diff --git a/apps/spreadsheeteditor/main/app/template/Toolbar.template b/apps/spreadsheeteditor/main/app/template/Toolbar.template
index 92ab3a430..057f851a0 100644
--- a/apps/spreadsheeteditor/main/app/template/Toolbar.template
+++ b/apps/spreadsheeteditor/main/app/template/Toolbar.template
@@ -46,19 +46,18 @@
         <section class="box-panels">
             <section class="panel" data-tab="home">
                 <div class="group">
-                    <div class="elset">
-                        <span class="btn-slot" style="float: left; width: 90px;" id="slot-field-fontname"></span>
-                        <span class="btn-slot" style="float: left; width: 45px; margin-left: 2px;" id="slot-field-fontsize"></span>
-                        <span class="btn-slot border" id="slot-btn-incfont" style="margin-left: 2px;"></span>
-                        <span class="btn-slot border" id="slot-btn-decfont" style="margin-left: 2px;"></span>
+                    <div class="elset font-attr-top">
+                        <span class="btn-slot" id="slot-field-fontname"></span>
+                        <span class="btn-slot" id="slot-field-fontsize"></span>
+                        <span class="btn-slot border" id="slot-btn-incfont"></span>
+                        <span class="btn-slot border" id="slot-btn-decfont"></span>
                     </div>
-                    <div class="elset">
-                        <span class="btn-slot split" id="slot-btn-bold"></span>
-                        <span class="btn-slot split" id="slot-btn-italic"></span>
-                        <span class="btn-slot split" id="slot-btn-underline"></span>
+                    <div class="elset font-attr">
+                        <span class="btn-slot" id="slot-btn-bold"></span>
+                        <span class="btn-slot" id="slot-btn-italic"></span>
+                        <span class="btn-slot" id="slot-btn-underline"></span>
                         <span class="btn-slot split" id="slot-btn-fontcolor"></span>
                         <span class="btn-slot split" id="slot-btn-fillparag"></span>
-                        <div class="separator short" style="margin: 0 6px;"></div>
                         <span class="btn-slot split" id="slot-btn-borders"></span>
                     </div>
                 </div>
@@ -69,23 +68,23 @@
                         <span class="btn-slot split" id="slot-btn-middle"></span>
                         <span class="btn-slot split" id="slot-btn-bottom"></span>
                         <span class="btn-slot split" id="slot-btn-wrap"></span>
-                        <span class="btn-slot" id="slot-btn-text-orient"></span>
+                        <span class="btn-slot split" id="slot-btn-text-orient"></span>
                     </div>
                     <div class="elset">
                         <span class="btn-slot split" id="slot-btn-align-left"></span>
                         <span class="btn-slot split" id="slot-btn-align-center"></span>
                         <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" id="slot-btn-merge"></span>
+                        <span class="btn-slot split" id="slot-btn-merge"></span>
                     </div>
                 </div>
                 <div class="separator long"></div>
                 <div class="group">
                     <div class="elset">
-                        <span class="btn-slot" id="slot-btn-formula"></span>
+                        <span class="btn-slot split" id="slot-btn-formula"></span>
                     </div>
                     <div class="elset">
-                        <span class="btn-slot" id="slot-btn-named-range"></span>
+                        <span class="btn-slot split" id="slot-btn-named-range"></span>
                     </div>
                 </div>
                 <div class="separator long"></div>
@@ -114,10 +113,10 @@
                 <div class="separator long"></div>
                 <div class="group">
                     <div class="elset">
-                        <span class="btn-slot" id="slot-btn-cell-ins"></span>
+                        <span class="btn-slot split" id="slot-btn-cell-ins"></span>
                     </div>
                     <div class="elset">
-                        <span class="btn-slot" id="slot-btn-cell-del"></span>
+                        <span class="btn-slot split" id="slot-btn-cell-del"></span>
                     </div>
                 </div>
                 <div class="separator long"></div>
diff --git a/apps/spreadsheeteditor/main/resources/less/toolbar.less b/apps/spreadsheeteditor/main/resources/less/toolbar.less
index 4d07d82ff..2971df45c 100644
--- a/apps/spreadsheeteditor/main/resources/less/toolbar.less
+++ b/apps/spreadsheeteditor/main/resources/less/toolbar.less
@@ -14,6 +14,29 @@
         display: table;
         width: 100%;
     }
+
+    .font-attr {
+        > .btn-slot:not(:last-child):not(.split) {
+            margin-right: 8px;
+        }
+
+        > .btn-slot.split:not(:last-child) {
+            margin-right: 5px;
+        }
+    }
+
+    .font-attr-top {
+        width: 186px;
+
+        > .btn-slot {
+            float: left;
+
+            &:not(:first-child) {
+                margin-left: 2px;
+            }
+        }
+
+    }
 }
 
 .toolbar-mask {
@@ -215,3 +238,11 @@
     background-color: @gray-light;
     border: 1px solid @gray;
 }
+
+#slot-field-fontname {
+    width: 91px;
+}
+
+#slot-field-fontsize {
+    width: 45px;
+}
\ No newline at end of file