diff --git a/apps/common/main/resources/img/toolbar/1x/big/.css.handlebars b/apps/common/main/resources/img/toolbar/1x/big/.css.handlebars
index 9348d8235..ae99b475e 100644
--- a/apps/common/main/resources/img/toolbar/1x/big/.css.handlebars
+++ b/apps/common/main/resources/img/toolbar/1x/big/.css.handlebars
@@ -5,7 +5,7 @@
             &:not(:disabled):not(.disabled) {
                 .toolbar__icon {
                     background-position-x: 0;
-                    background-position-x: var(--button-huge-active-icon-offset-x,0);
+                    background-position-x: var(--button-xhuge-active-icon-offset-x,0);
                 }
             }
         }
@@ -15,7 +15,7 @@
         &:not(:disabled):not(.disabled) {
             .toolbar__icon.toolbar__icon-big {
                 background-position-x: 0;
-                background-position-x: var(--button-huge-active-icon-offset-x,0);
+                background-position-x: var(--button-xhuge-active-icon-offset-x,0);
             }
         }
     }
diff --git a/apps/common/main/resources/img/toolbar/1x/huge/.css.handlebars b/apps/common/main/resources/img/toolbar/1x/huge/.css.handlebars
index cce2050b4..c1f895dd9 100644
--- a/apps/common/main/resources/img/toolbar/1x/huge/.css.handlebars
+++ b/apps/common/main/resources/img/toolbar/1x/huge/.css.handlebars
@@ -3,8 +3,9 @@
     &.active, &:active {
         &:not(:disabled):not(.disabled) {
             .options__icon.options__icon-huge {
-                @btn-active-icon-offset: -40px;
+                @btn-active-icon-offset: 0;
                 background-position-x: @btn-active-icon-offset;
+                background-position-x: var(--button-huge-active-icon-offset-x,0);
             }
         }
     }
diff --git a/apps/common/main/resources/less/buttons.less b/apps/common/main/resources/less/buttons.less
index 3c324c41c..a6579d6fd 100644
--- a/apps/common/main/resources/less/buttons.less
+++ b/apps/common/main/resources/less/buttons.less
@@ -284,7 +284,7 @@
 .icon-top {
     &.x-huge  {
         .btn&, .btn-group& .btn-toolbar {
-            .mx-button-otherstates-icon2(@button-huge-active-icon-offset-x);
+            .mx-button-otherstates-icon2(@button-xhuge-active-icon-offset-x);
         }
 
         .btn.small {
diff --git a/apps/common/main/resources/less/colors-table-dark.less b/apps/common/main/resources/less/colors-table-dark.less
index e8a1f7d67..00c583537 100644
--- a/apps/common/main/resources/less/colors-table-dark.less
+++ b/apps/common/main/resources/less/colors-table-dark.less
@@ -97,8 +97,10 @@
         --button-small-active-icon-offset-x: -20px;
         --button-large-normal-icon-offset-x: -31px;
         --button-large-active-icon-offset-x: -31px;
-        --button-huge-normal-icon-offset-x: -28px;
-        --button-huge-active-icon-offset-x: -28px;
+        --button-huge-normal-icon-offset-x: -40px;
+        --button-huge-active-icon-offset-x: -40px;
+        --button-xhuge-normal-icon-offset-x: -28px;
+        --button-xhuge-active-icon-offset-x: -28px;
 
         --modal-window-mask-opacity: 0.6;
         --image-border-types-filter: invert(100%) brightness(4);
diff --git a/apps/common/main/resources/less/colors-table.less b/apps/common/main/resources/less/colors-table.less
index a42088daf..6d6cca53b 100644
--- a/apps/common/main/resources/less/colors-table.less
+++ b/apps/common/main/resources/less/colors-table.less
@@ -110,6 +110,8 @@
     //--button-large-active-icon-offset-x: 0;
     //--button-huge-normal-icon-offset-x: 0;
     //--button-huge-active-icon-offset-x: 0;
+    //--button-xhuge-normal-icon-offset-x: 0;
+    //--button-xhuge-active-icon-offset-x: 0;
     --button-header-normal-icon-offset-x: -20px;
     --button-header-active-icon-offset-x: -20px;
     //--menu-icon-item-checked-offset-x: 0;
@@ -179,8 +181,8 @@
 @button-small-active-icon-offset-x: var(--button-small-active-icon-offset-x,0);
 @button-large-normal-icon-offset-x: var(--button-large-normal-icon-offset-x, 0);
 @button-large-active-icon-offset-x: var(--button-large-active-icon-offset-x, 0);
-@button-huge-normal-icon-offset-x: var(--button-huge-normal-icon-offset-x, 0);
-@button-huge-active-icon-offset-x: var(--button-huge-active-icon-offset-x, 0);
+@button-xhuge-normal-icon-offset-x: var(--button-xhuge-normal-icon-offset-x, 0);
+@button-xhuge-active-icon-offset-x: var(--button-xhuge-active-icon-offset-x, 0);
 
 @button-header-normal-icon-offset-x: var(--button-header-normal-icon-offset-x, -20px);
 @button-header-active-icon-offset-x: var(--button-header-active-icon-offset-x, -20px);
diff --git a/apps/documenteditor/main/resources/less/rightmenu.less b/apps/documenteditor/main/resources/less/rightmenu.less
index c84c57c44..2f78c8bdd 100644
--- a/apps/documenteditor/main/resources/less/rightmenu.less
+++ b/apps/documenteditor/main/resources/less/rightmenu.less
@@ -25,16 +25,16 @@
 .button-normal-icon(btn-colontitul-bc,    7, @huge-icon-size, @button-huge-normal-icon-offset-x);
 .button-normal-icon(btn-colontitul-br,    8, @huge-icon-size, @button-huge-normal-icon-offset-x);
 
-.button-normal-icon(btn-wrap-none,        9, @huge-icon-size, @button-huge-normal-icon-offset-x);
-.button-normal-icon(btn-wrap-parallel,    10, @huge-icon-size, @button-huge-normal-icon-offset-x);
+.button-normal-icon(btn-wrap-none,        9, @huge-icon-size, @button-xhuge-normal-icon-offset-x);
+.button-normal-icon(btn-wrap-parallel,    10, @huge-icon-size, @button-xhuge-normal-icon-offset-x);
 
-.button-normal-icon(btn-table-align-left,    0, @huge-icon-size, @button-huge-normal-icon-offset-x);
-.button-normal-icon(btn-table-align-center,  1, @huge-icon-size, @button-huge-normal-icon-offset-x);
-.button-normal-icon(btn-table-align-right,   2, @huge-icon-size, @button-huge-normal-icon-offset-x);
+.button-normal-icon(btn-table-align-left,    0, @huge-icon-size, @button-xhuge-normal-icon-offset-x);
+.button-normal-icon(btn-table-align-center,  1, @huge-icon-size, @button-xhuge-normal-icon-offset-x);
+.button-normal-icon(btn-table-align-right,   2, @huge-icon-size, @button-xhuge-normal-icon-offset-x);
 
-.button-normal-icon(btn-frame-inline,        9, @huge-icon-size, @button-huge-normal-icon-offset-x);
-.button-normal-icon(btn-frame-flow,          10, @huge-icon-size, @button-huge-normal-icon-offset-x);
-.button-normal-icon(btn-frame-none,          11, @huge-icon-size, @button-huge-normal-icon-offset-x);
+.button-normal-icon(btn-frame-inline,        9, @huge-icon-size, @button-xhuge-normal-icon-offset-x);
+.button-normal-icon(btn-frame-flow,          10, @huge-icon-size, @button-xhuge-normal-icon-offset-x);
+.button-normal-icon(btn-frame-none,          11, @huge-icon-size, @button-xhuge-normal-icon-offset-x);
 
 .button-otherstates-icon(icon-right-panel, @huge-icon-size);