diff --git a/ketcher-autotests/tests/Macromolecule-editor/Chem-monomers/chem-add-to-canvas.spec.ts b/ketcher-autotests/tests/Macromolecule-editor/Chem-monomers/chem-add-to-canvas.spec.ts
index 2ccc5d2c7e..519ab3686d 100644
--- a/ketcher-autotests/tests/Macromolecule-editor/Chem-monomers/chem-add-to-canvas.spec.ts
+++ b/ketcher-autotests/tests/Macromolecule-editor/Chem-monomers/chem-add-to-canvas.spec.ts
@@ -1,5 +1,9 @@
 import { test } from '@playwright/test';
-import { clickInTheMiddleOfTheScreen, waitForPageInit } from '@utils';
+import {
+  clickInTheMiddleOfTheScreen,
+  takePageScreenshot,
+  waitForPageInit,
+} from '@utils';
 import { POLYMER_TOGGLER } from '../../../constants/testIdConstants';
 
 /* 
@@ -20,9 +24,5 @@ test('Select chem and drag it to canvas', async ({ page }) => {
   // Click on <svg> #polymer-editor-canvas
   await clickInTheMiddleOfTheScreen(page);
 
-  // Take full page screenshot
-  await page.screenshot({
-    path: 'tests/Macromolecule-editor/screenshots/chem-add-to-canvas.png',
-    fullPage: true,
-  });
+  await takePageScreenshot(page);
 });
diff --git a/ketcher-autotests/tests/Macromolecule-editor/Chem-monomers/chem-add-to-canvas.spec.ts-snapshots/Select-chem-and-drag-it-to-canvas-1-chromium-linux.png b/ketcher-autotests/tests/Macromolecule-editor/Chem-monomers/chem-add-to-canvas.spec.ts-snapshots/Select-chem-and-drag-it-to-canvas-1-chromium-linux.png
new file mode 100644
index 0000000000..7588a62a83
Binary files /dev/null and b/ketcher-autotests/tests/Macromolecule-editor/Chem-monomers/chem-add-to-canvas.spec.ts-snapshots/Select-chem-and-drag-it-to-canvas-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
index 2600b40f0d..6ea361d69b 100644
--- a/ketcher-autotests/tests/Macromolecule-editor/Chem-monomers/chem-library.spec.ts
+++ b/ketcher-autotests/tests/Macromolecule-editor/Chem-monomers/chem-library.spec.ts
@@ -1,11 +1,13 @@
 import { test, expect } from '@playwright/test';
 import { POLYMER_TOGGLER } from '../../../constants/testIdConstants';
 import { waitForPageInit } from '@utils/common';
+import { takePageScreenshot } from '@utils';
 
 test.describe('Open Ketcher', () => {
   test.beforeEach(async ({ page }) => {
     await waitForPageInit(page);
   });
+
   test('Switch to Polymer Editor', async ({ page }) => {
     /* 
     Test case: #2496 - chem monomer library
@@ -25,8 +27,6 @@ test.describe('Open Ketcher', () => {
     await page.getByTestId(POLYMER_TOGGLER).click();
     await page.getByText('CHEM').click();
     await expect(page.getByText('A6OH')).toBeVisible();
-    await page.screenshot({
-      path: 'tests/Macromolecule-editor/screenshots/chem-library.png',
-    });
+    await takePageScreenshot(page);
   });
 });
diff --git a/ketcher-autotests/tests/Macromolecule-editor/Chem-monomers/chem-library.spec.ts-snapshots/Open-Ketcher-Open-Chem-tab-in-library-1-chromium-linux.png b/ketcher-autotests/tests/Macromolecule-editor/Chem-monomers/chem-library.spec.ts-snapshots/Open-Ketcher-Open-Chem-tab-in-library-1-chromium-linux.png
new file mode 100644
index 0000000000..ce37d2b4a4
Binary files /dev/null and b/ketcher-autotests/tests/Macromolecule-editor/Chem-monomers/chem-library.spec.ts-snapshots/Open-Ketcher-Open-Chem-tab-in-library-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Macromolecule-editor/Erase-Tool/erase-tool.spec.ts b/ketcher-autotests/tests/Macromolecule-editor/Erase-Tool/erase-tool.spec.ts
index 26b78c9ae9..ae6ec46f30 100644
--- a/ketcher-autotests/tests/Macromolecule-editor/Erase-Tool/erase-tool.spec.ts
+++ b/ketcher-autotests/tests/Macromolecule-editor/Erase-Tool/erase-tool.spec.ts
@@ -4,6 +4,7 @@ import {
   selectEraseTool,
   selectSingleBondTool,
   takeEditorScreenshot,
+  waitForPageInit,
 } from '@utils';
 import { turnOnMacromoleculesEditor } from '@utils/macromolecules';
 import { bondTwoMonomers } from '@utils/macromolecules/polymerBond';
@@ -11,9 +12,10 @@ import { bondTwoMonomers } from '@utils/macromolecules/polymerBond';
 
 test.describe('Erase Tool', () => {
   test.beforeEach(async ({ page }) => {
-    await page.goto('');
+    await waitForPageInit(page);
     await turnOnMacromoleculesEditor(page);
   });
+
   test('Delete monomer bonded with another monomers', async ({ page }) => {
     /* 
     Test case: #2370 - "Erase" tool for macromolecules editor
diff --git a/ketcher-autotests/tests/Macromolecule-editor/Favorites/favorites-add-to-canvas.spec.ts b/ketcher-autotests/tests/Macromolecule-editor/Favorites/favorites-add-to-canvas.spec.ts
index 6b0aa412e8..933a5b7353 100644
--- a/ketcher-autotests/tests/Macromolecule-editor/Favorites/favorites-add-to-canvas.spec.ts
+++ b/ketcher-autotests/tests/Macromolecule-editor/Favorites/favorites-add-to-canvas.spec.ts
@@ -1,25 +1,25 @@
 import { test } from '@playwright/test';
-import { POLYMER_TOGGLER } from '@constants/testIdConstants';
 import {
   clickInTheMiddleOfTheScreen,
-  takePolymerEditorScreenshot,
+  takePageScreenshot,
   waitForPageInit,
 } from '@utils';
 import {
   ALANINE,
   getFavoriteButtonSelector,
 } from '@utils/selectors/macromoleculeEditor';
+import { turnOnMacromoleculesEditor } from '@utils/macromolecules';
 
 test('Add molecule to favorites, switch to Favorites tab and drag it to the canvas', async ({
   page,
 }) => {
   await waitForPageInit(page);
+  await turnOnMacromoleculesEditor(page);
 
-  await page.getByTestId(POLYMER_TOGGLER).click();
   await page.click(getFavoriteButtonSelector(ALANINE));
   await page.getByText('Favorites').click();
   await page.click(ALANINE);
   await clickInTheMiddleOfTheScreen(page);
 
-  await takePolymerEditorScreenshot(page);
+  await takePageScreenshot(page);
 });
diff --git a/ketcher-autotests/tests/Macromolecule-editor/Ket/ket-deserialize.spec.ts b/ketcher-autotests/tests/Macromolecule-editor/Ket/ket-deserialize.spec.ts
index b7f77ee6a2..5b8062cbd3 100644
--- a/ketcher-autotests/tests/Macromolecule-editor/Ket/ket-deserialize.spec.ts
+++ b/ketcher-autotests/tests/Macromolecule-editor/Ket/ket-deserialize.spec.ts
@@ -1,12 +1,17 @@
 import { test } from '@playwright/test';
-import { openFileAndAddToCanvas, takeEditorScreenshot } from '@utils';
+import {
+  openFileAndAddToCanvas,
+  takeEditorScreenshot,
+  waitForPageInit,
+} from '@utils';
 import { turnOnMacromoleculesEditor } from '@utils/macromolecules';
 
 test.describe('Ket Deserialize', () => {
   test.beforeEach(async ({ page }) => {
-    await page.goto('');
+    await waitForPageInit(page);
     await turnOnMacromoleculesEditor(page);
   });
+
   test('Open ket file with monomers and bonds', async ({ page }) => {
     /* 
     Test case: #3230 - Support parsing KET file for macromolecules on ketcher side
diff --git a/ketcher-autotests/tests/Macromolecule-editor/Peptides/peptides-add-to-canvas.spec.ts b/ketcher-autotests/tests/Macromolecule-editor/Peptides/peptides-add-to-canvas.spec.ts
index 1b35202759..5e1b9e4dbd 100644
--- a/ketcher-autotests/tests/Macromolecule-editor/Peptides/peptides-add-to-canvas.spec.ts
+++ b/ketcher-autotests/tests/Macromolecule-editor/Peptides/peptides-add-to-canvas.spec.ts
@@ -1,7 +1,11 @@
 import { test } from '@playwright/test';
-import { clickInTheMiddleOfTheScreen, waitForPageInit } from '@utils';
+import {
+  clickInTheMiddleOfTheScreen,
+  takePageScreenshot,
+  waitForPageInit,
+} from '@utils';
 import { ALANINE } from '@utils/selectors/macromoleculeEditor';
-import { POLYMER_TOGGLER } from '../../../constants/testIdConstants';
+import { turnOnMacromoleculesEditor } from '@utils/macromolecules';
 
 /* 
 Test case: #3063 - Add e2e tests for Macromolecule editor
@@ -9,19 +13,10 @@ Test case: #3063 - Add e2e tests for Macromolecule editor
 
 test('Select peptide and drag it to canvas', async ({ page }) => {
   await waitForPageInit(page);
+  await turnOnMacromoleculesEditor(page);
 
-  // Click on POLYMER_TOGGLER
-  await page.getByTestId(POLYMER_TOGGLER).click();
-
-  // Click on <div> "A ★"
   await page.click(ALANINE);
-
-  // Click on <svg> #polymer-editor-canvas
   await clickInTheMiddleOfTheScreen(page);
 
-  // Take full page screenshot
-  await page.screenshot({
-    path: 'tests/Macromolecule-editor/screenshots/peptides-add-to-canvas.png',
-    fullPage: true,
-  });
+  await takePageScreenshot(page);
 });
diff --git a/ketcher-autotests/tests/Macromolecule-editor/Peptides/peptides-add-to-canvas.spec.ts-snapshots/Select-peptide-and-drag-it-to-canvas-1-chromium-linux.png b/ketcher-autotests/tests/Macromolecule-editor/Peptides/peptides-add-to-canvas.spec.ts-snapshots/Select-peptide-and-drag-it-to-canvas-1-chromium-linux.png
new file mode 100644
index 0000000000..6fb92f85e6
Binary files /dev/null and b/ketcher-autotests/tests/Macromolecule-editor/Peptides/peptides-add-to-canvas.spec.ts-snapshots/Select-peptide-and-drag-it-to-canvas-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Macromolecule-editor/Polymer-Bond-Tool/attachment-point-rotation.spec.ts b/ketcher-autotests/tests/Macromolecule-editor/Polymer-Bond-Tool/attachment-point-rotation.spec.ts
index 6e0231f218..4af329efc9 100644
--- a/ketcher-autotests/tests/Macromolecule-editor/Polymer-Bond-Tool/attachment-point-rotation.spec.ts
+++ b/ketcher-autotests/tests/Macromolecule-editor/Polymer-Bond-Tool/attachment-point-rotation.spec.ts
@@ -4,6 +4,8 @@ import {
   dragMouseTo,
   selectRectangleSelectionTool,
   selectSingleBondTool,
+  takePageScreenshot,
+  waitForPageInit,
 } from '@utils';
 import { turnOnMacromoleculesEditor } from '@utils/macromolecules';
 import { bondTwoMonomers } from '@utils/macromolecules/polymerBond';
@@ -11,7 +13,7 @@ import { bondTwoMonomers } from '@utils/macromolecules/polymerBond';
 
 test.describe('Check attachment point rotation', () => {
   test.beforeEach(async ({ page }) => {
-    await page.goto('');
+    await waitForPageInit(page);
     await turnOnMacromoleculesEditor(page);
   });
   test('Select monomer and bonds and then hover monomer', async ({ page }) => {
@@ -46,16 +48,12 @@ test.describe('Check attachment point rotation', () => {
     // Hover 1th peptide
     await peptide1.hover();
 
-    await page.screenshot({
-      path: 'tests/Macromolecule-editor/screenshots/attachment-point-rotation-1.png',
-    });
+    await takePageScreenshot(page);
 
     // Hover 2nd peptide
     await peptide2.hover();
 
-    await page.screenshot({
-      path: 'tests/Macromolecule-editor/screenshots/attachment-point-rotation-2.png',
-    });
+    await takePageScreenshot(page);
   });
 
   test('Move monomer bonded with another monomers and check attachment points', async ({
@@ -87,9 +85,7 @@ test.describe('Check attachment point rotation', () => {
     // Hover 1th peptide
     await peptide1.hover();
 
-    await page.screenshot({
-      path: 'tests/Macromolecule-editor/screenshots/attachment-point-rotation-3.png',
-    });
+    await takePageScreenshot(page);
 
     // Move selected monomer
     await selectRectangleSelectionTool(page);
@@ -102,8 +98,6 @@ test.describe('Check attachment point rotation', () => {
     // Hover 1th peptide
     await peptide1.hover();
 
-    await page.screenshot({
-      path: 'tests/Macromolecule-editor/screenshots/attachment-point-rotation-4.png',
-    });
+    await takePageScreenshot(page);
   });
 });
diff --git a/ketcher-autotests/tests/Macromolecule-editor/Polymer-Bond-Tool/attachment-point-rotation.spec.ts-snapshots/Check-attachment-point-rotation-Move-monomer-b-29ea5--another-monomers-and-check-attachment-points-2-chromium-linux.png b/ketcher-autotests/tests/Macromolecule-editor/Polymer-Bond-Tool/attachment-point-rotation.spec.ts-snapshots/Check-attachment-point-rotation-Move-monomer-b-29ea5--another-monomers-and-check-attachment-points-2-chromium-linux.png
new file mode 100644
index 0000000000..5fb332653f
Binary files /dev/null and b/ketcher-autotests/tests/Macromolecule-editor/Polymer-Bond-Tool/attachment-point-rotation.spec.ts-snapshots/Check-attachment-point-rotation-Move-monomer-b-29ea5--another-monomers-and-check-attachment-points-2-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Macromolecule-editor/Polymer-Bond-Tool/attachment-point-rotation.spec.ts-snapshots/Check-attachment-point-rotation-Move-monomer-b-c144d--another-monomers-and-check-attachment-points-1-chromium-linux.png b/ketcher-autotests/tests/Macromolecule-editor/Polymer-Bond-Tool/attachment-point-rotation.spec.ts-snapshots/Check-attachment-point-rotation-Move-monomer-b-c144d--another-monomers-and-check-attachment-points-1-chromium-linux.png
new file mode 100644
index 0000000000..ad341a502b
Binary files /dev/null and b/ketcher-autotests/tests/Macromolecule-editor/Polymer-Bond-Tool/attachment-point-rotation.spec.ts-snapshots/Check-attachment-point-rotation-Move-monomer-b-c144d--another-monomers-and-check-attachment-points-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Macromolecule-editor/Polymer-Bond-Tool/attachment-point-rotation.spec.ts-snapshots/Check-attachment-point-rotation-Select-monomer-and-bonds-and-then-hover-monomer-1-chromium-linux.png b/ketcher-autotests/tests/Macromolecule-editor/Polymer-Bond-Tool/attachment-point-rotation.spec.ts-snapshots/Check-attachment-point-rotation-Select-monomer-and-bonds-and-then-hover-monomer-1-chromium-linux.png
new file mode 100644
index 0000000000..d637d7aa68
Binary files /dev/null and b/ketcher-autotests/tests/Macromolecule-editor/Polymer-Bond-Tool/attachment-point-rotation.spec.ts-snapshots/Check-attachment-point-rotation-Select-monomer-and-bonds-and-then-hover-monomer-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Macromolecule-editor/Polymer-Bond-Tool/attachment-point-rotation.spec.ts-snapshots/Check-attachment-point-rotation-Select-monomer-and-bonds-and-then-hover-monomer-2-chromium-linux.png b/ketcher-autotests/tests/Macromolecule-editor/Polymer-Bond-Tool/attachment-point-rotation.spec.ts-snapshots/Check-attachment-point-rotation-Select-monomer-and-bonds-and-then-hover-monomer-2-chromium-linux.png
new file mode 100644
index 0000000000..94abcccbf5
Binary files /dev/null and b/ketcher-autotests/tests/Macromolecule-editor/Polymer-Bond-Tool/attachment-point-rotation.spec.ts-snapshots/Check-attachment-point-rotation-Select-monomer-and-bonds-and-then-hover-monomer-2-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Macromolecule-editor/Polymer-Bond-Tool/polymer-bond-tool.spec.ts b/ketcher-autotests/tests/Macromolecule-editor/Polymer-Bond-Tool/polymer-bond-tool.spec.ts
index 7c04e1133b..ba59b7c576 100644
--- a/ketcher-autotests/tests/Macromolecule-editor/Polymer-Bond-Tool/polymer-bond-tool.spec.ts
+++ b/ketcher-autotests/tests/Macromolecule-editor/Polymer-Bond-Tool/polymer-bond-tool.spec.ts
@@ -1,20 +1,22 @@
 import { test } from '@playwright/test';
-import { selectSingleBondTool, waitForPageInit } from '@utils';
+import {
+  selectSingleBondTool,
+  waitForPageInit,
+  takePageScreenshot,
+} from '@utils';
 import { turnOnMacromoleculesEditor } from '@utils/macromolecules';
 /* eslint-disable no-magic-numbers */
 
 test.describe('Polymer Bond Tool', () => {
   test.beforeEach(async ({ page }) => {
     await waitForPageInit(page);
+    await turnOnMacromoleculesEditor(page);
   });
   test('Create bond between two peptides', async ({ page }) => {
     /* 
     Test case: #2334 - Create peptide chain (HELM style) - Center-to-Center
     Description: Polymer bond tool
     */
-
-    await turnOnMacromoleculesEditor(page);
-
     // Choose peptide
     await page.getByText('Tza').click();
 
@@ -37,14 +39,11 @@ test.describe('Polymer Bond Tool', () => {
     // Create bonds between peptides, taking screenshots in middle states
     await peptide1.hover();
     await page.mouse.down();
-    await page.screenshot({
-      path: 'tests/Macromolecule-editor/screenshots/polymer-bond-tool.png',
-    });
+
+    await takePageScreenshot(page);
     await peptide2.hover();
     await page.mouse.up();
-    await page.screenshot({
-      path: 'tests/Macromolecule-editor/screenshots/polymer-bond-tool2.png',
-    });
+    await takePageScreenshot(page);
 
     await page.mouse.down();
     await peptide3.hover();
@@ -58,9 +57,7 @@ test.describe('Polymer Bond Tool', () => {
     // Wait error popup
     await page.waitForSelector('#error-tooltip');
 
-    await page.screenshot({
-      path: 'tests/Macromolecule-editor/screenshots/polymer-bond-tool3.png',
-    });
+    await takePageScreenshot(page);
   });
 
   test('Create bond between two chems', async ({ page }) => {
@@ -68,9 +65,6 @@ test.describe('Polymer Bond Tool', () => {
     Test case: #2497 - Adding chems to canvas - Center-to-Center
     Description: Polymer bond tool
     */
-
-    await turnOnMacromoleculesEditor(page);
-
     // Choose chems
     await page.getByText('CHEM').click();
     await page.getByTestId('hxy___Hexynyl alcohol').click();
@@ -90,13 +84,10 @@ test.describe('Polymer Bond Tool', () => {
     // Create bonds between chems, taking screenshots in middle states
     await chem1.hover();
     await page.mouse.down();
-    await page.screenshot({
-      path: 'tests/Macromolecule-editor/screenshots/polymer-bond-tool-chem1.png',
-    });
+    await takePageScreenshot(page);
     await chem2.hover();
     await page.mouse.up();
-    await page.screenshot({
-      path: 'tests/Macromolecule-editor/screenshots/polymer-bond-tool-chem2.png',
-    });
+
+    await takePageScreenshot(page);
   });
 });
diff --git a/ketcher-autotests/tests/Macromolecule-editor/Polymer-Bond-Tool/polymer-bond-tool.spec.ts-snapshots/Polymer-Bond-Tool-Create-bond-between-two-chems-1-chromium-linux.png b/ketcher-autotests/tests/Macromolecule-editor/Polymer-Bond-Tool/polymer-bond-tool.spec.ts-snapshots/Polymer-Bond-Tool-Create-bond-between-two-chems-1-chromium-linux.png
new file mode 100644
index 0000000000..ce3f9be1bc
Binary files /dev/null and b/ketcher-autotests/tests/Macromolecule-editor/Polymer-Bond-Tool/polymer-bond-tool.spec.ts-snapshots/Polymer-Bond-Tool-Create-bond-between-two-chems-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Macromolecule-editor/screenshots/polymer-bond-tool-chem2.png b/ketcher-autotests/tests/Macromolecule-editor/Polymer-Bond-Tool/polymer-bond-tool.spec.ts-snapshots/Polymer-Bond-Tool-Create-bond-between-two-chems-2-chromium-linux.png
similarity index 100%
rename from ketcher-autotests/tests/Macromolecule-editor/screenshots/polymer-bond-tool-chem2.png
rename to ketcher-autotests/tests/Macromolecule-editor/Polymer-Bond-Tool/polymer-bond-tool.spec.ts-snapshots/Polymer-Bond-Tool-Create-bond-between-two-chems-2-chromium-linux.png
diff --git a/ketcher-autotests/tests/Macromolecule-editor/Polymer-Bond-Tool/polymer-bond-tool.spec.ts-snapshots/Polymer-Bond-Tool-Create-bond-between-two-peptides-1-chromium-linux.png b/ketcher-autotests/tests/Macromolecule-editor/Polymer-Bond-Tool/polymer-bond-tool.spec.ts-snapshots/Polymer-Bond-Tool-Create-bond-between-two-peptides-1-chromium-linux.png
new file mode 100644
index 0000000000..f4fb00fec1
Binary files /dev/null and b/ketcher-autotests/tests/Macromolecule-editor/Polymer-Bond-Tool/polymer-bond-tool.spec.ts-snapshots/Polymer-Bond-Tool-Create-bond-between-two-peptides-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Macromolecule-editor/Polymer-Bond-Tool/polymer-bond-tool.spec.ts-snapshots/Polymer-Bond-Tool-Create-bond-between-two-peptides-2-chromium-linux.png b/ketcher-autotests/tests/Macromolecule-editor/Polymer-Bond-Tool/polymer-bond-tool.spec.ts-snapshots/Polymer-Bond-Tool-Create-bond-between-two-peptides-2-chromium-linux.png
new file mode 100644
index 0000000000..95b3bcc68b
Binary files /dev/null and b/ketcher-autotests/tests/Macromolecule-editor/Polymer-Bond-Tool/polymer-bond-tool.spec.ts-snapshots/Polymer-Bond-Tool-Create-bond-between-two-peptides-2-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Macromolecule-editor/Polymer-Bond-Tool/polymer-bond-tool.spec.ts-snapshots/Polymer-Bond-Tool-Create-bond-between-two-peptides-3-chromium-linux.png b/ketcher-autotests/tests/Macromolecule-editor/Polymer-Bond-Tool/polymer-bond-tool.spec.ts-snapshots/Polymer-Bond-Tool-Create-bond-between-two-peptides-3-chromium-linux.png
new file mode 100644
index 0000000000..9edda06481
Binary files /dev/null and b/ketcher-autotests/tests/Macromolecule-editor/Polymer-Bond-Tool/polymer-bond-tool.spec.ts-snapshots/Polymer-Bond-Tool-Create-bond-between-two-peptides-3-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Macromolecule-editor/RNAEditor/add-custom-preset.spec.ts b/ketcher-autotests/tests/Macromolecule-editor/RNAEditor/add-custom-preset.spec.ts
index 12ba2ca6af..2143be4601 100644
--- a/ketcher-autotests/tests/Macromolecule-editor/RNAEditor/add-custom-preset.spec.ts
+++ b/ketcher-autotests/tests/Macromolecule-editor/RNAEditor/add-custom-preset.spec.ts
@@ -1,4 +1,4 @@
-import { test } from '@playwright/test';
+import { Page, test } from '@playwright/test';
 import {
   POLYMER_TOGGLER,
   RNA_TAB,
@@ -8,84 +8,68 @@ import {
   BUTTON__ADD_TO_PRESETS,
 } from '../../../constants/testIdConstants';
 import { waitForPageInit } from '@utils/common';
+import { takePageScreenshot } from '@utils';
 
 /* 
 Test case: #3063 - Add e2e tests for Macromolecule editor
 */
+async function createRNA(page: Page) {
+  await page.getByTestId(POLYMER_TOGGLER).click();
+  await page.getByTestId(RNA_TAB).click();
+  await page.fill('[placeholder="Name your structure"]', 'MyRNA');
+  await page.press('[placeholder="Name your structure"]', 'Enter');
+}
+
+async function selectRNAComponents(
+  page: Page,
+  {
+    sugar,
+    base,
+    phosphate,
+  }: {
+    sugar: string;
+    base: string;
+    phosphate: string;
+  },
+) {
+  await page.getByTestId(SUGAR).click();
+  await page.getByTestId(sugar).click();
+
+  await page.getByTestId(BASE).click();
+  await page.getByTestId(base).click();
+
+  await page.getByTestId(PHOSPHATE).click();
+  await page.getByTestId(phosphate).click();
+}
+
 test.describe('Macromolecules custom presets', () => {
   test.beforeEach(async ({ page }) => {
     await waitForPageInit(page);
-
-    // Click on POLYMER_TOGGLER
-    await page.getByTestId(POLYMER_TOGGLER).click();
-
-    // Click on <button> "RNA"
-    await page.getByTestId(RNA_TAB).click();
-
-    // Click on <input> [placeholder="Name your structure"]
-    await page.click('[placeholder="Name your structure"]');
-
-    // Fill "MyRNA" on <input> [placeholder="Name your structure"]
-    await page.fill('[placeholder="Name your structure"]', 'MyRNA');
-
-    // Press Enter on input
-    await page.press('[placeholder="Name your structure"]', 'Enter');
+    await createRNA(page);
   });
-  test('Add new preset and duplicate it', async ({ page }) => {
-    // Click on <div> "Sugar Not selected"
-    await page.getByTestId(SUGAR).click();
-
-    // Click on <div> "25R ★"
-    await page.click('[data-testid="25R___2,5-Ribose"]');
 
-    // Click on <div> "Base Not selected"
-    await page.getByTestId(BASE).click();
-
-    // Click on <div> "baA ★"
-    await page.click('[data-testid="baA___N-benzyl-adenine"]');
-
-    // Click on <div> "Phosphate Not selected"
-    await page.getByTestId(PHOSPHATE).click();
-
-    // Click on <div> "bP ★"
-    await page.click('[data-testid="bP___Boranophosphate"]');
-
-    // Click on <button> "Add to Presets"
-    await page.getByTestId(BUTTON__ADD_TO_PRESETS).click();
-
-    await page.screenshot({
-      path: 'tests/Macromolecule-editor/screenshots/add-custom-preset-add.png',
+  test('Add new preset and duplicate it', async ({ page }) => {
+    await selectRNAComponents(page, {
+      sugar: '25R___2,5-Ribose',
+      base: 'baA___N-benzyl-adenine',
+      phosphate: 'bP___Boranophosphate',
     });
 
-    // Click on <button> "Duplicate and Edit"
-    await page.click('[data-testid="duplicate-btn"]');
-
-    // Click on <div> "Sugar 25R"
-    await page.getByTestId(SUGAR).click();
-
-    // Click on <div> "dR ★"
-    await page.click('[data-testid="dR___D-Arginine"]');
-
-    // Click on <div> "Base baA"
-    await page.getByTestId(BASE).click();
+    await page.getByTestId(BUTTON__ADD_TO_PRESETS).click();
 
-    // Click on <span> "cl2A"
-    await page.click('text=cl2A');
+    await takePageScreenshot(page);
 
-    // Click on <div> "Phosphate bP"
-    await page.getByTestId(PHOSPHATE).click();
+    await page.getByTestId('duplicate-btn').click();
 
-    // Click on <div> "Smp ★"
-    await page.click('[data-testid="Smp___(Sp)-Methylphosphonate"]');
+    await selectRNAComponents(page, {
+      sugar: "12ddR___1',2'-Di-Deoxy-Ribose",
+      base: 'A___Adenine',
+      phosphate: 'P___Phosphate',
+    });
 
-    // Click on <button> "Save"
-    await page.click('[data-testid="save-btn"]');
+    await page.getByTestId('save-btn').click();
 
-    // Take full page screenshot
-    await page.screenshot({
-      path: 'tests/Macromolecule-editor/screenshots/add-custom-preset-duplicate.png',
-      fullPage: true,
-    });
+    await takePageScreenshot(page);
   });
 
   test('Add new preset with two monomers and add it to canvas', async ({
@@ -126,9 +110,6 @@ test.describe('Macromolecules custom presets', () => {
     await page.click('[data-testid="MyRNA_baA_25R_."]');
 
     await page.click('#polymer-editor-canvas');
-    await page.screenshot({
-      path: 'tests/Macromolecule-editor/screenshots/add-custom-preset-add-to-canvas.png',
-      fullPage: true,
-    });
+    await takePageScreenshot(page);
   });
 });
diff --git a/ketcher-autotests/tests/Macromolecule-editor/RNAEditor/add-custom-preset.spec.ts-snapshots/Macromolecules-custom-presets-Add-new-preset-and-duplicate-it-1-chromium-linux.png b/ketcher-autotests/tests/Macromolecule-editor/RNAEditor/add-custom-preset.spec.ts-snapshots/Macromolecules-custom-presets-Add-new-preset-and-duplicate-it-1-chromium-linux.png
new file mode 100644
index 0000000000..6db75c97d0
Binary files /dev/null and b/ketcher-autotests/tests/Macromolecule-editor/RNAEditor/add-custom-preset.spec.ts-snapshots/Macromolecules-custom-presets-Add-new-preset-and-duplicate-it-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Macromolecule-editor/RNAEditor/add-custom-preset.spec.ts-snapshots/Macromolecules-custom-presets-Add-new-preset-and-duplicate-it-2-chromium-linux.png b/ketcher-autotests/tests/Macromolecule-editor/RNAEditor/add-custom-preset.spec.ts-snapshots/Macromolecules-custom-presets-Add-new-preset-and-duplicate-it-2-chromium-linux.png
new file mode 100644
index 0000000000..92ba08f8e3
Binary files /dev/null and b/ketcher-autotests/tests/Macromolecule-editor/RNAEditor/add-custom-preset.spec.ts-snapshots/Macromolecules-custom-presets-Add-new-preset-and-duplicate-it-2-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Macromolecule-editor/RNAEditor/add-custom-preset.spec.ts-snapshots/Macromolecules-custom-presets-Add-new-preset-with-two-monomers-and-add-it-to-canvas-1-chromium-linux.png b/ketcher-autotests/tests/Macromolecule-editor/RNAEditor/add-custom-preset.spec.ts-snapshots/Macromolecules-custom-presets-Add-new-preset-with-two-monomers-and-add-it-to-canvas-1-chromium-linux.png
new file mode 100644
index 0000000000..ac7338383b
Binary files /dev/null and b/ketcher-autotests/tests/Macromolecule-editor/RNAEditor/add-custom-preset.spec.ts-snapshots/Macromolecules-custom-presets-Add-new-preset-with-two-monomers-and-add-it-to-canvas-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Macromolecule-editor/RNAEditor/add-default-presets.spec.ts b/ketcher-autotests/tests/Macromolecule-editor/RNAEditor/add-default-presets.spec.ts
index 5104587986..d1ecc395a1 100644
--- a/ketcher-autotests/tests/Macromolecule-editor/RNAEditor/add-default-presets.spec.ts
+++ b/ketcher-autotests/tests/Macromolecule-editor/RNAEditor/add-default-presets.spec.ts
@@ -1,40 +1,35 @@
 import { turnOnMacromoleculesEditor } from '@utils/macromolecules';
 import { test } from '@playwright/test';
-import { waitForPageInit } from '@utils/common';
+import { takePageScreenshot, waitForPageInit } from '@utils';
 
 test.describe('Macromolecules default presets', () => {
   test.beforeEach(async ({ page }) => {
     await waitForPageInit(page);
+    await turnOnMacromoleculesEditor(page);
   });
+
   test('Check Guanine in default presets', async ({ page }) => {
     /* 
     Test case: #2934 - rna builder: add default presets
     Description: Switch to Polymer Editor
     */
-    await turnOnMacromoleculesEditor(page);
     await page.getByText('RNA').click();
 
     await page.getByTestId('cancel-btn').click();
     await page.getByTestId('G_G_R_P').click();
-    await page.screenshot({
-      path: 'tests/Macromolecule-editor/screenshots/default-presets.png',
-    });
+    await takePageScreenshot(page);
   });
 
   test('Add Guanine to canvas', async ({ page }) => {
     /* 
     Test case: #2507 - Add RNA monomers to canvas (by click)
     */
-    await turnOnMacromoleculesEditor(page);
     await page.getByText('RNA').click();
     await page.getByTestId('cancel-btn').click();
 
     await page.click('[data-testid="G_G_R_P"]');
 
     await page.click('#polymer-editor-canvas');
-    await page.screenshot({
-      path: 'tests/Macromolecule-editor/screenshots/add-default-preset-to-canvas.png',
-      fullPage: true,
-    });
+    await takePageScreenshot(page);
   });
 });
diff --git a/ketcher-autotests/tests/Macromolecule-editor/RNAEditor/add-default-presets.spec.ts-snapshots/Macromolecules-default-presets-Add-Guanine-to-canvas-1-chromium-linux.png b/ketcher-autotests/tests/Macromolecule-editor/RNAEditor/add-default-presets.spec.ts-snapshots/Macromolecules-default-presets-Add-Guanine-to-canvas-1-chromium-linux.png
new file mode 100644
index 0000000000..baf5dc0772
Binary files /dev/null and b/ketcher-autotests/tests/Macromolecule-editor/RNAEditor/add-default-presets.spec.ts-snapshots/Macromolecules-default-presets-Add-Guanine-to-canvas-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Macromolecule-editor/RNAEditor/add-default-presets.spec.ts-snapshots/Macromolecules-default-presets-Check-Guanine-in-default-presets-1-chromium-linux.png b/ketcher-autotests/tests/Macromolecule-editor/RNAEditor/add-default-presets.spec.ts-snapshots/Macromolecules-default-presets-Check-Guanine-in-default-presets-1-chromium-linux.png
new file mode 100644
index 0000000000..8a84e5c716
Binary files /dev/null and b/ketcher-autotests/tests/Macromolecule-editor/RNAEditor/add-default-presets.spec.ts-snapshots/Macromolecules-default-presets-Check-Guanine-in-default-presets-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Macromolecule-editor/Rectangle-Selection-Tool/rectangle-selection-tool.spec.ts b/ketcher-autotests/tests/Macromolecule-editor/Rectangle-Selection-Tool/rectangle-selection-tool.spec.ts
index 063d4a7f89..82c83c04f9 100644
--- a/ketcher-autotests/tests/Macromolecule-editor/Rectangle-Selection-Tool/rectangle-selection-tool.spec.ts
+++ b/ketcher-autotests/tests/Macromolecule-editor/Rectangle-Selection-Tool/rectangle-selection-tool.spec.ts
@@ -7,6 +7,8 @@ import {
   selectRectangleSelectionTool,
   selectSingleBondTool,
   takeEditorScreenshot,
+  takePageScreenshot,
+  waitForPageInit,
 } from '@utils';
 import { turnOnMacromoleculesEditor } from '@utils/macromolecules';
 import { bondTwoMonomers } from '@utils/macromolecules/polymerBond';
@@ -14,7 +16,7 @@ import { bondTwoMonomers } from '@utils/macromolecules/polymerBond';
 
 test.describe('Rectangle Selection Tool', () => {
   test.beforeEach(async ({ page }) => {
-    await page.goto('');
+    await waitForPageInit(page);
     await turnOnMacromoleculesEditor(page);
   });
   test('Select monomer and bonds and then erase', async ({ page }) => {
@@ -46,9 +48,7 @@ test.describe('Rectangle Selection Tool', () => {
     await bondTwoMonomers(page, peptide3, peptide2);
     await bondTwoMonomers(page, peptide3, peptide4);
 
-    await page.screenshot({
-      path: 'tests/Macromolecule-editor/screenshots/rectangle-selection-tool.png',
-    });
+    await takePageScreenshot(page);
 
     await selectRectangleSelectionTool(page);
 
@@ -60,16 +60,12 @@ test.describe('Rectangle Selection Tool', () => {
 
     await selectRectangleArea(page, startX, startY, endX, endY);
 
-    await page.screenshot({
-      path: 'tests/Macromolecule-editor/screenshots/rectangle-selection-tool2.png',
-    });
+    await takePageScreenshot(page);
 
     // Erase selected elements
     await selectEraseTool(page);
 
-    await page.screenshot({
-      path: 'tests/Macromolecule-editor/screenshots/rectangle-selection-tool3.png',
-    });
+    await takePageScreenshot(page);
   });
 
   test('Move monomer bonded with another monomers', async ({ page }) => {
diff --git a/ketcher-autotests/tests/Macromolecule-editor/Rectangle-Selection-Tool/rectangle-selection-tool.spec.ts-snapshots/Rectangle-Selection-Tool-Select-monomer-and-bonds-and-then-erase-1-chromium-linux.png b/ketcher-autotests/tests/Macromolecule-editor/Rectangle-Selection-Tool/rectangle-selection-tool.spec.ts-snapshots/Rectangle-Selection-Tool-Select-monomer-and-bonds-and-then-erase-1-chromium-linux.png
new file mode 100644
index 0000000000..48fa12d01f
Binary files /dev/null and b/ketcher-autotests/tests/Macromolecule-editor/Rectangle-Selection-Tool/rectangle-selection-tool.spec.ts-snapshots/Rectangle-Selection-Tool-Select-monomer-and-bonds-and-then-erase-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Macromolecule-editor/Rectangle-Selection-Tool/rectangle-selection-tool.spec.ts-snapshots/Rectangle-Selection-Tool-Select-monomer-and-bonds-and-then-erase-2-chromium-linux.png b/ketcher-autotests/tests/Macromolecule-editor/Rectangle-Selection-Tool/rectangle-selection-tool.spec.ts-snapshots/Rectangle-Selection-Tool-Select-monomer-and-bonds-and-then-erase-2-chromium-linux.png
new file mode 100644
index 0000000000..2ca8726c49
Binary files /dev/null and b/ketcher-autotests/tests/Macromolecule-editor/Rectangle-Selection-Tool/rectangle-selection-tool.spec.ts-snapshots/Rectangle-Selection-Tool-Select-monomer-and-bonds-and-then-erase-2-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Macromolecule-editor/Rectangle-Selection-Tool/rectangle-selection-tool.spec.ts-snapshots/Rectangle-Selection-Tool-Select-monomer-and-bonds-and-then-erase-3-chromium-linux.png b/ketcher-autotests/tests/Macromolecule-editor/Rectangle-Selection-Tool/rectangle-selection-tool.spec.ts-snapshots/Rectangle-Selection-Tool-Select-monomer-and-bonds-and-then-erase-3-chromium-linux.png
new file mode 100644
index 0000000000..f946596c22
Binary files /dev/null and b/ketcher-autotests/tests/Macromolecule-editor/Rectangle-Selection-Tool/rectangle-selection-tool.spec.ts-snapshots/Rectangle-Selection-Tool-Select-monomer-and-bonds-and-then-erase-3-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Macromolecule-editor/screenshots/add-custom-preset-add-to-canvas.png b/ketcher-autotests/tests/Macromolecule-editor/screenshots/add-custom-preset-add-to-canvas.png
deleted file mode 100644
index 78596a3e3d..0000000000
Binary files a/ketcher-autotests/tests/Macromolecule-editor/screenshots/add-custom-preset-add-to-canvas.png and /dev/null differ
diff --git a/ketcher-autotests/tests/Macromolecule-editor/screenshots/add-custom-preset-add.png b/ketcher-autotests/tests/Macromolecule-editor/screenshots/add-custom-preset-add.png
deleted file mode 100644
index fe2f2f8b5c..0000000000
Binary files a/ketcher-autotests/tests/Macromolecule-editor/screenshots/add-custom-preset-add.png and /dev/null differ
diff --git a/ketcher-autotests/tests/Macromolecule-editor/screenshots/add-custom-preset-duplicate.png b/ketcher-autotests/tests/Macromolecule-editor/screenshots/add-custom-preset-duplicate.png
deleted file mode 100644
index d2720c73f6..0000000000
Binary files a/ketcher-autotests/tests/Macromolecule-editor/screenshots/add-custom-preset-duplicate.png and /dev/null differ
diff --git a/ketcher-autotests/tests/Macromolecule-editor/screenshots/add-default-preset-to-canvas.png b/ketcher-autotests/tests/Macromolecule-editor/screenshots/add-default-preset-to-canvas.png
deleted file mode 100644
index fb5df7c743..0000000000
Binary files a/ketcher-autotests/tests/Macromolecule-editor/screenshots/add-default-preset-to-canvas.png and /dev/null differ
diff --git a/ketcher-autotests/tests/Macromolecule-editor/screenshots/attachment-point-rotation-1.png b/ketcher-autotests/tests/Macromolecule-editor/screenshots/attachment-point-rotation-1.png
deleted file mode 100644
index edc0147eee..0000000000
Binary files a/ketcher-autotests/tests/Macromolecule-editor/screenshots/attachment-point-rotation-1.png and /dev/null differ
diff --git a/ketcher-autotests/tests/Macromolecule-editor/screenshots/attachment-point-rotation-2.png b/ketcher-autotests/tests/Macromolecule-editor/screenshots/attachment-point-rotation-2.png
deleted file mode 100644
index 0562d2bf13..0000000000
Binary files a/ketcher-autotests/tests/Macromolecule-editor/screenshots/attachment-point-rotation-2.png and /dev/null differ
diff --git a/ketcher-autotests/tests/Macromolecule-editor/screenshots/attachment-point-rotation-3.png b/ketcher-autotests/tests/Macromolecule-editor/screenshots/attachment-point-rotation-3.png
deleted file mode 100644
index c63afedf1b..0000000000
Binary files a/ketcher-autotests/tests/Macromolecule-editor/screenshots/attachment-point-rotation-3.png and /dev/null differ
diff --git a/ketcher-autotests/tests/Macromolecule-editor/screenshots/attachment-point-rotation-4.png b/ketcher-autotests/tests/Macromolecule-editor/screenshots/attachment-point-rotation-4.png
deleted file mode 100644
index 9aaff61acd..0000000000
Binary files a/ketcher-autotests/tests/Macromolecule-editor/screenshots/attachment-point-rotation-4.png and /dev/null differ
diff --git a/ketcher-autotests/tests/Macromolecule-editor/screenshots/chem-add-to-canvas.png b/ketcher-autotests/tests/Macromolecule-editor/screenshots/chem-add-to-canvas.png
deleted file mode 100644
index 12d2cfcba7..0000000000
Binary files a/ketcher-autotests/tests/Macromolecule-editor/screenshots/chem-add-to-canvas.png and /dev/null differ
diff --git a/ketcher-autotests/tests/Macromolecule-editor/screenshots/chem-library.png b/ketcher-autotests/tests/Macromolecule-editor/screenshots/chem-library.png
deleted file mode 100644
index f10226b5ec..0000000000
Binary files a/ketcher-autotests/tests/Macromolecule-editor/screenshots/chem-library.png and /dev/null differ
diff --git a/ketcher-autotests/tests/Macromolecule-editor/screenshots/default-presets.png b/ketcher-autotests/tests/Macromolecule-editor/screenshots/default-presets.png
deleted file mode 100644
index 8507000980..0000000000
Binary files a/ketcher-autotests/tests/Macromolecule-editor/screenshots/default-presets.png and /dev/null differ
diff --git a/ketcher-autotests/tests/Macromolecule-editor/screenshots/peptides-add-to-canvas.png b/ketcher-autotests/tests/Macromolecule-editor/screenshots/peptides-add-to-canvas.png
deleted file mode 100644
index 003478fc76..0000000000
Binary files a/ketcher-autotests/tests/Macromolecule-editor/screenshots/peptides-add-to-canvas.png and /dev/null differ
diff --git a/ketcher-autotests/tests/Macromolecule-editor/screenshots/polymer-bond-tool-chem1.png b/ketcher-autotests/tests/Macromolecule-editor/screenshots/polymer-bond-tool-chem1.png
deleted file mode 100644
index b30216afa8..0000000000
Binary files a/ketcher-autotests/tests/Macromolecule-editor/screenshots/polymer-bond-tool-chem1.png and /dev/null differ
diff --git a/ketcher-autotests/tests/Macromolecule-editor/screenshots/polymer-bond-tool.png b/ketcher-autotests/tests/Macromolecule-editor/screenshots/polymer-bond-tool.png
deleted file mode 100644
index c9e1a7d1e2..0000000000
Binary files a/ketcher-autotests/tests/Macromolecule-editor/screenshots/polymer-bond-tool.png and /dev/null differ
diff --git a/ketcher-autotests/tests/Macromolecule-editor/screenshots/polymer-bond-tool2.png b/ketcher-autotests/tests/Macromolecule-editor/screenshots/polymer-bond-tool2.png
deleted file mode 100644
index 05253961bc..0000000000
Binary files a/ketcher-autotests/tests/Macromolecule-editor/screenshots/polymer-bond-tool2.png and /dev/null differ
diff --git a/ketcher-autotests/tests/Macromolecule-editor/screenshots/polymer-bond-tool3.png b/ketcher-autotests/tests/Macromolecule-editor/screenshots/polymer-bond-tool3.png
deleted file mode 100644
index 3832f9a26e..0000000000
Binary files a/ketcher-autotests/tests/Macromolecule-editor/screenshots/polymer-bond-tool3.png and /dev/null differ
diff --git a/ketcher-autotests/tests/Macromolecule-editor/screenshots/rectangle-selection-tool.png b/ketcher-autotests/tests/Macromolecule-editor/screenshots/rectangle-selection-tool.png
deleted file mode 100644
index 2214c7f080..0000000000
Binary files a/ketcher-autotests/tests/Macromolecule-editor/screenshots/rectangle-selection-tool.png and /dev/null differ
diff --git a/ketcher-autotests/tests/Macromolecule-editor/screenshots/rectangle-selection-tool2.png b/ketcher-autotests/tests/Macromolecule-editor/screenshots/rectangle-selection-tool2.png
deleted file mode 100644
index e6594e5334..0000000000
Binary files a/ketcher-autotests/tests/Macromolecule-editor/screenshots/rectangle-selection-tool2.png and /dev/null differ
diff --git a/ketcher-autotests/tests/Macromolecule-editor/screenshots/rectangle-selection-tool3.png b/ketcher-autotests/tests/Macromolecule-editor/screenshots/rectangle-selection-tool3.png
deleted file mode 100644
index 06e02aee21..0000000000
Binary files a/ketcher-autotests/tests/Macromolecule-editor/screenshots/rectangle-selection-tool3.png and /dev/null differ
diff --git a/ketcher-autotests/tests/utils/canvas/helpers.ts b/ketcher-autotests/tests/utils/canvas/helpers.ts
index 1aa2bf2fc2..6c745fda83 100644
--- a/ketcher-autotests/tests/utils/canvas/helpers.ts
+++ b/ketcher-autotests/tests/utils/canvas/helpers.ts
@@ -77,6 +77,18 @@ export async function getCoordinatesTopAtomOfBenzeneRing(page: Page) {
   };
 }
 
+export async function takePageScreenshot(
+  page: Page,
+  options?: { masks?: Locator[]; maxDiffPixelRatio?: number },
+) {
+  const maxTimeout = 3000;
+  await waitForRender(page, emptyFunction, maxTimeout);
+  await expect(page).toHaveScreenshot({
+    mask: options?.masks,
+    maxDiffPixelRatio: options?.maxDiffPixelRatio,
+  });
+}
+
 export async function takeEditorScreenshot(
   page: Page,
   options?: { masks?: Locator[]; maxDiffPixelRatio?: number },
@@ -111,13 +123,6 @@ export async function takeTopToolbarScreenshot(page: Page) {
   await expect(editor).toHaveScreenshot();
 }
 
-export async function takePolymerEditorScreenshot(page: Page) {
-  const maxTimeout = 3000;
-  const editor = page.locator('.Ketcher-polymer-editor-root');
-  await waitForRender(page, emptyFunction, maxTimeout);
-  await expect(editor).toHaveScreenshot();
-}
-
 export async function takeMultitoolDropdownScreenshot(page: Page) {
   const dropdown = page.locator('.default-multitool-dropdown');
   await expect(dropdown).toHaveScreenshot();
diff --git a/packages/ketcher-polymer-editor-react/src/components/monomerLibrary/RnaBuilder/RnaAccordion/RnaAccordion.test.tsx b/packages/ketcher-polymer-editor-react/src/components/monomerLibrary/RnaBuilder/RnaAccordion/RnaAccordion.test.tsx
index c20015daf7..8518d38b7d 100644
--- a/packages/ketcher-polymer-editor-react/src/components/monomerLibrary/RnaBuilder/RnaAccordion/RnaAccordion.test.tsx
+++ b/packages/ketcher-polymer-editor-react/src/components/monomerLibrary/RnaBuilder/RnaAccordion/RnaAccordion.test.tsx
@@ -2,10 +2,15 @@ import { render, screen } from '@testing-library/react';
 import { RnaAccordion } from 'components/monomerLibrary/RnaBuilder/RnaAccordion/RnaAccordion';
 import { getMonomerUniqueKey } from 'state/library';
 import { MonomerItemType } from 'ketcher-core';
+import { MONOMER_TYPES } from '../../../../constants';
 
 describe('Test Rna Accordion component', () => {
   it('should render', () => {
-    render(withThemeAndStoreProvider(<RnaAccordion />));
+    render(
+      withThemeAndStoreProvider(
+        <RnaAccordion libraryName={MONOMER_TYPES.RNA} />,
+      ),
+    );
 
     const rnaAccordion = screen.getByTestId('rna-accordion');
 
@@ -26,13 +31,16 @@ describe('Test Rna Accordion component', () => {
       },
     };
     render(
-      withThemeAndStoreProvider(<RnaAccordion />, {
-        library: {
-          searchFilter: '',
-          favorites: {},
-          monomers: [monomerData],
+      withThemeAndStoreProvider(
+        <RnaAccordion libraryName={MONOMER_TYPES.RNA} />,
+        {
+          library: {
+            searchFilter: '',
+            favorites: {},
+            monomers: [monomerData],
+          },
         },
-      }),
+      ),
     );
     const peptidesSummary = screen.getByTestId('summary-Phosphates');
 
diff --git a/packages/ketcher-polymer-editor-react/src/components/monomerLibrary/RnaBuilder/RnaAccordion/RnaAccordion.tsx b/packages/ketcher-polymer-editor-react/src/components/monomerLibrary/RnaBuilder/RnaAccordion/RnaAccordion.tsx
index a331bdb3fe..23d184b008 100644
--- a/packages/ketcher-polymer-editor-react/src/components/monomerLibrary/RnaBuilder/RnaAccordion/RnaAccordion.tsx
+++ b/packages/ketcher-polymer-editor-react/src/components/monomerLibrary/RnaBuilder/RnaAccordion/RnaAccordion.tsx
@@ -27,6 +27,7 @@ import {
   getMonomerUniqueKey,
   selectFilteredMonomers,
   selectMonomerGroups,
+  selectMonomersInCategory,
 } from 'state/library';
 import {
   DetailsContainer,
@@ -69,11 +70,12 @@ interface IGroupsDataItem {
   }[];
 }
 
-export const RnaAccordion = () => {
+export const RnaAccordion = ({ libraryName }) => {
   const monomers = useAppSelector(selectFilteredMonomers);
+  const items = selectMonomersInCategory(monomers, libraryName);
   const activeRnaBuilderItem = useAppSelector(selectActiveRnaBuilderItem);
   const activePreset = useAppSelector(selectActivePreset);
-  const groups = selectMonomerGroups(monomers);
+  const groups = selectMonomerGroups(items);
   const presets = useAppSelector(selectPresets);
   const isEditMode = useAppSelector(selectIsEditMode);
   const editor = useAppSelector(selectEditor);
diff --git a/packages/ketcher-polymer-editor-react/src/components/monomerLibrary/RnaBuilder/RnaAccordion/__snapshots__/RnaAccordion.test.tsx.snap b/packages/ketcher-polymer-editor-react/src/components/monomerLibrary/RnaBuilder/RnaAccordion/__snapshots__/RnaAccordion.test.tsx.snap
index f252e02be7..4ce7c65444 100644
--- a/packages/ketcher-polymer-editor-react/src/components/monomerLibrary/RnaBuilder/RnaAccordion/__snapshots__/RnaAccordion.test.tsx.snap
+++ b/packages/ketcher-polymer-editor-react/src/components/monomerLibrary/RnaBuilder/RnaAccordion/__snapshots__/RnaAccordion.test.tsx.snap
@@ -71,7 +71,7 @@ exports[`Test Rna Accordion component should render 1`] = `
       </div>
     </div>
     <div
-      class="css-1m9d4g"
+      class="css-2kwivx"
     >
       <div
         class="css-9bccu"
@@ -104,18 +104,19 @@ exports[`Test Rna Accordion component should render 1`] = `
         <svg
           class="css-1qr96ji"
           fill="none"
-          height="16"
-          viewBox="0 0 16 16"
-          width="16"
+          height="20"
+          stroke-width="2"
+          viewBox="0 0 20 20"
+          width="20"
           xmlns="http://www.w3.org/2000/svg"
         >
           <rect
             fill="currentColor"
-            height="13.333"
+            height="18"
             rx="1"
-            width="13.333"
-            x="1.332"
-            y="1.333"
+            width="18"
+            x="1"
+            y="1"
           />
         </svg>
         <span
@@ -142,7 +143,7 @@ exports[`Test Rna Accordion component should render 1`] = `
       </div>
     </div>
     <div
-      class="css-xy55ii"
+      class="css-4wpvad"
     >
       <div
         class="css-9bccu"
@@ -162,18 +163,30 @@ exports[`Test Rna Accordion component should render 1`] = `
         <svg
           class="css-1qr96ji"
           fill="none"
-          height="17"
-          viewBox="0 0 18 17"
-          width="18"
+          height="25"
+          stroke-width="2"
+          transform="translate(-3)"
+          viewBox="0 0 26 25"
+          width="26"
           xmlns="http://www.w3.org/2000/svg"
         >
           <rect
             fill="currentColor"
-            height="12"
+            height="15.013"
             rx="1"
-            transform="rotate(45 9 0)"
-            width="12"
-            x="9"
+            transform="rotate(45 13 1.414)"
+            width="15.013"
+            x="13"
+            y="1.414"
+          />
+          <rect
+            height="15.013"
+            rx="1"
+            stroke="currentColor"
+            transform="rotate(45 13 1.414)"
+            width="15.013"
+            x="13"
+            y="1.414"
           />
         </svg>
         <span
@@ -200,7 +213,7 @@ exports[`Test Rna Accordion component should render 1`] = `
       </div>
     </div>
     <div
-      class="css-xy55ii"
+      class="css-4wpvad"
     >
       <div
         class="css-9bccu"
@@ -221,17 +234,27 @@ exports[`Test Rna Accordion component should render 1`] = `
           class="css-1qr96ji"
           fill="none"
           height="24"
+          stroke-width="2"
+          transform="translate(-2)"
           viewBox="0 0 24 24"
           width="24"
           xmlns="http://www.w3.org/2000/svg"
         >
           <rect
             fill="currentColor"
-            height="20"
-            rx="10"
-            width="20"
-            x="2"
-            y="2"
+            height="18"
+            rx="9"
+            width="18"
+            x="3"
+            y="3"
+          />
+          <rect
+            height="18"
+            rx="9"
+            stroke="currentColor"
+            width="18"
+            x="3"
+            y="3"
           />
         </svg>
         <span
@@ -258,7 +281,7 @@ exports[`Test Rna Accordion component should render 1`] = `
       </div>
     </div>
     <div
-      class="css-xy55ii"
+      class="css-4wpvad"
     >
       <div
         class="css-9bccu"
diff --git a/packages/ketcher-polymer-editor-react/src/components/monomerLibrary/RnaBuilder/RnaBuilder.tsx b/packages/ketcher-polymer-editor-react/src/components/monomerLibrary/RnaBuilder/RnaBuilder.tsx
index 56f7c0096b..64acc724b7 100644
--- a/packages/ketcher-polymer-editor-react/src/components/monomerLibrary/RnaBuilder/RnaBuilder.tsx
+++ b/packages/ketcher-polymer-editor-react/src/components/monomerLibrary/RnaBuilder/RnaBuilder.tsx
@@ -31,7 +31,7 @@ import { getDefaultPresets } from 'src/helpers/getDefaultPreset';
 import { StyledButton } from 'components/monomerLibrary/RnaBuilder/RnaAccordion/styles';
 import { IRnaPreset } from 'components/monomerLibrary/RnaBuilder/types';
 
-export const RnaBuilder = () => {
+export const RnaBuilder = ({ libraryName }) => {
   const dispatch = useAppDispatch();
   const hasError = useAppSelector(selectHasUniqueNameError);
   const monomers = useAppSelector(selectFilteredMonomers);
@@ -48,7 +48,7 @@ export const RnaBuilder = () => {
   return (
     <RnaBuilderContainer>
       <RnaEditor />
-      <RnaAccordion />
+      <RnaAccordion libraryName={libraryName} />
       <Modal isOpen={hasError} title="Error Message" onClose={closeErrorModal}>
         <Modal.Content>
           Preset with name "{activePreset?.name}" already exists. Please choose
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 3898e87650..83cb1ca4c4 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: 'RNA',
     testId: 'RNA_TAB',
     component: RnaBuilder,
+    props: {
+      libraryName: MONOMER_TYPES.RNA,
+    },
   },
   {
     caption: 'CHEM',