diff --git a/apps/common/main/lib/component/Menu.js b/apps/common/main/lib/component/Menu.js
index cf6917e6a..c28a62d3d 100644
--- a/apps/common/main/lib/component/Menu.js
+++ b/apps/common/main/lib/component/Menu.js
@@ -454,6 +454,7 @@ define([
                         Common.UI.Menu.Manager.hideAll();
                     if ( $(e.currentTarget).closest('li').hasClass('dropdown-submenu')) {
                         e.stopPropagation();
+                        return false;
                     }
                 } else if (e.keyCode == Common.UI.Keys.UP || e.keyCode == Common.UI.Keys.DOWN)  {
                     this.fromKeyDown = true;
diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js
index 9fae3dfc1..5212e6863 100644
--- a/apps/documenteditor/main/app/controller/Main.js
+++ b/apps/documenteditor/main/app/controller/Main.js
@@ -593,7 +593,7 @@ define([
                     this.setLongActionView(action)
                 } else {
                     var me = this;
-                    if (id==Asc.c_oAscAsyncAction['Save'] || id==Asc.c_oAscAsyncAction['ForceSaveButton']) {
+                    if ((id==Asc.c_oAscAsyncAction['Save'] || id==Asc.c_oAscAsyncAction['ForceSaveButton']) && !this.appOptions.isOffline) {
                         if (this._state.fastCoauth && this._state.usersCount>1) {
                             me._state.timerSave = setTimeout(function () {
                                 me.getApplication().getController('Statusbar').setStatusCaption(me.textChangesSaved, false, 3000);
@@ -631,8 +631,8 @@ define([
                     case Asc.c_oAscAsyncAction['ForceSaveButton']:
                         clearTimeout(this._state.timerSave);
                         force = true;
-                        title   = this.saveTitleText;
-                        text    = this.saveTextText;
+                        title   = (!this.appOptions.isOffline) ? this.saveTitleText : '';
+                        text    = (!this.appOptions.isOffline) ? this.saveTextText : '';
                         break;
 
                     case Asc.c_oAscAsyncAction['LoadDocumentFonts']:
diff --git a/apps/documenteditor/main/resources/img/toolbar/charttypes.png b/apps/documenteditor/main/resources/img/toolbar/charttypes.png
index 1a809d63f..e13818e76 100644
Binary files a/apps/documenteditor/main/resources/img/toolbar/charttypes.png and b/apps/documenteditor/main/resources/img/toolbar/charttypes.png differ
diff --git a/apps/documenteditor/main/resources/img/toolbar/charttypes@2x.png b/apps/documenteditor/main/resources/img/toolbar/charttypes@2x.png
index fcd18de30..aac960d29 100644
Binary files a/apps/documenteditor/main/resources/img/toolbar/charttypes@2x.png and b/apps/documenteditor/main/resources/img/toolbar/charttypes@2x.png differ
diff --git a/apps/documenteditor/main/resources/less/toolbar.less b/apps/documenteditor/main/resources/less/toolbar.less
index 69181f0b7..f3dcb481e 100644
--- a/apps/documenteditor/main/resources/less/toolbar.less
+++ b/apps/documenteditor/main/resources/less/toolbar.less
@@ -229,19 +229,19 @@
 }
 
 .surface-normal{
-    background-position: -100px -200px;
+    background-position: 0px -300px;
 }
 
 .surface-wireframe{
-    background-position: -100px -200px;
+    background-position: -50px -300px;
 }
 
 .contour-normal{
-    background-position: -100px -200px;
+    background-position: -100px -300px;
 }
 
 .contour-wireframe{
-    background-position: -100px -200px;
+    background-position: -150px -300px;
 }
 
 @toolbar-icon-size: 20px;
diff --git a/apps/documenteditor/mobile/app/controller/Main.js b/apps/documenteditor/mobile/app/controller/Main.js
index 48cb17f9e..6d58ec665 100644
--- a/apps/documenteditor/mobile/app/controller/Main.js
+++ b/apps/documenteditor/mobile/app/controller/Main.js
@@ -541,6 +541,8 @@ define([
                     me.api.zoomFitToWidth();
                 }
 
+                DE.getController('Toolbar').activateControls();
+
                 if (me._state.licenseWarning) {
                     value = Common.localStorage.getItem("de-license-warning");
                     value = (value!==null) ? parseInt(value) : 0;
diff --git a/apps/documenteditor/mobile/app/controller/Toolbar.js b/apps/documenteditor/mobile/app/controller/Toolbar.js
index 3de97ec31..2da2aca06 100644
--- a/apps/documenteditor/mobile/app/controller/Toolbar.js
+++ b/apps/documenteditor/mobile/app/controller/Toolbar.js
@@ -157,6 +157,10 @@ define([
                 }
             },
 
+            activateControls: function() {
+                $('#toolbar-edit, #toolbar-add, #toolbar-settings, #toolbar-search, #document-back').removeClass('disabled');
+            },
+
             dlgLeaveTitleText   : 'You leave the application',
             dlgLeaveMsgText     : 'You have unsaved changes in this document. Click \'Stay on this Page\' to await the autosave of the document. Click \'Leave this Page\' to discard all the unsaved changes.',
             leaveButtonText     : 'Leave this Page',
diff --git a/apps/documenteditor/mobile/app/view/Toolbar.js b/apps/documenteditor/mobile/app/view/Toolbar.js
index 36d32df7a..0af0270a3 100644
--- a/apps/documenteditor/mobile/app/view/Toolbar.js
+++ b/apps/documenteditor/mobile/app/view/Toolbar.js
@@ -92,6 +92,7 @@ define([
                 }));
 
                 $('.view-main .navbar').on('addClass removeClass', _.bind(me.onDisplayMainNavbar, me));
+                $('#toolbar-edit, #toolbar-add, #toolbar-settings, #toolbar-search, #document-back').addClass('disabled');
 
                 return me;
             },
diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js
index e195f8583..206abb901 100644
--- a/apps/presentationeditor/main/app/controller/Main.js
+++ b/apps/presentationeditor/main/app/controller/Main.js
@@ -413,7 +413,7 @@ define([
                 if (action) {
                     this.setLongActionView(action)
                 } else {
-                    if (id==Asc.c_oAscAsyncAction['Save'] || id==Asc.c_oAscAsyncAction['ForceSaveButton']) {
+                    if ((id==Asc.c_oAscAsyncAction['Save'] || id==Asc.c_oAscAsyncAction['ForceSaveButton']) && !this.appOptions.isOffline) {
                         if (this._state.fastCoauth && this._state.usersCount>1) {
                             var me = this;
                             me._state.timerSave = setTimeout(function () {
@@ -451,8 +451,8 @@ define([
                     case Asc.c_oAscAsyncAction['ForceSaveButton']:
                         clearTimeout(this._state.timerSave);
                         force = true;
-                        // title   = this.saveTitleText;
-                        // text    = this.saveTextText;
+                        // title   = (!this.appOptions.isOffline) ? this.saveTitleText : '';
+                        // text    = (!this.appOptions.isOffline) ? this.saveTextText : '';
                         break;
 
                     case Asc.c_oAscAsyncAction['ForceSaveTimeout']:
diff --git a/apps/presentationeditor/main/resources/img/toolbar/charttypes.png b/apps/presentationeditor/main/resources/img/toolbar/charttypes.png
index 1a809d63f..e13818e76 100644
Binary files a/apps/presentationeditor/main/resources/img/toolbar/charttypes.png and b/apps/presentationeditor/main/resources/img/toolbar/charttypes.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/charttypes@2x.png b/apps/presentationeditor/main/resources/img/toolbar/charttypes@2x.png
index fcd18de30..aac960d29 100644
Binary files a/apps/presentationeditor/main/resources/img/toolbar/charttypes@2x.png and b/apps/presentationeditor/main/resources/img/toolbar/charttypes@2x.png differ
diff --git a/apps/presentationeditor/main/resources/less/toolbar.less b/apps/presentationeditor/main/resources/less/toolbar.less
index 37c1aa167..95ff31f34 100644
--- a/apps/presentationeditor/main/resources/less/toolbar.less
+++ b/apps/presentationeditor/main/resources/less/toolbar.less
@@ -223,19 +223,19 @@
 }
 
 .surface-normal{
-    background-position: -100px -200px;
+    background-position: 0px -300px;
 }
 
 .surface-wireframe{
-    background-position: -100px -200px;
+    background-position: -50px -300px;
 }
 
 .contour-normal{
-    background-position: -100px -200px;
+    background-position: -100px -300px;
 }
 
 .contour-wireframe{
-    background-position: -100px -200px;
+    background-position: -150px -300px;
 }
 
 @toolbar-icon-size: 20px;
diff --git a/apps/presentationeditor/mobile/app/controller/Main.js b/apps/presentationeditor/mobile/app/controller/Main.js
index 3ec2750a0..be8911e8d 100644
--- a/apps/presentationeditor/mobile/app/controller/Main.js
+++ b/apps/presentationeditor/mobile/app/controller/Main.js
@@ -508,6 +508,8 @@ define([
                     me.api.zoomFitToPage();
                 }
 
+                PE.getController('Toolbar').activateControls();
+
                 if (me._state.licenseWarning) {
                     value = Common.localStorage.getItem("de-license-warning");
                     value = (value!==null) ? parseInt(value) : 0;
diff --git a/apps/presentationeditor/mobile/app/controller/Toolbar.js b/apps/presentationeditor/mobile/app/controller/Toolbar.js
index 6364cb1ba..f9e5c197d 100644
--- a/apps/presentationeditor/mobile/app/controller/Toolbar.js
+++ b/apps/presentationeditor/mobile/app/controller/Toolbar.js
@@ -168,6 +168,10 @@ define([
                 }
             },
 
+            activateControls: function() {
+                $('#toolbar-preview, #toolbar-settings, #toolbar-search, #document-back').removeClass('disabled');
+            },
+
             dlgLeaveTitleText   : 'You leave the application',
             dlgLeaveMsgText     : 'You have unsaved changes in this document. Click \'Stay on this Page\' to await the autosave of the document. Click \'Leave this Page\' to discard all the unsaved changes.',
             leaveButtonText     : 'Leave this Page',
diff --git a/apps/presentationeditor/mobile/app/view/Toolbar.js b/apps/presentationeditor/mobile/app/view/Toolbar.js
index bc73e504a..bc6e3891f 100644
--- a/apps/presentationeditor/mobile/app/view/Toolbar.js
+++ b/apps/presentationeditor/mobile/app/view/Toolbar.js
@@ -93,6 +93,7 @@ define([
                 }));
 
                 $('.view-main .navbar').on('addClass removeClass', _.bind(me.onDisplayMainNavbar, me));
+                $('#toolbar-preview, #toolbar-edit, #toolbar-add, #toolbar-settings, #toolbar-search, #document-back').addClass('disabled');
 
                 return me;
             },
diff --git a/apps/spreadsheeteditor/main/resources/img/charttypes.png b/apps/spreadsheeteditor/main/resources/img/charttypes.png
index accc8a021..e13818e76 100644
Binary files a/apps/spreadsheeteditor/main/resources/img/charttypes.png and b/apps/spreadsheeteditor/main/resources/img/charttypes.png differ
diff --git a/apps/spreadsheeteditor/main/resources/img/charttypes@2x.png b/apps/spreadsheeteditor/main/resources/img/charttypes@2x.png
index 40e98ea44..aac960d29 100644
Binary files a/apps/spreadsheeteditor/main/resources/img/charttypes@2x.png and b/apps/spreadsheeteditor/main/resources/img/charttypes@2x.png differ
diff --git a/apps/spreadsheeteditor/main/resources/less/rightmenu.less b/apps/spreadsheeteditor/main/resources/less/rightmenu.less
index d0bd18bcb..d50c9bf07 100644
--- a/apps/spreadsheeteditor/main/resources/less/rightmenu.less
+++ b/apps/spreadsheeteditor/main/resources/less/rightmenu.less
@@ -314,19 +314,19 @@ button:active:not(.disabled) .btn-change-shape    {background-position: -56px  -
 }
 
 .surface-normal{
-    background-position: -100px -200px;
+    background-position: 0px -300px;
 }
 
 .surface-wireframe{
-    background-position: -100px -200px;
+    background-position: -50px -300px;
 }
 
 .contour-normal{
-    background-position: -100px -200px;
+    background-position: -100px -300px;
 }
 
 .contour-wireframe{
-    background-position: -100px -200px;
+    background-position: -150px -300px;
 }
 
 #table-combo-template .combo-dataview{
diff --git a/apps/spreadsheeteditor/mobile/app/controller/Main.js b/apps/spreadsheeteditor/mobile/app/controller/Main.js
index f7f07d3ea..0f9d0798a 100644
--- a/apps/spreadsheeteditor/mobile/app/controller/Main.js
+++ b/apps/spreadsheeteditor/mobile/app/controller/Main.js
@@ -527,6 +527,7 @@ define([
                     mode: me.appOptions.isEdit ? 'edit' : 'view'
                 });
 
+                SSE.getController('Toolbar').activateControls();
 
                 if (me._state.licenseWarning) {
                     value = Common.localStorage.getItem("sse-license-warning");
diff --git a/apps/spreadsheeteditor/mobile/app/controller/Toolbar.js b/apps/spreadsheeteditor/mobile/app/controller/Toolbar.js
index e4bd62767..5ed1c7c18 100644
--- a/apps/spreadsheeteditor/mobile/app/controller/Toolbar.js
+++ b/apps/spreadsheeteditor/mobile/app/controller/Toolbar.js
@@ -191,6 +191,10 @@ define([
                 this.getView('Toolbar').disableControl(['add', 'edit'], islocked);
             },
 
+            activateControls: function() {
+                $('#toolbar-settings, #toolbar-search, #document-back').removeClass('disabled');
+            },
+
             dlgLeaveTitleText   : 'You leave the application',
             dlgLeaveMsgText     : 'You have unsaved changes in this document. Click \'Stay on this Page\' to await the autosave of the document. Click \'Leave this Page\' to discard all the unsaved changes.',
             leaveButtonText     : 'Leave this Page',
diff --git a/apps/spreadsheeteditor/mobile/app/view/Toolbar.js b/apps/spreadsheeteditor/mobile/app/view/Toolbar.js
index aff1c023f..a6f1b8e93 100644
--- a/apps/spreadsheeteditor/mobile/app/view/Toolbar.js
+++ b/apps/spreadsheeteditor/mobile/app/view/Toolbar.js
@@ -82,6 +82,7 @@ define([
                 }));
 
                 $('.view-main .navbar').on('addClass removeClass', _.bind(me.onDisplayMainNavbar, me));
+                $('#toolbar-edit, #toolbar-add, #toolbar-settings, #toolbar-search, #document-back').addClass('disabled');
 
                 this.$btnEdit = $el.find('#toolbar-edit');
                 this.$btnAdd = $el.find('#toolbar-add');