diff --git a/apps/common/main/resources/less/buttons.less b/apps/common/main/resources/less/buttons.less
index bc7a7acdb..77f7e9f2e 100644
--- a/apps/common/main/resources/less/buttons.less
+++ b/apps/common/main/resources/less/buttons.less
@@ -179,7 +179,7 @@
     &.x-huge {
         @icon-size: 28px;
 
-        min-width: 45px;
+        min-width: 35px;
         height: @x-huge-btn-height;
 
         img {
diff --git a/apps/common/main/resources/less/toolbar.less b/apps/common/main/resources/less/toolbar.less
index a8f7639d5..cd60d3b6e 100644
--- a/apps/common/main/resources/less/toolbar.less
+++ b/apps/common/main/resources/less/toolbar.less
@@ -199,11 +199,11 @@
         display: table-cell;
         vertical-align: middle;
         white-space: nowrap;
-        padding-left: 12px;
+        padding-left: 6px;
         font-size: 0;
 
         &:last-child {
-            padding-right: 12px;
+            padding-right: 6px;
         }
     }
 
@@ -217,7 +217,7 @@
     }
 
     .separator {
-        margin-left: 12px;
+        margin-left: 6px;
 
         &.close {
             margin-left: 5px;
diff --git a/apps/documenteditor/main/app/template/Toolbar.template b/apps/documenteditor/main/app/template/Toolbar.template
index ceb4d53d4..3b250232a 100644
--- a/apps/documenteditor/main/app/template/Toolbar.template
+++ b/apps/documenteditor/main/app/template/Toolbar.template
@@ -30,7 +30,7 @@
         <section class="box-panels">
             <section class="panel" data-tab="home">
                 <div class="group">
-                    <div class="elset" style="width:260px;">
+                    <div class="elset" style="width:208px;">
                         <span class="btn-slot" id="slot-field-fontname"></span>
                         <span class="btn-slot" id="slot-field-fontsize"></span>
                         <span class="btn-slot" id="slot-btn-incfont"></span>
@@ -45,10 +45,9 @@
                         <span class="btn-slot" id="slot-btn-subscript"></span>
                         <span class="btn-slot split" id="slot-btn-highlight"></span>
                         <span class="btn-slot split" id="slot-btn-fontcolor"></span>
-                        <span class="btn-slot split" id="slot-btn-paracolor"></span>
                     </div>
                 </div>
-                <div class="separator long" style="margin-left: 5px;"></div>
+                <div class="separator long"></div>
                 <div class="group">
                     <div class="elset">
                         <span class="btn-slot split" id="slot-btn-markers"></span>
@@ -64,9 +63,10 @@
                         <span class="btn-slot split" id="slot-btn-align-right"></span>
                         <span class="btn-slot split" id="slot-btn-align-just"></span>
                         <span class="btn-slot split" id="slot-btn-hidenchars"></span>
+                        <span class="btn-slot split" id="slot-btn-paracolor"></span>
                     </div>
                 </div>
-                <div class="separator long" style="margin-left: 5px;"></div>
+                <div class="separator long"></div>
                 <div class="group">
                     <div class="elset">
                         <span class="btn-slot split" id="slot-btn-clearstyle"></span>
diff --git a/apps/documenteditor/main/resources/less/toolbar.less b/apps/documenteditor/main/resources/less/toolbar.less
index a79310a9a..1acca729c 100644
--- a/apps/documenteditor/main/resources/less/toolbar.less
+++ b/apps/documenteditor/main/resources/less/toolbar.less
@@ -13,7 +13,7 @@
 
     .font-attr {
         > .btn-slot:not(:last-child):not(.split) {
-            margin-right: 6px;
+            margin-right: 4px;
         }
 
         > .btn-slot:not(:last-child).split {
@@ -217,7 +217,7 @@
 
 #slot-field-fontname {
     float: left;
-    width: 158px;
+    width: 117px;
 }
 
 #slot-field-fontsize {
diff --git a/apps/presentationeditor/main/app/template/Toolbar.template b/apps/presentationeditor/main/app/template/Toolbar.template
index 40c0af831..571560c3b 100644
--- a/apps/presentationeditor/main/app/template/Toolbar.template
+++ b/apps/presentationeditor/main/app/template/Toolbar.template
@@ -43,9 +43,9 @@
                 </div>
                 <div class="separator long"></div>
                 <div class="group">
-                    <div class="elset" style="width:207px;">
-                        <span class="btn-slot" style="float: left; width: 115px;" id="slot-field-fontname"></span>
-                        <span class="btn-slot" style="float: left; width: 45px; margin-left: 2px;" id="slot-field-fontsize"></span>
+                    <div class="elset" style="width:175px;">
+                        <span class="btn-slot" style="float: left; width: 89px;" id="slot-field-fontname"></span>
+                        <span class="btn-slot" style="float: left; width: 40px; margin-left: 2px;" id="slot-field-fontsize"></span>
                         <span class="btn-slot" id="slot-btn-incfont"></span>
                         <span class="btn-slot" id="slot-btn-decfont"></span>
                     </div>
@@ -65,7 +65,7 @@
                         <span class="btn-slot split" id="slot-btn-markers"></span>
                         <span class="btn-slot split" id="slot-btn-numbering"></span>
                         <span class="btn-slot split" id="slot-btn-decoffset"></span>
-                        <span class="btn-slot split" id="slot-btn-incoffset"></span>
+                        <span class="btn-slot" id="slot-btn-incoffset"></span>
                     </div>
                     <div class="elset">
                         <span class="btn-slot split" id="slot-btn-halign"></span>
@@ -73,7 +73,7 @@
                         <span class="btn-slot split" id="slot-btn-linespace"></span>
                     </div>
                 </div>
-                <div class="separator long close"></div>
+                <div class="separator long"></div>
                 <div class="group">
                     <span class="btn-slot text x-huge slot-instext"></span>
                     <span class="btn-slot text x-huge slot-insertimg"></span>
diff --git a/apps/presentationeditor/main/resources/less/toolbar.less b/apps/presentationeditor/main/resources/less/toolbar.less
index 73d9568e9..81cfd0544 100644
--- a/apps/presentationeditor/main/resources/less/toolbar.less
+++ b/apps/presentationeditor/main/resources/less/toolbar.less
@@ -12,7 +12,7 @@
 
     .font-attr {
         > .btn-slot:not(:last-child):not(.split) {
-            margin-right: 8px;
+            margin-right: 4px;
         }
     }
 }
diff --git a/apps/spreadsheeteditor/main/app/template/ToolbarAnother.template b/apps/spreadsheeteditor/main/app/template/ToolbarAnother.template
index ba6dea7e5..7bced25b7 100644
--- a/apps/spreadsheeteditor/main/app/template/ToolbarAnother.template
+++ b/apps/spreadsheeteditor/main/app/template/ToolbarAnother.template
@@ -18,12 +18,12 @@
                     <span class="btn-slot split" id="slot-btn-formula"></span>
                 </div>
             </div>
-            <div class="separator short" style="margin-left: 5px;"></div>
+            <div class="separator short"></div>
             <div class="group">
                 <div class="elset">
                     <span class="btn-slot split" id="slot-btn-digit-dec"></span>
                     <span class="btn-slot split" id="slot-btn-digit-inc"></span>
-                    <span class="btn-slot" id="slot-btn-format" style="width: 84px; margin-left: 10px; vertical-align: middle;"></span>
+                    <span class="btn-slot" id="slot-btn-format" style="width: 84px; vertical-align: middle;"></span>
                 </div>
             </div>
             <div class="separator short"></div>
diff --git a/apps/spreadsheeteditor/main/resources/less/toolbar.less b/apps/spreadsheeteditor/main/resources/less/toolbar.less
index c532ae550..751c71ac6 100644
--- a/apps/spreadsheeteditor/main/resources/less/toolbar.less
+++ b/apps/spreadsheeteditor/main/resources/less/toolbar.less
@@ -17,16 +17,16 @@
 
     .font-attr {
         > .btn-slot:not(:last-child):not(.split) {
-            margin-right: 6px;
+            margin-right: 2px;
         }
 
         > .btn-slot.split:not(:last-child) {
-            margin-right: 5px;
+            margin-right: 2px;
         }
     }
 
     .font-attr-top {
-        width: 243px;
+        width: 218px;
 
         > .btn-slot {
             float: left;
@@ -149,7 +149,7 @@
 }
 
 #slot-field-fontname {
-    width: 148px;
+    width: 127px;
 }
 
 #slot-field-fontsize {