diff --git a/apps/common/main/resources/less/common.less b/apps/common/main/resources/less/common.less
index c1673848eb..58bf4f4df7 100644
--- a/apps/common/main/resources/less/common.less
+++ b/apps/common/main/resources/less/common.less
@@ -228,6 +228,10 @@ label {
                 padding: 4px 16px 4px 12px;
                 cursor: pointer;
 
+                .rtl & {
+                    padding: 4px 12px 4px 16px;
+                }
+
                 &:hover:not(.disabled) {
                     background-color: @highlight-button-hover-ie;
                     background-color: @highlight-button-hover;
@@ -242,6 +246,10 @@ label {
                         color: @text-normal-pressed-ie;
                         color: @text-normal-pressed;
                     }
+
+                    .menu-item-icon {
+                        background-position-x: var(--button-small-active-icon-offset-x, 0);
+                    }
                 }
 
                 &.disabled > a {
@@ -253,12 +261,18 @@ label {
 
             &.devider {
                 .dropdown-menu .divider;
+                margin-top: 10px;
+                margin-bottom: 10px;
+            }
+
+            &.devider-small {
                 margin-top: 7px;
                 margin-bottom: 7px;
             }
 
             &.devider-last {
                 margin-top: auto;
+                margin-bottom: -4px;
             }
 
             .menu-item-icon {
@@ -266,6 +280,9 @@ label {
                 height: 20px;
                 line-height: 20px;
                 position: relative;
+                &:not(:disabled) {
+                    opacity: var(--component-normal-icon-opacity, 0.8);
+                }
             }
 
             &.disabled {
diff --git a/apps/documenteditor/main/app/template/FileMenu.template b/apps/documenteditor/main/app/template/FileMenu.template
index f86e615b7f..a52eb60ae4 100644
--- a/apps/documenteditor/main/app/template/FileMenu.template
+++ b/apps/documenteditor/main/app/template/FileMenu.template
@@ -1,9 +1,9 @@
 <div class="panel-menu" role="menubar" aria-label="<%= scope.ariaFileMenu %>">
     <li id="fm-btn-return" class="fm-btn" data-layout-name="toolbar-file-close"></li>
-    <li class="devider"></li>
+    <li class="devider devider-small"></li>
     <li id="fm-btn-create" class="fm-btn"></li>
     <li id="fm-btn-recent" class="fm-btn"></li>
-    <li class="devider"></li>
+    <li class="devider devider-small"></li>
     <li id="fm-btn-save" class="fm-btn" data-layout-name="toolbar-file-save"></li>
     <li id="fm-btn-edit" class="fm-btn"></li>
     <li id="fm-btn-download" class="fm-btn"></li>
@@ -18,7 +18,8 @@
     <li id="fm-btn-history" class="fm-btn"></li>
     <li id="fm-btn-rights" class="fm-btn"></li>
     <li id="fm-btn-back" class="fm-btn"></li>
-    <li class="devider devider-last" class="fm-btn"></li>
+    <li class="devider-last"></li>
+    <li class="devider"></li>
     <li id="fm-btn-settings" class="fm-btn" data-layout-name="toolbar-file-settings"></li>
     <li id="fm-btn-help" class="fm-btn"></li>
 </div>
diff --git a/apps/documenteditor/main/app/view/FileMenu.js b/apps/documenteditor/main/app/view/FileMenu.js
index f15b925180..84edbc22d5 100644
--- a/apps/documenteditor/main/app/view/FileMenu.js
+++ b/apps/documenteditor/main/app/view/FileMenu.js
@@ -102,7 +102,7 @@ define([
                 canFocused: false,
                 dataHint: 1,
                 dataHintDirection: 'left-top',
-                dataHintOffset: [2, 14],
+                dataHintOffset: [-2, 22],
                 iconCls: 'menu__icon btn-previtem'
             });
 
@@ -113,7 +113,7 @@ define([
                 canFocused: false,
                 dataHint: 1,
                 dataHintDirection: 'left-top',
-                dataHintOffset: [2, 14],
+                dataHintOffset: [-2, 22],
                 dataHintTitle: 'S',
                 iconCls: 'menu__icon btn-save'
             });
@@ -130,7 +130,7 @@ define([
                 canFocused: false,
                 dataHint: 1,
                 dataHintDirection: 'left-top',
-                dataHintOffset: [2, 14],
+                dataHintOffset: [-2, 22],
                 iconCls: 'menu__icon btn-edit'
             });
 
@@ -141,7 +141,7 @@ define([
                 canFocused: false,
                 dataHint: 1,
                 dataHintDirection: 'left-top',
-                dataHintOffset: [2, 14],
+                dataHintOffset: [-2, 22],
                 iconCls: 'menu__icon btn-download'
             });
 
@@ -152,7 +152,7 @@ define([
                 canFocused: false,
                 dataHint: 1,
                 dataHintDirection: 'left-top',
-                dataHintOffset: [2, 14],
+                dataHintOffset: [-2, 22],
                 iconCls: 'menu__icon btn-save-copy'
             });
 
@@ -173,7 +173,7 @@ define([
                 canFocused: false,
                 dataHint: 1,
                 dataHintDirection: 'left-top',
-                dataHintOffset: [2, 14],
+                dataHintOffset: [-2, 22],
                 dataHintTitle: 'P',
                 iconCls: 'menu__icon btn-print'
             });
@@ -185,7 +185,7 @@ define([
                 canFocused: false,
                 dataHint: 1,
                 dataHintDirection: 'left-top',
-                dataHintOffset: [2, 14],
+                dataHintOffset: [-2, 22],
                 dataHintTitle: 'P',
                 iconCls: 'menu__icon btn-print'
             });
@@ -197,7 +197,7 @@ define([
                 canFocused: false,
                 dataHint: 1,
                 dataHintDirection: 'left-top',
-                dataHintOffset: [2, 14],
+                dataHintOffset: [-2, 22],
                 iconCls: 'menu__icon btn-rename'
             });
 
@@ -213,7 +213,7 @@ define([
                 canFocused: false,
                 dataHint: 1,
                 dataHintDirection: 'left-top',
-                dataHintOffset: [2, 14],
+                dataHintOffset: [-2, 22],
                 iconCls: 'menu__icon btn-lock'
             });
 
@@ -239,7 +239,7 @@ define([
                 canFocused: false,
                 dataHint: 1,
                 dataHintDirection: 'left-top',
-                dataHintOffset: [2, 14],
+                dataHintOffset: [-2, 22],
                 iconCls: 'menu__icon btn-create-new'
             });
 
@@ -250,7 +250,7 @@ define([
                 canFocused: false,
                 dataHint: 1,
                 dataHintDirection: 'left-top',
-                dataHintOffset: [2, 14],
+                dataHintOffset: [-2, 22],
                 iconCls: 'menu__icon btn-menu-about'
             });
 
@@ -261,7 +261,7 @@ define([
                 canFocused: false,
                 dataHint: 1,
                 dataHintDirection: 'left-top',
-                dataHintOffset: [2, 14],
+                dataHintOffset: [-2, 22],
                 iconCls: 'menu__icon btn-users-share'
             });
 
@@ -272,7 +272,7 @@ define([
                 canFocused: false,
                 dataHint: 1,
                 dataHintDirection: 'left-top',
-                dataHintOffset: [2, 14],
+                dataHintOffset: [-2, 22],
                 iconCls: 'menu__icon btn-version-history'
             });
             if ( !!this.options.miHistory ) {
@@ -287,7 +287,7 @@ define([
                 canFocused: false,
                 dataHint: 1,
                 dataHintDirection: 'left-top',
-                dataHintOffset: [2, 14],
+                dataHintOffset: [-2, 22],
                 iconCls: 'menu__icon btn-settings'
             });
 
@@ -298,7 +298,7 @@ define([
                 canFocused: false,
                 dataHint: 1,
                 dataHintDirection: 'left-top',
-                dataHintOffset: [2, 14],
+                dataHintOffset: [-2, 22],
                 iconCls: 'menu__icon btn-help'
             });
 
@@ -309,7 +309,7 @@ define([
                 canFocused: false,
                 dataHint: 1,
                 dataHintDirection: 'left-top',
-                dataHintOffset: [2, 14],
+                dataHintOffset: [-2, 22],
                 iconCls: 'menu__icon btn-goback'
             });
 
@@ -521,7 +521,7 @@ define([
                             canFocused: false,
                             dataHint: 1,
                             dataHintDirection: 'left-top',
-                            dataHintOffset: [2, 14],
+                            dataHintOffset: [-2, 22],
                             iconCls: 'menu__icon btn-open'
                         }));
                 }
@@ -537,7 +537,7 @@ define([
                             canFocused: false,
                             dataHint: 1,
                             dataHintDirection: 'left-top',
-                            dataHintOffset: [2, 14],
+                            dataHintOffset: [-2, 22],
                             iconCls: 'menu__icon btn-close'
                         }));
                 }
@@ -552,7 +552,8 @@ define([
                         canFocused: false,
                         dataHint: 1,
                         dataHintDirection: 'left-top',
-                        dataHintOffset: [2, 14]
+                        dataHintOffset: [2, 14],
+                        iconCls: 'menu__icon btn-close'
                     }));
             }
         },
diff --git a/apps/pdfeditor/main/app/template/FileMenu.template b/apps/pdfeditor/main/app/template/FileMenu.template
index 00ea8e3103..2c9db50a27 100644
--- a/apps/pdfeditor/main/app/template/FileMenu.template
+++ b/apps/pdfeditor/main/app/template/FileMenu.template
@@ -1,9 +1,9 @@
 <div class="panel-menu" role="menubar" aria-label="<%= scope.ariaFileMenu %>">
     <li id="fm-btn-return" class="fm-btn" data-layout-name="toolbar-file-close"></li>
-    <li class="devider"></li>
+    <li class="devider devider-small"></li>
     <li id="fm-btn-create" class="fm-btn"></li>
     <li id="fm-btn-recent" class="fm-btn"></li>
-    <li class="devider"></li>
+    <li class="devider devider-small"></li>
     <li id="fm-btn-save" class="fm-btn" data-layout-name="toolbar-file-save"></li>
     <li id="fm-btn-download" class="fm-btn"></li>
     <li id="fm-btn-save-copy" class="fm-btn"></li>
@@ -16,7 +16,8 @@
     <li id="fm-btn-info" class="fm-btn" data-layout-name="toolbar-file-info"></li>
     <li id="fm-btn-rights" class="fm-btn"></li>
     <li id="fm-btn-back" class="fm-btn"></li>
-    <li class="devider devider-last"></li>
+    <li class="devider-last"></li>
+    <li class="devider"></li>
     <li id="fm-btn-settings" class="fm-btn" data-layout-name="toolbar-file-settings"></li>
     <li id="fm-btn-help" class="fm-btn"></li>
 </div>
diff --git a/apps/pdfeditor/main/app/view/FileMenu.js b/apps/pdfeditor/main/app/view/FileMenu.js
index 07c59e48e3..edb92902cd 100644
--- a/apps/pdfeditor/main/app/view/FileMenu.js
+++ b/apps/pdfeditor/main/app/view/FileMenu.js
@@ -102,7 +102,7 @@ define([
                 canFocused: false,
                 dataHint: 1,
                 dataHintDirection: 'left-top',
-                dataHintOffset: [2, 14],
+                dataHintOffset: [-2, 22],
                 iconCls: 'menu__icon btn-previtem'
             });
 
@@ -113,7 +113,7 @@ define([
                 canFocused: false,
                 dataHint: 1,
                 dataHintDirection: 'left-top',
-                dataHintOffset: [2, 14],
+                dataHintOffset: [-2, 22],
                 dataHintTitle: 'S',
                 iconCls: 'menu__icon btn-save'
             });
@@ -130,7 +130,7 @@ define([
                 canFocused: false,
                 dataHint: 1,
                 dataHintDirection: 'left-top',
-                dataHintOffset: [2, 14],
+                dataHintOffset: [-2, 22],
                 iconCls: 'menu__icon btn-edit'
             });
 
@@ -141,7 +141,7 @@ define([
                 canFocused: false,
                 dataHint: 1,
                 dataHintDirection: 'left-top',
-                dataHintOffset: [2, 14],
+                dataHintOffset: [-2, 22],
                 iconCls: 'menu__icon btn-download'
             });
 
@@ -152,7 +152,7 @@ define([
                 canFocused: false,
                 dataHint: 1,
                 dataHintDirection: 'left-top',
-                dataHintOffset: [2, 14],
+                dataHintOffset: [-2, 22],
                 iconCls: 'menu__icon btn-save-copy'
             });
 
@@ -163,7 +163,7 @@ define([
                 canFocused: false,
                 dataHint: 1,
                 dataHintDirection: 'left-top',
-                dataHintOffset: [2, 14],
+                dataHintOffset: [-2, 22],
                 dataHintTitle: 'P'
             });
 
@@ -174,7 +174,7 @@ define([
                 canFocused: false,
                 dataHint: 1,
                 dataHintDirection: 'left-top',
-                dataHintOffset: [2, 14],
+                dataHintOffset: [-2, 22],
                 dataHintTitle: 'P',
                 iconCls: 'menu__icon btn-print'
             });
@@ -186,7 +186,7 @@ define([
                 canFocused: false,
                 dataHint: 1,
                 dataHintDirection: 'left-top',
-                dataHintOffset: [2, 14],
+                dataHintOffset: [-2, 22],
                 dataHintTitle: 'P',
                 iconCls: 'menu__icon btn-print'
             });
@@ -198,7 +198,7 @@ define([
                 canFocused: false,
                 dataHint: 1,
                 dataHintDirection: 'left-top',
-                dataHintOffset: [2, 14],
+                dataHintOffset: [-2, 22],
                 iconCls: 'menu__icon btn-rename'
             });
 
@@ -214,7 +214,7 @@ define([
                 canFocused: false,
                 dataHint: 1,
                 dataHintDirection: 'left-top',
-                dataHintOffset: [2, 14],
+                dataHintOffset: [-2, 22],
                 iconCls: 'menu__icon btn-lock'
             });
 
@@ -240,7 +240,7 @@ define([
                 canFocused: false,
                 dataHint: 1,
                 dataHintDirection: 'left-top',
-                dataHintOffset: [2, 14],
+                dataHintOffset: [-2, 22],
                 iconCls: 'menu__icon btn-create-new'
             });
 
@@ -251,7 +251,7 @@ define([
                 canFocused: false,
                 dataHint: 1,
                 dataHintDirection: 'left-top',
-                dataHintOffset: [2, 14],
+                dataHintOffset: [-2, 22],
                 iconCls: 'menu__icon btn-menu-about'
             });
 
@@ -262,7 +262,7 @@ define([
                 canFocused: false,
                 dataHint: 1,
                 dataHintDirection: 'left-top',
-                dataHintOffset: [2, 14],
+                dataHintOffset: [-2, 22],
                 iconCls: 'menu__icon btn-users-share'
             });
 
@@ -273,7 +273,7 @@ define([
                 canFocused: false,
                 dataHint: 1,
                 dataHintDirection: 'left-top',
-                dataHintOffset: [2, 14],
+                dataHintOffset: [-2, 22],
                 iconCls: 'menu__icon btn-settings'
             });
 
@@ -284,7 +284,7 @@ define([
                 canFocused: false,
                 dataHint: 1,
                 dataHintDirection: 'left-top',
-                dataHintOffset: [2, 14],
+                dataHintOffset: [-2, 22],
                 iconCls: 'menu__icon btn-help'
             });
 
@@ -295,7 +295,7 @@ define([
                 canFocused: false,
                 dataHint: 1,
                 dataHintDirection: 'left-top',
-                dataHintOffset: [2, 14],
+                dataHintOffset: [-2, 22],
                 iconCls: 'menu__icon btn-goback'
             });
 
@@ -498,7 +498,7 @@ define([
                             canFocused: false,
                             dataHint: 1,
                             dataHintDirection: 'left-top',
-                            dataHintOffset: [2, 14],
+                            dataHintOffset: [-2, 22],
                             iconCls: 'menu__icon btn-open'
                         }));
                 }
@@ -514,7 +514,7 @@ define([
                             canFocused: false,
                             dataHint: 1,
                             dataHintDirection: 'left-top',
-                            dataHintOffset: [2, 14],
+                            dataHintOffset: [-2, 22],
                             iconCls: 'menu__icon btn-close'
                         }));
                 }
@@ -529,7 +529,8 @@ define([
                         canFocused: false,
                         dataHint: 1,
                         dataHintDirection: 'left-top',
-                        dataHintOffset: [2, 14]
+                        dataHintOffset: [2, 14],
+                        iconCls: 'menu__icon btn-close'
                     }));
             }
         },
diff --git a/apps/presentationeditor/main/app/template/FileMenu.template b/apps/presentationeditor/main/app/template/FileMenu.template
index f86e615b7f..a52eb60ae4 100644
--- a/apps/presentationeditor/main/app/template/FileMenu.template
+++ b/apps/presentationeditor/main/app/template/FileMenu.template
@@ -1,9 +1,9 @@
 <div class="panel-menu" role="menubar" aria-label="<%= scope.ariaFileMenu %>">
     <li id="fm-btn-return" class="fm-btn" data-layout-name="toolbar-file-close"></li>
-    <li class="devider"></li>
+    <li class="devider devider-small"></li>
     <li id="fm-btn-create" class="fm-btn"></li>
     <li id="fm-btn-recent" class="fm-btn"></li>
-    <li class="devider"></li>
+    <li class="devider devider-small"></li>
     <li id="fm-btn-save" class="fm-btn" data-layout-name="toolbar-file-save"></li>
     <li id="fm-btn-edit" class="fm-btn"></li>
     <li id="fm-btn-download" class="fm-btn"></li>
@@ -18,7 +18,8 @@
     <li id="fm-btn-history" class="fm-btn"></li>
     <li id="fm-btn-rights" class="fm-btn"></li>
     <li id="fm-btn-back" class="fm-btn"></li>
-    <li class="devider devider-last" class="fm-btn"></li>
+    <li class="devider-last"></li>
+    <li class="devider"></li>
     <li id="fm-btn-settings" class="fm-btn" data-layout-name="toolbar-file-settings"></li>
     <li id="fm-btn-help" class="fm-btn"></li>
 </div>
diff --git a/apps/presentationeditor/main/app/view/FileMenu.js b/apps/presentationeditor/main/app/view/FileMenu.js
index fa6f278609..7d46ddec45 100644
--- a/apps/presentationeditor/main/app/view/FileMenu.js
+++ b/apps/presentationeditor/main/app/view/FileMenu.js
@@ -101,7 +101,7 @@ define([
                 canFocused: false,
                 dataHint: 1,
                 dataHintDirection: 'left-top',
-                dataHintOffset: [2, 14],
+                dataHintOffset: [-2, 22],
                 iconCls: 'menu__icon btn-previtem'
             });
 
@@ -113,7 +113,7 @@ define([
                 disabled: true,
                 dataHint: 1,
                 dataHintDirection: 'left-top',
-                dataHintOffset: [2, 14],
+                dataHintOffset: [-2, 22],
                 dataHintTitle: 'S',
                 iconCls: 'menu__icon btn-save'
             });
@@ -129,7 +129,7 @@ define([
                 canFocused: false,
                 dataHint: 1,
                 dataHintDirection: 'left-top',
-                dataHintOffset: [2, 14],
+                dataHintOffset: [-2, 22],
                 iconCls: 'menu__icon btn-edit'
             });
 
@@ -140,7 +140,7 @@ define([
                 canFocused: false,
                 dataHint: 1,
                 dataHintDirection: 'left-top',
-                dataHintOffset: [2, 14],
+                dataHintOffset: [-2, 22],
                 iconCls: 'menu__icon btn-download'
             });
 
@@ -151,7 +151,7 @@ define([
                 canFocused: false,
                 dataHint: 1,
                 dataHintDirection: 'left-top',
-                dataHintOffset: [2, 14],
+                dataHintOffset: [-2, 22],
                 iconCls: 'menu__icon btn-save-copy'
             });
 
@@ -172,7 +172,7 @@ define([
                 canFocused: false,
                 dataHint: 1,
                 dataHintDirection: 'left-top',
-                dataHintOffset: [2, 14],
+                dataHintOffset: [-2, 22],
                 dataHintTitle: 'P',
                 iconCls: 'menu__icon btn-print'
             });
@@ -184,7 +184,7 @@ define([
                 canFocused: false,
                 dataHint: 1,
                 dataHintDirection: 'left-top',
-                dataHintOffset: [2, 14],
+                dataHintOffset: [-2, 22],
                 dataHintTitle: 'P',
                 iconCls: 'menu__icon btn-print'
             });
@@ -196,7 +196,7 @@ define([
                 canFocused: false,
                 dataHint: 1,
                 dataHintDirection: 'left-top',
-                dataHintOffset: [2, 14],
+                dataHintOffset: [-2, 22],
                 iconCls: 'menu__icon btn-rename'
             });
             if ( !!this.options.miRename ) {
@@ -211,7 +211,7 @@ define([
                 canFocused: false,
                 dataHint: 1,
                 dataHintDirection: 'left-top',
-                dataHintOffset: [2, 14],
+                dataHintOffset: [-2, 22],
                 iconCls: 'menu__icon btn-lock'
             });
             if ( !!this.options.miProtect ) {
@@ -236,7 +236,7 @@ define([
                 canFocused: false,
                 dataHint: 1,
                 dataHintDirection: 'left-top',
-                dataHintOffset: [2, 14],
+                dataHintOffset: [-2, 22],
                 iconCls: 'menu__icon btn-create-new'
             });
 
@@ -247,7 +247,7 @@ define([
                 canFocused: false,
                 dataHint: 1,
                 dataHintDirection: 'left-top',
-                dataHintOffset: [2, 14],
+                dataHintOffset: [-2, 22],
                 iconCls: 'menu__icon btn-menu-about'
             });
 
@@ -258,7 +258,7 @@ define([
                 canFocused: false,
                 dataHint: 1,
                 dataHintDirection: 'left-top',
-                dataHintOffset: [2, 14],
+                dataHintOffset: [-2, 22],
                 iconCls: 'menu__icon btn-users-share'
             });
 
@@ -269,7 +269,7 @@ define([
                 canFocused: false,
                 dataHint: 1,
                 dataHintDirection: 'left-top',
-                dataHintOffset: [2, 14],
+                dataHintOffset: [-2, 22],
                 iconCls: 'menu__icon btn-help'
             });
 
@@ -280,7 +280,7 @@ define([
                 canFocused: false,
                 dataHint: 1,
                 dataHintDirection: 'left-top',
-                dataHintOffset: [2, 14],
+                dataHintOffset: [-2, 22],
                 iconCls: 'menu__icon btn-settings'
             });
 
@@ -291,7 +291,7 @@ define([
                 canFocused: false,
                 dataHint: 1,
                 dataHintDirection: 'left-top',
-                dataHintOffset: [2, 14],
+                dataHintOffset: [-2, 22],
                 iconCls: 'menu__icon btn-version-history'
             });
             if ( !!this.options.miHistory ) {
@@ -306,7 +306,7 @@ define([
                 canFocused: false,
                 dataHint: 1,
                 dataHintDirection: 'left-top',
-                dataHintOffset: [2, 14],
+                dataHintOffset: [-2, 22],
                 iconCls: 'menu__icon btn-goback'
             });
 
@@ -514,7 +514,7 @@ define([
                             canFocused: false,
                             dataHint: 1,
                             dataHintDirection: 'left-top',
-                            dataHintOffset: [2, 14],
+                            dataHintOffset: [-2, 22],
                             iconCls: 'menu__icon btn-open'
                         }));
                 }
@@ -530,7 +530,7 @@ define([
                             canFocused: false,
                             dataHint: 1,
                             dataHintDirection: 'left-top',
-                            dataHintOffset: [2, 14],
+                            dataHintOffset: [-2, 22],
                             iconCls: 'menu__icon btn-close'
                         }));
                 }
@@ -545,7 +545,8 @@ define([
                         canFocused: false,
                         dataHint: 1,
                         dataHintDirection: 'left-top',
-                        dataHintOffset: [2, 14]
+                        dataHintOffset: [2, 14],
+                        iconCls: 'menu__icon btn-close'
                     }));
             }
         },
diff --git a/apps/spreadsheeteditor/main/app/template/FileMenu.template b/apps/spreadsheeteditor/main/app/template/FileMenu.template
index bec91e8383..74738688a0 100644
--- a/apps/spreadsheeteditor/main/app/template/FileMenu.template
+++ b/apps/spreadsheeteditor/main/app/template/FileMenu.template
@@ -1,9 +1,9 @@
 <div class="panel-menu" role="menubar" aria-label="<%= scope.ariaFileMenu %>">
     <li id="fm-btn-return" class="fm-btn" data-layout-name="toolbar-file-close"></li>
-    <li class="devider"></li>
+    <li class="devider devider-small"></li>
     <li id="fm-btn-create" class="fm-btn"></li>
     <li id="fm-btn-recent" class="fm-btn"></li>
-    <li class="devider"></li>
+    <li class="devider devider-small"></li>
     <li id="fm-btn-save" class="fm-btn" data-layout-name="toolbar-file-save"></li>
     <li id="fm-btn-edit" class="fm-btn"></li>
     <li id="fm-btn-download" class="fm-btn"></li>
@@ -18,7 +18,8 @@
     <li id="fm-btn-history" class="fm-btn"></li>
     <li id="fm-btn-rights" class="fm-btn"></li>
     <li id="fm-btn-back" class="fm-btn"></li>
-    <li class="devider devider-last"></li>
+    <li class="devider-last"></li>
+    <li class="devider"></li>
     <li id="fm-btn-settings" class="fm-btn" data-layout-name="toolbar-file-settings"></li>
     <li id="fm-btn-help" class="fm-btn"></li>
 </div>
diff --git a/apps/spreadsheeteditor/main/app/view/FileMenu.js b/apps/spreadsheeteditor/main/app/view/FileMenu.js
index 9ec8d3043c..e06e1f0b27 100644
--- a/apps/spreadsheeteditor/main/app/view/FileMenu.js
+++ b/apps/spreadsheeteditor/main/app/view/FileMenu.js
@@ -89,7 +89,7 @@ define([
                 canFocused: false,
                 dataHint: 1,
                 dataHintDirection: 'left-top',
-                dataHintOffset: [2, 14],
+                dataHintOffset: [-2, 22],
                 iconCls: 'menu__icon btn-previtem'
             });
 
@@ -101,7 +101,7 @@ define([
                 disabled: true,
                 dataHint: 1,
                 dataHintDirection: 'left-top',
-                dataHintOffset: [2, 14],
+                dataHintOffset: [-2, 22],
                 dataHintTitle: 'S',
                 iconCls: 'menu__icon btn-save'
             });
@@ -117,7 +117,7 @@ define([
                 canFocused: false,
                 dataHint: 1,
                 dataHintDirection: 'left-top',
-                dataHintOffset: [2, 14],
+                dataHintOffset: [-2, 22],
                 iconCls: 'menu__icon btn-edit'
             });
 
@@ -128,7 +128,7 @@ define([
                 canFocused: false,
                 dataHint: 1,
                 dataHintDirection: 'left-top',
-                dataHintOffset: [2, 14],
+                dataHintOffset: [-2, 22],
                 iconCls: 'menu__icon btn-download'
             });
 
@@ -139,7 +139,7 @@ define([
                 canFocused: false,
                 dataHint: 1,
                 dataHintDirection: 'left-top',
-                dataHintOffset: [2, 14],
+                dataHintOffset: [-2, 22],
                 iconCls: 'menu__icon btn-save-copy'
             });
 
@@ -170,7 +170,7 @@ define([
                 canFocused: false,
                 dataHint: 1,
                 dataHintDirection: 'left-top',
-                dataHintOffset: [2, 14],
+                dataHintOffset: [-2, 22],
                 dataHintTitle: 'P',
                 iconCls: 'menu__icon btn-print'
             });
@@ -182,7 +182,7 @@ define([
                 canFocused: false,
                 dataHint: 1,
                 dataHintDirection: 'left-top',
-                dataHintOffset: [2, 14],
+                dataHintOffset: [-2, 22],
                 iconCls: 'menu__icon btn-rename'
             });
             if ( !!this.options.miRename ) {
@@ -197,7 +197,7 @@ define([
                 canFocused: false,
                 dataHint: 1,
                 dataHintDirection: 'left-top',
-                dataHintOffset: [2, 14],
+                dataHintOffset: [-2, 22],
                 iconCls: 'menu__icon btn-lock'
             });
             if ( !!this.options.miProtect ) {
@@ -222,7 +222,7 @@ define([
                 canFocused: false,
                 dataHint: 1,
                 dataHintDirection: 'left-top',
-                dataHintOffset: [2, 14],
+                dataHintOffset: [-2, 22],
                 iconCls: 'menu__icon btn-create-new'
             });
 
@@ -233,7 +233,7 @@ define([
                 canFocused: false,
                 dataHint: 1,
                 dataHintDirection: 'left-top',
-                dataHintOffset: [2, 14],
+                dataHintOffset: [-2, 22],
                 iconCls: 'menu__icon btn-menu-about'
             });
 
@@ -244,7 +244,7 @@ define([
                 canFocused: false,
                 dataHint: 1,
                 dataHintDirection: 'left-top',
-                dataHintOffset: [2, 14],
+                dataHintOffset: [-2, 22],
                 iconCls: 'menu__icon btn-users-share'
             });
 
@@ -255,7 +255,7 @@ define([
                 canFocused: false,
                 dataHint: 1,
                 dataHintDirection: 'left-top',
-                dataHintOffset: [2, 14],
+                dataHintOffset: [-2, 22],
                 iconCls: 'menu__icon btn-settings'
             });
 
@@ -266,7 +266,7 @@ define([
                 canFocused: false,
                 dataHint: 1,
                 dataHintDirection: 'left-top',
-                dataHintOffset: [2, 14],
+                dataHintOffset: [-2, 22],
                 iconCls: 'menu__icon btn-help'
             });
 
@@ -277,7 +277,7 @@ define([
                 canFocused: false,
                 dataHint: 1,
                 dataHintDirection: 'left-top',
-                dataHintOffset: [2, 14],
+                dataHintOffset: [-2, 22],
                 iconCls: 'menu__icon btn-version-history'
             });
 
@@ -288,7 +288,7 @@ define([
                 canFocused: false,
                 dataHint: 1,
                 dataHintDirection: 'left-top',
-                dataHintOffset: [2, 14],
+                dataHintOffset: [-2, 22],
                 iconCls: 'menu__icon btn-goback'
             });
 
@@ -502,7 +502,7 @@ define([
                             canFocused: false,
                             dataHint: 1,
                             dataHintDirection: 'left-top',
-                            dataHintOffset: [2, 14],
+                            dataHintOffset: [-2, 22],
                             iconCls: 'menu__icon btn-open'
                         }));
                 }
@@ -518,7 +518,7 @@ define([
                             canFocused: false,
                             dataHint: 1,
                             dataHintDirection: 'left-top',
-                            dataHintOffset: [2, 14],
+                            dataHintOffset: [-2, 22],
                             iconCls: 'menu__icon btn-close'
                         }));
                 }
@@ -533,7 +533,8 @@ define([
                         canFocused: false,
                         dataHint: 1,
                         dataHintDirection: 'left-top',
-                        dataHintOffset: [2, 14]
+                        dataHintOffset: [2, 14],
+                        iconCls: 'menu__icon btn-close'
                     }));
             }
         },