diff --git a/packages/editor/cypress/e2e/topicFontChange.cy.ts b/packages/editor/cypress/e2e/topicFontChange.cy.ts
index 77a55845..d8cd5afa 100644
--- a/packages/editor/cypress/e2e/topicFontChange.cy.ts
+++ b/packages/editor/cypress/e2e/topicFontChange.cy.ts
@@ -13,6 +13,8 @@ context('Edit Topic', () => {
   it('Change Main Topic Text', () => {
     cy.get('body').type('New Title Main Topic{enter}');
     cy.get('[test-id=1] > text > tspan').should('have.text', 'New Title Main Topic');
+
+    cy.wait(200);
     cy.matchImageSnapshot('changeMainTopicText');
   });
 
@@ -40,6 +42,8 @@ context('Edit Topic', () => {
 
     cy.get('@bigger').eq(1).click();
     cy.get('[test-id=1] > text').invoke('attr', 'font-size').should('eq', '20.2');
+
+    cy.wait(200);
     cy.matchImageSnapshot('changeFontSizeHuge');
   });
 
@@ -49,6 +53,7 @@ context('Edit Topic', () => {
 
     cy.get('[test-id=1] > text').invoke('attr', 'font-style').should('eq', 'italic');
 
+    cy.wait(200);
     cy.matchImageSnapshot('changeFontItalic');
   });
 
@@ -58,6 +63,7 @@ context('Edit Topic', () => {
 
     cy.get('[test-id=1] > text').invoke('attr', 'font-weight').should('eq', 'normal');
 
+    cy.wait(200);
     cy.matchImageSnapshot('changeFontBold');
   });
 
@@ -68,6 +74,7 @@ context('Edit Topic', () => {
 
     cy.get('[test-id=1] > text').invoke('attr', 'fill').should('eq', '#cc0000');
 
+    cy.wait(200);
     cy.matchImageSnapshot('changeFontColor');
   });
 });
diff --git a/packages/editor/cypress/e2e/topicManager.cy.ts b/packages/editor/cypress/e2e/topicManager.cy.ts
index 80c0fb7c..6200f369 100644
--- a/packages/editor/cypress/e2e/topicManager.cy.ts
+++ b/packages/editor/cypress/e2e/topicManager.cy.ts
@@ -12,6 +12,7 @@ context('Node manager', () => {
 
     cy.get('[test-id=36] > text > tspan').should('exist');
 
+    cy.wait(200);
     cy.matchImageSnapshot('editor-shortcut-edit');
   });
 
@@ -23,6 +24,7 @@ context('Node manager', () => {
     cy.get('[test-id=36] > text > tspan').should('exist');
     cy.get('[test-id=37] > text > tspan').should('exist');
 
+    cy.wait(200);
     cy.matchImageSnapshot('addChildNodeSortcut');
   });
 
@@ -32,6 +34,7 @@ context('Node manager', () => {
 
     cy.get('[test-id=37]').should('not.exist');
 
+    cy.wait(200);
     cy.matchImageSnapshot('deleteTopicShortcut');
   });
 
@@ -40,12 +43,15 @@ context('Node manager', () => {
 
     cy.get('[test-id=36] > text > tspan').should('exist');
 
+    cy.wait(200);
     cy.matchImageSnapshot('undoChange');
   });
 
   it('redo changes', () => {
     cy.get('[data-testid="RedoOutlinedIcon"]').click();
     cy.get('[test-id=36] > text > tspan').should('exist');
+
+    cy.wait(200);
     cy.matchImageSnapshot('redoChange');
   });
 
@@ -53,6 +59,7 @@ context('Node manager', () => {
     cy.contains('Mind Mapping rocks!!').click({ force: true });
     cy.get('body').type('{ctrl}s');
 
+    cy.wait(200);
     cy.matchImageSnapshot('saveChagesShortcut');
   });
 });
diff --git a/packages/editor/cypress/e2e/topicShape.cy.ts b/packages/editor/cypress/e2e/topicShape.cy.ts
index e3df98eb..c2fbfa2f 100644
--- a/packages/editor/cypress/e2e/topicShape.cy.ts
+++ b/packages/editor/cypress/e2e/topicShape.cy.ts
@@ -16,6 +16,7 @@ context('Change Topic shape', () => {
       .should('be.a', 'number')
       .should('eq', 0);
 
+    cy.wait(200);
     cy.matchImageSnapshot('changeToSquareShape');
   });
 
@@ -39,6 +40,7 @@ context('Change Topic shape', () => {
       .should('be.a', 'number')
       .should('be.lt', 5);
 
+    cy.wait(200);
     cy.matchImageSnapshot('changeToRoundedRectangle');
   });
 
@@ -48,6 +50,7 @@ context('Change Topic shape', () => {
     cy.get(`[aria-label="Topic Style"]`).first().trigger('mouseover');
     cy.get(`[aria-label="Line shape"]`).first().click();
 
+    cy.wait(200);
     cy.matchImageSnapshot('changeToLine');
   });
 
@@ -71,6 +74,7 @@ context('Change Topic shape', () => {
       .should('be.a', 'number')
       .should('be.lt', 15);
 
+    cy.wait(200);
     cy.matchImageSnapshot('changeToEllipseShape');
   });
 });
diff --git a/packages/editor/cypress/snapshots/topicFontChange.cy.ts/changeFontColor.snap.png b/packages/editor/cypress/snapshots/topicFontChange.cy.ts/changeFontColor.snap.png
index 36661408..6b1bcebe 100644
Binary files a/packages/editor/cypress/snapshots/topicFontChange.cy.ts/changeFontColor.snap.png and b/packages/editor/cypress/snapshots/topicFontChange.cy.ts/changeFontColor.snap.png differ
diff --git a/packages/editor/cypress/snapshots/topicFontChange.cy.ts/changeFontSizeSmall.snap.png b/packages/editor/cypress/snapshots/topicFontChange.cy.ts/changeFontSizeSmall.snap.png
index 7d0afc3c..2fa9a893 100644
Binary files a/packages/editor/cypress/snapshots/topicFontChange.cy.ts/changeFontSizeSmall.snap.png and b/packages/editor/cypress/snapshots/topicFontChange.cy.ts/changeFontSizeSmall.snap.png differ
diff --git a/packages/editor/cypress/snapshots/topicManager.cy.ts/redoChange.snap.png b/packages/editor/cypress/snapshots/topicManager.cy.ts/redoChange.snap.png
index e9699eb8..902d73e5 100644
Binary files a/packages/editor/cypress/snapshots/topicManager.cy.ts/redoChange.snap.png and b/packages/editor/cypress/snapshots/topicManager.cy.ts/redoChange.snap.png differ
diff --git a/packages/editor/cypress/snapshots/topicShape.cy.ts/changeToEllipseShape.snap.png b/packages/editor/cypress/snapshots/topicShape.cy.ts/changeToEllipseShape.snap.png
index a1248af2..c3f29ce8 100644
Binary files a/packages/editor/cypress/snapshots/topicShape.cy.ts/changeToEllipseShape.snap.png and b/packages/editor/cypress/snapshots/topicShape.cy.ts/changeToEllipseShape.snap.png differ
diff --git a/packages/editor/cypress/snapshots/topicShape.cy.ts/changeToLine.snap.png b/packages/editor/cypress/snapshots/topicShape.cy.ts/changeToLine.snap.png
index b2ee49e4..3a8bafed 100644
Binary files a/packages/editor/cypress/snapshots/topicShape.cy.ts/changeToLine.snap.png and b/packages/editor/cypress/snapshots/topicShape.cy.ts/changeToLine.snap.png differ
diff --git a/packages/editor/cypress/snapshots/topicShape.cy.ts/changeToRoundedRectangle.snap.png b/packages/editor/cypress/snapshots/topicShape.cy.ts/changeToRoundedRectangle.snap.png
index 1fe362d9..88f0eae7 100644
Binary files a/packages/editor/cypress/snapshots/topicShape.cy.ts/changeToRoundedRectangle.snap.png and b/packages/editor/cypress/snapshots/topicShape.cy.ts/changeToRoundedRectangle.snap.png differ
diff --git a/packages/editor/src/components/editor-toolbar/configBuilder.tsx b/packages/editor/src/components/editor-toolbar/configBuilder.tsx
index fb5d3f27..7795d0ca 100644
--- a/packages/editor/src/components/editor-toolbar/configBuilder.tsx
+++ b/packages/editor/src/components/editor-toolbar/configBuilder.tsx
@@ -37,7 +37,7 @@ import GestureOutlined from '@mui/icons-material/GestureOutlined';
 import TimelineOutined from '@mui/icons-material/TimelineOutlined';
 import ShareOutlined from '@mui/icons-material/ShareOutlined';
 import SwapCallsOutlined from '@mui/icons-material/SwapCallsOutlined';
-import ClearOutlined from '@mui/icons-material/ClearOutlined';
+import NotInterestedOutlined from '@mui/icons-material/NotInterestedOutlined';
 
 import Palette from '@mui/icons-material/Square';
 import SquareOutlined from '@mui/icons-material/SquareOutlined';
@@ -125,7 +125,7 @@ export function buildEditorPanelConfig(model: Editor, intl: IntlShape): ActionCo
         ],
       },
       {
-        icon: <ClearOutlined />,
+        icon: <NotInterestedOutlined />,
         tooltip: intl.formatMessage({
           id: 'editor-panel.tooltip-topic-border-color-default',
           defaultMessage: 'Default border color',
@@ -154,7 +154,7 @@ export function buildEditorPanelConfig(model: Editor, intl: IntlShape): ActionCo
         ],
       },
       {
-        icon: <ClearOutlined />,
+        icon: <NotInterestedOutlined />,
         tooltip: intl.formatMessage({
           id: 'editor-panel.tooltip-topic-fill-color-default',
           defaultMessage: 'Default fill color',
@@ -232,7 +232,7 @@ export function buildEditorPanelConfig(model: Editor, intl: IntlShape): ActionCo
         ],
       },
       {
-        icon: <ClearOutlined />,
+        icon: <NotInterestedOutlined />,
         tooltip: intl.formatMessage({
           id: 'editor-panel.tooltip-connection-color-default',
           defaultMessage: 'Default color',
@@ -323,7 +323,7 @@ export function buildEditorPanelConfig(model: Editor, intl: IntlShape): ActionCo
         ],
       },
       {
-        icon: <ClearOutlined />,
+        icon: <NotInterestedOutlined />,
         tooltip: intl.formatMessage({
           id: 'editor-panel.tooltip-topic-font-color-default',
           defaultMessage: 'Default color',
diff --git a/packages/webapp/cypress/snapshots/editor.cy.ts/editor-page.snap.png b/packages/webapp/cypress/snapshots/editor.cy.ts/editor-page.snap.png
index 9b31f0c5..dff1a78b 100644
Binary files a/packages/webapp/cypress/snapshots/editor.cy.ts/editor-page.snap.png and b/packages/webapp/cypress/snapshots/editor.cy.ts/editor-page.snap.png differ