diff --git a/apps/common/main/resources/less/buttons.less b/apps/common/main/resources/less/buttons.less
index f7784fa34..497fa2b48 100644
--- a/apps/common/main/resources/less/buttons.less
+++ b/apps/common/main/resources/less/buttons.less
@@ -739,7 +739,7 @@
     &.active:not(.disabled) {
         background-color: @highlight-button-pressed !important;
         border-color: @highlight-button-pressed;
-        color: white;
+        color: @text-normal-pressed;
     }
 
     &[disabled],
diff --git a/apps/common/main/resources/less/common.less b/apps/common/main/resources/less/common.less
index 185621f18..9df4541fa 100644
--- a/apps/common/main/resources/less/common.less
+++ b/apps/common/main/resources/less/common.less
@@ -60,14 +60,19 @@ textarea {
     background-position: 0 0;
 
     button.over & {
-        background-position: -28px 0;
+        //background-position: -28px 0;
     }
 
     .btn-group.open &,
         button.active:not(.disabled) &,
         button:active:not(.disabled) &
     {
-        background-position: -56px 0;
+        //background-position: -56px 0;
+    }
+
+    // TODO: not good, must be controled by variable
+    .theme-dark & {
+        background-position-x: -56px;
     }
 }
 
@@ -75,13 +80,18 @@ textarea {
     background-position: 0 -16px;
 
     button.over & {
-        background-position: -28px -16px;
+        //background-position: -28px -16px;
     }
 
     .btn-group.open &,
         button.active:not(.disabled) &,
         button:active:not(.disabled) &
     {
-        background-position: -56px -16px;
+        //background-position: -56px -16px;
+    }
+
+    // TODO: not good, must be controled by variable
+    .theme-dark & {
+        background-position-x: -56px;
     }
 }
diff --git a/apps/common/main/resources/less/dataview.less b/apps/common/main/resources/less/dataview.less
index f1df11fd7..6bed23082 100644
--- a/apps/common/main/resources/less/dataview.less
+++ b/apps/common/main/resources/less/dataview.less
@@ -26,7 +26,7 @@
 
         &:hover,
         &.selected {
-            .box-shadow(0 0 0 2px @highlight-button-pressed);
+            .box-shadow(0 0 0 2px @border-preview-select);
         }
     }
 
diff --git a/apps/documenteditor/main/resources/less/advanced-settings.less b/apps/documenteditor/main/resources/less/advanced-settings.less
index a15144438..4ffa802cd 100644
--- a/apps/documenteditor/main/resources/less/advanced-settings.less
+++ b/apps/documenteditor/main/resources/less/advanced-settings.less
@@ -40,7 +40,12 @@
 .button-normal-icon(btn-drop-none,        7, @x-huge-icon-size, @button-huge-normal-icon-offset-x);
 .button-normal-icon(btn-drop-text,        8, @x-huge-icon-size, @button-huge-normal-icon-offset-x);
 .button-normal-icon(btn-drop-margin,      9, @x-huge-icon-size, @button-huge-normal-icon-offset-x);
-.button-otherstates-icon(icon-advanced-wrap, @x-huge-icon-size);
+//.button-otherstates-icon(icon-advanced-wrap, @x-huge-icon-size);
+.icon-advanced-wrap {
+    .theme-dark & {
+        background-position-x: -45px;
+    }
+}
 
 .combo-arrow-style {
     .form-control {
diff --git a/apps/spreadsheeteditor/main/resources/less/toolbar.less b/apps/spreadsheeteditor/main/resources/less/toolbar.less
index fb1d4fc4c..3be7e8d52 100644
--- a/apps/spreadsheeteditor/main/resources/less/toolbar.less
+++ b/apps/spreadsheeteditor/main/resources/less/toolbar.less
@@ -136,4 +136,10 @@
 #slot-field-zoom {
     float: left;
     min-width: 46px;
+}
+
+.combo-styles {
+    .view, .dropdown-menu {
+        background-color: @canvas-content-background;
+    }
 }
\ No newline at end of file