diff --git a/apps/documenteditor/main/app/view/LineNumbersDialog.js b/apps/documenteditor/main/app/view/LineNumbersDialog.js
index 39713eaf2..8c1b857a6 100644
--- a/apps/documenteditor/main/app/view/LineNumbersDialog.js
+++ b/apps/documenteditor/main/app/view/LineNumbersDialog.js
@@ -118,6 +118,7 @@ define([
                 width: 80,
                 defaultUnit : 'cm',
                 value: 'Auto',
+                autoText    : this.txtAutoText,
                 maxValue: 55.87,
                 minValue: 0.1,
                 allowAuto: true,
@@ -253,6 +254,7 @@ define([
         textApplyTo: 'Apply changes to',
         textDocument: 'Whole document',
         textSection: 'Current section',
-        textForward: 'This point forward'
+        textForward: 'This point forward',
+        txtAutoText: 'Auto'
     }, DE.Views.LineNumbersDialog || {}))
 });
\ No newline at end of file
diff --git a/apps/documenteditor/main/app/view/TableOfContentsSettings.js b/apps/documenteditor/main/app/view/TableOfContentsSettings.js
index 1a93e6bb0..c26730f04 100644
--- a/apps/documenteditor/main/app/view/TableOfContentsSettings.js
+++ b/apps/documenteditor/main/app/view/TableOfContentsSettings.js
@@ -224,7 +224,7 @@ define([
 
             this.chLinks = new Common.UI.CheckBox({
                 el: $('#tableofcontents-chb-links'),
-                labelText: this.strLinks,
+                labelText: (this.type==1) ? this.strLinksOF : this.strLinks,
                 value: 'checked'
             });
             this.chLinks.on('change', _.bind(function(field, newValue, oldValue, eOpts){
@@ -905,7 +905,8 @@ define([
         textTable: 'Table',
         txtDistinctive: 'Distinctive',
         txtCentered: 'Centered',
-        txtFormal: 'Formal'
+        txtFormal: 'Formal',
+        strLinksOF: 'Format table of figures as links'
 
     }, DE.Views.TableOfContentsSettings || {}))
 });
\ No newline at end of file
diff --git a/apps/documenteditor/main/locale/de.json b/apps/documenteditor/main/locale/de.json
index 17e105c2e..501d35e54 100644
--- a/apps/documenteditor/main/locale/de.json
+++ b/apps/documenteditor/main/locale/de.json
@@ -1865,6 +1865,7 @@
   "DE.Views.LineNumbersDialog.textSection": "Aktueller Abschnitt",
   "DE.Views.LineNumbersDialog.textStartAt": "Beginnen mit",
   "DE.Views.LineNumbersDialog.textTitle": "Zeilennummern",
+  "DE.Views.LineNumbersDialog.txtAutoText": "Auto",
   "DE.Views.Links.capBtnBookmarks": "Lesezeichen",
   "DE.Views.Links.capBtnCaption": "Beschriftung",
   "DE.Views.Links.capBtnContentsUpdate": "Aktualisierung",
diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json
index f5c4fb6e7..f9af7c742 100644
--- a/apps/documenteditor/main/locale/en.json
+++ b/apps/documenteditor/main/locale/en.json
@@ -1865,6 +1865,7 @@
   "DE.Views.LineNumbersDialog.textSection": "Current section",
   "DE.Views.LineNumbersDialog.textStartAt": "Start at",
   "DE.Views.LineNumbersDialog.textTitle": "Line Numbers",
+  "DE.Views.LineNumbersDialog.txtAutoText": "Auto",
   "DE.Views.Links.capBtnBookmarks": "Bookmark",
   "DE.Views.Links.capBtnCaption": "Caption",
   "DE.Views.Links.capBtnContentsUpdate": "Refresh",
@@ -2218,6 +2219,7 @@
   "DE.Views.TableOfContentsSettings.strAlign": "Right align page numbers",
   "DE.Views.TableOfContentsSettings.strFullCaption": "Include label and number",
   "DE.Views.TableOfContentsSettings.strLinks": "Format Table of Contents as links",
+  "DE.Views.TableOfContentsSettings.strLinksOF": "Format table of figures as links",
   "DE.Views.TableOfContentsSettings.strShowPages": "Show page numbers",
   "DE.Views.TableOfContentsSettings.textBuildTable": "Build table of contents from",
   "DE.Views.TableOfContentsSettings.textBuildTableOF": "Build table of figures from",
diff --git a/apps/documenteditor/main/locale/es.json b/apps/documenteditor/main/locale/es.json
index f1958f215..0fdc206d1 100644
--- a/apps/documenteditor/main/locale/es.json
+++ b/apps/documenteditor/main/locale/es.json
@@ -1865,6 +1865,7 @@
   "DE.Views.LineNumbersDialog.textSection": "Sección actual",
   "DE.Views.LineNumbersDialog.textStartAt": "Empezar en",
   "DE.Views.LineNumbersDialog.textTitle": "Numeración de Líneas",
+  "DE.Views.LineNumbersDialog.txtAutoText": "Auto",
   "DE.Views.Links.capBtnBookmarks": "Marcador",
   "DE.Views.Links.capBtnCaption": "Leyenda",
   "DE.Views.Links.capBtnContentsUpdate": "Actualizar",
diff --git a/apps/documenteditor/main/locale/fr.json b/apps/documenteditor/main/locale/fr.json
index 4ab695ade..9e97d31d9 100644
--- a/apps/documenteditor/main/locale/fr.json
+++ b/apps/documenteditor/main/locale/fr.json
@@ -1865,6 +1865,7 @@
   "DE.Views.LineNumbersDialog.textSection": "Section active",
   "DE.Views.LineNumbersDialog.textStartAt": "Commencer par",
   "DE.Views.LineNumbersDialog.textTitle": "Numéros des lignes",
+  "DE.Views.LineNumbersDialog.txtAutoText": "Auto",
   "DE.Views.Links.capBtnBookmarks": "Signet",
   "DE.Views.Links.capBtnCaption": "Légende",
   "DE.Views.Links.capBtnContentsUpdate": "Actualiser",
diff --git a/apps/documenteditor/main/locale/ru.json b/apps/documenteditor/main/locale/ru.json
index 705ca4b30..87051f4fa 100644
--- a/apps/documenteditor/main/locale/ru.json
+++ b/apps/documenteditor/main/locale/ru.json
@@ -1865,6 +1865,7 @@
   "DE.Views.LineNumbersDialog.textSection": "К текущему разделу",
   "DE.Views.LineNumbersDialog.textStartAt": "Начать с",
   "DE.Views.LineNumbersDialog.textTitle": "Нумерация строк",
+  "DE.Views.LineNumbersDialog.txtAutoText": "Авто",
   "DE.Views.Links.capBtnBookmarks": "Закладка",
   "DE.Views.Links.capBtnCaption": "Название",
   "DE.Views.Links.capBtnContentsUpdate": "Обновить",
diff --git a/apps/documenteditor/main/resources/help/en/images/interface/editorwindow.png b/apps/documenteditor/main/resources/help/en/images/interface/editorwindow.png
index bb667f5d4..c68f47d48 100644
Binary files a/apps/documenteditor/main/resources/help/en/images/interface/editorwindow.png and b/apps/documenteditor/main/resources/help/en/images/interface/editorwindow.png differ
diff --git a/apps/documenteditor/main/resources/help/en/images/interface/filetab.png b/apps/documenteditor/main/resources/help/en/images/interface/filetab.png
index 338626c76..10e1b89b8 100644
Binary files a/apps/documenteditor/main/resources/help/en/images/interface/filetab.png and b/apps/documenteditor/main/resources/help/en/images/interface/filetab.png differ
diff --git a/apps/documenteditor/main/resources/help/en/images/interface/hometab.png b/apps/documenteditor/main/resources/help/en/images/interface/hometab.png
index 827d8d39e..0e6223753 100644
Binary files a/apps/documenteditor/main/resources/help/en/images/interface/hometab.png and b/apps/documenteditor/main/resources/help/en/images/interface/hometab.png differ
diff --git a/apps/documenteditor/main/resources/help/en/images/interface/inserttab.png b/apps/documenteditor/main/resources/help/en/images/interface/inserttab.png
index b530dbbf4..be9c726c7 100644
Binary files a/apps/documenteditor/main/resources/help/en/images/interface/inserttab.png and b/apps/documenteditor/main/resources/help/en/images/interface/inserttab.png differ
diff --git a/apps/documenteditor/main/resources/help/en/images/interface/layouttab.png b/apps/documenteditor/main/resources/help/en/images/interface/layouttab.png
index 2201cc980..af9e7b167 100644
Binary files a/apps/documenteditor/main/resources/help/en/images/interface/layouttab.png and b/apps/documenteditor/main/resources/help/en/images/interface/layouttab.png differ
diff --git a/apps/documenteditor/main/resources/help/en/images/interface/pluginstab.png b/apps/documenteditor/main/resources/help/en/images/interface/pluginstab.png
index d4de27924..ce1961c66 100644
Binary files a/apps/documenteditor/main/resources/help/en/images/interface/pluginstab.png and b/apps/documenteditor/main/resources/help/en/images/interface/pluginstab.png differ
diff --git a/apps/documenteditor/main/resources/help/en/images/interface/referencestab.png b/apps/documenteditor/main/resources/help/en/images/interface/referencestab.png
index 399fb87fe..3c1247da4 100644
Binary files a/apps/documenteditor/main/resources/help/en/images/interface/referencestab.png and b/apps/documenteditor/main/resources/help/en/images/interface/referencestab.png differ
diff --git a/apps/documenteditor/main/resources/help/en/images/interface/reviewtab.png b/apps/documenteditor/main/resources/help/en/images/interface/reviewtab.png
index cf8918abf..f67bf22db 100644
Binary files a/apps/documenteditor/main/resources/help/en/images/interface/reviewtab.png and b/apps/documenteditor/main/resources/help/en/images/interface/reviewtab.png differ
diff --git a/apps/documenteditor/main/resources/help/en/images/referencestab.png b/apps/documenteditor/main/resources/help/en/images/referencestab.png
index 74603527b..e9b546d54 100644
Binary files a/apps/documenteditor/main/resources/help/en/images/referencestab.png and b/apps/documenteditor/main/resources/help/en/images/referencestab.png differ
diff --git a/apps/spreadsheeteditor/main/app/view/DataValidationDialog.js b/apps/spreadsheeteditor/main/app/view/DataValidationDialog.js
index fa068fc84..c44029c1d 100644
--- a/apps/spreadsheeteditor/main/app/view/DataValidationDialog.js
+++ b/apps/spreadsheeteditor/main/app/view/DataValidationDialog.js
@@ -220,8 +220,8 @@ define([    'text!spreadsheeteditor/main/app/template/DataValidationDialog.templ
                     {value: Asc.c_oAscEDataValidationErrorStyle.Warning, clsText: 'warn', displayValue: this.textAlert},
                     {value: Asc.c_oAscEDataValidationErrorStyle.Information, clsText: 'info', displayValue: this.textMessage}
                 ],
-                style: 'width: 95px;',
-                menuStyle   : 'min-width: 95px;',
+                style: 'width: 110px;',
+                menuStyle   : 'min-width: 110px;',
                 takeFocusOnClose: true
             });
             this.cmbStyle.setValue(Asc.c_oAscEDataValidationErrorStyle.Stop);
@@ -232,7 +232,7 @@ define([    'text!spreadsheeteditor/main/app/template/DataValidationDialog.templ
                 allowBlank  : true,
                 validateOnBlur: false,
                 maxLength: 32,
-                style       : 'width: 100%;'
+                style       : 'width: 140px;'
             }).on('changed:after', function() {
                 me.isErrorTitleChanged = true;
             });