diff --git a/apps/common/main/resources/less/asc-mixins.less b/apps/common/main/resources/less/asc-mixins.less
index 4f2990fc6..a70329675 100644
--- a/apps/common/main/resources/less/asc-mixins.less
+++ b/apps/common/main/resources/less/asc-mixins.less
@@ -96,10 +96,16 @@
 }
 
 .button-otherstates-icon(@icon-class, @icon-size) {
-    button.over     > .@{icon-class} {background-position-x: -1*@icon-size; --bgX: calc(-1*@icon-size);}
-    button {
-        &.active, &:active {
-            &:not(.disabled):not(:disabled) > .@{icon-class} {background-position-x: -2*@icon-size !important; --bgX: calc(-2*@icon-size);}
+    .btn {
+        &:active, &.active {
+            &:not(:disabled):not(.disabed) {
+                > .@{icon-class} {
+                    @iconsize: -1*@icon-size;
+
+                    background-position-x: @iconsize;
+                    --bgX: @iconsize;
+                }
+            }
         }
     }
 }
diff --git a/apps/common/main/resources/less/buttons.less b/apps/common/main/resources/less/buttons.less
index 8cfab972f..e209664aa 100644
--- a/apps/common/main/resources/less/buttons.less
+++ b/apps/common/main/resources/less/buttons.less
@@ -587,10 +587,17 @@
         background-repeat: no-repeat;
     }
 
+    box-shadow: inset 0 0 0 1px @secondary;
+    .border-radius(@border-radius-small);
+
     &:hover,
-    .over,
+    &.over {
+        background-color: @secondary;
+    }
+
     &:active,
     &.active {
+        background-color: @primary;
     }
 }
 
diff --git a/apps/documenteditor/main/resources/img/right-panels/LargeBorders.png b/apps/documenteditor/main/resources/img/right-panels/LargeBorders.png
index cb4e7c2b7..a3b1673cd 100644
Binary files a/apps/documenteditor/main/resources/img/right-panels/LargeBorders.png and b/apps/documenteditor/main/resources/img/right-panels/LargeBorders.png differ
diff --git a/apps/documenteditor/main/resources/img/right-panels/RightPanelBigBtns.png b/apps/documenteditor/main/resources/img/right-panels/RightPanelBigBtns.png
index 215989afe..443b713b3 100644
Binary files a/apps/documenteditor/main/resources/img/right-panels/RightPanelBigBtns.png and b/apps/documenteditor/main/resources/img/right-panels/RightPanelBigBtns.png differ
diff --git a/apps/documenteditor/main/resources/img/right-panels/right_panel_wrap_btns.png b/apps/documenteditor/main/resources/img/right-panels/right_panel_wrap_btns.png
index da38dddab..3932a01bd 100644
Binary files a/apps/documenteditor/main/resources/img/right-panels/right_panel_wrap_btns.png and b/apps/documenteditor/main/resources/img/right-panels/right_panel_wrap_btns.png differ