diff --git a/.github/workflows/playwright.yml b/.github/workflows/playwright.yml
index c5b1a52f21..2c7a8d83db 100644
--- a/.github/workflows/playwright.yml
+++ b/.github/workflows/playwright.yml
@@ -16,6 +16,7 @@ env:
   KETCHER_URL: http://host.docker.internal:4002
   DOCKER: true
   IGNORE_UNSTABLE_TESTS: true
+  CI_ENVIRONMENT: true
 jobs:
   playwright_tests:
     timeout-minutes: 60
@@ -30,7 +31,7 @@ jobs:
       - name: Install dependencies
         run: npm ci
       - name: Build all packages
-        run: npm run build
+        run: npm run build:packages && npm run build:example:standalone
       - name: Run example in standalone mode
         run: cd example/ && nohup npm run serve:standalone &
       - name: Create env file
@@ -40,6 +41,7 @@ jobs:
           echo "KETCHER_URL=$KETCHER_URL" >> .env
           echo "MODE=$MODE" >> .env
           echo "IGNORE_UNSTABLE_TESTS=$IGNORE_UNSTABLE_TESTS" >> .env
+          echo "CI_ENVIRONMENT=$CI_ENVIRONMENT" >> .env
       - name: Build autotests for docker
         run: cd ketcher-autotests && npm run docker:build
       - name: Run playwright tests in docker
diff --git a/demo/src/components/FileInputForm.tsx b/demo/src/components/FileInputForm.tsx
index 39055340b9..e9925ab397 100644
--- a/demo/src/components/FileInputForm.tsx
+++ b/demo/src/components/FileInputForm.tsx
@@ -1,8 +1,8 @@
-import { useState } from 'react'
-import styled from '@emotion/styled'
+import { useState } from 'react';
+import styled from '@emotion/styled';
 
-import { PanelButton } from './shared/Buttons'
-import { Button } from '@mui/material'
+import { PanelButton } from './shared/Buttons';
+import { Button } from '@mui/material';
 
 const Form = styled('form')`
   margin-top: 10px;
@@ -15,7 +15,7 @@ const Form = styled('form')`
     font-size: 12px;
     text-transform: none;
   }
-`
+`;
 
 const FileNameBox = styled('div')`
   margin-top: 5px;
@@ -23,53 +23,51 @@ const FileNameBox = styled('div')`
   color: rgba(0, 0, 0, 0.6);
   font-size: 13px;
   text-align: left;
-`
+`;
 
 const parseFile = (file): Promise<string> =>
   new Promise((resolve, reject) => {
-    const reader = new FileReader()
+    const reader = new FileReader();
 
-    reader.readAsText(file, 'UTF-8')
+    reader.readAsText(file, 'UTF-8');
 
     reader.onload = function (evt) {
-      const fileContent = evt?.target?.result
-      console.log('Parsed file:')
-      console.log(fileContent)
+      const fileContent = evt?.target?.result;
       if (typeof fileContent === 'string') {
-        resolve(fileContent)
+        resolve(fileContent);
       }
-      resolve('')
-    }
+      resolve('');
+    };
     reader.onerror = function (err) {
-      reject(err)
-    }
-  })
+      reject(err);
+    };
+  });
 
 const submitHandler = (event) => {
-  event.preventDefault()
-  let file = event.target[0].files[0]
+  event.preventDefault();
+  let file = event.target[0].files[0];
 
   parseFile(file).then((str) => {
-    KetcherFunctions.renderFromCtab(str)
-  })
-}
+    KetcherFunctions.renderFromCtab(str);
+  });
+};
 
 interface FileInputProps {
-  printToTerminal: (str: string) => void
+  printToTerminal: (str: string) => void;
 }
 
 export const FileInputForm = ({ printToTerminal }: FileInputProps) => {
-  const [chosenFile, setFile] = useState('')
+  const [chosenFile, setFile] = useState('');
 
   const chooseFileHandler = (event) => {
-    const file: File = event.target.files[0]
-    setFile(file.name)
+    const file: File = event.target.files[0];
+    setFile(file.name);
 
     parseFile(file).then((str) => {
-      let message = 'Selected file content:' + str
-      printToTerminal(message)
-    })
-  }
+      let message = 'Selected file content:' + str;
+      printToTerminal(message);
+    });
+  };
 
   return (
     <>
@@ -103,5 +101,5 @@ export const FileInputForm = ({ printToTerminal }: FileInputProps) => {
         <span>{chosenFile}</span>
       </FileNameBox>
     </>
-  )
-}
+  );
+};
diff --git a/demo/src/components/Panel.tsx b/demo/src/components/Panel.tsx
index f334c3a4a6..7999e6bb80 100644
--- a/demo/src/components/Panel.tsx
+++ b/demo/src/components/Panel.tsx
@@ -1,12 +1,12 @@
-import styled from '@emotion/styled'
+import styled from '@emotion/styled';
 
-import { PanelButton } from './shared/Buttons'
+import { PanelButton } from './shared/Buttons';
 
-import { InputSelect } from './InputSelect'
-import { Highlighting } from './Highlighting'
-import { ButtonsSelect } from './ButtonsSelect'
-import { FileInputForm } from './FileInputForm'
-import { ControlsCard } from './ControlsCard'
+import { InputSelect } from './InputSelect';
+import { Highlighting } from './Highlighting';
+import { ButtonsSelect } from './ButtonsSelect';
+import { FileInputForm } from './FileInputForm';
+import { ControlsCard } from './ControlsCard';
 
 const FlexBox = styled('div')`
   display: flex;
@@ -15,42 +15,40 @@ const FlexBox = styled('div')`
   flex-wrap: wrap;
   justify-content: flex-start;
   gap: 10px;
-`
+`;
 
-const clearSelection = () => KetcherFunctions.clearSelection()
+const clearSelection = () => KetcherFunctions.clearSelection();
 
-const selectAll = () => KetcherFunctions.selectAll()
+const selectAll = () => KetcherFunctions.selectAll();
 
 interface Props {
-  printToTerminal: (string) => void
-  hiddenButtons: string[]
-  buttonsHideHandler: (arg: string[]) => void
+  printToTerminal: (string) => void;
+  hiddenButtons: string[];
+  buttonsHideHandler: (arg: string[]) => void;
 }
 
 export const Panel = ({
   printToTerminal,
   hiddenButtons,
-  buttonsHideHandler
+  buttonsHideHandler,
 }: Props) => {
   const exportHandler = () => {
     KetcherFunctions.exportCtab().then((str) => {
-      let message = 'Export content:' + str
-      console.log(message)
-      printToTerminal(message)
-    })
-  }
+      let message = 'Export content:' + str;
+      console.log(message);
+      printToTerminal(message);
+    });
+  };
 
   const showAtomIds = () => {
-    const atoms = KetcherFunctions.getSelectedAtomId()
-    console.log('Selected atoms:')
-    console.log(atoms)
+    const atoms = KetcherFunctions.getSelectedAtomId();
 
     if (!atoms) {
-      printToTerminal('No atoms selected')
+      printToTerminal('No atoms selected');
     } else {
-      printToTerminal('Selected atoms: ' + atoms)
+      printToTerminal('Selected atoms: ' + atoms);
     }
-  }
+  };
 
   return (
     <FlexBox>
@@ -105,5 +103,5 @@ export const Panel = ({
         </PanelButton>
       </ControlsCard>
     </FlexBox>
-  )
-}
+  );
+};
diff --git a/example/config/webpack.config.js b/example/config/webpack.config.js
index 18728d8072..87cc3939cc 100644
--- a/example/config/webpack.config.js
+++ b/example/config/webpack.config.js
@@ -10,8 +10,9 @@ const GitRevisionPlugin = require('git-revision-webpack-plugin');
 
 const gitRevisionPlugin = new GitRevisionPlugin();
 const applicationVersion = gitRevisionPlugin.version().split('-')[0];
+
 const envVariables = {
-  MODE: process.env.MODE,
+  MODE: process.env.MODE || 'standalone',
   API_PATH: process.env.REACT_APP_API_PATH,
   ENABLE_POLYMER_EDITOR: !!process.env.ENABLE_POLYMER_EDITOR,
   KETCHER_ENABLE_REDUX_LOGGER: JSON.stringify(false),
diff --git a/example/package.json b/example/package.json
index f93a0a3828..64ae7fbdc8 100644
--- a/example/package.json
+++ b/example/package.json
@@ -13,9 +13,9 @@
     "copy:build": "cross-env-shell shx cp -r build/. dist/$MODE",
     "prebuild": "cross-env-shell run-s init:build delete:dist init:dist",
     "postbuild": "cross-env-shell npm run copy:build",
-    "build:remote": "cross-env MODE=remote run-s prebuild build:react postbuild",
-    "build:standalone": "cross-env MODE=standalone run-s prebuild build:react postbuild",
-    "build:react": "react-app-rewired build",
+    "build:remote": "cross-env-shell MODE=remote run-s prebuild build:react postbuild",
+    "build:standalone": "cross-env-shell MODE=standalone run-s prebuild build:react postbuild",
+    "build:react": "cross-env-shell MODE=$MODE react-app-rewired build && echo $MODE",
     "build:react:analyze": "react-app-rewired build --analyze",
     "build": "npm run build:standalone && npm run build:remote",
     "build:standalone:analyze": "cross-env MODE=standalone run-s prebuild build:react:analyze postbuild",
diff --git a/example/src/PolymerToggler/PolymerToggler.tsx b/example/src/PolymerToggler/PolymerToggler.tsx
index fe3841610b..bdb6a7ee57 100644
--- a/example/src/PolymerToggler/PolymerToggler.tsx
+++ b/example/src/PolymerToggler/PolymerToggler.tsx
@@ -22,7 +22,7 @@ export interface PolymerTogglerProps {
 
 const PolymerToggler = ({ toggle }: PolymerTogglerProps): JSX.Element => {
   return (
-    <label className={styles.switch}>
+    <label className={styles.switch} data-testid="PolymerToggler">
       <input type="checkbox" onChange={(e) => toggle(e.target.checked)} />
       <span className={styles.slider} />
     </label>
diff --git a/ketcher-autotests/.env.example b/ketcher-autotests/.env.example
index e2153ff798..8f43099ff8 100644
--- a/ketcher-autotests/.env.example
+++ b/ketcher-autotests/.env.example
@@ -2,4 +2,5 @@ KETCHER_URL=""
 MODE="standalone"
 DOCKER=true
 IGNORE_UNSTABLE_TESTS=true
-GENERATE_DATA=false
\ No newline at end of file
+GENERATE_DATA=false
+CI_ENVIRONMENT=false
\ No newline at end of file
diff --git a/ketcher-autotests/README.md b/ketcher-autotests/README.md
index 0be21c70b8..730f64b735 100644
--- a/ketcher-autotests/README.md
+++ b/ketcher-autotests/README.md
@@ -97,9 +97,26 @@ selectNestedTool - select specific tool that has sub / nested levels.
     - Local frontend: KETCHER_URL=http://host.docker.internal:port (port where you run application)
   - OPTIONAL: IGNORE_UNSTABLE_TESTS=true (if you want to ignore unstable tests)
 - **OPTIONAL: Build frontend**:
-  if you want to run tests based on the localhost:4002, build and run frontend:
+  if you want to run tests based on the localhost:4002, you can put KETCHER_URL=http://localhost:4002
 
-  Directory "ketcher": - `npm ci` - `npm run build:example` - `npm run serve:standalone`
+### Run tests:
+
+- **OPTIONAL: Test Polymer Editor **:
+  If you want to run tests from Polymer Editor, add `ENABLE_POLYMER_EDITOR=true` in scripts:
+
+  - Root package.json: "build": "ENABLE_POLYMER_EDITOR=true npm run build -w example";
+
+- **Run app in browser: from root directory "ketcher"**:
+
+- `npm ci`
+- `npm run build`
+- `npm run serve`
+
+- **Run docker**:
+
+  - `cd ketcher-autotests`
+  - `npm run docker:build`
+  - `npm run docker:test`
 
 ### How to use?
 
diff --git a/ketcher-autotests/package.json b/ketcher-autotests/package.json
index 946a8070df..d88b2ea2e8 100644
--- a/ketcher-autotests/package.json
+++ b/ketcher-autotests/package.json
@@ -8,6 +8,7 @@
     "test": "npx playwright test",
     "test:debug": "npx playwright test --debug",
     "test:update": "npx playwright test --update-snapshots",
+    "test:trace": "npx playwright test --trace on --grep @check",
     "check:code": "npm run check:types && npm run check:lint",
     "check:types": "tsc --noEmit",
     "check:lint": "eslint .",
@@ -16,6 +17,7 @@
     "docker": "docker-compose run --rm autotests",
     "docker:build": "docker-compose build autotests",
     "docker:test": "npm run docker npx playwright test",
+    "docker:trace": "npm run docker npm run test:trace",
     "docker:update": "npm run docker npm run test:update",
     "docker:update:test": "npm run docker -- npx playwright test --update-snapshots -g"
   },
diff --git a/ketcher-autotests/playwright.config.ts b/ketcher-autotests/playwright.config.ts
index 4b1b9f6b96..0812e21f66 100644
--- a/ketcher-autotests/playwright.config.ts
+++ b/ketcher-autotests/playwright.config.ts
@@ -1,4 +1,5 @@
 import * as dotenv from 'dotenv';
+import * as os from 'os';
 import { PlaywrightTestConfig, devices } from '@playwright/test';
 import {
   REMOTE_URL,
@@ -14,18 +15,16 @@ dotenv.config();
 
 const ignoredTests = [
   'API/**',
+  'File-Management/Smile-Files/smile-files.spec.ts',
   'Examples/**',
-  'File-Management/**',
   'Indigo-Tools/**',
   'R-group-tool/**',
   'Reagents/**',
   'Structure-Creating-&-Editing/**',
-  'Templates/Functional-Groups/click-and-drag-fg-on-canvas.spec.ts',
   'Templates/Functional-Groups/functional-groups.spec.ts',
   'Templates/Functional-Groups/Functional-Group-Tools/functional-group-tools.spec.ts',
   'Templates/Salts-and-Solvents/**',
   'Templates/User-Templates/**',
-  'User-Interface/**',
   'utils/**',
 ];
 
@@ -65,9 +64,10 @@ const config: PlaywrightTestConfig = {
   /* Fail the build on CI if you accidentally left test.only in the source code. */
   forbidOnly: Boolean(process.env.CI),
   /* Retry on CI only */
-  retries: process.env.CI ? MAX_NUMBER_OF_RETRIES : 0,
+  retries: process.env.CI_ENVIRONMENT === 'true' ? MAX_NUMBER_OF_RETRIES : 0,
   /* Opt out of parallel tests on CI. */
-  workers: process.env.CI ? 1 : undefined,
+  // eslint-disable-next-line no-magic-numbers
+  workers: process.env.CI ? 2 : os.cpus().length,
   /* Reporter to use. See https://playwright.dev/docs/test-reporters */
   reporter: [
     [
diff --git a/ketcher-autotests/tests/Examples/ketcher-canvas.spec.ts-snapshots/Drawing-atom-Benzene-ring-Single-and-Double-Bond-single-bond-tool-1-chromium-linux.png b/ketcher-autotests/tests/Examples/ketcher-canvas.spec.ts-snapshots/Drawing-atom-Benzene-ring-Single-and-Double-Bond-single-bond-tool-1-chromium-linux.png
index d8dc55cea4..dd2d3cc849 100644
Binary files a/ketcher-autotests/tests/Examples/ketcher-canvas.spec.ts-snapshots/Drawing-atom-Benzene-ring-Single-and-Double-Bond-single-bond-tool-1-chromium-linux.png and b/ketcher-autotests/tests/Examples/ketcher-canvas.spec.ts-snapshots/Drawing-atom-Benzene-ring-Single-and-Double-Bond-single-bond-tool-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Examples/ketcher-files.spec.ts-snapshots/opening-molfile-1-chromium-linux.png b/ketcher-autotests/tests/Examples/ketcher-files.spec.ts-snapshots/opening-molfile-1-chromium-linux.png
index cd7738a5ca..7a14b53cd6 100644
Binary files a/ketcher-autotests/tests/Examples/ketcher-files.spec.ts-snapshots/opening-molfile-1-chromium-linux.png and b/ketcher-autotests/tests/Examples/ketcher-files.spec.ts-snapshots/opening-molfile-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Examples/ketcher-files.spec.ts-snapshots/opening-rnx-files-1-chromium-linux.png b/ketcher-autotests/tests/Examples/ketcher-files.spec.ts-snapshots/opening-rnx-files-1-chromium-linux.png
index 534e9df83d..50eea6e232 100644
Binary files a/ketcher-autotests/tests/Examples/ketcher-files.spec.ts-snapshots/opening-rnx-files-1-chromium-linux.png and b/ketcher-autotests/tests/Examples/ketcher-files.spec.ts-snapshots/opening-rnx-files-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/File-Management/Open-And-Save-Files/CDX-Files/cdx-files.spec.ts b/ketcher-autotests/tests/File-Management/Open-And-Save-Files/CDX-Files/cdx-files.spec.ts
index e9c19c4891..89e0969853 100644
--- a/ketcher-autotests/tests/File-Management/Open-And-Save-Files/CDX-Files/cdx-files.spec.ts
+++ b/ketcher-autotests/tests/File-Management/Open-And-Save-Files/CDX-Files/cdx-files.spec.ts
@@ -36,7 +36,7 @@ test.describe('CDX files', () => {
     await openFileAndAddToCanvas('cdx_file.cdx', page);
   });
 
-  test('opening cdx files from clickboard', async ({ page }) => {
+  test.fixme('opening cdx files from clipboard', async ({ page }) => {
     /* 
   Test case: EPMLSOPKET-6972
   Description: Open structure created in ChemDraw from clickboard
diff --git a/ketcher-autotests/tests/File-Management/Open-And-Save-Files/Cml-files/cml-files.spec.ts-snapshots/CML-files-Open-and-Save-file---CML---CML-for-R-group-and-other-features-1-chromium-linux.png b/ketcher-autotests/tests/File-Management/Open-And-Save-Files/Cml-files/cml-files.spec.ts-snapshots/CML-files-Open-and-Save-file---CML---CML-for-R-group-and-other-features-1-chromium-linux.png
index e2d7a58b8b..d287534a1e 100644
Binary files a/ketcher-autotests/tests/File-Management/Open-And-Save-Files/Cml-files/cml-files.spec.ts-snapshots/CML-files-Open-and-Save-file---CML---CML-for-R-group-and-other-features-1-chromium-linux.png and b/ketcher-autotests/tests/File-Management/Open-And-Save-Files/Cml-files/cml-files.spec.ts-snapshots/CML-files-Open-and-Save-file---CML---CML-for-R-group-and-other-features-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/File-Management/Open-And-Save-Files/Cml-files/cml-files.spec.ts-snapshots/CML-files-Open-and-Save-file---CML---CML-for-reaction-1-chromium-linux.png b/ketcher-autotests/tests/File-Management/Open-And-Save-Files/Cml-files/cml-files.spec.ts-snapshots/CML-files-Open-and-Save-file---CML---CML-for-reaction-1-chromium-linux.png
index 8c185a96da..f48556554e 100644
Binary files a/ketcher-autotests/tests/File-Management/Open-And-Save-Files/Cml-files/cml-files.spec.ts-snapshots/CML-files-Open-and-Save-file---CML---CML-for-reaction-1-chromium-linux.png and b/ketcher-autotests/tests/File-Management/Open-And-Save-Files/Cml-files/cml-files.spec.ts-snapshots/CML-files-Open-and-Save-file---CML---CML-for-reaction-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/File-Management/Open-And-Save-Files/InChi/InChi.spec.ts-snapshots/Open-and-Save-file---Generate-structure-from-InChI-String---Structure-with-stereobonds-1-chromium-linux.png b/ketcher-autotests/tests/File-Management/Open-And-Save-Files/InChi/InChi.spec.ts-snapshots/Open-and-Save-file---Generate-structure-from-InChI-String---Structure-with-stereobonds-1-chromium-linux.png
index 3f30004291..19fec22583 100644
Binary files a/ketcher-autotests/tests/File-Management/Open-And-Save-Files/InChi/InChi.spec.ts-snapshots/Open-and-Save-file---Generate-structure-from-InChI-String---Structure-with-stereobonds-1-chromium-linux.png and b/ketcher-autotests/tests/File-Management/Open-And-Save-Files/InChi/InChi.spec.ts-snapshots/Open-and-Save-file---Generate-structure-from-InChI-String---Structure-with-stereobonds-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/File-Management/Open-And-Save-Files/MOL-Files/mol-files.spec.ts-snapshots/Open-V3000-file-with-R-Groups-with-Fragments-1-chromium-linux.png b/ketcher-autotests/tests/File-Management/Open-And-Save-Files/MOL-Files/mol-files.spec.ts-snapshots/Open-V3000-file-with-R-Groups-with-Fragments-1-chromium-linux.png
new file mode 100644
index 0000000000..e04aec7361
Binary files /dev/null and b/ketcher-autotests/tests/File-Management/Open-And-Save-Files/MOL-Files/mol-files.spec.ts-snapshots/Open-V3000-file-with-R-Groups-with-Fragments-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/File-Management/Open-And-Save-Files/MOL-Files/mol-files.spec.ts-snapshots/Open-and-Save-file---Open-Save-V3000-mol-file-contains-abs-stereochemistry-1-2---open-1-chromium-linux.png b/ketcher-autotests/tests/File-Management/Open-And-Save-Files/MOL-Files/mol-files.spec.ts-snapshots/Open-and-Save-file---Open-Save-V3000-mol-file-contains-abs-stereochemistry-1-2---open-1-chromium-linux.png
index 5dfd73e3e2..8d48ab0340 100644
Binary files a/ketcher-autotests/tests/File-Management/Open-And-Save-Files/MOL-Files/mol-files.spec.ts-snapshots/Open-and-Save-file---Open-Save-V3000-mol-file-contains-abs-stereochemistry-1-2---open-1-chromium-linux.png and b/ketcher-autotests/tests/File-Management/Open-And-Save-Files/MOL-Files/mol-files.spec.ts-snapshots/Open-and-Save-file---Open-Save-V3000-mol-file-contains-abs-stereochemistry-1-2---open-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/File-Management/Open-And-Save-Files/MOL-Files/mol-files.spec.ts-snapshots/Open-and-Save-file---Open-Save-file-contains-Heteroatoms-1-2---open-1-chromium-linux.png b/ketcher-autotests/tests/File-Management/Open-And-Save-Files/MOL-Files/mol-files.spec.ts-snapshots/Open-and-Save-file---Open-Save-file-contains-Heteroatoms-1-2---open-1-chromium-linux.png
index ce22ac87e9..fc91138d24 100644
Binary files a/ketcher-autotests/tests/File-Management/Open-And-Save-Files/MOL-Files/mol-files.spec.ts-snapshots/Open-and-Save-file---Open-Save-file-contains-Heteroatoms-1-2---open-1-chromium-linux.png and b/ketcher-autotests/tests/File-Management/Open-And-Save-Files/MOL-Files/mol-files.spec.ts-snapshots/Open-and-Save-file---Open-Save-file-contains-Heteroatoms-1-2---open-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/File-Management/Open-And-Save-Files/MOL-Files/mol-files.spec.ts-snapshots/Open-and-Save-file---Open-Save-file-contains-abs-stereochemistry-1-2---open-1-chromium-linux.png b/ketcher-autotests/tests/File-Management/Open-And-Save-Files/MOL-Files/mol-files.spec.ts-snapshots/Open-and-Save-file---Open-Save-file-contains-abs-stereochemistry-1-2---open-1-chromium-linux.png
index 096732e14e..0c8526d1de 100644
Binary files a/ketcher-autotests/tests/File-Management/Open-And-Save-Files/MOL-Files/mol-files.spec.ts-snapshots/Open-and-Save-file---Open-Save-file-contains-abs-stereochemistry-1-2---open-1-chromium-linux.png and b/ketcher-autotests/tests/File-Management/Open-And-Save-Files/MOL-Files/mol-files.spec.ts-snapshots/Open-and-Save-file---Open-Save-file-contains-abs-stereochemistry-1-2---open-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/File-Management/Open-And-Save-Files/MOL-Files/mol-files.spec.ts-snapshots/Open-and-Save-file---Open-Save-file-with-R-Groups-1-2---open-1-chromium-linux.png b/ketcher-autotests/tests/File-Management/Open-And-Save-Files/MOL-Files/mol-files.spec.ts-snapshots/Open-and-Save-file---Open-Save-file-with-R-Groups-1-2---open-1-chromium-linux.png
index 70041dfee7..4b7f6f1d91 100644
Binary files a/ketcher-autotests/tests/File-Management/Open-And-Save-Files/MOL-Files/mol-files.spec.ts-snapshots/Open-and-Save-file---Open-Save-file-with-R-Groups-1-2---open-1-chromium-linux.png and b/ketcher-autotests/tests/File-Management/Open-And-Save-Files/MOL-Files/mol-files.spec.ts-snapshots/Open-and-Save-file---Open-Save-file-with-R-Groups-1-2---open-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/File-Management/Open-And-Save-Files/MOL-Files/mol-files.spec.ts-snapshots/Open-and-Save-files---Open-Save-structure-with-atom-properties-1-2---open-1-chromium-linux.png b/ketcher-autotests/tests/File-Management/Open-And-Save-Files/MOL-Files/mol-files.spec.ts-snapshots/Open-and-Save-files---Open-Save-structure-with-atom-properties-1-2---open-1-chromium-linux.png
index da2bdf3e08..4312054512 100644
Binary files a/ketcher-autotests/tests/File-Management/Open-And-Save-Files/MOL-Files/mol-files.spec.ts-snapshots/Open-and-Save-files---Open-Save-structure-with-atom-properties-1-2---open-1-chromium-linux.png and b/ketcher-autotests/tests/File-Management/Open-And-Save-Files/MOL-Files/mol-files.spec.ts-snapshots/Open-and-Save-files---Open-Save-structure-with-atom-properties-1-2---open-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/File-Management/Open-And-Save-Files/Open-File/open-file.spec.ts-snapshots/open-files-with-different-formats-Open-file---Input-mol-InChi-1-chromium-linux.png b/ketcher-autotests/tests/File-Management/Open-And-Save-Files/Open-File/open-file.spec.ts-snapshots/open-files-with-different-formats-Open-file---Input-mol-InChi-1-chromium-linux.png
index 69ac3f8026..6f0e87ccc3 100644
Binary files a/ketcher-autotests/tests/File-Management/Open-And-Save-Files/Open-File/open-file.spec.ts-snapshots/open-files-with-different-formats-Open-file---Input-mol-InChi-1-chromium-linux.png and b/ketcher-autotests/tests/File-Management/Open-And-Save-Files/Open-File/open-file.spec.ts-snapshots/open-files-with-different-formats-Open-file---Input-mol-InChi-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/File-Management/Open-And-Save-Files/Open-File/open-file.spec.ts-snapshots/open-files-with-different-formats-Open-file---Open-mol-file-1-2-1-chromium-linux.png b/ketcher-autotests/tests/File-Management/Open-And-Save-Files/Open-File/open-file.spec.ts-snapshots/open-files-with-different-formats-Open-file---Open-mol-file-1-2-1-chromium-linux.png
index 2d984f4918..6fd0b28c94 100644
Binary files a/ketcher-autotests/tests/File-Management/Open-And-Save-Files/Open-File/open-file.spec.ts-snapshots/open-files-with-different-formats-Open-file---Open-mol-file-1-2-1-chromium-linux.png and b/ketcher-autotests/tests/File-Management/Open-And-Save-Files/Open-File/open-file.spec.ts-snapshots/open-files-with-different-formats-Open-file---Open-mol-file-1-2-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/File-Management/Open-And-Save-Files/Open-File/open-file.spec.ts-snapshots/open-files-with-different-formats-Open-file---Open-mol-file-2-2-1-chromium-linux.png b/ketcher-autotests/tests/File-Management/Open-And-Save-Files/Open-File/open-file.spec.ts-snapshots/open-files-with-different-formats-Open-file---Open-mol-file-2-2-1-chromium-linux.png
index 93f7d64ee7..047c36e6de 100644
Binary files a/ketcher-autotests/tests/File-Management/Open-And-Save-Files/Open-File/open-file.spec.ts-snapshots/open-files-with-different-formats-Open-file---Open-mol-file-2-2-1-chromium-linux.png and b/ketcher-autotests/tests/File-Management/Open-And-Save-Files/Open-File/open-file.spec.ts-snapshots/open-files-with-different-formats-Open-file---Open-mol-file-2-2-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/File-Management/Open-And-Save-Files/Open-File/open-file.spec.ts-snapshots/open-files-with-different-formats-opening-rxn-files-1-chromium-linux.png b/ketcher-autotests/tests/File-Management/Open-And-Save-Files/Open-File/open-file.spec.ts-snapshots/open-files-with-different-formats-opening-rxn-files-1-chromium-linux.png
index 534e9df83d..50eea6e232 100644
Binary files a/ketcher-autotests/tests/File-Management/Open-And-Save-Files/Open-File/open-file.spec.ts-snapshots/open-files-with-different-formats-opening-rxn-files-1-chromium-linux.png and b/ketcher-autotests/tests/File-Management/Open-And-Save-Files/Open-File/open-file.spec.ts-snapshots/open-files-with-different-formats-opening-rxn-files-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/File-Management/Open-And-Save-Files/Open-File/open-file.spec.ts-snapshots/open-files-with-different-formats-opening-rxn-files-check-1-chromium-linux.png b/ketcher-autotests/tests/File-Management/Open-And-Save-Files/Open-File/open-file.spec.ts-snapshots/open-files-with-different-formats-opening-rxn-files-check-1-chromium-linux.png
new file mode 100644
index 0000000000..5361f2352f
Binary files /dev/null and b/ketcher-autotests/tests/File-Management/Open-And-Save-Files/Open-File/open-file.spec.ts-snapshots/open-files-with-different-formats-opening-rxn-files-check-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/File-Management/Open-And-Save-Files/Open-File/open-file.spec.ts-snapshots/open-files-with-different-formats-test-mol-file-check-1-chromium-linux.png b/ketcher-autotests/tests/File-Management/Open-And-Save-Files/Open-File/open-file.spec.ts-snapshots/open-files-with-different-formats-test-mol-file-check-1-chromium-linux.png
new file mode 100644
index 0000000000..1597db04d4
Binary files /dev/null and b/ketcher-autotests/tests/File-Management/Open-And-Save-Files/Open-File/open-file.spec.ts-snapshots/open-files-with-different-formats-test-mol-file-check-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/File-Management/Open-And-Save-Files/Rxn-Files/rxn-files.spec.ts b/ketcher-autotests/tests/File-Management/Open-And-Save-Files/Rxn-Files/rxn-files.spec.ts
index 8f5cb56a94..47555a0741 100644
--- a/ketcher-autotests/tests/File-Management/Open-And-Save-Files/Rxn-Files/rxn-files.spec.ts
+++ b/ketcher-autotests/tests/File-Management/Open-And-Save-Files/Rxn-Files/rxn-files.spec.ts
@@ -47,45 +47,47 @@ test('Open and Save file - Reaction from file that contains abbreviation 2/2 - s
   expect(rxnFile).toEqual(rxnFileExpected);
 });
 
-test('Open and Save file - Reaction from file that contains Heteroatoms 1/2 - open', async ({
-  page,
-}) => {
-  /**
-   * Test case: EPMLSOPKET-1904(1)
-   * Description: Reaction with heteroatoms is opened and saved correctly
-   */
-  await page.goto('');
-
-  await openFileAndAddToCanvas('Heteroatoms.rxn', page);
-  // check that structure opened from file is displayed correctly
-  await takeEditorScreenshot(page);
-});
-
-test('Open and Save file - Reaction from file that contains Heteroatoms 2/2 - save', async ({
-  page,
-}) => {
-  /**
-   * Test case: EPMLSOPKET-1904(2)
-   * Description: Reaction with heteroatoms is opened and saved correctly
-   */
-  await page.goto('');
-
-  await openFileAndAddToCanvas('Heteroatoms.rxn', page);
-  const expectedFile = await getRxn(page, 'v2000');
-  await saveToFile('heteroatoms-expectedV2000.rxn', expectedFile);
-
-  // eslint-disable-next-line no-magic-numbers
-  const METADATA_STRINGS_INDEXES = [2, 7, 30, 39, 62];
-
-  const { fileExpected: rxnFileExpected, file: rxnFile } =
-    await receiveFileComparisonData({
-      page,
-      expectedFileName: 'tests/test-data/heteroatoms-expectedV2000.rxn',
-      metaDataIndexes: METADATA_STRINGS_INDEXES,
-    });
-
-  expect(rxnFile).toEqual(rxnFileExpected);
-});
+test.fixme(
+  'Open and Save file - Reaction from file that contains Heteroatoms 1/2 - open',
+  async ({ page }) => {
+    /**
+     * Test case: EPMLSOPKET-1904(1)
+     * Description: Reaction with heteroatoms is opened and saved correctly
+     */
+    await page.goto('');
+
+    await openFileAndAddToCanvas('Heteroatoms.rxn', page);
+    // check that structure opened from file is displayed correctly
+    await takeEditorScreenshot(page);
+  },
+);
+
+test.fixme(
+  'Open and Save file - Reaction from file that contains Heteroatoms 2/2 - save',
+  async ({ page }) => {
+    /**
+     * Test case: EPMLSOPKET-1904(2)
+     * Description: Reaction with heteroatoms is opened and saved correctly
+     */
+    await page.goto('');
+
+    await openFileAndAddToCanvas('Heteroatoms.rxn', page);
+    const expectedFile = await getRxn(page, 'v2000');
+    await saveToFile('heteroatoms-expectedV2000.rxn', expectedFile);
+
+    // eslint-disable-next-line no-magic-numbers
+    const METADATA_STRINGS_INDEXES = [2, 7, 30, 39, 62];
+
+    const { fileExpected: rxnFileExpected, file: rxnFile } =
+      await receiveFileComparisonData({
+        page,
+        expectedFileName: 'tests/test-data/heteroatoms-expectedV2000.rxn',
+        metaDataIndexes: METADATA_STRINGS_INDEXES,
+      });
+
+    expect(rxnFile).toEqual(rxnFileExpected);
+  },
+);
 
 test('Open and Save file - V3000 rxn file contains Rgroup 1/2 - open', async ({
   page,
diff --git a/ketcher-autotests/tests/File-Management/Open-And-Save-Files/Rxn-Files/rxn-files.spec.ts-snapshots/Open-and-Save-file---Reaction-from-file-that-contains-abbreviation-1-2---open-1-chromium-linux.png b/ketcher-autotests/tests/File-Management/Open-And-Save-Files/Rxn-Files/rxn-files.spec.ts-snapshots/Open-and-Save-file---Reaction-from-file-that-contains-abbreviation-1-2---open-1-chromium-linux.png
index 851b39c2a0..bb76c132ff 100644
Binary files a/ketcher-autotests/tests/File-Management/Open-And-Save-Files/Rxn-Files/rxn-files.spec.ts-snapshots/Open-and-Save-file---Reaction-from-file-that-contains-abbreviation-1-2---open-1-chromium-linux.png and b/ketcher-autotests/tests/File-Management/Open-And-Save-Files/Rxn-Files/rxn-files.spec.ts-snapshots/Open-and-Save-file---Reaction-from-file-that-contains-abbreviation-1-2---open-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/File-Management/Open-And-Save-Files/cdxml-files.spec.ts-snapshots/Tests-for-API-setMolecule-getMolecule-Open-structure-in-another-editor-1-chromium-linux.png b/ketcher-autotests/tests/File-Management/Open-And-Save-Files/cdxml-files.spec.ts-snapshots/Tests-for-API-setMolecule-getMolecule-Open-structure-in-another-editor-1-chromium-linux.png
index 9c6c8bced4..f6e501498e 100644
Binary files a/ketcher-autotests/tests/File-Management/Open-And-Save-Files/cdxml-files.spec.ts-snapshots/Tests-for-API-setMolecule-getMolecule-Open-structure-in-another-editor-1-chromium-linux.png and b/ketcher-autotests/tests/File-Management/Open-And-Save-Files/cdxml-files.spec.ts-snapshots/Tests-for-API-setMolecule-getMolecule-Open-structure-in-another-editor-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/File-Management/Open-And-Save-Files/cdxml-files.spec.ts-snapshots/Tests-for-API-setMolecule-getMolecule-Paste-CDXML-1-chromium-linux.png b/ketcher-autotests/tests/File-Management/Open-And-Save-Files/cdxml-files.spec.ts-snapshots/Tests-for-API-setMolecule-getMolecule-Paste-CDXML-1-chromium-linux.png
index 9c6c8bced4..f6e501498e 100644
Binary files a/ketcher-autotests/tests/File-Management/Open-And-Save-Files/cdxml-files.spec.ts-snapshots/Tests-for-API-setMolecule-getMolecule-Paste-CDXML-1-chromium-linux.png and b/ketcher-autotests/tests/File-Management/Open-And-Save-Files/cdxml-files.spec.ts-snapshots/Tests-for-API-setMolecule-getMolecule-Paste-CDXML-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/File-Management/Smile-Files/smile-files.spec.ts b/ketcher-autotests/tests/File-Management/Smile-Files/smile-files.spec.ts
index e459b55fcf..fc1741f8f0 100644
--- a/ketcher-autotests/tests/File-Management/Smile-Files/smile-files.spec.ts
+++ b/ketcher-autotests/tests/File-Management/Smile-Files/smile-files.spec.ts
@@ -10,6 +10,7 @@ import {
   pressButton,
   clickInTheMiddleOfTheScreen,
   DELAY_IN_SECONDS,
+  waitForLoad,
 } from '@utils';
 import { getSmiles } from '@utils/formats';
 
@@ -35,7 +36,9 @@ async function clearCanvasAndPasteSmiles(page: Page, smiles: string) {
   await selectTopPanelButton(TopPanelButton.Open, page);
   await page.getByText('Paste from clipboard').click();
   await pasteFromClipboard(page, smiles);
-  await pressButton(page, 'Add to Canvas');
+  await waitForLoad(page, async () => {
+    await pressButton(page, 'Add to Canvas');
+  });
   await clickInTheMiddleOfTheScreen(page);
 }
 
@@ -87,7 +90,7 @@ test.describe('SMILES files', () => {
     );
   });
 
-  test('SmileString from mol file that contains abbreviation', async ({
+  test.skip('SmileString from mol file that contains abbreviation', async ({
     page,
   }) => {
     /*
@@ -96,7 +99,6 @@ test.describe('SMILES files', () => {
     warning appears for all types of Sgroup except the multiple Sgroup type.
     */
     await openFileAndAddToCanvas('sec_butyl_abr.mol', page);
-
     await getPreviewForSmiles(page, 'MDL Molfile V2000', 'Daylight SMILES');
     await delay(DELAY_IN_SECONDS.TWO);
     await page.getByText('Warnings').click();
@@ -166,7 +168,7 @@ test.describe('SMILES files', () => {
     await clearCanvasAndPasteSmiles(page, 'CCCC[C@@H](C)[C@@H](C)CC');
   });
 
-  test('SmileString  from V2000 mol file contains abs stereochemistry', async ({
+  test('SmileString from V2000 mol file contains abs stereochemistry', async ({
     page,
   }) => {
     /*
diff --git a/ketcher-autotests/tests/File-Management/Smile-Files/smile-files.spec.ts-snapshots/SMILES-files-Open-Daylight-SMILES-file-with-reagent-above-arrow-2-chromium-linux.png b/ketcher-autotests/tests/File-Management/Smile-Files/smile-files.spec.ts-snapshots/SMILES-files-Open-Daylight-SMILES-file-with-reagent-above-arrow-2-chromium-linux.png
index e2d4726601..36e0bace33 100644
Binary files a/ketcher-autotests/tests/File-Management/Smile-Files/smile-files.spec.ts-snapshots/SMILES-files-Open-Daylight-SMILES-file-with-reagent-above-arrow-2-chromium-linux.png and b/ketcher-autotests/tests/File-Management/Smile-Files/smile-files.spec.ts-snapshots/SMILES-files-Open-Daylight-SMILES-file-with-reagent-above-arrow-2-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/File-Management/Smile-Files/smile-files.spec.ts-snapshots/SMILES-files-SmileString-for-structure-with-Atom-properties-2-chromium-linux.png b/ketcher-autotests/tests/File-Management/Smile-Files/smile-files.spec.ts-snapshots/SMILES-files-SmileString-for-structure-with-Atom-properties-2-chromium-linux.png
index 3ba6eb5d09..7674c43d78 100644
Binary files a/ketcher-autotests/tests/File-Management/Smile-Files/smile-files.spec.ts-snapshots/SMILES-files-SmileString-for-structure-with-Atom-properties-2-chromium-linux.png and b/ketcher-autotests/tests/File-Management/Smile-Files/smile-files.spec.ts-snapshots/SMILES-files-SmileString-for-structure-with-Atom-properties-2-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/File-Management/Smile-Files/smile-files.spec.ts-snapshots/SMILES-files-SmileString-for-structure-with-Bond-properties-2-chromium-linux.png b/ketcher-autotests/tests/File-Management/Smile-Files/smile-files.spec.ts-snapshots/SMILES-files-SmileString-for-structure-with-Bond-properties-2-chromium-linux.png
index 0bce9cd0cb..08d35376e6 100644
Binary files a/ketcher-autotests/tests/File-Management/Smile-Files/smile-files.spec.ts-snapshots/SMILES-files-SmileString-for-structure-with-Bond-properties-2-chromium-linux.png and b/ketcher-autotests/tests/File-Management/Smile-Files/smile-files.spec.ts-snapshots/SMILES-files-SmileString-for-structure-with-Bond-properties-2-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/File-Management/Smile-Files/smile-files.spec.ts-snapshots/SMILES-files-SmileString-from-V2000-mol-file-contains-abs-stereochemistry-1-chromium-linux.png b/ketcher-autotests/tests/File-Management/Smile-Files/smile-files.spec.ts-snapshots/SMILES-files-SmileString-from-V2000-mol-file-contains-abs-stereochemistry-1-chromium-linux.png
index 0e5dd3d346..d078db66d3 100644
Binary files a/ketcher-autotests/tests/File-Management/Smile-Files/smile-files.spec.ts-snapshots/SMILES-files-SmileString-from-V2000-mol-file-contains-abs-stereochemistry-1-chromium-linux.png and b/ketcher-autotests/tests/File-Management/Smile-Files/smile-files.spec.ts-snapshots/SMILES-files-SmileString-from-V2000-mol-file-contains-abs-stereochemistry-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/File-Management/Smile-Files/smile-files.spec.ts-snapshots/SMILES-files-SmileString-from-V2000-mol-file-contains-abs-stereochemistry-2-chromium-linux.png b/ketcher-autotests/tests/File-Management/Smile-Files/smile-files.spec.ts-snapshots/SMILES-files-SmileString-from-V2000-mol-file-contains-abs-stereochemistry-2-chromium-linux.png
index 55c2517c33..840d7d670d 100644
Binary files a/ketcher-autotests/tests/File-Management/Smile-Files/smile-files.spec.ts-snapshots/SMILES-files-SmileString-from-V2000-mol-file-contains-abs-stereochemistry-2-chromium-linux.png and b/ketcher-autotests/tests/File-Management/Smile-Files/smile-files.spec.ts-snapshots/SMILES-files-SmileString-from-V2000-mol-file-contains-abs-stereochemistry-2-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/File-Management/Smile-Files/smile-files.spec.ts-snapshots/SMILES-files-SmileString-from-file-that-contains-Cis-Trans-configuration-2-chromium-linux.png b/ketcher-autotests/tests/File-Management/Smile-Files/smile-files.spec.ts-snapshots/SMILES-files-SmileString-from-file-that-contains-Cis-Trans-configuration-2-chromium-linux.png
index 4024931ef5..b807302f0f 100644
Binary files a/ketcher-autotests/tests/File-Management/Smile-Files/smile-files.spec.ts-snapshots/SMILES-files-SmileString-from-file-that-contains-Cis-Trans-configuration-2-chromium-linux.png and b/ketcher-autotests/tests/File-Management/Smile-Files/smile-files.spec.ts-snapshots/SMILES-files-SmileString-from-file-that-contains-Cis-Trans-configuration-2-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/File-Management/Smile-Files/smile-files.spec.ts-snapshots/SMILES-files-SmileString-from-mol-file-that-contains-combination-of-different-features-1-chromium-linux.png b/ketcher-autotests/tests/File-Management/Smile-Files/smile-files.spec.ts-snapshots/SMILES-files-SmileString-from-mol-file-that-contains-combination-of-different-features-1-chromium-linux.png
index 1b638c1de0..0d9cccfec9 100644
Binary files a/ketcher-autotests/tests/File-Management/Smile-Files/smile-files.spec.ts-snapshots/SMILES-files-SmileString-from-mol-file-that-contains-combination-of-different-features-1-chromium-linux.png and b/ketcher-autotests/tests/File-Management/Smile-Files/smile-files.spec.ts-snapshots/SMILES-files-SmileString-from-mol-file-that-contains-combination-of-different-features-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/File-Management/Smile-Files/smile-files.spec.ts-snapshots/SMILES-files-SmileString-from-mol-file-that-contains-combination-of-different-features-2-chromium-linux.png b/ketcher-autotests/tests/File-Management/Smile-Files/smile-files.spec.ts-snapshots/SMILES-files-SmileString-from-mol-file-that-contains-combination-of-different-features-2-chromium-linux.png
index dcc3a6191b..ec67340e26 100644
Binary files a/ketcher-autotests/tests/File-Management/Smile-Files/smile-files.spec.ts-snapshots/SMILES-files-SmileString-from-mol-file-that-contains-combination-of-different-features-2-chromium-linux.png and b/ketcher-autotests/tests/File-Management/Smile-Files/smile-files.spec.ts-snapshots/SMILES-files-SmileString-from-mol-file-that-contains-combination-of-different-features-2-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/File-Management/Smile-Files/smile-files.spec.ts-snapshots/SMILES-files-SmileString-from-reaction-consists-of-two-or-more-reaction-arrows-and-structures-1-chromium-linux.png b/ketcher-autotests/tests/File-Management/Smile-Files/smile-files.spec.ts-snapshots/SMILES-files-SmileString-from-reaction-consists-of-two-or-more-reaction-arrows-and-structures-1-chromium-linux.png
index af0774be80..c8fed3ac4d 100644
Binary files a/ketcher-autotests/tests/File-Management/Smile-Files/smile-files.spec.ts-snapshots/SMILES-files-SmileString-from-reaction-consists-of-two-or-more-reaction-arrows-and-structures-1-chromium-linux.png and b/ketcher-autotests/tests/File-Management/Smile-Files/smile-files.spec.ts-snapshots/SMILES-files-SmileString-from-reaction-consists-of-two-or-more-reaction-arrows-and-structures-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/File-Management/Smile-Files/smile-files.spec.ts-snapshots/SMILES-files-SmileString-from-reaction-consists-of-two-or-more-reaction-arrows-and-structures-2-chromium-linux.png b/ketcher-autotests/tests/File-Management/Smile-Files/smile-files.spec.ts-snapshots/SMILES-files-SmileString-from-reaction-consists-of-two-or-more-reaction-arrows-and-structures-2-chromium-linux.png
index 664b2064f0..2c814cfd71 100644
Binary files a/ketcher-autotests/tests/File-Management/Smile-Files/smile-files.spec.ts-snapshots/SMILES-files-SmileString-from-reaction-consists-of-two-or-more-reaction-arrows-and-structures-2-chromium-linux.png and b/ketcher-autotests/tests/File-Management/Smile-Files/smile-files.spec.ts-snapshots/SMILES-files-SmileString-from-reaction-consists-of-two-or-more-reaction-arrows-and-structures-2-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Indigo-Tools/Aromatize-Dearomatize/aromatize-dearomatize.spec.ts-snapshots/Aromatize-Dearomatize-Tool-Add-Atom-Manipula-e6120-lic-structures-with-a-circle-inside-the-cycle-1-chromium-linux.png b/ketcher-autotests/tests/Indigo-Tools/Aromatize-Dearomatize/aromatize-dearomatize.spec.ts-snapshots/Aromatize-Dearomatize-Tool-Add-Atom-Manipula-e6120-lic-structures-with-a-circle-inside-the-cycle-1-chromium-linux.png
index 65c17a2539..d1caab10a9 100644
Binary files a/ketcher-autotests/tests/Indigo-Tools/Aromatize-Dearomatize/aromatize-dearomatize.spec.ts-snapshots/Aromatize-Dearomatize-Tool-Add-Atom-Manipula-e6120-lic-structures-with-a-circle-inside-the-cycle-1-chromium-linux.png and b/ketcher-autotests/tests/Indigo-Tools/Aromatize-Dearomatize/aromatize-dearomatize.spec.ts-snapshots/Aromatize-Dearomatize-Tool-Add-Atom-Manipula-e6120-lic-structures-with-a-circle-inside-the-cycle-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Indigo-Tools/Aromatize-Dearomatize/aromatize-dearomatize.spec.ts-snapshots/Aromatize-Dearomatize-Tool-Aromatic-structures---interchanged-Single-and-Double-bonds-1-chromium-linux.png b/ketcher-autotests/tests/Indigo-Tools/Aromatize-Dearomatize/aromatize-dearomatize.spec.ts-snapshots/Aromatize-Dearomatize-Tool-Aromatic-structures---interchanged-Single-and-Double-bonds-1-chromium-linux.png
index b67520cdf0..a47e40f04a 100644
Binary files a/ketcher-autotests/tests/Indigo-Tools/Aromatize-Dearomatize/aromatize-dearomatize.spec.ts-snapshots/Aromatize-Dearomatize-Tool-Aromatic-structures---interchanged-Single-and-Double-bonds-1-chromium-linux.png and b/ketcher-autotests/tests/Indigo-Tools/Aromatize-Dearomatize/aromatize-dearomatize.spec.ts-snapshots/Aromatize-Dearomatize-Tool-Aromatic-structures---interchanged-Single-and-Double-bonds-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Indigo-Tools/Aromatize-Dearomatize/aromatize-dearomatize.spec.ts-snapshots/Aromatize-Dearomatize-Tool-Aromatic-structures---interchanged-Single-and-Double-bonds-2-chromium-linux.png b/ketcher-autotests/tests/Indigo-Tools/Aromatize-Dearomatize/aromatize-dearomatize.spec.ts-snapshots/Aromatize-Dearomatize-Tool-Aromatic-structures---interchanged-Single-and-Double-bonds-2-chromium-linux.png
index 202a1ff81b..a837f0f97c 100644
Binary files a/ketcher-autotests/tests/Indigo-Tools/Aromatize-Dearomatize/aromatize-dearomatize.spec.ts-snapshots/Aromatize-Dearomatize-Tool-Aromatic-structures---interchanged-Single-and-Double-bonds-2-chromium-linux.png and b/ketcher-autotests/tests/Indigo-Tools/Aromatize-Dearomatize/aromatize-dearomatize.spec.ts-snapshots/Aromatize-Dearomatize-Tool-Aromatic-structures---interchanged-Single-and-Double-bonds-2-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Indigo-Tools/Aromatize-Dearomatize/aromatize-dearomatize.spec.ts-snapshots/Aromatize-Dearomatize-Tool-Cml-file-Save-cyclic-structures-with-a-circle-inside-the-cycle-1-chromium-linux.png b/ketcher-autotests/tests/Indigo-Tools/Aromatize-Dearomatize/aromatize-dearomatize.spec.ts-snapshots/Aromatize-Dearomatize-Tool-Cml-file-Save-cyclic-structures-with-a-circle-inside-the-cycle-1-chromium-linux.png
index c9d7ee6c13..a2f74478a3 100644
Binary files a/ketcher-autotests/tests/Indigo-Tools/Aromatize-Dearomatize/aromatize-dearomatize.spec.ts-snapshots/Aromatize-Dearomatize-Tool-Cml-file-Save-cyclic-structures-with-a-circle-inside-the-cycle-1-chromium-linux.png and b/ketcher-autotests/tests/Indigo-Tools/Aromatize-Dearomatize/aromatize-dearomatize.spec.ts-snapshots/Aromatize-Dearomatize-Tool-Cml-file-Save-cyclic-structures-with-a-circle-inside-the-cycle-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Indigo-Tools/Aromatize-Dearomatize/aromatize-dearomatize.spec.ts-snapshots/Aromatize-Dearomatize-Tool-Copy-Paste-Manipu-ff58c-lic-structures-with-a-circle-inside-the-cycle-1-chromium-linux.png b/ketcher-autotests/tests/Indigo-Tools/Aromatize-Dearomatize/aromatize-dearomatize.spec.ts-snapshots/Aromatize-Dearomatize-Tool-Copy-Paste-Manipu-ff58c-lic-structures-with-a-circle-inside-the-cycle-1-chromium-linux.png
index c066ec03cf..77a4c16b0e 100644
Binary files a/ketcher-autotests/tests/Indigo-Tools/Aromatize-Dearomatize/aromatize-dearomatize.spec.ts-snapshots/Aromatize-Dearomatize-Tool-Copy-Paste-Manipu-ff58c-lic-structures-with-a-circle-inside-the-cycle-1-chromium-linux.png and b/ketcher-autotests/tests/Indigo-Tools/Aromatize-Dearomatize/aromatize-dearomatize.spec.ts-snapshots/Aromatize-Dearomatize-Tool-Copy-Paste-Manipu-ff58c-lic-structures-with-a-circle-inside-the-cycle-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Indigo-Tools/Aromatize-Dearomatize/aromatize-dearomatize.spec.ts-snapshots/Aromatize-Dearomatize-Tool-Cut-Paste-Manipul-880b8-lic-structures-with-a-circle-inside-the-cycle-1-chromium-linux.png b/ketcher-autotests/tests/Indigo-Tools/Aromatize-Dearomatize/aromatize-dearomatize.spec.ts-snapshots/Aromatize-Dearomatize-Tool-Cut-Paste-Manipul-880b8-lic-structures-with-a-circle-inside-the-cycle-1-chromium-linux.png
index 89b6acbf01..21b2ab1a14 100644
Binary files a/ketcher-autotests/tests/Indigo-Tools/Aromatize-Dearomatize/aromatize-dearomatize.spec.ts-snapshots/Aromatize-Dearomatize-Tool-Cut-Paste-Manipul-880b8-lic-structures-with-a-circle-inside-the-cycle-1-chromium-linux.png and b/ketcher-autotests/tests/Indigo-Tools/Aromatize-Dearomatize/aromatize-dearomatize.spec.ts-snapshots/Aromatize-Dearomatize-Tool-Cut-Paste-Manipul-880b8-lic-structures-with-a-circle-inside-the-cycle-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Indigo-Tools/Aromatize-Dearomatize/aromatize-dearomatize.spec.ts-snapshots/Aromatize-Dearomatize-Tool-Cycles-with-Aromatic-Bonds-1-chromium-linux.png b/ketcher-autotests/tests/Indigo-Tools/Aromatize-Dearomatize/aromatize-dearomatize.spec.ts-snapshots/Aromatize-Dearomatize-Tool-Cycles-with-Aromatic-Bonds-1-chromium-linux.png
index 51730d8147..92d90a32e0 100644
Binary files a/ketcher-autotests/tests/Indigo-Tools/Aromatize-Dearomatize/aromatize-dearomatize.spec.ts-snapshots/Aromatize-Dearomatize-Tool-Cycles-with-Aromatic-Bonds-1-chromium-linux.png and b/ketcher-autotests/tests/Indigo-Tools/Aromatize-Dearomatize/aromatize-dearomatize.spec.ts-snapshots/Aromatize-Dearomatize-Tool-Cycles-with-Aromatic-Bonds-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Indigo-Tools/Aromatize-Dearomatize/aromatize-dearomatize.spec.ts-snapshots/Aromatize-Dearomatize-Tool-Cycles-with-Aromatic-Bonds-2-chromium-linux.png b/ketcher-autotests/tests/Indigo-Tools/Aromatize-Dearomatize/aromatize-dearomatize.spec.ts-snapshots/Aromatize-Dearomatize-Tool-Cycles-with-Aromatic-Bonds-2-chromium-linux.png
index fd7b32cc56..b188d9b8f7 100644
Binary files a/ketcher-autotests/tests/Indigo-Tools/Aromatize-Dearomatize/aromatize-dearomatize.spec.ts-snapshots/Aromatize-Dearomatize-Tool-Cycles-with-Aromatic-Bonds-2-chromium-linux.png and b/ketcher-autotests/tests/Indigo-Tools/Aromatize-Dearomatize/aromatize-dearomatize.spec.ts-snapshots/Aromatize-Dearomatize-Tool-Cycles-with-Aromatic-Bonds-2-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Indigo-Tools/Aromatize-Dearomatize/aromatize-dearomatize.spec.ts-snapshots/Aromatize-Dearomatize-Tool-MolV2000-Save-cyclic-structures-with-a-circle-inside-the-cycle-1-chromium-linux.png b/ketcher-autotests/tests/Indigo-Tools/Aromatize-Dearomatize/aromatize-dearomatize.spec.ts-snapshots/Aromatize-Dearomatize-Tool-MolV2000-Save-cyclic-structures-with-a-circle-inside-the-cycle-1-chromium-linux.png
index d0ac32ebaa..2a76a031de 100644
Binary files a/ketcher-autotests/tests/Indigo-Tools/Aromatize-Dearomatize/aromatize-dearomatize.spec.ts-snapshots/Aromatize-Dearomatize-Tool-MolV2000-Save-cyclic-structures-with-a-circle-inside-the-cycle-1-chromium-linux.png and b/ketcher-autotests/tests/Indigo-Tools/Aromatize-Dearomatize/aromatize-dearomatize.spec.ts-snapshots/Aromatize-Dearomatize-Tool-MolV2000-Save-cyclic-structures-with-a-circle-inside-the-cycle-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Indigo-Tools/Aromatize-Dearomatize/aromatize-dearomatize.spec.ts-snapshots/Aromatize-Dearomatize-Tool-MolV3000-Save-cyclic-structures-with-a-circle-inside-the-cycle-1-chromium-linux.png b/ketcher-autotests/tests/Indigo-Tools/Aromatize-Dearomatize/aromatize-dearomatize.spec.ts-snapshots/Aromatize-Dearomatize-Tool-MolV3000-Save-cyclic-structures-with-a-circle-inside-the-cycle-1-chromium-linux.png
index c9d7ee6c13..a2f74478a3 100644
Binary files a/ketcher-autotests/tests/Indigo-Tools/Aromatize-Dearomatize/aromatize-dearomatize.spec.ts-snapshots/Aromatize-Dearomatize-Tool-MolV3000-Save-cyclic-structures-with-a-circle-inside-the-cycle-1-chromium-linux.png and b/ketcher-autotests/tests/Indigo-Tools/Aromatize-Dearomatize/aromatize-dearomatize.spec.ts-snapshots/Aromatize-Dearomatize-Tool-MolV3000-Save-cyclic-structures-with-a-circle-inside-the-cycle-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Indigo-Tools/Aromatize-Dearomatize/aromatize-dearomatize.spec.ts-snapshots/Aromatize-Dearomatize-Tool-Non-aromatic-structures---Single-bonds-only-1-chromium-linux.png b/ketcher-autotests/tests/Indigo-Tools/Aromatize-Dearomatize/aromatize-dearomatize.spec.ts-snapshots/Aromatize-Dearomatize-Tool-Non-aromatic-structures---Single-bonds-only-1-chromium-linux.png
index 61be46bd44..68ab881d5c 100644
Binary files a/ketcher-autotests/tests/Indigo-Tools/Aromatize-Dearomatize/aromatize-dearomatize.spec.ts-snapshots/Aromatize-Dearomatize-Tool-Non-aromatic-structures---Single-bonds-only-1-chromium-linux.png and b/ketcher-autotests/tests/Indigo-Tools/Aromatize-Dearomatize/aromatize-dearomatize.spec.ts-snapshots/Aromatize-Dearomatize-Tool-Non-aromatic-structures---Single-bonds-only-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Indigo-Tools/Aromatize-Dearomatize/aromatize-dearomatize.spec.ts-snapshots/Aromatize-Dearomatize-Tool-Non-aromatic-structures---Single-bonds-only-2-chromium-linux.png b/ketcher-autotests/tests/Indigo-Tools/Aromatize-Dearomatize/aromatize-dearomatize.spec.ts-snapshots/Aromatize-Dearomatize-Tool-Non-aromatic-structures---Single-bonds-only-2-chromium-linux.png
index 85f17c4e81..3ff868e89c 100644
Binary files a/ketcher-autotests/tests/Indigo-Tools/Aromatize-Dearomatize/aromatize-dearomatize.spec.ts-snapshots/Aromatize-Dearomatize-Tool-Non-aromatic-structures---Single-bonds-only-2-chromium-linux.png and b/ketcher-autotests/tests/Indigo-Tools/Aromatize-Dearomatize/aromatize-dearomatize.spec.ts-snapshots/Aromatize-Dearomatize-Tool-Non-aromatic-structures---Single-bonds-only-2-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Indigo-Tools/Aromatize-Dearomatize/aromatize-dearomatize.spec.ts-snapshots/Aromatize-Dearomatize-Tool-Non-aromatic-structures---interchanged-Single-and-Double-bonds-1-chromium-linux.png b/ketcher-autotests/tests/Indigo-Tools/Aromatize-Dearomatize/aromatize-dearomatize.spec.ts-snapshots/Aromatize-Dearomatize-Tool-Non-aromatic-structures---interchanged-Single-and-Double-bonds-1-chromium-linux.png
index e1793403e4..a3c2523e85 100644
Binary files a/ketcher-autotests/tests/Indigo-Tools/Aromatize-Dearomatize/aromatize-dearomatize.spec.ts-snapshots/Aromatize-Dearomatize-Tool-Non-aromatic-structures---interchanged-Single-and-Double-bonds-1-chromium-linux.png and b/ketcher-autotests/tests/Indigo-Tools/Aromatize-Dearomatize/aromatize-dearomatize.spec.ts-snapshots/Aromatize-Dearomatize-Tool-Non-aromatic-structures---interchanged-Single-and-Double-bonds-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Indigo-Tools/Aromatize-Dearomatize/aromatize-dearomatize.spec.ts-snapshots/Aromatize-Dearomatize-Tool-Non-aromatic-structures---interchanged-Single-and-Double-bonds-2-chromium-linux.png b/ketcher-autotests/tests/Indigo-Tools/Aromatize-Dearomatize/aromatize-dearomatize.spec.ts-snapshots/Aromatize-Dearomatize-Tool-Non-aromatic-structures---interchanged-Single-and-Double-bonds-2-chromium-linux.png
index e1793403e4..a00597ab8e 100644
Binary files a/ketcher-autotests/tests/Indigo-Tools/Aromatize-Dearomatize/aromatize-dearomatize.spec.ts-snapshots/Aromatize-Dearomatize-Tool-Non-aromatic-structures---interchanged-Single-and-Double-bonds-2-chromium-linux.png and b/ketcher-autotests/tests/Indigo-Tools/Aromatize-Dearomatize/aromatize-dearomatize.spec.ts-snapshots/Aromatize-Dearomatize-Tool-Non-aromatic-structures---interchanged-Single-and-Double-bonds-2-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Indigo-Tools/Aromatize-Dearomatize/aromatize-dearomatize.spec.ts-snapshots/Aromatize-Dearomatize-Tool-RxnV2000-Save-cyclic-structures-with-a-circle-inside-the-cycle-1-chromium-linux.png b/ketcher-autotests/tests/Indigo-Tools/Aromatize-Dearomatize/aromatize-dearomatize.spec.ts-snapshots/Aromatize-Dearomatize-Tool-RxnV2000-Save-cyclic-structures-with-a-circle-inside-the-cycle-1-chromium-linux.png
index 45965e5efb..261cc2450b 100644
Binary files a/ketcher-autotests/tests/Indigo-Tools/Aromatize-Dearomatize/aromatize-dearomatize.spec.ts-snapshots/Aromatize-Dearomatize-Tool-RxnV2000-Save-cyclic-structures-with-a-circle-inside-the-cycle-1-chromium-linux.png and b/ketcher-autotests/tests/Indigo-Tools/Aromatize-Dearomatize/aromatize-dearomatize.spec.ts-snapshots/Aromatize-Dearomatize-Tool-RxnV2000-Save-cyclic-structures-with-a-circle-inside-the-cycle-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Indigo-Tools/Aromatize-Dearomatize/aromatize-dearomatize.spec.ts-snapshots/Aromatize-Dearomatize-Tool-RxnV3000-Save-cyclic-structures-with-a-circle-inside-the-cycle-1-chromium-linux.png b/ketcher-autotests/tests/Indigo-Tools/Aromatize-Dearomatize/aromatize-dearomatize.spec.ts-snapshots/Aromatize-Dearomatize-Tool-RxnV3000-Save-cyclic-structures-with-a-circle-inside-the-cycle-1-chromium-linux.png
index 137b1d358b..080244c68b 100644
Binary files a/ketcher-autotests/tests/Indigo-Tools/Aromatize-Dearomatize/aromatize-dearomatize.spec.ts-snapshots/Aromatize-Dearomatize-Tool-RxnV3000-Save-cyclic-structures-with-a-circle-inside-the-cycle-1-chromium-linux.png and b/ketcher-autotests/tests/Indigo-Tools/Aromatize-Dearomatize/aromatize-dearomatize.spec.ts-snapshots/Aromatize-Dearomatize-Tool-RxnV3000-Save-cyclic-structures-with-a-circle-inside-the-cycle-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Indigo-Tools/Aromatize-Dearomatize/aromatize-dearomatize.spec.ts-snapshots/Aromatize-Dearomatize-Tool-Undo-Redo-Manipul-0c986-lic-structures-with-a-circle-inside-the-cycle-1-chromium-linux.png b/ketcher-autotests/tests/Indigo-Tools/Aromatize-Dearomatize/aromatize-dearomatize.spec.ts-snapshots/Aromatize-Dearomatize-Tool-Undo-Redo-Manipul-0c986-lic-structures-with-a-circle-inside-the-cycle-1-chromium-linux.png
index 1a53637a7b..78b5ef4597 100644
Binary files a/ketcher-autotests/tests/Indigo-Tools/Aromatize-Dearomatize/aromatize-dearomatize.spec.ts-snapshots/Aromatize-Dearomatize-Tool-Undo-Redo-Manipul-0c986-lic-structures-with-a-circle-inside-the-cycle-1-chromium-linux.png and b/ketcher-autotests/tests/Indigo-Tools/Aromatize-Dearomatize/aromatize-dearomatize.spec.ts-snapshots/Aromatize-Dearomatize-Tool-Undo-Redo-Manipul-0c986-lic-structures-with-a-circle-inside-the-cycle-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Indigo-Tools/Aromatize-Dearomatize/aromatize-dearomatize.spec.ts-snapshots/Aromatize-Dearomatize-Tool-Undo-Redo-Manipul-72b71-lic-structures-with-a-circle-inside-the-cycle-2-chromium-linux.png b/ketcher-autotests/tests/Indigo-Tools/Aromatize-Dearomatize/aromatize-dearomatize.spec.ts-snapshots/Aromatize-Dearomatize-Tool-Undo-Redo-Manipul-72b71-lic-structures-with-a-circle-inside-the-cycle-2-chromium-linux.png
index 410ab42568..2fffb3189d 100644
Binary files a/ketcher-autotests/tests/Indigo-Tools/Aromatize-Dearomatize/aromatize-dearomatize.spec.ts-snapshots/Aromatize-Dearomatize-Tool-Undo-Redo-Manipul-72b71-lic-structures-with-a-circle-inside-the-cycle-2-chromium-linux.png and b/ketcher-autotests/tests/Indigo-Tools/Aromatize-Dearomatize/aromatize-dearomatize.spec.ts-snapshots/Aromatize-Dearomatize-Tool-Undo-Redo-Manipul-72b71-lic-structures-with-a-circle-inside-the-cycle-2-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Indigo-Tools/Calculate-CIP-Tool/calculate-cip-tool.spec.ts-snapshots/Indigo-Tools---Calculate-CIP-Tool-1-structure-7ded6-tereo-labels-various-structure-combinations-1-chromium-linux.png b/ketcher-autotests/tests/Indigo-Tools/Calculate-CIP-Tool/calculate-cip-tool.spec.ts-snapshots/Indigo-Tools---Calculate-CIP-Tool-1-structure-7ded6-tereo-labels-various-structure-combinations-1-chromium-linux.png
index ec8747746b..a5939bf6c6 100644
Binary files a/ketcher-autotests/tests/Indigo-Tools/Calculate-CIP-Tool/calculate-cip-tool.spec.ts-snapshots/Indigo-Tools---Calculate-CIP-Tool-1-structure-7ded6-tereo-labels-various-structure-combinations-1-chromium-linux.png and b/ketcher-autotests/tests/Indigo-Tools/Calculate-CIP-Tool/calculate-cip-tool.spec.ts-snapshots/Indigo-Tools---Calculate-CIP-Tool-1-structure-7ded6-tereo-labels-various-structure-combinations-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Indigo-Tools/Calculate-CIP-Tool/calculate-cip-tool.spec.ts-snapshots/Indigo-Tools---Calculate-CIP-Tool-2-structure-88a7a-tereo-labels-various-structure-combinations-1-chromium-linux.png b/ketcher-autotests/tests/Indigo-Tools/Calculate-CIP-Tool/calculate-cip-tool.spec.ts-snapshots/Indigo-Tools---Calculate-CIP-Tool-2-structure-88a7a-tereo-labels-various-structure-combinations-1-chromium-linux.png
index 47a2e92239..da4aa9dd61 100644
Binary files a/ketcher-autotests/tests/Indigo-Tools/Calculate-CIP-Tool/calculate-cip-tool.spec.ts-snapshots/Indigo-Tools---Calculate-CIP-Tool-2-structure-88a7a-tereo-labels-various-structure-combinations-1-chromium-linux.png and b/ketcher-autotests/tests/Indigo-Tools/Calculate-CIP-Tool/calculate-cip-tool.spec.ts-snapshots/Indigo-Tools---Calculate-CIP-Tool-2-structure-88a7a-tereo-labels-various-structure-combinations-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Indigo-Tools/Calculate-CIP-Tool/calculate-cip-tool.spec.ts-snapshots/Indigo-Tools---Calculate-CIP-Tool-5-structure-219bb-tereo-labels-various-structure-combinations-1-chromium-linux.png b/ketcher-autotests/tests/Indigo-Tools/Calculate-CIP-Tool/calculate-cip-tool.spec.ts-snapshots/Indigo-Tools---Calculate-CIP-Tool-5-structure-219bb-tereo-labels-various-structure-combinations-1-chromium-linux.png
index b9149bef2c..2c1b81bb55 100644
Binary files a/ketcher-autotests/tests/Indigo-Tools/Calculate-CIP-Tool/calculate-cip-tool.spec.ts-snapshots/Indigo-Tools---Calculate-CIP-Tool-5-structure-219bb-tereo-labels-various-structure-combinations-1-chromium-linux.png and b/ketcher-autotests/tests/Indigo-Tools/Calculate-CIP-Tool/calculate-cip-tool.spec.ts-snapshots/Indigo-Tools---Calculate-CIP-Tool-5-structure-219bb-tereo-labels-various-structure-combinations-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Indigo-Tools/Calculate-CIP-Tool/calculate-cip-tool.spec.ts-snapshots/Indigo-Tools---Calculate-CIP-Tool-6-structure-45bb8-tereo-labels-various-structure-combinations-1-chromium-linux.png b/ketcher-autotests/tests/Indigo-Tools/Calculate-CIP-Tool/calculate-cip-tool.spec.ts-snapshots/Indigo-Tools---Calculate-CIP-Tool-6-structure-45bb8-tereo-labels-various-structure-combinations-1-chromium-linux.png
index 932c20ce08..22ebecb83a 100644
Binary files a/ketcher-autotests/tests/Indigo-Tools/Calculate-CIP-Tool/calculate-cip-tool.spec.ts-snapshots/Indigo-Tools---Calculate-CIP-Tool-6-structure-45bb8-tereo-labels-various-structure-combinations-1-chromium-linux.png and b/ketcher-autotests/tests/Indigo-Tools/Calculate-CIP-Tool/calculate-cip-tool.spec.ts-snapshots/Indigo-Tools---Calculate-CIP-Tool-6-structure-45bb8-tereo-labels-various-structure-combinations-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Indigo-Tools/Calculate-CIP-Tool/calculate-cip-tool.spec.ts-snapshots/Indigo-Tools---Calculate-CIP-Tool-Aromatize-Undo-with-structure-that-contain-stereo-labels-1-chromium-linux.png b/ketcher-autotests/tests/Indigo-Tools/Calculate-CIP-Tool/calculate-cip-tool.spec.ts-snapshots/Indigo-Tools---Calculate-CIP-Tool-Aromatize-Undo-with-structure-that-contain-stereo-labels-1-chromium-linux.png
index 3426bf4af9..245875e75e 100644
Binary files a/ketcher-autotests/tests/Indigo-Tools/Calculate-CIP-Tool/calculate-cip-tool.spec.ts-snapshots/Indigo-Tools---Calculate-CIP-Tool-Aromatize-Undo-with-structure-that-contain-stereo-labels-1-chromium-linux.png and b/ketcher-autotests/tests/Indigo-Tools/Calculate-CIP-Tool/calculate-cip-tool.spec.ts-snapshots/Indigo-Tools---Calculate-CIP-Tool-Aromatize-Undo-with-structure-that-contain-stereo-labels-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Indigo-Tools/Calculate-CIP-Tool/calculate-cip-tool.spec.ts-snapshots/Indigo-Tools---Calculate-CIP-Tool-Aromatize-Undo-with-structure-that-contain-stereo-labels-2-chromium-linux.png b/ketcher-autotests/tests/Indigo-Tools/Calculate-CIP-Tool/calculate-cip-tool.spec.ts-snapshots/Indigo-Tools---Calculate-CIP-Tool-Aromatize-Undo-with-structure-that-contain-stereo-labels-2-chromium-linux.png
index 9dea91e084..c165b13b4b 100644
Binary files a/ketcher-autotests/tests/Indigo-Tools/Calculate-CIP-Tool/calculate-cip-tool.spec.ts-snapshots/Indigo-Tools---Calculate-CIP-Tool-Aromatize-Undo-with-structure-that-contain-stereo-labels-2-chromium-linux.png and b/ketcher-autotests/tests/Indigo-Tools/Calculate-CIP-Tool/calculate-cip-tool.spec.ts-snapshots/Indigo-Tools---Calculate-CIP-Tool-Aromatize-Undo-with-structure-that-contain-stereo-labels-2-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Indigo-Tools/Calculate-CIP-Tool/calculate-cip-tool.spec.ts-snapshots/Indigo-Tools---Calculate-CIP-Tool-Aromatize-Undo-with-structure-that-contain-stereo-labels-3-chromium-linux.png b/ketcher-autotests/tests/Indigo-Tools/Calculate-CIP-Tool/calculate-cip-tool.spec.ts-snapshots/Indigo-Tools---Calculate-CIP-Tool-Aromatize-Undo-with-structure-that-contain-stereo-labels-3-chromium-linux.png
index 51e0c71c31..43d5d8cffe 100644
Binary files a/ketcher-autotests/tests/Indigo-Tools/Calculate-CIP-Tool/calculate-cip-tool.spec.ts-snapshots/Indigo-Tools---Calculate-CIP-Tool-Aromatize-Undo-with-structure-that-contain-stereo-labels-3-chromium-linux.png and b/ketcher-autotests/tests/Indigo-Tools/Calculate-CIP-Tool/calculate-cip-tool.spec.ts-snapshots/Indigo-Tools---Calculate-CIP-Tool-Aromatize-Undo-with-structure-that-contain-stereo-labels-3-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Indigo-Tools/Calculate-CIP-Tool/calculate-cip-tool.spec.ts-snapshots/Indigo-Tools---Calculate-CIP-Tool-Erase-atom--36b50-nipulations-with-structure-with-stereo-labels-2-chromium-linux.png b/ketcher-autotests/tests/Indigo-Tools/Calculate-CIP-Tool/calculate-cip-tool.spec.ts-snapshots/Indigo-Tools---Calculate-CIP-Tool-Erase-atom--36b50-nipulations-with-structure-with-stereo-labels-2-chromium-linux.png
index 9e4ae78c89..4776ef68d3 100644
Binary files a/ketcher-autotests/tests/Indigo-Tools/Calculate-CIP-Tool/calculate-cip-tool.spec.ts-snapshots/Indigo-Tools---Calculate-CIP-Tool-Erase-atom--36b50-nipulations-with-structure-with-stereo-labels-2-chromium-linux.png and b/ketcher-autotests/tests/Indigo-Tools/Calculate-CIP-Tool/calculate-cip-tool.spec.ts-snapshots/Indigo-Tools---Calculate-CIP-Tool-Erase-atom--36b50-nipulations-with-structure-with-stereo-labels-2-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Indigo-Tools/Calculate-CIP-Tool/calculate-cip-tool.spec.ts-snapshots/Indigo-Tools---Calculate-CIP-Tool-Layout-Undo-with-structure-that-contain-stereo-labels-2-chromium-linux.png b/ketcher-autotests/tests/Indigo-Tools/Calculate-CIP-Tool/calculate-cip-tool.spec.ts-snapshots/Indigo-Tools---Calculate-CIP-Tool-Layout-Undo-with-structure-that-contain-stereo-labels-2-chromium-linux.png
index fc644c7207..c82adb192e 100644
Binary files a/ketcher-autotests/tests/Indigo-Tools/Calculate-CIP-Tool/calculate-cip-tool.spec.ts-snapshots/Indigo-Tools---Calculate-CIP-Tool-Layout-Undo-with-structure-that-contain-stereo-labels-2-chromium-linux.png and b/ketcher-autotests/tests/Indigo-Tools/Calculate-CIP-Tool/calculate-cip-tool.spec.ts-snapshots/Indigo-Tools---Calculate-CIP-Tool-Layout-Undo-with-structure-that-contain-stereo-labels-2-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Indigo-Tools/Calculate-CIP-Tool/calculate-cip-tool.spec.ts-snapshots/Indigo-Tools---Calculate-CIP-Tool-Operation-wi-ce307-ture-including-stereo-properties-R-S-labels-1-chromium-linux.png b/ketcher-autotests/tests/Indigo-Tools/Calculate-CIP-Tool/calculate-cip-tool.spec.ts-snapshots/Indigo-Tools---Calculate-CIP-Tool-Operation-wi-ce307-ture-including-stereo-properties-R-S-labels-1-chromium-linux.png
index d9a09fccf7..14ac4ba781 100644
Binary files a/ketcher-autotests/tests/Indigo-Tools/Calculate-CIP-Tool/calculate-cip-tool.spec.ts-snapshots/Indigo-Tools---Calculate-CIP-Tool-Operation-wi-ce307-ture-including-stereo-properties-R-S-labels-1-chromium-linux.png and b/ketcher-autotests/tests/Indigo-Tools/Calculate-CIP-Tool/calculate-cip-tool.spec.ts-snapshots/Indigo-Tools---Calculate-CIP-Tool-Operation-wi-ce307-ture-including-stereo-properties-R-S-labels-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Indigo-Tools/Calculate-CIP-Tool/calculate-cip-tool.spec.ts-snapshots/Indigo-Tools---Calculate-CIP-Tool-Operation-wi-eeefa-ture-including-stereo-properties-E-Z-labels-1-chromium-linux.png b/ketcher-autotests/tests/Indigo-Tools/Calculate-CIP-Tool/calculate-cip-tool.spec.ts-snapshots/Indigo-Tools---Calculate-CIP-Tool-Operation-wi-eeefa-ture-including-stereo-properties-E-Z-labels-1-chromium-linux.png
index ed3bc7f565..61a6fcc309 100644
Binary files a/ketcher-autotests/tests/Indigo-Tools/Calculate-CIP-Tool/calculate-cip-tool.spec.ts-snapshots/Indigo-Tools---Calculate-CIP-Tool-Operation-wi-eeefa-ture-including-stereo-properties-E-Z-labels-1-chromium-linux.png and b/ketcher-autotests/tests/Indigo-Tools/Calculate-CIP-Tool/calculate-cip-tool.spec.ts-snapshots/Indigo-Tools---Calculate-CIP-Tool-Operation-wi-eeefa-ture-including-stereo-properties-E-Z-labels-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Indigo-Tools/Calculate-CIP-Tool/calculate-cip-tool.spec.ts-snapshots/Indigo-Tools---Calculate-CIP-Tool-Operation-with-a-structure-without-stereo-properties-1-chromium-linux.png b/ketcher-autotests/tests/Indigo-Tools/Calculate-CIP-Tool/calculate-cip-tool.spec.ts-snapshots/Indigo-Tools---Calculate-CIP-Tool-Operation-with-a-structure-without-stereo-properties-1-chromium-linux.png
index 193df92f63..360c1c042d 100644
Binary files a/ketcher-autotests/tests/Indigo-Tools/Calculate-CIP-Tool/calculate-cip-tool.spec.ts-snapshots/Indigo-Tools---Calculate-CIP-Tool-Operation-with-a-structure-without-stereo-properties-1-chromium-linux.png and b/ketcher-autotests/tests/Indigo-Tools/Calculate-CIP-Tool/calculate-cip-tool.spec.ts-snapshots/Indigo-Tools---Calculate-CIP-Tool-Operation-with-a-structure-without-stereo-properties-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Indigo-Tools/Calculated-Values-Tool/calculated-values.spec.ts-snapshots/Calculated-Values-Tools-Calculate-reaction-1-chromium-linux.png b/ketcher-autotests/tests/Indigo-Tools/Calculated-Values-Tool/calculated-values.spec.ts-snapshots/Calculated-Values-Tools-Calculate-reaction-1-chromium-linux.png
index 637c8ab243..b5b7e6b04e 100644
Binary files a/ketcher-autotests/tests/Indigo-Tools/Calculated-Values-Tool/calculated-values.spec.ts-snapshots/Calculated-Values-Tools-Calculate-reaction-1-chromium-linux.png and b/ketcher-autotests/tests/Indigo-Tools/Calculated-Values-Tool/calculated-values.spec.ts-snapshots/Calculated-Values-Tools-Calculate-reaction-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Indigo-Tools/Calculated-Values-Tool/calculated-values.spec.ts-snapshots/Calculated-Values-Tools-Calculate-reaction-2-chromium-linux.png b/ketcher-autotests/tests/Indigo-Tools/Calculated-Values-Tool/calculated-values.spec.ts-snapshots/Calculated-Values-Tools-Calculate-reaction-2-chromium-linux.png
index aa947a1681..0f4f3ed3d6 100644
Binary files a/ketcher-autotests/tests/Indigo-Tools/Calculated-Values-Tool/calculated-values.spec.ts-snapshots/Calculated-Values-Tools-Calculate-reaction-2-chromium-linux.png and b/ketcher-autotests/tests/Indigo-Tools/Calculated-Values-Tool/calculated-values.spec.ts-snapshots/Calculated-Values-Tools-Calculate-reaction-2-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Indigo-Tools/Calculated-Values-Tool/calculated-values.spec.ts-snapshots/Calculated-Values-Tools-Calculation-for-several-reaction-components-1-chromium-linux.png b/ketcher-autotests/tests/Indigo-Tools/Calculated-Values-Tool/calculated-values.spec.ts-snapshots/Calculated-Values-Tools-Calculation-for-several-reaction-components-1-chromium-linux.png
index 93a5ccc842..7ef9814c8d 100644
Binary files a/ketcher-autotests/tests/Indigo-Tools/Calculated-Values-Tool/calculated-values.spec.ts-snapshots/Calculated-Values-Tools-Calculation-for-several-reaction-components-1-chromium-linux.png and b/ketcher-autotests/tests/Indigo-Tools/Calculated-Values-Tool/calculated-values.spec.ts-snapshots/Calculated-Values-Tools-Calculation-for-several-reaction-components-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Indigo-Tools/Calculated-Values-Tool/calculated-values.spec.ts-snapshots/Calculated-Values-Tools-Calculation-for-several-reaction-components-part-of-structure-1-chromium-linux.png b/ketcher-autotests/tests/Indigo-Tools/Calculated-Values-Tool/calculated-values.spec.ts-snapshots/Calculated-Values-Tools-Calculation-for-several-reaction-components-part-of-structure-1-chromium-linux.png
index 224d6e75aa..631a835f98 100644
Binary files a/ketcher-autotests/tests/Indigo-Tools/Calculated-Values-Tool/calculated-values.spec.ts-snapshots/Calculated-Values-Tools-Calculation-for-several-reaction-components-part-of-structure-1-chromium-linux.png and b/ketcher-autotests/tests/Indigo-Tools/Calculated-Values-Tool/calculated-values.spec.ts-snapshots/Calculated-Values-Tools-Calculation-for-several-reaction-components-part-of-structure-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Indigo-Tools/Calculated-Values-Tool/calculated-values.spec.ts-snapshots/Calculated-Values-Tools-Calculation-for-structure-with-S-group---Superatom-abbreviation-1-chromium-linux.png b/ketcher-autotests/tests/Indigo-Tools/Calculated-Values-Tool/calculated-values.spec.ts-snapshots/Calculated-Values-Tools-Calculation-for-structure-with-S-group---Superatom-abbreviation-1-chromium-linux.png
index e8aa2d4ce2..fb58e6d22b 100644
Binary files a/ketcher-autotests/tests/Indigo-Tools/Calculated-Values-Tool/calculated-values.spec.ts-snapshots/Calculated-Values-Tools-Calculation-for-structure-with-S-group---Superatom-abbreviation-1-chromium-linux.png and b/ketcher-autotests/tests/Indigo-Tools/Calculated-Values-Tool/calculated-values.spec.ts-snapshots/Calculated-Values-Tools-Calculation-for-structure-with-S-group---Superatom-abbreviation-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Indigo-Tools/Calculated-Values-Tool/calculated-values.spec.ts-snapshots/Calculated-Values-Tools-Calculation-of-exact-mass-for-the-reaction-components-1-chromium-linux.png b/ketcher-autotests/tests/Indigo-Tools/Calculated-Values-Tool/calculated-values.spec.ts-snapshots/Calculated-Values-Tools-Calculation-of-exact-mass-for-the-reaction-components-1-chromium-linux.png
index 10c2764056..5e64099da5 100644
Binary files a/ketcher-autotests/tests/Indigo-Tools/Calculated-Values-Tool/calculated-values.spec.ts-snapshots/Calculated-Values-Tools-Calculation-of-exact-mass-for-the-reaction-components-1-chromium-linux.png and b/ketcher-autotests/tests/Indigo-Tools/Calculated-Values-Tool/calculated-values.spec.ts-snapshots/Calculated-Values-Tools-Calculation-of-exact-mass-for-the-reaction-components-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Indigo-Tools/Calculated-Values-Tool/calculated-values.spec.ts-snapshots/Calculated-Values-Tools-Calculations-for-Rgroup-member-1-chromium-linux.png b/ketcher-autotests/tests/Indigo-Tools/Calculated-Values-Tool/calculated-values.spec.ts-snapshots/Calculated-Values-Tools-Calculations-for-Rgroup-member-1-chromium-linux.png
index d5acf354c6..d0ad9e5bd0 100644
Binary files a/ketcher-autotests/tests/Indigo-Tools/Calculated-Values-Tool/calculated-values.spec.ts-snapshots/Calculated-Values-Tools-Calculations-for-Rgroup-member-1-chromium-linux.png and b/ketcher-autotests/tests/Indigo-Tools/Calculated-Values-Tool/calculated-values.spec.ts-snapshots/Calculated-Values-Tools-Calculations-for-Rgroup-member-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Indigo-Tools/Calculated-Values-Tool/calculated-values.spec.ts-snapshots/Calculated-Values-Tools-Calculations-for-Rgroup-member-select-part-of-structure-1-chromium-linux.png b/ketcher-autotests/tests/Indigo-Tools/Calculated-Values-Tool/calculated-values.spec.ts-snapshots/Calculated-Values-Tools-Calculations-for-Rgroup-member-select-part-of-structure-1-chromium-linux.png
index 21eae3fee7..50f97cfd4f 100644
Binary files a/ketcher-autotests/tests/Indigo-Tools/Calculated-Values-Tool/calculated-values.spec.ts-snapshots/Calculated-Values-Tools-Calculations-for-Rgroup-member-select-part-of-structure-1-chromium-linux.png and b/ketcher-autotests/tests/Indigo-Tools/Calculated-Values-Tool/calculated-values.spec.ts-snapshots/Calculated-Values-Tools-Calculations-for-Rgroup-member-select-part-of-structure-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts b/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts
index 78b1896ee2..a9188a94c8 100644
--- a/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts
+++ b/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts
@@ -9,6 +9,7 @@ import {
   delay,
   takeEditorScreenshot,
   DELAY_IN_SECONDS,
+  waitForLoad,
 } from '@utils';
 
 test.describe('Indigo Tools - Clean Tools', () => {
@@ -41,7 +42,9 @@ test.describe('Indigo Tools - Clean Tools', () => {
    */
     await selectTopPanelButton(TopPanelButton.Open, page);
     await openFile('different-angle-fr.mol', page);
-    await pressButton(page, 'Add to Canvas');
+    await waitForLoad(page, async () => {
+      await pressButton(page, 'Add to Canvas');
+    });
     // Large structure. Delay is necessary here
     await delay(DELAY_IN_SECONDS.FOUR);
     await clickInTheMiddleOfTheScreen(page);
diff --git a/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts-snapshots/Indigo-Tools---Clean-Tools-Clean-Queries-structure-1-chromium-linux.png b/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts-snapshots/Indigo-Tools---Clean-Tools-Clean-Queries-structure-1-chromium-linux.png
index 46806787c6..364ed6d58f 100644
Binary files a/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts-snapshots/Indigo-Tools---Clean-Tools-Clean-Queries-structure-1-chromium-linux.png and b/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts-snapshots/Indigo-Tools---Clean-Tools-Clean-Queries-structure-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts-snapshots/Indigo-Tools---Clean-Tools-Clean-Queries-structure-2-chromium-linux.png b/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts-snapshots/Indigo-Tools---Clean-Tools-Clean-Queries-structure-2-chromium-linux.png
index 87c1e68611..b31a6277f6 100644
Binary files a/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts-snapshots/Indigo-Tools---Clean-Tools-Clean-Queries-structure-2-chromium-linux.png and b/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts-snapshots/Indigo-Tools---Clean-Tools-Clean-Queries-structure-2-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts-snapshots/Indigo-Tools---Clean-Tools-Clean-Up-action-on-a-structures-with-Attachment-point-1-chromium-linux.png b/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts-snapshots/Indigo-Tools---Clean-Tools-Clean-Up-action-on-a-structures-with-Attachment-point-1-chromium-linux.png
index 8cbb390d64..88bf48271f 100644
Binary files a/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts-snapshots/Indigo-Tools---Clean-Tools-Clean-Up-action-on-a-structures-with-Attachment-point-1-chromium-linux.png and b/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts-snapshots/Indigo-Tools---Clean-Tools-Clean-Up-action-on-a-structures-with-Attachment-point-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts-snapshots/Indigo-Tools---Clean-Tools-Clean-bonds-angles-1-chromium-linux.png b/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts-snapshots/Indigo-Tools---Clean-Tools-Clean-bonds-angles-1-chromium-linux.png
index bc2cf7c052..3222a14c7a 100644
Binary files a/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts-snapshots/Indigo-Tools---Clean-Tools-Clean-bonds-angles-1-chromium-linux.png and b/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts-snapshots/Indigo-Tools---Clean-Tools-Clean-bonds-angles-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts-snapshots/Indigo-Tools---Clean-Tools-Clean-bonds-angles-2-chromium-linux.png b/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts-snapshots/Indigo-Tools---Clean-Tools-Clean-bonds-angles-2-chromium-linux.png
index d9cd433e87..8065d1fdfa 100644
Binary files a/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts-snapshots/Indigo-Tools---Clean-Tools-Clean-bonds-angles-2-chromium-linux.png and b/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts-snapshots/Indigo-Tools---Clean-Tools-Clean-bonds-angles-2-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts-snapshots/Indigo-Tools---Clean-Tools-Clean-bonds-lenght-1-chromium-linux.png b/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts-snapshots/Indigo-Tools---Clean-Tools-Clean-bonds-lenght-1-chromium-linux.png
index 43ac0f9b11..3ad7627928 100644
Binary files a/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts-snapshots/Indigo-Tools---Clean-Tools-Clean-bonds-lenght-1-chromium-linux.png and b/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts-snapshots/Indigo-Tools---Clean-Tools-Clean-bonds-lenght-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts-snapshots/Indigo-Tools---Clean-Tools-Clean-bonds-lenght-2-chromium-linux.png b/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts-snapshots/Indigo-Tools---Clean-Tools-Clean-bonds-lenght-2-chromium-linux.png
index 5009c53038..f411590ebf 100644
Binary files a/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts-snapshots/Indigo-Tools---Clean-Tools-Clean-bonds-lenght-2-chromium-linux.png and b/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts-snapshots/Indigo-Tools---Clean-Tools-Clean-bonds-lenght-2-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts-snapshots/Indigo-Tools---Clean-Tools-Clean-distorted-molecule-with-Clean-Up-tool-1-chromium-linux.png b/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts-snapshots/Indigo-Tools---Clean-Tools-Clean-distorted-molecule-with-Clean-Up-tool-1-chromium-linux.png
index 9c32444dc9..4a07d0f714 100644
Binary files a/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts-snapshots/Indigo-Tools---Clean-Tools-Clean-distorted-molecule-with-Clean-Up-tool-1-chromium-linux.png and b/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts-snapshots/Indigo-Tools---Clean-Tools-Clean-distorted-molecule-with-Clean-Up-tool-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts-snapshots/Indigo-Tools---Clean-Tools-Clean-distorted-molecule-with-Layout-tool-1-chromium-linux.png b/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts-snapshots/Indigo-Tools---Clean-Tools-Clean-distorted-molecule-with-Layout-tool-1-chromium-linux.png
index a2bf874674..1d8ea4d108 100644
Binary files a/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts-snapshots/Indigo-Tools---Clean-Tools-Clean-distorted-molecule-with-Layout-tool-1-chromium-linux.png and b/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts-snapshots/Indigo-Tools---Clean-Tools-Clean-distorted-molecule-with-Layout-tool-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts-snapshots/Indigo-Tools---Clean-Tools-Cleaned-structure-is-placed-horizontally-1-chromium-linux.png b/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts-snapshots/Indigo-Tools---Clean-Tools-Cleaned-structure-is-placed-horizontally-1-chromium-linux.png
index 9fa4c42720..b7c48bd67d 100644
Binary files a/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts-snapshots/Indigo-Tools---Clean-Tools-Cleaned-structure-is-placed-horizontally-1-chromium-linux.png and b/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts-snapshots/Indigo-Tools---Clean-Tools-Cleaned-structure-is-placed-horizontally-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts-snapshots/Indigo-Tools---Clean-Tools-Cleaned-structure-is-placed-horizontally-2-chromium-linux.png b/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts-snapshots/Indigo-Tools---Clean-Tools-Cleaned-structure-is-placed-horizontally-2-chromium-linux.png
index d94a1cab87..28c603dc35 100644
Binary files a/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts-snapshots/Indigo-Tools---Clean-Tools-Cleaned-structure-is-placed-horizontally-2-chromium-linux.png and b/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts-snapshots/Indigo-Tools---Clean-Tools-Cleaned-structure-is-placed-horizontally-2-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts-snapshots/Indigo-Tools---Clean-Tools-Layout-cyclic-structures-1-chromium-linux.png b/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts-snapshots/Indigo-Tools---Clean-Tools-Layout-cyclic-structures-1-chromium-linux.png
index acc04d7697..01ec3650f4 100644
Binary files a/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts-snapshots/Indigo-Tools---Clean-Tools-Layout-cyclic-structures-1-chromium-linux.png and b/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts-snapshots/Indigo-Tools---Clean-Tools-Layout-cyclic-structures-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts-snapshots/Indigo-Tools---Clean-Tools-Layout-several-structures-1-chromium-linux.png b/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts-snapshots/Indigo-Tools---Clean-Tools-Layout-several-structures-1-chromium-linux.png
index 3212c5783e..b916b03a3e 100644
Binary files a/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts-snapshots/Indigo-Tools---Clean-Tools-Layout-several-structures-1-chromium-linux.png and b/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts-snapshots/Indigo-Tools---Clean-Tools-Layout-several-structures-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts-snapshots/Indigo-Tools---Clean-Tools-Multiple-undo-1-chromium-linux.png b/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts-snapshots/Indigo-Tools---Clean-Tools-Multiple-undo-1-chromium-linux.png
index 0b9f593924..d98649657d 100644
Binary files a/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts-snapshots/Indigo-Tools---Clean-Tools-Multiple-undo-1-chromium-linux.png and b/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts-snapshots/Indigo-Tools---Clean-Tools-Multiple-undo-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts-snapshots/Indigo-Tools---Clean-Tools-Multiple-undo-2-chromium-linux.png b/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts-snapshots/Indigo-Tools---Clean-Tools-Multiple-undo-2-chromium-linux.png
index 1509a9ee0b..816c3d772c 100644
Binary files a/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts-snapshots/Indigo-Tools---Clean-Tools-Multiple-undo-2-chromium-linux.png and b/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts-snapshots/Indigo-Tools---Clean-Tools-Multiple-undo-2-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts-snapshots/Indigo-Tools---Clean-Tools-Multiple-undo-3-chromium-linux.png b/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts-snapshots/Indigo-Tools---Clean-Tools-Multiple-undo-3-chromium-linux.png
index e7a2366946..680f1b9cf2 100644
Binary files a/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts-snapshots/Indigo-Tools---Clean-Tools-Multiple-undo-3-chromium-linux.png and b/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts-snapshots/Indigo-Tools---Clean-Tools-Multiple-undo-3-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts-snapshots/Indigo-Tools---Clean-Tools-Structure-with-Mapping-1-chromium-linux.png b/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts-snapshots/Indigo-Tools---Clean-Tools-Structure-with-Mapping-1-chromium-linux.png
index ceca2f98a0..7c1055d59c 100644
Binary files a/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts-snapshots/Indigo-Tools---Clean-Tools-Structure-with-Mapping-1-chromium-linux.png and b/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts-snapshots/Indigo-Tools---Clean-Tools-Structure-with-Mapping-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts-snapshots/Indigo-Tools---Clean-Tools-Structure-with-Mapping-2-chromium-linux.png b/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts-snapshots/Indigo-Tools---Clean-Tools-Structure-with-Mapping-2-chromium-linux.png
index c34506e20f..454b2d341b 100644
Binary files a/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts-snapshots/Indigo-Tools---Clean-Tools-Structure-with-Mapping-2-chromium-linux.png and b/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts-snapshots/Indigo-Tools---Clean-Tools-Structure-with-Mapping-2-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts-snapshots/Indigo-Tools---Clean-Tools-Structure-with-R-Groups-2-chromium-linux.png b/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts-snapshots/Indigo-Tools---Clean-Tools-Structure-with-R-Groups-2-chromium-linux.png
index 513e4db3e0..c6b89dec15 100644
Binary files a/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts-snapshots/Indigo-Tools---Clean-Tools-Structure-with-R-Groups-2-chromium-linux.png and b/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts-snapshots/Indigo-Tools---Clean-Tools-Structure-with-R-Groups-2-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts-snapshots/Indigo-Tools---Clean-Tools-Structure-with-Stereochemistry-1-chromium-linux.png b/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts-snapshots/Indigo-Tools---Clean-Tools-Structure-with-Stereochemistry-1-chromium-linux.png
index aaefaade47..25b886ec29 100644
Binary files a/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts-snapshots/Indigo-Tools---Clean-Tools-Structure-with-Stereochemistry-1-chromium-linux.png and b/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts-snapshots/Indigo-Tools---Clean-Tools-Structure-with-Stereochemistry-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts-snapshots/Indigo-Tools---Clean-Tools-Structure-with-Stereochemistry-2-chromium-linux.png b/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts-snapshots/Indigo-Tools---Clean-Tools-Structure-with-Stereochemistry-2-chromium-linux.png
index 700cfabd46..4d3e0b0dff 100644
Binary files a/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts-snapshots/Indigo-Tools---Clean-Tools-Structure-with-Stereochemistry-2-chromium-linux.png and b/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts-snapshots/Indigo-Tools---Clean-Tools-Structure-with-Stereochemistry-2-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts-snapshots/Indigo-Tools---Clean-Tools-Structure-with-Stereolabels-1-chromium-linux.png b/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts-snapshots/Indigo-Tools---Clean-Tools-Structure-with-Stereolabels-1-chromium-linux.png
index 9af5565da1..ad48f4bf96 100644
Binary files a/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts-snapshots/Indigo-Tools---Clean-Tools-Structure-with-Stereolabels-1-chromium-linux.png and b/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts-snapshots/Indigo-Tools---Clean-Tools-Structure-with-Stereolabels-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts-snapshots/Indigo-Tools---Clean-Tools-Structure-with-Stereolabels-2-chromium-linux.png b/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts-snapshots/Indigo-Tools---Clean-Tools-Structure-with-Stereolabels-2-chromium-linux.png
index e44859513c..d0b9b92972 100644
Binary files a/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts-snapshots/Indigo-Tools---Clean-Tools-Structure-with-Stereolabels-2-chromium-linux.png and b/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts-snapshots/Indigo-Tools---Clean-Tools-Structure-with-Stereolabels-2-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Indigo-Tools/Enhanced-Stereochemistry/enhanced-stereochemistry.spec.ts-snapshots/Enhanced-Stereochemistry-Tool-Auto-fade-And-Or-center-labels-1-chromium-linux.png b/ketcher-autotests/tests/Indigo-Tools/Enhanced-Stereochemistry/enhanced-stereochemistry.spec.ts-snapshots/Enhanced-Stereochemistry-Tool-Auto-fade-And-Or-center-labels-1-chromium-linux.png
index f7e73a3cc9..ab7eef498e 100644
Binary files a/ketcher-autotests/tests/Indigo-Tools/Enhanced-Stereochemistry/enhanced-stereochemistry.spec.ts-snapshots/Enhanced-Stereochemistry-Tool-Auto-fade-And-Or-center-labels-1-chromium-linux.png and b/ketcher-autotests/tests/Indigo-Tools/Enhanced-Stereochemistry/enhanced-stereochemistry.spec.ts-snapshots/Enhanced-Stereochemistry-Tool-Auto-fade-And-Or-center-labels-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Indigo-Tools/Enhanced-Stereochemistry/enhanced-stereochemistry.spec.ts-snapshots/Enhanced-Stereochemistry-Tool-Auto-fade-And-Or-center-labels-2-chromium-linux.png b/ketcher-autotests/tests/Indigo-Tools/Enhanced-Stereochemistry/enhanced-stereochemistry.spec.ts-snapshots/Enhanced-Stereochemistry-Tool-Auto-fade-And-Or-center-labels-2-chromium-linux.png
index 21e2e95db0..08a5efa853 100644
Binary files a/ketcher-autotests/tests/Indigo-Tools/Enhanced-Stereochemistry/enhanced-stereochemistry.spec.ts-snapshots/Enhanced-Stereochemistry-Tool-Auto-fade-And-Or-center-labels-2-chromium-linux.png and b/ketcher-autotests/tests/Indigo-Tools/Enhanced-Stereochemistry/enhanced-stereochemistry.spec.ts-snapshots/Enhanced-Stereochemistry-Tool-Auto-fade-And-Or-center-labels-2-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Indigo-Tools/Enhanced-Stereochemistry/enhanced-stereochemistry.spec.ts-snapshots/Enhanced-Stereochemistry-Tool-Check-Enhanced-S-15224-ndow-for-two-structure-with-a-stereocenter-s-1-chromium-linux.png b/ketcher-autotests/tests/Indigo-Tools/Enhanced-Stereochemistry/enhanced-stereochemistry.spec.ts-snapshots/Enhanced-Stereochemistry-Tool-Check-Enhanced-S-15224-ndow-for-two-structure-with-a-stereocenter-s-1-chromium-linux.png
index 9491a6c11b..c0207cd340 100644
Binary files a/ketcher-autotests/tests/Indigo-Tools/Enhanced-Stereochemistry/enhanced-stereochemistry.spec.ts-snapshots/Enhanced-Stereochemistry-Tool-Check-Enhanced-S-15224-ndow-for-two-structure-with-a-stereocenter-s-1-chromium-linux.png and b/ketcher-autotests/tests/Indigo-Tools/Enhanced-Stereochemistry/enhanced-stereochemistry.spec.ts-snapshots/Enhanced-Stereochemistry-Tool-Check-Enhanced-S-15224-ndow-for-two-structure-with-a-stereocenter-s-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Indigo-Tools/Enhanced-Stereochemistry/enhanced-stereochemistry.spec.ts-snapshots/Enhanced-Stereochemistry-Tool-Color-stereogenic-centers---Bonds-Only-1-chromium-linux.png b/ketcher-autotests/tests/Indigo-Tools/Enhanced-Stereochemistry/enhanced-stereochemistry.spec.ts-snapshots/Enhanced-Stereochemistry-Tool-Color-stereogenic-centers---Bonds-Only-1-chromium-linux.png
index a65c9c0640..ede376d731 100644
Binary files a/ketcher-autotests/tests/Indigo-Tools/Enhanced-Stereochemistry/enhanced-stereochemistry.spec.ts-snapshots/Enhanced-Stereochemistry-Tool-Color-stereogenic-centers---Bonds-Only-1-chromium-linux.png and b/ketcher-autotests/tests/Indigo-Tools/Enhanced-Stereochemistry/enhanced-stereochemistry.spec.ts-snapshots/Enhanced-Stereochemistry-Tool-Color-stereogenic-centers---Bonds-Only-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Indigo-Tools/Enhanced-Stereochemistry/enhanced-stereochemistry.spec.ts-snapshots/Enhanced-Stereochemistry-Tool-Color-stereogenic-centers---Labels-and-Bonds-1-chromium-linux.png b/ketcher-autotests/tests/Indigo-Tools/Enhanced-Stereochemistry/enhanced-stereochemistry.spec.ts-snapshots/Enhanced-Stereochemistry-Tool-Color-stereogenic-centers---Labels-and-Bonds-1-chromium-linux.png
index 76cac566a1..672550cddf 100644
Binary files a/ketcher-autotests/tests/Indigo-Tools/Enhanced-Stereochemistry/enhanced-stereochemistry.spec.ts-snapshots/Enhanced-Stereochemistry-Tool-Color-stereogenic-centers---Labels-and-Bonds-1-chromium-linux.png and b/ketcher-autotests/tests/Indigo-Tools/Enhanced-Stereochemistry/enhanced-stereochemistry.spec.ts-snapshots/Enhanced-Stereochemistry-Tool-Color-stereogenic-centers---Labels-and-Bonds-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Indigo-Tools/Enhanced-Stereochemistry/enhanced-stereochemistry.spec.ts-snapshots/Enhanced-Stereochemistry-Tool-Color-stereogenic-centers---Off-1-chromium-linux.png b/ketcher-autotests/tests/Indigo-Tools/Enhanced-Stereochemistry/enhanced-stereochemistry.spec.ts-snapshots/Enhanced-Stereochemistry-Tool-Color-stereogenic-centers---Off-1-chromium-linux.png
index 3dd0740982..2a0f9cb3fa 100644
Binary files a/ketcher-autotests/tests/Indigo-Tools/Enhanced-Stereochemistry/enhanced-stereochemistry.spec.ts-snapshots/Enhanced-Stereochemistry-Tool-Color-stereogenic-centers---Off-1-chromium-linux.png and b/ketcher-autotests/tests/Indigo-Tools/Enhanced-Stereochemistry/enhanced-stereochemistry.spec.ts-snapshots/Enhanced-Stereochemistry-Tool-Color-stereogenic-centers---Off-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Indigo-Tools/Enhanced-Stereochemistry/enhanced-stereochemistry.spec.ts-snapshots/Enhanced-Stereochemistry-Tool-Edit-Absolute-flag-text-1-chromium-linux.png b/ketcher-autotests/tests/Indigo-Tools/Enhanced-Stereochemistry/enhanced-stereochemistry.spec.ts-snapshots/Enhanced-Stereochemistry-Tool-Edit-Absolute-flag-text-1-chromium-linux.png
index d8dfba313a..a6814625b6 100644
Binary files a/ketcher-autotests/tests/Indigo-Tools/Enhanced-Stereochemistry/enhanced-stereochemistry.spec.ts-snapshots/Enhanced-Stereochemistry-Tool-Edit-Absolute-flag-text-1-chromium-linux.png and b/ketcher-autotests/tests/Indigo-Tools/Enhanced-Stereochemistry/enhanced-stereochemistry.spec.ts-snapshots/Enhanced-Stereochemistry-Tool-Edit-Absolute-flag-text-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Indigo-Tools/Enhanced-Stereochemistry/enhanced-stereochemistry.spec.ts-snapshots/Enhanced-Stereochemistry-Tool-Hide-show-the-stereo-flag-1-chromium-linux.png b/ketcher-autotests/tests/Indigo-Tools/Enhanced-Stereochemistry/enhanced-stereochemistry.spec.ts-snapshots/Enhanced-Stereochemistry-Tool-Hide-show-the-stereo-flag-1-chromium-linux.png
index ed7d9e9ae9..c849511dc6 100644
Binary files a/ketcher-autotests/tests/Indigo-Tools/Enhanced-Stereochemistry/enhanced-stereochemistry.spec.ts-snapshots/Enhanced-Stereochemistry-Tool-Hide-show-the-stereo-flag-1-chromium-linux.png and b/ketcher-autotests/tests/Indigo-Tools/Enhanced-Stereochemistry/enhanced-stereochemistry.spec.ts-snapshots/Enhanced-Stereochemistry-Tool-Hide-show-the-stereo-flag-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Indigo-Tools/Enhanced-Stereochemistry/enhanced-stereochemistry.spec.ts-snapshots/Enhanced-Stereochemistry-Tool-Hide-show-the-stereo-flag-2-chromium-linux.png b/ketcher-autotests/tests/Indigo-Tools/Enhanced-Stereochemistry/enhanced-stereochemistry.spec.ts-snapshots/Enhanced-Stereochemistry-Tool-Hide-show-the-stereo-flag-2-chromium-linux.png
index 07eaa07d66..8fe80924f5 100644
Binary files a/ketcher-autotests/tests/Indigo-Tools/Enhanced-Stereochemistry/enhanced-stereochemistry.spec.ts-snapshots/Enhanced-Stereochemistry-Tool-Hide-show-the-stereo-flag-2-chromium-linux.png and b/ketcher-autotests/tests/Indigo-Tools/Enhanced-Stereochemistry/enhanced-stereochemistry.spec.ts-snapshots/Enhanced-Stereochemistry-Tool-Hide-show-the-stereo-flag-2-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Indigo-Tools/Enhanced-Stereochemistry/enhanced-stereochemistry.spec.ts-snapshots/Enhanced-Stereochemistry-Tool-Label-display-styles---Classic-1-chromium-linux.png b/ketcher-autotests/tests/Indigo-Tools/Enhanced-Stereochemistry/enhanced-stereochemistry.spec.ts-snapshots/Enhanced-Stereochemistry-Tool-Label-display-styles---Classic-1-chromium-linux.png
index 44a83e0beb..7b2c009c28 100644
Binary files a/ketcher-autotests/tests/Indigo-Tools/Enhanced-Stereochemistry/enhanced-stereochemistry.spec.ts-snapshots/Enhanced-Stereochemistry-Tool-Label-display-styles---Classic-1-chromium-linux.png and b/ketcher-autotests/tests/Indigo-Tools/Enhanced-Stereochemistry/enhanced-stereochemistry.spec.ts-snapshots/Enhanced-Stereochemistry-Tool-Label-display-styles---Classic-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Indigo-Tools/Enhanced-Stereochemistry/enhanced-stereochemistry.spec.ts-snapshots/Enhanced-Stereochemistry-Tool-Label-display-styles---Off-1-chromium-linux.png b/ketcher-autotests/tests/Indigo-Tools/Enhanced-Stereochemistry/enhanced-stereochemistry.spec.ts-snapshots/Enhanced-Stereochemistry-Tool-Label-display-styles---Off-1-chromium-linux.png
index b02fc34d76..7a1f9a0c47 100644
Binary files a/ketcher-autotests/tests/Indigo-Tools/Enhanced-Stereochemistry/enhanced-stereochemistry.spec.ts-snapshots/Enhanced-Stereochemistry-Tool-Label-display-styles---Off-1-chromium-linux.png and b/ketcher-autotests/tests/Indigo-Tools/Enhanced-Stereochemistry/enhanced-stereochemistry.spec.ts-snapshots/Enhanced-Stereochemistry-Tool-Label-display-styles---Off-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Indigo-Tools/Enhanced-Stereochemistry/enhanced-stereochemistry.spec.ts-snapshots/Enhanced-Stereochemistry-Tool-Label-display-styles---On-1-chromium-linux.png b/ketcher-autotests/tests/Indigo-Tools/Enhanced-Stereochemistry/enhanced-stereochemistry.spec.ts-snapshots/Enhanced-Stereochemistry-Tool-Label-display-styles---On-1-chromium-linux.png
index 44a83e0beb..7b2c009c28 100644
Binary files a/ketcher-autotests/tests/Indigo-Tools/Enhanced-Stereochemistry/enhanced-stereochemistry.spec.ts-snapshots/Enhanced-Stereochemistry-Tool-Label-display-styles---On-1-chromium-linux.png and b/ketcher-autotests/tests/Indigo-Tools/Enhanced-Stereochemistry/enhanced-stereochemistry.spec.ts-snapshots/Enhanced-Stereochemistry-Tool-Label-display-styles---On-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Indigo-Tools/Enhanced-Stereochemistry/enhanced-stereochemistry.spec.ts-snapshots/Enhanced-Stereochemistry-Tool-Radio-buttons-checked-1-chromium-linux.png b/ketcher-autotests/tests/Indigo-Tools/Enhanced-Stereochemistry/enhanced-stereochemistry.spec.ts-snapshots/Enhanced-Stereochemistry-Tool-Radio-buttons-checked-1-chromium-linux.png
index 99857a672f..3a708d35f2 100644
Binary files a/ketcher-autotests/tests/Indigo-Tools/Enhanced-Stereochemistry/enhanced-stereochemistry.spec.ts-snapshots/Enhanced-Stereochemistry-Tool-Radio-buttons-checked-1-chromium-linux.png and b/ketcher-autotests/tests/Indigo-Tools/Enhanced-Stereochemistry/enhanced-stereochemistry.spec.ts-snapshots/Enhanced-Stereochemistry-Tool-Radio-buttons-checked-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Indigo-Tools/Enhanced-Stereochemistry/enhanced-stereochemistry.spec.ts-snapshots/Enhanced-Stereochemistry-Tool-Radio-buttons-unchecked-1-chromium-linux.png b/ketcher-autotests/tests/Indigo-Tools/Enhanced-Stereochemistry/enhanced-stereochemistry.spec.ts-snapshots/Enhanced-Stereochemistry-Tool-Radio-buttons-unchecked-1-chromium-linux.png
index ae7a45f072..18889fa769 100644
Binary files a/ketcher-autotests/tests/Indigo-Tools/Enhanced-Stereochemistry/enhanced-stereochemistry.spec.ts-snapshots/Enhanced-Stereochemistry-Tool-Radio-buttons-unchecked-1-chromium-linux.png and b/ketcher-autotests/tests/Indigo-Tools/Enhanced-Stereochemistry/enhanced-stereochemistry.spec.ts-snapshots/Enhanced-Stereochemistry-Tool-Radio-buttons-unchecked-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Indigo-Tools/Enhanced-Stereochemistry/enhanced-stereochemistry.spec.ts-snapshots/Enhanced-Stereochemistry-Tool-Save-in-Molfile--3ffcf-e-of-the-structures-had-the-ABS-Chiral-Flag-1-chromium-linux.png b/ketcher-autotests/tests/Indigo-Tools/Enhanced-Stereochemistry/enhanced-stereochemistry.spec.ts-snapshots/Enhanced-Stereochemistry-Tool-Save-in-Molfile--3ffcf-e-of-the-structures-had-the-ABS-Chiral-Flag-1-chromium-linux.png
index ac338e7023..d438e1ed29 100644
Binary files a/ketcher-autotests/tests/Indigo-Tools/Enhanced-Stereochemistry/enhanced-stereochemistry.spec.ts-snapshots/Enhanced-Stereochemistry-Tool-Save-in-Molfile--3ffcf-e-of-the-structures-had-the-ABS-Chiral-Flag-1-chromium-linux.png and b/ketcher-autotests/tests/Indigo-Tools/Enhanced-Stereochemistry/enhanced-stereochemistry.spec.ts-snapshots/Enhanced-Stereochemistry-Tool-Save-in-Molfile--3ffcf-e-of-the-structures-had-the-ABS-Chiral-Flag-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Indigo-Tools/Enhanced-Stereochemistry/enhanced-stereochemistry.spec.ts-snapshots/Enhanced-Stereochemistry-Tool-Save-in-Molfile--d887f-he-saved-structures-had-the-ABS-Chiral-Flag-1-chromium-linux.png b/ketcher-autotests/tests/Indigo-Tools/Enhanced-Stereochemistry/enhanced-stereochemistry.spec.ts-snapshots/Enhanced-Stereochemistry-Tool-Save-in-Molfile--d887f-he-saved-structures-had-the-ABS-Chiral-Flag-1-chromium-linux.png
index 73798695ff..77fd05dd14 100644
Binary files a/ketcher-autotests/tests/Indigo-Tools/Enhanced-Stereochemistry/enhanced-stereochemistry.spec.ts-snapshots/Enhanced-Stereochemistry-Tool-Save-in-Molfile--d887f-he-saved-structures-had-the-ABS-Chiral-Flag-1-chromium-linux.png and b/ketcher-autotests/tests/Indigo-Tools/Enhanced-Stereochemistry/enhanced-stereochemistry.spec.ts-snapshots/Enhanced-Stereochemistry-Tool-Save-in-Molfile--d887f-he-saved-structures-had-the-ABS-Chiral-Flag-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Indigo-Tools/Enhanced-Stereochemistry/enhanced-stereochemistry.spec.ts-snapshots/Enhanced-Stereochemistry-Tool-Select-part-of--05e11-ndow-for-two-structure-with-a-stereocenter-s-1-chromium-linux.png b/ketcher-autotests/tests/Indigo-Tools/Enhanced-Stereochemistry/enhanced-stereochemistry.spec.ts-snapshots/Enhanced-Stereochemistry-Tool-Select-part-of--05e11-ndow-for-two-structure-with-a-stereocenter-s-1-chromium-linux.png
index d733c89f2e..d46da40d9b 100644
Binary files a/ketcher-autotests/tests/Indigo-Tools/Enhanced-Stereochemistry/enhanced-stereochemistry.spec.ts-snapshots/Enhanced-Stereochemistry-Tool-Select-part-of--05e11-ndow-for-two-structure-with-a-stereocenter-s-1-chromium-linux.png and b/ketcher-autotests/tests/Indigo-Tools/Enhanced-Stereochemistry/enhanced-stereochemistry.spec.ts-snapshots/Enhanced-Stereochemistry-Tool-Select-part-of--05e11-ndow-for-two-structure-with-a-stereocenter-s-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Macromolecule-editor/Chem-monomers/chem-library.spec.ts b/ketcher-autotests/tests/Macromolecule-editor/Chem-monomers/chem-library.spec.ts
new file mode 100644
index 0000000000..05a184c89f
--- /dev/null
+++ b/ketcher-autotests/tests/Macromolecule-editor/Chem-monomers/chem-library.spec.ts
@@ -0,0 +1,30 @@
+import { test, expect } from '@playwright/test';
+
+test.describe('Open Ketcher', () => {
+  test.beforeEach(async ({ page }) => {
+    await page.goto('');
+  });
+  test.skip('Switch to Polymer Editor', async ({ page }) => {
+    /* 
+    Test case: #2496 - chem monomer library
+    Description: Switch to Polymer Editor
+    */
+    await expect(page.getByTestId('PolymerToggler')).toBeVisible();
+    await page.getByTestId('PolymerToggler').click();
+
+    await expect(page.getByText('CHEM')).toBeVisible();
+  });
+
+  test.skip('Open Chem tab in library', async ({ page }) => {
+    /* 
+    Test case: #2496 - chem monomer library
+    Description: Open Chem tab in library
+    */
+    await page.getByTestId('PolymerToggler').click();
+    await page.getByText('CHEM').click();
+    await expect(page.getByText('A6OH')).toBeVisible();
+    await page.screenshot({
+      path: 'tests/Macromolecule-editor/screenshots/chem-library.png',
+    });
+  });
+});
diff --git a/ketcher-autotests/tests/Macromolecule-editor/screenshots/chem-library.png b/ketcher-autotests/tests/Macromolecule-editor/screenshots/chem-library.png
new file mode 100644
index 0000000000..fd7d37d8f8
Binary files /dev/null and b/ketcher-autotests/tests/Macromolecule-editor/screenshots/chem-library.png differ
diff --git a/ketcher-autotests/tests/R-group-tool/r-group-fragment-tool.spec.ts-snapshots/Open-Ketcher-Add-attachment-point-to-the-R-Group-member-1-chromium-linux.png b/ketcher-autotests/tests/R-group-tool/r-group-fragment-tool.spec.ts-snapshots/Open-Ketcher-Add-attachment-point-to-the-R-Group-member-1-chromium-linux.png
new file mode 100644
index 0000000000..0e7c993784
Binary files /dev/null and b/ketcher-autotests/tests/R-group-tool/r-group-fragment-tool.spec.ts-snapshots/Open-Ketcher-Add-attachment-point-to-the-R-Group-member-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/R-group-tool/r-group-fragment-tool.spec.ts-snapshots/Open-Ketcher-Change-R-Group-definition-for-multiple-R-Group-members-1-chromium-linux.png b/ketcher-autotests/tests/R-group-tool/r-group-fragment-tool.spec.ts-snapshots/Open-Ketcher-Change-R-Group-definition-for-multiple-R-Group-members-1-chromium-linux.png
index baaef005d0..71c72223af 100644
Binary files a/ketcher-autotests/tests/R-group-tool/r-group-fragment-tool.spec.ts-snapshots/Open-Ketcher-Change-R-Group-definition-for-multiple-R-Group-members-1-chromium-linux.png and b/ketcher-autotests/tests/R-group-tool/r-group-fragment-tool.spec.ts-snapshots/Open-Ketcher-Change-R-Group-definition-for-multiple-R-Group-members-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/R-group-tool/r-group-fragment-tool.spec.ts-snapshots/Open-Ketcher-Create-Single-R-Fragment-Group-member-1-chromium-linux.png b/ketcher-autotests/tests/R-group-tool/r-group-fragment-tool.spec.ts-snapshots/Open-Ketcher-Create-Single-R-Fragment-Group-member-1-chromium-linux.png
new file mode 100644
index 0000000000..8a9724fc7f
Binary files /dev/null and b/ketcher-autotests/tests/R-group-tool/r-group-fragment-tool.spec.ts-snapshots/Open-Ketcher-Create-Single-R-Fragment-Group-member-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/R-group-tool/r-group-fragment-tool.spec.ts-snapshots/Open-Ketcher-Create-several-R-Group-members-1-chromium-linux.png b/ketcher-autotests/tests/R-group-tool/r-group-fragment-tool.spec.ts-snapshots/Open-Ketcher-Create-several-R-Group-members-1-chromium-linux.png
new file mode 100644
index 0000000000..d13d5abf21
Binary files /dev/null and b/ketcher-autotests/tests/R-group-tool/r-group-fragment-tool.spec.ts-snapshots/Open-Ketcher-Create-several-R-Group-members-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/R-group-tool/r-group-fragment-tool.spec.ts-snapshots/Open-Ketcher-Define-a-structure-with-attachment-points-as-R-Group-member-1-chromium-linux.png b/ketcher-autotests/tests/R-group-tool/r-group-fragment-tool.spec.ts-snapshots/Open-Ketcher-Define-a-structure-with-attachment-points-as-R-Group-member-1-chromium-linux.png
new file mode 100644
index 0000000000..b2a5d4edc8
Binary files /dev/null and b/ketcher-autotests/tests/R-group-tool/r-group-fragment-tool.spec.ts-snapshots/Open-Ketcher-Define-a-structure-with-attachment-points-as-R-Group-member-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/R-group-tool/r-group-fragment-tool.spec.ts-snapshots/Open-Ketcher-R-Group-definition-is-not-deleted-when-root-structure-was-deleted-1-chromium-linux.png b/ketcher-autotests/tests/R-group-tool/r-group-fragment-tool.spec.ts-snapshots/Open-Ketcher-R-Group-definition-is-not-deleted-when-root-structure-was-deleted-1-chromium-linux.png
new file mode 100644
index 0000000000..294ccf75e3
Binary files /dev/null and b/ketcher-autotests/tests/R-group-tool/r-group-fragment-tool.spec.ts-snapshots/Open-Ketcher-R-Group-definition-is-not-deleted-when-root-structure-was-deleted-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/R-group-tool/r-group-fragment-tool.spec.ts-snapshots/Open-Ketcher-Remove-R-Group-member-from-R-Group-1-chromium-linux.png b/ketcher-autotests/tests/R-group-tool/r-group-fragment-tool.spec.ts-snapshots/Open-Ketcher-Remove-R-Group-member-from-R-Group-1-chromium-linux.png
index a7ee031a94..510829acbc 100644
Binary files a/ketcher-autotests/tests/R-group-tool/r-group-fragment-tool.spec.ts-snapshots/Open-Ketcher-Remove-R-Group-member-from-R-Group-1-chromium-linux.png and b/ketcher-autotests/tests/R-group-tool/r-group-fragment-tool.spec.ts-snapshots/Open-Ketcher-Remove-R-Group-member-from-R-Group-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/R-group-tool/r-group-label-dialog.spec.ts-snapshots/Open-Ketcher-Create-S-Group-with-R-Group-1-chromium-linux.png b/ketcher-autotests/tests/R-group-tool/r-group-label-dialog.spec.ts-snapshots/Open-Ketcher-Create-S-Group-with-R-Group-1-chromium-linux.png
index 824738e772..9e1b2d4975 100644
Binary files a/ketcher-autotests/tests/R-group-tool/r-group-label-dialog.spec.ts-snapshots/Open-Ketcher-Create-S-Group-with-R-Group-1-chromium-linux.png and b/ketcher-autotests/tests/R-group-tool/r-group-label-dialog.spec.ts-snapshots/Open-Ketcher-Create-S-Group-with-R-Group-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/R-group-tool/r-group-label-dialog.spec.ts-snapshots/Open-Ketcher-Delete-R-Group-label-using-Erase-tool-1-chromium-linux.png b/ketcher-autotests/tests/R-group-tool/r-group-label-dialog.spec.ts-snapshots/Open-Ketcher-Delete-R-Group-label-using-Erase-tool-1-chromium-linux.png
index f9ceb896bb..0886127d17 100644
Binary files a/ketcher-autotests/tests/R-group-tool/r-group-label-dialog.spec.ts-snapshots/Open-Ketcher-Delete-R-Group-label-using-Erase-tool-1-chromium-linux.png and b/ketcher-autotests/tests/R-group-tool/r-group-label-dialog.spec.ts-snapshots/Open-Ketcher-Delete-R-Group-label-using-Erase-tool-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/R-group-tool/r-group-label-dialog.spec.ts-snapshots/Open-Ketcher-Edit-R-Group-label-1-chromium-linux.png b/ketcher-autotests/tests/R-group-tool/r-group-label-dialog.spec.ts-snapshots/Open-Ketcher-Edit-R-Group-label-1-chromium-linux.png
index 1edd9294a6..0214ad9244 100644
Binary files a/ketcher-autotests/tests/R-group-tool/r-group-label-dialog.spec.ts-snapshots/Open-Ketcher-Edit-R-Group-label-1-chromium-linux.png and b/ketcher-autotests/tests/R-group-tool/r-group-label-dialog.spec.ts-snapshots/Open-Ketcher-Edit-R-Group-label-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/R-group-tool/r-group-label-dialog.spec.ts-snapshots/Open-Ketcher-Multiple-R-Group-label-1-chromium-linux.png b/ketcher-autotests/tests/R-group-tool/r-group-label-dialog.spec.ts-snapshots/Open-Ketcher-Multiple-R-Group-label-1-chromium-linux.png
index c668e94751..1e1b2141f4 100644
Binary files a/ketcher-autotests/tests/R-group-tool/r-group-label-dialog.spec.ts-snapshots/Open-Ketcher-Multiple-R-Group-label-1-chromium-linux.png and b/ketcher-autotests/tests/R-group-tool/r-group-label-dialog.spec.ts-snapshots/Open-Ketcher-Multiple-R-Group-label-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/R-group-tool/r-group-label-dialog.spec.ts-snapshots/Open-Ketcher-R-group-label-dialog-appears-1-chromium-linux.png b/ketcher-autotests/tests/R-group-tool/r-group-label-dialog.spec.ts-snapshots/Open-Ketcher-R-group-label-dialog-appears-1-chromium-linux.png
index 66d13420ad..faea5777dd 100644
Binary files a/ketcher-autotests/tests/R-group-tool/r-group-label-dialog.spec.ts-snapshots/Open-Ketcher-R-group-label-dialog-appears-1-chromium-linux.png and b/ketcher-autotests/tests/R-group-tool/r-group-label-dialog.spec.ts-snapshots/Open-Ketcher-R-group-label-dialog-appears-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/R-group-tool/r-group-label-dialog.spec.ts-snapshots/Open-Ketcher-Rotate-R-group-1-chromium-linux.png b/ketcher-autotests/tests/R-group-tool/r-group-label-dialog.spec.ts-snapshots/Open-Ketcher-Rotate-R-group-1-chromium-linux.png
index 824c8c1b21..a785db94dd 100644
Binary files a/ketcher-autotests/tests/R-group-tool/r-group-label-dialog.spec.ts-snapshots/Open-Ketcher-Rotate-R-group-1-chromium-linux.png and b/ketcher-autotests/tests/R-group-tool/r-group-label-dialog.spec.ts-snapshots/Open-Ketcher-Rotate-R-group-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/R-group-tool/r-group-label-dialog.spec.ts-snapshots/Open-Ketcher-Single-R-Group-label-1-chromium-linux.png b/ketcher-autotests/tests/R-group-tool/r-group-label-dialog.spec.ts-snapshots/Open-Ketcher-Single-R-Group-label-1-chromium-linux.png
index 1f3b4aeaf1..b2b406b7fa 100644
Binary files a/ketcher-autotests/tests/R-group-tool/r-group-label-dialog.spec.ts-snapshots/Open-Ketcher-Single-R-Group-label-1-chromium-linux.png and b/ketcher-autotests/tests/R-group-tool/r-group-label-dialog.spec.ts-snapshots/Open-Ketcher-Single-R-Group-label-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/R-group-tool/r-group-label-dialog.spec.ts-snapshots/Open-Ketcher-Try-to-create-R-Group-not-with-clicking-on-atom-1-chromium-linux.png b/ketcher-autotests/tests/R-group-tool/r-group-label-dialog.spec.ts-snapshots/Open-Ketcher-Try-to-create-R-Group-not-with-clicking-on-atom-1-chromium-linux.png
index 1d6426a4f4..d817889675 100644
Binary files a/ketcher-autotests/tests/R-group-tool/r-group-label-dialog.spec.ts-snapshots/Open-Ketcher-Try-to-create-R-Group-not-with-clicking-on-atom-1-chromium-linux.png and b/ketcher-autotests/tests/R-group-tool/r-group-label-dialog.spec.ts-snapshots/Open-Ketcher-Try-to-create-R-Group-not-with-clicking-on-atom-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/R-group-tool/r-group-label-dialog.spec.ts-snapshots/Open-Ketcher-Undo-Redo-with-R-group-label-1-chromium-linux.png b/ketcher-autotests/tests/R-group-tool/r-group-label-dialog.spec.ts-snapshots/Open-Ketcher-Undo-Redo-with-R-group-label-1-chromium-linux.png
index 6207af90d5..b2b406b7fa 100644
Binary files a/ketcher-autotests/tests/R-group-tool/r-group-label-dialog.spec.ts-snapshots/Open-Ketcher-Undo-Redo-with-R-group-label-1-chromium-linux.png and b/ketcher-autotests/tests/R-group-tool/r-group-label-dialog.spec.ts-snapshots/Open-Ketcher-Undo-Redo-with-R-group-label-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/R-group-tool/r-group-label-dialog.spec.ts-snapshots/Open-Ketcher-Undo-Redo-with-R-group-label-2-chromium-linux.png b/ketcher-autotests/tests/R-group-tool/r-group-label-dialog.spec.ts-snapshots/Open-Ketcher-Undo-Redo-with-R-group-label-2-chromium-linux.png
index 25490a1d08..4889b47088 100644
Binary files a/ketcher-autotests/tests/R-group-tool/r-group-label-dialog.spec.ts-snapshots/Open-Ketcher-Undo-Redo-with-R-group-label-2-chromium-linux.png and b/ketcher-autotests/tests/R-group-tool/r-group-label-dialog.spec.ts-snapshots/Open-Ketcher-Undo-Redo-with-R-group-label-2-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/R-group-tool/r-group-label-dialog.spec.ts-snapshots/Open-Ketcher-Zoom-In-Zoom-Out-1-chromium-linux.png b/ketcher-autotests/tests/R-group-tool/r-group-label-dialog.spec.ts-snapshots/Open-Ketcher-Zoom-In-Zoom-Out-1-chromium-linux.png
index e6d469186e..d1448b4922 100644
Binary files a/ketcher-autotests/tests/R-group-tool/r-group-label-dialog.spec.ts-snapshots/Open-Ketcher-Zoom-In-Zoom-Out-1-chromium-linux.png and b/ketcher-autotests/tests/R-group-tool/r-group-label-dialog.spec.ts-snapshots/Open-Ketcher-Zoom-In-Zoom-Out-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/R-group-tool/r-group-label-dialog.spec.ts-snapshots/Open-Ketcher-Zoom-In-Zoom-Out-2-chromium-linux.png b/ketcher-autotests/tests/R-group-tool/r-group-label-dialog.spec.ts-snapshots/Open-Ketcher-Zoom-In-Zoom-Out-2-chromium-linux.png
index b6a117f39d..f11520390c 100644
Binary files a/ketcher-autotests/tests/R-group-tool/r-group-label-dialog.spec.ts-snapshots/Open-Ketcher-Zoom-In-Zoom-Out-2-chromium-linux.png and b/ketcher-autotests/tests/R-group-tool/r-group-label-dialog.spec.ts-snapshots/Open-Ketcher-Zoom-In-Zoom-Out-2-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/R-group-tool/r-group-tool.spec.ts-snapshots/Icons-and-tooltips-3-chromium-linux.png b/ketcher-autotests/tests/R-group-tool/r-group-tool.spec.ts-snapshots/Icons-and-tooltips-3-chromium-linux.png
index 4dcb11e38c..9f9f046842 100644
Binary files a/ketcher-autotests/tests/R-group-tool/r-group-tool.spec.ts-snapshots/Icons-and-tooltips-3-chromium-linux.png and b/ketcher-autotests/tests/R-group-tool/r-group-tool.spec.ts-snapshots/Icons-and-tooltips-3-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Reagents/CDXML-Format/reagents-cdxml-format.spec.ts b/ketcher-autotests/tests/Reagents/CDXML-Format/reagents-cdxml-format.spec.ts
index 8026245f46..cd539d7f1d 100644
--- a/ketcher-autotests/tests/Reagents/CDXML-Format/reagents-cdxml-format.spec.ts
+++ b/ketcher-autotests/tests/Reagents/CDXML-Format/reagents-cdxml-format.spec.ts
@@ -9,6 +9,7 @@ import {
   openFileAndAddToCanvas,
   FILE_TEST_DATA,
   DELAY_IN_SECONDS,
+  waitForLoad,
 } from '@utils';
 
 import NH3TextAboveRequestData from '@tests/test-data/cdxml-nh3-text-above-request-data.json';
@@ -32,7 +33,9 @@ async function pasteCDXML(page: Page, fileFormat: string) {
   await selectTopPanelButton(TopPanelButton.Open, page);
   await page.getByText('Paste from clipboard').click();
   await page.getByRole('dialog').getByRole('textbox').fill(fileFormat);
-  await pressButton(page, 'Add to Canvas');
+  await waitForLoad(page, async () => {
+    await pressButton(page, 'Add to Canvas');
+  });
 }
 
 test.describe('Reagents CDXML format', () => {
diff --git a/ketcher-autotests/tests/Reagents/RXN-Format/reagents-rxn-format.spec.ts b/ketcher-autotests/tests/Reagents/RXN-Format/reagents-rxn-format.spec.ts
index 4bd2abaef3..8febcbe525 100644
--- a/ketcher-autotests/tests/Reagents/RXN-Format/reagents-rxn-format.spec.ts
+++ b/ketcher-autotests/tests/Reagents/RXN-Format/reagents-rxn-format.spec.ts
@@ -12,6 +12,7 @@ import {
   FILE_TEST_DATA,
   DELAY_IN_SECONDS,
   saveToFile,
+  waitForLoad,
 } from '@utils';
 import { getRxn } from '@utils/formats';
 
@@ -44,7 +45,9 @@ async function pasteFromClipboard(page: Page, fileFormats: string) {
   await selectTopPanelButton(TopPanelButton.Open, page);
   await page.getByText('Paste from clipboard').click();
   await page.getByRole('dialog').getByRole('textbox').fill(fileFormats);
-  await pressButton(page, 'Add to Canvas');
+  await waitForLoad(page, async () => {
+    await pressButton(page, 'Add to Canvas');
+  });
 }
 
 test.describe('Reagents RXN format', () => {
diff --git a/ketcher-autotests/tests/Reagents/RXN-Format/reagents-rxn-format.spec.ts-snapshots/Reagents-RXN-format-Paste-from-clipboard-in-RXN-V2000-format-1-chromium-linux.png b/ketcher-autotests/tests/Reagents/RXN-Format/reagents-rxn-format.spec.ts-snapshots/Reagents-RXN-format-Paste-from-clipboard-in-RXN-V2000-format-1-chromium-linux.png
index 784e8e0d4b..6f2b5b38b3 100644
Binary files a/ketcher-autotests/tests/Reagents/RXN-Format/reagents-rxn-format.spec.ts-snapshots/Reagents-RXN-format-Paste-from-clipboard-in-RXN-V2000-format-1-chromium-linux.png and b/ketcher-autotests/tests/Reagents/RXN-Format/reagents-rxn-format.spec.ts-snapshots/Reagents-RXN-format-Paste-from-clipboard-in-RXN-V2000-format-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Reagents/SMARTS-Format/reagents-smarts-format.spec.ts b/ketcher-autotests/tests/Reagents/SMARTS-Format/reagents-smarts-format.spec.ts
index d7ccf8dd59..973501718a 100644
--- a/ketcher-autotests/tests/Reagents/SMARTS-Format/reagents-smarts-format.spec.ts
+++ b/ketcher-autotests/tests/Reagents/SMARTS-Format/reagents-smarts-format.spec.ts
@@ -90,8 +90,8 @@ test.describe('Reagents SMARTS format', () => {
       page,
       '[#6]-[#6]-1=[#6]-[#6](-[#7])=[#6](-[#16])-[#6]=[#6]-1-[#8]>Cl>[#6]-[#6]-1=[#6]-[#6](I)=[#6](-[#8])-[#6]=[#6]-1Br',
     );
-    await waitForLoad(page, () => {
-      pressButton(page, 'Add to Canvas');
+    await waitForLoad(page, async () => {
+      await pressButton(page, 'Add to Canvas');
     });
     await clickInTheMiddleOfTheScreen(page);
   });
diff --git a/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts-snapshots/Attachment-Point-Tool-Copy-Paste-actions-1-chromium-linux.png b/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts-snapshots/Attachment-Point-Tool-Copy-Paste-actions-1-chromium-linux.png
index 1e2d3b20a4..b072097ad0 100644
Binary files a/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts-snapshots/Attachment-Point-Tool-Copy-Paste-actions-1-chromium-linux.png and b/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts-snapshots/Attachment-Point-Tool-Copy-Paste-actions-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts-snapshots/Attachment-Point-Tool-Copy-Paste-actions-2-chromium-linux.png b/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts-snapshots/Attachment-Point-Tool-Copy-Paste-actions-2-chromium-linux.png
index 5beb3c2214..d580fea7a3 100644
Binary files a/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts-snapshots/Attachment-Point-Tool-Copy-Paste-actions-2-chromium-linux.png and b/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts-snapshots/Attachment-Point-Tool-Copy-Paste-actions-2-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts-snapshots/Attachment-Point-Tool-Create-reaction-with-Attachment-point-1-chromium-linux.png b/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts-snapshots/Attachment-Point-Tool-Create-reaction-with-Attachment-point-1-chromium-linux.png
index 3288a9f2cd..be3f734c6f 100644
Binary files a/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts-snapshots/Attachment-Point-Tool-Create-reaction-with-Attachment-point-1-chromium-linux.png and b/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts-snapshots/Attachment-Point-Tool-Create-reaction-with-Attachment-point-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts-snapshots/Attachment-Point-Tool-Cut-Paste-actions-2-chromium-linux.png b/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts-snapshots/Attachment-Point-Tool-Cut-Paste-actions-2-chromium-linux.png
index 2e7c8a0e3b..b92e3a85eb 100644
Binary files a/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts-snapshots/Attachment-Point-Tool-Cut-Paste-actions-2-chromium-linux.png and b/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts-snapshots/Attachment-Point-Tool-Cut-Paste-actions-2-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts-snapshots/Attachment-Point-Tool-Delete-the-atom-with-attachment-point-s-with-Erase-tool-1-chromium-linux.png b/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts-snapshots/Attachment-Point-Tool-Delete-the-atom-with-attachment-point-s-with-Erase-tool-1-chromium-linux.png
index fdc3bc7eb9..029ff1b476 100644
Binary files a/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts-snapshots/Attachment-Point-Tool-Delete-the-atom-with-attachment-point-s-with-Erase-tool-1-chromium-linux.png and b/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts-snapshots/Attachment-Point-Tool-Delete-the-atom-with-attachment-point-s-with-Erase-tool-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts-snapshots/Attachment-Point-Tool-Delete-the-atom-with-attachment-point-s-with-Erase-tool-2-chromium-linux.png b/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts-snapshots/Attachment-Point-Tool-Delete-the-atom-with-attachment-point-s-with-Erase-tool-2-chromium-linux.png
index 4a3cedc2a0..f52290b84c 100644
Binary files a/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts-snapshots/Attachment-Point-Tool-Delete-the-atom-with-attachment-point-s-with-Erase-tool-2-chromium-linux.png and b/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts-snapshots/Attachment-Point-Tool-Delete-the-atom-with-attachment-point-s-with-Erase-tool-2-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts-snapshots/Attachment-Point-Tool-Delete-the-atom-with-attachment-point-s-with-hotkey-1-chromium-linux.png b/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts-snapshots/Attachment-Point-Tool-Delete-the-atom-with-attachment-point-s-with-hotkey-1-chromium-linux.png
index a9547b87d8..ed276cadaf 100644
Binary files a/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts-snapshots/Attachment-Point-Tool-Delete-the-atom-with-attachment-point-s-with-hotkey-1-chromium-linux.png and b/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts-snapshots/Attachment-Point-Tool-Delete-the-atom-with-attachment-point-s-with-hotkey-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts-snapshots/Attachment-Point-Tool-Delete-the-atom-with-attachment-point-s-with-hotkey-2-chromium-linux.png b/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts-snapshots/Attachment-Point-Tool-Delete-the-atom-with-attachment-point-s-with-hotkey-2-chromium-linux.png
index 4a3cedc2a0..f52290b84c 100644
Binary files a/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts-snapshots/Attachment-Point-Tool-Delete-the-atom-with-attachment-point-s-with-hotkey-2-chromium-linux.png and b/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts-snapshots/Attachment-Point-Tool-Delete-the-atom-with-attachment-point-s-with-hotkey-2-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts-snapshots/Attachment-Point-Tool-Drag-atoms-consist-attachment-points-1-chromium-linux.png b/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts-snapshots/Attachment-Point-Tool-Drag-atoms-consist-attachment-points-1-chromium-linux.png
index 13064186a7..fc005112a8 100644
Binary files a/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts-snapshots/Attachment-Point-Tool-Drag-atoms-consist-attachment-points-1-chromium-linux.png and b/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts-snapshots/Attachment-Point-Tool-Drag-atoms-consist-attachment-points-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts-snapshots/Attachment-Point-Tool-Drag-atoms-consist-attachment-points-2-chromium-linux.png b/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts-snapshots/Attachment-Point-Tool-Drag-atoms-consist-attachment-points-2-chromium-linux.png
index 4a3cedc2a0..f52290b84c 100644
Binary files a/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts-snapshots/Attachment-Point-Tool-Drag-atoms-consist-attachment-points-2-chromium-linux.png and b/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts-snapshots/Attachment-Point-Tool-Drag-atoms-consist-attachment-points-2-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts-snapshots/Attachment-Point-Tool-Save-as-rxn-file-1-chromium-linux.png b/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts-snapshots/Attachment-Point-Tool-Save-as-rxn-file-1-chromium-linux.png
index ab9c6a0eaf..fc4c80cdad 100644
Binary files a/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts-snapshots/Attachment-Point-Tool-Save-as-rxn-file-1-chromium-linux.png and b/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts-snapshots/Attachment-Point-Tool-Save-as-rxn-file-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts-snapshots/Attachment-Point-Tool-Save-as-rxn-file-V3000-1-chromium-linux.png b/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts-snapshots/Attachment-Point-Tool-Save-as-rxn-file-V3000-1-chromium-linux.png
index ab9c6a0eaf..fc4c80cdad 100644
Binary files a/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts-snapshots/Attachment-Point-Tool-Save-as-rxn-file-V3000-1-chromium-linux.png and b/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts-snapshots/Attachment-Point-Tool-Save-as-rxn-file-V3000-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts-snapshots/Attachment-Point-Tool-Select-any-Atom-from-Ato-3e622-ress-the-atom-with-attachment-point-and-drag-2-chromium-linux.png b/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts-snapshots/Attachment-Point-Tool-Select-any-Atom-from-Ato-3e622-ress-the-atom-with-attachment-point-and-drag-2-chromium-linux.png
index 4a3cedc2a0..f52290b84c 100644
Binary files a/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts-snapshots/Attachment-Point-Tool-Select-any-Atom-from-Ato-3e622-ress-the-atom-with-attachment-point-and-drag-2-chromium-linux.png and b/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts-snapshots/Attachment-Point-Tool-Select-any-Atom-from-Ato-3e622-ress-the-atom-with-attachment-point-and-drag-2-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts-snapshots/Attachment-Point-Tool-Select-any-Atom-from-Ato-811b6-ress-the-atom-with-attachment-point-and-drag-1-chromium-linux.png b/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts-snapshots/Attachment-Point-Tool-Select-any-Atom-from-Ato-811b6-ress-the-atom-with-attachment-point-and-drag-1-chromium-linux.png
index 744968a99a..2885602453 100644
Binary files a/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts-snapshots/Attachment-Point-Tool-Select-any-Atom-from-Ato-811b6-ress-the-atom-with-attachment-point-and-drag-1-chromium-linux.png and b/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts-snapshots/Attachment-Point-Tool-Select-any-Atom-from-Ato-811b6-ress-the-atom-with-attachment-point-and-drag-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts-snapshots/Attachment-Point-Tool-Select-any-Template-press-the-atom-with-attachment-point-and-drag-1-chromium-linux.png b/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts-snapshots/Attachment-Point-Tool-Select-any-Template-press-the-atom-with-attachment-point-and-drag-1-chromium-linux.png
index 12abb9acd6..9b60f7bee1 100644
Binary files a/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts-snapshots/Attachment-Point-Tool-Select-any-Template-press-the-atom-with-attachment-point-and-drag-1-chromium-linux.png and b/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts-snapshots/Attachment-Point-Tool-Select-any-Template-press-the-atom-with-attachment-point-and-drag-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts-snapshots/Attachment-Point-Tool-Select-any-Template-press-the-atom-with-attachment-point-and-drag-2-chromium-linux.png b/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts-snapshots/Attachment-Point-Tool-Select-any-Template-press-the-atom-with-attachment-point-and-drag-2-chromium-linux.png
index 4a3cedc2a0..f52290b84c 100644
Binary files a/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts-snapshots/Attachment-Point-Tool-Select-any-Template-press-the-atom-with-attachment-point-and-drag-2-chromium-linux.png and b/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts-snapshots/Attachment-Point-Tool-Select-any-Template-press-the-atom-with-attachment-point-and-drag-2-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts-snapshots/Attachment-Point-Tool-With-any-Bond-tool-click-the-atom-with-attachment-point-s-1-chromium-linux.png b/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts-snapshots/Attachment-Point-Tool-With-any-Bond-tool-click-the-atom-with-attachment-point-s-1-chromium-linux.png
index 56612c1502..a2ff21a78c 100644
Binary files a/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts-snapshots/Attachment-Point-Tool-With-any-Bond-tool-click-the-atom-with-attachment-point-s-1-chromium-linux.png and b/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts-snapshots/Attachment-Point-Tool-With-any-Bond-tool-click-the-atom-with-attachment-point-s-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts-snapshots/Attachment-Point-Tool-With-any-Bond-tool-click-the-atom-with-attachment-point-s-2-chromium-linux.png b/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts-snapshots/Attachment-Point-Tool-With-any-Bond-tool-click-the-atom-with-attachment-point-s-2-chromium-linux.png
index de3d446409..d9ef2cb9a9 100644
Binary files a/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts-snapshots/Attachment-Point-Tool-With-any-Bond-tool-click-the-atom-with-attachment-point-s-2-chromium-linux.png and b/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts-snapshots/Attachment-Point-Tool-With-any-Bond-tool-click-the-atom-with-attachment-point-s-2-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Paste-Action/paste-action.spec.ts-snapshots/Paste-Tool-InfoModal-with-hotkey-display-for-Paste-action-1-chromium-linux.png b/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Paste-Action/paste-action.spec.ts-snapshots/Paste-Tool-InfoModal-with-hotkey-display-for-Paste-action-1-chromium-linux.png
index c817094098..21dde44020 100644
Binary files a/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Paste-Action/paste-action.spec.ts-snapshots/Paste-Tool-InfoModal-with-hotkey-display-for-Paste-action-1-chromium-linux.png and b/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Paste-Action/paste-action.spec.ts-snapshots/Paste-Tool-InfoModal-with-hotkey-display-for-Paste-action-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Rotation/rotation.spec.ts-snapshots/Rotation-Cancel-rotation-on-right-click-1-chromium-linux.png b/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Rotation/rotation.spec.ts-snapshots/Rotation-Cancel-rotation-on-right-click-1-chromium-linux.png
index aed6d3267b..2a70e837d5 100644
Binary files a/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Rotation/rotation.spec.ts-snapshots/Rotation-Cancel-rotation-on-right-click-1-chromium-linux.png and b/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Rotation/rotation.spec.ts-snapshots/Rotation-Cancel-rotation-on-right-click-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Rotation/rotation.spec.ts-snapshots/Rotation-Cancel-rotation-on-right-click-2-chromium-linux.png b/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Rotation/rotation.spec.ts-snapshots/Rotation-Cancel-rotation-on-right-click-2-chromium-linux.png
index 7e0984e47b..6c25aa22d5 100644
Binary files a/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Rotation/rotation.spec.ts-snapshots/Rotation-Cancel-rotation-on-right-click-2-chromium-linux.png and b/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Rotation/rotation.spec.ts-snapshots/Rotation-Cancel-rotation-on-right-click-2-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/S-Group-Tool/Data-S-Group-Tool/data-s-group-tool.spec.ts-snapshots/Data-S-Group-tool-Edit-Data-S-Group-Field-name-and-Field-Value-1-chromium-linux.png b/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/S-Group-Tool/Data-S-Group-Tool/data-s-group-tool.spec.ts-snapshots/Data-S-Group-tool-Edit-Data-S-Group-Field-name-and-Field-Value-1-chromium-linux.png
index 7a1d058a56..2c95fe090b 100644
Binary files a/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/S-Group-Tool/Data-S-Group-Tool/data-s-group-tool.spec.ts-snapshots/Data-S-Group-tool-Edit-Data-S-Group-Field-name-and-Field-Value-1-chromium-linux.png and b/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/S-Group-Tool/Data-S-Group-Tool/data-s-group-tool.spec.ts-snapshots/Data-S-Group-tool-Edit-Data-S-Group-Field-name-and-Field-Value-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/S-Group-Tool/Superatom-S-Group-Tool/superatom-s-group-tool.spec.ts-snapshots/Superatom-S-Group-tool-Add-R-Group-Label-on-Chain-with-Superatom-S-Group-1-chromium-linux.png b/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/S-Group-Tool/Superatom-S-Group-Tool/superatom-s-group-tool.spec.ts-snapshots/Superatom-S-Group-tool-Add-R-Group-Label-on-Chain-with-Superatom-S-Group-1-chromium-linux.png
index 931f2b0e07..790411856a 100644
Binary files a/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/S-Group-Tool/Superatom-S-Group-Tool/superatom-s-group-tool.spec.ts-snapshots/Superatom-S-Group-tool-Add-R-Group-Label-on-Chain-with-Superatom-S-Group-1-chromium-linux.png and b/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/S-Group-Tool/Superatom-S-Group-Tool/superatom-s-group-tool.spec.ts-snapshots/Superatom-S-Group-tool-Add-R-Group-Label-on-Chain-with-Superatom-S-Group-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/S-Group-Tool/Superatom-S-Group-Tool/superatom-s-group-tool.spec.ts-snapshots/Superatom-S-Group-tool-Add-Template-on-Chain-with-Superatom-S-Group-1-chromium-linux.png b/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/S-Group-Tool/Superatom-S-Group-Tool/superatom-s-group-tool.spec.ts-snapshots/Superatom-S-Group-tool-Add-Template-on-Chain-with-Superatom-S-Group-1-chromium-linux.png
index 931f2b0e07..790411856a 100644
Binary files a/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/S-Group-Tool/Superatom-S-Group-Tool/superatom-s-group-tool.spec.ts-snapshots/Superatom-S-Group-tool-Add-Template-on-Chain-with-Superatom-S-Group-1-chromium-linux.png and b/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/S-Group-Tool/Superatom-S-Group-Tool/superatom-s-group-tool.spec.ts-snapshots/Superatom-S-Group-tool-Add-Template-on-Chain-with-Superatom-S-Group-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/S-Group-Tool/Superatom-S-Group-Tool/superatom-s-group-tool.spec.ts-snapshots/Superatom-S-Group-tool-Add-atom-on-Chain-with-Superatom-S-Group-1-chromium-linux.png b/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/S-Group-Tool/Superatom-S-Group-Tool/superatom-s-group-tool.spec.ts-snapshots/Superatom-S-Group-tool-Add-atom-on-Chain-with-Superatom-S-Group-1-chromium-linux.png
index 931f2b0e07..790411856a 100644
Binary files a/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/S-Group-Tool/Superatom-S-Group-Tool/superatom-s-group-tool.spec.ts-snapshots/Superatom-S-Group-tool-Add-atom-on-Chain-with-Superatom-S-Group-1-chromium-linux.png and b/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/S-Group-Tool/Superatom-S-Group-Tool/superatom-s-group-tool.spec.ts-snapshots/Superatom-S-Group-tool-Add-atom-on-Chain-with-Superatom-S-Group-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/S-Group-Tool/Superatom-S-Group-Tool/superatom-s-group-tool.spec.ts-snapshots/Superatom-S-Group-tool-Check-that-hotkeys-for--bb4c9--Abbreviation-on-Chain-with-Superatom-S-Group-1-chromium-linux.png b/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/S-Group-Tool/Superatom-S-Group-Tool/superatom-s-group-tool.spec.ts-snapshots/Superatom-S-Group-tool-Check-that-hotkeys-for--bb4c9--Abbreviation-on-Chain-with-Superatom-S-Group-1-chromium-linux.png
index e8c3ed08e1..565553158b 100644
Binary files a/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/S-Group-Tool/Superatom-S-Group-Tool/superatom-s-group-tool.spec.ts-snapshots/Superatom-S-Group-tool-Check-that-hotkeys-for--bb4c9--Abbreviation-on-Chain-with-Superatom-S-Group-1-chromium-linux.png and b/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/S-Group-Tool/Superatom-S-Group-Tool/superatom-s-group-tool.spec.ts-snapshots/Superatom-S-Group-tool-Check-that-hotkeys-for--bb4c9--Abbreviation-on-Chain-with-Superatom-S-Group-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/S-Group-Tool/Superatom-S-Group-Tool/superatom-s-group-tool.spec.ts-snapshots/Superatom-S-Group-tool-Delete-atom-on-Chain-with-Superatom-S-Group-1-chromium-linux.png b/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/S-Group-Tool/Superatom-S-Group-Tool/superatom-s-group-tool.spec.ts-snapshots/Superatom-S-Group-tool-Delete-atom-on-Chain-with-Superatom-S-Group-1-chromium-linux.png
index 931f2b0e07..790411856a 100644
Binary files a/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/S-Group-Tool/Superatom-S-Group-Tool/superatom-s-group-tool.spec.ts-snapshots/Superatom-S-Group-tool-Delete-atom-on-Chain-with-Superatom-S-Group-1-chromium-linux.png and b/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/S-Group-Tool/Superatom-S-Group-Tool/superatom-s-group-tool.spec.ts-snapshots/Superatom-S-Group-tool-Delete-atom-on-Chain-with-Superatom-S-Group-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/S-Group-Tool/Superatom-S-Group-Tool/superatom-s-group-tool.spec.ts-snapshots/Superatom-S-Group-tool-Edit-Superatom-S-Group-1-chromium-linux.png b/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/S-Group-Tool/Superatom-S-Group-Tool/superatom-s-group-tool.spec.ts-snapshots/Superatom-S-Group-tool-Edit-Superatom-S-Group-1-chromium-linux.png
index c89b37674c..47373ea51c 100644
Binary files a/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/S-Group-Tool/Superatom-S-Group-Tool/superatom-s-group-tool.spec.ts-snapshots/Superatom-S-Group-tool-Edit-Superatom-S-Group-1-chromium-linux.png and b/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/S-Group-Tool/Superatom-S-Group-Tool/superatom-s-group-tool.spec.ts-snapshots/Superatom-S-Group-tool-Edit-Superatom-S-Group-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Atom-Properties/atom-properties.spec.ts-snapshots/Atom-Properties-Add-Radicals-value-on-different-atoms-1-chromium-linux.png b/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Atom-Properties/atom-properties.spec.ts-snapshots/Atom-Properties-Add-Radicals-value-on-different-atoms-1-chromium-linux.png
index e6b943f199..2a29c7cbe2 100644
Binary files a/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Atom-Properties/atom-properties.spec.ts-snapshots/Atom-Properties-Add-Radicals-value-on-different-atoms-1-chromium-linux.png and b/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Atom-Properties/atom-properties.spec.ts-snapshots/Atom-Properties-Add-Radicals-value-on-different-atoms-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Atom-Properties/atom-properties.spec.ts-snapshots/Atom-Properties-All-atom-properties-information-saved-as-mol-file-1-chromium-linux.png b/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Atom-Properties/atom-properties.spec.ts-snapshots/Atom-Properties-All-atom-properties-information-saved-as-mol-file-1-chromium-linux.png
index d57f250275..082b62b821 100644
Binary files a/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Atom-Properties/atom-properties.spec.ts-snapshots/Atom-Properties-All-atom-properties-information-saved-as-mol-file-1-chromium-linux.png and b/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Atom-Properties/atom-properties.spec.ts-snapshots/Atom-Properties-All-atom-properties-information-saved-as-mol-file-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Atom-Properties/atom-properties.spec.ts-snapshots/Atom-Properties-All-atom-properties-information-saved-as-rxn-file-1-chromium-linux.png b/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Atom-Properties/atom-properties.spec.ts-snapshots/Atom-Properties-All-atom-properties-information-saved-as-rxn-file-1-chromium-linux.png
index c36e9545bc..d02808ce4d 100644
Binary files a/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Atom-Properties/atom-properties.spec.ts-snapshots/Atom-Properties-All-atom-properties-information-saved-as-rxn-file-1-chromium-linux.png and b/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Atom-Properties/atom-properties.spec.ts-snapshots/Atom-Properties-All-atom-properties-information-saved-as-rxn-file-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Atom-Properties/atom-properties.spec.ts-snapshots/Atom-Properties-Change-Isotope-value-on-different-atoms-1-chromium-linux.png b/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Atom-Properties/atom-properties.spec.ts-snapshots/Atom-Properties-Change-Isotope-value-on-different-atoms-1-chromium-linux.png
index fce12c70b6..8a35688456 100644
Binary files a/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Atom-Properties/atom-properties.spec.ts-snapshots/Atom-Properties-Change-Isotope-value-on-different-atoms-1-chromium-linux.png and b/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Atom-Properties/atom-properties.spec.ts-snapshots/Atom-Properties-Change-Isotope-value-on-different-atoms-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Atom-Properties/atom-properties.spec.ts-snapshots/Atom-Properties-Colored-atoms---Applying-of-atom-properties-to-colored-atoms-1-chromium-linux.png b/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Atom-Properties/atom-properties.spec.ts-snapshots/Atom-Properties-Colored-atoms---Applying-of-atom-properties-to-colored-atoms-1-chromium-linux.png
index 0df48fcf3a..56c42ab3e8 100644
Binary files a/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Atom-Properties/atom-properties.spec.ts-snapshots/Atom-Properties-Colored-atoms---Applying-of-atom-properties-to-colored-atoms-1-chromium-linux.png and b/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Atom-Properties/atom-properties.spec.ts-snapshots/Atom-Properties-Colored-atoms---Applying-of-atom-properties-to-colored-atoms-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Atom-Properties/atom-properties.spec.ts-snapshots/Atom-Properties-Colored-atoms-set---Mapping-reaction-1-chromium-linux.png b/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Atom-Properties/atom-properties.spec.ts-snapshots/Atom-Properties-Colored-atoms-set---Mapping-reaction-1-chromium-linux.png
index a37782a734..29164bedf0 100644
Binary files a/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Atom-Properties/atom-properties.spec.ts-snapshots/Atom-Properties-Colored-atoms-set---Mapping-reaction-1-chromium-linux.png and b/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Atom-Properties/atom-properties.spec.ts-snapshots/Atom-Properties-Colored-atoms-set---Mapping-reaction-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Atom-Properties/atom-properties.spec.ts-snapshots/Atom-Properties-Typing-in-isotope---several-atoms-through-Label-Edit-modal-1-chromium-linux.png b/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Atom-Properties/atom-properties.spec.ts-snapshots/Atom-Properties-Typing-in-isotope---several-atoms-through-Label-Edit-modal-1-chromium-linux.png
index cab9c8348d..8746930b20 100644
Binary files a/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Atom-Properties/atom-properties.spec.ts-snapshots/Atom-Properties-Typing-in-isotope---several-atoms-through-Label-Edit-modal-1-chromium-linux.png and b/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Atom-Properties/atom-properties.spec.ts-snapshots/Atom-Properties-Typing-in-isotope---several-atoms-through-Label-Edit-modal-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Atom-Tool/Group-generic/extended-table-buttons.spec.ts b/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Atom-Tool/Group-generic/extended-table-buttons.spec.ts
new file mode 100644
index 0000000000..bf98d6a1cc
--- /dev/null
+++ b/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Atom-Tool/Group-generic/extended-table-buttons.spec.ts
@@ -0,0 +1,19 @@
+import { test } from '@playwright/test';
+import { takeEditorScreenshot, AtomButton, selectAtomInToolbar } from '@utils';
+
+test.describe('Open and validate Extended table', () => {
+  test.beforeEach(async ({ page }) => {
+    await page.goto('');
+  });
+
+  test.afterEach(async ({ page }) => {
+    await takeEditorScreenshot(page);
+  });
+
+  test('Periodic table check', async ({ page }) => {
+    /* 
+      Test cases: EPMLSOPKET-1507, EPMLSOPKET-1509, EPMLSOPKET-1515, EPMLSOPKET-1519, EPMLSOPKET-1525
+      */
+    await selectAtomInToolbar(AtomButton.Extended, page);
+  });
+});
diff --git a/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Atom-Tool/Group-generic/extended-table-buttons.spec.ts-snapshots/Open-Ketcher-Periodic-table-check-1-chromium-linux.png b/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Atom-Tool/Group-generic/extended-table-buttons.spec.ts-snapshots/Open-Ketcher-Periodic-table-check-1-chromium-linux.png
new file mode 100644
index 0000000000..466b1c41ff
Binary files /dev/null and b/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Atom-Tool/Group-generic/extended-table-buttons.spec.ts-snapshots/Open-Ketcher-Periodic-table-check-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Atom-Tool/click-atom-on-canvas.spec.ts-snapshots/Click-Atom-on-canvas-The-Sulfur-atom-replaces-the-formic-acid-1-chromium-linux.png b/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Atom-Tool/click-atom-on-canvas.spec.ts-snapshots/Click-Atom-on-canvas-The-Sulfur-atom-replaces-the-formic-acid-1-chromium-linux.png
index 0c33fe43c7..6b50e44171 100644
Binary files a/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Atom-Tool/click-atom-on-canvas.spec.ts-snapshots/Click-Atom-on-canvas-The-Sulfur-atom-replaces-the-formic-acid-1-chromium-linux.png and b/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Atom-Tool/click-atom-on-canvas.spec.ts-snapshots/Click-Atom-on-canvas-The-Sulfur-atom-replaces-the-formic-acid-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Structure-Creating-&-Editing/Text-Tool/utf-8-svg-png.spec.ts-snapshots/Open-UTF-8-and-save-as-SVG-and-PNG-Open-UTF-8-file-and-save-as-PNG-1-chromium-linux.png b/ketcher-autotests/tests/Structure-Creating-&-Editing/Text-Tool/utf-8-svg-png.spec.ts-snapshots/Open-UTF-8-and-save-as-SVG-and-PNG-Open-UTF-8-file-and-save-as-PNG-1-chromium-linux.png
index 10ddc8407c..2a9c2fc5ef 100644
Binary files a/ketcher-autotests/tests/Structure-Creating-&-Editing/Text-Tool/utf-8-svg-png.spec.ts-snapshots/Open-UTF-8-and-save-as-SVG-and-PNG-Open-UTF-8-file-and-save-as-PNG-1-chromium-linux.png and b/ketcher-autotests/tests/Structure-Creating-&-Editing/Text-Tool/utf-8-svg-png.spec.ts-snapshots/Open-UTF-8-and-save-as-SVG-and-PNG-Open-UTF-8-file-and-save-as-PNG-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Structure-Creating-&-Editing/Text-Tool/utf-8-svg-png.spec.ts-snapshots/Open-UTF-8-and-save-as-SVG-and-PNG-Open-UTF-8-file-and-save-as-SVG-1-chromium-linux.png b/ketcher-autotests/tests/Structure-Creating-&-Editing/Text-Tool/utf-8-svg-png.spec.ts-snapshots/Open-UTF-8-and-save-as-SVG-and-PNG-Open-UTF-8-file-and-save-as-SVG-1-chromium-linux.png
index 9c3d7178c2..b32a8317b3 100644
Binary files a/ketcher-autotests/tests/Structure-Creating-&-Editing/Text-Tool/utf-8-svg-png.spec.ts-snapshots/Open-UTF-8-and-save-as-SVG-and-PNG-Open-UTF-8-file-and-save-as-SVG-1-chromium-linux.png and b/ketcher-autotests/tests/Structure-Creating-&-Editing/Text-Tool/utf-8-svg-png.spec.ts-snapshots/Open-UTF-8-and-save-as-SVG-and-PNG-Open-UTF-8-file-and-save-as-SVG-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Templates/Functional-Groups/Functional-Group-Tools/functional-group-tools.spec.ts-snapshots/Templates---Functional-Group-Tools2-Contract-Functional-Group-on-a-structure-1-chromium-linux.png b/ketcher-autotests/tests/Templates/Functional-Groups/Functional-Group-Tools/functional-group-tools.spec.ts-snapshots/Templates---Functional-Group-Tools2-Contract-Functional-Group-on-a-structure-1-chromium-linux.png
index dfa9c24e3c..e3e7084fed 100644
Binary files a/ketcher-autotests/tests/Templates/Functional-Groups/Functional-Group-Tools/functional-group-tools.spec.ts-snapshots/Templates---Functional-Group-Tools2-Contract-Functional-Group-on-a-structure-1-chromium-linux.png and b/ketcher-autotests/tests/Templates/Functional-Groups/Functional-Group-Tools/functional-group-tools.spec.ts-snapshots/Templates---Functional-Group-Tools2-Contract-Functional-Group-on-a-structure-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Templates/Functional-Groups/Functional-Group-Tools/functional-group-tools.spec.ts-snapshots/Templates---Functional-Group-Tools2-Expand-Functional-Group-on-a-structure-1-chromium-linux.png b/ketcher-autotests/tests/Templates/Functional-Groups/Functional-Group-Tools/functional-group-tools.spec.ts-snapshots/Templates---Functional-Group-Tools2-Expand-Functional-Group-on-a-structure-1-chromium-linux.png
index 85aa938d0e..a9ea384ae6 100644
Binary files a/ketcher-autotests/tests/Templates/Functional-Groups/Functional-Group-Tools/functional-group-tools.spec.ts-snapshots/Templates---Functional-Group-Tools2-Expand-Functional-Group-on-a-structure-1-chromium-linux.png and b/ketcher-autotests/tests/Templates/Functional-Groups/Functional-Group-Tools/functional-group-tools.spec.ts-snapshots/Templates---Functional-Group-Tools2-Expand-Functional-Group-on-a-structure-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Templates/Functional-Groups/Functional-Group-Tools/functional-group-tools.spec.ts-snapshots/Templates---Functional-Group-Tools2-Functional-Group-replaced-by-atom-1-chromium-linux.png b/ketcher-autotests/tests/Templates/Functional-Groups/Functional-Group-Tools/functional-group-tools.spec.ts-snapshots/Templates---Functional-Group-Tools2-Functional-Group-replaced-by-atom-1-chromium-linux.png
index bcc3e05611..ed257e963a 100644
Binary files a/ketcher-autotests/tests/Templates/Functional-Groups/Functional-Group-Tools/functional-group-tools.spec.ts-snapshots/Templates---Functional-Group-Tools2-Functional-Group-replaced-by-atom-1-chromium-linux.png and b/ketcher-autotests/tests/Templates/Functional-Groups/Functional-Group-Tools/functional-group-tools.spec.ts-snapshots/Templates---Functional-Group-Tools2-Functional-Group-replaced-by-atom-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Templates/Functional-Groups/click-and-drag-fg-on-canvas.spec.ts b/ketcher-autotests/tests/Templates/Functional-Groups/click-and-drag-fg-on-canvas.spec.ts
index e4b6b7114b..b9292dee3e 100644
--- a/ketcher-autotests/tests/Templates/Functional-Groups/click-and-drag-fg-on-canvas.spec.ts
+++ b/ketcher-autotests/tests/Templates/Functional-Groups/click-and-drag-fg-on-canvas.spec.ts
@@ -41,7 +41,7 @@ test.describe('Click and drag FG on canvas', () => {
     await drawFGAndDrag(FunctionalGroups.Cbz, SHIFT, page);
   });
 
-  test('Boc forms a bond with Cbz functional group', async ({ page }) => {
+  test.skip('Boc forms a bond with Cbz functional group', async ({ page }) => {
     /*
       Test case: EPMLSOPKET-11551
       Description: when click & drag with an FG on FG it should forms a bond between it
diff --git a/ketcher-autotests/tests/Templates/Functional-Groups/functional-groups.spec.ts-snapshots/Functional-Groups-Open-from-V2000-file-with-contracted-functional-group-1-chromium-linux.png b/ketcher-autotests/tests/Templates/Functional-Groups/functional-groups.spec.ts-snapshots/Functional-Groups-Open-from-V2000-file-with-contracted-functional-group-1-chromium-linux.png
index b776eec71d..108456cea6 100644
Binary files a/ketcher-autotests/tests/Templates/Functional-Groups/functional-groups.spec.ts-snapshots/Functional-Groups-Open-from-V2000-file-with-contracted-functional-group-1-chromium-linux.png and b/ketcher-autotests/tests/Templates/Functional-Groups/functional-groups.spec.ts-snapshots/Functional-Groups-Open-from-V2000-file-with-contracted-functional-group-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Templates/Functional-Groups/functional-groups.spec.ts-snapshots/Functional-Groups-Open-from-V2000-file-with-contracted-functional-group-2-chromium-linux.png b/ketcher-autotests/tests/Templates/Functional-Groups/functional-groups.spec.ts-snapshots/Functional-Groups-Open-from-V2000-file-with-contracted-functional-group-2-chromium-linux.png
index df1be75aa7..77736fef79 100644
Binary files a/ketcher-autotests/tests/Templates/Functional-Groups/functional-groups.spec.ts-snapshots/Functional-Groups-Open-from-V2000-file-with-contracted-functional-group-2-chromium-linux.png and b/ketcher-autotests/tests/Templates/Functional-Groups/functional-groups.spec.ts-snapshots/Functional-Groups-Open-from-V2000-file-with-contracted-functional-group-2-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Templates/Functional-Groups/functional-groups.spec.ts-snapshots/Functional-Groups-Open-from-ket-file-with-contracted-and-expanded-functional-groups-1-chromium-linux.png b/ketcher-autotests/tests/Templates/Functional-Groups/functional-groups.spec.ts-snapshots/Functional-Groups-Open-from-ket-file-with-contracted-and-expanded-functional-groups-1-chromium-linux.png
index 972b523c9a..704bf1b5a4 100644
Binary files a/ketcher-autotests/tests/Templates/Functional-Groups/functional-groups.spec.ts-snapshots/Functional-Groups-Open-from-ket-file-with-contracted-and-expanded-functional-groups-1-chromium-linux.png and b/ketcher-autotests/tests/Templates/Functional-Groups/functional-groups.spec.ts-snapshots/Functional-Groups-Open-from-ket-file-with-contracted-and-expanded-functional-groups-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Templates/Functional-Groups/functional-groups.spec.ts-snapshots/Functional-Groups-Paste-from-Clipboard-with-contracted-and-expanded-functional-groups-1-chromium-linux.png b/ketcher-autotests/tests/Templates/Functional-Groups/functional-groups.spec.ts-snapshots/Functional-Groups-Paste-from-Clipboard-with-contracted-and-expanded-functional-groups-1-chromium-linux.png
index 972b523c9a..704bf1b5a4 100644
Binary files a/ketcher-autotests/tests/Templates/Functional-Groups/functional-groups.spec.ts-snapshots/Functional-Groups-Paste-from-Clipboard-with-contracted-and-expanded-functional-groups-1-chromium-linux.png and b/ketcher-autotests/tests/Templates/Functional-Groups/functional-groups.spec.ts-snapshots/Functional-Groups-Paste-from-Clipboard-with-contracted-and-expanded-functional-groups-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Templates/Functional-Groups/functional-groups.spec.ts-snapshots/Functional-Groups-Save-functional-groups-to-Custom-Templates-1-chromium-linux.png b/ketcher-autotests/tests/Templates/Functional-Groups/functional-groups.spec.ts-snapshots/Functional-Groups-Save-functional-groups-to-Custom-Templates-1-chromium-linux.png
index 6bf289848a..dcacf243d2 100644
Binary files a/ketcher-autotests/tests/Templates/Functional-Groups/functional-groups.spec.ts-snapshots/Functional-Groups-Save-functional-groups-to-Custom-Templates-1-chromium-linux.png and b/ketcher-autotests/tests/Templates/Functional-Groups/functional-groups.spec.ts-snapshots/Functional-Groups-Save-functional-groups-to-Custom-Templates-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Templates/User-Templates/user-templates.spec.ts-snapshots/Click-User-Templates-on-canvas-Copy-Paste-action-with-templates-1-chromium-linux.png b/ketcher-autotests/tests/Templates/User-Templates/user-templates.spec.ts-snapshots/Click-User-Templates-on-canvas-Copy-Paste-action-with-templates-1-chromium-linux.png
index caf8df3379..057d8c653a 100644
Binary files a/ketcher-autotests/tests/Templates/User-Templates/user-templates.spec.ts-snapshots/Click-User-Templates-on-canvas-Copy-Paste-action-with-templates-1-chromium-linux.png and b/ketcher-autotests/tests/Templates/User-Templates/user-templates.spec.ts-snapshots/Click-User-Templates-on-canvas-Copy-Paste-action-with-templates-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Templates/User-Templates/user-templates.spec.ts-snapshots/Click-User-Templates-on-canvas-Create-Template---saving-1-chromium-linux.png b/ketcher-autotests/tests/Templates/User-Templates/user-templates.spec.ts-snapshots/Click-User-Templates-on-canvas-Create-Template---saving-1-chromium-linux.png
index 4681ff1aeb..cef50aba36 100644
Binary files a/ketcher-autotests/tests/Templates/User-Templates/user-templates.spec.ts-snapshots/Click-User-Templates-on-canvas-Create-Template---saving-1-chromium-linux.png and b/ketcher-autotests/tests/Templates/User-Templates/user-templates.spec.ts-snapshots/Click-User-Templates-on-canvas-Create-Template---saving-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Templates/User-Templates/user-templates.spec.ts-snapshots/Click-User-Templates-on-canvas-Create-Template-with-with-Reaction-arrow-1-chromium-linux.png b/ketcher-autotests/tests/Templates/User-Templates/user-templates.spec.ts-snapshots/Click-User-Templates-on-canvas-Create-Template-with-with-Reaction-arrow-1-chromium-linux.png
index 531b6959dd..6b95c35fa7 100644
Binary files a/ketcher-autotests/tests/Templates/User-Templates/user-templates.spec.ts-snapshots/Click-User-Templates-on-canvas-Create-Template-with-with-Reaction-arrow-1-chromium-linux.png and b/ketcher-autotests/tests/Templates/User-Templates/user-templates.spec.ts-snapshots/Click-User-Templates-on-canvas-Create-Template-with-with-Reaction-arrow-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/User-Interface/AbbreviationLookup/abbreviation-lookup.spec.ts b/ketcher-autotests/tests/User-Interface/AbbreviationLookup/abbreviation-lookup.spec.ts
new file mode 100644
index 0000000000..f6ba9ffc15
--- /dev/null
+++ b/ketcher-autotests/tests/User-Interface/AbbreviationLookup/abbreviation-lookup.spec.ts
@@ -0,0 +1,24 @@
+import { test } from '@playwright/test';
+import { clickInTheMiddleOfTheScreen, takeEditorScreenshot } from '@utils';
+
+/*
+   Lookup Abbreviations window appears when user starts typing
+*/
+test.describe('Lookup Abbreviations window', () => {
+  test.beforeEach(async ({ page }) => {
+    await page.goto('');
+  });
+
+  test('does not disappear when user switches to new browser tab', async ({
+    browser,
+    page,
+  }) => {
+    await clickInTheMiddleOfTheScreen(page);
+    await page.keyboard.type('mer');
+    const newPage = await browser.newPage();
+    await newPage.goto('', { waitUntil: 'domcontentloaded' });
+    await newPage.bringToFront();
+    await page.bringToFront();
+    await takeEditorScreenshot(page);
+  });
+});
diff --git a/ketcher-autotests/tests/User-Interface/AbbreviationLookup/abbreviation-lookup.spec.ts-snapshots/Lookup-Abbreviations-window-does-not-disappear-when-user-switches-to-new-browser-tab-1-chromium-linux.png b/ketcher-autotests/tests/User-Interface/AbbreviationLookup/abbreviation-lookup.spec.ts-snapshots/Lookup-Abbreviations-window-does-not-disappear-when-user-switches-to-new-browser-tab-1-chromium-linux.png
new file mode 100644
index 0000000000..882b2897e1
Binary files /dev/null and b/ketcher-autotests/tests/User-Interface/AbbreviationLookup/abbreviation-lookup.spec.ts-snapshots/Lookup-Abbreviations-window-does-not-disappear-when-user-switches-to-new-browser-tab-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/User-Interface/About/about-ui.spec.ts b/ketcher-autotests/tests/User-Interface/About/about-ui.spec.ts
index f51d959be6..2da3e149a5 100644
--- a/ketcher-autotests/tests/User-Interface/About/about-ui.spec.ts
+++ b/ketcher-autotests/tests/User-Interface/About/about-ui.spec.ts
@@ -18,7 +18,9 @@ test.describe('Open Ketcher', () => {
     */
     await selectTopPanelButton(TopPanelButton.About, page);
 
-    await takeEditorScreenshot(page);
+    await takeEditorScreenshot(page, {
+      masks: [page.getByTestId('build-time')],
+    });
   });
 
   test('Links in About floating window', async ({ page }) => {
diff --git a/ketcher-autotests/tests/User-Interface/About/about-ui.spec.ts-snapshots/Open-Ketcher-About-floating-windows-appeared-1-chromium-linux.png b/ketcher-autotests/tests/User-Interface/About/about-ui.spec.ts-snapshots/Open-Ketcher-About-floating-windows-appeared-1-chromium-linux.png
index 5c23c323d6..2b37e47d9a 100644
Binary files a/ketcher-autotests/tests/User-Interface/About/about-ui.spec.ts-snapshots/Open-Ketcher-About-floating-windows-appeared-1-chromium-linux.png and b/ketcher-autotests/tests/User-Interface/About/about-ui.spec.ts-snapshots/Open-Ketcher-About-floating-windows-appeared-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/User-Interface/Outline-For-Hovered-Structures/outline-for-hovered-structures.spec.ts b/ketcher-autotests/tests/User-Interface/Outline-For-Hovered-Structures/outline-for-hovered-structures.spec.ts
new file mode 100644
index 0000000000..9e84209429
--- /dev/null
+++ b/ketcher-autotests/tests/User-Interface/Outline-For-Hovered-Structures/outline-for-hovered-structures.spec.ts
@@ -0,0 +1,42 @@
+import { test } from '@playwright/test';
+import {
+  takeEditorScreenshot,
+  openFileAndAddToCanvas,
+  getCoordinatesOfTheMiddleOfTheScreen,
+} from '@utils';
+
+// shift of coordinates relative to the center, for the hover of the entire structure:
+const screenCenterShift = 50;
+
+test.describe('Outline for hovered structures', () => {
+  test.beforeEach(async ({ page }) => {
+    await page.goto('');
+  });
+
+  test.afterEach(async ({ page }) => {
+    await takeEditorScreenshot(page);
+  });
+
+  /* Draw selection outline correctly for hovered structures:
+   * related to GitHub issue: https://github.com/epam/ketcher/issues/2595
+   */
+  /* Arrangement by layers of structures from top to bottom:
+		text, bond, outline of atoms, outline of bonds, selection of atoms (with hover), selection of bonds (with hover) */
+  test('Should draw selection outline correctly for hovered structures', async ({
+    page,
+  }) => {
+    await openFileAndAddToCanvas('benzene-ring-with-two-atoms.ket', page);
+
+    await page.keyboard.press('Control+KeyA');
+    await page.keyboard.down('Control');
+
+    const { x, y } = await getCoordinatesOfTheMiddleOfTheScreen(page);
+
+    // mouse movement start coordinate to get the hover of the entire selected structure:
+    await page.mouse.move(x, y);
+
+    await page.mouse.move(x, y + screenCenterShift, { steps: 10 });
+
+    await takeEditorScreenshot(page);
+  });
+});
diff --git a/ketcher-autotests/tests/User-Interface/Outline-For-Hovered-Structures/outline-for-hovered-structures.spec.ts-snapshots/Outline-for-hovered-structures-Should-draw-selection-outline-correctly-for-hovered-structures-1-chromium-linux.png b/ketcher-autotests/tests/User-Interface/Outline-For-Hovered-Structures/outline-for-hovered-structures.spec.ts-snapshots/Outline-for-hovered-structures-Should-draw-selection-outline-correctly-for-hovered-structures-1-chromium-linux.png
new file mode 100644
index 0000000000..e01a3aff7f
Binary files /dev/null and b/ketcher-autotests/tests/User-Interface/Outline-For-Hovered-Structures/outline-for-hovered-structures.spec.ts-snapshots/Outline-for-hovered-structures-Should-draw-selection-outline-correctly-for-hovered-structures-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/User-Interface/Outline-For-Hovered-Structures/outline-for-hovered-structures.spec.ts-snapshots/Outline-for-hovered-structures-Should-draw-selection-outline-correctly-for-hovered-structures-2-chromium-linux.png b/ketcher-autotests/tests/User-Interface/Outline-For-Hovered-Structures/outline-for-hovered-structures.spec.ts-snapshots/Outline-for-hovered-structures-Should-draw-selection-outline-correctly-for-hovered-structures-2-chromium-linux.png
new file mode 100644
index 0000000000..62bd9bdb03
Binary files /dev/null and b/ketcher-autotests/tests/User-Interface/Outline-For-Hovered-Structures/outline-for-hovered-structures.spec.ts-snapshots/Outline-for-hovered-structures-Should-draw-selection-outline-correctly-for-hovered-structures-2-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/User-Interface/Right-Click-Menu/right-click.spec.ts-snapshots/Right-click-menu-Check-Attach-S-Group-for-bond-by-right-click-menu-1-chromium-linux.png b/ketcher-autotests/tests/User-Interface/Right-Click-Menu/right-click.spec.ts-snapshots/Right-click-menu-Check-Attach-S-Group-for-bond-by-right-click-menu-1-chromium-linux.png
index b2128300d6..433fc266bf 100644
Binary files a/ketcher-autotests/tests/User-Interface/Right-Click-Menu/right-click.spec.ts-snapshots/Right-click-menu-Check-Attach-S-Group-for-bond-by-right-click-menu-1-chromium-linux.png and b/ketcher-autotests/tests/User-Interface/Right-Click-Menu/right-click.spec.ts-snapshots/Right-click-menu-Check-Attach-S-Group-for-bond-by-right-click-menu-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/User-Interface/Right-Click-Menu/right-click.spec.ts-snapshots/Right-click-menu-Check-creating-new-AND-Group-from-Enhanced-stereochemistry-item-2-chromium-linux.png b/ketcher-autotests/tests/User-Interface/Right-Click-Menu/right-click.spec.ts-snapshots/Right-click-menu-Check-creating-new-AND-Group-from-Enhanced-stereochemistry-item-2-chromium-linux.png
index 6f012ac27e..289daf68f4 100644
Binary files a/ketcher-autotests/tests/User-Interface/Right-Click-Menu/right-click.spec.ts-snapshots/Right-click-menu-Check-creating-new-AND-Group-from-Enhanced-stereochemistry-item-2-chromium-linux.png and b/ketcher-autotests/tests/User-Interface/Right-Click-Menu/right-click.spec.ts-snapshots/Right-click-menu-Check-creating-new-AND-Group-from-Enhanced-stereochemistry-item-2-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/User-Interface/Right-Click-Menu/right-click.spec.ts-snapshots/Right-click-menu-Check-creating-new-OR-Group-from-Enhanced-stereochemistry-item-2-chromium-linux.png b/ketcher-autotests/tests/User-Interface/Right-Click-Menu/right-click.spec.ts-snapshots/Right-click-menu-Check-creating-new-OR-Group-from-Enhanced-stereochemistry-item-2-chromium-linux.png
index f6e05a18ba..8bca0d96cb 100644
Binary files a/ketcher-autotests/tests/User-Interface/Right-Click-Menu/right-click.spec.ts-snapshots/Right-click-menu-Check-creating-new-OR-Group-from-Enhanced-stereochemistry-item-2-chromium-linux.png and b/ketcher-autotests/tests/User-Interface/Right-Click-Menu/right-click.spec.ts-snapshots/Right-click-menu-Check-creating-new-OR-Group-from-Enhanced-stereochemistry-item-2-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/User-Interface/Right-Click-Menu/right-click.spec.ts-snapshots/Right-click-menu-Check-right-click-menu-for-atoms-1-chromium-linux.png b/ketcher-autotests/tests/User-Interface/Right-Click-Menu/right-click.spec.ts-snapshots/Right-click-menu-Check-right-click-menu-for-atoms-1-chromium-linux.png
index 7363d1617a..17d5bd34b3 100644
Binary files a/ketcher-autotests/tests/User-Interface/Right-Click-Menu/right-click.spec.ts-snapshots/Right-click-menu-Check-right-click-menu-for-atoms-1-chromium-linux.png and b/ketcher-autotests/tests/User-Interface/Right-Click-Menu/right-click.spec.ts-snapshots/Right-click-menu-Check-right-click-menu-for-atoms-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/User-Interface/Right-Click-Menu/right-click.spec.ts-snapshots/Right-click-menu-Check-right-click-menu-for-bonds-1-chromium-linux.png b/ketcher-autotests/tests/User-Interface/Right-Click-Menu/right-click.spec.ts-snapshots/Right-click-menu-Check-right-click-menu-for-bonds-1-chromium-linux.png
index 3cd4fef2ca..5c9ccc6de4 100644
Binary files a/ketcher-autotests/tests/User-Interface/Right-Click-Menu/right-click.spec.ts-snapshots/Right-click-menu-Check-right-click-menu-for-bonds-1-chromium-linux.png and b/ketcher-autotests/tests/User-Interface/Right-Click-Menu/right-click.spec.ts-snapshots/Right-click-menu-Check-right-click-menu-for-bonds-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/User-Interface/Right-Click-Menu/right-click.spec.ts-snapshots/Right-click-menu-Check-right-click-submenu-for-Query-bonds-1-chromium-linux.png b/ketcher-autotests/tests/User-Interface/Right-Click-Menu/right-click.spec.ts-snapshots/Right-click-menu-Check-right-click-submenu-for-Query-bonds-1-chromium-linux.png
index 26ec0bb4b5..f5013d0659 100644
Binary files a/ketcher-autotests/tests/User-Interface/Right-Click-Menu/right-click.spec.ts-snapshots/Right-click-menu-Check-right-click-submenu-for-Query-bonds-1-chromium-linux.png and b/ketcher-autotests/tests/User-Interface/Right-Click-Menu/right-click.spec.ts-snapshots/Right-click-menu-Check-right-click-submenu-for-Query-bonds-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/User-Interface/Right-Click-Menu/right-click.spec.ts-snapshots/Right-click-menu-Check-that-menu-Enhanced-ster-0f28b-f-atom-does-not-have-enhanced-stereochemistry-1-chromium-linux.png b/ketcher-autotests/tests/User-Interface/Right-Click-Menu/right-click.spec.ts-snapshots/Right-click-menu-Check-that-menu-Enhanced-ster-0f28b-f-atom-does-not-have-enhanced-stereochemistry-1-chromium-linux.png
index b6ed352fde..4ab1215620 100644
Binary files a/ketcher-autotests/tests/User-Interface/Right-Click-Menu/right-click.spec.ts-snapshots/Right-click-menu-Check-that-menu-Enhanced-ster-0f28b-f-atom-does-not-have-enhanced-stereochemistry-1-chromium-linux.png and b/ketcher-autotests/tests/User-Interface/Right-Click-Menu/right-click.spec.ts-snapshots/Right-click-menu-Check-that-menu-Enhanced-ster-0f28b-f-atom-does-not-have-enhanced-stereochemistry-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/User-Interface/Right-Click-Menu/right-click.spec.ts-snapshots/Right-click-menu-Check-that-the-menu-Enhanced--751a5-out-if-the-atom-have-enhanced-stereochemistry-1-chromium-linux.png b/ketcher-autotests/tests/User-Interface/Right-Click-Menu/right-click.spec.ts-snapshots/Right-click-menu-Check-that-the-menu-Enhanced--751a5-out-if-the-atom-have-enhanced-stereochemistry-1-chromium-linux.png
index 0ec1a9edcf..be04aab5af 100644
Binary files a/ketcher-autotests/tests/User-Interface/Right-Click-Menu/right-click.spec.ts-snapshots/Right-click-menu-Check-that-the-menu-Enhanced--751a5-out-if-the-atom-have-enhanced-stereochemistry-1-chromium-linux.png and b/ketcher-autotests/tests/User-Interface/Right-Click-Menu/right-click.spec.ts-snapshots/Right-click-menu-Check-that-the-menu-Enhanced--751a5-out-if-the-atom-have-enhanced-stereochemistry-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/User-Interface/Right-Click-Menu/right-click.spec.ts-snapshots/Right-click-menu-Right-click-on-a-Bond-with-se-4f555-roup-tool-not-opens-S-Group-Properties-window-1-chromium-linux.png b/ketcher-autotests/tests/User-Interface/Right-Click-Menu/right-click.spec.ts-snapshots/Right-click-menu-Right-click-on-a-Bond-with-se-4f555-roup-tool-not-opens-S-Group-Properties-window-1-chromium-linux.png
index 3cd4fef2ca..5c9ccc6de4 100644
Binary files a/ketcher-autotests/tests/User-Interface/Right-Click-Menu/right-click.spec.ts-snapshots/Right-click-menu-Right-click-on-a-Bond-with-se-4f555-roup-tool-not-opens-S-Group-Properties-window-1-chromium-linux.png and b/ketcher-autotests/tests/User-Interface/Right-Click-Menu/right-click.spec.ts-snapshots/Right-click-menu-Right-click-on-a-Bond-with-se-4f555-roup-tool-not-opens-S-Group-Properties-window-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/User-Interface/Right-Click-Menu/right-click.spec.ts-snapshots/Right-click-menu-Right-click-on-an-Atom-with-s-dae3c-roup-tool-not-opens-S-Group-Properties-window-1-chromium-linux.png b/ketcher-autotests/tests/User-Interface/Right-Click-Menu/right-click.spec.ts-snapshots/Right-click-menu-Right-click-on-an-Atom-with-s-dae3c-roup-tool-not-opens-S-Group-Properties-window-1-chromium-linux.png
index cab5d01641..672a5e7aaf 100644
Binary files a/ketcher-autotests/tests/User-Interface/Right-Click-Menu/right-click.spec.ts-snapshots/Right-click-menu-Right-click-on-an-Atom-with-s-dae3c-roup-tool-not-opens-S-Group-Properties-window-1-chromium-linux.png and b/ketcher-autotests/tests/User-Interface/Right-Click-Menu/right-click.spec.ts-snapshots/Right-click-menu-Right-click-on-an-Atom-with-s-dae3c-roup-tool-not-opens-S-Group-Properties-window-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/User-Interface/Zoom-Changes/zoom-changes.spec.ts b/ketcher-autotests/tests/User-Interface/Zoom-Changes/zoom-changes.spec.ts
index 35fbfa34f8..aa383a92af 100644
--- a/ketcher-autotests/tests/User-Interface/Zoom-Changes/zoom-changes.spec.ts
+++ b/ketcher-autotests/tests/User-Interface/Zoom-Changes/zoom-changes.spec.ts
@@ -1,17 +1,17 @@
 import { test, expect } from '@playwright/test';
-import { takeEditorScreenshot, clickInTheMiddleOfTheScreen } from '@utils';
+import { takeTopToolbarScreenshot, clickInTheMiddleOfTheScreen } from '@utils';
 import { TestIdSelectors } from '../../utils/selectors/testIdSelectors';
 
 const randomNegativeNumber = -60;
 const randomPositiveNumber = 60;
 
-test.describe('Open Ketcher', () => {
+test.describe('Zoom changes', () => {
   test.beforeEach(async ({ page }) => {
     await page.goto('');
   });
 
   test.afterEach(async ({ page }) => {
-    await takeEditorScreenshot(page);
+    await takeTopToolbarScreenshot(page);
   });
 
   /* Editor is zoomed correctly: */
diff --git a/ketcher-autotests/tests/User-Interface/Zoom-Changes/zoom-changes.spec.ts-snapshots/Open-Ketcher-when-using-ctrl-mouse-scroll-down-1-chromium-linux.png b/ketcher-autotests/tests/User-Interface/Zoom-Changes/zoom-changes.spec.ts-snapshots/Open-Ketcher-when-using-ctrl-mouse-scroll-down-1-chromium-linux.png
new file mode 100644
index 0000000000..84f0f62944
Binary files /dev/null and b/ketcher-autotests/tests/User-Interface/Zoom-Changes/zoom-changes.spec.ts-snapshots/Open-Ketcher-when-using-ctrl-mouse-scroll-down-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/User-Interface/Zoom-Changes/zoom-changes.spec.ts-snapshots/Open-Ketcher-when-using-ctrl-mouse-scroll-up-1-chromium-linux.png b/ketcher-autotests/tests/User-Interface/Zoom-Changes/zoom-changes.spec.ts-snapshots/Open-Ketcher-when-using-ctrl-mouse-scroll-up-1-chromium-linux.png
new file mode 100644
index 0000000000..48b5e3874b
Binary files /dev/null and b/ketcher-autotests/tests/User-Interface/Zoom-Changes/zoom-changes.spec.ts-snapshots/Open-Ketcher-when-using-ctrl-mouse-scroll-up-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/User-Interface/Zoom-Changes/zoom-changes.spec.ts-snapshots/Zoom-changes-when-using-ctrl-mouse-scroll-down-1-chromium-linux.png b/ketcher-autotests/tests/User-Interface/Zoom-Changes/zoom-changes.spec.ts-snapshots/Zoom-changes-when-using-ctrl-mouse-scroll-down-1-chromium-linux.png
new file mode 100644
index 0000000000..e007e82a78
Binary files /dev/null and b/ketcher-autotests/tests/User-Interface/Zoom-Changes/zoom-changes.spec.ts-snapshots/Zoom-changes-when-using-ctrl-mouse-scroll-down-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/User-Interface/Zoom-Changes/zoom-changes.spec.ts-snapshots/Zoom-changes-when-using-ctrl-mouse-scroll-up-1-chromium-linux.png b/ketcher-autotests/tests/User-Interface/Zoom-Changes/zoom-changes.spec.ts-snapshots/Zoom-changes-when-using-ctrl-mouse-scroll-up-1-chromium-linux.png
new file mode 100644
index 0000000000..e62817a65f
Binary files /dev/null and b/ketcher-autotests/tests/User-Interface/Zoom-Changes/zoom-changes.spec.ts-snapshots/Zoom-changes-when-using-ctrl-mouse-scroll-up-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/test-data/Attached data-expected.mol b/ketcher-autotests/tests/test-data/Attached data-expected.mol
index 465ac39f9d..170f04e135 100644
--- a/ketcher-autotests/tests/test-data/Attached data-expected.mol	
+++ b/ketcher-autotests/tests/test-data/Attached data-expected.mol	
@@ -1,17 +1,17 @@
 
-  Ketcher  7102321522D 1   1.00000     0.00000     0
+  Ketcher  8 123 7262D 1   1.00000     0.00000     0
 
  10  9  0  0  1  0  0  0  0  0999 V2000
-   12.1688   -8.1500    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   13.0349   -8.6500    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   13.9009   -8.1500    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   14.7670   -8.6500    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   15.6330   -8.1500    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   16.4991   -8.6500    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   17.3651   -8.1500    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   15.6330   -7.1500    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   16.4991   -9.6500    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   18.2312   -8.6500    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   13.0438   -8.8500    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   13.9099   -9.3500    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   14.7759   -8.8500    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   15.6420   -9.3500    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   16.5080   -8.8500    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   17.3741   -9.3500    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   18.2401   -8.8500    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   16.5080   -7.8500    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   17.3741  -10.3500    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   19.1062   -9.3500    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
   1  2  1  0  0  0  0
   2  3  1  0  0  0  0
   3  4  1  0  0  0  0
diff --git a/ketcher-autotests/tests/test-data/Attached data_V3000-expected.mol b/ketcher-autotests/tests/test-data/Attached data_V3000-expected.mol
index bf22c37224..e27b724539 100644
--- a/ketcher-autotests/tests/test-data/Attached data_V3000-expected.mol	
+++ b/ketcher-autotests/tests/test-data/Attached data_V3000-expected.mol	
@@ -1,20 +1,20 @@
 
-  -INDIGO-07102321522D
+  -INDIGO-08012307262D
 
   0  0  0  0  0  0  0  0  0  0  0 V3000
 M  V30 BEGIN CTAB
 M  V30 COUNTS 10 9 1 0 0
 M  V30 BEGIN ATOM
-M  V30 1 C 12.1688 -8.15007 0.0 0
-M  V30 2 C 13.0349 -8.64999 0.0 0
-M  V30 3 C 13.9009 -8.15007 0.0 0
-M  V30 4 C 14.767 -8.64999 0.0 0
-M  V30 5 C 15.633 -8.15007 0.0 0 CFG=2
-M  V30 6 C 16.4991 -8.64999 0.0 0 CFG=2
-M  V30 7 C 17.3651 -8.15007 0.0 0
-M  V30 8 C 15.633 -7.14997 0.0 0
-M  V30 9 C 16.4991 -9.65003 0.0 0
-M  V30 10 C 18.2312 -8.64999 0.0 0
+M  V30 1 C 13.0438 -8.85007 0.0 0
+M  V30 2 C 13.9099 -9.34999 0.0 0
+M  V30 3 C 14.7759 -8.85007 0.0 0
+M  V30 4 C 15.642 -9.34999 0.0 0
+M  V30 5 C 16.508 -8.85007 0.0 0 CFG=2
+M  V30 6 C 17.3741 -9.34999 0.0 0 CFG=2
+M  V30 7 C 18.2401 -8.85007 0.0 0
+M  V30 8 C 16.508 -7.84997 0.0 0
+M  V30 9 C 17.3741 -10.35 0.0 0
+M  V30 10 C 19.1062 -9.34999 0.0 0
 M  V30 END ATOM
 M  V30 BEGIN BOND
 M  V30 1 1 1 2
diff --git a/ketcher-autotests/tests/test-data/V2000-abs-expected.mol b/ketcher-autotests/tests/test-data/V2000-abs-expected.mol
index 2933b557da..59650c3b4d 100644
--- a/ketcher-autotests/tests/test-data/V2000-abs-expected.mol
+++ b/ketcher-autotests/tests/test-data/V2000-abs-expected.mol
@@ -1,50 +1,50 @@
 
-  Ketcher  7102321522D 1   1.00000     0.00000     0
+  Ketcher  8 123 7262D 1   1.00000     0.00000     0
 
  43 47  0  0  1  0  0  0  0  0999 V2000
-   15.1939   -7.8433    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   15.1939   -8.8608    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   15.7649   -9.6187    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   16.6474  -10.0029    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   15.9933  -10.6881    0.0000 O   0  0  0  0  0  0  0  0  0  0  0  0
-   17.0523  -10.9684    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   17.6856   -9.8887    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   18.3916   -9.2657    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   18.7446   -8.2586    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   18.3501   -7.2619    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   17.5610   -6.6597    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   16.6785   -7.1269    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   15.6922   -7.0023    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   15.2354   -6.0783    0.0000 O   0  0  0  0  0  0  0  0  0  0  0  0
-   16.9693   -8.1029    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   19.3987   -7.4903    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   20.3124   -7.9160    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   20.1359   -6.8362    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   18.5578   -6.3275    0.0000 H   0  0  0  0  0  0  0  0  0  0  0  0
-   19.3261   -8.9439    0.0000 H   0  0  0  0  0  0  0  0  0  0  0  0
-   15.1212  -10.3870    0.0000 O   0  0  0  0  0  0  0  0  0  0  0  0
-   15.5157  -11.2903    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   14.8928  -12.1001    0.0000 O   0  0  0  0  0  0  0  0  0  0  0  0
-   16.5020  -11.4460    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   14.4152   -9.2346    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   14.4152  -10.1067    0.0000 O   0  0  0  0  0  0  0  0  0  0  0  0
-   13.5638  -10.5739    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   13.5638  -11.5602    0.0000 O   0  0  0  0  0  0  0  0  0  0  0  0
-   12.6917  -10.1067    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   11.8507  -10.5739    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   11.8507  -11.5602    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   11.0097  -12.0586    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   10.1376  -11.5914    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   10.1376  -10.6050    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   11.0097  -10.1067    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   13.5950   -8.8296    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   13.5950   -7.8433    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   12.7644   -9.1930    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   14.9758   -9.7641    0.0000 H   0  0  0  0  0  0  0  0  0  0  0  0
-   14.7786   -6.9089    0.0000 O   0  0  0  0  0  0  0  0  0  0  0  0
-   13.8026   -6.7843    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   13.3769   -5.8499    0.0000 O   0  0  0  0  0  0  0  0  0  0  0  0
-   13.2004   -7.5630    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   16.2423   -8.6491    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   16.2423   -9.6666    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   16.8134  -10.4245    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   17.6959  -10.8087    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   17.0418  -11.4939    0.0000 O   0  0  0  0  0  0  0  0  0  0  0  0
+   18.1008  -11.7742    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   18.7341  -10.6945    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   19.4401  -10.0715    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   19.7931   -9.0644    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   19.3986   -8.0677    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   18.6095   -7.4655    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   17.7270   -7.9327    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   16.7407   -7.8081    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   16.2839   -6.8841    0.0000 O   0  0  0  0  0  0  0  0  0  0  0  0
+   18.0177   -8.9087    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   20.4472   -8.2961    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   21.3609   -8.7218    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   21.1844   -7.6420    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   19.6062   -7.1333    0.0000 H   0  0  0  0  0  0  0  0  0  0  0  0
+   20.3745   -9.7497    0.0000 H   0  0  0  0  0  0  0  0  0  0  0  0
+   16.1697  -11.1928    0.0000 O   0  0  0  0  0  0  0  0  0  0  0  0
+   16.5642  -12.0961    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   15.9412  -12.9059    0.0000 O   0  0  0  0  0  0  0  0  0  0  0  0
+   17.5505  -12.2518    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   15.4637  -10.0404    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   15.4637  -10.9125    0.0000 O   0  0  0  0  0  0  0  0  0  0  0  0
+   14.6123  -11.3797    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   14.6123  -12.3660    0.0000 O   0  0  0  0  0  0  0  0  0  0  0  0
+   13.7402  -10.9125    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   12.8992  -11.3797    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   12.8992  -12.3660    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   12.0582  -12.8644    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   11.1861  -12.3972    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   11.1861  -11.4109    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   12.0582  -10.9125    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   14.6434   -9.6355    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   14.6434   -8.6491    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   13.8128   -9.9988    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   16.0243  -10.5699    0.0000 H   0  0  0  0  0  0  0  0  0  0  0  0
+   15.8270   -7.7147    0.0000 O   0  0  0  0  0  0  0  0  0  0  0  0
+   14.8511   -7.5901    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   14.4254   -6.6557    0.0000 O   0  0  0  0  0  0  0  0  0  0  0  0
+   14.2489   -8.3688    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
   2  1  1  0  0  0  0
   3  2  1  0  0  0  0
   4  3  1  0  0  0  0
diff --git a/ketcher-autotests/tests/test-data/V3000-abs-expected.mol b/ketcher-autotests/tests/test-data/V3000-abs-expected.mol
index 6d80fde7a3..9b4efbb13a 100644
--- a/ketcher-autotests/tests/test-data/V3000-abs-expected.mol
+++ b/ketcher-autotests/tests/test-data/V3000-abs-expected.mol
@@ -1,59 +1,59 @@
 
-  -INDIGO-07102321522D
+  -INDIGO-08012307262D
 
   0  0  0  0  0  0  0  0  0  0  0 V3000
 M  V30 BEGIN CTAB
 M  V30 COUNTS 49 53 0 0 0
 M  V30 BEGIN ATOM
-M  V30 1 C 13.7126 -7.87488 0.0 0 CFG=1
-M  V30 2 C 13.7126 -8.90891 0.0 0 CFG=1
-M  V30 3 C 14.293 -9.6792 0.0 0 CFG=1
-M  V30 4 C 15.1899 -10.0696 0.0 0 CFG=2
-M  V30 5 O 14.5251 -10.766 0.0 0
-M  V30 6 C 15.6014 -11.0509 0.0 0
-M  V30 7 C 16.245 -9.95355 0.0 0
-M  V30 8 C 16.9625 -9.32048 0.0 0
-M  V30 9 C 17.3213 -8.29693 0.0 0 CFG=1
-M  V30 10 C 16.9203 -7.28398 0.0 0 CFG=1
-M  V30 11 C 16.1184 -6.672 0.0 0
-M  V30 12 C 15.2215 -7.14684 0.0 0
-M  V30 13 C 14.2191 -7.02024 0.0 0
-M  V30 14 O 13.7548 -6.08111 0.0 0
-M  V30 15 C 15.517 -8.13869 0.0 0
-M  V30 16 C 17.986 -7.51616 0.0 0
-M  V30 17 C 18.9146 -7.94876 0.0 0
-M  V30 18 C 18.7352 -6.85139 0.0 0
-M  V30 19 H 17.1313 -6.33437 0.0 0
-M  V30 20 H 17.9122 -8.99333 0.0 0
-M  V30 21 O 13.6388 -10.46 0.0 0
-M  V30 22 C 14.0397 -11.378 0.0 0
-M  V30 23 O 13.4067 -12.201 0.0 0
-M  V30 24 C 15.0421 -11.5363 0.0 0
-M  V30 25 C 12.9213 -9.28878 0.0 0 CFG=1
-M  V30 26 O 12.9213 -10.1751 0.0 0
-M  V30 27 C 12.056 -10.65 0.0 0
-M  V30 28 O 12.056 -11.6524 0.0 0
-M  V30 29 C 11.1697 -10.1751 0.0 0
-M  V30 30 C 10.315 -10.65 0.0 0
-M  V30 31 C 10.315 -11.6524 0.0 0
-M  V30 32 C 9.46033 -12.1588 0.0 0
-M  V30 33 C 8.57405 -11.684 0.0 0
-M  V30 34 C 8.57405 -10.6816 0.0 0
-M  V30 35 C 9.46033 -10.1751 0.0 0
-M  V30 36 C 12.0877 -8.87728 0.0 0 CFG=2
-M  V30 37 C 12.0877 -7.87488 0.0 0
-M  V30 38 C 11.2436 -9.2466 0.0 0
-M  V30 39 H 13.4911 -9.82695 0.0 0
-M  V30 40 O 13.2906 -6.92527 0.0 0
-M  V30 41 C 12.2987 -6.7986 0.0 0
-M  V30 42 O 11.8661 -5.84899 0.0 0
-M  V30 43 C 11.6868 -7.58998 0.0 0
-M  V30 44 C 20.3149 -8.63273 0.0 0
-M  V30 45 C 20.3149 -9.50508 0.0 0
-M  V30 46 C 21.0704 -9.94132 0.0 0
-M  V30 47 C 21.826 -9.50508 0.0 0
-M  V30 48 C 21.826 -8.63273 0.0 0
-M  V30 49 C 21.0704 -8.19649 0.0 0
+M  V30 1 C 14.7361 -8.68069 0.0 0 CFG=1
+M  V30 2 C 14.7361 -9.71472 0.0 0 CFG=1
+M  V30 3 C 15.3165 -10.485 0.0 0 CFG=1
+M  V30 4 C 16.2134 -10.8754 0.0 0 CFG=2
+M  V30 5 O 15.5486 -11.5718 0.0 0
+M  V30 6 C 16.6249 -11.8567 0.0 0
+M  V30 7 C 17.2685 -10.7594 0.0 0
+M  V30 8 C 17.986 -10.1263 0.0 0
+M  V30 9 C 18.3448 -9.10274 0.0 0 CFG=1
+M  V30 10 C 17.9438 -8.08979 0.0 0 CFG=1
+M  V30 11 C 17.1419 -7.47781 0.0 0
+M  V30 12 C 16.245 -7.95265 0.0 0
+M  V30 13 C 15.2426 -7.82604 0.0 0
+M  V30 14 O 14.7783 -6.88691 0.0 0
+M  V30 15 C 16.5404 -8.9445 0.0 0
+M  V30 16 C 19.0095 -8.32197 0.0 0
+M  V30 17 C 19.9381 -8.75456 0.0 0
+M  V30 18 C 19.7587 -7.6572 0.0 0
+M  V30 19 H 18.1548 -7.14018 0.0 0
+M  V30 20 H 18.9357 -9.79914 0.0 0
+M  V30 21 O 14.6622 -11.2658 0.0 0
+M  V30 22 C 15.0632 -12.1838 0.0 0
+M  V30 23 O 14.4301 -13.0068 0.0 0
+M  V30 24 C 16.0656 -12.3421 0.0 0
+M  V30 25 C 13.9448 -10.0946 0.0 0 CFG=1
+M  V30 26 O 13.9448 -10.9809 0.0 0
+M  V30 27 C 13.0795 -11.4558 0.0 0
+M  V30 28 O 13.0795 -12.4582 0.0 0
+M  V30 29 C 12.1932 -10.9809 0.0 0
+M  V30 30 C 11.3385 -11.4558 0.0 0
+M  V30 31 C 11.3385 -12.4582 0.0 0
+M  V30 32 C 10.4838 -12.9646 0.0 0
+M  V30 33 C 9.59753 -12.4898 0.0 0
+M  V30 34 C 9.59753 -11.4874 0.0 0
+M  V30 35 C 10.4838 -10.9809 0.0 0
+M  V30 36 C 13.1112 -9.68308 0.0 0 CFG=2
+M  V30 37 C 13.1112 -8.68069 0.0 0
+M  V30 38 C 12.267 -10.0524 0.0 0
+M  V30 39 H 14.5146 -10.6328 0.0 0
+M  V30 40 O 14.3141 -7.73108 0.0 0
+M  V30 41 C 13.3222 -7.60441 0.0 0
+M  V30 42 O 12.8896 -6.6548 0.0 0
+M  V30 43 C 12.7102 -8.39578 0.0 0
+M  V30 44 C 21.3384 -9.43854 0.0 0
+M  V30 45 C 21.3384 -10.3109 0.0 0
+M  V30 46 C 22.0939 -10.7471 0.0 0
+M  V30 47 C 22.8494 -10.3109 0.0 0
+M  V30 48 C 22.8494 -9.43854 0.0 0
+M  V30 49 C 22.0939 -9.0023 0.0 0
 M  V30 END ATOM
 M  V30 BEGIN BOND
 M  V30 1 1 2 1
diff --git a/ketcher-autotests/tests/test-data/all-possible-atoms-properties-expected.mol b/ketcher-autotests/tests/test-data/all-possible-atoms-properties-expected.mol
index 310198ab24..bbd9670bf6 100644
--- a/ketcher-autotests/tests/test-data/all-possible-atoms-properties-expected.mol
+++ b/ketcher-autotests/tests/test-data/all-possible-atoms-properties-expected.mol
@@ -1,19 +1,19 @@
 
-  Ketcher  7102322 12D 1   1.00000     0.00000     0
+  Ketcher  72823 9 82D 1   1.00000     0.00000     0
 
  12 13  0  0  0  0  0  0  0  0999 V2000
-   14.3566   -9.9245    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   16.0870   -9.9240    0.0000 F   0  0  0  5  0  3  0  0  0  0  0  0
-   15.2234   -9.4244    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   16.0870  -10.9249    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   14.3566  -10.9294    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   15.2256  -11.4244    0.0000 O   0  0  0  3  0  5  0  0  0  0  0  0
-   15.2234   -8.4243    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   14.3569   -6.9266    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   14.3566   -7.9242    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   15.2234   -6.4256    0.0000 N   0  0  0  2  0  4  0  0  0  0  0  0
-   16.0934   -7.9212    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   16.0869   -6.9212    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   15.4051  -10.7303    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   17.1355  -10.7298    0.0000 F   0  0  0  5  0  3  0  0  0  0  0  0
+   16.2719  -10.2302    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   17.1355  -11.7307    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   15.4051  -11.7352    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   16.2741  -12.2302    0.0000 O   0  0  0  3  0  5  0  0  0  0  0  0
+   16.2719   -9.2302    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   15.4054   -7.7324    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   15.4051   -8.7301    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   16.2719   -7.2314    0.0000 N   0  0  0  2  0  4  0  0  0  0  0  0
+   17.1419   -8.7271    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   17.1354   -7.7270    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
   3  1  2  0     0  0
   4  2  2  0     0  0
   1  5  1  0     0  0
diff --git a/ketcher-autotests/tests/test-data/all-possible-atoms-properties-expected.rxn b/ketcher-autotests/tests/test-data/all-possible-atoms-properties-expected.rxn
index 14ff712d5c..df1982a46c 100644
--- a/ketcher-autotests/tests/test-data/all-possible-atoms-properties-expected.rxn
+++ b/ketcher-autotests/tests/test-data/all-possible-atoms-properties-expected.rxn
@@ -1,26 +1,26 @@
 $RXN V3000
 
- -INDIGO- 0710232201
+ -INDIGO- 0728230908
 
 M  V30 COUNTS 1 1
 M  V30 BEGIN REACTANT
 M  V30 BEGIN CTAB
 M  V30 COUNTS 12 13 3 0 0
 M  V30 BEGIN ATOM
-M  V30 1 C 9.85822 -9.91225 0.0 0
-M  V30 2 F 11.5885 -9.91177 0.0 0 CHG=2 HCOUNT=4 RAD=3 MASS=3 VAL=3 SUBST=4 R-
-M  V30 BCNT=4
-M  V30 3 C 10.725 -9.41215 0.0 0
-M  V30 4 C 11.5885 -10.9127 0.0 0
-M  V30 5 C 9.85822 -10.9172 0.0 0
-M  V30 6 O 10.7272 -11.4122 0.0 0 CHG=3 HCOUNT=2 RAD=1 MASS=1 VAL=5 SUBST=-2 -
+M  V30 1 C 13.0367 -11.0303 0.0 0
+M  V30 2 F 14.767 -11.0298 0.0 0 CHG=2 HCOUNT=4 RAD=3 MASS=3 VAL=3 SUBST=4 RB-
+M  V30 CNT=4
+M  V30 3 C 13.9035 -10.5302 0.0 0
+M  V30 4 C 14.767 -12.0307 0.0 0
+M  V30 5 C 13.0367 -12.0352 0.0 0
+M  V30 6 O 13.9057 -12.5302 0.0 0 CHG=3 HCOUNT=2 RAD=1 MASS=1 VAL=5 SUBST=-2 -
 M  V30 RBCNT=3
-M  V30 7 C 10.725 -8.41214 0.0 0
-M  V30 8 C 9.85843 -6.91447 0.0 0
-M  V30 9 C 9.85817 -7.91211 0.0 0
-M  V30 10 N 10.7249 -6.41341 0.0 0 CHG=1 HCOUNT=1 RAD=2 MASS=2 VAL=4 SUBST=2
-M  V30 11 C 11.595 -7.90908 0.0 0
-M  V30 12 C 11.5885 -6.90902 0.0 0
+M  V30 7 C 13.9035 -9.53015 0.0 0
+M  V30 8 C 13.0369 -8.03248 0.0 0
+M  V30 9 C 13.0367 -9.03012 0.0 0
+M  V30 10 N 13.9034 -7.53142 0.0 0 CHG=1 HCOUNT=1 RAD=2 MASS=2 VAL=4 SUBST=2
+M  V30 11 C 14.7735 -9.02709 0.0 0
+M  V30 12 C 14.767 -8.02703 0.0 0
 M  V30 END ATOM
 M  V30 BEGIN BOND
 M  V30 1 2 3 1
@@ -38,12 +38,21 @@ M  V30 12 2 11 12
 M  V30 13 1 12 10
 M  V30 END BOND
 M  V30 BEGIN SGROUP
-M  V30 1 DAT 1 ATOMS=(1 2) FIELDNAME=INDIGO_ALIAS FIELDDISP="   11.5885   -9.-
-M  V30 9118    AA    ALL  1       1  " FIELDDATA="!@@#$hg"
-M  V30 2 DAT 2 ATOMS=(1 6) FIELDNAME=INDIGO_ALIAS FIELDDISP="   10.7272  -11.-
-M  V30 4122    AA    ALL  1       1  " FIELDDATA="!2tef"
-M  V30 3 DAT 3 ATOMS=(1 10) FIELDNAME=INDIGO_ALIAS FIELDDISP="   10.7249   -6-
-M  V30 .4134    AA    ALL  1       1  " FIELDDATA="alias123"
+M  V30 1 DAT 1 ATOMS=(1 2) BRKXYZ=(9 0.000000 0.000000 0.000000 0.000000 0.00-
+M  V30 0000 0.000000 0.000000 0.000000 0.000000) BRKXYZ=(9 0.000000 0.000000 -
+M  V30 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000) FIELDN-
+M  V30 AME=INDIGO_ALIAS FIELDDISP="    0.0000    0.0000    DA    ALL  1      -
+M  V30  1  " FIELDDATA="!@@#$hg"
+M  V30 2 DAT 2 ATOMS=(1 6) BRKXYZ=(9 0.000000 0.000000 0.000000 0.000000 0.00-
+M  V30 0000 0.000000 0.000000 0.000000 0.000000) BRKXYZ=(9 0.000000 0.000000 -
+M  V30 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000) FIELDN-
+M  V30 AME=INDIGO_ALIAS FIELDDISP="    0.0000    0.0000    DA    ALL  1      -
+M  V30  1  " FIELDDATA="!2tef"
+M  V30 3 DAT 3 ATOMS=(1 10) BRKXYZ=(9 0.000000 0.000000 0.000000 0.000000 0.0-
+M  V30 00000 0.000000 0.000000 0.000000 0.000000) BRKXYZ=(9 0.000000 0.000000-
+M  V30  0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000) FIELD-
+M  V30 NAME=INDIGO_ALIAS FIELDDISP="    0.0000    0.0000    DA    ALL  1     -
+M  V30   1  " FIELDDATA="alias123"
 M  V30 END SGROUP
 M  V30 END CTAB
 M  V30 END REACTANT
@@ -51,20 +60,20 @@ M  V30 BEGIN PRODUCT
 M  V30 BEGIN CTAB
 M  V30 COUNTS 12 13 3 0 0
 M  V30 BEGIN ATOM
-M  V30 1 C 18.855 -7.98774 0.0 0
-M  V30 2 F 20.5853 -7.98822 0.0 0 CHG=2 HCOUNT=4 RAD=3 MASS=3 VAL=3 SUBST=4 R-
+M  V30 1 C 17.7735 -9.03137 0.0 0
+M  V30 2 F 19.5038 -9.03185 0.0 0 CHG=2 HCOUNT=4 RAD=3 MASS=3 VAL=3 SUBST=4 R-
 M  V30 BCNT=4
-M  V30 3 C 19.7218 -8.48785 0.0 0
-M  V30 4 C 20.5853 -6.98728 0.0 0
-M  V30 5 C 18.855 -6.98279 0.0 0
-M  V30 6 O 19.724 -6.48777 0.0 0 CHG=3 HCOUNT=2 RAD=1 MASS=1 VAL=5 SUBST=-2 R-
+M  V30 3 C 18.6403 -9.53148 0.0 0
+M  V30 4 C 19.5038 -8.0309 0.0 0
+M  V30 5 C 17.7735 -8.02641 0.0 0
+M  V30 6 O 18.6425 -7.5314 0.0 0 CHG=3 HCOUNT=2 RAD=1 MASS=1 VAL=5 SUBST=-2 R-
 M  V30 BCNT=3
-M  V30 7 C 19.7218 -9.48786 0.0 0
-M  V30 8 C 18.8553 -10.9855 0.0 0
-M  V30 9 C 18.855 -9.98788 0.0 0
-M  V30 10 N 19.7218 -11.4866 0.0 0 CHG=1 HCOUNT=1 RAD=2 MASS=2 VAL=4 SUBST=2
-M  V30 11 C 20.5918 -9.99091 0.0 0
-M  V30 12 C 20.5853 -10.991 0.0 0
+M  V30 7 C 18.6403 -10.5315 0.0 0
+M  V30 8 C 17.7738 -12.0291 0.0 0
+M  V30 9 C 17.7735 -11.0315 0.0 0
+M  V30 10 N 18.6403 -12.5302 0.0 0 CHG=1 HCOUNT=1 RAD=2 MASS=2 VAL=4 SUBST=2
+M  V30 11 C 19.5103 -11.0345 0.0 0
+M  V30 12 C 19.5038 -12.0346 0.0 0
 M  V30 END ATOM
 M  V30 BEGIN BOND
 M  V30 1 2 3 1
@@ -82,12 +91,21 @@ M  V30 12 2 11 12
 M  V30 13 1 12 10
 M  V30 END BOND
 M  V30 BEGIN SGROUP
-M  V30 1 DAT 1 ATOMS=(1 2) FIELDNAME=INDIGO_ALIAS FIELDDISP="   20.5853   -7.-
-M  V30 9882    AA    ALL  1       1  " FIELDDATA="!@@#$hg"
-M  V30 2 DAT 2 ATOMS=(1 6) FIELDNAME=INDIGO_ALIAS FIELDDISP="   19.7240   -6.-
-M  V30 4878    AA    ALL  1       1  " FIELDDATA="!2tef"
-M  V30 3 DAT 3 ATOMS=(1 10) FIELDNAME=INDIGO_ALIAS FIELDDISP="   19.7218  -11-
-M  V30 .4866    AA    ALL  1       1  " FIELDDATA="alias123"
+M  V30 1 DAT 1 ATOMS=(1 2) BRKXYZ=(9 0.000000 0.000000 0.000000 0.000000 0.00-
+M  V30 0000 0.000000 0.000000 0.000000 0.000000) BRKXYZ=(9 0.000000 0.000000 -
+M  V30 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000) FIELDN-
+M  V30 AME=INDIGO_ALIAS FIELDDISP="    0.0000    0.0000    DA    ALL  1      -
+M  V30  1  " FIELDDATA="!@@#$hg"
+M  V30 2 DAT 2 ATOMS=(1 6) BRKXYZ=(9 0.000000 0.000000 0.000000 0.000000 0.00-
+M  V30 0000 0.000000 0.000000 0.000000 0.000000) BRKXYZ=(9 0.000000 0.000000 -
+M  V30 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000) FIELDN-
+M  V30 AME=INDIGO_ALIAS FIELDDISP="    0.0000    0.0000    DA    ALL  1      -
+M  V30  1  " FIELDDATA="!2tef"
+M  V30 3 DAT 3 ATOMS=(1 10) BRKXYZ=(9 0.000000 0.000000 0.000000 0.000000 0.0-
+M  V30 00000 0.000000 0.000000 0.000000 0.000000) BRKXYZ=(9 0.000000 0.000000-
+M  V30  0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000) FIELD-
+M  V30 NAME=INDIGO_ALIAS FIELDDISP="    0.0000    0.0000    DA    ALL  1     -
+M  V30   1  " FIELDDATA="alias123"
 M  V30 END SGROUP
 M  V30 END CTAB
 M  V30 END PRODUCT
diff --git a/ketcher-autotests/tests/test-data/aromatic-benzene-cml-expected.cml b/ketcher-autotests/tests/test-data/aromatic-benzene-cml-expected.cml
index 0189b587fb..a141e34bfb 100644
--- a/ketcher-autotests/tests/test-data/aromatic-benzene-cml-expected.cml
+++ b/ketcher-autotests/tests/test-data/aromatic-benzene-cml-expected.cml
@@ -2,30 +2,30 @@
 <cml>
     <molecule>
         <atomArray>
-            <atom id="a0" elementType="C" x2="11.9551" y2="-8.0492"/>
-            <atom id="a1" elementType="C" x2="13.6854" y2="-8.0487"/>
-            <atom id="a2" elementType="C" x2="12.8219" y2="-7.5491"/>
-            <atom id="a3" elementType="C" x2="13.6854" y2="-9.04961"/>
-            <atom id="a4" elementType="C" x2="11.9551" y2="-9.05411"/>
-            <atom id="a5" elementType="C" x2="12.8241" y2="-9.54911"/>
-            <atom id="a6" elementType="C" x2="14.3926" y2="-7.3416"/>
-            <atom id="a7" elementType="C" x2="14.8388" y2="-5.66979"/>
-            <atom id="a8" elementType="C" x2="14.1332" y2="-6.37509"/>
-            <atom id="a9" elementType="C" x2="15.8058" y2="-5.92819"/>
-            <atom id="a10" elementType="C" x2="15.3634" y2="-7.601"/>
-            <atom id="a11" elementType="C" x2="16.066" y2="-6.88929"/>
-            <atom id="a12" elementType="C" x2="14.3926" y2="-9.75672"/>
-            <atom id="a13" elementType="C" x2="16.0643" y2="-10.203"/>
-            <atom id="a14" elementType="C" x2="15.3591" y2="-9.49741"/>
-            <atom id="a15" elementType="C" x2="15.8059" y2="-11.17"/>
-            <atom id="a16" elementType="C" x2="14.1331" y2="-10.7276"/>
-            <atom id="a17" elementType="C" x2="14.8448" y2="-11.4302"/>
-            <atom id="a18" elementType="C" x2="16.7714" y2="-9.49591"/>
-            <atom id="a19" elementType="C" x2="17.2177" y2="-7.8241"/>
-            <atom id="a20" elementType="C" x2="16.5121" y2="-8.5294"/>
-            <atom id="a21" elementType="C" x2="18.1847" y2="-8.0825"/>
-            <atom id="a22" elementType="C" x2="17.7423" y2="-9.75532"/>
-            <atom id="a23" elementType="C" x2="18.4449" y2="-9.04361"/>
+            <atom id="a0" elementType="C" x2="12.9786" y2="-8.88001"/>
+            <atom id="a1" elementType="C" x2="14.7089" y2="-8.87951"/>
+            <atom id="a2" elementType="C" x2="13.8454" y2="-8.37991"/>
+            <atom id="a3" elementType="C" x2="14.7089" y2="-9.88041"/>
+            <atom id="a4" elementType="C" x2="12.9786" y2="-9.88492"/>
+            <atom id="a5" elementType="C" x2="13.8476" y2="-10.3799"/>
+            <atom id="a6" elementType="C" x2="15.4161" y2="-8.17241"/>
+            <atom id="a7" elementType="C" x2="15.8623" y2="-6.50059"/>
+            <atom id="a8" elementType="C" x2="15.1567" y2="-7.2059"/>
+            <atom id="a9" elementType="C" x2="16.8293" y2="-6.759"/>
+            <atom id="a10" elementType="C" x2="16.3869" y2="-8.43181"/>
+            <atom id="a11" elementType="C" x2="17.0895" y2="-7.7201"/>
+            <atom id="a12" elementType="C" x2="15.4161" y2="-10.5875"/>
+            <atom id="a13" elementType="C" x2="17.0878" y2="-11.0338"/>
+            <atom id="a14" elementType="C" x2="16.3826" y2="-10.3282"/>
+            <atom id="a15" elementType="C" x2="16.8294" y2="-12.0008"/>
+            <atom id="a16" elementType="C" x2="15.1566" y2="-11.5584"/>
+            <atom id="a17" elementType="C" x2="15.8683" y2="-12.261"/>
+            <atom id="a18" elementType="C" x2="17.7949" y2="-10.3267"/>
+            <atom id="a19" elementType="C" x2="18.2412" y2="-8.65491"/>
+            <atom id="a20" elementType="C" x2="17.5356" y2="-9.36021"/>
+            <atom id="a21" elementType="C" x2="19.2082" y2="-8.91331"/>
+            <atom id="a22" elementType="C" x2="18.7658" y2="-10.5861"/>
+            <atom id="a23" elementType="C" x2="19.4684" y2="-9.87442"/>
         </atomArray>
         <bondArray>
             <bond atomRefs2="a2 a0" order="A"/>
diff --git a/ketcher-autotests/tests/test-data/aromatic-benzene-rxnv2000-expected.rxn b/ketcher-autotests/tests/test-data/aromatic-benzene-rxnv2000-expected.rxn
index 16f2dd9eac..9e03d8b6a2 100644
--- a/ketcher-autotests/tests/test-data/aromatic-benzene-rxnv2000-expected.rxn
+++ b/ketcher-autotests/tests/test-data/aromatic-benzene-rxnv2000-expected.rxn
@@ -1,37 +1,37 @@
 $RXN
 
- -INDIGO- 0710232153
+ -INDIGO- 0728230858
 
   1  1
 $MOL
 
-  -INDIGO-07102321532D
+  -INDIGO-07282308582D
 
  24 27  0  0  0  0  0  0  0  0999 V2000
-    8.8199   -8.0492    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   10.5502   -8.0487    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-    9.6867   -7.5491    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   10.5502   -9.0496    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-    8.8199   -9.0541    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-    9.6889   -9.5491    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   11.2574   -7.3416    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   11.7036   -5.6698    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   10.9980   -6.3751    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   12.6706   -5.9282    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   12.2282   -7.6010    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   12.9308   -6.8893    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   11.2574   -9.7567    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   12.9291  -10.2030    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   12.2239   -9.4974    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   12.6707  -11.1700    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   10.9979  -10.7276    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   11.7096  -11.4302    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   13.6362   -9.4959    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   14.0825   -7.8241    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   13.3769   -8.5294    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   15.0496   -8.0825    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   14.6071   -9.7553    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   15.3098   -9.0436    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   10.6134   -8.8800    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   12.3437   -8.8795    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   11.4802   -8.3799    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   12.3437   -9.8804    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   10.6134   -9.8849    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   11.4824  -10.3799    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   13.0509   -8.1724    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   13.4971   -6.5006    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   12.7915   -7.2059    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   14.4641   -6.7590    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   14.0217   -8.4318    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   14.7243   -7.7201    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   13.0509  -10.5875    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   14.7226  -11.0338    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   14.0174  -10.3282    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   14.4642  -12.0008    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   12.7914  -11.5584    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   13.5031  -12.2610    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   15.4297  -10.3267    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   15.8760   -8.6549    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   15.1704   -9.3602    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   16.8430   -8.9133    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   16.4006  -10.5861    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   17.1032   -9.8744    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
   3  1  4  0  0  0  0
   4  2  4  0  0  0  0
   1  5  4  0  0  0  0
@@ -62,15 +62,15 @@ $MOL
 M  END
 $MOL
 
-  -INDIGO-07102321532D
+  -INDIGO-07282308582D
 
   6  6  0  0  0  0  0  0  0  0999 V2000
-   19.8497   -8.2001    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   21.5801   -8.1996    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   20.7165   -7.7000    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   21.5801   -9.2005    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   19.8497   -9.2050    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   20.7187   -9.7000    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   20.1032   -8.8809    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   21.8336   -8.8804    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   20.9700   -8.3808    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   21.8336   -9.8813    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   20.1032   -9.8858    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   20.9722  -10.3808    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
   3  1  4  0  0  0  0
   4  2  4  0  0  0  0
   1  5  4  0  0  0  0
diff --git a/ketcher-autotests/tests/test-data/aromatic-benzene-rxnv3000-expected.rxn b/ketcher-autotests/tests/test-data/aromatic-benzene-rxnv3000-expected.rxn
index 2110735525..d4413bdd7b 100644
--- a/ketcher-autotests/tests/test-data/aromatic-benzene-rxnv3000-expected.rxn
+++ b/ketcher-autotests/tests/test-data/aromatic-benzene-rxnv3000-expected.rxn
@@ -1,36 +1,36 @@
 $RXN V3000
 
- -INDIGO- 0710232153
+ -INDIGO- 0728230858
 
 M  V30 COUNTS 1 1
 M  V30 BEGIN REACTANT
 M  V30 BEGIN CTAB
 M  V30 COUNTS 24 27 0 0 0
 M  V30 BEGIN ATOM
-M  V30 1 C 8.81997 -8.04921 0.0 0
-M  V30 2 C 10.5503 -8.04871 0.0 0
-M  V30 3 C 9.68676 -7.54911 0.0 0
-M  V30 4 C 10.5503 -9.0496 0.0 0
-M  V30 5 C 8.81997 -9.0541 0.0 0
-M  V30 6 C 9.68896 -9.5491 0.0 0
-M  V30 7 C 11.2575 -7.34161 0.0 0
-M  V30 8 C 11.7037 -5.66981 0.0 0
-M  V30 9 C 10.9981 -6.37501 0.0 0
-M  V30 10 C 12.6707 -5.9282 0.0 0
-M  V30 11 C 12.2283 -7.60101 0.0 0
-M  V30 12 C 12.9309 -6.8893 0.0 0
-M  V30 13 C 11.2575 -9.75671 0.0 0
-M  V30 14 C 12.9292 -10.203 0.0 0
-M  V30 15 C 12.224 -9.4974 0.0 0
-M  V30 16 C 12.6708 -11.17 0.0 0
-M  V30 17 C 10.998 -10.7276 0.0 0
-M  V30 18 C 11.7097 -11.4302 0.0 0
-M  V30 19 C 13.6363 -9.4959 0.0 0
-M  V30 20 C 14.0826 -7.82411 0.0 0
-M  V30 21 C 13.377 -8.52941 0.0 0
-M  V30 22 C 15.0496 -8.08251 0.0 0
-M  V30 23 C 14.6072 -9.75531 0.0 0
-M  V30 24 C 15.3098 -9.0436 0.0 0
+M  V30 1 C 10.6134 -8.88002 0.0 0
+M  V30 2 C 12.3437 -8.87951 0.0 0
+M  V30 3 C 11.4802 -8.37992 0.0 0
+M  V30 4 C 12.3437 -9.88041 0.0 0
+M  V30 5 C 10.6134 -9.88491 0.0 0
+M  V30 6 C 11.4824 -10.3799 0.0 0
+M  V30 7 C 13.0509 -8.17242 0.0 0
+M  V30 8 C 13.4971 -6.50061 0.0 0
+M  V30 9 C 12.7915 -7.20582 0.0 0
+M  V30 10 C 14.4641 -6.75901 0.0 0
+M  V30 11 C 14.0217 -8.43182 0.0 0
+M  V30 12 C 14.7243 -7.72011 0.0 0
+M  V30 13 C 13.0509 -10.5875 0.0 0
+M  V30 14 C 14.7226 -11.0338 0.0 0
+M  V30 15 C 14.0174 -10.3282 0.0 0
+M  V30 16 C 14.4642 -12.0008 0.0 0
+M  V30 17 C 12.7914 -11.5584 0.0 0
+M  V30 18 C 13.5031 -12.261 0.0 0
+M  V30 19 C 15.4297 -10.3267 0.0 0
+M  V30 20 C 15.876 -8.65492 0.0 0
+M  V30 21 C 15.1704 -9.36021 0.0 0
+M  V30 22 C 16.843 -8.91331 0.0 0
+M  V30 23 C 16.4006 -10.5861 0.0 0
+M  V30 24 C 17.1032 -9.87441 0.0 0
 M  V30 END ATOM
 M  V30 BEGIN BOND
 M  V30 1 4 3 1
@@ -67,12 +67,12 @@ M  V30 BEGIN PRODUCT
 M  V30 BEGIN CTAB
 M  V30 COUNTS 6 6 0 0 0
 M  V30 BEGIN ATOM
-M  V30 1 C 19.8496 -8.20008 0.0 0
-M  V30 2 C 21.58 -8.1996 0.0 0
-M  V30 3 C 20.7164 -7.69998 0.0 0
-M  V30 4 C 21.58 -9.20053 0.0 0
-M  V30 5 C 19.8496 -9.20502 0.0 0
-M  V30 6 C 20.7186 -9.70003 0.0 0
+M  V30 1 C 20.1032 -8.88088 0.0 0
+M  V30 2 C 21.8336 -8.8804 0.0 0
+M  V30 3 C 20.97 -8.38078 0.0 0
+M  V30 4 C 21.8336 -9.88134 0.0 0
+M  V30 5 C 20.1032 -9.88583 0.0 0
+M  V30 6 C 20.9722 -10.3808 0.0 0
 M  V30 END ATOM
 M  V30 BEGIN BOND
 M  V30 1 4 3 1
diff --git a/ketcher-autotests/tests/test-data/aromatic-benzene-v2000-expected.mol b/ketcher-autotests/tests/test-data/aromatic-benzene-v2000-expected.mol
index 1c52215ea2..bc5cf4f298 100644
--- a/ketcher-autotests/tests/test-data/aromatic-benzene-v2000-expected.mol
+++ b/ketcher-autotests/tests/test-data/aromatic-benzene-v2000-expected.mol
@@ -1,31 +1,31 @@
 
-  Ketcher  7102321532D 1   1.00000     0.00000     0
+  Ketcher  72823 8582D 1   1.00000     0.00000     0
 
  24 27  0  0  0  0  0  0  0  0999 V2000
-   11.9551   -8.0492    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   13.6854   -8.0487    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   12.8219   -7.5491    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   13.6854   -9.0496    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   11.9551   -9.0541    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   12.8241   -9.5491    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   14.3926   -7.3416    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   14.8388   -5.6698    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   14.1332   -6.3751    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   15.8058   -5.9282    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   15.3634   -7.6010    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   16.0660   -6.8893    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   14.3926   -9.7567    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   16.0643  -10.2030    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   15.3591   -9.4974    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   15.8059  -11.1700    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   14.1331  -10.7276    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   14.8448  -11.4302    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   16.7714   -9.4959    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   17.2177   -7.8241    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   16.5121   -8.5294    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   18.1847   -8.0825    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   17.7423   -9.7553    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   18.4449   -9.0436    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   12.9786   -8.8800    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   14.7089   -8.8795    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   13.8454   -8.3799    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   14.7089   -9.8804    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   12.9786   -9.8849    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   13.8476  -10.3799    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   15.4161   -8.1724    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   15.8623   -6.5006    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   15.1567   -7.2059    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   16.8293   -6.7590    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   16.3869   -8.4318    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   17.0895   -7.7201    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   15.4161  -10.5875    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   17.0878  -11.0338    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   16.3826  -10.3282    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   16.8294  -12.0008    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   15.1566  -11.5584    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   15.8683  -12.2610    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   17.7949  -10.3267    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   18.2412   -8.6549    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   17.5356   -9.3602    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   19.2082   -8.9133    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   18.7658  -10.5861    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   19.4684   -9.8744    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
   3  1  4  0     0  0
   4  2  4  0     0  0
   1  5  4  0     0  0
diff --git a/ketcher-autotests/tests/test-data/aromatic-benzene-v3000-expected.mol b/ketcher-autotests/tests/test-data/aromatic-benzene-v3000-expected.mol
index 443a26e82f..3a296a2169 100644
--- a/ketcher-autotests/tests/test-data/aromatic-benzene-v3000-expected.mol
+++ b/ketcher-autotests/tests/test-data/aromatic-benzene-v3000-expected.mol
@@ -1,34 +1,34 @@
 
-  -INDIGO-07102321532D
+  -INDIGO-07282308582D
 
   0  0  0  0  0  0  0  0  0  0  0 V3000
 M  V30 BEGIN CTAB
 M  V30 COUNTS 24 27 0 0 0
 M  V30 BEGIN ATOM
-M  V30 1 C 11.9551 -8.0492 0.0 0
-M  V30 2 C 13.6854 -8.0487 0.0 0
-M  V30 3 C 12.8219 -7.5491 0.0 0
-M  V30 4 C 13.6854 -9.04961 0.0 0
-M  V30 5 C 11.9551 -9.05411 0.0 0
-M  V30 6 C 12.8241 -9.54911 0.0 0
-M  V30 7 C 14.3926 -7.3416 0.0 0
-M  V30 8 C 14.8388 -5.66979 0.0 0
-M  V30 9 C 14.1332 -6.37509 0.0 0
-M  V30 10 C 15.8058 -5.92819 0.0 0
-M  V30 11 C 15.3634 -7.601 0.0 0
-M  V30 12 C 16.066 -6.88929 0.0 0
-M  V30 13 C 14.3926 -9.75672 0.0 0
-M  V30 14 C 16.0643 -10.203 0.0 0
-M  V30 15 C 15.3591 -9.49741 0.0 0
-M  V30 16 C 15.8059 -11.17 0.0 0
-M  V30 17 C 14.1331 -10.7276 0.0 0
-M  V30 18 C 14.8448 -11.4302 0.0 0
-M  V30 19 C 16.7714 -9.49591 0.0 0
-M  V30 20 C 17.2177 -7.8241 0.0 0
-M  V30 21 C 16.5121 -8.5294 0.0 0
-M  V30 22 C 18.1847 -8.0825 0.0 0
-M  V30 23 C 17.7423 -9.75532 0.0 0
-M  V30 24 C 18.4449 -9.04361 0.0 0
+M  V30 1 C 12.9786 -8.88001 0.0 0
+M  V30 2 C 14.7089 -8.87951 0.0 0
+M  V30 3 C 13.8454 -8.37991 0.0 0
+M  V30 4 C 14.7089 -9.88041 0.0 0
+M  V30 5 C 12.9786 -9.88492 0.0 0
+M  V30 6 C 13.8476 -10.3799 0.0 0
+M  V30 7 C 15.4161 -8.17241 0.0 0
+M  V30 8 C 15.8623 -6.50059 0.0 0
+M  V30 9 C 15.1567 -7.2059 0.0 0
+M  V30 10 C 16.8293 -6.759 0.0 0
+M  V30 11 C 16.3869 -8.43181 0.0 0
+M  V30 12 C 17.0895 -7.7201 0.0 0
+M  V30 13 C 15.4161 -10.5875 0.0 0
+M  V30 14 C 17.0878 -11.0338 0.0 0
+M  V30 15 C 16.3826 -10.3282 0.0 0
+M  V30 16 C 16.8294 -12.0008 0.0 0
+M  V30 17 C 15.1566 -11.5584 0.0 0
+M  V30 18 C 15.8683 -12.261 0.0 0
+M  V30 19 C 17.7949 -10.3267 0.0 0
+M  V30 20 C 18.2412 -8.65491 0.0 0
+M  V30 21 C 17.5356 -9.36021 0.0 0
+M  V30 22 C 19.2082 -8.91331 0.0 0
+M  V30 23 C 18.7658 -10.5861 0.0 0
+M  V30 24 C 19.4684 -9.87442 0.0 0
 M  V30 END ATOM
 M  V30 BEGIN BOND
 M  V30 1 4 3 1
diff --git a/ketcher-autotests/tests/test-data/atom-properties-V3000-expected.mol b/ketcher-autotests/tests/test-data/atom-properties-V3000-expected.mol
index ab8477dfe1..3de642f6ca 100644
--- a/ketcher-autotests/tests/test-data/atom-properties-V3000-expected.mol
+++ b/ketcher-autotests/tests/test-data/atom-properties-V3000-expected.mol
@@ -1,23 +1,23 @@
 
-  -INDIGO-07102321522D
+  -INDIGO-08012307252D
 
   0  0  0  0  0  0  0  0  0  0  0 V3000
 M  V30 BEGIN CTAB
 M  V30 COUNTS 12 11 0 0 0
 M  V30 BEGIN ATOM
-M  V30 1 C 18.0034 -7.73333 0.0 0 CHG=2 VAL=1 INVRET=2 UNSAT=1 SUBST=-1 RBCNT-
+M  V30 1 C 18.8784 -8.43333 0.0 0 CHG=2 VAL=1 INVRET=2 UNSAT=1 SUBST=-1 RBCNT-
 M  V30 =-2
-M  V30 2 C 19.0365 -8.32986 0.0 0
-M  V30 3 C 19.0365 -9.52277 0.0 0
-M  V30 4 C 18.0034 -10.1192 0.0 0
-M  V30 5 C 16.9704 -9.52277 0.0 0
-M  V30 6 C 16.9704 -8.32986 0.0 0
-M  V30 7 C 11.3635 -7.44935 0.0 0
-M  V30 8 C 12.0291 -7.83356 0.0 0
-M  V30 9 C 12.6946 -7.44935 0.0 0 CFG=2
-M  V30 10 C 13.3602 -7.83356 0.0 0
-M  V30 11 C 14.0257 -7.44935 0.0 0
-M  V30 12 C 12.6946 -6.68078 0.0 0
+M  V30 2 C 19.9115 -9.02986 0.0 0
+M  V30 3 C 19.9115 -10.2228 0.0 0
+M  V30 4 C 18.8784 -10.8192 0.0 0
+M  V30 5 C 17.8454 -10.2228 0.0 0
+M  V30 6 C 17.8454 -9.02986 0.0 0
+M  V30 7 C 12.2385 -8.14935 0.0 0
+M  V30 8 C 12.9041 -8.53356 0.0 0
+M  V30 9 C 13.5696 -8.14935 0.0 0 CFG=2
+M  V30 10 C 14.2352 -8.53356 0.0 0
+M  V30 11 C 14.9007 -8.14935 0.0 0
+M  V30 12 C 13.5696 -7.38077 0.0 0
 M  V30 END ATOM
 M  V30 BEGIN BOND
 M  V30 1 1 1 2
diff --git a/ketcher-autotests/tests/test-data/benzene-and-cyclopentadiene-expected.mol b/ketcher-autotests/tests/test-data/benzene-and-cyclopentadiene-expected.mol
index a662c89558..296ae9ec11 100644
--- a/ketcher-autotests/tests/test-data/benzene-and-cyclopentadiene-expected.mol
+++ b/ketcher-autotests/tests/test-data/benzene-and-cyclopentadiene-expected.mol
@@ -1,18 +1,18 @@
 
-  Ketcher  7102322 02D 1   1.00000     0.00000     0
+  Ketcher  72823 9 62D 1   1.00000     0.00000     0
 
  11 11  0  0  0  0  0  0  0  0999 V2000
-   12.4250   -7.9001    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   14.1554   -7.8996    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   13.2918   -7.4000    0.0000 O   0  0  0  0  0  0  0  0  0  0  0  0
-   14.1554   -8.9005    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   12.4250   -8.9050    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   13.2940   -9.4000    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   17.1654   -7.6550    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   17.6657   -9.1950    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   17.9750   -8.2488    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   16.6650   -9.1950    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   16.3556   -8.2488    0.0000 N   0  0  0  0  0  0  0  0  0  0  0  0
+   13.3000   -8.6001    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   15.0304   -8.5996    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   14.1668   -8.1000    0.0000 O   0  0  0  0  0  0  0  0  0  0  0  0
+   15.0304   -9.6005    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   13.3000   -9.6050    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   14.1690  -10.1000    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   18.0404   -8.3550    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   18.5407   -9.8950    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   18.8500   -8.9488    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   17.5400   -9.8950    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   17.2306   -8.9488    0.0000 N   0  0  0  0  0  0  0  0  0  0  0  0
   3  1  2  0     0  0
   4  2  2  0     0  0
   1  5  1  0     0  0
diff --git a/ketcher-autotests/tests/test-data/benzene-arrow-benzene-reagent-nh3-expected.rxn b/ketcher-autotests/tests/test-data/benzene-arrow-benzene-reagent-nh3-expected.rxn
index 450404b29d..7f1b4a129a 100644
--- a/ketcher-autotests/tests/test-data/benzene-arrow-benzene-reagent-nh3-expected.rxn
+++ b/ketcher-autotests/tests/test-data/benzene-arrow-benzene-reagent-nh3-expected.rxn
@@ -1,18 +1,18 @@
 $RXN V3000
 
- -INDIGO- 0710232157
+ -INDIGO- 0728230902
 
 M  V30 COUNTS 1 1 1
 M  V30 BEGIN REACTANT
 M  V30 BEGIN CTAB
 M  V30 COUNTS 6 6 0 0 0
 M  V30 BEGIN ATOM
-M  V30 1 C 10.1973 -7.91257 0.0 0
-M  V30 2 C 11.9277 -7.91209 0.0 0
-M  V30 3 C 11.0641 -7.41247 0.0 0
-M  V30 4 C 11.9277 -8.91303 0.0 0
-M  V30 5 C 10.1973 -8.91752 0.0 0
-M  V30 6 C 11.0663 -9.41253 0.0 0
+M  V30 1 C 11.0723 -8.63757 0.0 0
+M  V30 2 C 12.8027 -8.63709 0.0 0
+M  V30 3 C 11.9391 -8.13747 0.0 0
+M  V30 4 C 12.8027 -9.63803 0.0 0
+M  V30 5 C 11.0723 -9.64252 0.0 0
+M  V30 6 C 11.9413 -10.1375 0.0 0
 M  V30 END ATOM
 M  V30 BEGIN BOND
 M  V30 1 2 3 1
@@ -28,12 +28,12 @@ M  V30 BEGIN PRODUCT
 M  V30 BEGIN CTAB
 M  V30 COUNTS 6 6 0 0 0
 M  V30 BEGIN ATOM
-M  V30 1 C 18.4723 -7.93757 0.0 0
-M  V30 2 C 20.2027 -7.93709 0.0 0
-M  V30 3 C 19.3391 -7.43747 0.0 0
-M  V30 4 C 20.2027 -8.93803 0.0 0
-M  V30 5 C 18.4723 -8.94252 0.0 0
-M  V30 6 C 19.3413 -9.43753 0.0 0
+M  V30 1 C 19.3473 -8.66257 0.0 0
+M  V30 2 C 21.0777 -8.66209 0.0 0
+M  V30 3 C 20.2141 -8.16247 0.0 0
+M  V30 4 C 21.0777 -9.66303 0.0 0
+M  V30 5 C 19.3473 -9.66752 0.0 0
+M  V30 6 C 20.2163 -10.1625 0.0 0
 M  V30 END ATOM
 M  V30 BEGIN BOND
 M  V30 1 2 3 1
@@ -49,7 +49,7 @@ M  V30 BEGIN AGENT
 M  V30 BEGIN CTAB
 M  V30 COUNTS 1 0 0 0 0
 M  V30 BEGIN ATOM
-M  V30 1 N 14.9625 -8.0125 0.0 0
+M  V30 1 N 15.8375 -8.7375 0.0 0
 M  V30 END ATOM
 M  V30 BEGIN BOND
 M  V30 END BOND
diff --git a/ketcher-autotests/tests/test-data/benzene-with-charge-expected.mol b/ketcher-autotests/tests/test-data/benzene-with-charge-expected.mol
index 82d4dc5ccd..17a6b26558 100644
--- a/ketcher-autotests/tests/test-data/benzene-with-charge-expected.mol
+++ b/ketcher-autotests/tests/test-data/benzene-with-charge-expected.mol
@@ -1,13 +1,13 @@
 
-  Ketcher  7102322 02D 1   1.00000     0.00000     0
+  Ketcher  72823 9 62D 1   1.00000     0.00000     0
 
   6  6  0  0  0  0  0  0  0  0999 V2000
-   14.3348   -7.9251    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   16.0652   -7.9246    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   15.2016   -7.4250    0.0000 N   0  0  0  0  0  0  0  0  0  0  0  0
-   16.0652   -8.9255    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   14.3348   -8.9300    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   15.1788   -9.4250    0.0000 O   0  0  0  0  0  0  0  0  0  0  0  0
+   15.2098   -8.6501    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   16.9402   -8.6496    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   16.0766   -8.1500    0.0000 N   0  0  0  0  0  0  0  0  0  0  0  0
+   16.9402   -9.6505    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   15.2098   -9.6550    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   16.0538  -10.1500    0.0000 O   0  0  0  0  0  0  0  0  0  0  0  0
   3  1  2  0     0  0
   4  2  2  0     0  0
   1  5  1  0     0  0
diff --git a/ketcher-autotests/tests/test-data/benzene-with-three-atoms-expected.mol b/ketcher-autotests/tests/test-data/benzene-with-three-atoms-expected.mol
index 5a7e10ca66..d67750b182 100644
--- a/ketcher-autotests/tests/test-data/benzene-with-three-atoms-expected.mol
+++ b/ketcher-autotests/tests/test-data/benzene-with-three-atoms-expected.mol
@@ -1,13 +1,13 @@
 
-  Ketcher  7102322 02D 1   1.00000     0.00000     0
+  Ketcher  72823 9 62D 1   1.00000     0.00000     0
 
   6  6  0  0  0  0  0  0  0  0999 V2000
-   14.3348   -7.9251    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   16.0652   -7.9246    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   15.2016   -7.4250    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   16.0652   -8.9255    0.0000 Cl  0  0  0  0  0  0  0  0  0  0  0  0
-   14.3348   -8.9300    0.0000 N   0  0  0  0  0  0  0  0  0  0  0  0
-   15.2038   -9.4250    0.0000 O   0  0  0  0  0  0  0  0  0  0  0  0
+   15.2098   -8.6501    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   16.9402   -8.6496    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   16.0766   -8.1500    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   16.9402   -9.6505    0.0000 Cl  0  0  0  0  0  0  0  0  0  0  0  0
+   15.2098   -9.6550    0.0000 N   0  0  0  0  0  0  0  0  0  0  0  0
+   16.0788  -10.1500    0.0000 O   0  0  0  0  0  0  0  0  0  0  0  0
   3  1  2  0     0  0
   4  2  2  0     0  0
   1  5  1  0     0  0
diff --git a/ketcher-autotests/tests/test-data/cdxml-6969.cdxml b/ketcher-autotests/tests/test-data/cdxml-6969.cdxml
new file mode 100644
index 0000000000..639d041b45
--- /dev/null
+++ b/ketcher-autotests/tests/test-data/cdxml-6969.cdxml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE CDXML SYSTEM "http://www.cambridgesoft.com/xml/cdxml.dtd">
+<CDXML BondLength="30.000000" LabelFont="3" CaptionFont="4">
+    <fonttable id="1">
+        <font id="2" charset="utf-8" name="Arial"/>
+        <font id="3" charset="utf-8" name="Times New Roman"/>
+    </fonttable>
+    <colortable>
+        <color r="1" g="1" b="1"/>
+        <color r="0" g="0" b="0"/>
+        <color r="1" g="0" b="0"/>
+        <color r="1" g="1" b="0"/>
+        <color r="0" g="1" b="0"/>
+        <color r="0" g="1" b="1"/>
+        <color r="0" g="0" b="1"/>
+        <color r="1" g="0" b="1"/>
+        <color r="0.5" g="0.5" b="0.5"/>
+    </colortable>
+    <page HeightPages="1" WidthPages="1">
+        <fragment id="4">
+            <n id="21" NodeType="Fragment">
+                <fragment id="22">
+                    <n id="5" p="55.981895 60.750004"/>
+                    <n id="6" Element="1" p="30.000000 75.749947">
+                        <t p="30.000000 75.749947" LabelJustification="Left">
+                            <s font="3" size="10" face="96">H</s>
+                        </t>
+                    </n>
+                    <n id="7" Element="8" NumHydrogens="1" p="81.961754 75.749947">
+                        <t p="81.961754 75.749947" LabelJustification="Left">
+                            <s font="3" size="10" face="96">OH</s>
+                        </t>
+                    </n>
+                    <n id="8" Element="8" NumHydrogens="0" p="55.981895 30.750145">
+                        <t p="55.981895 30.750145" LabelJustification="Left">
+                            <s font="3" size="10" face="96">O</s>
+                        </t>
+                    </n>
+                    <b id="14" B="5" E="6"/>
+                    <b id="15" B="5" E="7"/>
+                    <b id="16" B="5" E="8" Order="2"/>
+                </fragment>
+                <t LabelJustification="Left" LabelAlignment="Above">
+                    <s>formic acid</s>
+                </t>
+            </n>
+            <n id="23" NodeType="Fragment">
+                <fragment id="24">
+                    <n id="9" Element="16" NumHydrogens="0" p="247.981888 60.000015">
+                        <t p="247.981888 60.000015" LabelJustification="Left">
+                            <s font="3" size="10" face="96">S</s>
+                        </t>
+                    </n>
+                    <n id="10" Element="8" NumHydrogens="0" p="247.981888 30.000000">
+                        <t p="247.981888 30.000000" LabelJustification="Left">
+                            <s font="3" size="10" face="96">O</s>
+                        </t>
+                    </n>
+                    <n id="11" Element="8" NumHydrogens="0" p="247.981888 90.000015">
+                        <t p="247.981888 90.000015" LabelJustification="Left">
+                            <s font="3" size="10" face="96">O</s>
+                        </t>
+                    </n>
+                    <n id="12" Element="8" NumHydrogens="1" p="277.981873 60.000015">
+                        <t p="277.981873 60.000015" LabelJustification="Left">
+                            <s font="3" size="10" face="96">OH</s>
+                        </t>
+                    </n>
+                    <n id="13" p="217.981888 60.000015"/>
+                    <b id="17" B="9" E="10" Order="2"/>
+                    <b id="18" B="9" E="11" Order="2"/>
+                    <b id="19" B="9" E="12"/>
+                    <b id="20" B="9" E="13"/>
+                </fragment>
+                <t LabelJustification="Left" LabelAlignment="Above">
+                    <s>methane sulphonic acid</s>
+                </t>
+            </n>
+        </fragment>
+    </page>
+</CDXML>
diff --git a/ketcher-autotests/tests/test-data/chain-with-attachment-points-expected.mol b/ketcher-autotests/tests/test-data/chain-with-attachment-points-expected.mol
index d47f8dc48d..2344664b57 100644
--- a/ketcher-autotests/tests/test-data/chain-with-attachment-points-expected.mol
+++ b/ketcher-autotests/tests/test-data/chain-with-attachment-points-expected.mol
@@ -1,15 +1,15 @@
 
-  -INDIGO-07102321582D
+  -INDIGO-07282309042D
 
   8  7  0  0  0  0  0  0  0  0999 V2000
-   12.1689   -8.1750    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   13.0349   -8.6750    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   13.9010   -8.1750    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   14.7670   -8.6750    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   15.6330   -8.1750    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   16.4990   -8.6750    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   17.3651   -8.1750    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   18.2311   -8.6750    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   13.0439   -8.9000    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   13.9099   -9.4000    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   14.7760   -8.9000    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   15.6420   -9.4000    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   16.5080   -8.9000    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   17.3740   -9.4000    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   18.2401   -8.9000    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   19.1061   -9.4000    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
   1  2  1  0  0  0  0
   2  3  1  0  0  0  0
   3  4  1  0  0  0  0
diff --git a/ketcher-autotests/tests/test-data/chain-with-attachment-points-expectedV3000.mol b/ketcher-autotests/tests/test-data/chain-with-attachment-points-expectedV3000.mol
index 08b40de74e..3e877df160 100644
--- a/ketcher-autotests/tests/test-data/chain-with-attachment-points-expectedV3000.mol
+++ b/ketcher-autotests/tests/test-data/chain-with-attachment-points-expectedV3000.mol
@@ -1,18 +1,18 @@
 
-  -INDIGO-07102321582D
+  -INDIGO-07282309042D
 
   0  0  0  0  0  0  0  0  0  0  0 V3000
 M  V30 BEGIN CTAB
 M  V30 COUNTS 8 7 0 0 0
 M  V30 BEGIN ATOM
-M  V30 1 C 12.1689 -8.175 0.0 0
-M  V30 2 C 13.0349 -8.675 0.0 0
-M  V30 3 C 13.901 -8.175 0.0 0 ATTCHPT=1
-M  V30 4 C 14.767 -8.675 0.0 0 ATTCHPT=2
-M  V30 5 C 15.633 -8.175 0.0 0
-M  V30 6 C 16.499 -8.675 0.0 0 ATTCHPT=-1
-M  V30 7 C 17.3651 -8.175 0.0 0
-M  V30 8 C 18.2311 -8.675 0.0 0
+M  V30 1 C 13.0439 -8.9 0.0 0
+M  V30 2 C 13.9099 -9.4 0.0 0
+M  V30 3 C 14.776 -8.9 0.0 0 ATTCHPT=1
+M  V30 4 C 15.642 -9.4 0.0 0 ATTCHPT=2
+M  V30 5 C 16.508 -8.9 0.0 0
+M  V30 6 C 17.374 -9.4 0.0 0 ATTCHPT=-1
+M  V30 7 C 18.2401 -8.9 0.0 0
+M  V30 8 C 19.1061 -9.4 0.0 0
 M  V30 END ATOM
 M  V30 BEGIN BOND
 M  V30 1 1 1 2
diff --git a/ketcher-autotests/tests/test-data/chain-with-data-s-group-partstructure-expected.cml b/ketcher-autotests/tests/test-data/chain-with-data-s-group-partstructure-expected.cml
index 9a691f5c7d..084e05418e 100644
--- a/ketcher-autotests/tests/test-data/chain-with-data-s-group-partstructure-expected.cml
+++ b/ketcher-autotests/tests/test-data/chain-with-data-s-group-partstructure-expected.cml
@@ -2,13 +2,13 @@
 <cml>
     <molecule>
         <atomArray>
-            <atom id="a0" elementType="C" x2="12.6019" y2="-8.175"/>
-            <atom id="a1" elementType="C" x2="13.4679" y2="-8.675"/>
-            <atom id="a2" elementType="C" x2="14.334" y2="-8.175"/>
-            <atom id="a3" elementType="C" x2="15.2" y2="-8.675"/>
-            <atom id="a4" elementType="C" x2="16.066" y2="-8.175"/>
-            <atom id="a5" elementType="C" x2="16.9321" y2="-8.675"/>
-            <atom id="a6" elementType="C" x2="17.7981" y2="-8.175"/>
+            <atom id="a0" elementType="C" x2="13.4769" y2="-8.9"/>
+            <atom id="a1" elementType="C" x2="14.3429" y2="-9.4"/>
+            <atom id="a2" elementType="C" x2="15.209" y2="-8.9"/>
+            <atom id="a3" elementType="C" x2="16.075" y2="-9.4"/>
+            <atom id="a4" elementType="C" x2="16.941" y2="-8.9"/>
+            <atom id="a5" elementType="C" x2="17.8071" y2="-9.4"/>
+            <atom id="a6" elementType="C" x2="18.6731" y2="-8.9"/>
         </atomArray>
         <bondArray>
             <bond atomRefs2="a0 a1" order="1"/>
diff --git a/ketcher-autotests/tests/test-data/chain-with-h-count-expected.mol b/ketcher-autotests/tests/test-data/chain-with-h-count-expected.mol
index 3000682842..1db3c9d349 100644
--- a/ketcher-autotests/tests/test-data/chain-with-h-count-expected.mol
+++ b/ketcher-autotests/tests/test-data/chain-with-h-count-expected.mol
@@ -1,16 +1,16 @@
 
-  Ketcher  7102322 12D 1   1.00000     0.00000     0
+  Ketcher  72823 9 72D 1   1.00000     0.00000     0
 
   9  8  0  0  0  0  0  0  0  0999 V2000
-   11.7359   -8.1750    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   12.6019   -8.6750    0.0000 C   0  0  0  1  0  0  0  0  0  0  0  0
-   13.4680   -8.1750    0.0000 C   0  0  0  2  0  0  0  0  0  0  0  0
-   14.3340   -8.6750    0.0000 C   0  0  0  3  0  0  0  0  0  0  0  0
-   15.2000   -8.1750    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   16.0660   -8.6750    0.0000 C   0  0  0  4  0  0  0  0  0  0  0  0
-   16.9321   -8.1750    0.0000 C   0  0  0  5  0  0  0  0  0  0  0  0
-   17.7981   -8.6750    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   18.6641   -8.1750    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   12.6109   -8.9000    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   13.4769   -9.4000    0.0000 C   0  0  0  1  0  0  0  0  0  0  0  0
+   14.3430   -8.9000    0.0000 C   0  0  0  2  0  0  0  0  0  0  0  0
+   15.2090   -9.4000    0.0000 C   0  0  0  3  0  0  0  0  0  0  0  0
+   16.0750   -8.9000    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   16.9410   -9.4000    0.0000 C   0  0  0  4  0  0  0  0  0  0  0  0
+   17.8071   -8.9000    0.0000 C   0  0  0  5  0  0  0  0  0  0  0  0
+   18.6731   -9.4000    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   19.5391   -8.9000    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
   1  2  1  0     0  0
   2  3  1  0     0  0
   3  4  1  0     0  0
diff --git a/ketcher-autotests/tests/test-data/chain-with-isotope-expected.mol b/ketcher-autotests/tests/test-data/chain-with-isotope-expected.mol
index babb2dc8e6..71ee0a3da1 100644
--- a/ketcher-autotests/tests/test-data/chain-with-isotope-expected.mol
+++ b/ketcher-autotests/tests/test-data/chain-with-isotope-expected.mol
@@ -1,14 +1,14 @@
 
-  Ketcher  7102322 02D 1   1.00000     0.00000     0
+  Ketcher  72823 9 72D 1   1.00000     0.00000     0
 
   7  6  0  0  0  0  0  0  0  0999 V2000
-   12.5966   -8.1745    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   13.4644   -8.6505    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   14.3322   -8.1495    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   15.2000   -8.6505    0.0000 Cl  0  0  0  0  0  0  0  0  0  0  0  0
-   16.0678   -8.1495    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   16.9356   -8.6505    0.0000 O   0  0  0  0  0  0  0  0  0  0  0  0
-   17.8034   -8.1495    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   13.4716   -8.8745    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   14.3394   -9.3505    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   15.2072   -8.8495    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   16.0750   -9.3505    0.0000 Cl  0  0  0  0  0  0  0  0  0  0  0  0
+   16.9428   -8.8495    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   17.8106   -9.3505    0.0000 O   0  0  0  0  0  0  0  0  0  0  0  0
+   18.6784   -8.8495    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
   1  2  1  0     0  0
   2  3  1  0     0  0
   3  4  1  0     0  0
diff --git a/ketcher-autotests/tests/test-data/chain-with-name-and-value-expected.mol b/ketcher-autotests/tests/test-data/chain-with-name-and-value-expected.mol
index d4274c1234..3bbbeb02c5 100644
--- a/ketcher-autotests/tests/test-data/chain-with-name-and-value-expected.mol
+++ b/ketcher-autotests/tests/test-data/chain-with-name-and-value-expected.mol
@@ -1,14 +1,14 @@
 
-  -INDIGO-07102321582D
+  -INDIGO-07282309042D
 
   7  6  0  0  0  0  0  0  0  0999 V2000
-   12.6269   -8.1750    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   13.4929   -8.6750    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   14.3590   -8.1750    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   15.2250   -8.6750    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   16.0910   -8.1750    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   16.9570   -8.6750    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   17.8231   -8.1750    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   13.5269   -8.9000    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   14.3929   -9.4000    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   15.2590   -8.9000    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   16.1250   -9.4000    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   16.9910   -8.9000    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   17.8570   -9.4000    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   18.7231   -8.9000    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
   1  2  1  0  0  0  0
   2  3  1  0  0  0  0
   3  4  1  0  0  0  0
diff --git a/ketcher-autotests/tests/test-data/chain-with-radicals-expected.mol b/ketcher-autotests/tests/test-data/chain-with-radicals-expected.mol
index e7d4685c7c..1f1fccbbbc 100644
--- a/ketcher-autotests/tests/test-data/chain-with-radicals-expected.mol
+++ b/ketcher-autotests/tests/test-data/chain-with-radicals-expected.mol
@@ -1,16 +1,16 @@
 
-  Ketcher  7102322 02D 1   1.00000     0.00000     0
+  Ketcher  72823 9 72D 1   1.00000     0.00000     0
 
   9  8  0  0  0  0  0  0  0  0999 V2000
-   11.7359   -8.1500    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   12.6019   -8.6500    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   13.4680   -8.1500    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   14.3340   -8.6500    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   15.2000   -8.1500    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   16.0660   -8.6500    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   16.9321   -8.1500    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   17.7981   -8.6500    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   18.6641   -8.1500    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   12.6109   -8.8500    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   13.4769   -9.3500    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   14.3430   -8.8500    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   15.2090   -9.3500    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   16.0750   -8.8500    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   16.9410   -9.3500    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   17.8071   -8.8500    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   18.6731   -9.3500    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   19.5391   -8.8500    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
   1  2  1  0     0  0
   2  3  1  0     0  0
   3  4  1  0     0  0
diff --git a/ketcher-autotests/tests/test-data/chain-with-rection-flags-expected.mol b/ketcher-autotests/tests/test-data/chain-with-rection-flags-expected.mol
index 9a298db810..e7c963f4fc 100644
--- a/ketcher-autotests/tests/test-data/chain-with-rection-flags-expected.mol
+++ b/ketcher-autotests/tests/test-data/chain-with-rection-flags-expected.mol
@@ -1,14 +1,14 @@
 
-  Ketcher  7102322 12D 1   1.00000     0.00000     0
+  Ketcher  72823 9 82D 1   1.00000     0.00000     0
 
   7  6  0  0  0  0  0  0  0  0999 V2000
-   12.6019   -8.1750    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   13.4679   -8.6750    0.0000 C   0  0  0  0  0  0  0  0  0  0  1  1
-   14.3340   -8.1750    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   15.2000   -8.6750    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   16.0660   -8.1750    0.0000 C   0  0  0  0  0  0  0  0  0  0  2  1
-   16.9320   -8.6750    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   17.7981   -8.1750    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   13.4769   -8.9000    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   14.3429   -9.4000    0.0000 C   0  0  0  0  0  0  0  0  0  0  1  1
+   15.2090   -8.9000    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   16.0750   -9.4000    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   16.9410   -8.9000    0.0000 C   0  0  0  0  0  0  0  0  0  0  2  1
+   17.8070   -9.4000    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   18.6731   -8.9000    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
   1  2  1  0     0  0
   2  3  1  0     0  0
   3  4  1  0     0  0
diff --git a/ketcher-autotests/tests/test-data/chain-with-ring-bond-count-expected.mol b/ketcher-autotests/tests/test-data/chain-with-ring-bond-count-expected.mol
index 7b0cfde715..93cdd6ea54 100644
--- a/ketcher-autotests/tests/test-data/chain-with-ring-bond-count-expected.mol
+++ b/ketcher-autotests/tests/test-data/chain-with-ring-bond-count-expected.mol
@@ -1,16 +1,16 @@
 
-  Ketcher  7102322 02D 1   1.00000     0.00000     0
+  Ketcher  72823 9 72D 1   1.00000     0.00000     0
 
   9  8  0  0  0  0  0  0  0  0999 V2000
-   11.7359   -8.1750    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   12.6019   -8.6750    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   13.4680   -8.1750    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   14.3340   -8.6750    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   15.2000   -8.1750    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   16.0660   -8.6750    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   16.9321   -8.1750    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   17.7981   -8.6750    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   18.6641   -8.1750    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   12.6109   -8.9000    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   13.4769   -9.4000    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   14.3430   -8.9000    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   15.2090   -9.4000    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   16.0750   -8.9000    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   16.9410   -9.4000    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   17.8071   -8.9000    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   18.6731   -9.4000    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   19.5391   -8.9000    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
   1  2  1  0     0  0
   2  3  1  0     0  0
   3  4  1  0     0  0
diff --git a/ketcher-autotests/tests/test-data/chain-with-substitution-count-expected.mol b/ketcher-autotests/tests/test-data/chain-with-substitution-count-expected.mol
index da1ee16c86..7082514f5d 100644
--- a/ketcher-autotests/tests/test-data/chain-with-substitution-count-expected.mol
+++ b/ketcher-autotests/tests/test-data/chain-with-substitution-count-expected.mol
@@ -1,17 +1,17 @@
 
-  Ketcher  7102322 12D 1   1.00000     0.00000     0
+  Ketcher  72823 9 72D 1   1.00000     0.00000     0
 
  10  9  0  0  0  0  0  0  0  0999 V2000
-   11.3029   -8.1750    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   12.1689   -8.6750    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   13.0350   -8.1750    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   13.9010   -8.6750    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   14.7670   -8.1750    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   15.6330   -8.6750    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   16.4991   -8.1750    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   17.3651   -8.6750    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   18.2311   -8.1750    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   19.0971   -8.6750    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   12.1779   -8.9000    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   13.0439   -9.4000    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   13.9100   -8.9000    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   14.7760   -9.4000    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   15.6420   -8.9000    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   16.5080   -9.4000    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   17.3741   -8.9000    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   18.2401   -9.4000    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   19.1061   -8.9000    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   19.9721   -9.4000    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
   1  2  1  0     0  0
   2  3  1  0     0  0
   3  4  1  0     0  0
diff --git a/ketcher-autotests/tests/test-data/chain-with-valence-expected.mol b/ketcher-autotests/tests/test-data/chain-with-valence-expected.mol
index 1afbea8947..2d8e520dd5 100644
--- a/ketcher-autotests/tests/test-data/chain-with-valence-expected.mol
+++ b/ketcher-autotests/tests/test-data/chain-with-valence-expected.mol
@@ -1,16 +1,16 @@
 
-  Ketcher  7102322 02D 1   1.00000     0.00000     0
+  Ketcher  72823 9 72D 1   1.00000     0.00000     0
 
   9  8  0  0  0  0  0  0  0  0999 V2000
-   11.7359   -8.1750    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   12.6019   -8.6750    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   13.4680   -8.1750    0.0000 N   0  0  0  0  0  1  0  0  0  0  0  0
-   14.3340   -8.6750    0.0000 O   0  0  0  0  0  2  0  0  0  0  0  0
-   15.2000   -8.1750    0.0000 P   0  0  0  0  0  4  0  0  0  0  0  0
-   16.0660   -8.6750    0.0000 Cl  0  0  0  0  0  5  0  0  0  0  0  0
-   16.9321   -8.1750    0.0000 Br  0  0  0  0  0  2  0  0  0  0  0  0
-   17.7981   -8.6750    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   18.6641   -8.1750    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   12.6109   -8.9000    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   13.4769   -9.4000    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   14.3430   -8.9000    0.0000 N   0  0  0  0  0  1  0  0  0  0  0  0
+   15.2090   -9.4000    0.0000 O   0  0  0  0  0  2  0  0  0  0  0  0
+   16.0750   -8.9000    0.0000 P   0  0  0  0  0  4  0  0  0  0  0  0
+   16.9410   -9.4000    0.0000 Cl  0  0  0  0  0  5  0  0  0  0  0  0
+   17.8071   -8.9000    0.0000 Br  0  0  0  0  0  2  0  0  0  0  0  0
+   18.6731   -9.4000    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   19.5391   -8.9000    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
   1  2  1  0     0  0
   2  3  1  0     0  0
   3  4  1  0     0  0
diff --git a/ketcher-autotests/tests/test-data/cml-1945-expected.cml b/ketcher-autotests/tests/test-data/cml-1945-expected.cml
index 24f6971604..b6ff92dfb0 100644
--- a/ketcher-autotests/tests/test-data/cml-1945-expected.cml
+++ b/ketcher-autotests/tests/test-data/cml-1945-expected.cml
@@ -2,11 +2,11 @@
 <cml>
     <molecule>
         <atomArray>
-            <atom id="a0" elementType="C" x2="13.4679" y2="-8.67499"/>
-            <atom id="a1" elementType="C" x2="14.3339" y2="-8.17501"/>
-            <atom id="a2" elementType="C" x2="15.1999" y2="-8.67499"/>
-            <atom id="a3" elementType="C" x2="16.0661" y2="-8.17501"/>
-            <atom id="a4" elementType="C" x2="16.9321" y2="-8.67499"/>
+            <atom id="a0" elementType="C" x2="14.3429" y2="-9.39999"/>
+            <atom id="a1" elementType="C" x2="15.2089" y2="-8.90001"/>
+            <atom id="a2" elementType="C" x2="16.0749" y2="-9.39999"/>
+            <atom id="a3" elementType="C" x2="16.9411" y2="-8.90001"/>
+            <atom id="a4" elementType="C" x2="17.8071" y2="-9.39999"/>
         </atomArray>
         <bondArray>
             <bond atomRefs2="a0 a1" order="1"/>
diff --git a/ketcher-autotests/tests/test-data/cml-1946-expected.cml b/ketcher-autotests/tests/test-data/cml-1946-expected.cml
index 644f8c0a4f..8787b06c2e 100644
--- a/ketcher-autotests/tests/test-data/cml-1946-expected.cml
+++ b/ketcher-autotests/tests/test-data/cml-1946-expected.cml
@@ -2,21 +2,21 @@
 <cml>
     <molecule>
         <atomArray>
-            <atom id="a0" elementType="C" x2="7.94599" y2="-6.82949"/>
-            <atom id="a1" elementType="C" x2="8.81199" y2="-6.32949"/>
-            <atom id="a2" elementType="C" x2="9.67799" y2="-6.82949"/>
-            <atom id="a3" elementType="C" x2="10.5441" y2="-6.32949"/>
-            <atom id="a4" elementType="C" x2="11.4101" y2="-6.82949"/>
-            <atom id="a5" elementType="Br" x2="11.9862" y2="-10.327"/>
-            <atom id="a6" elementType="Br" x2="11.9825" y2="-9.33194"/>
-            <atom id="a7" elementType="S" x2="10.9743" y2="-10.3141"/>
-            <atom id="a8" elementType="Br" x2="10.9718" y2="-9.33194"/>
-            <atom id="a9" elementType="C" x2="22.454" y2="-9.6545"/>
-            <atom id="a10" elementType="S" x2="21.954" y2="-8.78846"/>
-            <atom id="a11" elementType="C" x2="20.954" y2="-8.78845"/>
-            <atom id="a12" elementType="C" x2="20.454" y2="-9.65448"/>
-            <atom id="a13" elementType="C" x2="20.954" y2="-10.5205"/>
-            <atom id="a14" elementType="S" x2="21.954" y2="-10.5205"/>
+            <atom id="a0" elementType="C" x2="8.82099" y2="-7.55449"/>
+            <atom id="a1" elementType="C" x2="9.68699" y2="-7.05449"/>
+            <atom id="a2" elementType="C" x2="10.553" y2="-7.55449"/>
+            <atom id="a3" elementType="C" x2="11.4191" y2="-7.05449"/>
+            <atom id="a4" elementType="C" x2="12.2851" y2="-7.55449"/>
+            <atom id="a5" elementType="Br" x2="12.8612" y2="-11.052"/>
+            <atom id="a6" elementType="Br" x2="12.8575" y2="-10.0569"/>
+            <atom id="a7" elementType="S" x2="11.8493" y2="-11.0391"/>
+            <atom id="a8" elementType="Br" x2="11.8468" y2="-10.0569"/>
+            <atom id="a9" elementType="C" x2="23.329" y2="-10.3795"/>
+            <atom id="a10" elementType="S" x2="22.829" y2="-9.51346"/>
+            <atom id="a11" elementType="C" x2="21.829" y2="-9.51345"/>
+            <atom id="a12" elementType="C" x2="21.329" y2="-10.3795"/>
+            <atom id="a13" elementType="C" x2="21.829" y2="-11.2455"/>
+            <atom id="a14" elementType="S" x2="22.829" y2="-11.2455"/>
         </atomArray>
         <bondArray>
             <bond atomRefs2="a0 a1" order="1"/>
diff --git a/ketcher-autotests/tests/test-data/cml-1947-reaction-expected.cml b/ketcher-autotests/tests/test-data/cml-1947-reaction-expected.cml
index 76855f58e8..e89147ddf1 100644
--- a/ketcher-autotests/tests/test-data/cml-1947-reaction-expected.cml
+++ b/ketcher-autotests/tests/test-data/cml-1947-reaction-expected.cml
@@ -4,12 +4,12 @@
 <reactantList>
 <molecule>
     <atomArray>
-        <atom id="a0" elementType="C" x2="7.9589" y2="-7.775"/>
-        <atom id="a1" elementType="C" x2="8.82491" y2="-8.275"/>
-        <atom id="a2" elementType="C" x2="8.82491" y2="-9.27501"/>
-        <atom id="a3" elementType="C" x2="7.9589" y2="-9.77501"/>
-        <atom id="a4" elementType="C" x2="7.0929" y2="-9.27501"/>
-        <atom id="a5" elementType="C" x2="7.0929" y2="-8.275"/>
+        <atom id="a0" elementType="C" x2="10.3439" y2="-8.09999"/>
+        <atom id="a1" elementType="C" x2="11.2099" y2="-8.6"/>
+        <atom id="a2" elementType="C" x2="11.2099" y2="-9.6"/>
+        <atom id="a3" elementType="C" x2="10.3439" y2="-10.1"/>
+        <atom id="a4" elementType="C" x2="9.47788" y2="-9.6"/>
+        <atom id="a5" elementType="C" x2="9.47788" y2="-8.6"/>
     </atomArray>
     <bondArray>
         <bond atomRefs2="a0 a1" order="1"/>
@@ -28,10 +28,10 @@
 </molecule>
 <molecule>
     <atomArray>
-        <atom id="a0" elementType="C" x2="12.2589" y2="-8.85"/>
-        <atom id="a1" elementType="C" x2="13.1249" y2="-9.35001"/>
-        <atom id="a2" elementType="C" x2="13.991" y2="-8.85"/>
-        <atom id="a3" elementType="C" x2="14.857" y2="-9.35001"/>
+        <atom id="a0" elementType="C" x2="13.7099" y2="-8.85"/>
+        <atom id="a1" elementType="C" x2="14.5759" y2="-9.35"/>
+        <atom id="a2" elementType="C" x2="15.442" y2="-8.85"/>
+        <atom id="a3" elementType="C" x2="16.308" y2="-9.35"/>
     </atomArray>
     <bondArray>
         <bond atomRefs2="a0 a1" order="1"/>
@@ -43,15 +43,15 @@
 <productList>
 <molecule>
     <atomArray>
-        <atom id="a0" elementType="C" x2="21.409" y2="-7.9"/>
-        <atom id="a1" elementType="C" x2="22.275" y2="-8.4"/>
-        <atom id="a2" elementType="C" x2="22.275" y2="-9.40001"/>
-        <atom id="a3" elementType="C" x2="21.409" y2="-9.90001"/>
-        <atom id="a4" elementType="C" x2="20.543" y2="-9.40001"/>
-        <atom id="a5" elementType="C" x2="20.543" y2="-8.4"/>
-        <atom id="a6" elementType="C" x2="23.141" y2="-7.9"/>
-        <atom id="a7" elementType="C" x2="24.0071" y2="-8.4"/>
-        <atom id="a8" elementType="C" x2="23.141" y2="-6.89999"/>
+        <atom id="a0" elementType="C" x2="20.174" y2="-8.6"/>
+        <atom id="a1" elementType="C" x2="21.04" y2="-9.1"/>
+        <atom id="a2" elementType="C" x2="21.04" y2="-10.1"/>
+        <atom id="a3" elementType="C" x2="20.174" y2="-10.6"/>
+        <atom id="a4" elementType="C" x2="19.308" y2="-10.1"/>
+        <atom id="a5" elementType="C" x2="19.308" y2="-9.1"/>
+        <atom id="a6" elementType="C" x2="21.906" y2="-8.6"/>
+        <atom id="a7" elementType="C" x2="22.7721" y2="-9.1"/>
+        <atom id="a8" elementType="C" x2="21.906" y2="-7.59999"/>
     </atomArray>
     <bondArray>
         <bond atomRefs2="a0 a1" order="1"/>
diff --git a/ketcher-autotests/tests/test-data/cml-1948-r-group-expected.cml b/ketcher-autotests/tests/test-data/cml-1948-r-group-expected.cml
index cb8825e7b2..db4edcc6a8 100644
--- a/ketcher-autotests/tests/test-data/cml-1948-r-group-expected.cml
+++ b/ketcher-autotests/tests/test-data/cml-1948-r-group-expected.cml
@@ -2,75 +2,75 @@
 <cml>
     <molecule>
         <atomArray>
-            <atom id="a0" elementType="S" x2="7.19985" y2="-12.6523"/>
-            <atom id="a1" elementType="C" x2="8.06596" y2="-13.1522"/>
-            <atom id="a2" elementType="C" x2="8.93196" y2="-12.6523"/>
-            <atom id="a3" elementType="C" mrvQueryProps="u1;" x2="9.79796" y2="-13.1522"/>
-            <atom id="a4" elementType="C" x2="10.6641" y2="-12.6523" exactChange="1"/>
-            <atom id="a5" elementType="C" x2="11.5301" y2="-13.1522"/>
-            <atom id="a6" elementType="C" x2="12.3961" y2="-12.6523"/>
-            <atom id="a7" elementType="C" x2="13.2622" y2="-13.1522"/>
-            <atom id="a8" elementType="C" x2="14.1282" y2="-12.6523">
+            <atom id="a0" elementType="S" x2="7.39725" y2="-13.1914"/>
+            <atom id="a1" elementType="C" x2="8.26335" y2="-13.6913"/>
+            <atom id="a2" elementType="C" x2="9.12935" y2="-13.1914"/>
+            <atom id="a3" elementType="C" mrvQueryProps="u1;" x2="9.99536" y2="-13.6913"/>
+            <atom id="a4" elementType="C" x2="10.8615" y2="-13.1914" exactChange="1"/>
+            <atom id="a5" elementType="C" x2="11.7275" y2="-13.6913"/>
+            <atom id="a6" elementType="C" x2="12.5935" y2="-13.1914"/>
+            <atom id="a7" elementType="C" x2="13.4596" y2="-13.6913"/>
+            <atom id="a8" elementType="C" x2="14.3256" y2="-13.1914">
                 <atomParity atomRefs4="a7 a38 a9 a8">1</atomParity>
             </atom>
-            <atom id="a9" elementType="C" x2="14.9943" y2="-13.1522"/>
-            <atom id="a10" elementType="C" x2="15.8604" y2="-12.6523"/>
-            <atom id="a11" elementType="C" x2="16.7264" y2="-13.1522">
+            <atom id="a9" elementType="C" x2="15.1917" y2="-13.6913"/>
+            <atom id="a10" elementType="C" x2="16.0578" y2="-13.1914"/>
+            <atom id="a11" elementType="C" x2="16.9238" y2="-13.6913">
                 <atomParity atomRefs4="a10 a41 a12 a11">1</atomParity>
             </atom>
-            <atom id="a12" elementType="C" x2="17.5925" y2="-12.6523"/>
-            <atom id="a13" elementType="C" x2="18.4585" y2="-13.1522"/>
-            <atom id="a14" elementType="C" x2="19.3246" y2="-12.6523"/>
-            <atom id="a15" elementType="C" mrvQueryProps="H0" x2="20.1906" y2="-13.1522"/>
-            <atom id="a16" elementType="C" x2="21.0566" y2="-12.6523"/>
-            <atom id="a17" elementType="C" mrvQueryProps="s*;" x2="21.9227" y2="-13.1522"/>
-            <atom id="a18" elementType="C" x2="22.7887" y2="-12.6523"/>
-            <atom id="a19" elementType="R" rgroupRef="2" x2="23.6547" y2="-13.1522"/>
-            <atom id="a20" elementType="C" isotope="13" isotopeNumber="13" x2="21.0566" y2="-11.6522"/>
-            <atom id="a21" elementType="C" x2="21.9227" y2="-11.1522"/>
-            <atom id="a22" elementType="C" x2="21.9227" y2="-10.1521"/>
-            <atom id="a23" elementType="C" spinMultiplicity="1" radical="divalent1" x2="22.7887" y2="-9.6521"/>
-            <atom id="a24" elementType="C" x2="22.7887" y2="-8.65219"/>
-            <atom id="a25" elementType="C" x2="23.6547" y2="-8.15219"/>
-            <atom id="a26" elementType="C" formalCharge="2" x2="21.0566" y2="-9.6521"/>
-            <atom id="a27" elementType="C" x2="20.1906" y2="-10.1521"/>
-            <atom id="a28" elementType="C" x2="19.3246" y2="-9.6521" reactionStereo="Inv">
+            <atom id="a12" elementType="C" x2="17.7899" y2="-13.1914"/>
+            <atom id="a13" elementType="C" x2="18.6559" y2="-13.6913"/>
+            <atom id="a14" elementType="C" x2="19.522" y2="-13.1914"/>
+            <atom id="a15" elementType="C" mrvQueryProps="H0" x2="20.388" y2="-13.6913"/>
+            <atom id="a16" elementType="C" x2="21.254" y2="-13.1914"/>
+            <atom id="a17" elementType="C" mrvQueryProps="s*;" x2="22.1201" y2="-13.6913"/>
+            <atom id="a18" elementType="C" x2="22.9861" y2="-13.1914"/>
+            <atom id="a19" elementType="R" rgroupRef="2" x2="23.8521" y2="-13.6913"/>
+            <atom id="a20" elementType="C" isotope="13" isotopeNumber="13" x2="21.254" y2="-12.1913"/>
+            <atom id="a21" elementType="C" x2="22.1201" y2="-11.6913"/>
+            <atom id="a22" elementType="C" x2="22.1201" y2="-10.6912"/>
+            <atom id="a23" elementType="C" spinMultiplicity="1" radical="divalent1" x2="22.9861" y2="-10.1912"/>
+            <atom id="a24" elementType="C" x2="22.9861" y2="-9.19125"/>
+            <atom id="a25" elementType="C" x2="23.8521" y2="-8.69125"/>
+            <atom id="a26" elementType="C" formalCharge="2" x2="21.254" y2="-10.1912"/>
+            <atom id="a27" elementType="C" x2="20.388" y2="-10.6912"/>
+            <atom id="a28" elementType="C" x2="19.522" y2="-10.1912" reactionStereo="Inv">
                 <atomParity atomRefs4="a27 a34 a29 a28">1</atomParity>
             </atom>
-            <atom id="a29" elementType="C" x2="18.4585" y2="-10.1521"/>
-            <atom id="a30" elementType="C" x2="17.5925" y2="-9.6521"/>
-            <atom id="a31" elementType="C" x2="16.7264" y2="-10.1521"/>
-            <atom id="a32" elementType="C" mrvQueryProps="rb*;" x2="15.8604" y2="-9.6521"/>
-            <atom id="a33" elementType="C" x2="14.9943" y2="-10.1521"/>
-            <atom id="a34" elementType="C" x2="19.3246" y2="-8.65219"/>
-            <atom id="a35" elementType="C" x2="18.4585" y2="-8.15219"/>
-            <atom id="a36" elementType="R" rgroupRef="1" x2="18.4585" y2="-7.15209"/>
-            <atom id="a37" elementType="C" x2="17.5925" y2="-8.65219"/>
-            <atom id="a38" elementType="C" x2="14.1282" y2="-11.6522"/>
-            <atom id="a39" elementType="C" x2="13.2622" y2="-11.1522"/>
-            <atom id="a40" elementType="O" x2="13.2622" y2="-10.1521"/>
-            <atom id="a41" elementType="N" x2="16.7264" y2="-14.1522"/>
-            <atom id="a42" elementType="F" x2="8.93196" y2="-11.6522"/>
-            <atom id="a43" elementType="C" x2="22.7887" y2="-11.6522">
+            <atom id="a29" elementType="C" x2="18.6559" y2="-10.6912"/>
+            <atom id="a30" elementType="C" x2="17.7899" y2="-10.1912"/>
+            <atom id="a31" elementType="C" x2="16.9238" y2="-10.6912"/>
+            <atom id="a32" elementType="C" mrvQueryProps="rb*;" x2="16.0578" y2="-10.1912"/>
+            <atom id="a33" elementType="C" x2="15.1917" y2="-10.6912"/>
+            <atom id="a34" elementType="C" x2="19.522" y2="-9.19125"/>
+            <atom id="a35" elementType="C" x2="18.6559" y2="-8.69125"/>
+            <atom id="a36" elementType="R" rgroupRef="1" x2="18.6559" y2="-7.69115"/>
+            <atom id="a37" elementType="C" x2="17.7899" y2="-9.19125"/>
+            <atom id="a38" elementType="C" x2="14.3256" y2="-12.1913"/>
+            <atom id="a39" elementType="C" x2="13.4596" y2="-11.6913"/>
+            <atom id="a40" elementType="O" x2="13.4596" y2="-10.6912"/>
+            <atom id="a41" elementType="N" x2="16.9238" y2="-14.6913"/>
+            <atom id="a42" elementType="F" x2="9.12935" y2="-12.1913"/>
+            <atom id="a43" elementType="C" x2="22.9861" y2="-12.1913">
                 <atomParity atomRefs4="a-1 a21 a44 a43">1</atomParity>
             </atom>
-            <atom id="a44" elementType="C" x2="23.6547" y2="-11.1522"/>
-            <atom id="a45" elementType="C" x2="24.5207" y2="-11.6522"/>
-            <atom id="a46" elementType="C" x2="25.3868" y2="-11.1522"/>
-            <atom id="a47" elementType="C" x2="26.2528" y2="-11.6522"/>
-            <atom id="a48" elementType="C" x2="27.1188" y2="-11.1522"/>
-            <atom id="a49" elementType="C" x2="27.9848" y2="-11.6522"/>
-            <atom id="a50" elementType="C" x2="28.8509" y2="-11.1522"/>
-            <atom id="a51" elementType="C" x2="29.7169" y2="-11.6522"/>
-            <atom id="a52" elementType="C" x2="30.5829" y2="-11.1522"/>
-            <atom id="a53" elementType="C" x2="31.4489" y2="-11.6522"/>
-            <atom id="a54" elementType="C" x2="32.315" y2="-11.1522"/>
-            <atom id="a55" elementType="C" x2="33.181" y2="-11.6522"/>
-            <atom id="a56" elementType="C" x2="34.047" y2="-11.1522"/>
-            <atom id="a57" elementType="C" mrvQueryProps="L!C!Si!Ge!As: " x2="34.9131" y2="-11.6522"/>
-            <atom id="a58" elementType="C" mrvAlias="CYC" x2="27.1188" y2="-10.1522"/>
-            <atom id="a59" elementType="C" mrvPseudo="X" x2="30.5829" y2="-10.1522"/>
-            <atom id="a60" elementType="B" mrvQueryProps="L,B,C,N,P: " x2="32.315" y2="-10.1522"/>
+            <atom id="a44" elementType="C" x2="23.8521" y2="-11.6913"/>
+            <atom id="a45" elementType="C" x2="24.7181" y2="-12.1913"/>
+            <atom id="a46" elementType="C" x2="25.5842" y2="-11.6913"/>
+            <atom id="a47" elementType="C" x2="26.4502" y2="-12.1913"/>
+            <atom id="a48" elementType="C" x2="27.3162" y2="-11.6913"/>
+            <atom id="a49" elementType="C" x2="28.1822" y2="-12.1913"/>
+            <atom id="a50" elementType="C" x2="29.0483" y2="-11.6913"/>
+            <atom id="a51" elementType="C" x2="29.9143" y2="-12.1913"/>
+            <atom id="a52" elementType="C" x2="30.7803" y2="-11.6913"/>
+            <atom id="a53" elementType="C" x2="31.6463" y2="-12.1913"/>
+            <atom id="a54" elementType="C" x2="32.5124" y2="-11.6913"/>
+            <atom id="a55" elementType="C" x2="33.3784" y2="-12.1913"/>
+            <atom id="a56" elementType="C" x2="34.2444" y2="-11.6913"/>
+            <atom id="a57" elementType="C" mrvQueryProps="L!C!Si!Ge!As: " x2="35.1104" y2="-12.1913"/>
+            <atom id="a58" elementType="C" mrvAlias="CYC" x2="27.3162" y2="-10.6913"/>
+            <atom id="a59" elementType="C" mrvPseudo="X" x2="30.7803" y2="-10.6913"/>
+            <atom id="a60" elementType="B" mrvQueryProps="L,B,C,N,P: " x2="32.5124" y2="-10.6913"/>
         </atomArray>
         <bondArray>
             <bond atomRefs2="a0 a1" order="2"/>
diff --git a/ketcher-autotests/tests/test-data/heteroatoms-V3000-expected.mol b/ketcher-autotests/tests/test-data/heteroatoms-V3000-expected.mol
index 04e175b692..ddea0f1c40 100644
--- a/ketcher-autotests/tests/test-data/heteroatoms-V3000-expected.mol
+++ b/ketcher-autotests/tests/test-data/heteroatoms-V3000-expected.mol
@@ -1,19 +1,19 @@
 
-  -INDIGO-07102321522D
+  -INDIGO-08012307262D
 
   0  0  0  0  0  0  0  0  0  0  0 V3000
 M  V30 BEGIN CTAB
 M  V30 COUNTS 9 8 0 0 0
 M  V30 BEGIN ATOM
-M  V30 1 N 11.7359 -8.675 0.0 0
-M  V30 2 O 12.602 -8.175 0.0 0
-M  V30 3 S 13.4679 -8.675 0.0 0
-M  V30 4 P 14.334 -8.175 0.0 0
-M  V30 5 F 15.2001 -8.675 0.0 0
-M  V30 6 Cl 16.066 -8.175 0.0 0
-M  V30 7 Br 16.9321 -8.675 0.0 0
-M  V30 8 I 17.798 -8.175 0.0 0
-M  V30 9 H 18.6641 -8.675 0.0 0
+M  V30 1 N 12.6109 -9.4 0.0 0
+M  V30 2 O 13.477 -8.9 0.0 0
+M  V30 3 S 14.3429 -9.4 0.0 0
+M  V30 4 P 15.209 -8.9 0.0 0
+M  V30 5 F 16.0751 -9.4 0.0 0
+M  V30 6 Cl 16.941 -8.9 0.0 0
+M  V30 7 Br 17.8071 -9.4 0.0 0
+M  V30 8 I 18.673 -8.9 0.0 0
+M  V30 9 H 19.5391 -9.4 0.0 0
 M  V30 END ATOM
 M  V30 BEGIN BOND
 M  V30 1 1 1 2
diff --git a/ketcher-autotests/tests/test-data/heteroatoms-expected.mol b/ketcher-autotests/tests/test-data/heteroatoms-expected.mol
index c8b202d6cc..93b346cfbd 100644
--- a/ketcher-autotests/tests/test-data/heteroatoms-expected.mol
+++ b/ketcher-autotests/tests/test-data/heteroatoms-expected.mol
@@ -1,16 +1,16 @@
 
-  Ketcher  7102321522D 1   1.00000     0.00000     0
+  Ketcher  8 123 7262D 1   1.00000     0.00000     0
 
   9  8  0  0  0  0  0  0  0  0999 V2000
-   11.7359   -8.6750    0.0000 N   0  0  0  0  0  0  0  0  0  0  0  0
-   12.6020   -8.1750    0.0000 O   0  0  0  0  0  0  0  0  0  0  0  0
-   13.4680   -8.6750    0.0000 S   0  0  0  0  0  0  0  0  0  0  0  0
-   14.3340   -8.1750    0.0000 P   0  0  0  0  0  0  0  0  0  0  0  0
-   15.2000   -8.6750    0.0000 F   0  0  0  0  0  0  0  0  0  0  0  0
-   16.0660   -8.1750    0.0000 Cl  0  0  0  0  0  0  0  0  0  0  0  0
-   16.9320   -8.6750    0.0000 Br  0  0  0  0  0  0  0  0  0  0  0  0
-   17.7980   -8.1750    0.0000 I   0  0  0  0  0  0  0  0  0  0  0  0
-   18.6641   -8.6750    0.0000 H   0  0  0  0  0  0  0  0  0  0  0  0
+   12.6109   -9.4000    0.0000 N   0  0  0  0  0  0  0  0  0  0  0  0
+   13.4770   -8.9000    0.0000 O   0  0  0  0  0  0  0  0  0  0  0  0
+   14.3430   -9.4000    0.0000 S   0  0  0  0  0  0  0  0  0  0  0  0
+   15.2090   -8.9000    0.0000 P   0  0  0  0  0  0  0  0  0  0  0  0
+   16.0750   -9.4000    0.0000 F   0  0  0  0  0  0  0  0  0  0  0  0
+   16.9410   -8.9000    0.0000 Cl  0  0  0  0  0  0  0  0  0  0  0  0
+   17.8070   -9.4000    0.0000 Br  0  0  0  0  0  0  0  0  0  0  0  0
+   18.6730   -8.9000    0.0000 I   0  0  0  0  0  0  0  0  0  0  0  0
+   19.5391   -9.4000    0.0000 H   0  0  0  0  0  0  0  0  0  0  0  0
   1  2  1  0  0  0  0
   2  3  1  0  0  0  0
   3  4  1  0  0  0  0
diff --git a/ketcher-autotests/tests/test-data/ketcher (4)-expected.mol b/ketcher-autotests/tests/test-data/ketcher (4)-expected.mol
index 4c9d75aa39..450f06e7fb 100644
--- a/ketcher-autotests/tests/test-data/ketcher (4)-expected.mol	
+++ b/ketcher-autotests/tests/test-data/ketcher (4)-expected.mol	
@@ -1,24 +1,24 @@
 
-  Ketcher  7102321522D 1   1.00000     0.00000     0
+  Ketcher  8 123 7262D 1   1.00000     0.00000     0
 
  17 16  0  0  0  0  0  0  0  0999 V2000
-   10.0038   -9.3748    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   10.8698   -9.8748    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   11.7359   -9.3748    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   12.6020   -9.8748    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   13.4679   -9.3748    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   14.3340   -9.8748    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   15.2001   -9.3748    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   16.0661   -9.8748    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   16.9321   -9.3748    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   17.7981   -9.8748    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   18.6642   -9.3748    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   19.5302   -9.8748    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   20.3962   -9.3748    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   14.4338   -9.1160    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   14.6926   -8.1501    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   15.6587   -7.8911    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   15.9175   -6.9252    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   10.8788  -10.0748    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   11.7448  -10.5748    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   12.6109  -10.0748    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   13.4770  -10.5748    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   14.3429  -10.0748    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   15.2090  -10.5748    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   16.0751  -10.0748    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   16.9411  -10.5748    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   17.8071  -10.0748    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   18.6731  -10.5748    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   19.5392  -10.0748    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   20.4052  -10.5748    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   21.2712  -10.0748    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   15.3088   -9.8160    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   15.5676   -8.8501    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   16.5337   -8.5911    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   16.7925   -7.6252    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
   1  2  1  0     0  0
   2  3  1  0     0  0
   3  4  1  0     0  0
diff --git a/ketcher-autotests/tests/test-data/markush-expected.mol b/ketcher-autotests/tests/test-data/markush-expected.mol
index b98c14a139..b9d2bac6f2 100644
--- a/ketcher-autotests/tests/test-data/markush-expected.mol
+++ b/ketcher-autotests/tests/test-data/markush-expected.mol
@@ -7,18 +7,18 @@ $HDR
 $END HDR
 $CTAB
  12 12  0  0  0  0  0  0  0  0999 V2000
-   15.1062   -7.6481    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   16.8376   -7.6476    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   15.9736   -7.1476    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   16.8376   -8.6492    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   15.1062   -8.6537    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   15.9758   -9.1490    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   15.9736   -6.1493    0.0000 R#  0  0  0  0  0  0  0  0  0  0  0  0
-   14.2353   -7.1452    0.0000 R#  0  0  0  0  0  0  0  0  0  0  0  0
-   14.2395   -9.1540    0.0000 R#  0  0  0  0  0  0  0  0  0  0  0  0
-   15.9758  -10.1454    0.0000 R#  0  0  0  0  0  0  0  0  0  0  0  0
-   17.7006   -9.1473    0.0000 R#  0  0  0  0  0  0  0  0  0  0  0  0
-   17.7023   -7.1484    0.0000 R#  0  0  0  0  0  0  0  0  0  0  0  0
+   16.1297   -8.7289    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   17.8611   -8.7284    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   16.9971   -8.2284    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   17.8611   -9.7300    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   16.1297   -9.7345    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   16.9993  -10.2298    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   16.9971   -7.2301    0.0000 R#  0  0  0  0  0  0  0  0  0  0  0  0
+   15.2587   -8.2260    0.0000 R#  0  0  0  0  0  0  0  0  0  0  0  0
+   15.2630  -10.2348    0.0000 R#  0  0  0  0  0  0  0  0  0  0  0  0
+   16.9993  -11.2263    0.0000 R#  0  0  0  0  0  0  0  0  0  0  0  0
+   18.7241  -10.2282    0.0000 R#  0  0  0  0  0  0  0  0  0  0  0  0
+   18.7258   -8.2292    0.0000 R#  0  0  0  0  0  0  0  0  0  0  0  0
   6  4  1  0  0  0  0
   5  6  2  0  0  0  0
   2  3  1  0  0  0  0
@@ -39,19 +39,19 @@ $RGP
   1
 $CTAB
   1  0  0  0  0  0  0  0  0  0999 V2000
-   12.6977  -11.8007    0.0000 Br  0  0  0  0  0  0  0  0  0  0  0  0
+   13.7212  -12.8815    0.0000 Br  0  0  0  0  0  0  0  0  0  0  0  0
 M  APO  1   1   1
 M  END
 $END CTAB
 $CTAB
   1  0  0  0  0  0  0  0  0  0999 V2000
-   15.0773  -11.8007    0.0000 Cl  0  0  0  0  0  0  0  0  0  0  0  0
+   16.1007  -12.8815    0.0000 Cl  0  0  0  0  0  0  0  0  0  0  0  0
 M  APO  1   1   1
 M  END
 $END CTAB
 $CTAB
   1  0  0  0  0  0  0  0  0  0999 V2000
-   17.4189  -11.8007    0.0000 I   0  0  0  0  0  0  0  0  0  0  0  0
+   18.4424  -12.8815    0.0000 I   0  0  0  0  0  0  0  0  0  0  0  0
 M  APO  1   1   1
 M  END
 $END CTAB
diff --git a/ketcher-autotests/tests/test-data/mdl-rxnfile-v2000-expected.rxn b/ketcher-autotests/tests/test-data/mdl-rxnfile-v2000-expected.rxn
index 8f22e96ddf..6f8e25e139 100644
--- a/ketcher-autotests/tests/test-data/mdl-rxnfile-v2000-expected.rxn
+++ b/ketcher-autotests/tests/test-data/mdl-rxnfile-v2000-expected.rxn
@@ -1,19 +1,19 @@
 $RXN
 
- -INDIGO- 0710232157
+ -INDIGO- 0728230902
 
   1  1  1
 $MOL
 
-  -INDIGO-07102321572D
+  -INDIGO-07282309022D
 
   6  6  0  0  0  0  0  0  0  0999 V2000
-   10.1973   -7.9126    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   11.9277   -7.9121    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   11.0641   -7.4125    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   11.9277   -8.9130    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   10.1973   -8.9175    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   11.0663   -9.4125    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   11.0723   -8.6376    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   12.8027   -8.6371    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   11.9391   -8.1375    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   12.8027   -9.6380    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   11.0723   -9.6425    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   11.9413  -10.1375    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
   3  1  2  0  0  0  0
   4  2  2  0  0  0  0
   1  5  1  0  0  0  0
@@ -23,15 +23,15 @@ $MOL
 M  END
 $MOL
 
-  -INDIGO-07102321572D
+  -INDIGO-07282309022D
 
   6  6  0  0  0  0  0  0  0  0999 V2000
-   18.4723   -7.9376    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   20.2027   -7.9371    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   19.3391   -7.4375    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   20.2027   -8.9380    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   18.4723   -8.9425    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   19.3413   -9.4375    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   19.3473   -8.6626    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   21.0777   -8.6621    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   20.2141   -8.1625    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   21.0777   -9.6630    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   19.3473   -9.6675    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   20.2163  -10.1625    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
   3  1  2  0  0  0  0
   4  2  2  0  0  0  0
   1  5  1  0  0  0  0
@@ -41,8 +41,8 @@ $MOL
 M  END
 $MOL
 
-  -INDIGO-07102321572D
+  -INDIGO-07282309022D
 
   1  0  0  0  0  0  0  0  0  0999 V2000
-   14.9625   -8.0125    0.0000 N   0  0  0  0  0  0  0  0  0  0  0  0
+   15.8375   -8.7375    0.0000 N   0  0  0  0  0  0  0  0  0  0  0  0
 M  END
diff --git a/ketcher-autotests/tests/test-data/mdl-rxnfile-v3000-expected.rxn b/ketcher-autotests/tests/test-data/mdl-rxnfile-v3000-expected.rxn
index 450404b29d..062880a164 100644
--- a/ketcher-autotests/tests/test-data/mdl-rxnfile-v3000-expected.rxn
+++ b/ketcher-autotests/tests/test-data/mdl-rxnfile-v3000-expected.rxn
@@ -1,18 +1,18 @@
 $RXN V3000
 
- -INDIGO- 0710232157
+ -INDIGO- 0728230903
 
 M  V30 COUNTS 1 1 1
 M  V30 BEGIN REACTANT
 M  V30 BEGIN CTAB
 M  V30 COUNTS 6 6 0 0 0
 M  V30 BEGIN ATOM
-M  V30 1 C 10.1973 -7.91257 0.0 0
-M  V30 2 C 11.9277 -7.91209 0.0 0
-M  V30 3 C 11.0641 -7.41247 0.0 0
-M  V30 4 C 11.9277 -8.91303 0.0 0
-M  V30 5 C 10.1973 -8.91752 0.0 0
-M  V30 6 C 11.0663 -9.41253 0.0 0
+M  V30 1 C 11.0723 -8.63757 0.0 0
+M  V30 2 C 12.8027 -8.63709 0.0 0
+M  V30 3 C 11.9391 -8.13747 0.0 0
+M  V30 4 C 12.8027 -9.63803 0.0 0
+M  V30 5 C 11.0723 -9.64252 0.0 0
+M  V30 6 C 11.9413 -10.1375 0.0 0
 M  V30 END ATOM
 M  V30 BEGIN BOND
 M  V30 1 2 3 1
@@ -28,12 +28,12 @@ M  V30 BEGIN PRODUCT
 M  V30 BEGIN CTAB
 M  V30 COUNTS 6 6 0 0 0
 M  V30 BEGIN ATOM
-M  V30 1 C 18.4723 -7.93757 0.0 0
-M  V30 2 C 20.2027 -7.93709 0.0 0
-M  V30 3 C 19.3391 -7.43747 0.0 0
-M  V30 4 C 20.2027 -8.93803 0.0 0
-M  V30 5 C 18.4723 -8.94252 0.0 0
-M  V30 6 C 19.3413 -9.43753 0.0 0
+M  V30 1 C 19.3473 -8.66257 0.0 0
+M  V30 2 C 21.0777 -8.66209 0.0 0
+M  V30 3 C 20.2141 -8.16247 0.0 0
+M  V30 4 C 21.0777 -9.66303 0.0 0
+M  V30 5 C 19.3473 -9.66752 0.0 0
+M  V30 6 C 20.2163 -10.1625 0.0 0
 M  V30 END ATOM
 M  V30 BEGIN BOND
 M  V30 1 2 3 1
@@ -49,7 +49,7 @@ M  V30 BEGIN AGENT
 M  V30 BEGIN CTAB
 M  V30 COUNTS 1 0 0 0 0
 M  V30 BEGIN ATOM
-M  V30 1 N 14.9625 -8.0125 0.0 0
+M  V30 1 N 15.8375 -8.7375 0.0 0
 M  V30 END ATOM
 M  V30 BEGIN BOND
 M  V30 END BOND
diff --git a/ketcher-autotests/tests/test-data/mixed-and-stereomarks-expected.ket b/ketcher-autotests/tests/test-data/mixed-and-stereomarks-expected.ket
index 84fda0a651..0ba9e39260 100644
--- a/ketcher-autotests/tests/test-data/mixed-and-stereomarks-expected.ket
+++ b/ketcher-autotests/tests/test-data/mixed-and-stereomarks-expected.ket
@@ -12,56 +12,56 @@
             {
                 "label": "O",
                 "location": [
-                    17.31229922460997,
-                    -6.898900551028723,
+                    18.187299224609966,
+                    -7.598900551028723,
                     0
                 ]
             },
             {
                 "label": "O",
                 "location": [
-                    17.31229922460997,
-                    -8.900299816348229,
+                    18.187299224609966,
+                    -9.600299816348228,
                     0
                 ]
             },
             {
                 "label": "O",
                 "location": [
-                    15.57879986094885,
-                    -9.901099448971276,
+                    16.45379986094885,
+                    -10.601099448971276,
                     0
                 ]
             },
             {
                 "label": "O",
                 "location": [
-                    13.85060049534219,
-                    -8.900499816274811,
+                    14.725600495342189,
+                    -9.60049981627481,
                     0
                 ]
             },
             {
                 "label": "O",
                 "location": [
-                    15.578599861022267,
-                    -6.898900551028723,
+                    16.453599861022266,
+                    -7.598900551028723,
                     0
                 ]
             },
             {
                 "label": "O",
                 "location": [
-                    13.087700775390031,
-                    -7.546300313379002,
+                    13.96270077539003,
+                    -8.246300313379002,
                     0
                 ]
             },
             {
                 "label": "C",
                 "location": [
-                    16.44819954180664,
-                    -7.3993003673402455,
+                    17.323199541806638,
+                    -8.099300367340245,
                     0
                 ],
                 "stereoLabel": "&2"
@@ -69,8 +69,8 @@
             {
                 "label": "C",
                 "location": [
-                    16.44819954180664,
-                    -8.399900000036707,
+                    17.323199541806638,
+                    -9.099900000036707,
                     0
                 ],
                 "stereoLabel": "abs"
@@ -78,8 +78,8 @@
             {
                 "label": "C",
                 "location": [
-                    15.578599861022267,
-                    -8.900499816274811,
+                    16.453599861022266,
+                    -9.60049981627481,
                     0
                 ],
                 "stereoLabel": "abs"
@@ -87,8 +87,8 @@
             {
                 "label": "C",
                 "location": [
-                    14.71470017814552,
-                    -8.40009999996329,
+                    15.589700178145518,
+                    -9.10009999996329,
                     0
                 ],
                 "stereoLabel": "&1"
@@ -96,8 +96,8 @@
             {
                 "label": "C",
                 "location": [
-                    14.71470017814552,
-                    -7.399400367303537,
+                    15.589700178145518,
+                    -8.099400367303536,
                     0
                 ],
                 "stereoLabel": "abs"
@@ -105,8 +105,8 @@
             {
                 "label": "C",
                 "location": [
-                    13.85060049534219,
-                    -6.899000550992015,
+                    14.725600495342189,
+                    -7.599000550992014,
                     0
                 ]
             }
diff --git a/ketcher-autotests/tests/test-data/mixed-or-stereomarks-expected.ket b/ketcher-autotests/tests/test-data/mixed-or-stereomarks-expected.ket
index 906db2026e..3476a0c74a 100644
--- a/ketcher-autotests/tests/test-data/mixed-or-stereomarks-expected.ket
+++ b/ketcher-autotests/tests/test-data/mixed-or-stereomarks-expected.ket
@@ -12,56 +12,56 @@
             {
                 "label": "O",
                 "location": [
-                    17.31229922460997,
-                    -6.898900551028723,
+                    18.187299224609966,
+                    -7.598900551028723,
                     0
                 ]
             },
             {
                 "label": "O",
                 "location": [
-                    17.31229922460997,
-                    -8.900299816348229,
+                    18.187299224609966,
+                    -9.600299816348228,
                     0
                 ]
             },
             {
                 "label": "O",
                 "location": [
-                    15.57879986094885,
-                    -9.901099448971276,
+                    16.45379986094885,
+                    -10.601099448971276,
                     0
                 ]
             },
             {
                 "label": "O",
                 "location": [
-                    13.85060049534219,
-                    -8.900499816274811,
+                    14.725600495342189,
+                    -9.60049981627481,
                     0
                 ]
             },
             {
                 "label": "O",
                 "location": [
-                    15.578599861022267,
-                    -6.898900551028723,
+                    16.453599861022266,
+                    -7.598900551028723,
                     0
                 ]
             },
             {
                 "label": "O",
                 "location": [
-                    13.087700775390031,
-                    -7.546300313379002,
+                    13.96270077539003,
+                    -8.246300313379002,
                     0
                 ]
             },
             {
                 "label": "C",
                 "location": [
-                    16.44819954180664,
-                    -7.3993003673402455,
+                    17.323199541806638,
+                    -8.099300367340245,
                     0
                 ],
                 "stereoLabel": "or2"
@@ -69,8 +69,8 @@
             {
                 "label": "C",
                 "location": [
-                    16.44819954180664,
-                    -8.399900000036707,
+                    17.323199541806638,
+                    -9.099900000036707,
                     0
                 ],
                 "stereoLabel": "abs"
@@ -78,8 +78,8 @@
             {
                 "label": "C",
                 "location": [
-                    15.578599861022267,
-                    -8.900499816274811,
+                    16.453599861022266,
+                    -9.60049981627481,
                     0
                 ],
                 "stereoLabel": "abs"
@@ -87,8 +87,8 @@
             {
                 "label": "C",
                 "location": [
-                    14.71470017814552,
-                    -8.40009999996329,
+                    15.589700178145518,
+                    -9.10009999996329,
                     0
                 ],
                 "stereoLabel": "or1"
@@ -96,8 +96,8 @@
             {
                 "label": "C",
                 "location": [
-                    14.71470017814552,
-                    -7.399400367303537,
+                    15.589700178145518,
+                    -8.099400367303536,
                     0
                 ],
                 "stereoLabel": "abs"
@@ -105,8 +105,8 @@
             {
                 "label": "C",
                 "location": [
-                    13.85060049534219,
-                    -6.899000550992015,
+                    14.725600495342189,
+                    -7.599000550992014,
                     0
                 ]
             }
diff --git a/ketcher-autotests/tests/test-data/mol-1848-to-compare-expectedV2000.mol b/ketcher-autotests/tests/test-data/mol-1848-to-compare-expectedV2000.mol
index be684fc6af..2bdbc1032c 100644
--- a/ketcher-autotests/tests/test-data/mol-1848-to-compare-expectedV2000.mol
+++ b/ketcher-autotests/tests/test-data/mol-1848-to-compare-expectedV2000.mol
@@ -1,5 +1,5 @@
 
-  Ketcher  7102321522D 1   1.00000     0.00000     0
+  Ketcher  8 123 7272D 1   1.00000     0.00000     0
 
   6  6  0  0  0  0  0  0  0  0999 V2000
    13.8348   -7.5001    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
diff --git a/ketcher-autotests/tests/test-data/mol_1855_to_open-expected.mol b/ketcher-autotests/tests/test-data/mol_1855_to_open-expected.mol
index 5d83fb3ed4..0746188799 100644
--- a/ketcher-autotests/tests/test-data/mol_1855_to_open-expected.mol
+++ b/ketcher-autotests/tests/test-data/mol_1855_to_open-expected.mol
@@ -1,34 +1,34 @@
 
-  Ketcher  7102321512D 1   1.00000     0.00000     0
+  Ketcher  8 123 7252D 1   1.00000     0.00000     0
 
  27 26  0  0  0  0  0  0  0  0999 V2000
-    7.8388   -6.3500    0.0000 N   0  0  0  0  0  4  0  0  0  0  0  0
-    8.7048   -5.8500    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-    9.5709   -6.3500    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   10.4369   -5.8500    0.0000 Q   0  0  0  0  0  0  0  0  0  0  0  0
-   11.3029   -6.3500    0.0000 A   0  0  0  0  0  0  0  0  0  0  0  0
-   12.1689   -5.8500    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   13.0350   -6.3500    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   13.9010   -5.8500    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   14.7670   -6.3500    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   15.6330   -5.8500    0.0000 C   0  0  0  1  0  0  0  0  0  0  0  0
-   16.4990   -6.3500    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   17.3651   -5.8500    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   18.2311   -6.3500    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   19.0971   -5.8500    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   19.9631   -6.3500    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   20.8292   -5.8500    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   21.6952   -6.3500    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   22.5612   -5.8500    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   11.3029   -7.3500    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   10.4369   -7.8500    0.0000 L   0  0  0  0  0  0  0  0  0  0  0  0
-   12.1689   -7.8500    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   12.1689   -8.8500    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   13.0350   -9.3500    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   13.0350  -10.3500    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   13.9010  -10.8500    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   13.9010  -11.8500    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   14.7670  -12.3500    0.0000 L   0  0  0  0  0  0  0  0  0  0  0  0
+    8.8623   -7.1558    0.0000 N   0  0  0  0  0  4  0  0  0  0  0  0
+    9.7283   -6.6558    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   10.5944   -7.1558    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   11.4604   -6.6558    0.0000 Q   0  0  0  0  0  0  0  0  0  0  0  0
+   12.3264   -7.1558    0.0000 A   0  0  0  0  0  0  0  0  0  0  0  0
+   13.1924   -6.6558    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   14.0585   -7.1558    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   14.9245   -6.6558    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   15.7905   -7.1558    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   16.6565   -6.6558    0.0000 C   0  0  0  1  0  0  0  0  0  0  0  0
+   17.5225   -7.1558    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   18.3886   -6.6558    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   19.2546   -7.1558    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   20.1206   -6.6558    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   20.9866   -7.1558    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   21.8527   -6.6558    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   22.7187   -7.1558    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   23.5847   -6.6558    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   12.3264   -8.1558    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   11.4604   -8.6558    0.0000 L   0  0  0  0  0  0  0  0  0  0  0  0
+   13.1924   -8.6558    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   13.1924   -9.6558    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   14.0585  -10.1558    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   14.0585  -11.1558    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   14.9245  -11.6558    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   14.9245  -12.6558    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   15.7905  -13.1558    0.0000 L   0  0  0  0  0  0  0  0  0  0  0  0
   1  2  1  0  0  0  0
   2  3  1  0  0  0  0
   3  4  1  0  0  0  0
diff --git a/ketcher-autotests/tests/test-data/multiple-group-data-expected.mol b/ketcher-autotests/tests/test-data/multiple-group-data-expected.mol
index 98a127a71b..6201b50d24 100644
--- a/ketcher-autotests/tests/test-data/multiple-group-data-expected.mol
+++ b/ketcher-autotests/tests/test-data/multiple-group-data-expected.mol
@@ -1,14 +1,14 @@
 
-  -INDIGO-07102321592D
+  -INDIGO-07282309052D
 
   7  6  0  0  0  0  0  0  0  0999 V2000
-   12.6019   -8.1750    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   13.4679   -8.6750    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   14.3340   -8.1750    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   15.2000   -8.6750    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   16.0660   -8.1750    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   16.9321   -8.6750    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   17.7981   -8.1750    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   13.4769   -8.9000    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   14.3429   -9.4000    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   15.2090   -8.9000    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   16.0750   -9.4000    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   16.9410   -8.9000    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   17.8071   -9.4000    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   18.6731   -8.9000    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
   1  2  1  0  0  0  0
   2  3  1  0  0  0  0
   3  4  1  0  0  0  0
@@ -20,6 +20,6 @@ M  SLB  1   1   1
 M  SAL   1  5   2   3   4   5   6
 M  SPA   1  5   2   3   4   5   6
 M  SMT   1 1
-M  SDI   1  4   12.9679   -9.1750   12.9679   -7.6750
-M  SDI   1  4   17.4321   -7.6750   17.4321   -9.1750
+M  SDI   1  4   13.8429   -9.9000   13.8429   -8.4000
+M  SDI   1  4   18.3071   -8.4000   18.3071   -9.9000
 M  END
diff --git a/ketcher-autotests/tests/test-data/one-structure-with-abs-flag-expected.mol b/ketcher-autotests/tests/test-data/one-structure-with-abs-flag-expected.mol
index e5b32501b8..eecc661290 100644
--- a/ketcher-autotests/tests/test-data/one-structure-with-abs-flag-expected.mol
+++ b/ketcher-autotests/tests/test-data/one-structure-with-abs-flag-expected.mol
@@ -1,31 +1,31 @@
 
-  Ketcher  7102321552D 1   1.00000     0.00000     0
+  Ketcher  72823 9 12D 1   1.00000     0.00000     0
 
  24 24  0  0  1  0  0  0  0  0999 V2000
-    9.7287   -7.5574    0.0000 O   0  0  0  0  0  0  0  0  0  0  0  0
-    9.0692   -9.6080    0.0000 O   0  0  0  0  0  0  0  0  0  0  0  0
-    6.8959   -9.6119    0.0000 O   0  0  0  0  0  0  0  0  0  0  0  0
-    7.9569   -7.2631    0.0000 O   0  0  0  0  0  0  0  0  0  0  0  0
-    8.7792   -7.8674    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-    8.4816   -8.8028    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-    7.4708   -8.8028    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-    7.1529   -7.8527    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   18.7039   -7.5324    0.0000 O   0  0  0  0  0  0  0  0  0  0  0  0
-   18.0444   -9.5830    0.0000 O   0  0  0  0  0  0  0  0  0  0  0  0
-   15.8711   -9.5869    0.0000 O   0  0  0  0  0  0  0  0  0  0  0  0
-   16.9321   -7.2381    0.0000 O   0  0  0  0  0  0  0  0  0  0  0  0
-   17.7544   -7.8424    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   17.4568   -8.7778    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   16.4460   -8.7778    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   16.1281   -7.8277    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   27.7541   -7.4824    0.0000 O   0  0  0  0  0  0  0  0  0  0  0  0
-   27.0946   -9.5330    0.0000 O   0  0  0  0  0  0  0  0  0  0  0  0
-   24.9213   -9.5369    0.0000 O   0  0  0  0  0  0  0  0  0  0  0  0
-   25.9823   -7.1881    0.0000 O   0  0  0  0  0  0  0  0  0  0  0  0
-   26.8046   -7.7924    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   26.5070   -8.7278    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   25.4962   -8.7278    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   25.1783   -7.7777    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   10.9537   -8.4457    0.0000 O   0  0  0  0  0  0  0  0  0  0  0  0
+   10.2942  -10.4963    0.0000 O   0  0  0  0  0  0  0  0  0  0  0  0
+    8.1209  -10.5002    0.0000 O   0  0  0  0  0  0  0  0  0  0  0  0
+    9.1819   -8.1514    0.0000 O   0  0  0  0  0  0  0  0  0  0  0  0
+   10.0042   -8.7557    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+    9.7066   -9.6911    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+    8.6958   -9.6911    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+    8.3779   -8.7410    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   19.9289   -8.4207    0.0000 O   0  0  0  0  0  0  0  0  0  0  0  0
+   19.2694  -10.4713    0.0000 O   0  0  0  0  0  0  0  0  0  0  0  0
+   17.0961  -10.4752    0.0000 O   0  0  0  0  0  0  0  0  0  0  0  0
+   18.1571   -8.1264    0.0000 O   0  0  0  0  0  0  0  0  0  0  0  0
+   18.9794   -8.7307    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   18.6818   -9.6661    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   17.6710   -9.6661    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   17.3531   -8.7160    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   28.9791   -8.3707    0.0000 O   0  0  0  0  0  0  0  0  0  0  0  0
+   28.3196  -10.4213    0.0000 O   0  0  0  0  0  0  0  0  0  0  0  0
+   26.1463  -10.4252    0.0000 O   0  0  0  0  0  0  0  0  0  0  0  0
+   27.2073   -8.0764    0.0000 O   0  0  0  0  0  0  0  0  0  0  0  0
+   28.0296   -8.6807    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   27.7320   -9.6161    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   26.7212   -9.6161    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   26.4033   -8.6660    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
   8  4  1  0     0  0
   8  7  1  0     0  0
   4  5  1  0     0  0
diff --git a/ketcher-autotests/tests/test-data/r-group-V3000-expectedV3000.rxn b/ketcher-autotests/tests/test-data/r-group-V3000-expectedV3000.rxn
index 5899572ca0..d85f816358 100644
--- a/ketcher-autotests/tests/test-data/r-group-V3000-expectedV3000.rxn
+++ b/ketcher-autotests/tests/test-data/r-group-V3000-expectedV3000.rxn
@@ -1,16 +1,16 @@
 $RXN V3000
 
- -INDIGO- 0710232152
+ -INDIGO- 0801230727
 
 M  V30 COUNTS 1 1
 M  V30 BEGIN REACTANT
 M  V30 BEGIN CTAB
 M  V30 COUNTS 4 3 0 0 0
 M  V30 BEGIN ATOM
-M  V30 1 C 10.6153 -8.22857 0.0 0
-M  V30 2 R# 11.4813 -7.72857 0.0 0 RGROUPS=(1 1)
-M  V30 3 C 9.74923 -7.72857 0.0 0
-M  V30 4 C 10.6153 -9.22857 0.0 0
+M  V30 1 C 11.4903 -8.95357 0.0 0
+M  V30 2 R# 12.3563 -8.45357 0.0 0 RGROUPS=(1 1)
+M  V30 3 C 10.6242 -8.45357 0.0 0
+M  V30 4 C 11.4903 -9.95357 0.0 0
 M  V30 END ATOM
 M  V30 BEGIN BOND
 M  V30 1 1 1 4
@@ -23,11 +23,11 @@ M  V30 BEGIN PRODUCT
 M  V30 BEGIN CTAB
 M  V30 COUNTS 5 4 0 0 0
 M  V30 BEGIN ATOM
-M  V30 1 C 17.1867 -8.12143 0.0 0
-M  V30 2 C 18.0527 -7.62143 0.0 0
-M  V30 3 C 18.9188 -8.12143 0.0 0
-M  V30 4 C 19.7847 -7.62143 0.0 0
-M  V30 5 R# 20.6508 -8.12143 0.0 0 RGROUPS=(1 2)
+M  V30 1 C 18.0617 -8.84643 0.0 0
+M  V30 2 C 18.9277 -8.34643 0.0 0
+M  V30 3 C 19.7938 -8.84643 0.0 0
+M  V30 4 C 20.6597 -8.34643 0.0 0
+M  V30 5 R# 21.5258 -8.84643 0.0 0 RGROUPS=(1 2)
 M  V30 END ATOM
 M  V30 BEGIN BOND
 M  V30 1 1 1 2
diff --git a/ketcher-autotests/tests/test-data/r-group-expected.mol b/ketcher-autotests/tests/test-data/r-group-expected.mol
index 815b7ff290..a6ef6b4d61 100644
--- a/ketcher-autotests/tests/test-data/r-group-expected.mol
+++ b/ketcher-autotests/tests/test-data/r-group-expected.mol
@@ -7,14 +7,14 @@ $HDR
 $END HDR
 $CTAB
   8  7  0  0  0  0  0  0  0  0999 V2000
-   12.1690   -6.5071    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   13.0350   -6.0071    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   13.9010   -6.5071    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   14.7670   -6.0071    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   15.6330   -6.5071    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   16.4990   -6.0071    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   17.3650   -6.5071    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   18.2310   -6.0071    0.0000 R#  0  0  0  0  0  0  0  0  0  0  0  0
+   13.1925   -7.7629    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   14.0585   -7.2629    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   14.9245   -7.7629    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   15.7905   -7.2629    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   16.6565   -7.7629    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   17.5225   -7.2629    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   18.3885   -7.7629    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   19.2545   -7.2629    0.0000 R#  0  0  0  0  0  0  0  0  0  0  0  0
   1  2  1  0  0  0  0
   2  3  1  0  0  0  0
   3  4  1  0  0  0  0
@@ -30,9 +30,9 @@ $RGP
   1
 $CTAB
   3  2  0  0  0  0  0  0  0  0999 V2000
-   13.0422  -13.4413    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   13.9083  -13.9413    0.0000 Br  0  0  0  0  0  0  0  0  0  0  0  0
-   13.0422  -12.4413    0.0000 O   0  0  0  0  0  0  0  0  0  0  0  0
+   14.0657  -14.6971    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   14.9317  -15.1971    0.0000 Br  0  0  0  0  0  0  0  0  0  0  0  0
+   14.0657  -13.6971    0.0000 O   0  0  0  0  0  0  0  0  0  0  0  0
   1  2  1  0  0  0  0
   1  3  2  0  0  0  0
 M  APO  1   1   1
@@ -40,12 +40,12 @@ M  END
 $END CTAB
 $CTAB
   6  5  0  0  0  0  0  0  0  0999 V2000
-   16.0832  -12.9895    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   16.9492  -13.4895    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   17.6737  -12.7747    0.0000 F   0  0  0  0  0  0  0  0  0  0  0  0
-   16.6992  -14.4929    0.0000 F   0  0  0  0  0  0  0  0  0  0  0  0
-   17.7660  -13.9713    0.0000 F   0  0  0  0  0  0  0  0  0  0  0  0
-   16.0832  -11.9895    0.0000 O   0  0  0  0  0  0  0  0  0  0  0  0
+   17.1067  -14.2453    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   17.9727  -14.7453    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   18.6972  -14.0305    0.0000 F   0  0  0  0  0  0  0  0  0  0  0  0
+   17.7227  -15.7487    0.0000 F   0  0  0  0  0  0  0  0  0  0  0  0
+   18.7894  -15.2271    0.0000 F   0  0  0  0  0  0  0  0  0  0  0  0
+   17.1067  -13.2453    0.0000 O   0  0  0  0  0  0  0  0  0  0  0  0
   1  2  1  0  0  0  0
   2  3  1  0  0  0  0
   2  4  1  0  0  0  0
diff --git a/ketcher-autotests/tests/test-data/reaction-with-arrow-and-plus-expected.rxn b/ketcher-autotests/tests/test-data/reaction-with-arrow-and-plus-expected.rxn
index a93e9b5093..3303f6faf1 100644
--- a/ketcher-autotests/tests/test-data/reaction-with-arrow-and-plus-expected.rxn
+++ b/ketcher-autotests/tests/test-data/reaction-with-arrow-and-plus-expected.rxn
@@ -1,22 +1,22 @@
 $RXN
 
- -INDIGO- 0710232158
+ -INDIGO- 0728230904
 
   1  2
 $MOL
 
-  -INDIGO-07102321582D
+  -INDIGO-07282309042D
 
   9  8  0  0  0  0  0  0  0  0999 V2000
-    6.6875   -8.2250    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-    7.5535   -8.7250    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-    9.2856   -8.7250    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   10.1516   -8.2250    0.0000 Br  0  0  0  0  0  0  0  0  0  0  0  0
-    8.4196   -8.2250    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   11.0176   -8.7250    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   11.8836   -8.2250    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   12.7497   -8.7250    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   13.6157   -8.2250    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+    7.8875   -9.1383    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+    8.7535   -9.6383    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   10.4856   -9.6383    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   11.3516   -9.1383    0.0000 Br  0  0  0  0  0  0  0  0  0  0  0  0
+    9.6196   -9.1383    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   12.2176   -9.6383    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   13.0836   -9.1383    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   13.9497   -9.6383    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   14.8157   -9.1383    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
   1  2  1  0  0  0  0
   3  4  1  0  0  0  0
   5  3  1  0  0  0  0
@@ -28,22 +28,22 @@ $MOL
 M  END
 $MOL
 
-  -INDIGO-07102321582D
+  -INDIGO-07282309042D
 
   1  0  0  0  0  0  0  0  0  0999 V2000
-   25.1625   -8.2000    0.0000 Br  0  0  0  0  0  0  0  0  0  0  0  0
+   26.3625   -9.1133    0.0000 Br  0  0  0  0  0  0  0  0  0  0  0  0
 M  END
 $MOL
 
-  -INDIGO-07102321582D
+  -INDIGO-07282309042D
 
   6  5  0  0  0  0  0  0  0  0999 V2000
-   18.4920   -8.1250    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   19.3580   -8.6250    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   20.2240   -8.1250    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   21.0900   -8.6250    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   21.9561   -8.1250    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   22.8221   -8.6250    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   19.6920   -9.0383    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   20.5580   -9.5383    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   21.4240   -9.0383    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   22.2900   -9.5383    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   23.1561   -9.0383    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   24.0221   -9.5383    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
   1  2  1  0  0  0  0
   2  3  1  0  0  0  0
   3  4  1  0  0  0  0
diff --git a/ketcher-autotests/tests/test-data/reaction-with-arrow-and-plus-expectedV3000.rxn b/ketcher-autotests/tests/test-data/reaction-with-arrow-and-plus-expectedV3000.rxn
index 9bddc88c43..e675419d2a 100644
--- a/ketcher-autotests/tests/test-data/reaction-with-arrow-and-plus-expectedV3000.rxn
+++ b/ketcher-autotests/tests/test-data/reaction-with-arrow-and-plus-expectedV3000.rxn
@@ -1,21 +1,21 @@
 $RXN V3000
 
- -INDIGO- 0710232158
+ -INDIGO- 0728230904
 
 M  V30 COUNTS 1 2
 M  V30 BEGIN REACTANT
 M  V30 BEGIN CTAB
 M  V30 COUNTS 9 8 0 0 0
 M  V30 BEGIN ATOM
-M  V30 1 C 6.68746 -8.225 0.0 0
-M  V30 2 C 7.55347 -8.725 0.0 0
-M  V30 3 C 9.28557 -8.725 0.0 0
-M  V30 4 Br 10.1516 -8.225 0.0 0
-M  V30 5 C 8.41957 -8.225 0.0 0
-M  V30 6 C 11.0176 -8.725 0.0 0
-M  V30 7 C 11.8836 -8.225 0.0 0
-M  V30 8 C 12.7497 -8.725 0.0 0
-M  V30 9 C 13.6157 -8.225 0.0 0
+M  V30 1 C 7.88746 -9.13827 0.0 0
+M  V30 2 C 8.75347 -9.63827 0.0 0
+M  V30 3 C 10.4856 -9.63827 0.0 0
+M  V30 4 Br 11.3516 -9.13827 0.0 0
+M  V30 5 C 9.61957 -9.13827 0.0 0
+M  V30 6 C 12.2176 -9.63826 0.0 0
+M  V30 7 C 13.0836 -9.13827 0.0 0
+M  V30 8 C 13.9497 -9.63826 0.0 0
+M  V30 9 C 14.8157 -9.13827 0.0 0
 M  V30 END ATOM
 M  V30 BEGIN BOND
 M  V30 1 1 1 2
@@ -33,7 +33,7 @@ M  V30 BEGIN PRODUCT
 M  V30 BEGIN CTAB
 M  V30 COUNTS 1 0 0 0 0
 M  V30 BEGIN ATOM
-M  V30 1 Br 25.1625 -8.2 0.0 0
+M  V30 1 Br 26.3625 -9.11327 0.0 0
 M  V30 END ATOM
 M  V30 BEGIN BOND
 M  V30 END BOND
@@ -41,12 +41,12 @@ M  V30 END CTAB
 M  V30 BEGIN CTAB
 M  V30 COUNTS 6 5 0 0 0
 M  V30 BEGIN ATOM
-M  V30 1 C 18.492 -8.125 0.0 0
-M  V30 2 C 19.358 -8.625 0.0 0
-M  V30 3 C 20.224 -8.125 0.0 0
-M  V30 4 C 21.09 -8.625 0.0 0
-M  V30 5 C 21.9561 -8.125 0.0 0
-M  V30 6 C 22.8221 -8.625 0.0 0
+M  V30 1 C 19.692 -9.03826 0.0 0
+M  V30 2 C 20.558 -9.53826 0.0 0
+M  V30 3 C 21.424 -9.03826 0.0 0
+M  V30 4 C 22.29 -9.53826 0.0 0
+M  V30 5 C 23.1561 -9.03826 0.0 0
+M  V30 6 C 24.0221 -9.53826 0.0 0
 M  V30 END ATOM
 M  V30 BEGIN BOND
 M  V30 1 1 1 2
diff --git a/ketcher-autotests/tests/test-data/rxn-1849-to-compare-expectedV2000.rxn b/ketcher-autotests/tests/test-data/rxn-1849-to-compare-expectedV2000.rxn
index e0a9636882..8950dc82b6 100644
--- a/ketcher-autotests/tests/test-data/rxn-1849-to-compare-expectedV2000.rxn
+++ b/ketcher-autotests/tests/test-data/rxn-1849-to-compare-expectedV2000.rxn
@@ -1,11 +1,11 @@
 $RXN
 
- -INDIGO- 0710232152
+ -INDIGO- 0801230727
 
   1  1
 $MOL
 
-  -INDIGO-07102321522D
+  -INDIGO-08012307272D
 
   6  6  0  0  0  0  0  0  0  0999 V2000
    13.8348   -7.5001    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
@@ -23,7 +23,7 @@ $MOL
 M  END
 $MOL
 
-  -INDIGO-07102321522D
+  -INDIGO-08012307272D
 
   6  6  0  0  0  0  0  0  0  0999 V2000
    13.8348   -2.7251    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
diff --git a/ketcher-autotests/tests/test-data/sec-butyl-abr-expectedV2000.rxn b/ketcher-autotests/tests/test-data/sec-butyl-abr-expectedV2000.rxn
index 26f95446fe..a2074e13a5 100644
--- a/ketcher-autotests/tests/test-data/sec-butyl-abr-expectedV2000.rxn
+++ b/ketcher-autotests/tests/test-data/sec-butyl-abr-expectedV2000.rxn
@@ -1,18 +1,18 @@
 $RXN
 
- -INDIGO- 0710232152
+ -INDIGO- 0801230727
 
   2  1
 $MOL
 
-  -INDIGO-07102321522D
+  -INDIGO-08012307272D
 
   5  5  0  0  0  0  0  0  0  0999 V2000
-   16.3772   -9.8268    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   15.2967   -9.0417    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   15.7093   -7.7714    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   17.0451   -7.7714    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   17.4578   -9.0417    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   17.7898  -10.3660    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   16.7093   -9.5809    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   17.1219   -8.3105    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   18.4577   -8.3105    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   18.8704   -9.5809    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
   1  2  1  0  0  0  0
   2  3  1  0  0  0  0
   3  4  1  0  0  0  0
@@ -21,19 +21,19 @@ $MOL
 M  END
 $MOL
 
-  -INDIGO-07102321522D
+  -INDIGO-08012307272D
 
  10  9  0  0  0  0  0  0  0  0999 V2000
-    6.5036   -8.7841    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-    7.3137   -8.3164    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-    8.1239   -8.7841    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-    8.9340   -8.3164    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-    9.7441   -8.7841    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   10.5542   -8.3164    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   11.3643   -8.7841    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   12.1744   -8.3164    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   12.9845   -8.7841    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   11.3643   -9.7195    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+    7.7284   -9.1045    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+    8.5386   -8.6367    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+    9.3487   -9.1045    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   10.1588   -8.6367    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   10.9689   -9.1045    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   11.7790   -8.6367    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   12.5891   -9.1045    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   13.3992   -8.6367    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   14.2093   -9.1045    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   12.5891  -10.0398    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
   1  2  1  0  0  0  0
   2  3  1  0  0  0  0
   3  4  1  0  0  0  0
@@ -52,26 +52,26 @@ M  SDI   1  4    0.0000    0.0000    0.0000    0.0000
 M  END
 $MOL
 
-  -INDIGO-07102321522D
+  -INDIGO-08012307272D
 
  17 17  0  0  0  0  0  0  0  0999 V2000
-   23.7154   -9.3786    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   22.9053   -8.9108    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   22.0952   -9.3786    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   24.5255   -8.9108    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   25.3357   -9.3786    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   26.1458   -8.9108    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   26.9559   -9.3786    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   27.7660   -8.9108    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   28.5761   -9.3786    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   29.3862   -8.9108    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   30.1964   -9.3786    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   29.3862   -7.9754    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   28.6294   -7.4256    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   28.9185   -6.5360    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   29.8540   -6.5360    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   30.1431   -7.4256    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   28.5761  -10.3140    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   23.4906  -10.2918    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   22.6805   -9.8241    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   21.8704  -10.2918    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   24.3007   -9.8241    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   25.1109  -10.2918    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   25.9210   -9.8241    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   26.7311  -10.2918    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   27.5412   -9.8241    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   28.3513  -10.2918    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   29.1614   -9.8241    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   29.9716  -10.2918    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   29.1614   -8.8886    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   28.4046   -8.3389    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   28.6937   -7.4492    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   29.6292   -7.4492    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   29.9183   -8.3389    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   28.3513  -11.2273    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
   1  2  1  0  0  0  0
   2  3  1  0  0  0  0
   1  4  1  0  0  0  0
diff --git a/ketcher-autotests/tests/test-data/sec_butyl_abr-expected.mol b/ketcher-autotests/tests/test-data/sec_butyl_abr-expected.mol
index dd13d20c59..8d5f9487c3 100644
--- a/ketcher-autotests/tests/test-data/sec_butyl_abr-expected.mol
+++ b/ketcher-autotests/tests/test-data/sec_butyl_abr-expected.mol
@@ -1,17 +1,17 @@
 
-  Ketcher  7102321522D 1   1.00000     0.00000     0
+  Ketcher  8 123 7252D 1   1.00000     0.00000     0
 
  10  9  0  0  0  0  0  0  0  0999 V2000
-    9.9538   -8.4250    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   10.8199   -7.9250    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   11.6859   -8.4250    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   12.5519   -7.9250    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   13.4179   -8.4250    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   14.2840   -7.9250    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   15.1500   -8.4250    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   16.0160   -7.9250    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   16.8821   -8.4250    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   15.1500   -9.4249    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   10.7788   -9.1500    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   11.6449   -8.6500    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   12.5109   -9.1500    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   13.3769   -8.6500    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   14.2429   -9.1500    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   15.1090   -8.6500    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   15.9750   -9.1500    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   16.8410   -8.6500    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   17.7071   -9.1500    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   15.9750  -10.1499    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
   1  2  1  0  0  0  0
   2  3  1  0  0  0  0
   3  4  1  0  0  0  0
diff --git a/ketcher-autotests/tests/test-data/sec_butyl_abr_V3000-expected.mol b/ketcher-autotests/tests/test-data/sec_butyl_abr_V3000-expected.mol
index 5cb91f08cd..9699655c14 100644
--- a/ketcher-autotests/tests/test-data/sec_butyl_abr_V3000-expected.mol
+++ b/ketcher-autotests/tests/test-data/sec_butyl_abr_V3000-expected.mol
@@ -1,20 +1,20 @@
 
-  -INDIGO-07102321522D
+  -INDIGO-08012307262D
 
   0  0  0  0  0  0  0  0  0  0  0 V3000
 M  V30 BEGIN CTAB
 M  V30 COUNTS 10 9 1 0 0
 M  V30 BEGIN ATOM
-M  V30 1 C 9.95393 -8.425 0.0 0
-M  V30 2 C 10.82 -7.92494 0.0 0
-M  V30 3 C 11.6859 -8.425 0.0 0
-M  V30 4 C 12.552 -7.92494 0.0 0
-M  V30 5 C 13.418 -8.425 0.0 0
-M  V30 6 C 14.284 -7.92494 0.0 0
-M  V30 7 C 15.15 -8.425 0.0 0
-M  V30 8 C 15.1499 -9.42493 0.0 0
-M  V30 9 C 16.0161 -7.92507 0.0 0
-M  V30 10 C 16.882 -8.42513 0.0 0
+M  V30 1 C 10.7789 -9.15 0.0 0
+M  V30 2 C 11.645 -8.64994 0.0 0
+M  V30 3 C 12.5109 -9.15 0.0 0
+M  V30 4 C 13.377 -8.64994 0.0 0
+M  V30 5 C 14.243 -9.15 0.0 0
+M  V30 6 C 15.109 -8.64994 0.0 0
+M  V30 7 C 15.975 -9.15 0.0 0
+M  V30 8 C 15.9749 -10.1499 0.0 0
+M  V30 9 C 16.8411 -8.65007 0.0 0
+M  V30 10 C 17.707 -9.15013 0.0 0
 M  V30 END ATOM
 M  V30 BEGIN BOND
 M  V30 1 1 1 2
diff --git a/ketcher-autotests/tests/test-data/spiro-expected.mol b/ketcher-autotests/tests/test-data/spiro-expected.mol
index 91341f858b..da33c863dd 100644
--- a/ketcher-autotests/tests/test-data/spiro-expected.mol
+++ b/ketcher-autotests/tests/test-data/spiro-expected.mol
@@ -1,36 +1,36 @@
 
-  -INDIGO-07102321522D
+  -INDIGO-08012307262D
 
   0  0  0  0  0  0  0  0  0  0  0 V3000
 M  V30 BEGIN CTAB
 M  V30 COUNTS 26 30 0 0 0
 M  V30 BEGIN ATOM
-M  V30 1 C 10.988 -6.16455 0.0 0
-M  V30 2 C 10.988 -7.16468 0.0 0
-M  V30 3 C 11.8541 -7.66464 0.0 0
-M  V30 4 C 12.7201 -7.16468 0.0 0
-M  V30 5 C 12.7201 -6.16455 0.0 0
-M  V30 6 C 11.8541 -5.66459 0.0 0
-M  V30 7 C 12.4613 -8.13064 0.0 0
-M  V30 8 C 13.1684 -8.83774 0.0 0
-M  V30 9 C 14.1344 -8.57889 0.0 0
-M  V30 10 C 14.3932 -7.61293 0.0 0
-M  V30 11 C 13.6861 -6.90583 0.0 0
-M  V30 12 C 14.3931 -9.54485 0.0 0
-M  V30 13 C 15.3591 -9.8037 0.0 0
-M  V30 14 C 16.0662 -9.09649 0.0 0
-M  V30 15 C 15.8073 -8.13064 0.0 0
-M  V30 16 C 14.8415 -7.87178 0.0 0
-M  V30 17 C 15.8073 -10.0625 0.0 0
-M  V30 18 C 16.5144 -10.7696 0.0 0
-M  V30 19 C 17.4803 -10.5107 0.0 0
-M  V30 20 C 17.7391 -9.54485 0.0 0
-M  V30 21 C 17.032 -8.83774 0.0 0
-M  V30 22 C 17.7391 -11.4767 0.0 0
-M  V30 23 C 18.705 -11.7354 0.0 0
-M  V30 24 C 19.412 -11.0284 0.0 0
-M  V30 25 C 19.1532 -10.0625 0.0 0
-M  V30 26 C 18.1874 -9.8037 0.0 0
+M  V30 1 C 12.0115 -6.99536 0.0 0
+M  V30 2 C 12.0115 -7.99549 0.0 0
+M  V30 3 C 12.8776 -8.49545 0.0 0
+M  V30 4 C 13.7436 -7.99549 0.0 0
+M  V30 5 C 13.7436 -6.99536 0.0 0
+M  V30 6 C 12.8776 -6.49539 0.0 0
+M  V30 7 C 13.4848 -8.96144 0.0 0
+M  V30 8 C 14.1919 -9.66855 0.0 0
+M  V30 9 C 15.1578 -9.4097 0.0 0
+M  V30 10 C 15.4167 -8.44374 0.0 0
+M  V30 11 C 14.7096 -7.73663 0.0 0
+M  V30 12 C 15.4166 -10.3757 0.0 0
+M  V30 13 C 16.3825 -10.6345 0.0 0
+M  V30 14 C 17.0897 -9.9273 0.0 0
+M  V30 15 C 16.8308 -8.96144 0.0 0
+M  V30 16 C 15.8649 -8.70259 0.0 0
+M  V30 17 C 16.8308 -10.8933 0.0 0
+M  V30 18 C 17.5379 -11.6004 0.0 0
+M  V30 19 C 18.5038 -11.3415 0.0 0
+M  V30 20 C 18.7626 -10.3757 0.0 0
+M  V30 21 C 18.0555 -9.66855 0.0 0
+M  V30 22 C 18.7626 -12.3075 0.0 0
+M  V30 23 C 19.7285 -12.5662 0.0 0
+M  V30 24 C 20.4355 -11.8592 0.0 0
+M  V30 25 C 20.1767 -10.8933 0.0 0
+M  V30 26 C 19.2109 -10.6345 0.0 0
 M  V30 END ATOM
 M  V30 BEGIN BOND
 M  V30 1 1 5 6
diff --git a/ketcher-autotests/tests/test-data/sru-polymer-data-expected.mol b/ketcher-autotests/tests/test-data/sru-polymer-data-expected.mol
index 3e1751a638..2149c3bec7 100644
--- a/ketcher-autotests/tests/test-data/sru-polymer-data-expected.mol
+++ b/ketcher-autotests/tests/test-data/sru-polymer-data-expected.mol
@@ -1,22 +1,22 @@
 
-  -INDIGO-07102321592D
+  -INDIGO-07282309062D
 
  15 14  0  0  0  0  0  0  0  0999 V2000
-    9.1378   -8.1750    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   10.0038   -8.6750    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   10.8699   -8.1750    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   11.7359   -8.6750    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   12.6019   -8.1750    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   13.4679   -8.6750    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   14.3340   -8.1750    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   15.2000   -8.6750    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   16.0660   -8.1750    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   16.9320   -8.6750    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   17.7981   -8.1750    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   18.6641   -8.6750    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   19.5301   -8.1750    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   20.3961   -8.6750    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   21.2622   -8.1750    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   10.0128   -8.9000    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   10.8788   -9.4000    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   11.7449   -8.9000    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   12.6109   -9.4000    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   13.4769   -8.9000    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   14.3429   -9.4000    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   15.2090   -8.9000    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   16.0750   -9.4000    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   16.9410   -8.9000    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   17.8070   -9.4000    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   18.6731   -8.9000    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   19.5391   -9.4000    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   20.4051   -8.9000    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   21.2711   -9.4000    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   22.1372   -8.9000    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
   1  2  1  0  0  0  0
   2  3  1  0  0  0  0
   3  4  1  0  0  0  0
@@ -36,6 +36,6 @@ M  SLB  1   1   1
 M  SCN  1   1 HT 
 M  SAL   1  6   3   4   5   6   7   8
 M  SMT   1 n
-M  SDI   1  4   10.5699   -8.9250   10.5699   -7.9250
-M  SDI   1  4   15.5000   -7.9250   15.5000   -8.9250
+M  SDI   1  4   11.4449   -9.6500   11.4449   -8.6500
+M  SDI   1  4   16.3750   -8.6500   16.3750   -9.6500
 M  END
diff --git a/ketcher-autotests/tests/test-data/stereo-and-structure-expected.ket b/ketcher-autotests/tests/test-data/stereo-and-structure-expected.ket
index 22e47c39bc..3863512022 100644
--- a/ketcher-autotests/tests/test-data/stereo-and-structure-expected.ket
+++ b/ketcher-autotests/tests/test-data/stereo-and-structure-expected.ket
@@ -12,56 +12,56 @@
             {
                 "label": "O",
                 "location": [
-                    17.33729922460997,
-                    -6.898900551028723,
+                    18.23729922460997,
+                    -7.598900551028723,
                     0
                 ]
             },
             {
                 "label": "O",
                 "location": [
-                    17.33729922460997,
-                    -8.90029981634823,
+                    18.23729922460997,
+                    -9.60029981634823,
                     0
                 ]
             },
             {
                 "label": "O",
                 "location": [
-                    15.603799860948854,
-                    -9.901099448971276,
+                    16.503799860948853,
+                    -10.601099448971276,
                     0
                 ]
             },
             {
                 "label": "O",
                 "location": [
-                    13.875600495342194,
-                    -8.900499816274813,
+                    14.775600495342193,
+                    -9.600499816274812,
                     0
                 ]
             },
             {
                 "label": "O",
                 "location": [
-                    15.603599861022271,
-                    -6.898900551028723,
+                    16.50359986102227,
+                    -7.598900551028723,
                     0
                 ]
             },
             {
                 "label": "O",
                 "location": [
-                    13.112700775390033,
-                    -7.546300313379001,
+                    14.012700775390032,
+                    -8.246300313379,
                     0
                 ]
             },
             {
                 "label": "C",
                 "location": [
-                    16.473199541806643,
-                    -7.3993003673402455,
+                    17.373199541806642,
+                    -8.099300367340245,
                     0
                 ],
                 "stereoLabel": "&1"
@@ -69,8 +69,8 @@
             {
                 "label": "C",
                 "location": [
-                    16.473199541806643,
-                    -8.399900000036707,
+                    17.373199541806642,
+                    -9.099900000036707,
                     0
                 ],
                 "stereoLabel": "&1"
@@ -78,8 +78,8 @@
             {
                 "label": "C",
                 "location": [
-                    15.603599861022271,
-                    -8.900499816274813,
+                    16.50359986102227,
+                    -9.600499816274812,
                     0
                 ],
                 "stereoLabel": "&1"
@@ -87,8 +87,8 @@
             {
                 "label": "C",
                 "location": [
-                    14.739700178145524,
-                    -8.40009999996329,
+                    15.639700178145523,
+                    -9.10009999996329,
                     0
                 ],
                 "stereoLabel": "&1"
@@ -96,8 +96,8 @@
             {
                 "label": "C",
                 "location": [
-                    14.739700178145524,
-                    -7.399400367303537,
+                    15.639700178145523,
+                    -8.099400367303536,
                     0
                 ],
                 "stereoLabel": "&1"
@@ -105,8 +105,8 @@
             {
                 "label": "C",
                 "location": [
-                    13.875600495342194,
-                    -6.899000550992015,
+                    14.775600495342193,
+                    -7.599000550992014,
                     0
                 ]
             }
diff --git a/ketcher-autotests/tests/test-data/stereo-mixed-structure-expected.ket b/ketcher-autotests/tests/test-data/stereo-mixed-structure-expected.ket
index 45f73ecc20..d3c44491eb 100644
--- a/ketcher-autotests/tests/test-data/stereo-mixed-structure-expected.ket
+++ b/ketcher-autotests/tests/test-data/stereo-mixed-structure-expected.ket
@@ -12,56 +12,56 @@
             {
                 "label": "O",
                 "location": [
-                    17.312299224609973,
-                    -6.898900551028724,
+                    18.18729922460997,
+                    -7.5989005510287235,
                     0
                 ]
             },
             {
                 "label": "O",
                 "location": [
-                    17.312299224609973,
-                    -8.900299816348232,
+                    18.18729922460997,
+                    -9.600299816348231,
                     0
                 ]
             },
             {
                 "label": "O",
                 "location": [
-                    15.578799860948854,
-                    -9.901099448971275,
+                    16.453799860948852,
+                    -10.601099448971274,
                     0
                 ]
             },
             {
                 "label": "O",
                 "location": [
-                    13.850600495342192,
-                    -8.900499816274815,
+                    14.72560049534219,
+                    -9.600499816274814,
                     0
                 ]
             },
             {
                 "label": "O",
                 "location": [
-                    15.578599861022271,
-                    -6.898900551028724,
+                    16.45359986102227,
+                    -7.5989005510287235,
                     0
                 ]
             },
             {
                 "label": "O",
                 "location": [
-                    13.087700775390033,
-                    -7.546300313379004,
+                    13.962700775390031,
+                    -8.246300313379002,
                     0
                 ]
             },
             {
                 "label": "C",
                 "location": [
-                    16.448199541806645,
-                    -7.399300367340247,
+                    17.32319954180664,
+                    -8.099300367340247,
                     0
                 ],
                 "stereoLabel": "or1"
@@ -69,8 +69,8 @@
             {
                 "label": "C",
                 "location": [
-                    16.448199541806645,
-                    -8.399900000036709,
+                    17.32319954180664,
+                    -9.099900000036708,
                     0
                 ],
                 "stereoLabel": "abs"
@@ -78,8 +78,8 @@
             {
                 "label": "C",
                 "location": [
-                    15.578599861022271,
-                    -8.900499816274815,
+                    16.45359986102227,
+                    -9.600499816274814,
                     0
                 ],
                 "stereoLabel": "abs"
@@ -87,8 +87,8 @@
             {
                 "label": "C",
                 "location": [
-                    14.714700178145522,
-                    -8.400099999963292,
+                    15.58970017814552,
+                    -9.100099999963291,
                     0
                 ],
                 "stereoLabel": "&1"
@@ -96,8 +96,8 @@
             {
                 "label": "C",
                 "location": [
-                    14.714700178145522,
-                    -7.399400367303539,
+                    15.58970017814552,
+                    -8.099400367303538,
                     0
                 ],
                 "stereoLabel": "abs"
@@ -105,8 +105,8 @@
             {
                 "label": "C",
                 "location": [
-                    13.850600495342192,
-                    -6.899000550992016,
+                    14.72560049534219,
+                    -7.599000550992015,
                     0
                 ]
             }
diff --git a/ketcher-autotests/tests/test-data/stereo-or-structure-expected.ket b/ketcher-autotests/tests/test-data/stereo-or-structure-expected.ket
index 7e63b61acd..8b6b6703fb 100644
--- a/ketcher-autotests/tests/test-data/stereo-or-structure-expected.ket
+++ b/ketcher-autotests/tests/test-data/stereo-or-structure-expected.ket
@@ -12,56 +12,56 @@
             {
                 "label": "O",
                 "location": [
-                    17.33729922460997,
-                    -6.898900551028723,
+                    18.23729922460997,
+                    -7.598900551028723,
                     0
                 ]
             },
             {
                 "label": "O",
                 "location": [
-                    17.33729922460997,
-                    -8.90029981634823,
+                    18.23729922460997,
+                    -9.60029981634823,
                     0
                 ]
             },
             {
                 "label": "O",
                 "location": [
-                    15.603799860948854,
-                    -9.901099448971276,
+                    16.503799860948853,
+                    -10.601099448971276,
                     0
                 ]
             },
             {
                 "label": "O",
                 "location": [
-                    13.875600495342194,
-                    -8.900499816274813,
+                    14.775600495342193,
+                    -9.600499816274812,
                     0
                 ]
             },
             {
                 "label": "O",
                 "location": [
-                    15.603599861022271,
-                    -6.898900551028723,
+                    16.50359986102227,
+                    -7.598900551028723,
                     0
                 ]
             },
             {
                 "label": "O",
                 "location": [
-                    13.112700775390033,
-                    -7.546300313379001,
+                    14.012700775390032,
+                    -8.246300313379,
                     0
                 ]
             },
             {
                 "label": "C",
                 "location": [
-                    16.473199541806643,
-                    -7.3993003673402455,
+                    17.373199541806642,
+                    -8.099300367340245,
                     0
                 ],
                 "stereoLabel": "or1"
@@ -69,8 +69,8 @@
             {
                 "label": "C",
                 "location": [
-                    16.473199541806643,
-                    -8.399900000036707,
+                    17.373199541806642,
+                    -9.099900000036707,
                     0
                 ],
                 "stereoLabel": "or1"
@@ -78,8 +78,8 @@
             {
                 "label": "C",
                 "location": [
-                    15.603599861022271,
-                    -8.900499816274813,
+                    16.50359986102227,
+                    -9.600499816274812,
                     0
                 ],
                 "stereoLabel": "or1"
@@ -87,8 +87,8 @@
             {
                 "label": "C",
                 "location": [
-                    14.739700178145524,
-                    -8.40009999996329,
+                    15.639700178145523,
+                    -9.10009999996329,
                     0
                 ],
                 "stereoLabel": "or1"
@@ -96,8 +96,8 @@
             {
                 "label": "C",
                 "location": [
-                    14.739700178145524,
-                    -7.399400367303537,
+                    15.639700178145523,
+                    -8.099400367303536,
                     0
                 ],
                 "stereoLabel": "or1"
@@ -105,8 +105,8 @@
             {
                 "label": "C",
                 "location": [
-                    13.875600495342194,
-                    -6.899000550992015,
+                    14.775600495342193,
+                    -7.599000550992014,
                     0
                 ]
             }
diff --git a/ketcher-autotests/tests/test-data/structure-with-stereo-bonds-expected.ket b/ketcher-autotests/tests/test-data/structure-with-stereo-bonds-expected.ket
index 6eceea7aa0..38299db6a2 100644
--- a/ketcher-autotests/tests/test-data/structure-with-stereo-bonds-expected.ket
+++ b/ketcher-autotests/tests/test-data/structure-with-stereo-bonds-expected.ket
@@ -12,24 +12,24 @@
             {
                 "label": "C",
                 "location": [
-                    12.62691338253587,
-                    -8.150101287208233,
+                    13.526913382535868,
+                    -8.850101287208233,
                     0
                 ]
             },
             {
                 "label": "C",
                 "location": [
-                    13.492808922377366,
-                    -8.650098711761586,
+                    14.392808922377364,
+                    -9.350098711761586,
                     0
                 ]
             },
             {
                 "label": "C",
                 "location": [
-                    14.358904461188683,
-                    -8.150101287208233,
+                    15.258904461188681,
+                    -8.850101287208233,
                     0
                 ],
                 "stereoLabel": "&1"
@@ -37,8 +37,8 @@
             {
                 "label": "C",
                 "location": [
-                    15.22490000051509,
-                    -8.650098711761586,
+                    16.12490000051509,
+                    -9.350098711761586,
                     0
                 ],
                 "stereoLabel": "&1"
@@ -46,40 +46,40 @@
             {
                 "label": "C",
                 "location": [
-                    16.090895539841497,
-                    -8.150101287208233,
+                    16.990895539841496,
+                    -8.850101287208233,
                     0
                 ]
             },
             {
                 "label": "C",
                 "location": [
-                    16.95699107865282,
-                    -8.650098711761586,
+                    17.85699107865282,
+                    -9.350098711761586,
                     0
                 ]
             },
             {
                 "label": "C",
                 "location": [
-                    17.823086617464135,
-                    -8.150101287208233,
+                    18.723086617464133,
+                    -8.850101287208233,
                     0
                 ]
             },
             {
                 "label": "C",
                 "location": [
-                    14.358904461188683,
-                    -7.150006438616618,
+                    15.258904461188681,
+                    -7.850006438616617,
                     0
                 ]
             },
             {
                 "label": "C",
                 "location": [
-                    15.22490000051509,
-                    -9.649993561383383,
+                    16.12490000051509,
+                    -10.349993561383382,
                     0
                 ]
             }
diff --git a/ketcher-autotests/tests/test-data/structure-with-stereo-bonds-expectedV2000.mol b/ketcher-autotests/tests/test-data/structure-with-stereo-bonds-expectedV2000.mol
index 7d24aef060..db1ef00d74 100644
--- a/ketcher-autotests/tests/test-data/structure-with-stereo-bonds-expectedV2000.mol
+++ b/ketcher-autotests/tests/test-data/structure-with-stereo-bonds-expectedV2000.mol
@@ -1,16 +1,16 @@
 
-  Ketcher  7102321532D 1   1.00000     0.00000     0
+  Ketcher  72823 8592D 1   1.00000     0.00000     0
 
   9  8  0  0  0  0  0  0  0  0999 V2000
-   12.6269   -8.1501    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   13.4928   -8.6501    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   14.3589   -8.1501    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   15.2249   -8.6501    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   16.0909   -8.1501    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   16.9570   -8.6501    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   17.8231   -8.1501    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   14.3589   -7.1500    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   15.2249   -9.6500    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   13.5269   -8.8501    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   14.3928   -9.3501    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   15.2589   -8.8501    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   16.1249   -9.3501    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   16.9909   -8.8501    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   17.8570   -9.3501    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   18.7231   -8.8501    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   15.2589   -7.8500    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   16.1249  -10.3500    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
   1  2  1  0     0  0
   2  3  1  0     0  0
   3  4  1  0     0  0
diff --git a/ketcher-autotests/tests/test-data/structure-with-stereo-bonds-expectedV3000.mol b/ketcher-autotests/tests/test-data/structure-with-stereo-bonds-expectedV3000.mol
index b0090423d6..0ecfec51a0 100644
--- a/ketcher-autotests/tests/test-data/structure-with-stereo-bonds-expectedV3000.mol
+++ b/ketcher-autotests/tests/test-data/structure-with-stereo-bonds-expectedV3000.mol
@@ -1,19 +1,19 @@
 
-  -INDIGO-07102321532D
+  -INDIGO-07282308592D
 
   0  0  0  0  0  0  0  0  0  0  0 V3000
 M  V30 BEGIN CTAB
 M  V30 COUNTS 9 8 0 0 0
 M  V30 BEGIN ATOM
-M  V30 1 C 12.6269 -8.1501 0.0 0
-M  V30 2 C 13.4928 -8.6501 0.0 0
-M  V30 3 C 14.3589 -8.1501 0.0 0 CFG=2
-M  V30 4 C 15.2249 -8.6501 0.0 0 CFG=2
-M  V30 5 C 16.0909 -8.1501 0.0 0
-M  V30 6 C 16.957 -8.6501 0.0 0
-M  V30 7 C 17.8231 -8.1501 0.0 0
-M  V30 8 C 14.3589 -7.15001 0.0 0
-M  V30 9 C 15.2249 -9.64999 0.0 0
+M  V30 1 C 13.5269 -8.8501 0.0 0
+M  V30 2 C 14.3928 -9.3501 0.0 0
+M  V30 3 C 15.2589 -8.8501 0.0 0 CFG=2
+M  V30 4 C 16.1249 -9.3501 0.0 0 CFG=2
+M  V30 5 C 16.9909 -8.8501 0.0 0
+M  V30 6 C 17.857 -9.3501 0.0 0
+M  V30 7 C 18.7231 -8.8501 0.0 0
+M  V30 8 C 15.2589 -7.85001 0.0 0
+M  V30 9 C 16.1249 -10.35 0.0 0
 M  V30 END ATOM
 M  V30 BEGIN BOND
 M  V30 1 1 1 2
diff --git a/ketcher-autotests/tests/test-data/superatom-all-chain-expected.mol b/ketcher-autotests/tests/test-data/superatom-all-chain-expected.mol
index f59f6ce312..a05402c566 100644
--- a/ketcher-autotests/tests/test-data/superatom-all-chain-expected.mol
+++ b/ketcher-autotests/tests/test-data/superatom-all-chain-expected.mol
@@ -1,16 +1,16 @@
 
-  -INDIGO-07102322002D
+  -INDIGO-07282309062D
 
   9  8  0  0  0  0  0  0  0  0999 V2000
-   11.7859   -8.1750    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   12.6519   -8.6750    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   13.5179   -8.1750    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   14.3840   -8.6750    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   15.2500   -8.1750    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   16.1160   -8.6750    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   16.9820   -8.1750    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   17.8481   -8.6750    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   18.7141   -8.1750    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   12.7109   -8.9000    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   13.5769   -9.4000    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   14.4429   -8.9000    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   15.3090   -9.4000    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   16.1750   -8.9000    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   17.0410   -9.4000    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   17.9071   -8.9000    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   18.7731   -9.4000    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   19.6391   -8.9000    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
   1  2  1  0  0  0  0
   2  3  1  0  0  0  0
   3  4  1  0  0  0  0
diff --git a/ketcher-autotests/tests/test-data/three-structure-enantiomer-expected.mol b/ketcher-autotests/tests/test-data/three-structure-enantiomer-expected.mol
index 97058df383..07108776d8 100644
--- a/ketcher-autotests/tests/test-data/three-structure-enantiomer-expected.mol
+++ b/ketcher-autotests/tests/test-data/three-structure-enantiomer-expected.mol
@@ -1,31 +1,31 @@
 
-  Ketcher  7102321552D 1   1.00000     0.00000     0
+  Ketcher  72823 9 12D 1   1.00000     0.00000     0
 
  24 24  0  0  0  0  0  0  0  0999 V2000
-   10.5787   -7.5574    0.0000 O   0  0  0  0  0  0  0  0  0  0  0  0
-    9.9192   -9.6080    0.0000 O   0  0  0  0  0  0  0  0  0  0  0  0
-    7.7459   -9.6119    0.0000 O   0  0  0  0  0  0  0  0  0  0  0  0
-    8.8069   -7.2631    0.0000 O   0  0  0  0  0  0  0  0  0  0  0  0
-    9.6292   -7.8674    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-    9.3316   -8.8028    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-    8.3208   -8.8028    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-    8.0029   -7.8527    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   19.5539   -7.5324    0.0000 O   0  0  0  0  0  0  0  0  0  0  0  0
-   18.8944   -9.5830    0.0000 O   0  0  0  0  0  0  0  0  0  0  0  0
-   16.7211   -9.5869    0.0000 O   0  0  0  0  0  0  0  0  0  0  0  0
-   17.7821   -7.2381    0.0000 O   0  0  0  0  0  0  0  0  0  0  0  0
-   18.6044   -7.8424    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   18.3068   -8.7778    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   17.2960   -8.7778    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   16.9781   -7.8277    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   28.6041   -7.4824    0.0000 O   0  0  0  0  0  0  0  0  0  0  0  0
-   27.9446   -9.5330    0.0000 O   0  0  0  0  0  0  0  0  0  0  0  0
-   25.7713   -9.5369    0.0000 O   0  0  0  0  0  0  0  0  0  0  0  0
-   26.8323   -7.1881    0.0000 O   0  0  0  0  0  0  0  0  0  0  0  0
-   27.6546   -7.7924    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   27.3570   -8.7278    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   26.3462   -8.7278    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-   26.0283   -7.7777    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   11.8287   -8.4457    0.0000 O   0  0  0  0  0  0  0  0  0  0  0  0
+   11.1692  -10.4963    0.0000 O   0  0  0  0  0  0  0  0  0  0  0  0
+    8.9959  -10.5002    0.0000 O   0  0  0  0  0  0  0  0  0  0  0  0
+   10.0569   -8.1514    0.0000 O   0  0  0  0  0  0  0  0  0  0  0  0
+   10.8792   -8.7557    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   10.5816   -9.6911    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+    9.5708   -9.6911    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+    9.2529   -8.7410    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   20.8039   -8.4207    0.0000 O   0  0  0  0  0  0  0  0  0  0  0  0
+   20.1444  -10.4713    0.0000 O   0  0  0  0  0  0  0  0  0  0  0  0
+   17.9711  -10.4752    0.0000 O   0  0  0  0  0  0  0  0  0  0  0  0
+   19.0321   -8.1264    0.0000 O   0  0  0  0  0  0  0  0  0  0  0  0
+   19.8544   -8.7307    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   19.5568   -9.6661    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   18.5460   -9.6661    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   18.2281   -8.7160    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   29.8541   -8.3707    0.0000 O   0  0  0  0  0  0  0  0  0  0  0  0
+   29.1946  -10.4213    0.0000 O   0  0  0  0  0  0  0  0  0  0  0  0
+   27.0213  -10.4252    0.0000 O   0  0  0  0  0  0  0  0  0  0  0  0
+   28.0823   -8.0764    0.0000 O   0  0  0  0  0  0  0  0  0  0  0  0
+   28.9046   -8.6807    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   28.6070   -9.6161    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   27.5962   -9.6161    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
+   27.2783   -8.6660    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
   8  4  1  0     0  0
   8  7  1  0     0  0
   4  5  1  0     0  0
diff --git a/ketcher-autotests/tests/utils/canvas/helpers.ts b/ketcher-autotests/tests/utils/canvas/helpers.ts
index 0a31dbbb50..8120c06948 100644
--- a/ketcher-autotests/tests/utils/canvas/helpers.ts
+++ b/ketcher-autotests/tests/utils/canvas/helpers.ts
@@ -91,6 +91,11 @@ export async function takeLeftToolbarScreenshot(page: Page) {
   await expect(editor).toHaveScreenshot();
 }
 
+export async function takeTopToolbarScreenshot(page: Page) {
+  const editor = page.getByTestId('top-toolbar');
+  await expect(editor).toHaveScreenshot();
+}
+
 /**
  * Returns an editor screenshot
  * Usage: convenient for temporary comparison of different states
diff --git a/ketcher-autotests/tests/utils/common/waitForLoad/waitForLoad.ts b/ketcher-autotests/tests/utils/common/waitForLoad/waitForLoad.ts
index a9bc83eb0c..89e32f1287 100644
--- a/ketcher-autotests/tests/utils/common/waitForLoad/waitForLoad.ts
+++ b/ketcher-autotests/tests/utils/common/waitForLoad/waitForLoad.ts
@@ -36,6 +36,4 @@ export const waitForLoad = async (page: Page, callback: VoidFunction) => {
   if (await page.locator('.loading-spinner').isVisible()) {
     await page.waitForSelector('.loading-spinner', { state: 'detached' });
   }
-
-  // return promise;
 };
diff --git a/ketcher-autotests/tests/utils/files/readFile.ts b/ketcher-autotests/tests/utils/files/readFile.ts
index 2a7c4d3534..8fe2d939f8 100644
--- a/ketcher-autotests/tests/utils/files/readFile.ts
+++ b/ketcher-autotests/tests/utils/files/readFile.ts
@@ -50,7 +50,9 @@ export async function pasteFromClipboardAndAddToCanvas(
   await selectTopPanelButton(TopPanelButton.Open, page);
   await page.getByText('Paste from clipboard').click();
   await page.getByRole('dialog').getByRole('textbox').fill(fillStructure);
-  await pressButton(page, 'Add to Canvas');
+  await waitForLoad(page, async () => {
+    await pressButton(page, 'Add to Canvas');
+  });
 }
 
 export async function receiveMolFileComparisonData(
diff --git a/package-lock.json b/package-lock.json
index 5cb9320c9d..211100bdd5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8567,8 +8567,9 @@
     },
     "node_modules/cross-env": {
       "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz",
+      "integrity": "sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "cross-spawn": "^7.0.1"
       },
diff --git a/package.json b/package.json
index 17b208768b..f7fbd8cfe8 100644
--- a/package.json
+++ b/package.json
@@ -15,6 +15,8 @@
     "precommit": "lint-staged --allow-empty && npm run prettier:write --workspaces --if-present",
     "prepush": "npm run test && npm run check:autotests",
     "build": "npm run build:packages && npm run build:example",
+    "build:example:standalone": "npm run build:standalone -w example",
+    "build:example:remote": "npm run build:remote -w example",
     "build:core": "npm run build -w ketcher-core",
     "build:standalone": "npm run build -w ketcher-standalone",
     "build:react": "npm run build -w ketcher-react",
diff --git a/packages/ketcher-core/__tests__/application/render/restruct/rergroup.test.ts b/packages/ketcher-core/__tests__/application/render/restruct/rergroup.test.ts
index eeb87983b0..c55fd44a73 100644
--- a/packages/ketcher-core/__tests__/application/render/restruct/rergroup.test.ts
+++ b/packages/ketcher-core/__tests__/application/render/restruct/rergroup.test.ts
@@ -12,7 +12,10 @@ describe('rergroup should calculate R-Group bounding box correctly', () => {
     rGroup.frags.add(0);
     const rerGroup = new ReRGroup(rGroup);
     rerGroup.getAtoms = mockFn().mockReturnValue(restruct.molecule.atoms);
-    const attachmentsSpy = jest.spyOn(render.ctab, 'getAttachmentsPointsVBox');
+    const attachmentsSpy = jest.spyOn(
+      render.ctab,
+      'getRGroupAttachmentPointsVBoxByAtomIds',
+    );
     rerGroup.calcBBox(render);
     expect(attachmentsSpy).toHaveBeenCalled();
   });
diff --git a/packages/ketcher-core/__tests__/domain/entities/sgroup.test.ts b/packages/ketcher-core/__tests__/domain/entities/sgroup.test.ts
index e03f222415..e12a889a78 100644
--- a/packages/ketcher-core/__tests__/domain/entities/sgroup.test.ts
+++ b/packages/ketcher-core/__tests__/domain/entities/sgroup.test.ts
@@ -10,7 +10,10 @@ describe('sgroup should calculate S-Group bounding box correctly', () => {
     render.ctab = { ...restruct.molecule } as unknown as ReStruct;
     const sGroup = new SGroup('MUL');
     sGroup.atoms = [0, 1, 2, 3, 4];
-    const attachmentsSpy = jest.spyOn(render.ctab, 'getAttachmentsPointsVBox');
+    const attachmentsSpy = jest.spyOn(
+      render.ctab,
+      'getRGroupAttachmentPointsVBoxByAtomIds',
+    );
     SGroup.bracketPos(sGroup, restruct.molecule, {}, undefined, render);
     expect(attachmentsSpy).toHaveBeenCalled();
   });
diff --git a/packages/ketcher-core/__tests__/mock-data.ts b/packages/ketcher-core/__tests__/mock-data.ts
index 0efa5b5e62..0d8324975a 100644
--- a/packages/ketcher-core/__tests__/mock-data.ts
+++ b/packages/ketcher-core/__tests__/mock-data.ts
@@ -693,7 +693,7 @@ const molecule = {
   bondInitHalfBonds() {},
   atomAddNeighbor() {},
   setImplicitHydrogen() {},
-  getAttachmentsPointsVBox: mockFn().mockReturnValue(
+  getRGroupAttachmentPointsVBoxByAtomIds: mockFn().mockReturnValue(
     new Box2Abs(
       new Vec2({
         x: 6,
diff --git a/packages/ketcher-core/docs/data/hover_selection_rgroup_attachment_point.png b/packages/ketcher-core/docs/data/hover_selection_rgroup_attachment_point.png
new file mode 100644
index 0000000000..719aa46c49
Binary files /dev/null and b/packages/ketcher-core/docs/data/hover_selection_rgroup_attachment_point.png differ
diff --git a/packages/ketcher-core/docs/enums/LayerMap.md b/packages/ketcher-core/docs/enums/LayerMap.md
index ce3cc19207..0dbb217bad 100644
--- a/packages/ketcher-core/docs/enums/LayerMap.md
+++ b/packages/ketcher-core/docs/enums/LayerMap.md
@@ -21,11 +21,14 @@ limitations under the License.
 ### Enumeration Members
 
 - [background](LayerMap.md#background)
-- [data](LayerMap.md#data)
-- [hovering](LayerMap.md#hovering)
-- [indices](LayerMap.md#indices)
 - [selectionPlate](LayerMap.md#selectionplate)
+- [hovering](LayerMap.md#hovering)
+- [bondSkeleton](LayerMap.md#bondSkeleton)
+- [atom](LayerMap.md#atom)
 - [warnings](LayerMap.md#warnings)
+- [data](LayerMap.md#data)
+- [additionalInfo](LayerMap.md#additionalInfo)
+- [indices](LayerMap.md#indices)
 
 ## Enumeration Members
 
@@ -35,7 +38,7 @@ limitations under the License.
 
 #### Defined in
 
-[packages/ketcher-core/src/application/render/restruct/generalEnumTypes.ts:18](https://github.com/epam/ketcher/blob/bf065756/packages/ketcher-core/src/application/render/restruct/generalEnumTypes.ts#L18)
+[packages/ketcher-core/src/application/render/restruct/generalEnumTypes.ts:22](https://github.com/epam/ketcher/blob/bf065756/packages/ketcher-core/src/application/render/restruct/generalEnumTypes.ts#L22)
 
 ___
 
@@ -45,7 +48,7 @@ ___
 
 #### Defined in
 
-[packages/ketcher-core/src/application/render/restruct/generalEnumTypes.ts:22](https://github.com/epam/ketcher/blob/bf065756/packages/ketcher-core/src/application/render/restruct/generalEnumTypes.ts#L22)
+[packages/ketcher-core/src/application/render/restruct/generalEnumTypes.ts:28](https://github.com/epam/ketcher/blob/bf065756/packages/ketcher-core/src/application/render/restruct/generalEnumTypes.ts#L28)
 
 ___
 
@@ -55,7 +58,7 @@ ___
 
 #### Defined in
 
-[packages/ketcher-core/src/application/render/restruct/generalEnumTypes.ts:20](https://github.com/epam/ketcher/blob/bf065756/packages/ketcher-core/src/application/render/restruct/generalEnumTypes.ts#L20)
+[packages/ketcher-core/src/application/render/restruct/generalEnumTypes.ts:24](https://github.com/epam/ketcher/blob/bf065756/packages/ketcher-core/src/application/render/restruct/generalEnumTypes.ts#L24)
 
 ___
 
@@ -65,7 +68,7 @@ ___
 
 #### Defined in
 
-[packages/ketcher-core/src/application/render/restruct/generalEnumTypes.ts:23](https://github.com/epam/ketcher/blob/bf065756/packages/ketcher-core/src/application/render/restruct/generalEnumTypes.ts#L23)
+[packages/ketcher-core/src/application/render/restruct/generalEnumTypes.ts:30](https://github.com/epam/ketcher/blob/bf065756/packages/ketcher-core/src/application/render/restruct/generalEnumTypes.ts#L30)
 
 ___
 
@@ -75,7 +78,7 @@ ___
 
 #### Defined in
 
-[packages/ketcher-core/src/application/render/restruct/generalEnumTypes.ts:19](https://github.com/epam/ketcher/blob/bf065756/packages/ketcher-core/src/application/render/restruct/generalEnumTypes.ts#L19)
+[packages/ketcher-core/src/application/render/restruct/generalEnumTypes.ts:23](https://github.com/epam/ketcher/blob/bf065756/packages/ketcher-core/src/application/render/restruct/generalEnumTypes.ts#L23)
 
 ___
 
@@ -85,4 +88,28 @@ ___
 
 #### Defined in
 
-[packages/ketcher-core/src/application/render/restruct/generalEnumTypes.ts:21](https://github.com/epam/ketcher/blob/bf065756/packages/ketcher-core/src/application/render/restruct/generalEnumTypes.ts#L21)
+[packages/ketcher-core/src/application/render/restruct/generalEnumTypes.ts:27](https://github.com/epam/ketcher/blob/bf065756/packages/ketcher-core/src/application/render/restruct/generalEnumTypes.ts#L27)
+
+### atom
+
+• **atom**
+
+#### Defined in
+
+[packages/ketcher-core/src/application/render/restruct/generalEnumTypes.ts:25](https://github.com/epam/ketcher/blob/bf065756/packages/ketcher-core/src/application/render/restruct/generalEnumTypes.ts#L25)
+
+### additionalInfo
+
+• **additionalInfo**
+
+#### Defined in
+
+[packages/ketcher-core/src/application/render/restruct/generalEnumTypes.ts:29](https://github.com/epam/ketcher/blob/bf065756/packages/ketcher-core/src/application/render/restruct/generalEnumTypes.ts#L29)
+
+### bondSkeleton
+
+• **bondSkeleton**
+
+#### Defined in
+
+[packages/ketcher-core/src/application/render/restruct/generalEnumTypes.ts:26](https://github.com/epam/ketcher/blob/bf065756/packages/ketcher-core/src/application/render/restruct/generalEnumTypes.ts#L26)
\ No newline at end of file
diff --git a/packages/ketcher-core/src/application/editor/actions/erase.ts b/packages/ketcher-core/src/application/editor/actions/erase.ts
index f429ecaccd..d6a4a61978 100644
--- a/packages/ketcher-core/src/application/editor/actions/erase.ts
+++ b/packages/ketcher-core/src/application/editor/actions/erase.ts
@@ -18,6 +18,7 @@ import {
   AtomDelete,
   BondDelete,
   CalcImplicitH,
+  RGroupAttachmentPointRemove,
   RxnArrowDelete,
   RxnPlusDelete,
   SimpleObjectDelete,
@@ -31,6 +32,7 @@ import assert from 'assert';
 import { atomGetDegree, formatSelection } from './utils';
 import { fromBondStereoUpdate } from '../actions/bond';
 import { fromFragmentSplit } from './fragment';
+import { fromRGroupAttachmentPointDeletion } from './rgroupAttachmentPoint';
 
 export function fromOneAtomDeletion(restruct, atomId: number) {
   return fromFragmentDeletion(restruct, { atoms: [atomId] });
@@ -130,6 +132,7 @@ export function fromFragmentDeletion(restruct, rawSelection) {
     );
   });
 
+  const removedRGroupAttachmentPoints: number[] = [];
   selection.atoms.forEach((aid) => {
     const frid3 = restruct.molecule.atoms.get(aid).fragment;
     if (frids.indexOf(frid3) < 0) frids.push(frid3);
@@ -139,6 +142,13 @@ export function fromFragmentDeletion(restruct, rawSelection) {
     }
 
     action.addOp(new AtomDelete(aid));
+
+    const attachmentPointsToDelete =
+      restruct.molecule.getRGroupAttachmentPointsByAtomId(aid);
+    attachmentPointsToDelete.forEach((id) => {
+      action.addOp(new RGroupAttachmentPointRemove(id));
+      removedRGroupAttachmentPoints.push(id);
+    });
   });
 
   removeSgroupIfNeeded(action, restruct, atomsToRemove);
@@ -159,8 +169,19 @@ export function fromFragmentDeletion(restruct, rawSelection) {
     action.addOp(new TextDelete(id));
   });
 
+  const actionToDeleteRGroupAttachmentPoints = new Action();
+  selection.rgroupAttachmentPoints.forEach((id) => {
+    if (!removedRGroupAttachmentPoints.includes(id)) {
+      actionToDeleteRGroupAttachmentPoints.mergeWith(
+        fromRGroupAttachmentPointDeletion(restruct, id),
+      );
+    }
+  });
+
   action = action.perform(restruct);
-  action.mergeWith(actionRemoveBonds);
+  action
+    .mergeWith(actionRemoveBonds)
+    .mergeWith(actionToDeleteRGroupAttachmentPoints);
 
   const rgForRemove: Array<number> = frids.map(
     (frid) => RGroup.findRGroupByFragment(restruct.molecule.rgroups, frid)!,
diff --git a/packages/ketcher-core/src/application/editor/actions/index.ts b/packages/ketcher-core/src/application/editor/actions/index.ts
index 1a99bf9f84..0af2498330 100644
--- a/packages/ketcher-core/src/application/editor/actions/index.ts
+++ b/packages/ketcher-core/src/application/editor/actions/index.ts
@@ -10,6 +10,7 @@ export * from './fragment';
 export * from './paste';
 export * from './reaction';
 export * from './rgroup';
+export * from './rgroupAttachmentPoint';
 export * from './rotate';
 export * from './sgroup';
 export * from './simpleobject';
diff --git a/packages/ketcher-core/src/application/editor/actions/paste.ts b/packages/ketcher-core/src/application/editor/actions/paste.ts
index 9676a69860..b03fd7bdee 100644
--- a/packages/ketcher-core/src/application/editor/actions/paste.ts
+++ b/packages/ketcher-core/src/application/editor/actions/paste.ts
@@ -31,6 +31,7 @@ import { fromRGroupAttrs, fromUpdateIfThen } from './rgroup';
 import { Action } from './action';
 import { SGroup, Struct, Vec2 } from 'domain/entities';
 import { fromSgroupAddition } from './sgroup';
+import { fromRGroupAttachmentPointAddition } from './rgroupAttachmentPoint';
 
 export function fromPaste(
   restruct,
@@ -71,6 +72,14 @@ export function fromPaste(
     aidMap.set(aid, operation.data.aid);
 
     pasteItems.atoms.push(operation.data.aid);
+
+    action.mergeWith(
+      fromRGroupAttachmentPointAddition(
+        restruct,
+        tmpAtom.attpnt,
+        operation.data.aid,
+      ),
+    );
   });
 
   pstruct.frags.forEach((frag, frid) => {
diff --git a/packages/ketcher-core/src/application/editor/actions/rgroupAttachmentPoint.ts b/packages/ketcher-core/src/application/editor/actions/rgroupAttachmentPoint.ts
new file mode 100644
index 0000000000..f68d9e83af
--- /dev/null
+++ b/packages/ketcher-core/src/application/editor/actions/rgroupAttachmentPoint.ts
@@ -0,0 +1,126 @@
+import assert from 'assert';
+import { ReStruct } from 'application/render';
+import { Struct } from 'domain/entities';
+import {
+  RGroupAttachmentPointAdd,
+  RGroupAttachmentPointRemove,
+} from '../operations';
+import { Action } from './action';
+import { fromAtomsAttrs } from '.';
+
+export function fromRGroupAttachmentPointUpdate(
+  restruct: ReStruct,
+  atomId: number,
+  attpnt,
+) {
+  const action = new Action();
+  action.mergeWith(fromRGroupAttachmentPointsDeletionByAtom(restruct, atomId));
+  action.mergeWith(fromRGroupAttachmentPointAddition(restruct, attpnt, atomId));
+  return action;
+}
+
+export function fromRGroupAttachmentPointAddition(
+  restruct: ReStruct,
+  attpnt,
+  atomId: number,
+) {
+  const action = new Action();
+  switch (attpnt) {
+    case 1:
+      action.addOp(
+        new RGroupAttachmentPointAdd({
+          atomId,
+          attachmentPointType: 'primary',
+        }),
+      );
+      break;
+
+    case 2:
+      action.addOp(
+        new RGroupAttachmentPointAdd({
+          atomId,
+          attachmentPointType: 'secondary',
+        }),
+      );
+      break;
+
+    case 3:
+      action.addOp(
+        new RGroupAttachmentPointAdd({
+          atomId,
+          attachmentPointType: 'primary',
+        }),
+      );
+      action.addOp(
+        new RGroupAttachmentPointAdd({
+          atomId,
+          attachmentPointType: 'secondary',
+        }),
+      );
+      break;
+
+    default:
+      break;
+  }
+  return action.perform(restruct);
+}
+
+function fromRGroupAttachmentPointsDeletionByAtom(
+  restruct: ReStruct,
+  atomId: number,
+) {
+  const action = new Action();
+  const attachmentPointsToDelete =
+    restruct.molecule.getRGroupAttachmentPointsByAtomId(atomId);
+  attachmentPointsToDelete.forEach((rgroupAttachmentPointId) => {
+    action.addOp(new RGroupAttachmentPointRemove(rgroupAttachmentPointId));
+  });
+  return action.perform(restruct);
+}
+
+export function fromRGroupAttachmentPointDeletion(
+  restruct: ReStruct,
+  id: number,
+) {
+  const { atomId, newAttpnt } = getNewAtomAttpnt(restruct.molecule, id);
+  const actionToUpdateAtomsAttrs = fromAtomsAttrs(
+    restruct,
+    atomId,
+    { attpnt: newAttpnt },
+    null,
+  );
+
+  const actionToDeletePoint = new Action();
+  actionToDeletePoint.addOp(new RGroupAttachmentPointRemove(id));
+
+  return actionToDeletePoint
+    .perform(restruct)
+    .mergeWith(actionToUpdateAtomsAttrs);
+}
+
+function getNewAtomAttpnt(
+  struct: Struct,
+  rgroupAttachmentPointToDelete: number,
+) {
+  const pointToDelete = struct.rgroupAttachmentPoints.get(
+    rgroupAttachmentPointToDelete,
+  );
+  assert(pointToDelete != null);
+  const attachedAtomId = pointToDelete.atomId;
+  const attachedAtom = struct.atoms.get(attachedAtomId);
+  const currentAttpnt = attachedAtom?.attpnt;
+
+  let newAttpnt = 0;
+  if (currentAttpnt === 1 || currentAttpnt === 2) {
+    newAttpnt = 0;
+  } else if (currentAttpnt === 3) {
+    const pointToDeleteType = pointToDelete.type;
+    if (pointToDeleteType === 'primary') {
+      newAttpnt = 2;
+    } else if (pointToDeleteType === 'secondary') {
+      newAttpnt = 1;
+    }
+  }
+
+  return { atomId: attachedAtomId, newAttpnt };
+}
diff --git a/packages/ketcher-core/src/application/editor/operations/FragmentStereoFlag.ts b/packages/ketcher-core/src/application/editor/operations/FragmentStereoFlag.ts
index 80a4c63da1..7e96b2b9e7 100644
--- a/packages/ketcher-core/src/application/editor/operations/FragmentStereoFlag.ts
+++ b/packages/ketcher-core/src/application/editor/operations/FragmentStereoFlag.ts
@@ -15,14 +15,17 @@
  ***************************************************************************/
 
 import { BaseOperation } from './base';
-import { OperationType } from './OperationType';
+import { OperationPriority, OperationType } from './OperationType';
 import { ReStruct } from '../../render';
 
 export class FragmentStereoFlag extends BaseOperation {
   frid: number;
 
   constructor(fragmentId: number) {
-    super(OperationType.FRAGMENT_STEREO_FLAG, 6);
+    super(
+      OperationType.FRAGMENT_STEREO_FLAG,
+      OperationPriority.FRAGMENT_STEREO_FLAG,
+    );
     this.frid = fragmentId;
   }
 
diff --git a/packages/ketcher-core/src/application/editor/operations/OperationType.ts b/packages/ketcher-core/src/application/editor/operations/OperationType.ts
index cb336f39e3..c4e6d50762 100644
--- a/packages/ketcher-core/src/application/editor/operations/OperationType.ts
+++ b/packages/ketcher-core/src/application/editor/operations/OperationType.ts
@@ -36,6 +36,8 @@ export const OperationType = Object.freeze({
   S_GROUP_REMOVE_FROM_HIERACHY: 'Delete s-group from hierarchy',
   R_GROUP_ATTR: 'Set r-group attribute',
   R_GROUP_FRAGMENT: 'R-group fragment',
+  R_GROUP_ATTACHMENT_POINT_ADD: 'Add R-group attachment point',
+  R_GROUP_ATTACHMENT_POINT_REMOVE: 'Remove R-group attachment point',
   UPDATE_IF_THEN: 'Update',
   RESTORE_IF_THEN: 'Restore',
   RXN_ARROW_ADD: 'Add rxn arrow',
@@ -68,3 +70,24 @@ export const OperationType = Object.freeze({
   UPDATE_HIGHLIGHT: 'Update highlight',
   REMOVE_HIGHLIGHT: 'Remove highlight',
 });
+
+export enum OperationPriority {
+  ATOM_ATTR = 1,
+  BOND_ADD = 1,
+  R_GROUP_ATTACHMENT_POINT_REMOVE = 1,
+  ATOM_MOVE = 2,
+  BOND_ATTR = 2,
+  BOND_MOVE = 2,
+  BOND_DELETE = 3,
+  S_GROUP_ATOM_ADD = 3,
+  S_GROUP_ATTACHMENT_POINT_ADD = 3,
+  R_GROUP_ATTACHMENT_POINT_ADD = 3,
+  S_GROUP_ATTR = 4,
+  ATOM_DELETE = 5,
+  FRAGMENT_STEREO_FLAG = 6,
+  CALC_IMPLICIT_H = 10,
+  FRAGMENT_DELETE_STEREO_ATOM = 90,
+  S_GROUP_DELETE = 95,
+  S_GROUP_ADD_TO_HIERACHY = 100,
+  FRAGMENT_ADD_STEREO_ATOM = 100,
+}
diff --git a/packages/ketcher-core/src/application/editor/operations/atom/AtomAttr.ts b/packages/ketcher-core/src/application/editor/operations/atom/AtomAttr.ts
index 414ae0568d..f53b86147a 100644
--- a/packages/ketcher-core/src/application/editor/operations/atom/AtomAttr.ts
+++ b/packages/ketcher-core/src/application/editor/operations/atom/AtomAttr.ts
@@ -15,7 +15,7 @@
  ***************************************************************************/
 
 import { BaseOperation } from '../base';
-import { OperationType } from '../OperationType';
+import { OperationPriority, OperationType } from '../OperationType';
 import { ReStruct } from '../../../render';
 
 type Data = {
@@ -29,7 +29,7 @@ export class AtomAttr extends BaseOperation {
   data2: Data | null;
 
   constructor(atomId?: any, attribute?: any, value?: any) {
-    super(OperationType.ATOM_ATTR, 1);
+    super(OperationType.ATOM_ATTR, OperationPriority.ATOM_ATTR);
     this.data = { aid: atomId, attribute, value };
     this.data2 = null;
   }
diff --git a/packages/ketcher-core/src/application/editor/operations/atom/AtomMove.ts b/packages/ketcher-core/src/application/editor/operations/atom/AtomMove.ts
index dde5bec171..834fd892d8 100644
--- a/packages/ketcher-core/src/application/editor/operations/atom/AtomMove.ts
+++ b/packages/ketcher-core/src/application/editor/operations/atom/AtomMove.ts
@@ -15,7 +15,7 @@
  ***************************************************************************/
 
 import { BaseOperation } from '../base';
-import { OperationType } from '../OperationType';
+import { OperationPriority, OperationType } from '../OperationType';
 import { ReStruct } from '../../../render';
 import { Scale } from 'domain/helpers';
 
@@ -27,7 +27,7 @@ export class AtomMove extends BaseOperation {
   };
 
   constructor(atomId?: any, d?: any, noinvalidate?: any) {
-    super(OperationType.ATOM_MOVE, 2);
+    super(OperationType.ATOM_MOVE, OperationPriority.ATOM_MOVE);
     this.data = { aid: atomId, d, noinvalidate };
   }
 
diff --git a/packages/ketcher-core/src/application/editor/operations/atom/index.ts b/packages/ketcher-core/src/application/editor/operations/atom/index.ts
index f47a583a4a..5b28f08650 100644
--- a/packages/ketcher-core/src/application/editor/operations/atom/index.ts
+++ b/packages/ketcher-core/src/application/editor/operations/atom/index.ts
@@ -19,7 +19,7 @@ import { Atom, Pile, Vec2 } from 'domain/entities';
 import { ReAtom, ReStruct } from '../../../render';
 
 import { BaseOperation } from '../base';
-import { OperationType } from '../OperationType';
+import { OperationPriority, OperationType } from '../OperationType';
 
 // todo: separate classes: now here is circular dependency in `invert` method
 
@@ -88,7 +88,7 @@ class AtomDelete extends BaseOperation {
   data: Data;
 
   constructor(atomId?: any) {
-    super(OperationType.ATOM_DELETE, 5);
+    super(OperationType.ATOM_DELETE, OperationPriority.ATOM_DELETE);
     this.data = { aid: atomId, atom: null, pos: null };
   }
 
diff --git a/packages/ketcher-core/src/application/editor/operations/bond/BondAttr.ts b/packages/ketcher-core/src/application/editor/operations/bond/BondAttr.ts
index f688e79f48..12626fedf9 100644
--- a/packages/ketcher-core/src/application/editor/operations/bond/BondAttr.ts
+++ b/packages/ketcher-core/src/application/editor/operations/bond/BondAttr.ts
@@ -15,7 +15,7 @@
  ***************************************************************************/
 
 import { BaseOperation } from '../base';
-import { OperationType } from '../OperationType';
+import { OperationPriority, OperationType } from '../OperationType';
 import { ReStruct } from '../../../render';
 
 type Data = {
@@ -29,7 +29,7 @@ export class BondAttr extends BaseOperation {
   data2: Data | null;
 
   constructor(bondId?: any, attribute?: any, value?: any) {
-    super(OperationType.BOND_ATTR, 2);
+    super(OperationType.BOND_ATTR, OperationPriority.BOND_ATTR);
     this.data = { bid: bondId, attribute, value };
     this.data2 = null;
   }
diff --git a/packages/ketcher-core/src/application/editor/operations/bond/BondMove.ts b/packages/ketcher-core/src/application/editor/operations/bond/BondMove.ts
index 3be86a3dbd..ed225f638e 100644
--- a/packages/ketcher-core/src/application/editor/operations/bond/BondMove.ts
+++ b/packages/ketcher-core/src/application/editor/operations/bond/BondMove.ts
@@ -15,7 +15,7 @@
  ***************************************************************************/
 
 import { BaseOperation } from '../base';
-import { OperationType } from '../OperationType';
+import { OperationPriority, OperationType } from '../OperationType';
 import { ReStruct } from '../../../render';
 import { Scale } from 'domain/helpers';
 
@@ -26,7 +26,7 @@ export class BondMove extends BaseOperation {
   };
 
   constructor(bondId?: any, d?: any) {
-    super(OperationType.BOND_MOVE, 2);
+    super(OperationType.BOND_MOVE, OperationPriority.BOND_MOVE);
     this.data = { bid: bondId, d };
   }
 
diff --git a/packages/ketcher-core/src/application/editor/operations/bond/index.ts b/packages/ketcher-core/src/application/editor/operations/bond/index.ts
index 7b7b95cadf..a356b93796 100644
--- a/packages/ketcher-core/src/application/editor/operations/bond/index.ts
+++ b/packages/ketcher-core/src/application/editor/operations/bond/index.ts
@@ -19,7 +19,7 @@ import { ReBond, ReStruct } from '../../../render';
 
 import { BaseOperation } from '../base';
 import { Bond } from 'domain/entities';
-import { OperationType } from '../OperationType';
+import { OperationPriority, OperationType } from '../OperationType';
 
 // todo: separate classes: now here is circular dependency in `invert` method
 
@@ -34,7 +34,7 @@ class BondAdd extends BaseOperation {
   data: Data;
 
   constructor(begin?: any, end?: any, bond?: any) {
-    super(OperationType.BOND_ADD, 1);
+    super(OperationType.BOND_ADD, OperationPriority.BOND_ADD);
     this.data = { bond, begin, end, bid: null };
   }
 
@@ -100,7 +100,7 @@ class BondDelete extends BaseOperation {
   data: Data;
 
   constructor(bondId?: any) {
-    super(OperationType.BOND_DELETE, 3);
+    super(OperationType.BOND_DELETE, OperationPriority.BOND_DELETE);
     this.data = { bid: bondId, bond: null, begin: null, end: null };
   }
 
diff --git a/packages/ketcher-core/src/application/editor/operations/calcimplicitH.ts b/packages/ketcher-core/src/application/editor/operations/calcimplicitH.ts
index 946c02f379..7732715cfe 100644
--- a/packages/ketcher-core/src/application/editor/operations/calcimplicitH.ts
+++ b/packages/ketcher-core/src/application/editor/operations/calcimplicitH.ts
@@ -15,14 +15,14 @@
  ***************************************************************************/
 
 import { BaseOperation } from './base';
-import { OperationType } from './OperationType';
+import { OperationPriority, OperationType } from './OperationType';
 import { ReStruct } from '../../render';
 
 export class CalcImplicitH extends BaseOperation {
   atomIds: Array<number>;
 
   constructor(aids: Array<number>) {
-    super(OperationType.CALC_IMPLICIT_H, 10);
+    super(OperationType.CALC_IMPLICIT_H, OperationPriority.CALC_IMPLICIT_H);
     this.atomIds = aids;
   }
 
diff --git a/packages/ketcher-core/src/application/editor/operations/fragmentStereoAtom.ts b/packages/ketcher-core/src/application/editor/operations/fragmentStereoAtom.ts
index e99ec98e56..0d22e83feb 100644
--- a/packages/ketcher-core/src/application/editor/operations/fragmentStereoAtom.ts
+++ b/packages/ketcher-core/src/application/editor/operations/fragmentStereoAtom.ts
@@ -16,7 +16,7 @@
 /* eslint-disable @typescript-eslint/no-use-before-define */
 
 import { BaseOperation } from './base';
-import { OperationType } from './OperationType';
+import { OperationPriority, OperationType } from './OperationType';
 import { ReStruct } from '../../render';
 
 // todo: separate classes: now here is circular dependency in `invert` method
@@ -31,7 +31,10 @@ class FragmentAddStereoAtom extends BaseOperation {
   data: Data;
 
   constructor(fragmentId: any, atomId: any) {
-    super(OperationType.FRAGMENT_ADD_STEREO_ATOM, 100);
+    super(
+      OperationType.FRAGMENT_ADD_STEREO_ATOM,
+      OperationPriority.FRAGMENT_ADD_STEREO_ATOM,
+    );
     this.data = { frid: fragmentId, aid: atomId };
   }
 
@@ -55,7 +58,10 @@ class FragmentDeleteStereoAtom extends BaseOperation {
   data: Data;
 
   constructor(fragmentId: any, atomId: any) {
-    super(OperationType.FRAGMENT_DELETE_STEREO_ATOM, 90);
+    super(
+      OperationType.FRAGMENT_DELETE_STEREO_ATOM,
+      OperationPriority.FRAGMENT_DELETE_STEREO_ATOM,
+    );
     this.data = { frid: fragmentId, aid: atomId };
   }
 
diff --git a/packages/ketcher-core/src/application/editor/operations/index.ts b/packages/ketcher-core/src/application/editor/operations/index.ts
index 36bf986c67..6a5b0ae1db 100644
--- a/packages/ketcher-core/src/application/editor/operations/index.ts
+++ b/packages/ketcher-core/src/application/editor/operations/index.ts
@@ -27,6 +27,7 @@ export * from './calcimplicitH';
 export * from './LoopMove';
 export * from './OperationType';
 export * from './rgroup';
+export * from './rgroupAttachmentPoint';
 export * from './rxn';
 export * from './simpleObject';
 export * from './sgroup';
diff --git a/packages/ketcher-core/src/application/editor/operations/rgroupAttachmentPoint/RGroupAttachmentPointAdd.ts b/packages/ketcher-core/src/application/editor/operations/rgroupAttachmentPoint/RGroupAttachmentPointAdd.ts
new file mode 100644
index 0000000000..31db976b13
--- /dev/null
+++ b/packages/ketcher-core/src/application/editor/operations/rgroupAttachmentPoint/RGroupAttachmentPointAdd.ts
@@ -0,0 +1,63 @@
+import { ReStruct, ReRGroupAttachmentPoint } from 'application/render';
+import assert from 'assert';
+import {
+  RGroupAttachmentPoint,
+  RGroupAttachmentPointType,
+} from 'domain/entities';
+import { RGroupAttachmentPointRemove } from '.';
+import { OperationPriority, OperationType } from '../OperationType';
+import BaseOperation from '../base';
+
+type Data = {
+  atomId: number;
+  attachmentPointType: RGroupAttachmentPointType;
+  attachmentPointId?: number;
+};
+
+class RGroupAttachmentPointAdd extends BaseOperation {
+  data: Data;
+
+  constructor(data: Data) {
+    super(
+      OperationType.R_GROUP_ATTACHMENT_POINT_ADD,
+      OperationPriority.R_GROUP_ATTACHMENT_POINT_ADD,
+    );
+    this.data = data;
+  }
+
+  execute(restruct: ReStruct) {
+    const { atomId, attachmentPointType } = this.data;
+    const newAttachmentPoint = new RGroupAttachmentPoint(
+      atomId,
+      attachmentPointType,
+    );
+
+    const struct = restruct.molecule;
+    const revertedId = this.data.attachmentPointId;
+    let attachmentPointId = 0;
+    if (revertedId === undefined) {
+      const newId = struct.rgroupAttachmentPoints.add(newAttachmentPoint);
+      attachmentPointId = newId;
+    } else {
+      struct.rgroupAttachmentPoints.set(revertedId, newAttachmentPoint);
+      attachmentPointId = revertedId;
+    }
+    this.data.attachmentPointId = attachmentPointId;
+
+    const reAtom = restruct.atoms.get(atomId);
+    assert(reAtom != null);
+    restruct.rgroupAttachmentPoints.set(
+      attachmentPointId,
+      new ReRGroupAttachmentPoint(newAttachmentPoint, reAtom),
+    );
+  }
+
+  invert() {
+    if (this.data.attachmentPointId === undefined) {
+      throw Error(`Inverted attachmentPointId doesn't exist`);
+    }
+    return new RGroupAttachmentPointRemove(this.data.attachmentPointId);
+  }
+}
+
+export { RGroupAttachmentPointAdd };
diff --git a/packages/ketcher-core/src/application/editor/operations/rgroupAttachmentPoint/RGroupAttachmentPointRemove.ts b/packages/ketcher-core/src/application/editor/operations/rgroupAttachmentPoint/RGroupAttachmentPointRemove.ts
new file mode 100644
index 0000000000..f8e8a956ab
--- /dev/null
+++ b/packages/ketcher-core/src/application/editor/operations/rgroupAttachmentPoint/RGroupAttachmentPointRemove.ts
@@ -0,0 +1,51 @@
+import { ReStruct } from 'application/render';
+import assert from 'assert';
+import { RGroupAttachmentPointAdd } from '.';
+import { OperationPriority, OperationType } from '../OperationType';
+import BaseOperation from '../base';
+
+type Data = { atomId: number; attachmentPointType; attachmentPointId: number };
+
+const INITIAL_DATA = {
+  atomId: 0,
+  attachmentPointType: 1,
+  attachmentPointId: 0,
+};
+
+class RGroupAttachmentPointRemove extends BaseOperation {
+  data: Data;
+
+  constructor(attachmentPointId: number) {
+    super(
+      OperationType.R_GROUP_ATTACHMENT_POINT_REMOVE,
+      OperationPriority.R_GROUP_ATTACHMENT_POINT_REMOVE,
+    );
+    this.data = {
+      ...INITIAL_DATA,
+      attachmentPointId,
+    };
+  }
+
+  execute(restruct: ReStruct) {
+    const { attachmentPointId } = this.data;
+    const struct = restruct.molecule;
+    const item = struct.rgroupAttachmentPoints.get(attachmentPointId);
+    const reItem = restruct.rgroupAttachmentPoints.get(attachmentPointId);
+    assert(item != null && reItem != null);
+
+    this.data.atomId = item.atomId;
+    this.data.attachmentPointType = item.type;
+
+    restruct.markItemRemoved();
+    restruct.clearVisel(reItem.visel);
+    restruct.rgroupAttachmentPoints.delete(attachmentPointId);
+
+    struct.rgroupAttachmentPoints.delete(attachmentPointId);
+  }
+
+  invert() {
+    return new RGroupAttachmentPointAdd(this.data);
+  }
+}
+
+export { RGroupAttachmentPointRemove };
diff --git a/packages/ketcher-core/src/application/editor/operations/rgroupAttachmentPoint/index.ts b/packages/ketcher-core/src/application/editor/operations/rgroupAttachmentPoint/index.ts
new file mode 100644
index 0000000000..14446d20d9
--- /dev/null
+++ b/packages/ketcher-core/src/application/editor/operations/rgroupAttachmentPoint/index.ts
@@ -0,0 +1,2 @@
+export * from './RGroupAttachmentPointAdd';
+export * from './RGroupAttachmentPointRemove';
diff --git a/packages/ketcher-core/src/application/editor/operations/sgroup/SGroupAttr.ts b/packages/ketcher-core/src/application/editor/operations/sgroup/SGroupAttr.ts
index 6ea6d4bb1b..6aa1afda7c 100644
--- a/packages/ketcher-core/src/application/editor/operations/sgroup/SGroupAttr.ts
+++ b/packages/ketcher-core/src/application/editor/operations/sgroup/SGroupAttr.ts
@@ -15,7 +15,7 @@
  ***************************************************************************/
 
 import { BaseOperation } from '../base';
-import { OperationType } from '../OperationType';
+import { OperationPriority, OperationType } from '../OperationType';
 import { ReStruct } from '../../../render';
 
 export class SGroupAttr extends BaseOperation {
@@ -26,7 +26,7 @@ export class SGroupAttr extends BaseOperation {
   };
 
   constructor(sgroupId?: any, attribute?: any, value?: any) {
-    super(OperationType.S_GROUP_ATTR, 4);
+    super(OperationType.S_GROUP_ATTR, OperationPriority.S_GROUP_ATTR);
     this.data = {
       sgid: sgroupId,
       attr: attribute,
diff --git a/packages/ketcher-core/src/application/editor/operations/sgroup/index.ts b/packages/ketcher-core/src/application/editor/operations/sgroup/index.ts
index 607a952053..6f7ed86a88 100644
--- a/packages/ketcher-core/src/application/editor/operations/sgroup/index.ts
+++ b/packages/ketcher-core/src/application/editor/operations/sgroup/index.ts
@@ -19,7 +19,7 @@ import { FunctionalGroup, SGroup, Vec2 } from 'domain/entities';
 import { ReSGroup, ReStruct } from '../../../render';
 
 import { BaseOperation } from '../base';
-import { OperationType } from '../OperationType';
+import { OperationPriority, OperationType } from '../OperationType';
 
 // todo: separate classes: now here is circular dependency in `invert` method
 
@@ -92,7 +92,7 @@ class SGroupDelete extends BaseOperation {
   data: Data;
 
   constructor(sgroupId?: any) {
-    super(OperationType.S_GROUP_DELETE, 95);
+    super(OperationType.S_GROUP_DELETE, OperationPriority.S_GROUP_DELETE);
     this.data = { sgid: sgroupId };
   }
 
diff --git a/packages/ketcher-core/src/application/editor/operations/sgroup/sgroupAtom.ts b/packages/ketcher-core/src/application/editor/operations/sgroup/sgroupAtom.ts
index 4c123c1e12..da7f6600a6 100644
--- a/packages/ketcher-core/src/application/editor/operations/sgroup/sgroupAtom.ts
+++ b/packages/ketcher-core/src/application/editor/operations/sgroup/sgroupAtom.ts
@@ -16,7 +16,7 @@
 /* eslint-disable @typescript-eslint/no-use-before-define */
 
 import { BaseOperation } from '../base';
-import { OperationType } from '../OperationType';
+import { OperationPriority, OperationType } from '../OperationType';
 import { ReStruct } from '../../../render';
 import { SGroup } from 'domain/entities';
 
@@ -31,7 +31,7 @@ class SGroupAtomAdd extends BaseOperation {
   data: Data;
 
   constructor(sgroupId?: any, aid?: any) {
-    super(OperationType.S_GROUP_ATOM_ADD, 3);
+    super(OperationType.S_GROUP_ATOM_ADD, OperationPriority.S_GROUP_ATOM_ADD);
     this.data = { sgid: sgroupId, aid };
   }
 
diff --git a/packages/ketcher-core/src/application/editor/operations/sgroup/sgroupAttachmentPoints.ts b/packages/ketcher-core/src/application/editor/operations/sgroup/sgroupAttachmentPoints.ts
index 7129620a58..9bf6128b18 100644
--- a/packages/ketcher-core/src/application/editor/operations/sgroup/sgroupAttachmentPoints.ts
+++ b/packages/ketcher-core/src/application/editor/operations/sgroup/sgroupAttachmentPoints.ts
@@ -1,5 +1,5 @@
 import { BaseOperation } from '../base';
-import { OperationType } from '../OperationType';
+import { OperationPriority, OperationType } from '../OperationType';
 import { ReStruct } from '../../../render';
 import { SGroupAttachmentPoint } from 'domain/entities';
 import assert from 'assert';
@@ -13,7 +13,10 @@ export class SGroupAttachmentPointAdd extends BaseOperation {
   data: Data;
 
   constructor(sGroupId: number, attachmentPoint: SGroupAttachmentPoint) {
-    super(OperationType.S_GROUP_ATTACHMENT_POINT_ADD, 3);
+    super(
+      OperationType.S_GROUP_ATTACHMENT_POINT_ADD,
+      OperationPriority.S_GROUP_ATTACHMENT_POINT_ADD,
+    );
     this.data = { sGroupId, attachmentPoint };
   }
 
diff --git a/packages/ketcher-core/src/application/editor/operations/sgroup/sgroupHierarchy.ts b/packages/ketcher-core/src/application/editor/operations/sgroup/sgroupHierarchy.ts
index ab0870ec0b..7ef88c5907 100644
--- a/packages/ketcher-core/src/application/editor/operations/sgroup/sgroupHierarchy.ts
+++ b/packages/ketcher-core/src/application/editor/operations/sgroup/sgroupHierarchy.ts
@@ -16,7 +16,7 @@
 /* eslint-disable @typescript-eslint/no-use-before-define */
 
 import { BaseOperation } from '../base';
-import { OperationType } from '../OperationType';
+import { OperationPriority, OperationType } from '../OperationType';
 import { ReStruct } from '../../../render';
 
 // todo: separate classes: now here is circular dependency in `invert` method
@@ -31,7 +31,10 @@ class SGroupAddToHierarchy extends BaseOperation {
   data: Data;
 
   constructor(sgroupId?: any, parent?: any, children?: any) {
-    super(OperationType.S_GROUP_ADD_TO_HIERACHY, 100);
+    super(
+      OperationType.S_GROUP_ADD_TO_HIERACHY,
+      OperationPriority.S_GROUP_ADD_TO_HIERACHY,
+    );
     this.data = { sgid: sgroupId, parent, children };
   }
 
diff --git a/packages/ketcher-core/src/application/editor/shared/constants.ts b/packages/ketcher-core/src/application/editor/shared/constants.ts
index 7eef248e96..298de23ba6 100644
--- a/packages/ketcher-core/src/application/editor/shared/constants.ts
+++ b/packages/ketcher-core/src/application/editor/shared/constants.ts
@@ -28,6 +28,7 @@ export const selectionKeys = [
   'frags',
   'sgroups',
   'rgroups',
+  'rgroupAttachmentPoints',
   'rxnArrows',
   'rxnPluses',
   'simpleObjects',
diff --git a/packages/ketcher-core/src/application/render/draw.ts b/packages/ketcher-core/src/application/render/draw.ts
index 9ce9960889..020f33ba0e 100644
--- a/packages/ketcher-core/src/application/render/draw.ts
+++ b/packages/ketcher-core/src/application/render/draw.ts
@@ -1496,6 +1496,75 @@ function recenterText(path: Element, relativeBox: RelativeBox) {
   }
 }
 
+function rgroupAttachmentPoint(
+  paper: RaphaelPaper,
+  shiftedAtomPositionVector: Vec2,
+  attachmentPointEnd: Vec2,
+  directionVector: Vec2,
+  options: RenderOptions,
+) {
+  const linePath = paper.path(
+    'M{0},{1}L{2},{3}',
+    tfx(shiftedAtomPositionVector.x),
+    tfx(shiftedAtomPositionVector.y),
+    tfx(attachmentPointEnd.x),
+    tfx(attachmentPointEnd.y),
+  );
+
+  const curvePath = paper.path(
+    getSvgCurveShapeAttachmentPoint(
+      attachmentPointEnd,
+      directionVector,
+      options.scale,
+    ),
+  );
+
+  const resultShape = paper
+    .set([curvePath, linePath])
+    .attr(options.lineattr)
+    .attr({ 'stroke-width': options.lineWidth });
+
+  return resultShape;
+}
+
+function getSvgCurveShapeAttachmentPoint(
+  centerPosition: Vec2,
+  directionVector: Vec2,
+  basicSize: number,
+): string {
+  // declared here https://github.com/epam/ketcher/issues/2165
+  // this path has (0,0) in the position of attachment point atom
+  const attachmentPointSvgPathString = `M13 1.5l-1.5 3.7c-0.3 0.8-1.5 0.8-1.9 0l-1.7-4.4c-0.3-0.8-1.5-0.8-1.9 0l-1.7 4.4c-0.3 0.8-1.5 0.8-1.8 0l-1.8-4.4c-0.3-0.8-1.5-0.8-1.8 0l-1.7 4.4c-0.3 0.8-1.5 0.8-1.9 0l-1.7-4.4c-0.3-0.8-1.5-0.8-1.9 0l-1.6 4.2c-0.3 0.9-1.6 0.8-1.9 0l-1.2-3.5`;
+  const attachmentPointSvgPathSize = 39.8;
+
+  const shapeScale = basicSize / attachmentPointSvgPathSize;
+  const angleDegrees =
+    (Math.atan2(directionVector.y, directionVector.x) * 180) / Math.PI - 90;
+
+  return svgPath(attachmentPointSvgPathString)
+    .rotate(angleDegrees)
+    .scale(shapeScale)
+    .translate(centerPosition.x, centerPosition.y)
+    .toString();
+}
+
+function rgroupAttachmentPointLabel(
+  paper: RaphaelPaper,
+  labelPosition: Vec2,
+  labelText: string,
+  options: RenderOptions,
+  fill,
+) {
+  const labelPath = paper
+    .text(labelPosition.x, labelPosition.y, labelText)
+    .attr({
+      font: options.font,
+      'font-size': options.fontsz * 0.9,
+      fill,
+    });
+  return labelPath;
+}
+
 export default {
   recenterText,
   arrow,
@@ -1527,4 +1596,6 @@ export default {
   rectangleArrowHighlightAndSelection,
   polyline,
   line,
+  rgroupAttachmentPoint,
+  rgroupAttachmentPointLabel,
 };
diff --git a/packages/ketcher-core/src/application/render/renderStruct.ts b/packages/ketcher-core/src/application/render/renderStruct.ts
index f1ac5987e7..ec98b84a5e 100644
--- a/packages/ketcher-core/src/application/render/renderStruct.ts
+++ b/packages/ketcher-core/src/application/render/renderStruct.ts
@@ -66,6 +66,11 @@ function convertAllSGroupAttachmentPointsToRGroupAttachmentPoints(
       // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
       const attachmentPointAtom = struct.atoms.get(attachmentPoint.atomId)!;
       attachmentPointAtom.setRGAttachmentPointForDisplayPurpose();
+      const rgroupAttachmentPoint =
+        attachmentPoint.convertToRGroupAttachmentPointForDisplayPurpose(
+          attachmentPoint.atomId,
+        );
+      struct.rgroupAttachmentPoints.add(rgroupAttachmentPoint);
     });
   });
 }
diff --git a/packages/ketcher-core/src/application/render/restruct/generalEnumTypes.ts b/packages/ketcher-core/src/application/render/restruct/generalEnumTypes.ts
index f6f9730388..067cb94314 100644
--- a/packages/ketcher-core/src/application/render/restruct/generalEnumTypes.ts
+++ b/packages/ketcher-core/src/application/render/restruct/generalEnumTypes.ts
@@ -16,12 +16,14 @@
 
 /*
   This map is used to draw anything on 'layers'
-  You can treat these values as z-index: backround has the lowest z-index, indices has the highest
+  You can treat these values as z-index: background has the lowest z-index, indices has the highest
 */
 export enum LayerMap {
   background = 'background',
   selectionPlate = 'selectionPlate',
   hovering = 'hovering',
+  atom = 'atom',
+  bondSkeleton = 'bondSkeleton',
   warnings = 'warnings',
   data = 'data',
   additionalInfo = 'additionalInfo',
diff --git a/packages/ketcher-core/src/application/render/restruct/index.ts b/packages/ketcher-core/src/application/render/restruct/index.ts
index 1b18e50fb5..283a8c3f89 100644
--- a/packages/ketcher-core/src/application/render/restruct/index.ts
+++ b/packages/ketcher-core/src/application/render/restruct/index.ts
@@ -16,6 +16,7 @@
 // ReStruct is to store all the auxiliary information for
 //  Struct while rendering
 
+import ReObject from './reobject';
 import ReAtom from './reatom';
 import ReBond from './rebond';
 import ReEnhancedFlag from './reenhancedFlag';
@@ -30,7 +31,9 @@ import ReText from './retext';
 
 export * from './generalEnumTypes';
 export * from './reatom';
+export * from './rergroupAttachmentPoint';
 export {
+  ReObject,
   ReAtom,
   ReBond,
   ReRxnPlus,
diff --git a/packages/ketcher-core/src/application/render/restruct/reatom.ts b/packages/ketcher-core/src/application/render/restruct/reatom.ts
index 764b0c9760..386e66a0a9 100644
--- a/packages/ketcher-core/src/application/render/restruct/reatom.ts
+++ b/packages/ketcher-core/src/application/render/restruct/reatom.ts
@@ -38,7 +38,6 @@ import { Scale } from 'domain/helpers';
 import draw from '../draw';
 import util from '../util';
 import { tfx } from 'utilities';
-import svgPath from 'svgpath';
 import { RenderOptions } from 'application/render/render.types';
 
 interface ElemAttr {
@@ -101,32 +100,9 @@ class ReAtom extends ReObject {
     return new Box2Abs(this.a.pp, this.a.pp);
   }
 
-  /**
-   * Why?
-   * We need to return Bounding box for the attachment points for this atom,
-   * to be able to correctly calculate boundaries for autoscaling and positioning
-   */
-  getVBoxObjOfAttachmentPoint(render: Render): Box2Abs | null {
-    let accumulatedBBox: Box2Abs | null = null;
-    const directionVectors = this.getAttachmentPointDirectionVectors(
-      render.ctab.molecule,
-    );
-    directionVectors.forEach((directionVector) => {
-      const attachmentPointEndPosition = this.a.pp.add(directionVector);
-      const attachmentPointEndBoundingBox = new Box2Abs(
-        attachmentPointEndPosition,
-        attachmentPointEndPosition,
-      );
-      accumulatedBBox = accumulatedBBox
-        ? Box2Abs.union(accumulatedBBox, attachmentPointEndBoundingBox)
-        : attachmentPointEndBoundingBox;
-    });
-    return accumulatedBBox;
-  }
-
   drawHover(render: Render) {
     const ret = this.makeHoverPlate(render);
-    render.ctab.addReObjectPath(LayerMap.hovering, this.visel, ret);
+    render.ctab.addReObjectPath(LayerMap.atom, this.visel, ret);
     return ret;
   }
 
@@ -237,55 +213,6 @@ class ReAtom extends ReObject {
     return Boolean(this.a.attpnt);
   }
 
-  private isTrisectionAttachmentPoint(): boolean {
-    // in this case we should split the attachment point vector to two vectors
-    return this.a.attpnt === 3;
-  }
-
-  private getAttachmentPointDirectionVectors(struct: Struct): Vec2[] {
-    if (!this.hasAttachmentPoint()) {
-      return [];
-    }
-    if (this.isTrisectionAttachmentPoint()) {
-      return trisectionLargestSector(this, struct);
-    } else {
-      const hasOnlyOneBond = this.a.neighbors.length === 1;
-      const directionVector = hasOnlyOneBond
-        ? getAttachmentDirectionForOnlyOneBond(this, struct)
-        : bisectLargestSector(this, struct);
-      return [directionVector];
-    }
-  }
-
-  showAttachmentPoints(restruct: ReStruct): void {
-    const directionVectors = this.getAttachmentPointDirectionVectors(
-      restruct.molecule,
-    );
-    directionVectors.forEach((directionVector, index) => {
-      showAttachmentPointShape(
-        this,
-        restruct.render,
-        directionVector,
-        restruct.addReObjectPath.bind(restruct),
-      );
-
-      const showLabel = isAttachmentPointLabelRequired(restruct);
-      if (showLabel) {
-        // in case of isTrisectionRequired (trisection case) we should show labels '1' and '2' for those separated vectors
-        const labelText = String(
-          this.isTrisectionAttachmentPoint() ? index + 1 : this.a.attpnt,
-        );
-        showAttachmentPointLabel(
-          this,
-          restruct.render,
-          directionVector,
-          restruct.addReObjectPath.bind(restruct),
-          labelText,
-        );
-      }
-    });
-  }
-
   show(restruct: ReStruct, aid: number, options: any): void {
     // eslint-disable-line max-statements
     const atom = restruct.molecule.atoms.get(aid)!;
@@ -317,7 +244,7 @@ class ReAtom extends ReObject {
 
     this.hydrogenOnTheLeft = setHydrogenPos(restruct.molecule, this);
     this.showLabel = isLabelVisible(restruct, render.options, this);
-    this.color = 'black'; // reset colour
+    this.color = 'black'; // reset color
 
     let delta;
     let rightMargin;
@@ -519,7 +446,7 @@ class ReAtom extends ReObject {
       draw.recenterText(aamPath, aamBox);
       const visel = this.visel;
       let t = 3;
-      let dir = bisectLargestSector(this, restruct.molecule);
+      let dir = this.bisectLargestSector(restruct.molecule);
       // estimate the shift to clear the atom label
       for (let i = 0; i < visel.exts.length; ++i) {
         t = Math.max(t, util.shiftRayBox(ps, dir, visel.exts[i].translate(ps)));
@@ -564,6 +491,40 @@ class ReAtom extends ReObject {
       });
     }
   }
+
+  getLargestSectorFromNeighbors(struct: Struct): {
+    neighborAngle: number;
+    largestAngle: number;
+  } {
+    let angles: Array<number> = [];
+    this.a.neighbors.forEach((halfBondId) => {
+      const halfBond = struct.halfBonds.get(halfBondId);
+      halfBond && angles.push(halfBond.ang);
+    });
+    angles = angles.sort((a, b) => a - b);
+    const largeAngles: Array<number> = [];
+    for (let i = 0; i < angles.length - 1; ++i) {
+      largeAngles.push(angles[(i + 1) % angles.length] - angles[i]);
+    }
+    largeAngles.push(angles[0] - angles[angles.length - 1] + 2 * Math.PI);
+    let largestAngle = 0;
+    let neighborAngle = -Math.PI / 2;
+    for (let i = 0; i < angles.length; ++i) {
+      if (largeAngles[i] > largestAngle) {
+        largestAngle = largeAngles[i];
+        neighborAngle = angles[i];
+      }
+    }
+
+    return { neighborAngle, largestAngle };
+  }
+
+  bisectLargestSector(struct: Struct): Vec2 {
+    const { largestAngle, neighborAngle } =
+      this.getLargestSectorFromNeighbors(struct);
+    const bisectAngle = neighborAngle + largestAngle / 2;
+    return newVectorFromAngle(bisectAngle);
+  }
 }
 
 function getStereoAtomColor(options, stereoLabel) {
@@ -648,7 +609,7 @@ function shouldDisplayStereoLabel(
 }
 
 function isLabelVisible(restruct, options, atom) {
-  const isAttachmentPointAtom = atom.a.attpnt != null;
+  const isAttachmentPointAtom = Boolean(atom.a.attpnt);
   const isCarbon = atom.a.label.toLowerCase() === 'c';
   const visibleTerminal =
     options.showHydrogenLabels !== ShowHydrogenLabels.Off &&
@@ -1146,184 +1107,8 @@ function pathAndRBoxTranslate(path, rbb, x, y) {
   rbb.y += y;
 }
 
-function bisectLargestSector(atom: ReAtom, struct: Struct): Vec2 {
-  const { largestAngle, neighborAngle } = getLargestSectorFromNeighbors(
-    atom,
-    struct,
-  );
-  const bisectAngle = neighborAngle + largestAngle / 2;
-  return newVectorFromAngle(bisectAngle);
-}
-
-function getAttachmentDirectionForOnlyOneBond(
-  atom: ReAtom,
-  struct: Struct,
-): Vec2 {
-  const DEGREE_120_FOR_ONE_BOND = (2 * Math.PI) / 3;
-  const DEGREE_180_FOR_TRIPLE_BOND = Math.PI;
-  const onlyNeighbor = atom.a.neighbors[0];
-  // eslint-disable-next-line  @typescript-eslint/no-non-null-assertion
-  const neighbour = struct.halfBonds.get(onlyNeighbor)!;
-  const angle = neighbour.ang;
-  const isTripleBond =
-    struct.bonds.get(neighbour.bid)?.type === Bond.PATTERN.TYPE.TRIPLE;
-  const finalAngle =
-    angle +
-    (isTripleBond ? DEGREE_180_FOR_TRIPLE_BOND : DEGREE_120_FOR_ONE_BOND);
-  return newVectorFromAngle(finalAngle);
-}
-
-function trisectionLargestSector(atom: ReAtom, struct: Struct): [Vec2, Vec2] {
-  const { largestAngle, neighborAngle } = getLargestSectorFromNeighbors(
-    atom,
-    struct,
-  );
-  const firstTrisectorAngle = neighborAngle + largestAngle / 3;
-  const secondTrisectorAngle = neighborAngle + (largestAngle * 2) / 3;
-
-  return [
-    newVectorFromAngle(firstTrisectorAngle),
-    newVectorFromAngle(secondTrisectorAngle),
-  ];
-}
-
 function newVectorFromAngle(angle: number): Vec2 {
   return new Vec2(Math.cos(angle), Math.sin(angle));
 }
 
-function getLargestSectorFromNeighbors(
-  atom: ReAtom,
-  struct: Struct,
-): { neighborAngle: number; largestAngle: number } {
-  let angles: Array<number> = [];
-  atom.a.neighbors.forEach((hbid) => {
-    const hb = struct.halfBonds.get(hbid);
-    hb && angles.push(hb.ang);
-  });
-  angles = angles.sort((a, b) => a - b);
-  const da: Array<number> = [];
-  for (let i = 0; i < angles.length - 1; ++i) {
-    da.push(angles[(i + 1) % angles.length] - angles[i]);
-  }
-  da.push(angles[0] - angles[angles.length - 1] + 2 * Math.PI);
-  let daMax = 0;
-  let ang = -Math.PI / 2;
-  for (let i = 0; i < angles.length; ++i) {
-    if (da[i] > daMax) {
-      daMax = da[i];
-      ang = angles[i];
-    }
-  }
-
-  return { neighborAngle: ang, largestAngle: daMax };
-}
-
-function getSvgCurveShapeAttachmentPoint(
-  centerPosition: Vec2,
-  directionVector: Vec2,
-  basicSize: number,
-): string {
-  // declared here https://github.com/epam/ketcher/issues/2165
-  // this path has (0,0) in the position of attachment point atom
-  const attachmentPointSvgPathString = `M13 1.5l-1.5 3.7c-0.3 0.8-1.5 0.8-1.9 0l-1.7-4.4c-0.3-0.8-1.5-0.8-1.9 0l-1.7 4.4c-0.3 0.8-1.5 0.8-1.8 0l-1.8-4.4c-0.3-0.8-1.5-0.8-1.8 0l-1.7 4.4c-0.3 0.8-1.5 0.8-1.9 0l-1.7-4.4c-0.3-0.8-1.5-0.8-1.9 0l-1.6 4.2c-0.3 0.9-1.6 0.8-1.9 0l-1.2-3.5`;
-  const attachmentPointSvgPathSize = 39.8;
-
-  const shapeScale = basicSize / attachmentPointSvgPathSize;
-  const angleDegrees =
-    (Math.atan2(directionVector.y, directionVector.x) * 180) / Math.PI - 90;
-
-  return svgPath(attachmentPointSvgPathString)
-    .rotate(angleDegrees)
-    .scale(shapeScale)
-    .translate(centerPosition.x, centerPosition.y)
-    .toString();
-}
-
-function showAttachmentPointShape(
-  atom: ReAtom,
-  { options, paper }: Render,
-  directionVector: Vec2,
-  addReObjectPath: InstanceType<typeof ReStruct>['addReObjectPath'],
-): void {
-  const atomPositionVector = Scale.obj2scaled(atom.a.pp, options);
-  const shiftedAtomPositionVector = atom.getShiftedSegmentPosition(
-    options,
-    directionVector,
-  );
-  const attachmentPointEnd = atomPositionVector.addScaled(
-    directionVector,
-    options.scale * 0.85,
-  );
-
-  const linePath = paper.path(
-    'M{0},{1}L{2},{3}',
-    tfx(shiftedAtomPositionVector.x),
-    tfx(shiftedAtomPositionVector.y),
-    tfx(attachmentPointEnd.x),
-    tfx(attachmentPointEnd.y),
-  );
-
-  const curvePath = paper.path(
-    getSvgCurveShapeAttachmentPoint(
-      attachmentPointEnd,
-      directionVector,
-      options.scale,
-    ),
-  );
-
-  const resultShape = paper
-    .set([curvePath, linePath])
-    .attr(options.lineattr)
-    .attr({ 'stroke-width': options.lineWidth });
-
-  addReObjectPath(
-    LayerMap.indices,
-    atom.visel,
-    resultShape,
-    atomPositionVector,
-  );
-}
-
-function getLabelPositionForAttachmentPoint(
-  atomPositionVector: Vec2,
-  directionVector: Vec2,
-  shapeHeight: number,
-): Vec2 {
-  const normal = directionVector.rotateSC(1, 0);
-  return atomPositionVector
-    .addScaled(normal, 0.17 * shapeHeight)
-    .addScaled(directionVector, shapeHeight * 0.7);
-}
-
-function showAttachmentPointLabel(
-  atom: ReAtom,
-  { options, paper }: Render,
-  directionVector: Vec2,
-  addReObjectPath: InstanceType<typeof ReStruct>['addReObjectPath'],
-  labelText: string,
-): void {
-  const atomPositionVector = Scale.obj2scaled(atom.a.pp, options);
-  const labelPosition = getLabelPositionForAttachmentPoint(
-    atomPositionVector,
-    directionVector,
-    options.scale,
-  );
-  const labelPath = paper
-    .text(labelPosition.x, labelPosition.y, labelText)
-    .attr({
-      font: options.font,
-      'font-size': options.fontsz * 0.9,
-      fill: atom.color,
-    });
-
-  addReObjectPath(LayerMap.indices, atom.visel, labelPath, atomPositionVector);
-}
-
-export function isAttachmentPointLabelRequired(restruct: ReStruct) {
-  // in case of having 2 or 3 attachment point type we have to render
-  // 2 - Secondary type
-  // 3 - Both Primary and Secondary - should be considered as two Attachment points
-  return restruct.molecule.atoms.some(({ attpnt }) => [2, 3].includes(attpnt));
-}
-
 export default ReAtom;
diff --git a/packages/ketcher-core/src/application/render/restruct/rebond.ts b/packages/ketcher-core/src/application/render/restruct/rebond.ts
index dc2880b3d4..38fac1020a 100644
--- a/packages/ketcher-core/src/application/render/restruct/rebond.ts
+++ b/packages/ketcher-core/src/application/render/restruct/rebond.ts
@@ -301,7 +301,14 @@ class ReBond extends ReObject {
     const isSnapping = restruct.isSnappingBond(bid);
     this.path = getBondPath(restruct, this, hb1, hb2, isSnapping);
     this.rbb = util.relBox(this.path.getBBox());
-    restruct.addReObjectPath(LayerMap.data, this.visel, this.path, null, true);
+    // add layer for bond's skeleton:
+    restruct.addReObjectPath(
+      LayerMap.bondSkeleton,
+      this.visel,
+      this.path,
+      null,
+      true,
+    );
     const reactingCenter: any = {};
     reactingCenter.path = getReactingCenterPath(render, this, hb1, hb2);
     if (reactingCenter.path) {
diff --git a/packages/ketcher-core/src/application/render/restruct/rergroup.js b/packages/ketcher-core/src/application/render/restruct/rergroup.js
index 75a2a0805d..a8996425cf 100644
--- a/packages/ketcher-core/src/application/render/restruct/rergroup.js
+++ b/packages/ketcher-core/src/application/render/restruct/rergroup.js
@@ -21,6 +21,8 @@ import ReObject from './reobject';
 import { Scale } from 'domain/helpers';
 import draw from '../draw';
 import util from '../util';
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+import { Render } from '../raphaelRender';
 
 const BORDER_EXT = new Vec2(0.05 * 3, 0.05 * 3);
 const PADDING_VECTOR = new Vec2(0.2, 0.4);
@@ -55,7 +57,11 @@ class ReRGroup extends ReObject {
     return ret;
   }
 
+  /**
+   * @param {Render} render
+   */
   calcBBox(render) {
+    /** @type {Box2Abs | null} */
     let rGroupBoundingBox = null;
     this.item.frags.forEach((fid) => {
       const fragBox = render.ctab.frags
@@ -67,17 +73,19 @@ class ReRGroup extends ReObject {
           : fragBox;
       }
     });
-    let attachmentPointsVBox = render.ctab.getAttachmentsPointsVBox(
-      this.getAtoms(render),
-    );
-    attachmentPointsVBox = attachmentPointsVBox
-      ? attachmentPointsVBox.extend(BORDER_EXT, BORDER_EXT)
-      : attachmentPointsVBox;
-
-    rGroupBoundingBox =
-      attachmentPointsVBox && rGroupBoundingBox
-        ? Box2Abs.union(attachmentPointsVBox, rGroupBoundingBox)
-        : rGroupBoundingBox;
+
+    const rGroupAttachmentPointsVBox =
+      render.ctab.getRGroupAttachmentPointsVBoxByAtomIds(this.getAtoms(render));
+    if (rGroupBoundingBox && rGroupAttachmentPointsVBox) {
+      rGroupBoundingBox = Box2Abs.union(
+        rGroupBoundingBox,
+        rGroupAttachmentPointsVBox,
+      );
+    }
+
+    rGroupBoundingBox = rGroupBoundingBox
+      ? rGroupBoundingBox.extend(BORDER_EXT, BORDER_EXT)
+      : rGroupBoundingBox;
 
     return rGroupBoundingBox;
   }
diff --git a/packages/ketcher-core/src/application/render/restruct/rergroupAttachmentPoint.ts b/packages/ketcher-core/src/application/render/restruct/rergroupAttachmentPoint.ts
new file mode 100644
index 0000000000..42907b9e26
--- /dev/null
+++ b/packages/ketcher-core/src/application/render/restruct/rergroupAttachmentPoint.ts
@@ -0,0 +1,374 @@
+import { RaphaelPaper } from 'raphael';
+import {
+  Bond,
+  RGroupAttachmentPoint,
+  RGroupAttachmentPointType,
+  Struct,
+  Vec2,
+} from 'domain/entities';
+import { Scale } from 'domain/helpers';
+import { ReAtom, ReObject, ReStruct } from '.';
+import draw from '../draw';
+import { Render } from '../raphaelRender';
+import { RenderOptions } from '../render.types';
+import { LayerMap } from './generalEnumTypes';
+import Visel from './visel';
+
+class ReRGroupAttachmentPoint extends ReObject {
+  item: RGroupAttachmentPoint;
+  reAtom: ReAtom;
+  lineDirectionVector: Vec2 = new Vec2();
+
+  static LINE_OUTLINE_WIDTH = 0.36;
+  static OUTLINE_PADDING = 0.15;
+  static CURVE_OUTLINE_WIDTH = 1.0;
+  static CURVE_OUTLINE_HEIGHT = 0.42;
+
+  constructor(item: RGroupAttachmentPoint, reAtom: ReAtom) {
+    super('rgroupAttachmentPoint');
+    this.item = item;
+    this.reAtom = reAtom;
+  }
+
+  get normalizedLineDirectionVector() {
+    return this.lineDirectionVector.normalized();
+  }
+
+  get normalizedCurveDirectionVector() {
+    return this.lineDirectionVector.rotate(Math.PI / 2).normalized();
+  }
+
+  get startPoint() {
+    return this.reAtom.a.pp;
+  }
+
+  get middlePoint() {
+    return this.outlineEndPoint.addScaled(
+      this.normalizedLineDirectionVector,
+      -ReRGroupAttachmentPoint.CURVE_OUTLINE_HEIGHT,
+    );
+  }
+
+  get endPoint() {
+    return this.startPoint.add(this.lineDirectionVector);
+  }
+
+  get outlineEndPoint() {
+    const length =
+      this.lineDirectionVector.length() +
+      ReRGroupAttachmentPoint.OUTLINE_PADDING;
+    return this.startPoint.addScaled(
+      this.normalizedLineDirectionVector,
+      length,
+    );
+  }
+
+  static isSelectable() {
+    return true;
+  }
+
+  getOutlinePoints() {
+    const topLeftPadPoint = this.outlineEndPoint.addScaled(
+      this.normalizedCurveDirectionVector,
+      -ReRGroupAttachmentPoint.CURVE_OUTLINE_WIDTH / 2,
+    );
+    const topLeftPoint = topLeftPadPoint.addScaled(
+      this.normalizedCurveDirectionVector,
+      ReRGroupAttachmentPoint.OUTLINE_PADDING,
+    );
+    const topRightPadPoint = this.outlineEndPoint.addScaled(
+      this.normalizedCurveDirectionVector,
+      ReRGroupAttachmentPoint.CURVE_OUTLINE_WIDTH / 2,
+    );
+    const topRightPoint = topRightPadPoint.addScaled(
+      this.normalizedCurveDirectionVector,
+      -ReRGroupAttachmentPoint.OUTLINE_PADDING,
+    );
+    const middleMostLeftPadPoint = this.middlePoint.addScaled(
+      this.normalizedCurveDirectionVector,
+      -ReRGroupAttachmentPoint.CURVE_OUTLINE_WIDTH / 2,
+    );
+    const middleMostLeftPoint = middleMostLeftPadPoint.addScaled(
+      this.normalizedCurveDirectionVector,
+      ReRGroupAttachmentPoint.OUTLINE_PADDING,
+    );
+    const middleMostRightPadPoint = this.middlePoint.addScaled(
+      this.normalizedCurveDirectionVector,
+      ReRGroupAttachmentPoint.CURVE_OUTLINE_WIDTH / 2,
+    );
+    const middleMostRightPoint = middleMostRightPadPoint.addScaled(
+      this.normalizedCurveDirectionVector,
+      -ReRGroupAttachmentPoint.OUTLINE_PADDING,
+    );
+    const middleLeftPoint = this.middlePoint.addScaled(
+      this.normalizedCurveDirectionVector,
+      -ReRGroupAttachmentPoint.LINE_OUTLINE_WIDTH / 2,
+    );
+    const middleRightPoint = this.middlePoint.addScaled(
+      this.normalizedCurveDirectionVector,
+      ReRGroupAttachmentPoint.LINE_OUTLINE_WIDTH / 2,
+    );
+    const bottomLeftPadPoint = this.startPoint.addScaled(
+      this.normalizedCurveDirectionVector,
+      -ReRGroupAttachmentPoint.LINE_OUTLINE_WIDTH / 2,
+    );
+    const bottomLeftPoint = bottomLeftPadPoint.addScaled(
+      this.normalizedLineDirectionVector,
+      ReRGroupAttachmentPoint.OUTLINE_PADDING,
+    );
+    const bottomRightPadPoint = this.startPoint.addScaled(
+      this.normalizedCurveDirectionVector,
+      ReRGroupAttachmentPoint.LINE_OUTLINE_WIDTH / 2,
+    );
+    const bottomRightPoint = bottomRightPadPoint.addScaled(
+      this.normalizedLineDirectionVector,
+      ReRGroupAttachmentPoint.OUTLINE_PADDING,
+    );
+
+    return [
+      topLeftPadPoint,
+      topLeftPoint,
+      topRightPoint,
+      topRightPadPoint,
+      middleMostRightPadPoint,
+      middleMostRightPoint,
+      middleRightPoint,
+      bottomRightPoint,
+      bottomRightPadPoint,
+      bottomLeftPadPoint,
+      bottomLeftPoint,
+      middleLeftPoint,
+      middleMostLeftPoint,
+      middleMostLeftPadPoint,
+    ] as const;
+  }
+
+  getDistanceTo(destination: Vec2) {
+    return Vec2.dist(destination, this.middlePoint);
+  }
+
+  show(restruct: ReStruct) {
+    const directionVector = this.getAttachmentPointDirectionVector(
+      restruct.molecule,
+    );
+
+    if (!directionVector) {
+      return;
+    }
+    this.lineDirectionVector = directionVector;
+
+    showAttachmentPointShape(
+      this.reAtom,
+      restruct.render,
+      directionVector,
+      restruct.addReObjectPath.bind(restruct),
+      this.visel,
+    );
+
+    const showLabel = isAttachmentPointLabelRequired(restruct);
+    if (showLabel) {
+      // in case of isTrisectionRequired (trisection case) we should show labels '1' and '2' for those separated vectors
+      const labelText = this.item.type === 'primary' ? '1' : '2';
+      showAttachmentPointLabel(
+        this.reAtom,
+        restruct.render,
+        directionVector,
+        restruct.addReObjectPath.bind(restruct),
+        labelText,
+        this.visel,
+      );
+    }
+  }
+
+  private getHoverPlatePath(options: RenderOptions) {
+    const outlinePoints = this.getOutlinePoints();
+    const scaledOutlinePoints = outlinePoints.map((point) =>
+      Scale.obj2scaled(point, options),
+    );
+    const [
+      topLeftPadPoint,
+      topLeftPoint,
+      topRightPoint,
+      topRightPadPoint,
+      middleMostRightPadPoint,
+      middleMostRightPoint,
+      middleRightPoint,
+      bottomRightPoint,
+      bottomRightPadPoint,
+      bottomLeftPadPoint,
+      bottomLeftPoint,
+      middleLeftPoint,
+      middleMostLeftPoint,
+      middleMostLeftPadPoint,
+    ] = scaledOutlinePoints;
+
+    // Docs: ketcher-core/docs/data/hover_selection_rgroup_attachment_point.png
+    const pathString = `
+      M ${topLeftPoint.x} ${topLeftPoint.y}
+      L ${topRightPoint.x} ${topRightPoint.y}
+      C ${topRightPadPoint.x} ${topRightPadPoint.y}, ${middleMostRightPadPoint.x} ${middleMostRightPadPoint.y}, ${middleMostRightPoint.x} ${middleMostRightPoint.y}
+      L ${middleRightPoint.x} ${middleRightPoint.y}
+      L ${bottomRightPoint.x} ${bottomRightPoint.y}
+      C ${bottomRightPadPoint.x} ${bottomRightPadPoint.y}, ${bottomLeftPadPoint.x} ${bottomLeftPadPoint.y}, ${bottomLeftPoint.x} ${bottomLeftPoint.y}
+      L ${middleLeftPoint.x} ${middleLeftPoint.y}
+      L ${middleMostLeftPoint.x} ${middleMostLeftPoint.y}
+      C ${middleMostLeftPadPoint.x} ${middleMostLeftPadPoint.y}, ${topLeftPadPoint.x} ${topLeftPadPoint.y}, ${topLeftPoint.x} ${topLeftPoint.y}
+    `;
+    return pathString;
+  }
+
+  makeHoverPlate(render: Render) {
+    const hoverPlatePath = this.getHoverPlatePath(render.options);
+    return render.paper.path(hoverPlatePath).attr(render.options.hoverStyle);
+  }
+
+  makeSelectionPlate(
+    _restruct: ReStruct,
+    paper: RaphaelPaper,
+    options: RenderOptions,
+  ) {
+    const hoverPlatePath = this.getHoverPlatePath(options);
+    return paper.path(hoverPlatePath).attr(options.selectionStyle);
+  }
+
+  drawHover(render: Render) {
+    const hoverPlate = this.makeHoverPlate(render);
+    render.ctab.addReObjectPath(LayerMap.hovering, this.visel, hoverPlate);
+    return hoverPlate;
+  }
+
+  private getAttachmentPointDirectionVector(struct: Struct) {
+    if (!this.reAtom.hasAttachmentPoint()) {
+      return;
+    }
+    if (this.isTrisectionAttachmentPoint()) {
+      return trisectionLargestSector(this.reAtom, struct, this.item.type);
+    } else {
+      const hasOnlyOneBond = this.reAtom.a.neighbors.length === 1;
+      const directionVector = hasOnlyOneBond
+        ? getAttachmentDirectionForOnlyOneBond(this.reAtom, struct)
+        : this.reAtom.bisectLargestSector(struct);
+      return directionVector;
+    }
+  }
+
+  private isTrisectionAttachmentPoint(): boolean {
+    // in this case we should split the attachment point vector to two vectors
+    return this.reAtom.a.attpnt === 3;
+  }
+}
+
+function showAttachmentPointShape(
+  atom: ReAtom,
+  { options, paper }: Render,
+  directionVector: Vec2,
+  addReObjectPath: InstanceType<typeof ReStruct>['addReObjectPath'],
+  visel: Visel,
+): void {
+  const atomPositionVector = Scale.obj2scaled(atom.a.pp, options);
+  const shiftedAtomPositionVector = atom.getShiftedSegmentPosition(
+    options,
+    directionVector,
+  );
+  const attachmentPointEnd = atomPositionVector.addScaled(
+    directionVector,
+    options.scale * 0.85,
+  );
+
+  const resultShape = draw.rgroupAttachmentPoint(
+    paper,
+    shiftedAtomPositionVector,
+    attachmentPointEnd,
+    directionVector,
+    options,
+  );
+
+  addReObjectPath(
+    LayerMap.indices,
+    visel,
+    resultShape,
+    atomPositionVector,
+    true,
+  );
+}
+
+function trisectionLargestSector(
+  atom: ReAtom,
+  struct: Struct,
+  attachmentPointType: RGroupAttachmentPointType,
+) {
+  const { largestAngle, neighborAngle } =
+    atom.getLargestSectorFromNeighbors(struct);
+  const firstTrisectorAngle = neighborAngle + largestAngle / 3;
+  const secondTrisectorAngle = neighborAngle + (largestAngle * 2) / 3;
+
+  return attachmentPointType === 'primary'
+    ? newVectorFromAngle(firstTrisectorAngle)
+    : newVectorFromAngle(secondTrisectorAngle);
+}
+
+function newVectorFromAngle(angle: number): Vec2 {
+  return new Vec2(Math.cos(angle), Math.sin(angle));
+}
+
+function isAttachmentPointLabelRequired(restruct: ReStruct) {
+  // in case of having 2 or 3 attachment point type we have to render
+  // 2 - Secondary type
+  // 3 - Both Primary and Secondary - should be considered as two Attachment points
+  return restruct.molecule.atoms.some(({ attpnt }) => [2, 3].includes(attpnt));
+}
+
+function getAttachmentDirectionForOnlyOneBond(
+  atom: ReAtom,
+  struct: Struct,
+): Vec2 {
+  const DEGREE_120_FOR_ONE_BOND = (2 * Math.PI) / 3;
+  const DEGREE_180_FOR_TRIPLE_BOND = Math.PI;
+  const onlyNeighbor = atom.a.neighbors[0];
+  // eslint-disable-next-line  @typescript-eslint/no-non-null-assertion
+  const neighbour = struct.halfBonds.get(onlyNeighbor)!;
+  const angle = neighbour.ang;
+  const isTripleBond =
+    struct.bonds.get(neighbour.bid)?.type === Bond.PATTERN.TYPE.TRIPLE;
+  const finalAngle =
+    angle +
+    (isTripleBond ? DEGREE_180_FOR_TRIPLE_BOND : DEGREE_120_FOR_ONE_BOND);
+  return newVectorFromAngle(finalAngle);
+}
+
+function showAttachmentPointLabel(
+  atom: ReAtom,
+  { options, paper }: Render,
+  directionVector: Vec2,
+  addReObjectPath: InstanceType<typeof ReStruct>['addReObjectPath'],
+  labelText: string,
+  visel: Visel,
+): void {
+  const atomPositionVector = Scale.obj2scaled(atom.a.pp, options);
+  const labelPosition = getLabelPositionForAttachmentPoint(
+    atomPositionVector,
+    directionVector,
+    options.scale,
+  );
+  const labelPath = draw.rgroupAttachmentPointLabel(
+    paper,
+    labelPosition,
+    labelText,
+    options,
+    atom.color,
+  );
+  addReObjectPath(LayerMap.indices, visel, labelPath, atomPositionVector, true);
+}
+
+function getLabelPositionForAttachmentPoint(
+  atomPositionVector: Vec2,
+  directionVector: Vec2,
+  shapeHeight: number,
+): Vec2 {
+  const normal = directionVector.rotateSC(1, 0);
+  return atomPositionVector
+    .addScaled(normal, 0.17 * shapeHeight)
+    .addScaled(directionVector, shapeHeight * 0.7);
+}
+
+export { ReRGroupAttachmentPoint };
diff --git a/packages/ketcher-core/src/application/render/restruct/restruct.ts b/packages/ketcher-core/src/application/render/restruct/restruct.ts
index eacb57766c..39a5e87f91 100644
--- a/packages/ketcher-core/src/application/render/restruct/restruct.ts
+++ b/packages/ketcher-core/src/application/render/restruct/restruct.ts
@@ -19,11 +19,12 @@ import {
   FunctionalGroup,
   Pile,
   Pool,
+  RGroupAttachmentPoint,
   SGroup,
   Struct,
   Vec2,
 } from 'domain/entities';
-
+import assert from 'assert';
 import { LayerMap } from './generalEnumTypes';
 import ReAtom from './reatom';
 import ReBond from './rebond';
@@ -40,6 +41,7 @@ import ReText from './retext';
 import { Render } from '../raphaelRender';
 import Visel from './visel';
 import util from '../util';
+import { ReRGroupAttachmentPoint } from './rergroupAttachmentPoint';
 
 class ReStruct {
   public static maps = {
@@ -49,6 +51,7 @@ class ReStruct {
     rxnArrows: ReRxnArrow,
     frags: ReFrag,
     rgroups: ReRGroup,
+    rgroupAttachmentPoints: ReRGroupAttachmentPoint,
     sgroupData: ReDataSGroupData,
     enhancedFlags: ReEnhancedFlag,
     sgroups: ReSGroup,
@@ -66,6 +69,8 @@ class ReStruct {
   public rxnArrows: Map<number, ReRxnArrow> = new Map();
   public frags: Pool = new Pool();
   public rgroups: Pool = new Pool();
+  public rgroupAttachmentPoints: Pool<ReRGroupAttachmentPoint> = new Pool();
+
   public sgroups: Map<number, ReSGroup> = new Map();
   public sgroupData: Map<number, ReDataSGroupData> = new Map();
   public enhancedFlags: Map<number, ReEnhancedFlag> = new Map();
@@ -130,6 +135,17 @@ class ReStruct {
       this.rgroups.set(id, new ReRGroup(item));
     });
 
+    molecule.rgroupAttachmentPoints.forEach(
+      (item: RGroupAttachmentPoint, id: number) => {
+        const reAtom = this.atoms.get(item.atomId);
+        assert(reAtom != null);
+        this.rgroupAttachmentPoints.set(
+          id,
+          new ReRGroupAttachmentPoint(item, reAtom),
+        );
+      },
+    );
+
     molecule.sgroups.forEach((item, id) => {
       this.sgroups.set(id, new ReSGroup(item));
       if (item.type === 'DAT' && !item.data.attached) {
@@ -141,6 +157,22 @@ class ReStruct {
     });
   }
 
+  get visibleRGroupAttachmentPoints() {
+    const sgroups = this.molecule.sgroups;
+    const functionalGroups = this.molecule.functionalGroups;
+    return this.rgroupAttachmentPoints.filter((_id, reItem) => {
+      const atomId = reItem.item.atomId;
+      const atom = this.molecule.atoms.get(atomId);
+      assert(atom != null);
+      return !FunctionalGroup.isAtomInContractedFunctionalGroup(
+        atom,
+        sgroups,
+        functionalGroups,
+        false,
+      );
+    });
+  }
+
   connectedComponentRemoveAtom(aid: number, reAtom?: ReAtom): void {
     const atom = reAtom || this.atoms.get(aid);
     if (!atom || atom.component < 0) return;
@@ -351,17 +383,6 @@ class ReStruct {
 
     let boundingBox = this.getBoundingBoxForSelection(selection);
 
-    if (boundingBox) {
-      const atomsIdsSelected: number[] = selection.atoms ?? [
-        ...this.atoms.keys(),
-      ];
-      const attachmentPointsVBox =
-        this.getAttachmentsPointsVBox(atomsIdsSelected);
-      if (attachmentPointsVBox) {
-        boundingBox = Box2Abs.union(boundingBox, attachmentPointsVBox);
-      }
-    }
-
     boundingBox = boundingBox || new Box2Abs(0, 0, 0, 0);
     return boundingBox;
   }
@@ -438,18 +459,6 @@ class ReStruct {
       this.molecule.frags.delete(fid);
     });
 
-    // dependency on attachment points
-    // must be removed once attachment points will be dedicated Visel
-    // must be refactored in https://github.com/epam/ketcher/issues/2742 (#2742)
-    this.atoms.forEach((_, aid) => {
-      const atom = this.atoms.get(aid);
-      // in case of atom has attachment point we have to mark it as changed,
-      // so the labels for attachment point will be recalculated
-      if (atom?.hasAttachmentPoint()) {
-        this.atomsChanged.set(aid, 1);
-      }
-    });
-
     Object.keys(ReStruct.maps).forEach((map) => {
       const mapChanged = this[map + 'Changed'];
 
@@ -618,27 +627,58 @@ class ReStruct {
     });
   }
 
-  getAttachmentsPointsVBox(atomsIds: number[]): Box2Abs | null {
-    let result: Box2Abs | null = null;
-    for (const atomId of atomsIds) {
-      const reAtom = this.atoms.get(atomId)!;
-      const bbox = reAtom.getVBoxObjOfAttachmentPoint(this.render);
-      if (bbox) {
-        result = result ? Box2Abs.union(result, bbox) : bbox;
+  getRGroupAttachmentPointsVBoxByAtomIds(atomsIds: number[]): Box2Abs | null {
+    let allAtomAttachmentPointsVBox: Box2Abs | null = null;
+
+    atomsIds.forEach((atomId) => {
+      const attachmentPointIds =
+        this.molecule.getRGroupAttachmentPointsByAtomId(atomId);
+
+      const oneAtomAttachmentPointsVBox = attachmentPointIds.reduce(
+        (previousVBox, attachmentPointId) => {
+          const attachmentPoint =
+            this.rgroupAttachmentPoints.get(attachmentPointId);
+          assert(attachmentPoint != null);
+          const currentVBox = attachmentPoint.getVBoxObj(this.render);
+          return previousVBox && currentVBox
+            ? Box2Abs.union(previousVBox, currentVBox)
+            : currentVBox;
+        },
+        null as Box2Abs | null,
+      );
+
+      if (allAtomAttachmentPointsVBox && oneAtomAttachmentPointsVBox) {
+        allAtomAttachmentPointsVBox = Box2Abs.union(
+          allAtomAttachmentPointsVBox,
+          oneAtomAttachmentPointsVBox,
+        );
+      } else {
+        allAtomAttachmentPointsVBox =
+          allAtomAttachmentPointsVBox ?? oneAtomAttachmentPointsVBox;
       }
-    }
-    return result;
+    });
+
+    return allAtomAttachmentPointsVBox;
   }
 
   private showRgroupAttachmentPoints() {
-    this.atoms.forEach((_value, aid) => {
-      const atom = this.atoms.get(aid);
-      const sgroup = this.molecule.getGroupFromAtomId(aid);
+    // why update all rgroupAttachmentPoints instead of changed ones?
+    // 1. The label of an R-Group attachment point may be affected by other R-Group attachment points
+    // 2. The visibility of an an R-Group attachment point may be affected by contracting/expanding an S-Group
+    this.rgroupAttachmentPoints.forEach((_value, id) => {
+      const rgroupAttachmentPoint = this.rgroupAttachmentPoints.get(id);
+      if (rgroupAttachmentPoint?.visel) {
+        this.clearVisel(rgroupAttachmentPoint.visel);
+      }
+
+      const attachedAtomId = rgroupAttachmentPoint?.item.atomId;
+      const sgroup = this.molecule.getGroupFromAtomId(attachedAtomId);
       const isInsideContractedSGroup = Boolean(sgroup?.isContracted());
       if (isInsideContractedSGroup) {
         return;
       }
-      atom?.showAttachmentPoints(this);
+
+      rgroupAttachmentPoint?.show(this);
     });
   }
 
diff --git a/packages/ketcher-core/src/application/render/restruct/retext.ts b/packages/ketcher-core/src/application/render/restruct/retext.ts
index cc118bad8a..165829539f 100644
--- a/packages/ketcher-core/src/application/render/restruct/retext.ts
+++ b/packages/ketcher-core/src/application/render/restruct/retext.ts
@@ -129,7 +129,7 @@ class ReText extends ReObject {
   drawHover(render: any): any {
     if (!this.paths.length) return null;
     const ret = this.hoverPath(render).attr(render.options.hoverStyle);
-    render.ctab.addReObjectPath(LayerMap.hovering, this.visel, ret);
+    render.ctab.addReObjectPath(LayerMap.data, this.visel, ret);
     return ret;
   }
 
diff --git a/packages/ketcher-core/src/domain/entities/atom.ts b/packages/ketcher-core/src/domain/entities/atom.ts
index 62158eda30..e1349cabc4 100644
--- a/packages/ketcher-core/src/domain/entities/atom.ts
+++ b/packages/ketcher-core/src/domain/entities/atom.ts
@@ -46,6 +46,13 @@ export interface AtomAttributes {
   substitutionCount?: number;
   ringBondCount?: number;
   explicitValence?: number;
+  /**
+   *  Values can be `0 | 1 | 2 | 3 | null`.
+   * `1` - has a `primary` R-Group Attachment Point
+   * `2` - has a `secondary` R-Group Attachment Point
+   * `3` - has a `primary` and a `secondary` R-Group Attachment Points
+   * `null` and `0` both mean the atom has no R-Group Attachment Points
+   */
   attpnt?: any;
   rglabel?: string | null;
   charge?: number;
@@ -212,6 +219,10 @@ export class Atom {
     });
   }
 
+  get isRGroupAttachmentPointEditDisabled() {
+    return this.label === 'R#' && this.rglabel !== null;
+  }
+
   /**
    * Trick: used for cloned struct for tooltips, for preview, for templates
    *
diff --git a/packages/ketcher-core/src/domain/entities/functionalGroup.ts b/packages/ketcher-core/src/domain/entities/functionalGroup.ts
index ae8e94d7eb..c4ed6044ec 100644
--- a/packages/ketcher-core/src/domain/entities/functionalGroup.ts
+++ b/packages/ketcher-core/src/domain/entities/functionalGroup.ts
@@ -101,6 +101,19 @@ export class FunctionalGroup {
     return null;
   }
 
+  static isRGroupAttachmentPointInsideFunctionalGroup(
+    molecule: Struct,
+    id: number,
+  ) {
+    const rgroupAttachmentPoint = molecule.rgroupAttachmentPoints.get(id);
+    assert(rgroupAttachmentPoint != null);
+    const attachedAtom = rgroupAttachmentPoint.atomId;
+    return FunctionalGroup.atomsInFunctionalGroup(
+      molecule.functionalGroups,
+      attachedAtom,
+    );
+  }
+
   static findFunctionalGroupByAtom(
     functionalGroups: Pool<FunctionalGroup>,
     atomId: number,
diff --git a/packages/ketcher-core/src/domain/entities/index.ts b/packages/ketcher-core/src/domain/entities/index.ts
index 72bd7cf6f8..0be05d5d01 100644
--- a/packages/ketcher-core/src/domain/entities/index.ts
+++ b/packages/ketcher-core/src/domain/entities/index.ts
@@ -22,6 +22,7 @@ export * from './functionalGroup';
 export * from './halfBond';
 export * from './loop';
 export * from './rgroup';
+export * from './rgroupAttachmentPoint';
 export * from './rxnArrow';
 export * from './rxnPlus';
 export * from './sgroup';
diff --git a/packages/ketcher-core/src/domain/entities/rgroupAttachmentPoint.ts b/packages/ketcher-core/src/domain/entities/rgroupAttachmentPoint.ts
new file mode 100644
index 0000000000..4d605b1b35
--- /dev/null
+++ b/packages/ketcher-core/src/domain/entities/rgroupAttachmentPoint.ts
@@ -0,0 +1,16 @@
+export type RGroupAttachmentPointType = 'primary' | 'secondary';
+
+export class RGroupAttachmentPoint {
+  atomId: number;
+  type: RGroupAttachmentPointType;
+
+  constructor(atomId: number, type: RGroupAttachmentPointType) {
+    this.atomId = atomId;
+    this.type = type;
+  }
+
+  clone(atomToNewAtom?: Map<number, number> | null) {
+    const newAtomId = atomToNewAtom?.get(this.atomId);
+    return new RGroupAttachmentPoint(newAtomId ?? this.atomId, this.type);
+  }
+}
diff --git a/packages/ketcher-core/src/domain/entities/sGroupAttachmentPoint.ts b/packages/ketcher-core/src/domain/entities/sGroupAttachmentPoint.ts
index 2eceb404e0..3b5e4aa0b0 100644
--- a/packages/ketcher-core/src/domain/entities/sGroupAttachmentPoint.ts
+++ b/packages/ketcher-core/src/domain/entities/sGroupAttachmentPoint.ts
@@ -1,4 +1,5 @@
 import assert from 'assert';
+import { RGroupAttachmentPoint } from './rgroupAttachmentPoint';
 
 /**
  * This is data model for Sgrou attachment point.
@@ -51,4 +52,18 @@ export class SGroupAttachmentPoint {
       this.attachmentId,
     );
   }
+
+  /**
+   * Trick: used for cloned struct for tooltips, for preview, for templates
+   *
+   * Why?
+   * Currently, tooltips are implemented with removing sgroups (wrong implementation)
+   * That's why we need to mark atoms as sgroup attachment points.
+   *
+   * If we change preview approach to flagged (option for showing sgroups without abbreviation),
+   * then we will be able to remove this hack.
+   */
+  convertToRGroupAttachmentPointForDisplayPurpose(attachedAtomId: number) {
+    return new RGroupAttachmentPoint(attachedAtomId, 'primary');
+  }
 }
diff --git a/packages/ketcher-core/src/domain/entities/sgroup.ts b/packages/ketcher-core/src/domain/entities/sgroup.ts
index 977e768c5e..ed486aa794 100644
--- a/packages/ketcher-core/src/domain/entities/sgroup.ts
+++ b/packages/ketcher-core/src/domain/entities/sgroup.ts
@@ -506,7 +506,8 @@ export class SGroup {
       braketBox = !braketBox ? bbb : Box2Abs.union(braketBox, bbb!);
     });
     if (!render) render = window.ketcher!.editor.render;
-    let attachmentPointsVBox = render.ctab.getAttachmentsPointsVBox(atoms);
+    let attachmentPointsVBox =
+      render.ctab.getRGroupAttachmentPointsVBoxByAtomIds(atoms);
     attachmentPointsVBox = attachmentPointsVBox
       ? attachmentPointsVBox.extend(BORDER_EXT, BORDER_EXT)
       : attachmentPointsVBox;
diff --git a/packages/ketcher-core/src/domain/entities/struct.ts b/packages/ketcher-core/src/domain/entities/struct.ts
index 87ede28c24..4c068abacc 100644
--- a/packages/ketcher-core/src/domain/entities/struct.ts
+++ b/packages/ketcher-core/src/domain/entities/struct.ts
@@ -14,6 +14,7 @@
  * limitations under the License.
  ***************************************************************************/
 
+import assert from 'assert';
 import { Atom, radicalElectrons } from './atom';
 import { EditorSelection } from 'application/editor';
 import { Bond } from './bond';
@@ -34,6 +35,7 @@ import { SimpleObject } from './simpleObject';
 import { Text } from './text';
 import { Vec2 } from './vec2';
 import { Highlight } from './highlight';
+import { RGroupAttachmentPoint } from './rgroupAttachmentPoint';
 
 export type Neighbor = {
   aid: number;
@@ -59,6 +61,7 @@ export class Struct {
   rxnPluses: Pool<RxnPlus>;
   frags: Pool<Fragment | null>;
   rgroups: Pool<RGroup>;
+  rgroupAttachmentPoints: Pool<RGroupAttachmentPoint>;
   name: string;
   abbreviation?: string;
   sGroupForest: SGroupForest;
@@ -78,6 +81,7 @@ export class Struct {
     this.rxnPluses = new Pool<RxnPlus>();
     this.frags = new Pool<Fragment>();
     this.rgroups = new Pool<RGroup>();
+    this.rgroupAttachmentPoints = new Pool<RGroupAttachmentPoint>();
     this.name = '';
     this.abbreviation = '';
     this.sGroupForest = new SGroupForest();
@@ -129,6 +133,7 @@ export class Struct {
     aidMap?: Map<number, number> | null,
     simpleObjectsSet?: Pile<number> | null,
     textsSet?: Pile<number> | null,
+    rgroupAttachmentPointSet?: Pile<number> | null,
   ): Struct {
     return this.mergeInto(
       new Struct(),
@@ -139,6 +144,7 @@ export class Struct {
       aidMap,
       simpleObjectsSet,
       textsSet,
+      rgroupAttachmentPointSet,
     );
   }
 
@@ -182,12 +188,16 @@ export class Struct {
     aidMap?: Map<number, number> | null,
     simpleObjectsSet?: Pile<number> | null,
     textsSet?: Pile<number> | null,
+    rgroupAttachmentPointSet?: Pile<number> | null,
   ): Struct {
     atomSet = atomSet || new Pile<number>(this.atoms.keys());
     bondSet = bondSet || new Pile<number>(this.bonds.keys());
     simpleObjectsSet =
       simpleObjectsSet || new Pile<number>(this.simpleObjects.keys());
     textsSet = textsSet || new Pile<number>(this.texts.keys());
+    rgroupAttachmentPointSet =
+      rgroupAttachmentPointSet ||
+      new Pile<number>(this.rgroupAttachmentPoints.keys());
     aidMap = aidMap || new Map();
 
     bondSet = bondSet.filter((bid) => {
@@ -286,6 +296,12 @@ export class Struct {
       cp.texts.add(this.texts.get(id)!.clone());
     });
 
+    rgroupAttachmentPointSet.forEach((id) => {
+      const rgroupAttachmentPoint = this.rgroupAttachmentPoints.get(id);
+      assert(rgroupAttachmentPoint != null);
+      cp.rgroupAttachmentPoints.add(rgroupAttachmentPoint.clone(aidMap));
+    });
+
     if (!dropRxnSymbols) {
       cp.isReaction = this.isReaction;
       this.rxnArrows.forEach((item) => {
@@ -1155,4 +1171,11 @@ export class Struct {
       }) || []
     );
   }
+
+  getRGroupAttachmentPointsByAtomId(atomId: number) {
+    const rgroupAttachmentPoints = this.rgroupAttachmentPoints.filter(
+      (_id, attachmentPoint) => attachmentPoint.atomId === atomId,
+    );
+    return [...rgroupAttachmentPoints.keys()];
+  }
 }
diff --git a/packages/ketcher-core/src/domain/serializers/ket/fromKet/moleculeToStruct.ts b/packages/ketcher-core/src/domain/serializers/ket/fromKet/moleculeToStruct.ts
index 6fe1c5ec34..441a221d2d 100644
--- a/packages/ketcher-core/src/domain/serializers/ket/fromKet/moleculeToStruct.ts
+++ b/packages/ketcher-core/src/domain/serializers/ket/fromKet/moleculeToStruct.ts
@@ -20,6 +20,7 @@ import {
   SGroup,
   Struct,
   SGroupAttachmentPoint,
+  RGroupAttachmentPoint,
 } from 'domain/entities';
 
 import { Elements } from 'domain/constants';
@@ -39,9 +40,23 @@ export function moleculeToStruct(ketItem: any): Struct {
   const struct = mergeFragmentsToStruct(ketItem, new Struct());
   if (ketItem.atoms) {
     ketItem.atoms.forEach((atom) => {
-      if (atom.type === 'rg-label') struct.atoms.add(rglabelToStruct(atom));
-      if (atom.type === 'atom-list') struct.atoms.add(atomListToStruct(atom));
-      if (!atom.type) struct.atoms.add(atomToStruct(atom));
+      let atomId: number | null = null;
+      if (atom.type === 'rg-label') {
+        atomId = struct.atoms.add(rglabelToStruct(atom));
+      }
+      if (atom.type === 'atom-list') {
+        atomId = struct.atoms.add(atomListToStruct(atom));
+      }
+      if (!atom.type) {
+        atomId = struct.atoms.add(atomToStruct(atom));
+      }
+      if (atomId !== null) {
+        addRGroupAttachmentPointsToStruct(
+          struct,
+          atomId,
+          atom.attachmentPoints,
+        );
+      }
     });
   }
 
@@ -130,6 +145,33 @@ export function atomListToStruct(source) {
   return new Atom(params);
 }
 
+function addRGroupAttachmentPointsToStruct(
+  struct: Struct,
+  attachedAtomId: number,
+  attpnt,
+) {
+  const rgroupAttachmentPoints: RGroupAttachmentPoint[] = [];
+  if (attpnt === 1) {
+    rgroupAttachmentPoints.push(
+      new RGroupAttachmentPoint(attachedAtomId, 'primary'),
+    );
+  } else if (attpnt === 2) {
+    rgroupAttachmentPoints.push(
+      new RGroupAttachmentPoint(attachedAtomId, 'secondary'),
+    );
+  } else if (attpnt === 3) {
+    rgroupAttachmentPoints.push(
+      new RGroupAttachmentPoint(attachedAtomId, 'primary'),
+    );
+    rgroupAttachmentPoints.push(
+      new RGroupAttachmentPoint(attachedAtomId, 'secondary'),
+    );
+  }
+  rgroupAttachmentPoints.forEach((rgroupAttachmentPoint) => {
+    struct.rgroupAttachmentPoints.add(rgroupAttachmentPoint);
+  });
+}
+
 /**
  *
  * @param source
diff --git a/packages/ketcher-polymer-editor-react/src/__snapshots__/Editor.test.tsx.snap b/packages/ketcher-polymer-editor-react/src/__snapshots__/Editor.test.tsx.snap
index f8ec9a4d29..5be9e76c1f 100644
--- a/packages/ketcher-polymer-editor-react/src/__snapshots__/Editor.test.tsx.snap
+++ b/packages/ketcher-polymer-editor-react/src/__snapshots__/Editor.test.tsx.snap
@@ -328,7 +328,7 @@ Object {
               class="css-2df9n"
             >
               <div
-                class="shown css-rchq34"
+                class="shown monomer-library css-i21y02"
               >
                 <div
                   class="css-genkkc"
@@ -833,7 +833,7 @@ Object {
             class="css-2df9n"
           >
             <div
-              class="shown css-rchq34"
+              class="shown monomer-library css-i21y02"
             >
               <div
                 class="css-genkkc"
diff --git a/packages/ketcher-polymer-editor-react/src/components/monomerLibrary/MonomerLibrary.tsx b/packages/ketcher-polymer-editor-react/src/components/monomerLibrary/MonomerLibrary.tsx
index cb63b83261..fb5f960d3c 100644
--- a/packages/ketcher-polymer-editor-react/src/components/monomerLibrary/MonomerLibrary.tsx
+++ b/packages/ketcher-polymer-editor-react/src/components/monomerLibrary/MonomerLibrary.tsx
@@ -20,6 +20,7 @@ import { tabsContent } from 'components/monomerLibrary/tabsContent';
 import { useAppDispatch } from 'hooks';
 import { setSearchFilter } from 'state/library';
 import { Icon } from 'ketcher-react';
+import StyledPreview from 'components/shared/MonomerPreview';
 
 const MonomerLibraryContainer = styled.div(({ theme }) => ({
   width: '254px',
@@ -28,6 +29,7 @@ const MonomerLibraryContainer = styled.div(({ theme }) => ({
   boxShadow: '0px 2px 5px rgba(103, 104, 132, 0.15)',
   display: 'flex',
   flexDirection: 'column',
+  position: 'relative',
 
   '&.hidden': {
     visibility: 'hidden',
@@ -130,7 +132,9 @@ const MonomerLibrary = () => {
   };
 
   return (
-    <MonomerLibraryContainer className={isHidden ? 'hidden' : 'shown'}>
+    <MonomerLibraryContainer
+      className={isHidden ? 'hidden monomer-library' : 'shown monomer-library'}
+    >
       <MonomerLibraryHeader>
         <MonomerLibraryTitle>Library</MonomerLibraryTitle>
         <MonomerLibraryToggle>
@@ -159,6 +163,7 @@ const MonomerLibrary = () => {
         </MonomerLibrarySearch>
       </MonomerLibraryHeader>
       <Tabs tabs={tabsContent} />
+      <StyledPreview className="polymer-library-preview" />
     </MonomerLibraryContainer>
   );
 };
diff --git a/packages/ketcher-polymer-editor-react/src/components/monomerLibrary/monomerLibraryGroup/MonomerGroup.test.tsx b/packages/ketcher-polymer-editor-react/src/components/monomerLibrary/monomerLibraryGroup/MonomerGroup.test.tsx
index b6f1aec2a2..a783e8522c 100644
--- a/packages/ketcher-polymer-editor-react/src/components/monomerLibrary/monomerLibraryGroup/MonomerGroup.test.tsx
+++ b/packages/ketcher-polymer-editor-react/src/components/monomerLibrary/monomerLibraryGroup/MonomerGroup.test.tsx
@@ -29,6 +29,7 @@ describe('Monomer Group', () => {
           MonomerNaturalAnalogCode: 'R',
           MonomerName: 'RRMonomerName',
           Name: 'RRName',
+          MonomerType: 'RNA',
         },
         struct: new Struct(),
       },
@@ -38,6 +39,7 @@ describe('Monomer Group', () => {
           MonomerNaturalAnalogCode: 'A',
           MonomerName: 'mAMonomerName',
           Name: 'mAName',
+          MonomerType: 'CHEM',
         },
         struct: new Struct(),
       },
@@ -47,6 +49,7 @@ describe('Monomer Group', () => {
           MonomerNaturalAnalogCode: 'D',
           MonomerName: 'dDMonomerName',
           Name: 'dDName',
+          MonomerType: 'RNA',
         },
         struct: new Struct(),
       },
@@ -56,6 +59,7 @@ describe('Monomer Group', () => {
           MonomerNaturalAnalogCode: 'R',
           MonomerName: 'arRMonomerName',
           Name: 'arRName',
+          MonomerType: 'RNA',
         },
         struct: new Struct(),
       },
@@ -65,6 +69,7 @@ describe('Monomer Group', () => {
           MonomerNaturalAnalogCode: 'L',
           MonomerName: 'LdLMonomerName',
           Name: 'LdLRName',
+          MonomerType: 'CHEM',
         },
         struct: new Struct(),
       },
diff --git a/packages/ketcher-polymer-editor-react/src/components/monomerLibrary/monomerLibraryGroup/MonomerGroup.tsx b/packages/ketcher-polymer-editor-react/src/components/monomerLibrary/monomerLibraryGroup/MonomerGroup.tsx
index b6c6b7554a..313046110b 100644
--- a/packages/ketcher-polymer-editor-react/src/components/monomerLibrary/monomerLibraryGroup/MonomerGroup.tsx
+++ b/packages/ketcher-polymer-editor-react/src/components/monomerLibrary/monomerLibraryGroup/MonomerGroup.tsx
@@ -14,19 +14,14 @@
  * limitations under the License.
  ***************************************************************************/
 import { EmptyFunction } from 'helpers';
-import { debounce } from 'lodash';
-import { useMemo, useRef } from 'react';
 import { MonomerItem } from '../monomerLibraryItem';
 import { MonomerItemType } from '../monomerLibraryItem/types';
-import {
-  GroupContainer,
-  GroupTitle,
-  ItemsContainer,
-  StyledPreview,
-} from './styles';
+import { GroupContainer, GroupTitle, ItemsContainer } from './styles';
 import { IMonomerGroupProps } from './types';
-import { usePreview } from '../../../hooks/usePreview';
 import { getMonomerUniqueKey } from 'state/library';
+import { calculatePreviewPosition } from '../../../helpers';
+import { useAppDispatch, useAppSelector } from 'hooks';
+import { showPreview, selectShowPreview } from 'state/common';
 
 const MonomerGroup = ({
   items,
@@ -34,34 +29,28 @@ const MonomerGroup = ({
   selectedMonomerUniqueKey,
   onItemClick = EmptyFunction,
 }: IMonomerGroupProps) => {
-  const ref = useRef<HTMLDivElement>(null);
-  const [previewItem, previewStyle, setPreviewItem] = usePreview(ref);
-
-  const debouncedSetPreviewItem = useMemo(
-    () => debounce(setPreviewItem, 500),
-    [setPreviewItem],
-  );
+  const dispatch = useAppDispatch();
+  const preview = useAppSelector(selectShowPreview);
 
   const handleItemMouseLeave = () => {
-    debouncedSetPreviewItem.cancel();
-    setPreviewItem();
+    dispatch(showPreview());
   };
 
   const handleItemMouseMove = (
     monomer: MonomerItemType,
     e: React.MouseEvent<HTMLDivElement, MouseEvent>,
   ) => {
-    if (previewItem) {
-      setPreviewItem();
+    if (preview.monomer) {
       return;
     }
 
-    const rect = e.currentTarget.getBoundingClientRect();
-    debouncedSetPreviewItem(monomer, rect);
+    const cardCoordinates = e.currentTarget.getBoundingClientRect();
+    const previewStyle = calculatePreviewPosition(monomer, cardCoordinates);
+    dispatch(showPreview({ monomer, style: previewStyle }));
   };
 
   return (
-    <GroupContainer ref={ref}>
+    <GroupContainer>
       {title && (
         <GroupTitle>
           <span>{title}</span>
@@ -86,9 +75,6 @@ const MonomerGroup = ({
           );
         })}
       </ItemsContainer>
-      {previewItem && (
-        <StyledPreview monomer={previewItem} top={previewStyle?.top || ''} />
-      )}
     </GroupContainer>
   );
 };
diff --git a/packages/ketcher-polymer-editor-react/src/components/monomerLibrary/monomerLibraryGroup/styles.ts b/packages/ketcher-polymer-editor-react/src/components/monomerLibrary/monomerLibraryGroup/styles.ts
index 4809a9bfae..b6cf2e5842 100644
--- a/packages/ketcher-polymer-editor-react/src/components/monomerLibrary/monomerLibraryGroup/styles.ts
+++ b/packages/ketcher-polymer-editor-react/src/components/monomerLibrary/monomerLibraryGroup/styles.ts
@@ -14,9 +14,6 @@
  * limitations under the License.
  ***************************************************************************/
 import styled from '@emotion/styled';
-import { MonomerPreview } from 'components/shared/MonomerPreview';
-import { preview } from '../../../constants';
-import { PreviewStyle } from '../../../types';
 
 export const ItemsContainer = styled.div`
   display: grid;
@@ -58,13 +55,3 @@ export const GroupTitle = styled.div`
   color: ${({ theme }) => theme.ketcher.color.text.primary};
   margin: 0;
 `;
-
-export const StyledPreview = styled(MonomerPreview)<PreviewStyle>`
-  z-index: 1;
-  position: absolute;
-  left: 50%;
-  transform: translate(-50%, 0);
-  top: ${(props) => props.top};
-  width: ${preview.width}px;
-  height: ${preview.height}px;
-`;
diff --git a/packages/ketcher-polymer-editor-react/src/components/monomerLibrary/monomerLibraryItem/MonomerItem.tsx b/packages/ketcher-polymer-editor-react/src/components/monomerLibrary/monomerLibraryItem/MonomerItem.tsx
index 597c2b976c..74da96a805 100644
--- a/packages/ketcher-polymer-editor-react/src/components/monomerLibrary/monomerLibraryItem/MonomerItem.tsx
+++ b/packages/ketcher-polymer-editor-react/src/components/monomerLibrary/monomerLibraryItem/MonomerItem.tsx
@@ -20,6 +20,7 @@ import { getMonomerUniqueKey, toggleMonomerFavorites } from 'state/library';
 import { Card } from './styles';
 import { IMonomerItemProps } from './types';
 import { selectIsEditMode } from 'state/rna-builder';
+import { MONOMER_TYPES } from '../../../constants';
 
 const MonomerItem = ({
   item,
@@ -31,15 +32,19 @@ const MonomerItem = ({
   const [favorite, setFavorite] = useState(item.favorite);
   const dispatch = useAppDispatch();
   const isEditMode = useAppSelector(selectIsEditMode);
+  const colorCode =
+    item.props.MonomerType === MONOMER_TYPES.CHEM
+      ? item.props.MonomerType
+      : item.props.MonomerNaturalAnalogCode;
 
   return (
     <Card
       onClick={onClick}
       selected={isSelected}
       disabled={!isEditMode}
-      code={item.props.MonomerNaturalAnalogCode}
       data-testid={getMonomerUniqueKey(item)}
       data-monomer-item-id={getMonomerUniqueKey(item)}
+      code={colorCode}
       onMouseLeave={onMouseLeave}
       onMouseMove={onMouseMove}
     >
diff --git a/packages/ketcher-polymer-editor-react/src/components/monomerLibrary/monomerLibraryItem/types.ts b/packages/ketcher-polymer-editor-react/src/components/monomerLibrary/monomerLibraryItem/types.ts
index 242b5d272d..4e1ee13d45 100644
--- a/packages/ketcher-polymer-editor-react/src/components/monomerLibrary/monomerLibraryItem/types.ts
+++ b/packages/ketcher-polymer-editor-react/src/components/monomerLibrary/monomerLibraryItem/types.ts
@@ -29,7 +29,7 @@ export type MonomerItemType = {
     BranchMonomer?: string;
     MonomerCaps?: string;
     MonomerCode?: string;
-    MonomerType?: string;
+    MonomerType: string;
   };
 };
 
diff --git a/packages/ketcher-polymer-editor-react/src/components/monomerLibrary/monomerLibraryList/MonomerList.test.tsx b/packages/ketcher-polymer-editor-react/src/components/monomerLibrary/monomerLibraryList/MonomerList.test.tsx
new file mode 100644
index 0000000000..54133ab774
--- /dev/null
+++ b/packages/ketcher-polymer-editor-react/src/components/monomerLibrary/monomerLibraryList/MonomerList.test.tsx
@@ -0,0 +1,90 @@
+/****************************************************************************
+ * Copyright 2021 EPAM Systems
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ***************************************************************************/
+
+import { render, screen } from '@testing-library/react';
+import { MONOMER_TYPES } from '../../../constants';
+
+import { MonomerList } from './MonomerList';
+
+describe('Monomer List', () => {
+  const onItemClick = jest.fn();
+  const initialState = {
+    library: {
+      searchFilter: '',
+      favorites: {},
+      monomers: [
+        {
+          props: {
+            BranchMonomer: 'false',
+            MonomerCaps: '[R1]H',
+            MonomerCode: '',
+            MonomerName: 'Phe4SD',
+            MonomerNaturalAnalogCode: 'F',
+            MonomerType: 'PEPTIDE',
+            Name: '(2S)-2-amino-3-{4-[(4S)-2,6-dioxo-1,3-diazinane-4-amido]phenyl}propanoic acid',
+          },
+          struct: {},
+        },
+        {
+          props: {
+            BranchMonomer: 'false',
+            MonomerCaps: '[R1]H',
+            MonomerCode: '',
+            MonomerName: 'PEG2',
+            MonomerNaturalAnalogCode: '.',
+            MonomerType: 'CHEM',
+            Name: 'Diethylene Glycol',
+          },
+          struct: {},
+        },
+      ],
+    },
+  };
+
+  it('should render correct with groups', () => {
+    const view = render(
+      withThemeAndStoreProvider(
+        <MonomerList
+          libraryName={MONOMER_TYPES.PEPTIDE}
+          onItemClick={onItemClick}
+        />,
+        initialState,
+      ),
+    );
+
+    const currentItem = screen.getByText('Phe4SD');
+    expect(currentItem).toBeInTheDocument();
+
+    expect(view).toMatchSnapshot();
+  });
+
+  it('should render correct without groups', () => {
+    const view = render(
+      withThemeAndStoreProvider(
+        <MonomerList
+          libraryName={MONOMER_TYPES.CHEM}
+          onItemClick={onItemClick}
+        />,
+        initialState,
+      ),
+    );
+
+    const currentItem = screen.getByText('PEG2');
+    expect(currentItem).toBeInTheDocument();
+
+    expect(view).toMatchSnapshot();
+  });
+});
diff --git a/packages/ketcher-polymer-editor-react/src/components/monomerLibrary/monomerLibraryList/MonomerList.tsx b/packages/ketcher-polymer-editor-react/src/components/monomerLibrary/monomerLibraryList/MonomerList.tsx
index f00824f659..71477a1a01 100644
--- a/packages/ketcher-polymer-editor-react/src/components/monomerLibrary/monomerLibraryList/MonomerList.tsx
+++ b/packages/ketcher-polymer-editor-react/src/components/monomerLibrary/monomerLibraryList/MonomerList.tsx
@@ -14,6 +14,7 @@
  * limitations under the License.
  ***************************************************************************/
 
+import { useState } from 'react';
 import { MonomerGroup } from '../monomerLibraryGroup';
 import { useAppSelector } from 'hooks';
 import { MonomerListContainer } from './styles';
@@ -23,6 +24,7 @@ import {
   selectMonomerGroups,
   selectMonomersInCategory,
   selectMonomersInFavorites,
+  getMonomerUniqueKey,
 } from 'state/library';
 import { MONOMER_LIBRARY_FAVORITES } from '../../../constants';
 import { MonomerItemType } from '../monomerLibraryItem/types';
@@ -41,15 +43,22 @@ const MonomerList = ({ onItemClick, libraryName }: IMonomerListProps) => {
 
   const groups = selectMonomerGroups(items);
 
+  const [selectedMonomers, setSelectedMonomers] = useState('');
+
+  const selectItem = (monomer: MonomerItemType) => {
+    setSelectedMonomers(getMonomerUniqueKey(monomer));
+  };
+
   return (
     <MonomerListContainer>
-      {groups.map(({ groupItems, groupTitle }) => {
+      {groups.map(({ groupItems, groupTitle }, _index, groups) => {
         return (
           <MonomerGroup
             key={groupTitle}
-            title={groupTitle}
+            title={groups.length === 1 ? undefined : groupTitle}
             items={groupItems}
-            onItemClick={onItemClick}
+            onItemClick={onItemClick || selectItem}
+            selectedMonomerUniqueKey={selectedMonomers}
           />
         );
       })}
diff --git a/packages/ketcher-polymer-editor-react/src/components/monomerLibrary/monomerLibraryList/__snapshots__/MonomerList.test.tsx.snap b/packages/ketcher-polymer-editor-react/src/components/monomerLibrary/monomerLibraryList/__snapshots__/MonomerList.test.tsx.snap
new file mode 100644
index 0000000000..a8796dd438
--- /dev/null
+++ b/packages/ketcher-polymer-editor-react/src/components/monomerLibrary/monomerLibraryList/__snapshots__/MonomerList.test.tsx.snap
@@ -0,0 +1,241 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Monomer List should render correct with groups 1`] = `
+Object {
+  "asFragment": [Function],
+  "baseElement": <body>
+    <div>
+      <div
+        class="css-3whre8"
+      >
+        <div
+          class="css-1jn33hb"
+        >
+          <div
+            class="css-a0lsh8"
+          >
+            <span>
+              F
+            </span>
+          </div>
+          <div
+            class="css-u8jo8f"
+          >
+            <div
+              class="css-w9donl"
+              data-testid="F"
+            >
+              <span>
+                Phe4SD
+              </span>
+              <div
+                class="star "
+              >
+                ★
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </body>,
+  "container": <div>
+    <div
+      class="css-3whre8"
+    >
+      <div
+        class="css-1jn33hb"
+      >
+        <div
+          class="css-a0lsh8"
+        >
+          <span>
+            F
+          </span>
+        </div>
+        <div
+          class="css-u8jo8f"
+        >
+          <div
+            class="css-w9donl"
+            data-testid="F"
+          >
+            <span>
+              Phe4SD
+            </span>
+            <div
+              class="star "
+            >
+              ★
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>,
+  "debug": [Function],
+  "findAllByAltText": [Function],
+  "findAllByDisplayValue": [Function],
+  "findAllByLabelText": [Function],
+  "findAllByPlaceholderText": [Function],
+  "findAllByRole": [Function],
+  "findAllByTestId": [Function],
+  "findAllByText": [Function],
+  "findAllByTitle": [Function],
+  "findByAltText": [Function],
+  "findByDisplayValue": [Function],
+  "findByLabelText": [Function],
+  "findByPlaceholderText": [Function],
+  "findByRole": [Function],
+  "findByTestId": [Function],
+  "findByText": [Function],
+  "findByTitle": [Function],
+  "getAllByAltText": [Function],
+  "getAllByDisplayValue": [Function],
+  "getAllByLabelText": [Function],
+  "getAllByPlaceholderText": [Function],
+  "getAllByRole": [Function],
+  "getAllByTestId": [Function],
+  "getAllByText": [Function],
+  "getAllByTitle": [Function],
+  "getByAltText": [Function],
+  "getByDisplayValue": [Function],
+  "getByLabelText": [Function],
+  "getByPlaceholderText": [Function],
+  "getByRole": [Function],
+  "getByTestId": [Function],
+  "getByText": [Function],
+  "getByTitle": [Function],
+  "queryAllByAltText": [Function],
+  "queryAllByDisplayValue": [Function],
+  "queryAllByLabelText": [Function],
+  "queryAllByPlaceholderText": [Function],
+  "queryAllByRole": [Function],
+  "queryAllByTestId": [Function],
+  "queryAllByText": [Function],
+  "queryAllByTitle": [Function],
+  "queryByAltText": [Function],
+  "queryByDisplayValue": [Function],
+  "queryByLabelText": [Function],
+  "queryByPlaceholderText": [Function],
+  "queryByRole": [Function],
+  "queryByTestId": [Function],
+  "queryByText": [Function],
+  "queryByTitle": [Function],
+  "rerender": [Function],
+  "unmount": [Function],
+}
+`;
+
+exports[`Monomer List should render correct without groups 1`] = `
+Object {
+  "asFragment": [Function],
+  "baseElement": <body>
+    <div>
+      <div
+        class="css-3whre8"
+      >
+        <div
+          class="css-1jn33hb"
+        >
+          <div
+            class="css-u8jo8f"
+          >
+            <div
+              class="css-1gz3ldw"
+              data-testid="."
+            >
+              <span>
+                PEG2
+              </span>
+              <div
+                class="star "
+              >
+                ★
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </body>,
+  "container": <div>
+    <div
+      class="css-3whre8"
+    >
+      <div
+        class="css-1jn33hb"
+      >
+        <div
+          class="css-u8jo8f"
+        >
+          <div
+            class="css-1gz3ldw"
+            data-testid="."
+          >
+            <span>
+              PEG2
+            </span>
+            <div
+              class="star "
+            >
+              ★
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>,
+  "debug": [Function],
+  "findAllByAltText": [Function],
+  "findAllByDisplayValue": [Function],
+  "findAllByLabelText": [Function],
+  "findAllByPlaceholderText": [Function],
+  "findAllByRole": [Function],
+  "findAllByTestId": [Function],
+  "findAllByText": [Function],
+  "findAllByTitle": [Function],
+  "findByAltText": [Function],
+  "findByDisplayValue": [Function],
+  "findByLabelText": [Function],
+  "findByPlaceholderText": [Function],
+  "findByRole": [Function],
+  "findByTestId": [Function],
+  "findByText": [Function],
+  "findByTitle": [Function],
+  "getAllByAltText": [Function],
+  "getAllByDisplayValue": [Function],
+  "getAllByLabelText": [Function],
+  "getAllByPlaceholderText": [Function],
+  "getAllByRole": [Function],
+  "getAllByTestId": [Function],
+  "getAllByText": [Function],
+  "getAllByTitle": [Function],
+  "getByAltText": [Function],
+  "getByDisplayValue": [Function],
+  "getByLabelText": [Function],
+  "getByPlaceholderText": [Function],
+  "getByRole": [Function],
+  "getByTestId": [Function],
+  "getByText": [Function],
+  "getByTitle": [Function],
+  "queryAllByAltText": [Function],
+  "queryAllByDisplayValue": [Function],
+  "queryAllByLabelText": [Function],
+  "queryAllByPlaceholderText": [Function],
+  "queryAllByRole": [Function],
+  "queryAllByTestId": [Function],
+  "queryAllByText": [Function],
+  "queryAllByTitle": [Function],
+  "queryByAltText": [Function],
+  "queryByDisplayValue": [Function],
+  "queryByLabelText": [Function],
+  "queryByPlaceholderText": [Function],
+  "queryByRole": [Function],
+  "queryByTestId": [Function],
+  "queryByText": [Function],
+  "queryByTitle": [Function],
+  "rerender": [Function],
+  "unmount": [Function],
+}
+`;
diff --git a/packages/ketcher-polymer-editor-react/src/components/monomerLibrary/monomerLibraryList/types.ts b/packages/ketcher-polymer-editor-react/src/components/monomerLibrary/monomerLibraryList/types.ts
index 2131db6561..4d8ba1fd0d 100644
--- a/packages/ketcher-polymer-editor-react/src/components/monomerLibrary/monomerLibraryList/types.ts
+++ b/packages/ketcher-polymer-editor-react/src/components/monomerLibrary/monomerLibraryList/types.ts
@@ -24,5 +24,5 @@ export type Group = {
 
 export interface IMonomerListProps {
   libraryName: LibraryNameType;
-  onItemClick: (item) => void;
+  onItemClick?: (item) => void;
 }
diff --git a/packages/ketcher-polymer-editor-react/src/components/monomerLibrary/tabsContent.tsx b/packages/ketcher-polymer-editor-react/src/components/monomerLibrary/tabsContent.tsx
index 2a54b20a04..d44af922fa 100644
--- a/packages/ketcher-polymer-editor-react/src/components/monomerLibrary/tabsContent.tsx
+++ b/packages/ketcher-polymer-editor-react/src/components/monomerLibrary/tabsContent.tsx
@@ -23,6 +23,9 @@ export const tabsContent = [
   },
   {
     caption: 'CHEM',
-    component: () => <></>,
+    component: MonomerList,
+    props: {
+      libraryName: MONOMER_TYPES.CHEM,
+    },
   },
 ];
diff --git a/packages/ketcher-polymer-editor-react/src/components/shared/MonomerPreview/index.tsx b/packages/ketcher-polymer-editor-react/src/components/shared/MonomerPreview/index.tsx
index 6fd5a9b5f2..1ac89cb589 100644
--- a/packages/ketcher-polymer-editor-react/src/components/shared/MonomerPreview/index.tsx
+++ b/packages/ketcher-polymer-editor-react/src/components/shared/MonomerPreview/index.tsx
@@ -13,12 +13,42 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ***************************************************************************/
+import { useMemo } from 'react';
 import { MonomerName, Container, StyledStructRender } from './styles';
 import { IPreviewProps } from './types';
+import { preview } from '../../../constants';
+import styled from '@emotion/styled';
+import { useAppSelector } from 'hooks';
+import { selectShowPreview } from 'state/common';
 
-export const MonomerPreview = ({ monomer, className }: IPreviewProps) => (
-  <Container className={className}>
-    <MonomerName>{monomer.struct.name}</MonomerName>
-    <StyledStructRender struct={monomer.struct} />
-  </Container>
-);
+const MonomerPreview = ({ className }: IPreviewProps) => {
+  const preview = useAppSelector(selectShowPreview);
+
+  const ContainerDinamic = useMemo(
+    () => styled(Container)`
+      top: ${preview?.style || ''};
+    `,
+    [preview],
+  );
+
+  return (
+    preview?.monomer && (
+      <ContainerDinamic className={className}>
+        <MonomerName>{preview.monomer.struct.name}</MonomerName>
+        <StyledStructRender struct={preview.monomer.struct} />
+      </ContainerDinamic>
+    )
+  );
+};
+
+const StyledPreview = styled(MonomerPreview)`
+  z-index: 1;
+  position: absolute;
+  width: ${preview.width}px;
+  height: ${preview.height}px;
+  left: 50%;
+  transform: translate(-50%, 0);
+`;
+
+export default StyledPreview;
+export { MonomerPreview };
diff --git a/packages/ketcher-polymer-editor-react/src/components/shared/MonomerPreview/types.ts b/packages/ketcher-polymer-editor-react/src/components/shared/MonomerPreview/types.ts
index c1235c8117..ffe1c23685 100644
--- a/packages/ketcher-polymer-editor-react/src/components/shared/MonomerPreview/types.ts
+++ b/packages/ketcher-polymer-editor-react/src/components/shared/MonomerPreview/types.ts
@@ -13,9 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ***************************************************************************/
-import { MonomerItemType } from 'components/monomerLibrary/monomerLibraryItem/types';
-
 export interface IPreviewProps {
-  monomer: MonomerItemType;
   className?: string;
 }
diff --git a/packages/ketcher-polymer-editor-react/src/constants.ts b/packages/ketcher-polymer-editor-react/src/constants.ts
index 88062623a5..003e2f790f 100644
--- a/packages/ketcher-polymer-editor-react/src/constants.ts
+++ b/packages/ketcher-polymer-editor-react/src/constants.ts
@@ -32,6 +32,7 @@ export const preview = {
   width: 230,
   height: 230,
   gap: 5,
+  topPadding: 16,
 } as const;
 
 export enum MonomerGroups {
diff --git a/packages/ketcher-polymer-editor-react/src/helpers/calculatePreviewPosition.ts b/packages/ketcher-polymer-editor-react/src/helpers/calculatePreviewPosition.ts
new file mode 100644
index 0000000000..47ecfa60a8
--- /dev/null
+++ b/packages/ketcher-polymer-editor-react/src/helpers/calculatePreviewPosition.ts
@@ -0,0 +1,42 @@
+/****************************************************************************
+ * Copyright 2021 EPAM Systems
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ***************************************************************************/
+import { EditorClassName, preview } from '../constants';
+import { MonomerItemType } from '../components/monomerLibrary/monomerLibraryItem/types';
+
+export const calculatePreviewPosition = (
+  monomer: MonomerItemType | undefined,
+  target?: DOMRect,
+): string => {
+  if (monomer && target) {
+    const editorRect = document
+      .querySelector(`.${EditorClassName}`)
+      ?.getBoundingClientRect();
+
+    if (!editorRect || !target) {
+      return '';
+    }
+
+    const top =
+      target.top > preview.height + preview.gap
+        ? target.top - preview.gap - preview.height - preview.topPadding
+        : target.bottom + preview.gap - preview.topPadding;
+
+    const newStyle = `${top}px`;
+
+    return newStyle;
+  }
+  return '';
+};
diff --git a/packages/ketcher-polymer-editor-react/src/helpers/index.ts b/packages/ketcher-polymer-editor-react/src/helpers/index.ts
index 3a02eadd58..7c5319ee6d 100644
--- a/packages/ketcher-polymer-editor-react/src/helpers/index.ts
+++ b/packages/ketcher-polymer-editor-react/src/helpers/index.ts
@@ -16,3 +16,4 @@
 
 export {};
 export * from './emptyFunction';
+export * from './calculatePreviewPosition';
diff --git a/packages/ketcher-polymer-editor-react/src/hooks/usePreview.ts b/packages/ketcher-polymer-editor-react/src/hooks/usePreview.ts
deleted file mode 100644
index a65e04034c..0000000000
--- a/packages/ketcher-polymer-editor-react/src/hooks/usePreview.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-/****************************************************************************
- * Copyright 2021 EPAM Systems
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ***************************************************************************/
-import { RefObject, useState } from 'react';
-import { EditorClassName, preview } from '../constants';
-import { MonomerItemType } from '../components/monomerLibrary/monomerLibraryItem/types';
-import { PreviewStyle } from '../types';
-
-export const usePreview = (
-  ref: RefObject<HTMLDivElement>,
-): [
-  monomer: MonomerItemType | undefined,
-  previewStyle: PreviewStyle | undefined,
-  setPreview: (item?: MonomerItemType, rect?: DOMRect) => void,
-] => {
-  const [previewMonomer, setPreviewMonomer] = useState<
-    MonomerItemType | undefined
-  >();
-  const [previewStyle, setPreviewStyle] = useState<PreviewStyle | undefined>();
-
-  const setPreview = (monomer?: MonomerItemType, rect?: DOMRect) => {
-    if (monomer && rect && ref.current) {
-      const editorRect = document
-        .querySelector(`.${EditorClassName}`)
-        ?.getBoundingClientRect();
-
-      if (!editorRect || !rect) {
-        return;
-      }
-
-      const top =
-        editorRect.bottom > rect.bottom + preview.height + preview.gap
-          ? rect.bottom - ref.current.getBoundingClientRect().top + preview.gap
-          : rect.top -
-            ref.current.getBoundingClientRect().top -
-            preview.height -
-            preview.gap;
-
-      const newStyle = { top: `${top}px` };
-      setPreviewMonomer(monomer);
-      setPreviewStyle(newStyle);
-    } else {
-      setPreviewMonomer(undefined);
-      setPreviewStyle(undefined);
-    }
-  };
-
-  return [previewMonomer, previewStyle, setPreview];
-};
diff --git a/packages/ketcher-polymer-editor-react/src/state/common/editorSlice.ts b/packages/ketcher-polymer-editor-react/src/state/common/editorSlice.ts
index d94bfd4b37..eab8124d04 100644
--- a/packages/ketcher-polymer-editor-react/src/state/common/editorSlice.ts
+++ b/packages/ketcher-polymer-editor-react/src/state/common/editorSlice.ts
@@ -16,15 +16,18 @@
 
 import { createSlice, PayloadAction } from '@reduxjs/toolkit';
 import { RootState } from 'state';
+import { MonomerItemType } from 'components/monomerLibrary/monomerLibraryItem/types';
 
 interface EditorState {
   isReady: boolean | null;
   activeTool: string;
+  preview: { monomer: undefined | MonomerItemType; style: string };
 }
 
 const initialState: EditorState = {
   isReady: null,
   activeTool: 'select',
+  preview: { monomer: undefined, style: '' },
 };
 
 export const editorSlice = createSlice({
@@ -43,13 +46,26 @@ export const editorSlice = createSlice({
     selectTool: (state, action: PayloadAction<string>) => {
       state.activeTool = action.payload;
     },
+    showPreview: (
+      state,
+      action: PayloadAction<
+        | {
+            monomer: undefined | MonomerItemType;
+            style: string;
+          }
+        | undefined
+      >,
+    ) => {
+      state.preview = action.payload || { monomer: undefined, style: '' };
+    },
   },
 });
 
-export const { init, initSuccess, initFailure, selectTool } =
+export const { init, initSuccess, initFailure, selectTool, showPreview } =
   editorSlice.actions;
 
 export const selectEditorIsReady = (state: RootState) => state.editor.isReady;
+export const selectShowPreview = (state: RootState) => state.editor.preview;
 export const selectEditorActiveTool = (state: RootState) =>
   state.editor.activeTool;
 
diff --git a/packages/ketcher-polymer-editor-react/src/theming/defaultTheme/defaultTheme.ts b/packages/ketcher-polymer-editor-react/src/theming/defaultTheme/defaultTheme.ts
index 8cc47ffb15..11eaa74365 100644
--- a/packages/ketcher-polymer-editor-react/src/theming/defaultTheme/defaultTheme.ts
+++ b/packages/ketcher-polymer-editor-react/src/theming/defaultTheme/defaultTheme.ts
@@ -30,6 +30,7 @@ const monomerColors: Record<string, MonomerColorScheme> = {
   colorP: { regular: '#F2C5B6', hover: '#FFA98C' },
   colorST: { regular: '#FFC44C', hover: '#FFAA00' },
   colorW: { regular: '#99458B', hover: '#7F006B' },
+  chem: { regular: '#333333', hover: '#555555' },
 };
 
 export const defaultTheme: EditorTheme = {
@@ -176,6 +177,7 @@ export const defaultTheme: EditorTheme = {
       S: monomerColors.colorST,
       T: monomerColors.colorST,
       W: monomerColors.colorW,
+      CHEM: monomerColors.chem,
     },
   },
   border: {
diff --git a/packages/ketcher-react/src/script/editor/Editor.ts b/packages/ketcher-react/src/script/editor/Editor.ts
index 0ad38eb80f..e547824179 100644
--- a/packages/ketcher-react/src/script/editor/Editor.ts
+++ b/packages/ketcher-react/src/script/editor/Editor.ts
@@ -78,6 +78,7 @@ const highlightTargets = [
   'frags',
   'merge',
   'rgroups',
+  'rgroupAttachmentPoints',
   'sgroups',
   'sgroupData',
   'enhancedFlags',
@@ -115,6 +116,7 @@ export interface Selection {
   rxnPluses?: Array<number>;
   rxnArrows?: Array<number>;
   texts?: Array<number>;
+  rgroupAttachmentPoints?: Array<number>;
 }
 
 class Editor implements KetcherEditor {
diff --git a/packages/ketcher-react/src/script/editor/shared/closest.js b/packages/ketcher-react/src/script/editor/shared/closest.js
index 0f69f147a1..3ecd9f34a2 100644
--- a/packages/ketcher-react/src/script/editor/shared/closest.js
+++ b/packages/ketcher-react/src/script/editor/shared/closest.js
@@ -14,7 +14,15 @@
  * limitations under the License.
  ***************************************************************************/
 
-import { Fragment, FunctionalGroup, Vec2, Scale, SGroup } from 'ketcher-core';
+import {
+  Fragment,
+  FunctionalGroup,
+  Vec2,
+  Scale,
+  SGroup,
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  ReStruct,
+} from 'ketcher-core';
 
 const SELECTION_DISTANCE_COEFFICIENT = 0.4;
 const SELECTION_WITHIN_TEXT = 0;
@@ -30,6 +38,7 @@ const findMaps = {
   rxnPluses: findClosestRxnPlus,
   frags: findClosestFrag,
   rgroups: findClosestRGroup,
+  rgroupAttachmentPoints: findClosestRgroupAttachmentPoints,
   simpleObjects: findClosestSimpleObject,
   texts: findClosestText,
 };
@@ -348,6 +357,42 @@ function findClosestRGroup(restruct, pos, skip, minDist) {
   return ret;
 }
 
+/**
+ * @param {ReStruct} restruct
+ * @param {Vec2} cursorPosition
+ * @param {number} minDistToOtherItems
+ */
+function findClosestRgroupAttachmentPoints(
+  restruct,
+  cursorPosition,
+  _skip,
+  minDistToOtherItems,
+) {
+  let minDist = minDistToOtherItems ?? Number.POSITIVE_INFINITY;
+  /** @type {number | undefined} */
+  let closestItemId;
+
+  restruct.visibleRGroupAttachmentPoints.forEach((reItem, id) => {
+    const itemOutlinePoints = reItem.getOutlinePoints();
+    const isCursorInsideOutline =
+      cursorPosition.isInsidePolygon(itemOutlinePoints);
+    if (isCursorInsideOutline) {
+      const dist = reItem.getDistanceTo(cursorPosition);
+      if (dist < minDist) {
+        minDist = dist;
+        closestItemId = id;
+      }
+    }
+  });
+
+  return closestItemId === undefined
+    ? null
+    : {
+        id: closestItemId,
+        dist: minDist,
+      };
+}
+
 function findClosestRxnArrow(restruct, pos) {
   let minDist = null;
   let refPoint = null;
diff --git a/packages/ketcher-react/src/script/editor/tool/apoint.ts b/packages/ketcher-react/src/script/editor/tool/apoint.ts
index 6ae56e59fa..0eecab8a1a 100644
--- a/packages/ketcher-react/src/script/editor/tool/apoint.ts
+++ b/packages/ketcher-react/src/script/editor/tool/apoint.ts
@@ -14,9 +14,11 @@
  * limitations under the License.
  ***************************************************************************/
 
-import { fromAtomsAttrs, FunctionalGroup } from 'ketcher-core';
+import assert from 'assert';
+import { FunctionalGroup } from 'ketcher-core';
 import Editor from '../Editor';
 import { Tool } from './Tool';
+import { editRGroupAttachmentPoint } from './apoint.utils';
 
 class APointTool implements Tool {
   private readonly editor: Editor;
@@ -28,11 +30,17 @@ class APointTool implements Tool {
 
   mousemove(event) {
     const struct = this.editor.render.ctab.molecule;
-    const closestItem = this.editor.findItem(event, ['atoms']);
-    if (closestItem) {
+    const closestItem = this.editor.findItem(event, [
+      'atoms',
+      'rgroupAttachmentPoints',
+    ]);
+    if (closestItem?.map === 'atoms') {
       const atom = struct.atoms.get(closestItem.id);
-      if (atom?.label !== 'R#' && atom?.rglabel === null)
+      if (atom?.label !== 'R#' && atom?.rglabel === null) {
         this.editor.hover(closestItem, null, event);
+      }
+    } else if (closestItem?.map === 'rgroupAttachmentPoints') {
+      this.editor.hover(closestItem, null, event);
     } else {
       this.editor.hover(null);
     }
@@ -75,25 +83,12 @@ class APointTool implements Tool {
     if (ci && ci.map === 'atoms') {
       this.editor.hover(null);
       const atom = molecule.atoms.get(ci.id);
+      assert(atom != null);
 
-      if (atom?.label === 'R#' && atom?.rglabel !== null) return;
+      if (!atom.isRGroupAttachmentPointEditDisabled) {
+        editRGroupAttachmentPoint(editor, atom, ci.id);
+      }
 
-      const res = editor.event.elementEdit.dispatch({
-        attpnt: atom?.attpnt,
-      });
-      Promise.resolve(res)
-        .then((newatom) => {
-          if (atom?.attpnt !== newatom.attpnt) {
-            const action = fromAtomsAttrs(
-              editor.render.ctab,
-              ci.id,
-              newatom,
-              null,
-            );
-            editor.update(action);
-          }
-        })
-        .catch(() => null); // w/o changes
       return true;
     }
     return true;
diff --git a/packages/ketcher-react/src/script/editor/tool/apoint.utils.ts b/packages/ketcher-react/src/script/editor/tool/apoint.utils.ts
new file mode 100644
index 0000000000..19129a5efb
--- /dev/null
+++ b/packages/ketcher-react/src/script/editor/tool/apoint.utils.ts
@@ -0,0 +1,41 @@
+import {
+  Atom,
+  Editor,
+  fromAtomsAttrs,
+  fromRGroupAttachmentPointUpdate,
+} from 'ketcher-core';
+
+export async function editRGroupAttachmentPoint(
+  editor: Editor,
+  atom: Atom,
+  atomId: number,
+) {
+  try {
+    const newAtom = await editor.event.elementEdit.dispatch({
+      attpnt: atom.attpnt,
+    });
+
+    const previousAttpnt = atom?.attpnt;
+    const currentAttpnt = newAtom.attpnt;
+    if (previousAttpnt !== currentAttpnt) {
+      const actionFromAtomsAttrs = fromAtomsAttrs(
+        editor.render.ctab,
+        atomId,
+        newAtom,
+        null,
+      );
+      const actionFromRGroupAttachmentPointUpdate =
+        fromRGroupAttachmentPointUpdate(
+          editor.render.ctab,
+          atomId,
+          currentAttpnt,
+        );
+      const action = actionFromAtomsAttrs.mergeWith(
+        actionFromRGroupAttachmentPointUpdate,
+      );
+      editor.update(action);
+    }
+  } catch (_error) {
+    // close modal without any operations
+  }
+}
diff --git a/packages/ketcher-react/src/script/editor/tool/eraser.ts b/packages/ketcher-react/src/script/editor/tool/eraser.ts
index 2f949366e3..d14540e0a7 100644
--- a/packages/ketcher-react/src/script/editor/tool/eraser.ts
+++ b/packages/ketcher-react/src/script/editor/tool/eraser.ts
@@ -20,6 +20,7 @@ import {
   fromOneAtomDeletion,
   fromOneBondDeletion,
   fromPlusDeletion,
+  fromRGroupAttachmentPointDeletion,
   fromSgroupDeletion,
   fromSimpleObjectDeletion,
   fromTextDeletion,
@@ -50,6 +51,7 @@ class EraserTool implements Tool {
       'sgroupData',
       'simpleObjects',
       'texts',
+      'rgroupAttachmentPoints',
     ];
     this.lassoHelper = new LassoHelper(mode || 0, editor, null);
 
@@ -163,6 +165,19 @@ class EraserTool implements Tool {
       }
     }
 
+    if (selected && functionalGroups.size && selected.rgroupAttachmentPoints) {
+      for (const rgroupAttachmentPointId of selected.rgroupAttachmentPoints) {
+        const attachedAtomId =
+          FunctionalGroup.isRGroupAttachmentPointInsideFunctionalGroup(
+            molecule,
+            rgroupAttachmentPointId,
+          );
+        if (attachedAtomId !== null) {
+          atomsResult.push(attachedAtomId);
+        }
+      }
+    }
+
     if (atomsResult.length > 0) {
       for (const id of atomsResult) {
         const fgId = FunctionalGroup.findFunctionalGroupByAtom(
@@ -274,6 +289,15 @@ class EraserTool implements Tool {
       ) {
         bondResult.push(bondId);
       }
+    } else if (functionalGroups && ci?.map === 'rgroupAttachmentPoints') {
+      const attachedAtomId =
+        FunctionalGroup.isRGroupAttachmentPointInsideFunctionalGroup(
+          molecule,
+          ci.id,
+        );
+      if (attachedAtomId !== null) {
+        atomResult.push(attachedAtomId);
+      }
     }
 
     if (atomResult.length) {
@@ -341,6 +365,8 @@ class EraserTool implements Tool {
       this.editor.update(fromSimpleObjectDeletion(restruct, ci.id));
     } else if (ci.map === 'texts') {
       this.editor.update(fromTextDeletion(restruct, ci.id));
+    } else if (ci.map === 'rgroupAttachmentPoints') {
+      this.editor.update(fromRGroupAttachmentPointDeletion(restruct, ci.id));
     } else {
       // TODO re-factoring needed - should be "map-independent"
       console.error(
diff --git a/packages/ketcher-react/src/script/editor/tool/helper/locate.ts b/packages/ketcher-react/src/script/editor/tool/helper/locate.ts
index d7bb699411..c0fcbe20b0 100644
--- a/packages/ketcher-react/src/script/editor/tool/helper/locate.ts
+++ b/packages/ketcher-react/src/script/editor/tool/helper/locate.ts
@@ -140,6 +140,18 @@ function getElementsInRectangle(restruct, p0, p1) {
     }
   });
 
+  const rgroupAttachmentPointList: number[] = [];
+  restruct.visibleRGroupAttachmentPoints.forEach((item, id) => {
+    if (
+      item.middlePoint.x > x0 &&
+      item.middlePoint.x < x1 &&
+      item.middlePoint.y > y0 &&
+      item.middlePoint.y < y1
+    ) {
+      rgroupAttachmentPointList.push(id);
+    }
+  });
+
   return {
     atoms: atomList,
     bonds: bondList,
@@ -149,6 +161,7 @@ function getElementsInRectangle(restruct, p0, p1) {
     sgroupData: sgroupDataList,
     simpleObjects: simpleObjectsList,
     texts: textsList,
+    rgroupAttachmentPoints: rgroupAttachmentPointList,
   };
 }
 
@@ -259,6 +272,13 @@ function getElementsInPolygon(restruct, rr) {
     }
   });
 
+  const rgroupAttachmentPointList: number[] = [];
+  restruct.visibleRGroupAttachmentPoints.forEach((item, id) => {
+    if (isPointInPolygon(r, item.middlePoint)) {
+      rgroupAttachmentPointList.push(id);
+    }
+  });
+
   return {
     atoms: atomList,
     bonds: bondList,
@@ -268,6 +288,7 @@ function getElementsInPolygon(restruct, rr) {
     sgroupData: sgroupDataList,
     simpleObjects: simpleObjectsList,
     texts: textsList,
+    rgroupAttachmentPoints: rgroupAttachmentPointList,
   };
 }
 
diff --git a/packages/ketcher-react/src/script/editor/tool/rotate-controller.ts b/packages/ketcher-react/src/script/editor/tool/rotate-controller.ts
index e2a1747b11..21bd2abf43 100644
--- a/packages/ketcher-react/src/script/editor/tool/rotate-controller.ts
+++ b/packages/ketcher-react/src/script/editor/tool/rotate-controller.ts
@@ -148,11 +148,11 @@ class RotateController {
 
   private show() {
     const originalCenter = this.rotateTool.getCenter();
-    const visibleAtoms = this.render.ctab.molecule.getSelectedVisibleAtoms(
-      this.editor.selection(),
-    );
+    const selection = this.editor.selection();
+    const visibleAtoms =
+      this.render.ctab.molecule.getSelectedVisibleAtoms(selection);
 
-    const { texts, rxnArrows, rxnPluses } = this.editor.selection() || {};
+    const { texts, rxnArrows, rxnPluses } = selection || {};
 
     const isMoreThanOneItemBeingSelected =
       visibleAtoms.concat(texts || [], rxnArrows || [], rxnPluses || [])
@@ -174,7 +174,8 @@ class RotateController {
       texts,
       rxnArrows,
       rxnPluses,
-      this.editor.selection()?.bonds,
+      selection?.bonds,
+      selection?.rgroupAttachmentPoints,
     );
 
     this.handleCenter = new Vec2(
@@ -270,6 +271,7 @@ class RotateController {
     rxnArrows?: number[],
     rxnPluses?: number[],
     bonds?: number[],
+    rgroupAttachmentPoints?: number[],
   ) {
     const RECT_RADIUS = 20;
     const RECT_PADDING = 10;
@@ -285,6 +287,7 @@ class RotateController {
           atoms: visibleAtoms,
         }),
         bonds,
+        rgroupAttachmentPoints,
       })
       .transform(Scale.obj2scaled, this.render.options)
       .translate(this.render.options.offset || new Vec2());
diff --git a/packages/ketcher-react/src/script/editor/tool/select.ts b/packages/ketcher-react/src/script/editor/tool/select.ts
index 41edf18f94..08a1e328b6 100644
--- a/packages/ketcher-react/src/script/editor/tool/select.ts
+++ b/packages/ketcher-react/src/script/editor/tool/select.ts
@@ -645,6 +645,7 @@ function getMapsForClosestItem(selectFragment: boolean) {
     'functionalGroups',
     'sgroupData',
     'rgroups',
+    'rgroupAttachmentPoints',
     'rxnArrows',
     'rxnPluses',
     'enhancedFlags',
@@ -664,10 +665,7 @@ function getResizingProps(
   return [editor.render.ctab, dragCtx.item.id, diff, current, dragCtx.item.ref];
 }
 
-function getNewSelectedItems(
-  editor: Editor,
-  selectedSgroups: number[],
-): { atoms: number[]; bonds: number[] } {
+function getNewSelectedItems(editor: Editor, selectedSgroups: number[]) {
   const newSelected: Record<'atoms' | 'bonds', number[]> = {
     atoms: [],
     bonds: [],
diff --git a/packages/ketcher-react/src/script/editor/utils/functionalGroupsTooltip.ts b/packages/ketcher-react/src/script/editor/utils/functionalGroupsTooltip.ts
index d44c78447b..701e2e5527 100644
--- a/packages/ketcher-react/src/script/editor/utils/functionalGroupsTooltip.ts
+++ b/packages/ketcher-react/src/script/editor/utils/functionalGroupsTooltip.ts
@@ -1,5 +1,6 @@
-import Editor from '../Editor';
+import assert from 'assert';
 import { Bond, SGroup, Struct } from 'ketcher-core';
+import Editor from '../Editor';
 
 let showTooltipTimer: ReturnType<typeof setTimeout> | null = null;
 
@@ -23,23 +24,40 @@ function convertSGroupAttachmentPointsToRGroupAttachmentPoints(
   atomsIdMapping: Map<number, number>,
 ) {
   sGroup.getAttachmentPoints().forEach((attachmentPoint) => {
-    const attachmentPointAtom = struct.atoms.get(
-      atomsIdMapping.get(attachmentPoint.atomId)!,
-    )!;
+    const atomId = atomsIdMapping.get(attachmentPoint.atomId);
+    assert(atomId != null);
+    const attachmentPointAtom = struct.atoms.get(atomId);
+    assert(attachmentPointAtom != null);
     attachmentPointAtom.setRGAttachmentPointForDisplayPurpose();
+    const rgroupAttachmentPoint =
+      attachmentPoint.convertToRGroupAttachmentPointForDisplayPurpose(atomId);
+    struct.rgroupAttachmentPoints.add(rgroupAttachmentPoint);
   });
 }
 
 function makeStruct(editor: Editor, sGroup: SGroup) {
   const existingStruct = editor.struct();
   const struct = new Struct();
-  const atomsIdMapping = new Map();
 
-  sGroup.atoms.forEach((atomId) => {
-    const atom = existingStruct.atoms.get(atomId)!;
-    const atomIdInTooltip = struct.atoms.add(atom.clone());
-    atomsIdMapping.set(atomId, atomIdInTooltip);
-  });
+  const atomsIdMapping = makeAtoms(sGroup, existingStruct, struct);
+  makeRGroupAttachmentPoints(sGroup, existingStruct, struct, atomsIdMapping);
+  makeBonds(sGroup, existingStruct, struct, atomsIdMapping);
+
+  convertSGroupAttachmentPointsToRGroupAttachmentPoints(
+    struct,
+    sGroup,
+    atomsIdMapping,
+  );
+
+  return struct;
+}
+
+function makeBonds(
+  sGroup: SGroup,
+  existingStruct: Struct,
+  struct: Struct,
+  atomsIdMapping: Map<number, number>,
+) {
   Array.from(existingStruct.bonds).forEach((value) => {
     const [_, bond] = value as [number, Bond];
     const clonedBond = bond.clone(atomsIdMapping);
@@ -49,14 +67,37 @@ function makeStruct(editor: Editor, sGroup: SGroup) {
       struct.bonds.add(clonedBond);
     }
   });
+}
 
-  convertSGroupAttachmentPointsToRGroupAttachmentPoints(
-    struct,
-    sGroup,
-    atomsIdMapping,
-  );
+function makeRGroupAttachmentPoints(
+  sGroup: SGroup,
+  existingStruct: Struct,
+  struct: Struct,
+  atomsIdMapping: Map<number, number>,
+) {
+  sGroup.atoms.forEach((atomId: number) => {
+    const rgroupAttachmentPointIds =
+      existingStruct.getRGroupAttachmentPointsByAtomId(atomId);
+    rgroupAttachmentPointIds.forEach((id) => {
+      const rgroupAttachmentPoint =
+        existingStruct.rgroupAttachmentPoints.get(id);
+      assert(rgroupAttachmentPoint != null);
+      struct.rgroupAttachmentPoints.add(
+        rgroupAttachmentPoint.clone(atomsIdMapping),
+      );
+    });
+  });
+}
 
-  return struct;
+function makeAtoms(sGroup: SGroup, existingStruct: Struct, struct: Struct) {
+  const atomsIdMapping = new Map();
+  sGroup.atoms.forEach((atomId: number) => {
+    const atom = existingStruct.atoms.get(atomId);
+    assert(atom != null);
+    const atomIdInTooltip = struct.atoms.add(atom.clone());
+    atomsIdMapping.set(atomId, atomIdInTooltip);
+  });
+  return atomsIdMapping;
 }
 
 function hideTooltip(editor: Editor) {
diff --git a/packages/ketcher-react/src/script/ui/dialog/AbbreviationLookup/AbbreviationLookup.test.tsx b/packages/ketcher-react/src/script/ui/dialog/AbbreviationLookup/AbbreviationLookup.test.tsx
index 91cb368909..5ab3c288c9 100644
--- a/packages/ketcher-react/src/script/ui/dialog/AbbreviationLookup/AbbreviationLookup.test.tsx
+++ b/packages/ketcher-react/src/script/ui/dialog/AbbreviationLookup/AbbreviationLookup.test.tsx
@@ -90,7 +90,7 @@ describe('AbbreviationLookup', () => {
       wrapper: KetcherWrapper,
     });
     const input = screen.getByRole('combobox');
-    fireEvent.blur(input);
+    input.blur();
 
     expect(mockedDispatch).toHaveBeenCalledWith(closeAbbreviationLookup());
   });
diff --git a/packages/ketcher-react/src/script/ui/dialog/AbbreviationLookup/AbbreviationLookup.tsx b/packages/ketcher-react/src/script/ui/dialog/AbbreviationLookup/AbbreviationLookup.tsx
index 72405a3a03..f1bd4b3fd3 100644
--- a/packages/ketcher-react/src/script/ui/dialog/AbbreviationLookup/AbbreviationLookup.tsx
+++ b/packages/ketcher-react/src/script/ui/dialog/AbbreviationLookup/AbbreviationLookup.tsx
@@ -17,6 +17,7 @@
 import {
   ChangeEvent,
   CSSProperties,
+  FocusEvent,
   KeyboardEvent,
   MutableRefObject,
   SyntheticEvent,
@@ -137,8 +138,10 @@ export const AbbreviationLookup = ({ options }: Props) => {
     event.stopPropagation();
   };
 
-  const handleBlur = () => {
-    closePanel();
+  const handleBlur = (event: FocusEvent<HTMLInputElement>) => {
+    if (event.target !== document.activeElement) {
+      closePanel();
+    }
   };
 
   return (
diff --git a/packages/ketcher-react/src/script/ui/views/Editor.jsx b/packages/ketcher-react/src/script/ui/views/Editor.jsx
index e0c68bf8fe..3f498a6e5b 100644
--- a/packages/ketcher-react/src/script/ui/views/Editor.jsx
+++ b/packages/ketcher-react/src/script/ui/views/Editor.jsx
@@ -29,9 +29,9 @@ const mapDispatchToProps = (dispatch) => {
   const onZoomOut = () => dispatchAction(dispatch, 'zoom-out');
 
   return {
-    onZoomIn,
-    onZoomOut,
     ...dispatch(initEditor),
+    onZoomOut,
+    onZoomIn,
   };
 };
 
diff --git a/packages/ketcher-react/src/script/ui/views/components/ContextMenu/ContextMenu.tsx b/packages/ketcher-react/src/script/ui/views/components/ContextMenu/ContextMenu.tsx
index aacc0e09d2..8443f2f110 100644
--- a/packages/ketcher-react/src/script/ui/views/components/ContextMenu/ContextMenu.tsx
+++ b/packages/ketcher-react/src/script/ui/views/components/ContextMenu/ContextMenu.tsx
@@ -25,6 +25,7 @@ import AtomMenuItems from './menuItems/AtomMenuItems';
 import BondMenuItems from './menuItems/BondMenuItems';
 import FunctionalGroupMenuItems from './menuItems/FunctionalGroupMenuItems';
 import SelectionMenuItems from './menuItems/SelectionMenuItems';
+import RGroupAttachmentPointMenuItems from './menuItems/RGroupAttachmentPointMenuItems';
 
 const props: Partial<MenuProps> = {
   animation: false,
@@ -86,6 +87,16 @@ const ContextMenu: React.FC = () => {
       >
         <FunctionalGroupMenuItems />
       </Menu>
+
+      <Menu
+        {...props}
+        id={CONTEXT_MENU_ID.FOR_R_GROUP_ATTACHMENT_POINT}
+        onVisibilityChange={(visible) =>
+          trackVisibility(CONTEXT_MENU_ID.FOR_R_GROUP_ATTACHMENT_POINT, visible)
+        }
+      >
+        <RGroupAttachmentPointMenuItems />
+      </Menu>
     </>
   );
 };
diff --git a/packages/ketcher-react/src/script/ui/views/components/ContextMenu/ContextMenuTrigger.tsx b/packages/ketcher-react/src/script/ui/views/components/ContextMenu/ContextMenuTrigger.tsx
index 0b13f0120c..676659c870 100644
--- a/packages/ketcher-react/src/script/ui/views/components/ContextMenu/ContextMenuTrigger.tsx
+++ b/packages/ketcher-react/src/script/ui/views/components/ContextMenu/ContextMenuTrigger.tsx
@@ -98,7 +98,11 @@ const ContextMenuTrigger: React.FC<PropsWithChildren> = ({ children }) => {
           selectedSGroupsIds,
         })
       ) {
-        if (!selection.bonds && !selection.atoms) {
+        if (
+          !selection.bonds &&
+          !selection.atoms &&
+          !selection.rgroupAttachmentPoints
+        ) {
           triggerType = ContextMenuTriggerType.None;
         } else {
           triggerType = ContextMenuTriggerType.Selection;
diff --git a/packages/ketcher-react/src/script/ui/views/components/ContextMenu/ContextMenuTrigger.utils.ts b/packages/ketcher-react/src/script/ui/views/components/ContextMenu/ContextMenuTrigger.utils.ts
index ea7379aa15..367660d8ca 100644
--- a/packages/ketcher-react/src/script/ui/views/components/ContextMenu/ContextMenuTrigger.utils.ts
+++ b/packages/ketcher-react/src/script/ui/views/components/ContextMenu/ContextMenuTrigger.utils.ts
@@ -95,6 +95,13 @@ export function getMenuPropsForClosestItem(
         : null;
     }
 
+    case 'rgroupAttachmentPoints': {
+      return {
+        id: CONTEXT_MENU_ID.FOR_R_GROUP_ATTACHMENT_POINT,
+        rgroupAttachmentPoints: [closestItem.id],
+      };
+    }
+
     default:
       return null;
   }
@@ -112,6 +119,8 @@ export function getMenuPropsForSelection(
 
   const bondsInSelection = 'bonds' in selection;
   const atomsInSelection = 'atoms' in selection;
+  const isRGroupAttachmentPointsSelected =
+    'rgroupAttachmentPoints' in selection;
 
   if (selectedFunctionalGroups.size > 0) {
     const functionalGroups = Array.from(selectedFunctionalGroups.values());
@@ -119,7 +128,11 @@ export function getMenuPropsForSelection(
       id: CONTEXT_MENU_ID.FOR_FUNCTIONAL_GROUPS,
       functionalGroups,
     };
-  } else if (bondsInSelection && !atomsInSelection) {
+  } else if (
+    bondsInSelection &&
+    !atomsInSelection &&
+    !isRGroupAttachmentPointsSelected
+  ) {
     return {
       id: CONTEXT_MENU_ID.FOR_BONDS,
       bondIds: selection.bonds,
@@ -129,7 +142,11 @@ export function getMenuPropsForSelection(
         IGNORED_MAPS_LIST,
       ),
     };
-  } else if (atomsInSelection && !bondsInSelection) {
+  } else if (
+    atomsInSelection &&
+    !bondsInSelection &&
+    !isRGroupAttachmentPointsSelected
+  ) {
     return {
       id: CONTEXT_MENU_ID.FOR_ATOMS,
       atomIds: selection.atoms,
@@ -139,6 +156,20 @@ export function getMenuPropsForSelection(
         IGNORED_MAPS_LIST,
       ),
     };
+  } else if (
+    isRGroupAttachmentPointsSelected &&
+    !bondsInSelection &&
+    !atomsInSelection
+  ) {
+    return {
+      id: CONTEXT_MENU_ID.FOR_R_GROUP_ATTACHMENT_POINT,
+      rgroupAttachmentPoints: selection.rgroupAttachmentPoints,
+      extraItemsSelected: !onlyHasProperty(
+        selection,
+        'rgroupAttachmentPoints',
+        IGNORED_MAPS_LIST,
+      ),
+    };
   } else {
     return {
       id: CONTEXT_MENU_ID.FOR_SELECTION,
diff --git a/packages/ketcher-react/src/script/ui/views/components/ContextMenu/contextMenu.types.ts b/packages/ketcher-react/src/script/ui/views/components/ContextMenu/contextMenu.types.ts
index a3ec55324f..4bbbfef4d8 100644
--- a/packages/ketcher-react/src/script/ui/views/components/ContextMenu/contextMenu.types.ts
+++ b/packages/ketcher-react/src/script/ui/views/components/ContextMenu/contextMenu.types.ts
@@ -7,6 +7,7 @@ export enum CONTEXT_MENU_ID {
   FOR_ATOMS = 'context-menu-for-atoms',
   FOR_SELECTION = 'context-menu-for-selection',
   FOR_FUNCTIONAL_GROUPS = 'context-menu-for-functional-groups',
+  FOR_R_GROUP_ATTACHMENT_POINT = 'context-menu-for-rgroup-attachment-point',
 }
 
 export type ItemData = unknown;
@@ -17,6 +18,7 @@ export type ContextMenuShowProps = {
   bondIds?: number[];
   atomIds?: number[];
   extraItemsSelected?: boolean;
+  rgroupAttachmentPoints?: number[];
 } | null;
 
 export interface MenuItemsProps {
diff --git a/packages/ketcher-react/src/script/ui/views/components/ContextMenu/hooks/useRGroupAttachmentPointEdit.ts b/packages/ketcher-react/src/script/ui/views/components/ContextMenu/hooks/useRGroupAttachmentPointEdit.ts
new file mode 100644
index 0000000000..e382d46e4d
--- /dev/null
+++ b/packages/ketcher-react/src/script/ui/views/components/ContextMenu/hooks/useRGroupAttachmentPointEdit.ts
@@ -0,0 +1,47 @@
+import { useCallback } from 'react';
+import assert from 'assert';
+import { useAppContext } from 'src/hooks';
+import Editor from 'src/script/editor';
+import { ItemEventParams } from '../contextMenu.types';
+import { editRGroupAttachmentPoint } from 'src/script/editor/tool/apoint.utils';
+
+const useRGroupAttachmentPointEdit = () => {
+  const { getKetcherInstance } = useAppContext();
+
+  const handler = useCallback(
+    ({ props }: ItemEventParams) => {
+      const editor = getKetcherInstance().editor as Editor;
+      const restruct = editor.render.ctab;
+      const atomId = props?.atomIds?.[0];
+      assert(atomId != null);
+      const atom = restruct.molecule.atoms.get(atomId);
+      assert(atom != null);
+
+      editRGroupAttachmentPoint(editor, atom, atomId);
+    },
+    [getKetcherInstance],
+  );
+
+  const disabled = useCallback(
+    ({ props }: ItemEventParams) => {
+      const editor = getKetcherInstance().editor as Editor;
+      const restruct = editor.render.ctab;
+      const atomId = props?.atomIds?.[0];
+      assert(atomId != null);
+      const atom = restruct.molecule.atoms.get(atomId);
+      assert(atom != null);
+
+      return atom.isRGroupAttachmentPointEditDisabled;
+    },
+    [getKetcherInstance],
+  );
+
+  const hidden = useCallback(({ props }: ItemEventParams) => {
+    const atomLength = props?.atomIds?.length || 0;
+    return atomLength > 1;
+  }, []);
+
+  return [handler, disabled, hidden] as const;
+};
+
+export default useRGroupAttachmentPointEdit;
diff --git a/packages/ketcher-react/src/script/ui/views/components/ContextMenu/hooks/useRGroupAttachmentPointRemove.ts b/packages/ketcher-react/src/script/ui/views/components/ContextMenu/hooks/useRGroupAttachmentPointRemove.ts
new file mode 100644
index 0000000000..0d97649d84
--- /dev/null
+++ b/packages/ketcher-react/src/script/ui/views/components/ContextMenu/hooks/useRGroupAttachmentPointRemove.ts
@@ -0,0 +1,33 @@
+import { Action, fromRGroupAttachmentPointDeletion } from 'ketcher-core';
+import { useCallback } from 'react';
+import { useAppContext } from 'src/hooks';
+import Editor from 'src/script/editor';
+import { ItemEventParams } from '../contextMenu.types';
+
+const useDelete = () => {
+  const { getKetcherInstance } = useAppContext();
+
+  const handler = useCallback(
+    async ({ props }: ItemEventParams) => {
+      const editor = getKetcherInstance().editor as Editor;
+      const restruct = editor.render.ctab;
+      const pointsToDelete = props?.rgroupAttachmentPoints || [];
+
+      const action = pointsToDelete.reduce((previousAction, currentPoint) => {
+        const currentAction = fromRGroupAttachmentPointDeletion(
+          restruct,
+          currentPoint,
+        );
+        return previousAction.mergeWith(currentAction);
+      }, new Action());
+
+      editor.update(action);
+      editor.selection(null);
+    },
+    [getKetcherInstance],
+  );
+
+  return handler;
+};
+
+export default useDelete;
diff --git a/packages/ketcher-react/src/script/ui/views/components/ContextMenu/menuItems/AtomMenuItems.tsx b/packages/ketcher-react/src/script/ui/views/components/ContextMenu/menuItems/AtomMenuItems.tsx
index 9c3aa88c55..01cf72a883 100644
--- a/packages/ketcher-react/src/script/ui/views/components/ContextMenu/menuItems/AtomMenuItems.tsx
+++ b/packages/ketcher-react/src/script/ui/views/components/ContextMenu/menuItems/AtomMenuItems.tsx
@@ -4,10 +4,16 @@ import useAtomEdit from '../hooks/useAtomEdit';
 import useAtomStereo from '../hooks/useAtomStereo';
 import useDelete from '../hooks/useDelete';
 import { MenuItemsProps } from '../contextMenu.types';
+import useRGroupAttachmentPointEdit from '../hooks/useRGroupAttachmentPointEdit';
 
 const AtomMenuItems: FC<MenuItemsProps> = (props) => {
   const [handleEdit] = useAtomEdit();
   const [handleStereo, stereoDisabled] = useAtomStereo();
+  const [
+    handleEditRGroupAttachmentPoint,
+    rgroupAttachmentPointDisabled,
+    rgroupAttachmentPointHidden,
+  ] = useRGroupAttachmentPointEdit();
   const handleDelete = useDelete();
 
   return (
@@ -22,6 +28,15 @@ const AtomMenuItems: FC<MenuItemsProps> = (props) => {
         Enhanced stereochemistry...
       </Item>
 
+      <Item
+        {...props}
+        disabled={rgroupAttachmentPointDisabled}
+        hidden={rgroupAttachmentPointHidden}
+        onClick={handleEditRGroupAttachmentPoint}
+      >
+        Edit R-Group attachment point...
+      </Item>
+
       <Item {...props} onClick={handleDelete}>
         Delete
       </Item>
diff --git a/packages/ketcher-react/src/script/ui/views/components/ContextMenu/menuItems/RGroupAttachmentPointMenuItems.tsx b/packages/ketcher-react/src/script/ui/views/components/ContextMenu/menuItems/RGroupAttachmentPointMenuItems.tsx
new file mode 100644
index 0000000000..0a12743912
--- /dev/null
+++ b/packages/ketcher-react/src/script/ui/views/components/ContextMenu/menuItems/RGroupAttachmentPointMenuItems.tsx
@@ -0,0 +1,18 @@
+import { FC } from 'react';
+import { Item } from 'react-contexify';
+import { MenuItemsProps } from '../contextMenu.types';
+import useRGroupAttachmentPointRemove from '../hooks/useRGroupAttachmentPointRemove';
+
+const RGroupAttachmentPointMenuItems: FC<MenuItemsProps> = (props) => {
+  const handleRemove = useRGroupAttachmentPointRemove();
+
+  return (
+    <>
+      <Item {...props} onClick={handleRemove}>
+        Remove
+      </Item>
+    </>
+  );
+};
+
+export default RGroupAttachmentPointMenuItems;
diff --git a/packages/ketcher-react/src/script/ui/views/modal/components/document/Open/Open.tsx b/packages/ketcher-react/src/script/ui/views/modal/components/document/Open/Open.tsx
index 651bd64b2d..15969cbacf 100644
--- a/packages/ketcher-react/src/script/ui/views/modal/components/document/Open/Open.tsx
+++ b/packages/ketcher-react/src/script/ui/views/modal/components/document/Open/Open.tsx
@@ -137,6 +137,7 @@ const Open: FC<Props> = (props) => {
       className={classes.open}
       params={rest}
       result={() => null}
+      data-testid="openStructureModal"
       footerContent={
         withFooterContent ? (
           <FooterContent
diff --git a/packages/ketcher-react/src/script/ui/views/modal/components/meta/About/About.jsx b/packages/ketcher-react/src/script/ui/views/modal/components/meta/About/About.jsx
index fccd3e834b..473149eedd 100644
--- a/packages/ketcher-react/src/script/ui/views/modal/components/meta/About/About.jsx
+++ b/packages/ketcher-react/src/script/ui/views/modal/components/meta/About/About.jsx
@@ -51,7 +51,7 @@ function AboutDialog(props) {
                 Version {props.version}
               </a>
             </dt>
-            <dd>
+            <dd data-testid="build-time">
               Build at <time>{props.date}</time>
             </dd>
             <div className={classes.infoLinks}>
diff --git a/packages/ketcher-react/src/script/ui/views/toolbars/TopToolbar/TopToolbar.tsx b/packages/ketcher-react/src/script/ui/views/toolbars/TopToolbar/TopToolbar.tsx
index 8f421fe1ae..e67bbd8bfd 100644
--- a/packages/ketcher-react/src/script/ui/views/toolbars/TopToolbar/TopToolbar.tsx
+++ b/packages/ketcher-react/src/script/ui/views/toolbars/TopToolbar/TopToolbar.tsx
@@ -138,7 +138,11 @@ export const TopToolbar = ({
   const { ref: resizeRef, width = 50 } = useResizeObserver<HTMLDivElement>();
 
   return (
-    <ControlsPanel className={className} ref={resizeRef}>
+    <ControlsPanel
+      className={className}
+      ref={resizeRef}
+      data-testid="top-toolbar"
+    >
       <TopToolbarIconButton
         title="Clear Canvas"
         onClick={onClear}