diff --git a/apps/common/main/resources/less/buttons.less b/apps/common/main/resources/less/buttons.less
index a0e322bb4..56e2a683f 100644
--- a/apps/common/main/resources/less/buttons.less
+++ b/apps/common/main/resources/less/buttons.less
@@ -43,6 +43,7 @@
     &:focus {
         outline: 0;
         outline-offset: 0;
+        color: @text-normal;
     }
 
     &:hover {
@@ -557,7 +558,7 @@
         float: left;
         width: 100%;
         height: 100%;
-        border: 1px solid @border-control-focus;
+        border: 1px solid @border-color-shading;
         background-color: transparent;
     }
 
@@ -849,6 +850,7 @@
     &.primary {
         color: @text-inverse;
         background-color: @background-primary-dialog-button;
+        border: 0 none;
 
         &:hover:not(.disabled),
         &.hover:not(.disabled) {
diff --git a/apps/common/main/resources/less/colors-table.less b/apps/common/main/resources/less/colors-table.less
index b0e6fcccd..b4ed5365c 100644
--- a/apps/common/main/resources/less/colors-table.less
+++ b/apps/common/main/resources/less/colors-table.less
@@ -75,6 +75,8 @@
     //--button-small-active-icon-offset-x: 0;
     //--button-big-normal-icon-offset-x: 0;
     //--button-big-active-icon-offset-x: 0;
+    --button-header-normal-icon-offset-x: -20px;
+    --button-header-active-icon-offset-x: -20px;
 }
 
 // Background
@@ -132,3 +134,6 @@
 @button-small-active-icon-offset-x: var(--button-small-active-icon-offset-x,0);
 @button-big-normal-icon-offset-x: var(--button-big-normal-icon-offset-x, 0);
 @button-big-active-icon-offset-x: var(--button-big-active-icon-offset-x, 0);
+
+@button-header-normal-icon-offset-x: var(--button-header-normal-icon-offset-x, -20px);
+@button-header-active-icon-offset-x: var(--button-header-active-icon-offset-x, -20px);
diff --git a/apps/common/main/resources/less/common.less b/apps/common/main/resources/less/common.less
index 84a32dd79..8b1b288a6 100644
--- a/apps/common/main/resources/less/common.less
+++ b/apps/common/main/resources/less/common.less
@@ -43,3 +43,8 @@ label {
         color: @text-normal;
     }
 }
+
+textarea {
+    background-color: @background-normal;
+    color: @text-normal
+}
\ No newline at end of file
diff --git a/apps/common/main/resources/less/header.less b/apps/common/main/resources/less/header.less
index 61e0bde9a..807406c43 100644
--- a/apps/common/main/resources/less/header.less
+++ b/apps/common/main/resources/less/header.less
@@ -70,7 +70,7 @@
     .btn-header {
         &:hover {
             &:not(.disabled):not(.icon) {
-                background-color: rgba(255,255,255,0.2);
+                background-color: @highlight-header-button-hover;
             }
         }
 
@@ -103,18 +103,6 @@
         border: 0 none;
         cursor: default;
         line-height: 32px;
-
-        //&:hover:not(:disabled) {
-        //    border: 1px solid @gray-dark;
-        //    background-color: rgba(255,255,255,0.2);
-        //}
-        //
-        //&:focus:not(:active) {
-        //    border: 1px solid @gray-dark;
-        //    cursor: text;
-        //    background-color: white;
-        //    color: @gray-deep;
-        //}
     }
 
     #rib-save-status {
@@ -191,7 +179,7 @@
         padding: 0;
 
         &.icon--inverse {
-            background-position-x: -20px;
+            background-position-x: @button-header-normal-icon-offset-x;
         }
     }
 
@@ -300,7 +288,17 @@
         position: relative;
 
         &.icon--inverse {
-            background-position-x: -20px;
+            background-position-x: @button-header-normal-icon-offset-x;
+        }
+    }
+
+    .btn& {
+        &:active {
+            .icon.toolbar__icon {
+                &.icon--inverse {
+                    background-position-x: @button-header-active-icon-offset-x;
+                }
+            }
         }
     }
 
@@ -323,7 +321,7 @@
 
     &:hover {
         &:not(.disabled) {
-            background-color: rgba(255,255,255,0.2);
+            background-color: @highlight-header-button-hover;
         }
     }
 
diff --git a/apps/common/main/resources/less/toolbar.less b/apps/common/main/resources/less/toolbar.less
index 06b10238b..a01026d71 100644
--- a/apps/common/main/resources/less/toolbar.less
+++ b/apps/common/main/resources/less/toolbar.less
@@ -73,7 +73,7 @@
             height: 100%;
 
             &:hover {
-                background-color: rgba(255,255,255,0.2);
+                background-color: @highlight-header-button-hover;
             }
 
             &.active {
@@ -527,3 +527,37 @@
     }
 }
 
+.color-schemas-menu {
+    span {
+        &.colors {
+            display: inline-block;
+            margin-right: 15px;
+        }
+
+        &.color {
+            display: inline-block;
+            width: 12px;
+            height: 12px;
+            margin-right: 2px;
+            border: 1px solid @border-color-shading;
+            vertical-align: middle;
+        }
+
+        &.text {
+            vertical-align: middle;
+        }
+    }
+    &.checked {
+        &:before {
+            display: none !important;
+        }
+        &, &:hover, &:focus {
+            background-color: @highlight-button-pressed;
+            color: @dropdown-link-active-color;
+            span.color {
+                border-color: rgba(255,255,255,0.7);
+            }
+        }
+    }
+}
+
diff --git a/apps/documenteditor/main/resources/less/toolbar.less b/apps/documenteditor/main/resources/less/toolbar.less
index 3316cb45f..4cda0c2b0 100644
--- a/apps/documenteditor/main/resources/less/toolbar.less
+++ b/apps/documenteditor/main/resources/less/toolbar.less
@@ -77,39 +77,6 @@
     .loop(2);
 }
 
-.color-schemas-menu {
-    span {
-        &.colors {
-            display: inline-block;
-            margin-right: 15px;
-        }
-
-        &.color {
-            display: inline-block;
-            width: 12px;
-            height: 12px;
-            margin-right: 2px;
-            border: 1px solid rgba(0, 0, 0, 0.2);
-            vertical-align: middle;
-        }
-
-        &.text {
-            vertical-align: middle;
-        }
-    }
-    &.checked {
-        &:before {
-            display: none !important;
-        }
-        &, &:hover, &:focus {
-            background-color: @highlight-button-pressed;
-            color: @dropdown-link-active-color;
-            span.color {
-                border-color: rgba(255,255,255,0.7);
-            }
-        }
-    }
-}
 // page number position
 .menu-pageposition {
     .dataview {
diff --git a/apps/presentationeditor/main/resources/less/toolbar.less b/apps/presentationeditor/main/resources/less/toolbar.less
index 5ff8e21e3..5e6f7c698 100644
--- a/apps/presentationeditor/main/resources/less/toolbar.less
+++ b/apps/presentationeditor/main/resources/less/toolbar.less
@@ -51,40 +51,6 @@
     height: 38px;
 }
 
-.color-schemas-menu {
-    span {
-        &.colors {
-            display: inline-block;
-            margin-right: 15px;
-        }
-
-        &.color {
-            display: inline-block;
-            width: 12px;
-            height: 12px;
-            margin-right: 2px;
-            border: 1px solid rgba(0, 0, 0, 0.2);
-            vertical-align: middle;
-        }
-
-        &.text {
-            vertical-align: middle;
-        }
-    }
-    &.checked {
-        &:before {
-            display: none !important;
-        }
-        &, &:hover, &:focus {
-            background-color: @highlight-button-pressed;
-            color: @dropdown-link-active-color;
-            span.color {
-                border-color: rgba(255,255,255,0.7);
-            }
-        }
-    }
-}
-
 // menu zoom
 .menu-zoom {
     line-height: @line-height-base;
diff --git a/apps/spreadsheeteditor/main/resources/less/toolbar.less b/apps/spreadsheeteditor/main/resources/less/toolbar.less
index 48f3e06a5..764207d75 100644
--- a/apps/spreadsheeteditor/main/resources/less/toolbar.less
+++ b/apps/spreadsheeteditor/main/resources/less/toolbar.less
@@ -39,40 +39,6 @@
     }
 }
 
-.color-schemas-menu {
-    span {
-        &.colors {
-            display: inline-block;
-            margin-right: 15px;
-        }
-
-        &.color {
-            display: inline-block;
-            width: 12px;
-            height: 12px;
-            margin-right: 2px;
-            border: 1px solid rgba(0, 0, 0, 0.2);
-            vertical-align: middle;
-        }
-
-        &.text {
-            vertical-align: middle;
-        }
-    }
-    &.checked {
-        &:before {
-            display: none !important;
-        }
-        &, &:hover, &:focus {
-            background-color: @highlight-button-pressed;
-            color: @dropdown-link-active-color;
-            span.color {
-                border-color: rgba(255,255,255,0.7);
-            }
-        }
-    }
-}
-
 // menu zoom
 .menu-zoom {
     line-height: @line-height-base;