diff --git a/apps/common/main/resources/less/buttons.less b/apps/common/main/resources/less/buttons.less
index cc30c8b41..59317d9bc 100644
--- a/apps/common/main/resources/less/buttons.less
+++ b/apps/common/main/resources/less/buttons.less
@@ -303,7 +303,7 @@
 
     &:active:not(.disabled),
     &.active:not(.disabled) {
-        color: lighten(@gray-lighter, 10%);
+        color: @text-normal;
         background-color: @primary;
     }
 
@@ -432,7 +432,7 @@
 
     &.open {
         > .btn-toolbar {
-                //color: lighten(@gray-lighter, 10%);
+                //color: @text-normal;
 
                 // Show no shadow for `.btn-link` since it has no other button styles.
                 &.btn-link {
diff --git a/apps/common/main/resources/less/layout.less b/apps/common/main/resources/less/layout.less
index 6c644723f..e9e88b51c 100644
--- a/apps/common/main/resources/less/layout.less
+++ b/apps/common/main/resources/less/layout.less
@@ -17,7 +17,7 @@
 
     .layout-resizer {
         z-index: @zindex-dropdown - 10;
-        background: @gray-light;
+        background: @background-toolbar;
         border: 0 none;
 
         &.move {
diff --git a/apps/common/main/resources/less/loadmask.less b/apps/common/main/resources/less/loadmask.less
index efcdeb750..9f4eda252 100644
--- a/apps/common/main/resources/less/loadmask.less
+++ b/apps/common/main/resources/less/loadmask.less
@@ -23,7 +23,7 @@
     border: none;
     background-image: none;
     background-color: fade(@black, 90%);
-    color: @gray-light;
+    color: @background-toolbar;
     .border-radius(@border-radius-large);
 
     left: 50%;
diff --git a/apps/common/main/resources/less/plugins.less b/apps/common/main/resources/less/plugins.less
index c33d56b50..01fc0515f 100644
--- a/apps/common/main/resources/less/plugins.less
+++ b/apps/common/main/resources/less/plugins.less
@@ -118,7 +118,7 @@
     width: 100%;
     height: 100%;
     opacity: 0.4;
-    background-color: @gray-light;
+    background-color: @background-toolbar;
     z-index: @zindex-tooltip + 1;
 }
 
diff --git a/apps/common/main/resources/less/scroller.less b/apps/common/main/resources/less/scroller.less
index dbd64c7e7..7b9b9b801 100644
--- a/apps/common/main/resources/less/scroller.less
+++ b/apps/common/main/resources/less/scroller.less
@@ -11,13 +11,13 @@
         }
 
         .ps-scrollbar-x {
-            background-color: @gray-light;
+            background-color: @background-toolbar;
 
             &.always-visible-x {
                 bottom: 0px;
                 height: 9px;
 
-                background-color: @gray-light;
+                background-color: @background-toolbar;
                 background-image: data-uri('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA0AAAAOCAYAAAD0f5bSAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAuSURBVChTY6AfOH/+/H9SaSYQg1RAlqZhCT5+/AgOSlJoOgY50DqSNZJhEwMDACkvNZLpune5AAAAAElFTkSuQmCC');
                 background-repeat: no-repeat;
 
@@ -72,13 +72,13 @@
         }
 
         .ps-scrollbar-y {
-            background-color: @gray-light;
+            background-color: @background-toolbar;
 
             &.always-visible-y {
                 right: 0px;
                 width: 9px;
 
-                background-color: @gray-light;
+                background-color: @background-toolbar;
                 .background-ximage('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAANCAQAAAAz1Zf0AAAAIUlEQVR42mNgAILz/0GQAQo+/gdBBqLAqE5ydH5k+sgEANHgUH2JtDRHAAAAAElFTkSuQmCC',
                         'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABwAAAAaAgMAAADZOtQaAAAACVBMVEUAAADPz8/x8fFVrc9qAAAAAXRSTlMAQObYZgAAABZJREFUeNpjYAgNYOBaxcDEgAsMLXkA/sUJfm1m4l8AAAAASUVORK5CYII=', 14px);
 
diff --git a/apps/common/main/resources/less/toolbar.less b/apps/common/main/resources/less/toolbar.less
index 2436441d5..ec514cf02 100644
--- a/apps/common/main/resources/less/toolbar.less
+++ b/apps/common/main/resources/less/toolbar.less
@@ -78,7 +78,7 @@
             }
 
             &.active {
-                background-color: @gray-light;
+                background-color: @background-toolbar;
             }
 
 
@@ -191,7 +191,7 @@
         /**/
     }
 
-    background-color: @gray-light;
+    background-color: @background-toolbar;
     .box-inner-shadow(0 -1px 0 @border-toolbar);
 
     .group {
@@ -264,7 +264,7 @@
         right: 0;
         bottom: 0;
         opacity: 0;
-        background-color: @gray-light;
+        background-color: @background-toolbar;
         /* z-index: @zindex-tooltip + 1; */
     }
 
@@ -368,11 +368,11 @@
 
         .tabs .scroll {
             &.left {
-                box-shadow: 5px 0 20px 5px @gray-light;
+                box-shadow: 5px 0 20px 5px @background-toolbar;
             }
 
             &.right {
-                box-shadow: -5px 0 20px 5px @gray-light;
+                box-shadow: -5px 0 20px 5px @background-toolbar;
             }
 
             &:after {
diff --git a/apps/common/main/resources/less/variables.less b/apps/common/main/resources/less/variables.less
index 31d1076cf..6135fada6 100644
--- a/apps/common/main/resources/less/variables.less
+++ b/apps/common/main/resources/less/variables.less
@@ -17,9 +17,9 @@
 @gray-darker:           #848484; //rgb(132, 132, 132)
 //@gray-dark:             #cbcbcb; //rgb(203, 203, 203)
 //@gray:                  #cfcfcf; //rgb(207, 207, 207)
-@gray-light:            #f1f1f1; //rgb(241, 241, 241)
-@gray-lighter:          #ededed; //rgb(237, 237, 237)
 @gray-soft:             #adadad; //rgb(173, 173, 173)
+//@gray-light:            #f1f1f1; //rgb(241, 241, 241)
+//@gray-lighter:          #ededed; //rgb(237, 237, 237)
 
 @primary:               #7d858c; //rgb(125, 133, 140)
 @primary-hover:         #666d73; //rgb(102, 109, 115)
@@ -162,7 +162,7 @@
 @btn-info-bg:                    @brand-info;
 @btn-info-border:                darken(@btn-info-bg, 5%);
 
-@btn-link-disabled-color:        @gray-light;
+@btn-link-disabled-color:        #f1f1f1; // @gray-light;
 
 // Allows for customizing button radius independently from global border radius
 @btn-border-radius-base:         @border-radius-base;
@@ -173,7 +173,7 @@
 // -------------------------
 
 @input-bg:                       #fff;
-@input-bg-disabled:              @gray-lighter;
+@input-bg-disabled:              #ededed; // @gray-lighter;
 
 @input-color:                    #000;
 @input-border:                   #cfcfcf; // @gray;
@@ -332,12 +332,12 @@
 // Inverted navbar
 //
 // Reset inverted navbar basics
-@navbar-inverse-color:                      @gray-light;
+@navbar-inverse-color:                      #f1f1f1; // @gray-light;
 @navbar-inverse-bg:                         #222;
 @navbar-inverse-border:                     darken(@navbar-inverse-bg, 10%);
 
 // Inverted navbar links
-@navbar-inverse-link-color:                 @gray-light;
+@navbar-inverse-link-color:                 #f1f1f1; // @gray-light;
 @navbar-inverse-link-hover-color:           #fff;
 @navbar-inverse-link-hover-bg:              transparent;
 @navbar-inverse-link-active-color:          @navbar-inverse-link-hover-color;
@@ -360,17 +360,17 @@
 // -------------------------
 
 @nav-link-padding:                          10px 15px;
-@nav-link-hover-bg:                         @gray-lighter;
+@nav-link-hover-bg:                         #ededed; // @gray-lighter;
 
-@nav-disabled-link-color:                   @gray-light;
-@nav-disabled-link-hover-color:             @gray-light;
+@nav-disabled-link-color:                   #f1f1f1; // @gray-light;
+@nav-disabled-link-hover-color:             #f1f1f1; // @gray-light;
 
 @nav-open-link-hover-color:                 #fff;
 
 // Tabs
 @nav-tabs-border-color:                     #ddd;
 
-@nav-tabs-link-hover-border-color:          @gray-lighter;
+@nav-tabs-link-hover-border-color:          #ededed; // @gray-lighter;
 
 @nav-tabs-active-link-hover-bg:             @body-bg;
 @nav-tabs-active-link-hover-color:          #cfcfcf; // @gray;
@@ -392,14 +392,14 @@
 @pagination-border:                    #ddd;
 
 @pagination-hover-color:               @link-hover-color;
-@pagination-hover-bg:                  @gray-lighter;
+@pagination-hover-bg:                  #ededed; // @gray-lighter;
 @pagination-hover-border:              #ddd;
 
 @pagination-active-bg:                 @brand-primary;
 @pagination-active-color:              #fff;
 @pagination-active-border:             @brand-primary;
 
-@pagination-disabled-color:            @gray-light;
+@pagination-disabled-color:            #f1f1f1; // @gray-light;
 @pagination-disabled-bg:               #fff;
 @pagination-disabled-border:           #ddd;
 
@@ -414,7 +414,7 @@
 @pager-active-bg:                      @pagination-active-bg;
 @pager-active-color:                   @pagination-active-color;
 
-@pager-disabled-color:                 @gray-light;
+@pager-disabled-color:                 #f1f1f1; // @gray-light;
 
 
 // Jumbotron
@@ -422,7 +422,7 @@
 
 @jumbotron-padding:              30px;
 @jumbotron-color:                inherit;
-@jumbotron-bg:                   @gray-lighter;
+@jumbotron-bg:                   #ededed; // @gray-lighter;
 @jumbotron-heading-color:        inherit;
 @jumbotron-font-size:            ceil(@font-size-base * 1.5);
 @jumbotron-heading-font-size:    ceil((@font-size-base * 4.5));
@@ -478,7 +478,7 @@
 // Labels
 // -------------------------
 
-@label-default-bg:            @gray-light;
+@label-default-bg:            #f1f1f1; // @gray-light;
 @label-primary-bg:            @brand-primary;
 @label-success-bg:            @brand-success;
 @label-info-bg:               @brand-info;
@@ -557,8 +557,8 @@
 @list-group-active-border:    @list-group-active-bg;
 @list-group-active-text-color:  lighten(@list-group-active-bg, 40%);
 
-@list-group-disabled-color:      @gray-light;
-@list-group-disabled-bg:         @gray-lighter;
+@list-group-disabled-color:      #f1f1f1; // @gray-light;
+@list-group-disabled-bg:         #ededed; // @gray-lighter;
 @list-group-disabled-text-color: @list-group-disabled-color;
 
 @list-group-link-color:          #555;
@@ -621,7 +621,7 @@
 // -------------------------
 @badge-color:                 #fff;
 @badge-link-hover-color:      #fff;
-@badge-bg:                    @gray-light;
+@badge-bg:                    #f1f1f1; // @gray-light;
 
 @badge-active-color:          @link-color;
 @badge-active-bg:             #fff;
@@ -637,7 +637,7 @@
 @breadcrumb-padding-horizontal: 15px;
 @breadcrumb-bg:               #f5f5f5;
 @breadcrumb-color:            #ccc;
-@breadcrumb-active-color:     @gray-light;
+@breadcrumb-active-color:     #f1f1f1; // @gray-light;
 @breadcrumb-separator:        "/";
 
 
@@ -679,19 +679,19 @@
 
 // Type
 // ------------------------
-@text-muted:                  @gray-light;
-@abbr-border-color:           @gray-light;
-@headings-small-color:        @gray-light;
-@blockquote-small-color:      @gray-light;
+@text-muted:                  #f1f1f1; // @gray-light;
+@abbr-border-color:           #f1f1f1; // @gray-light;
+@headings-small-color:        #f1f1f1; // @gray-light;
+@blockquote-small-color:      #f1f1f1; // @gray-light;
 @blockquote-font-size:        (@font-size-base * 1.25);
-@blockquote-border-color:     @gray-lighter;
-@page-header-border-color:    @gray-lighter;
+@blockquote-border-color:     #ededed; // @gray-lighter;
+@page-header-border-color:    #ededed; // @gray-lighter;
 
 // Miscellaneous
 // -------------------------
 
 // Hr border color
-@hr-border:                   @gray-lighter;
+@hr-border:                   #ededed; // @gray-lighter;
 
 // Horizontal forms & lists
 @component-offset-horizontal: 180px;
diff --git a/apps/common/main/resources/less/window.less b/apps/common/main/resources/less/window.less
index cf9a23c09..b455acbc9 100644
--- a/apps/common/main/resources/less/window.less
+++ b/apps/common/main/resources/less/window.less
@@ -54,7 +54,7 @@
         vertical-align: bottom;
         line-height: 26px;
 
-        background: @gray-lighter;
+        background: @background-toolbar;
         border-bottom: solid 1px @border-toolbar;
 
         cursor: move;
@@ -241,7 +241,7 @@
         width: 5px;
         height: 5px;
         z-index: 1;
-        background: @gray-lighter;
+        background: @background-toolbar;
         border: 1px none @border-toolbar;
 
         &.left {
diff --git a/apps/documenteditor/main/resources/less/filemenu.less b/apps/documenteditor/main/resources/less/filemenu.less
index 26b78ef09..0e0ab7ee7 100644
--- a/apps/documenteditor/main/resources/less/filemenu.less
+++ b/apps/documenteditor/main/resources/less/filemenu.less
@@ -8,7 +8,7 @@
     width: 260px;
     float: left;
     border-right: 1px solid @border-toolbar;
-    background-color: @gray-light;
+    background-color: @background-toolbar;
 
     li {
       list-style: none;
@@ -246,7 +246,7 @@
 
     &:hover,
     &.over {
-      background-color: @gray-light;
+      background-color: @background-toolbar;
     }
 
     .recent-icon {
@@ -299,7 +299,7 @@
       &:not(.header-name) {
         &:hover,
         &.over {
-          background-color: @gray-light;
+          background-color: @background-toolbar;
         }
 
         &.selected {
diff --git a/apps/documenteditor/main/resources/less/layout.less b/apps/documenteditor/main/resources/less/layout.less
index da3efab6c..9e294e0a1 100644
--- a/apps/documenteditor/main/resources/less/layout.less
+++ b/apps/documenteditor/main/resources/less/layout.less
@@ -39,7 +39,7 @@ label {
     top:0;
     right: 0;
     bottom: 0;
-    background-color: @gray-light;
+    background-color: @background-toolbar;
     overflow: hidden;
 }
 
diff --git a/apps/documenteditor/main/resources/less/leftmenu.less b/apps/documenteditor/main/resources/less/leftmenu.less
index 715ccdb6b..51ed180ff 100644
--- a/apps/documenteditor/main/resources/less/leftmenu.less
+++ b/apps/documenteditor/main/resources/less/leftmenu.less
@@ -47,7 +47,7 @@
     top: 0;
     position: absolute;
     z-index: @zindex-dropdown - 5;
-    background-color: @gray-light;
+    background-color: @background-toolbar;
     overflow: hidden;
 }
 
diff --git a/apps/documenteditor/main/resources/less/rightmenu.less b/apps/documenteditor/main/resources/less/rightmenu.less
index 0e021feeb..1080e9e26 100644
--- a/apps/documenteditor/main/resources/less/rightmenu.less
+++ b/apps/documenteditor/main/resources/less/rightmenu.less
@@ -3,7 +3,7 @@
     .tool-menu-btns {
         position: absolute;
         border-left: 1px solid @border-toolbar;
-        background-color: @gray-light;
+        background-color: @background-toolbar;
         right: 0;
         overflow: hidden;
     }
diff --git a/apps/documenteditor/main/resources/less/statusbar.less b/apps/documenteditor/main/resources/less/statusbar.less
index 33ac5899e..468a34854 100644
--- a/apps/documenteditor/main/resources/less/statusbar.less
+++ b/apps/documenteditor/main/resources/less/statusbar.less
@@ -2,7 +2,7 @@
     display: table;
     padding: 2px;
     height: 25px;
-    background-color: @gray-light;
+    background-color: @background-toolbar;
     .box-inner-shadow(0 1px 0 @border-toolbar);
 
     .status-label {
diff --git a/apps/documenteditor/main/resources/less/toolbar.less b/apps/documenteditor/main/resources/less/toolbar.less
index 308377e03..92c37c106 100644
--- a/apps/documenteditor/main/resources/less/toolbar.less
+++ b/apps/documenteditor/main/resources/less/toolbar.less
@@ -29,7 +29,7 @@
     right: 0;
     bottom: 0;
     opacity: 0;
-    background-color: @gray-light;
+    background-color: @background-toolbar;
     z-index: @zindex-tooltip + 1;
 }
 
@@ -238,6 +238,6 @@
 #special-paste-container {
     position: absolute;
     z-index: @zindex-dropdown - 20;
-    background-color: @gray-light;
+    background-color: @background-toolbar;
     border: 1px solid @border-regular-control;
 }
\ No newline at end of file
diff --git a/apps/presentationeditor/main/resources/less/document-preview.less b/apps/presentationeditor/main/resources/less/document-preview.less
index 8587861dc..80a151c48 100644
--- a/apps/presentationeditor/main/resources/less/document-preview.less
+++ b/apps/presentationeditor/main/resources/less/document-preview.less
@@ -3,7 +3,7 @@
 }
 .preview-controls {
     display: table;
-    background: @gray-light;
+    background: @background-toolbar;
     height: 35px;
     z-index: 10;
     opacity: 0.2;
diff --git a/apps/presentationeditor/main/resources/less/layout.less b/apps/presentationeditor/main/resources/less/layout.less
index 34ed35b70..ad91dad2c 100644
--- a/apps/presentationeditor/main/resources/less/layout.less
+++ b/apps/presentationeditor/main/resources/less/layout.less
@@ -50,7 +50,7 @@ label {
     top:0;
     right: 0;
     bottom: 0;
-    background-color: @gray-light;
+    background-color: @background-toolbar;
     overflow: hidden;
 }
 
diff --git a/apps/presentationeditor/main/resources/less/leftmenu.less b/apps/presentationeditor/main/resources/less/leftmenu.less
index e28e5d919..15e8e4bfa 100644
--- a/apps/presentationeditor/main/resources/less/leftmenu.less
+++ b/apps/presentationeditor/main/resources/less/leftmenu.less
@@ -57,7 +57,7 @@
     top: 0;
     position: absolute;
     z-index: @zindex-dropdown - 5;
-    background-color: @gray-light;
+    background-color: @background-toolbar;
     overflow: hidden;
 }
 
@@ -92,7 +92,7 @@
         width: 260px;
         float: left;
         border-right: 1px solid @border-toolbar;
-        background-color: @gray-light;
+        background-color: @background-toolbar;
 
         li {
             list-style: none;
@@ -313,7 +313,7 @@
 
                 &:hover,
                 &.over {
-                    background-color: @gray-light;
+                    background-color: @background-toolbar;
                 }
 
                 .recent-icon {
@@ -368,7 +368,7 @@
                     &:not(.header-name) {
                         &:hover,
                         &.over {
-                            background-color: @gray-light;
+                            background-color: @background-toolbar;
                         }
 
                         &.selected {
diff --git a/apps/presentationeditor/main/resources/less/rightmenu.less b/apps/presentationeditor/main/resources/less/rightmenu.less
index de34db69f..cde91a8ec 100644
--- a/apps/presentationeditor/main/resources/less/rightmenu.less
+++ b/apps/presentationeditor/main/resources/less/rightmenu.less
@@ -3,7 +3,7 @@
     .tool-menu-btns {
         position: absolute;
         border-left: 1px solid @border-toolbar;
-        background-color: @gray-light;
+        background-color: @background-toolbar;
         right: 0;
         overflow: hidden;
     }
diff --git a/apps/presentationeditor/main/resources/less/statusbar.less b/apps/presentationeditor/main/resources/less/statusbar.less
index 61b6f1319..b6c7431a1 100644
--- a/apps/presentationeditor/main/resources/less/statusbar.less
+++ b/apps/presentationeditor/main/resources/less/statusbar.less
@@ -2,7 +2,7 @@
     display: table;
     padding: 2px;
     height: 25px;
-    background-color: @gray-light;
+    background-color: @background-toolbar;
     .box-inner-shadow(0 1px 0 @border-toolbar);
 
     .status-label {
diff --git a/apps/presentationeditor/main/resources/less/toolbar.less b/apps/presentationeditor/main/resources/less/toolbar.less
index 52bf97be5..3c7f097db 100644
--- a/apps/presentationeditor/main/resources/less/toolbar.less
+++ b/apps/presentationeditor/main/resources/less/toolbar.less
@@ -131,7 +131,7 @@
 #special-paste-container {
     position: absolute;
     z-index: @zindex-dropdown - 20;
-    background-color: @gray-light;
+    background-color: @background-toolbar;
     border: 1px solid @border-regular-control;
 }
 
diff --git a/apps/spreadsheeteditor/main/resources/less/celleditor.less b/apps/spreadsheeteditor/main/resources/less/celleditor.less
index ba00cd590..29ea98fc9 100644
--- a/apps/spreadsheeteditor/main/resources/less/celleditor.less
+++ b/apps/spreadsheeteditor/main/resources/less/celleditor.less
@@ -8,7 +8,7 @@
         float: left;
         height: 20px;
         border-bottom: 1px solid @border-toolbar;
-        background-color: @gray-light;
+        background-color: @background-toolbar;
 
         #ce-cell-name {
             width: 100px;
@@ -31,7 +31,7 @@
             display: inline-block;
             position: absolute;
             left: 80px;
-            background-color: @gray-light;
+            background-color: @background-toolbar;
 
             button {
                 background-color: #fff;
diff --git a/apps/spreadsheeteditor/main/resources/less/layout.less b/apps/spreadsheeteditor/main/resources/less/layout.less
index 36ed624eb..c1d710dc5 100644
--- a/apps/spreadsheeteditor/main/resources/less/layout.less
+++ b/apps/spreadsheeteditor/main/resources/less/layout.less
@@ -33,7 +33,7 @@ label {
     top:0;
     right: 0;
     bottom: 0;
-    background-color: @gray-light;
+    background-color: @background-toolbar;
     overflow: hidden;
 }
 
diff --git a/apps/spreadsheeteditor/main/resources/less/leftmenu.less b/apps/spreadsheeteditor/main/resources/less/leftmenu.less
index 3a50ce72b..d0c99b6ab 100644
--- a/apps/spreadsheeteditor/main/resources/less/leftmenu.less
+++ b/apps/spreadsheeteditor/main/resources/less/leftmenu.less
@@ -57,7 +57,7 @@
     top: 0;
     position: absolute;
     z-index: @zindex-dropdown - 5;
-    background-color: @gray-light;
+    background-color: @background-toolbar;
     overflow: hidden;
 }
 
@@ -92,7 +92,7 @@
         width: 260px;
         float: left;
         border-right: 1px solid @border-toolbar;
-        background-color: @gray-light;
+        background-color: @background-toolbar;
 
         li {
             list-style: none;
@@ -232,7 +232,7 @@
 
                         &:hover,
                         &.over {
-                            background-color: @gray-light;
+                            background-color: @background-toolbar;
                         }
 
                         &.selected {
@@ -377,7 +377,7 @@
 
                 &:hover,
                 &.over {
-                    background-color: @gray-light;
+                    background-color: @background-toolbar;
                 }
 
                 .recent-icon {
@@ -432,7 +432,7 @@
                     &:not(.header-name) {
                         &:hover,
                         &.over {
-                            background-color: @gray-light;
+                            background-color: @background-toolbar;
                         }
 
                         &.selected {
diff --git a/apps/spreadsheeteditor/main/resources/less/rightmenu.less b/apps/spreadsheeteditor/main/resources/less/rightmenu.less
index 63b3a0fee..ef94b8a31 100644
--- a/apps/spreadsheeteditor/main/resources/less/rightmenu.less
+++ b/apps/spreadsheeteditor/main/resources/less/rightmenu.less
@@ -3,7 +3,7 @@
     .tool-menu-btns {
         position: absolute;
         border-left: 1px solid @border-toolbar;
-        background-color: @gray-light;
+        background-color: @background-toolbar;
         right: 0;
         overflow: hidden;
     }
diff --git a/apps/spreadsheeteditor/main/resources/less/statusbar.less b/apps/spreadsheeteditor/main/resources/less/statusbar.less
index d38a6b4b8..e31f755c0 100644
--- a/apps/spreadsheeteditor/main/resources/less/statusbar.less
+++ b/apps/spreadsheeteditor/main/resources/less/statusbar.less
@@ -1,7 +1,7 @@
 .statusbar {
     padding: 0 2px 0;
     height: 25px;
-    background-color: @gray-light;
+    background-color: @background-toolbar;
     .box-inner-shadow(0 1px 0 @border-toolbar);
     z-index: 500;
 
@@ -158,7 +158,7 @@
             display: flex;
 
             > li {
-                background-color: @gray-light;
+                background-color: @background-toolbar;
 
                 &:first-of-type {
                     span {
@@ -178,7 +178,7 @@
                     padding: 0 10px 0;
                     line-height: 24px;
                     margin-right: -1px;
-                    background-color: @gray-light;
+                    background-color: @background-toolbar;
                     outline: none;
                     border-left: 1px solid @border-toolbar;
                     border-right: 1px solid @border-toolbar;
@@ -398,7 +398,7 @@
     width: 36px;
     height: 100%;
     opacity: 0;
-    background-color: @gray-light;
+    background-color: @background-toolbar;
     z-index: @zindex-modal - 1;
 }
 
diff --git a/apps/spreadsheeteditor/main/resources/less/toolbar.less b/apps/spreadsheeteditor/main/resources/less/toolbar.less
index 5f8723de2..7a10b21b5 100644
--- a/apps/spreadsheeteditor/main/resources/less/toolbar.less
+++ b/apps/spreadsheeteditor/main/resources/less/toolbar.less
@@ -144,7 +144,7 @@
 #autocorrect-paste-container {
     position: absolute;
     z-index: @zindex-dropdown - 20;
-    background-color: @gray-light;
+    background-color: @background-toolbar;
     border: 1px solid @border-regular-control;
 }