diff --git a/apps/common/main/resources/less/combobox.less b/apps/common/main/resources/less/combobox.less
index 6dcbe6fa9..825aad573 100644
--- a/apps/common/main/resources/less/combobox.less
+++ b/apps/common/main/resources/less/combobox.less
@@ -48,11 +48,9 @@
         float: none;
     }
 
-    .btn,
-    .btn:hover,
-    .btn:focus {
+    .btn {
         border-left: 0;
-        border-color: @border-control-focus;
+        border-color: @border-regular-control;
         background-color: transparent;
         margin-left: -1px;
         position: absolute;
@@ -66,6 +64,11 @@
         border-color: @border-regular-control;
     }
 
+    .btn-default.disabled:hover {
+        background-color: transparent;
+        border-color: @border-regular-control;
+    }
+
     &.input-group-nr.open:not(.no-highlighted) {
         & > .form-control,
         & > .btn {
diff --git a/apps/documenteditor/main/resources/less/rightmenu.less b/apps/documenteditor/main/resources/less/rightmenu.less
index 5953bc833..a5964c32a 100644
--- a/apps/documenteditor/main/resources/less/rightmenu.less
+++ b/apps/documenteditor/main/resources/less/rightmenu.less
@@ -183,10 +183,10 @@ button:active:not(.disabled) .btn-change-shape    {background-position: -56px  -
 .combo-dataview-menu {
     .form-control {
         cursor: pointer;
-        background-color: white;
+        background-color: @background-normal;
 
         &.text {
-            background: white;
+            background: @background-normal;
             vertical-align: bottom;
         }
     }
diff --git a/apps/spreadsheeteditor/main/resources/less/rightmenu.less b/apps/spreadsheeteditor/main/resources/less/rightmenu.less
index f091d0a1b..6bbd70cdd 100644
--- a/apps/spreadsheeteditor/main/resources/less/rightmenu.less
+++ b/apps/spreadsheeteditor/main/resources/less/rightmenu.less
@@ -111,10 +111,10 @@ button:active:not(.disabled) .btn-change-shape    {background-position: -56px  -
 .combo-dataview-menu {
     .form-control {
         cursor: pointer;
-        background-color: white;
+        background-color: @background-normal;
 
         &.text {
-            background: white;
+            background: @background-normal;
             vertical-align: bottom;
         }
     }