diff --git a/apps/common/main/lib/view/LanguageDialog.js b/apps/common/main/lib/view/LanguageDialog.js
index be8342bc2..e36d87523 100644
--- a/apps/common/main/lib/view/LanguageDialog.js
+++ b/apps/common/main/lib/view/LanguageDialog.js
@@ -87,7 +87,9 @@ define([
                 '<span class="input-group combobox <%= cls %> combo-langs" id="<%= id %>" style="<%= style %>">',
                     '<input type="text" class="form-control">',
                     '<span class="icon input-icon spellcheck-lang toolbar__icon btn-ic-docspell"></span>',
-                    '<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"><span class="caret img-commonctrl"></span></button>',
+                    '<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">',
+                        '<span class="caret" />',
+                    '</button>',
                     '<ul class="dropdown-menu <%= menuCls %>" style="<%= menuStyle %>" role="menu">',
                         '<% _.each(items, function(item) { %>',
                         '<li id="<%= item.id %>" data-value="<%= item.value %>">',
diff --git a/apps/common/main/resources/img/toolbar/1x/.css.handlebars b/apps/common/main/resources/img/toolbar/1x/.css.handlebars
index ababdd30d..38132ed40 100644
--- a/apps/common/main/resources/img/toolbar/1x/.css.handlebars
+++ b/apps/common/main/resources/img/toolbar/1x/.css.handlebars
@@ -10,9 +10,7 @@
 }
 .menu__icon {
     .no-checkmark.checked & {
-        @btn-active-icon-offset: -20px;
-        background-position-x: @btn-active-icon-offset;
-        --bgX: @btn-active-icon-offset;
+        background-position-x: @menu-icon-item-checked-offset-x;
     }
 }
 .toolbar__icon, .menu__icon {
diff --git a/apps/common/main/resources/less/colors-table-dark.less b/apps/common/main/resources/less/colors-table-dark.less
index 94a927999..d7334cf15 100644
--- a/apps/common/main/resources/less/colors-table-dark.less
+++ b/apps/common/main/resources/less/colors-table-dark.less
@@ -75,5 +75,7 @@
         --image-border-types-filter: invert(100%) brightness(4);
         --image-border-types-filter-selected: invert(100%) brightness(4);
         --component-normal-icon-filter: invert(100%);
+
+        --menu-icon-item-checked-offset-x: -20px;
     }
 }
diff --git a/apps/common/main/resources/less/colors-table.less b/apps/common/main/resources/less/colors-table.less
index 06226a1da..e4e0f3989 100644
--- a/apps/common/main/resources/less/colors-table.less
+++ b/apps/common/main/resources/less/colors-table.less
@@ -81,6 +81,7 @@
     //--button-huge-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;
 
     --modal-window-mask-opacity: 0.2;
     --image-border-types-filter: none;
@@ -155,3 +156,5 @@
 
 @component-normal-icon-filer: var(--component-normal-icon-filter);
 @comment-resolved-icon-color: var(--comment-resolved-icon-color);
+
+@menu-icon-item-checked-offset-x: var(--menu-icon-item-checked-offset-x, 0);
\ No newline at end of file
diff --git a/apps/common/main/resources/less/combo-dataview.less b/apps/common/main/resources/less/combo-dataview.less
index 5fe3f58db..ac80e6303 100644
--- a/apps/common/main/resources/less/combo-dataview.less
+++ b/apps/common/main/resources/less/combo-dataview.less
@@ -35,8 +35,9 @@
                 .caret {
 //                    width: 7px;
 //                    height: 7px;
-                    border: 0;
-                    background-position: @arrow-small-offset-x @arrow-small-offset-y;
+//                    border: 0;
+//                    background-position: @arrow-small-offset-x @arrow-small-offset-y;
+                    margin-left: 1px;
                 }
             }
         }
diff --git a/apps/common/main/resources/less/combobox.less b/apps/common/main/resources/less/combobox.less
index ee35ea957..e43fea56a 100644
--- a/apps/common/main/resources/less/combobox.less
+++ b/apps/common/main/resources/less/combobox.less
@@ -65,7 +65,7 @@
     &.input-group-nr.open:not(.no-highlighted) {
         & > .form-control,
         & > .btn {
-            border-color: @border-preview-select;
+            border-color: @border-control-focus;
 
             .caret {
                 transform: rotate(45deg);
@@ -76,7 +76,7 @@
     &.input-group-nr:not(.no-highlighted) > .form-control {
         &:focus,
         &:focus ~ button.dropdown-toggle {
-            border-color: @border-preview-select;
+            border-color: @border-control-focus;
         }
     }
 
@@ -145,7 +145,7 @@
     &.input-group-nr:not(.no-highlighted) {
         & > .form-control,
         & > .btn {
-            border-color: @border-preview-select;
+            border-color: @border-control-focus;
         }
     }
 }
\ No newline at end of file
diff --git a/apps/common/main/resources/less/spinner.less b/apps/common/main/resources/less/spinner.less
index 165deeee8..e91cefef2 100644
--- a/apps/common/main/resources/less/spinner.less
+++ b/apps/common/main/resources/less/spinner.less
@@ -10,7 +10,7 @@
         padding-right: @trigger-width + 2px;
 
         &:focus {
-            border-color: @border-preview-select;
+            // border-color: @border-preview-select;
         }
     }
 
@@ -18,7 +18,7 @@
         display: block;
         position: relative;
         width: @trigger-width;
-        height: @spin-height/2;
+        height: @spin-height/2 - 1;
         padding: 0;
         margin: 0;
         border: none;
@@ -39,6 +39,8 @@
         position: absolute;
         top: 0;
         right: 1px;
+        border-top: 1px solid transparent;
+        border-bottom: 1px solid transparent;
 
         i {
             display: inline-block;
@@ -54,18 +56,22 @@
             &.disabled {
                 opacity: .35;
             }
+
+            &:hover {
+                background-color: @highlight-button-hover;
+            }
         }
     }
 
     .spinner-up {
         i {
-            transform: rotate(45deg) translate(1px,-2px);
+            transform: rotate(45deg) translate(-1px,-1px);
         }
     }
 
     .spinner-down {
         i {
-            transform: rotate(-135deg) translate(1px,4px);
+            transform: rotate(-135deg) translate(2px,2px);
         }
     }
 }
\ No newline at end of file
diff --git a/apps/common/main/resources/less/window.less b/apps/common/main/resources/less/window.less
index a58e7bcc7..a257c51fc 100644
--- a/apps/common/main/resources/less/window.less
+++ b/apps/common/main/resources/less/window.less
@@ -83,7 +83,7 @@
                 transition: transform .3s;
 
                 &:hover {
-                    transform: rotate(180deg);
+                    transform: scale(1.1);
                     opacity: 1;
                 }
 
diff --git a/apps/documenteditor/main/app/view/ShapeSettings.js b/apps/documenteditor/main/app/view/ShapeSettings.js
index bcdcdd7b7..1df032510 100644
--- a/apps/documenteditor/main/app/view/ShapeSettings.js
+++ b/apps/documenteditor/main/app/view/ShapeSettings.js
@@ -1642,7 +1642,9 @@ define([
                         '<div class="input-group combobox combo-dataview-menu input-group-nr dropdown-toggle" tabindex="0" data-toggle="dropdown">',
                         '<div class="form-control text" style="width: 90px;">' + this.textSelectTexture + '</div>',
                         '<div style="display: table-cell;"></div>',
-                        '<button type="button" class="btn btn-default"><span class="caret img-commonctrl"></span></button>',
+                        '<button type="button" class="btn btn-default">',
+                            '<span class="caret"></span>',
+                        '</button>',
                         '</div>'
                     ].join(''))
                 });
diff --git a/apps/presentationeditor/main/app/view/ShapeSettings.js b/apps/presentationeditor/main/app/view/ShapeSettings.js
index 588415bc5..9a7270677 100644
--- a/apps/presentationeditor/main/app/view/ShapeSettings.js
+++ b/apps/presentationeditor/main/app/view/ShapeSettings.js
@@ -1518,7 +1518,9 @@ define([
                         '<div class="input-group combobox combo-dataview-menu input-group-nr dropdown-toggle" tabindex="0" data-toggle="dropdown">',
                             '<div class="form-control text" style="width: 90px;">' + this.textSelectTexture + '</div>',
                             '<div style="display: table-cell;"></div>',
-                            '<button type="button" class="btn btn-default"><span class="caret img-commonctrl"></span></button>',
+                            '<button type="button" class="btn btn-default">',
+                                '<span class="caret"></span>',
+                            '</button>',
                         '</div>'
                     ].join(''))
                 });
diff --git a/apps/presentationeditor/main/app/view/SlideSettings.js b/apps/presentationeditor/main/app/view/SlideSettings.js
index 695ee6d8c..4ac09ce5e 100644
--- a/apps/presentationeditor/main/app/view/SlideSettings.js
+++ b/apps/presentationeditor/main/app/view/SlideSettings.js
@@ -976,7 +976,9 @@ define([
                         '<div class="input-group combobox combo-dataview-menu input-group-nr dropdown-toggle" tabindex="0" data-toggle="dropdown">',
                         '<div class="form-control text" style="width: 90px;">' + this.textSelectTexture + '</div>',
                         '<div style="display: table-cell;"></div>',
-                        '<button type="button" class="btn btn-default"><span class="caret img-commonctrl"></span></button>',
+                        '<button type="button" class="btn btn-default">',
+                            '<span class="caret"></span>',
+                        '</button>',
                         '</div>'
                     ].join(''))
                 });
diff --git a/apps/presentationeditor/main/app/view/TextArtSettings.js b/apps/presentationeditor/main/app/view/TextArtSettings.js
index b48aba029..cc71d911c 100644
--- a/apps/presentationeditor/main/app/view/TextArtSettings.js
+++ b/apps/presentationeditor/main/app/view/TextArtSettings.js
@@ -1435,7 +1435,9 @@ define([
                         '<div class="input-group combobox combo-dataview-menu input-group-nr dropdown-toggle" tabindex="0" data-toggle="dropdown">',
                             '<div class="form-control text" style="width: 90px;">' + this.textSelectTexture + '</div>',
                             '<div style="display: table-cell;"></div>',
-                            '<button type="button" class="btn btn-default"><span class="caret img-commonctrl"></span></button>',
+                            '<button type="button" class="btn btn-default">',
+                                '<span class="caret"></span>',
+                            '</button>',
                         '</div>'
                     ].join(''))
                 });
diff --git a/apps/presentationeditor/main/resources/less/leftmenu.less b/apps/presentationeditor/main/resources/less/leftmenu.less
index 5e440103a..360f3c21d 100644
--- a/apps/presentationeditor/main/resources/less/leftmenu.less
+++ b/apps/presentationeditor/main/resources/less/leftmenu.less
@@ -161,7 +161,7 @@
     .panel-context {
         width: 100%;
         padding-left: 260px;
-        background-color: #fff;
+        background-color: @background-normal;
 
         .content-box {
             height: 100%;
diff --git a/apps/spreadsheeteditor/main/app/template/CellEditor.template b/apps/spreadsheeteditor/main/app/template/CellEditor.template
index 01bf97f19..bba8d7381 100644
--- a/apps/spreadsheeteditor/main/app/template/CellEditor.template
+++ b/apps/spreadsheeteditor/main/app/template/CellEditor.template
@@ -4,7 +4,7 @@
     <button id="ce-func-label" type="button" class="btn small btn-toolbar"><i class="icon toolbar__icon btn-function"></i></button>
 </div>
 <div class="ce-group-expand">
-    <button id="ce-btn-expand" type="button" class="btn"><span class="caret img-commonctrl">&nbsp;</span></button>
+    <button id="ce-btn-expand" type="button" class="btn"><span class="caret">&nbsp;</span></button>
 </div>
 <div class="ce-group-content">
     <textarea id="ce-cell-content" class="form-control" spellcheck="false" rows="1" cols="20"></textarea>
diff --git a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js
index 7a953d193..d30df3151 100644
--- a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js
+++ b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js
@@ -904,7 +904,9 @@ define([
                     '<span class="input-group combobox <%= cls %> combo-langs" id="<%= id %>" style="<%= style %>">',
                     '<input type="text" class="form-control" style="padding-left: 25px !important;">',
                     '<span class="icon input-icon lang-flag"></span>',
-                    '<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"><span class="caret img-commonctrl"></span></button>',
+                        '<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">',
+                            '<span class="caret" />',
+                        '</button>',
                         '<ul class="dropdown-menu <%= menuCls %>" style="<%= menuStyle %>" role="menu">',
                             '<% _.each(items, function(item) { %>',
                                 '<li id="<%= item.id %>" data-value="<%= item.value %>">',
diff --git a/apps/spreadsheeteditor/main/app/view/ShapeSettings.js b/apps/spreadsheeteditor/main/app/view/ShapeSettings.js
index 7f83ec623..6fb27fc46 100644
--- a/apps/spreadsheeteditor/main/app/view/ShapeSettings.js
+++ b/apps/spreadsheeteditor/main/app/view/ShapeSettings.js
@@ -1544,7 +1544,9 @@ define([
                         '<div class="input-group combobox combo-dataview-menu input-group-nr dropdown-toggle" tabindex="0" data-toggle="dropdown">',
                             '<div class="form-control text" style="width: 90px;">' + this.textSelectTexture + '</div>',
                             '<div style="display: table-cell;"></div>',
-                            '<button type="button" class="btn btn-default"><span class="caret img-commonctrl"></span></button>',
+                            '<button type="button" class="btn btn-default">',
+                                '<span class="caret" />',
+                            '</button>',
                         '</div>'
                     ].join(''))
                 });
diff --git a/apps/spreadsheeteditor/main/app/view/TextArtSettings.js b/apps/spreadsheeteditor/main/app/view/TextArtSettings.js
index 907394fb2..b0b4b315c 100644
--- a/apps/spreadsheeteditor/main/app/view/TextArtSettings.js
+++ b/apps/spreadsheeteditor/main/app/view/TextArtSettings.js
@@ -1440,7 +1440,9 @@ define([
                         '<div class="input-group combobox combo-dataview-menu input-group-nr dropdown-toggle" tabindex="0" data-toggle="dropdown">',
                             '<div class="form-control text" style="width: 90px;">' + this.textSelectTexture + '</div>',
                             '<div style="display: table-cell;"></div>',
-                            '<button type="button" class="btn btn-default"><span class="caret img-commonctrl"></span></button>',
+                            '<button type="button" class="btn btn-default">',
+                                '<span class="caret" />',
+                            '</button>',
                         '</div>'
                     ].join(''))
                 });
diff --git a/apps/spreadsheeteditor/main/resources/less/celleditor.less b/apps/spreadsheeteditor/main/resources/less/celleditor.less
index a8b39714e..a873a6e01 100644
--- a/apps/spreadsheeteditor/main/resources/less/celleditor.less
+++ b/apps/spreadsheeteditor/main/resources/less/celleditor.less
@@ -2,7 +2,7 @@
     border-bottom: solid 1px @border-toolbar;
     border-left: solid 1px @border-toolbar;
     min-height: 20px;
-    background-color: #fff;
+    background-color: @background-normal;
 
     .ce-group-name {
         float: left;
@@ -34,7 +34,7 @@
             background-color: @background-toolbar;
 
             button {
-                background-color: #fff;
+                background-color: @background-normal;
                 height: 19px;
 
                 &.disabled {
@@ -123,7 +123,7 @@
 
     &.btn-collapse {
         .caret {
-            transform: rotate(180deg);
+            transform: rotate(45deg);
         }
     }
 }
diff --git a/apps/spreadsheeteditor/main/resources/less/leftmenu.less b/apps/spreadsheeteditor/main/resources/less/leftmenu.less
index 0e00ca34f..b578b73b9 100644
--- a/apps/spreadsheeteditor/main/resources/less/leftmenu.less
+++ b/apps/spreadsheeteditor/main/resources/less/leftmenu.less
@@ -151,7 +151,7 @@
     .panel-context {
         width: 100%;
         padding-left: 260px;
-        background-color: #fff;
+        background-color: @background-normal;
 
         .content-box {
             height: 100%;
diff --git a/apps/spreadsheeteditor/main/resources/less/statusbar.less b/apps/spreadsheeteditor/main/resources/less/statusbar.less
index e9e41fba4..691235e3b 100644
--- a/apps/spreadsheeteditor/main/resources/less/statusbar.less
+++ b/apps/spreadsheeteditor/main/resources/less/statusbar.less
@@ -193,8 +193,8 @@
 
                 &.active {
                     > span {
-                        border-bottom-color: @body-bg;
-                        background-color: @body-bg;
+                        border-bottom-color: @background-toolbar;
+                        background-color: @background-toolbar;
                         outline: none;
 
                         box-shadow: 0px 4px 0 #49795d inset;
@@ -206,9 +206,10 @@
 
                 &.selected {
                     > span {
-                        border-bottom-color: @body-bg;
-                        background-color: @body-bg;
+                        border-bottom-color: @highlight-header-button-hover;
+                        background-color: @highlight-header-button-hover;
                         box-shadow: 0px 4px 0 #49795d inset;
+                        color: @text-normal-pressed;
                     }
                 }