diff --git a/apps/common/main/resources/img/right-panels/rowscols_icon.png b/apps/common/main/resources/img/right-panels/rowscols_icon.png
index 4936930c4..61ad3eb8f 100644
Binary files a/apps/common/main/resources/img/right-panels/rowscols_icon.png and b/apps/common/main/resources/img/right-panels/rowscols_icon.png differ
diff --git a/apps/common/main/resources/img/right-panels/rowscols_icon@1.5x.png b/apps/common/main/resources/img/right-panels/rowscols_icon@1.5x.png
index ed7943a0b..b00e33d9f 100644
Binary files a/apps/common/main/resources/img/right-panels/rowscols_icon@1.5x.png and b/apps/common/main/resources/img/right-panels/rowscols_icon@1.5x.png differ
diff --git a/apps/common/main/resources/img/right-panels/rowscols_icon@2x.png b/apps/common/main/resources/img/right-panels/rowscols_icon@2x.png
index 113f8835b..a2a69e6bd 100644
Binary files a/apps/common/main/resources/img/right-panels/rowscols_icon@2x.png and b/apps/common/main/resources/img/right-panels/rowscols_icon@2x.png differ
diff --git a/apps/common/main/resources/less/common.less b/apps/common/main/resources/less/common.less
index d732bc597..b4a0128b6 100644
--- a/apps/common/main/resources/less/common.less
+++ b/apps/common/main/resources/less/common.less
@@ -222,49 +222,34 @@ textarea {
 
 .btn-edit-table,
 .btn-change-shape {
-    .background-ximage-v2('right-panels/rowscols_icon.png', 84px);
+    .background-ximage-v2('right-panels/rowscols_icon.png', 56px);
     margin-right: 2px !important;
     margin-bottom: 1px !important;
+
+    background-position-x: calc(@button-small-normal-icon-offset-x - 8px);
+
+    .btn-group.open &,
+        button.active:not(.disabled) &,
+        button:active:not(.disabled) &
+    {
+        background-position-x: calc(@button-small-active-icon-offset-x - 8px);
+    }
 }
 
 .btn-edit-table {
-    background-position: 0 0;
+    background-position-y: 0;
 
     button.over & {
         //background-position: -28px 0;
     }
-
-    .btn-group.open &,
-        button.active:not(.disabled) &,
-        button:active:not(.disabled) &
-    {
-        //background-position: -56px 0;
-    }
-
-    // TODO: not good, must be controled by variable
-    .theme-dark & {
-        background-position-x: -56px;
-    }
 }
 
 .btn-change-shape {
-    background-position: 0 -16px;
+    background-position-y: -16px;
 
     button.over & {
         //background-position: -28px -16px;
     }
-
-    .btn-group.open &,
-        button.active:not(.disabled) &,
-        button:active:not(.disabled) &
-    {
-        //background-position: -56px -16px;
-    }
-
-    // TODO: not good, must be controled by variable
-    .theme-dark & {
-        background-position-x: -56px;
-    }
 }
 
 .doc-content-color {