diff --git a/apps/documenteditor/main/app/controller/Toolbar.js b/apps/documenteditor/main/app/controller/Toolbar.js
index 38b1e7278..cb747531e 100644
--- a/apps/documenteditor/main/app/controller/Toolbar.js
+++ b/apps/documenteditor/main/app/controller/Toolbar.js
@@ -2033,14 +2033,14 @@ define([
 
         onFootnotePrevClick: function(btn) {
             if (this.api)
-                this.api.GotoFootnotePrev();
+                this.api.asc_GotoFootnote(false);
 
             Common.NotificationCenter.trigger('edit:complete', this.toolbar);
         },
 
         onFootnoteNextClick: function(btn) {
             if (this.api)
-                this.api.GotoFootnoteNext();
+                this.api.asc_GotoFootnote(true);
 
             Common.NotificationCenter.trigger('edit:complete', this.toolbar);
         },
diff --git a/apps/documenteditor/main/app/template/Toolbar.template b/apps/documenteditor/main/app/template/Toolbar.template
index 3b6e4cbcd..6a71a0ac4 100644
--- a/apps/documenteditor/main/app/template/Toolbar.template
+++ b/apps/documenteditor/main/app/template/Toolbar.template
@@ -153,6 +153,7 @@
                 <span class="btn-placeholder split" id="id-toolbar-full-placeholder-btn-insertimage"></span>
                 <span class="btn-placeholder split" id="id-toolbar-full-placeholder-btn-insertchart"></span>
                 <span class="btn-placeholder split" id="id-toolbar-full-placeholder-btn-inserttext"></span>
+                <span class="btn-placeholder split" id="id-toolbar-full-placeholder-btn-insertequation"></span>
                 <span class="btn-placeholder split" id="id-toolbar-full-placeholder-btn-dropcap"></span>
             </div>
             <div class="toolbar-row">
@@ -160,7 +161,7 @@
                 <span class="btn-placeholder split" id="id-toolbar-full-placeholder-btn-inserttable"></span>
                 <span class="btn-placeholder split" id="id-toolbar-full-placeholder-btn-inserthyperlink"></span>
                 <span class="btn-placeholder split" id="id-toolbar-full-placeholder-btn-insertshape"></span>
-                <span class="btn-placeholder split" id="id-toolbar-full-placeholder-btn-insertequation"></span>
+                <span class="btn-placeholder split" id="id-toolbar-full-placeholder-btn-notes"></span>
             </div>
         </div>
         <div class="separator long" style="margin-left: 5px;"></div>
@@ -191,12 +192,6 @@
                 <span class="btn-placeholder" id="id-toolbar-full-placeholder-btn-mailrecepients"></span>
             </div>
         </div>
-        <div class="separator long" style="margin-left: 5px;"></div>
-        <div class="toolbar-group">
-            <div class="toolbar-row">
-                <span class="btn-placeholder split" id="id-toolbar-full-placeholder-btn-notes"></span>
-            </div>
-        </div>
         <div class="toolbar-group" id="id-toolbar-full-placeholder-field-styles" style="width: 100%; min-width: 160px;">
         </div>
         <div class="toolbar-group no-mask">
diff --git a/apps/documenteditor/main/app/view/NoteSettingsDialog.js b/apps/documenteditor/main/app/view/NoteSettingsDialog.js
index 089f4fb4d..f32005b37 100644
--- a/apps/documenteditor/main/app/view/NoteSettingsDialog.js
+++ b/apps/documenteditor/main/app/view/NoteSettingsDialog.js
@@ -59,66 +59,62 @@ define([
                 title: this.textTitle,
                 template: [
                     '<div class="box" style="height:' + (me.options.height - 85) + 'px;">',
-                        '<div class="content-panel" style="padding: 0;"><div class="inner-content">',
+                        '<div class="content-panel" style="padding: 0 5px;"><div class="inner-content">',
                             '<div class="settings-panel active">',
-                                '<table cols="2" style="width: 100%;">',
+                                '<table cols="1" style="width: 100%;">',
                                     '<tr>',
-                                        '<td colspan=2 class="padding-small">',
+                                        '<td class="padding-small">',
                                         '<label class="header">', me.textLocation,'</label>',
                                         '</td>',
                                     '</tr>',
                                     '<tr>',
-                                        '<td class="padding-large" style="width: 50%;">',
-                                            '<label class="input-label">', me.textFootnote,'</label>',
-                                            // '<div id="note-settings-radio-footnote" class="padding-small" style="display: block;"></div>',
-                                        '</td>',
                                         '<td class="padding-large">',
-                                            '<div id="note-settings-combo-footnote" class="input-group-nr" style="width:100%;"></div>',
+                                            '<label class="input-label" style="margin-top: 4px;">', me.textFootnote,'</label>',
+                                            '<div id="note-settings-combo-footnote" class="input-group-nr" style="display: inline-block; width:150px;float:right;"></div>',
                                         '</td>',
                                     '</tr>',
                                     '<tr>',
-                                        '<td colspan=2>',
-                                            '<div class="padding-large text-only"></div>',
+                                        '<td>',
+                                            '<div class="padding-large"></div>',
                                         '</td>',
                                     '</tr>',
                                     '<tr>',
-                                        '<td colspan=2 class="padding-small">',
+                                        '<td class="padding-small">',
                                             '<label class="header">', me.textFormat,'</label>',
                                         '</td>',
                                     '</tr>',
                                     '<tr>',
                                         '<td class="padding-small">',
-                                            '<label class="input-label">', me.textNumFormat,'</label>',
-                                            '<div id="note-settings-combo-format" class="input-group-nr" style="width:100px;"></div>',
+                                            '<div style="display: inline-block; margin-right: 10px;">',
+                                                '<label class="input-label">', me.textNumFormat,'</label>',
+                                                '<div id="note-settings-combo-format" class="input-group-nr" style="width:150px;"></div>',
+                                            '</div>','<div style="display: inline-block;">',
+                                                '<label class="input-label">', me.textStart,'</label>',
+                                                '<div id="note-settings-spin-start"></div>',
+                                            '</div>',
                                         '</td>',
+                                    '</tr>',
+                                    '<tr>',
                                         '<td class="padding-small">',
-                                            '<label class="input-label">', me.textStart,'</label>',
-                                            '<div id="note-settings-spin-start"></div>',
-                                        '</td>',
-                                    '</tr>',
-                                    '<tr>',
-                                        '<td colspan=2 class="padding-small">',
                                             '<label class="input-label">', me.textNumbering, '</label>',
-                                            '<div id="note-settings-combo-numbering" class="input-group-nr" style="width:140px;"></div>',
+                                            '<div id="note-settings-combo-numbering" class="input-group-nr" style="width:150px;"></div>',
                                         '</td>',
                                     '</tr>',
                                     '<tr>',
-                                        '<td colspan=2 class="padding-large">',
+                                        '<td class="padding-large">',
                                             '<label class="input-label">', me.textCustom, '</label>',
                                             '<div id="note-settings-txt-custom"></div>',
                                         '</td>',
                                     '</tr>',
                                     '<tr>',
-                                        '<td colspan=2>',
-                                            '<div class="padding-large text-only"></div>',
+                                        '<td>',
+                                            '<div class="padding-large"></div>',
                                         '</td>',
                                     '</tr>',
                                     '<tr>',
                                         '<td class="padding-small">',
-                                            '<label class="header">', me.textApplyTo,'</label>',
-                                        '</td>',
-                                        '<td class="padding-small">',
-                                            '<div id="note-settings-combo-apply" class="input-group-nr" style="width:100%;"></div>',
+                                            '<label class="header" style="margin-top: 4px;">', me.textApplyTo,'</label>',
+                                            '<div id="note-settings-combo-apply" class="input-group-nr" style="display: inline-block; width:150px;float:right;"></div>',
                                         '</td>',
                                     '</tr>',
                                 '</table>',
@@ -150,7 +146,7 @@ define([
             this.cmbFootnote = new Common.UI.ComboBox({
                 el: $('#note-settings-combo-footnote'),
                 cls: 'input-group-nr',
-                menuStyle: 'min-width: 140px;',
+                menuStyle: 'min-width: 150px;',
                 editable: false,
                 data: [
                     { displayValue: this.textPageBottom,   value: Asc.c_oAscFootnotePos.section_footnote_PosPageBottom },
@@ -162,7 +158,7 @@ define([
             this.cmbFormat = new Common.UI.ComboBox({
                 el: $('#note-settings-combo-format'),
                 cls: 'input-group-nr',
-                menuStyle: 'min-width: 100px;',
+                menuStyle: 'min-width: 150px;',
                 editable: false,
                 data: [
                     { displayValue: '1, 2, 3,...',      value: 1, maskExp: /[0-9]/, defValue: 1 },
@@ -179,7 +175,7 @@ define([
             this.spnStart = new Common.UI.CustomSpinner({
                 el: $('#note-settings-spin-start'),
                 step: 1,
-                width: 100,
+                width: 85,
                 defaultUnit : "",
                 value: 1,
                 maxValue: 16383,
@@ -191,7 +187,7 @@ define([
             this.cmbNumbering = new Common.UI.ComboBox({
                 el: $('#note-settings-combo-numbering'),
                 cls: 'input-group-nr',
-                menuStyle: 'min-width: 140px;',
+                menuStyle: 'min-width: 150px;',
                 editable: false,
                 data: [
                     { displayValue: this.textContinue,   value: Asc.c_oAscFootnoteRestart.section_footnote_RestartContinuous },
@@ -206,7 +202,7 @@ define([
                 allowBlank  : true,
                 validateOnChange: true,
                 validateOnBlur: false,
-                style       : 'width: 100px; vertical-align: middle;',
+                style       : 'width: 85px; vertical-align: middle;',
                 value       : ''
             }).on ('changing', function (input, value) {
                 me.cmbFormat.setDisabled(value.length>0);
@@ -216,7 +212,7 @@ define([
             this.cmbApply = new Common.UI.ComboBox({
                 el: $('#note-settings-combo-apply'),
                 cls: 'input-group-nr',
-                menuStyle: 'min-width: 140px;',
+                menuStyle: 'min-width: 150px;',
                 editable: false,
                 data: [
                     { displayValue: this.textDocument,   value: Asc.section_footnote_RestartContinuous },
diff --git a/apps/documenteditor/main/resources/img/toolbar-menu.png b/apps/documenteditor/main/resources/img/toolbar-menu.png
index 4a3467f6c..91fc2ad34 100644
Binary files a/apps/documenteditor/main/resources/img/toolbar-menu.png and b/apps/documenteditor/main/resources/img/toolbar-menu.png differ
diff --git a/apps/documenteditor/main/resources/img/toolbar-menu@2x.png b/apps/documenteditor/main/resources/img/toolbar-menu@2x.png
index 018302470..ee9d5f5db 100644
Binary files a/apps/documenteditor/main/resources/img/toolbar-menu@2x.png and b/apps/documenteditor/main/resources/img/toolbar-menu@2x.png differ
diff --git a/apps/documenteditor/main/resources/less/toolbar.less b/apps/documenteditor/main/resources/less/toolbar.less
index 55a28fad9..44cda7f91 100644
--- a/apps/documenteditor/main/resources/less/toolbar.less
+++ b/apps/documenteditor/main/resources/less/toolbar.less
@@ -333,7 +333,7 @@
 .button-normal-icon(btn-zoomout,          58, @toolbar-icon-size);
 .button-normal-icon(btn-columns,          82, @toolbar-icon-size);
 .button-normal-icon(btn-pagemargins,      83, @toolbar-icon-size);
-.button-normal-icon(btn-notes,            83, @toolbar-icon-size);
+.button-normal-icon(btn-notes,            85, @toolbar-icon-size);
 
 .button-normal-icon(mmerge-next,          71, @toolbar-icon-size);
 .button-normal-icon(mmerge-last,          72, @toolbar-icon-size);