diff --git a/apps/api/documents/api.js b/apps/api/documents/api.js
index e689381f5c..4764619edc 100644
--- a/apps/api/documents/api.js
+++ b/apps/api/documents/api.js
@@ -477,7 +477,7 @@
                     }
                 }
 
-                var type = /^(?:(pdf|djvu|xps|oxps))$/.exec(_config.document.fileType);
+                var type = /^(?:(djvu|xps|oxps))$/.exec(_config.document.fileType);
                 if (type && typeof type[1] === 'string') {
                     _config.editorConfig.canUseHistory = false;
                 }
@@ -960,46 +960,53 @@
                 'word': 'documenteditor',
                 'cell': 'spreadsheeteditor',
                 'slide': 'presentationeditor',
-                'pdf': 'pdfeditor'
+                'pdf': 'pdfeditor',
+                'common': 'common'
             },
-            appType = 'word';
-
-        if (typeof config.documentType === 'string') {
-            appType = config.documentType.toLowerCase();
-            if (config.type !== 'mobile' && config.type !== 'embedded' && !!config.document && typeof config.document.fileType === 'string') {
-                var type = /^(?:(pdf|djvu|xps|oxps))$/.exec(config.document.fileType);
-                if (type && typeof type[1] === 'string')
-                    appType = 'pdf';
-            }
-        } else
-        if (!!config.document && typeof config.document.fileType === 'string') {
-            var type = /^(?:(xls|xlsx|ods|csv|xlst|xlsy|gsheet|xlsm|xlt|xltm|xltx|fods|ots|xlsb)|(pps|ppsx|ppt|pptx|odp|pptt|ppty|gslides|pot|potm|potx|ppsm|pptm|fodp|otp)|(pdf|djvu|xps|oxps))$/
-                            .exec(config.document.fileType);
-            if (type) {
-                if (typeof type[1] === 'string') appType = 'cell'; else
-                if (typeof type[2] === 'string') appType = 'slide'; else
-                if (typeof type[3] === 'string' && config.type !== 'mobile' && config.type !== 'embedded') appType = 'pdf';
-            }
+            appType = 'word',
+            type,
+            fillForms = false,
+            isForm = false;
+        if (config.document) {
+            if (typeof config.document.fileType === 'string')
+                type = /^(?:(pdf)|(djvu|xps|oxps)|(xls|xlsx|ods|csv|xlst|xlsy|gsheet|xlsm|xlt|xltm|xltx|fods|ots|xlsb)|(pps|ppsx|ppt|pptx|odp|pptt|ppty|gslides|pot|potm|potx|ppsm|pptm|fodp|otp))$/
+                    .exec(config.document.fileType);
+
+            if (config.document.permissions)
+                fillForms = (config.document.permissions.fillForms===undefined ? config.document.permissions.edit !== false : config.document.permissions.fillForms) &&
+                            config.editorConfig && (config.editorConfig.mode !== 'view');
         }
-        if (appType === 'pdf' && (config.type === 'mobile' ||  config.type === 'embedded')) {
-            appType = 'word';
+        if (type && typeof type[2] === 'string') { // djvu|xps|oxps
+            appType = config.type === 'mobile' ||  config.type === 'embedded' ? 'word' : 'pdf';
+        } else if (type && typeof type[1] === 'string') { // pdf - need check
+            isForm = config.document ? config.document.isForm : undefined;
+            if (config.type === 'embedded')
+                appType = fillForms && isForm===undefined ? 'common' : 'word';
+            else if (config.type !== 'mobile')
+                appType = isForm===undefined ? 'common' : isForm ? 'word' : 'pdf';
+        } else {
+            if (typeof config.documentType === 'string')
+                appType = config.documentType.toLowerCase();
+            else {
+                if (type && typeof type[3] === 'string') appType = 'cell'; else
+                if (type && typeof type[4] === 'string') appType = 'slide';
+            }
         }
+        path += appMap[appType];
 
-        path += appMap[appType] + "/";
-        const path_type = config.type === "mobile"
-                    ? "mobile" : (config.type === "embedded")
-                    ? "embed" : "main";
+        const path_type = config.type === "mobile" ? "mobile" :
+                          config.type === "embedded" ? (fillForms && isForm ? "forms" : "embed") : "main";
+        if (appType !== 'common')
+            path += "/" + path_type;
 
-        path += path_type;
         var index = "/index.html";
-        if (config.editorConfig && path_type!=="forms") {
+        if (config.editorConfig && path_type!=="forms" && appType!=='common') {
             var customization = config.editorConfig.customization;
             if ( typeof(customization) == 'object' && ( customization.toolbarNoTabs ||
-                                                        (config.editorConfig.targetApp!=='desktop') && (customization.loaderName || customization.loaderLogo))) {
+               (config.editorConfig.targetApp!=='desktop') && (customization.loaderName || customization.loaderLogo))) {
                 index = "/index_loader.html";
             } else if (config.editorConfig.mode === 'editdiagram' || config.editorConfig.mode === 'editmerge' || config.editorConfig.mode === 'editole')
                 index = "/index_internal.html";
-
         }
         path += index;
         return path;
@@ -1036,6 +1043,9 @@
         if (config.editorConfig && (config.editorConfig.mode == 'editdiagram' || config.editorConfig.mode == 'editmerge' || config.editorConfig.mode == 'editole'))
             params += "&internal=true";
 
+        if (config.type)
+            params += "&type=" + config.type;
+
         if (config.frameEditorId)
             params += "&frameEditorId=" + config.frameEditorId;
 
@@ -1064,6 +1074,12 @@
         if (config.document && config.document.fileType)
             params += "&fileType=" + config.document.fileType;
 
+        if (config.editorConfig) {
+            var customization = config.editorConfig.customization;
+            if ( customization && typeof(customization) == 'object' && ( customization.toolbarNoTabs || (config.editorConfig.targetApp!=='desktop') && (customization.loaderName || customization.loaderLogo))) {
+                params += "&indexPostfix=_loader";
+            }
+        }
         return params;
     }
 
diff --git a/apps/common/index.html b/apps/common/index.html
new file mode 100644
index 0000000000..0a15bcbaab
--- /dev/null
+++ b/apps/common/index.html
@@ -0,0 +1,62 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+      <title>ONLYOFFICE Documents</title>
+      <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+      <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=IE8">
+      <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no">
+
+      <style type="text/css">
+          .loadmask {
+              left: 0;
+              top: 0;
+              position: absolute;
+              height: 100%;
+              width: 100%;
+              overflow: hidden;
+              border: none;
+              background: #e2e2e2;
+              background: var(--canvas-background, #e2e2e2);
+              z-index: 1002;
+          }
+
+          .theme-dark .loadmask, .theme-type-dark .loadmask {
+              background: #555;
+          }
+      </style>
+      <script>
+          function getUrlParams() {
+              var e,
+                  a = /\+/g,  // Regex for replacing addition symbol with a space
+                  r = /([^&=]+)=?([^&]*)/g,
+                  d = function (s) { return decodeURIComponent(s.replace(a, " ")); },
+                  q = window.location.search.substring(1),
+                  urlParams = {};
+
+              while (e = r.exec(q))
+                  urlParams[d(e[1])] = d(e[2]);
+
+              return urlParams;
+          }
+
+          var params = getUrlParams(),
+              postfix = params["indexPostfix"] || '',
+              embed = params["type"]==='embedded';
+          window.frameEditorId = params["frameEditorId"];
+          window.parentOrigin = params["parentOrigin"];
+      </script>
+      <script src="main/lib/util/themeinit.js"></script>
+  </head>
+  <body>
+      <script src="main/lib/util/htmlutils.js"></script>
+      <script type="text/javascript" src="checkExtendedPDF.js"></script>
+      <div id="loading-mask" class="loadmask"></div>
+      <script>
+          listenApiMsg(function (isform) {
+              var match = window.location.href.match(/(.*)common\/index.html/i);
+              match && window.location.replace(match[1] + (isform || embed ? 'documenteditor' : 'pdfeditor') + '/' + (isform && embed ? 'forms' : embed ? 'embed' : 'main') + '/index' + postfix + '.html' +
+                       window.location.search + ("&isForm=" + !!isform));
+          });
+      </script>
+  </body>
+</html>
diff --git a/apps/common/index.html.deploy b/apps/common/index.html.deploy
new file mode 100644
index 0000000000..444d04e20e
--- /dev/null
+++ b/apps/common/index.html.deploy
@@ -0,0 +1,62 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+      <title>ONLYOFFICE Documents</title>
+      <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+      <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=IE8">
+      <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no">
+
+      <style type="text/css">
+          .loadmask {
+              left: 0;
+              top: 0;
+              position: absolute;
+              height: 100%;
+              width: 100%;
+              overflow: hidden;
+              border: none;
+              background: #e2e2e2;
+              background: var(--canvas-background, #e2e2e2);
+              z-index: 1002;
+          }
+
+          .theme-dark .loadmask, .theme-type-dark .loadmask {
+              background: #555;
+          }
+      </style>
+      <script>
+          function getUrlParams() {
+              var e,
+                  a = /\+/g,  // Regex for replacing addition symbol with a space
+                  r = /([^&=]+)=?([^&]*)/g,
+                  d = function (s) { return decodeURIComponent(s.replace(a, " ")); },
+                  q = window.location.search.substring(1),
+                  urlParams = {};
+
+              while (e = r.exec(q))
+                  urlParams[d(e[1])] = d(e[2]);
+
+              return urlParams;
+          }
+
+          var params = getUrlParams(),
+              postfix = params["indexPostfix"] || '',
+              embed = params["type"]==='embedded';
+          window.frameEditorId = params["frameEditorId"];
+          window.parentOrigin = params["parentOrigin"];
+      </script>
+      <script src="../../../../apps/common/main/lib/util/themeinit.js?__inline=true"></script>
+  </head>
+  <body>
+      <script src="../../../../apps/common/main/lib/util/htmlutils.js?__inline=true"></script>
+      <script src="../../../../apps/common/checkExtendedPDF.js?__inline=true"></script>
+      <div id="loading-mask" class="loadmask"></div>
+      <script>
+          listenApiMsg(function (isform) {
+              var match = window.location.href.match(/(.*)common\/index.html/i);
+              match && window.location.replace(match[1] + (isform || embed ? 'documenteditor' : 'pdfeditor') + '/' + (isform && embed ? 'forms' : embed ? 'embed' : 'main') + '/index' + postfix + '.html' +
+                       window.location.search + ("&isForm=" + !!isform));
+          });
+      </script>
+  </body>
+</html>
diff --git a/apps/common/main/lib/view/Header.js b/apps/common/main/lib/view/Header.js
index 2152728c54..13b5840449 100644
--- a/apps/common/main/lib/view/Header.js
+++ b/apps/common/main/lib/view/Header.js
@@ -203,13 +203,13 @@ define([
             } else {
                 $panelUsers['hide']();
             }
-            updateDocNamePosition(appConfig);
+            updateDocNamePosition();
         }
 
         function onLostEditRights() {
             _readonlyRights = true;
             this.btnShare && this.btnShare.setVisible(false);
-            updateDocNamePosition(appConfig);
+            updateDocNamePosition();
         }
 
         function onUsersClick(e) {
@@ -223,14 +223,15 @@ define([
         }
 
         function updateDocNamePosition(config) {
+            config = config || appConfig;
             if ( $labelDocName && config) {
                 var $parent = $labelDocName.parent();
-                if (!(config.isEdit || isPDFEditor && config.isRestrictedEdit)) {
+                if (!config.twoLevelHeader) {
                     var _left_width = $parent.position().left,
                         _right_width = $parent.next().outerWidth();
                     $parent.css('padding-left', _left_width < _right_width ? Math.max(2, _right_width - _left_width) : 2);
                     $parent.css('padding-right', _left_width < _right_width ? 2 : Math.max(2, _left_width - _right_width));
-                } else if (!(config.customization && config.customization.compactHeader)) {
+                } else if (!config.compactHeader) {
                     var _left_width = $parent.position().left,
                         _right_width = $parent.next().outerWidth(),
                         outerWidth = $labelDocName.outerWidth(),
@@ -245,7 +246,7 @@ define([
                     }
                 }
 
-                if (!(config.customization && config.customization.toolbarHideFileName) && (!(config.isEdit || isPDFEditor && config.isRestrictedEdit) || config.customization && config.customization.compactHeader)) {
+                if (!(config.customization && config.customization.toolbarHideFileName) && (!config.twoLevelHeader || config.compactHeader)) {
                     var basis = parseFloat($parent.css('padding-left') || 0) + parseFloat($parent.css('padding-right') || 0) + parseInt($labelDocName.css('min-width') || 50); // 2px - box-shadow
                     config.isCrypted && (basis += 20);
                     $parent.css('flex-basis', Math.ceil(basis) + 'px');
@@ -285,9 +286,8 @@ define([
         }
 
         function onResize() {
-            if (appConfig && (appConfig.isEdit || isPDFEditor && appConfig.isRestrictedEdit) && !(appConfig.customization && appConfig.customization.compactHeader)) {
-                updateDocNamePosition(appConfig);
-            }
+            if (appConfig && appConfig.twoLevelHeader && !appConfig.compactHeader)
+                updateDocNamePosition();
         }
 
         function onAppShowed(config) {
@@ -336,7 +336,7 @@ define([
                 });
                 me.btnShare.updateHint(me.tipAccessRights);
                 me.btnShare.setVisible(!_readonlyRights && appConfig && (appConfig.sharingSettingsUrl && appConfig.sharingSettingsUrl.length || appConfig.canRequestSharingSettings));
-                updateDocNamePosition(appConfig);
+                updateDocNamePosition();
             }
 
             if ( me.logo )
@@ -367,7 +367,7 @@ define([
                 });
                 $btnUsers.on('click', onUsersClick.bind(me));
                 $panelUsers[(appConfig && (editingUsers > 1 && (appConfig.isEdit || appConfig.isRestrictedEdit) || editingUsers > 0 && appConfig.canLiveView)) ? 'show' : 'hide']();
-                updateDocNamePosition(appConfig);
+                updateDocNamePosition();
             }
 
             if (appConfig.user.guest && appConfig.canRenameAnonymous) {
@@ -413,7 +413,7 @@ define([
                 });
             }
 
-            if ( !(mode.isEdit || isPDFEditor && mode.isRestrictedEdit) ) {
+            if ( !appConfig.twoLevelHeader ) {
                 if ( me.btnDownload ) {
                     me.btnDownload.updateHint(me.tipDownload);
                     me.btnDownload.on('click', function (e) {
@@ -505,7 +505,7 @@ define([
                     Common.NotificationCenter.trigger('doc:mode-apply', item.value, true);
                 });
             }
-            if ((appConfig.isEdit || isPDFEditor && appConfig.isRestrictedEdit) && !(appConfig.customization && appConfig.customization.compactHeader))
+            if (appConfig.twoLevelHeader && !appConfig.compactHeader)
                 Common.NotificationCenter.on('window:resize', onResize);
         }
 
@@ -629,7 +629,7 @@ define([
                 Common.NotificationCenter.on({
                     'app:ready': function(mode) {Common.Utils.asyncCall(onAppReady, me, mode);},
                     'app:face': function(mode) {Common.Utils.asyncCall(onAppShowed, me, mode);},
-                    'tab:visible': function() {Common.Utils.asyncCall(updateDocNamePosition, me, appConfig);},
+                    'tab:visible': function() {Common.Utils.asyncCall(updateDocNamePosition, me);},
                     'collaboration:sharingdeny': function(mode) {Common.Utils.asyncCall(onLostEditRights, me, mode);}
                 });
                 Common.NotificationCenter.on('uitheme:changed', this.changeLogo.bind(this));
@@ -706,7 +706,7 @@ define([
                         $html.find('#slot-btn-favorite').hide();
                     }
 
-                    if ( !(config.isEdit || isPDFEditor && config.isRestrictedEdit)) {
+                    if ( !config.twoLevelHeader) {
                         if ( (config.canDownload || config.canDownloadOrigin) && !config.isOffline  )
                             this.btnDownload = createTitleButton('toolbar__icon icon--inverse btn-download', $html.findById('#slot-hbtn-download'), undefined, 'bottom', 'big');
 
@@ -721,7 +721,7 @@ define([
                     }
                     me.btnSearch.render($html.find('#slot-btn-search'));
 
-                    if (!(config.isEdit || isPDFEditor && config.isRestrictedEdit) || config.customization && !!config.customization.compactHeader) {
+                    if (!config.twoLevelHeader || config.compactHeader) {
                         if (config.user.guest && config.canRenameAnonymous) {
                             me.btnUserName = new Common.UI.Button({
                                 el: $html.findById('.slot-btn-user-name'),
@@ -823,13 +823,13 @@ define([
                     if ( config.canCloseEditor )
                         me.btnClose = createTitleButton('toolbar__icon icon--inverse btn-close', $html.findById('#slot-btn-close'), false, 'left', '10, 10');
 
-                    if ( config.canPrint && (config.isEdit || isPDFEditor && config.isRestrictedEdit) ) {
+                    if ( config.canPrint && config.twoLevelHeader ) {
                         me.btnPrint = createTitleButton('toolbar__icon icon--inverse btn-print', $html.findById('#slot-btn-dt-print'), true, undefined, undefined, 'P');
                     }
-                    if ( config.canQuickPrint && (config.isEdit || isPDFEditor && config.isRestrictedEdit) )
+                    if ( config.canQuickPrint && config.twoLevelHeader )
                         me.btnPrintQuick = createTitleButton('toolbar__icon icon--inverse btn-quick-print', $html.findById('#slot-btn-dt-print-quick'), true, undefined, undefined, 'Q');
 
-                    if (!isPDFEditor || !config.isForm)
+                    if (!isPDFEditor && !(config.isPDFForm && config.canFillForms && config.isRestrictedEdit) || isPDFEditor && !config.isForm)
                         me.btnSave = createTitleButton('toolbar__icon icon--inverse btn-save', $html.findById('#slot-btn-dt-save'), true, undefined, undefined, 'S');
                     me.btnUndo = createTitleButton('toolbar__icon icon--inverse btn-undo', $html.findById('#slot-btn-dt-undo'), true, undefined, undefined, 'Z',
                                                     [Common.enumLock.undoLock, Common.enumLock.fileMenuOpened]);
@@ -901,7 +901,7 @@ define([
                 this.btnGoBack[value ? 'show' : 'hide']();
                 if (value)
                     this.btnGoBack.updateHint((text && typeof text == 'string') ? text : this.textBack);
-                updateDocNamePosition(appConfig);
+                updateDocNamePosition();
                 return this;
             },
 
@@ -914,7 +914,7 @@ define([
                 this.btnFavorite[value!==undefined && value!==null ? 'show' : 'hide']();
                 this.btnFavorite.changeIcon(!!value ? {next: 'btn-in-favorite', curr: 'btn-favorite'} : {next: 'btn-favorite', curr: 'btn-in-favorite'});
                 this.btnFavorite.updateHint(!value ? this.textAddFavorite : this.textRemoveFavorite);
-                updateDocNamePosition(appConfig);
+                updateDocNamePosition();
                 return this;
             },
 
diff --git a/apps/common/main/resources/less/asc-mixins.less b/apps/common/main/resources/less/asc-mixins.less
index cedc33457b..07d7a9a666 100644
--- a/apps/common/main/resources/less/asc-mixins.less
+++ b/apps/common/main/resources/less/asc-mixins.less
@@ -844,3 +844,23 @@
 //        }
 //    }
 //}
+
+.header-background-color {
+    background-color: @header-background-color-ie;
+    background-color: @header-background-color;
+
+    .pdf-form & {
+        background-color: @header-background-color-pdf-ie;
+        background-color: @header-background-color-pdf;
+    }
+}
+
+.header-border-color {
+    border-color: @header-background-color-ie !important;
+    border-color: @header-background-color !important;
+
+    .pdf-form & {
+        border-color: @header-background-color-pdf-ie !important;
+        border-color: @header-background-color-pdf !important;
+    }
+}
diff --git a/apps/common/main/resources/less/calendar.less b/apps/common/main/resources/less/calendar.less
index 97fe8653b2..57e3b47873 100644
--- a/apps/common/main/resources/less/calendar.less
+++ b/apps/common/main/resources/less/calendar.less
@@ -1,6 +1,3 @@
-@calendar-bg-color: @header-background-color-ie;
-@calendar-bg-color: @header-background-color;
-
 .calendar-window {
   border-radius: 0;
   box-shadow: none;
diff --git a/apps/common/main/resources/less/header.less b/apps/common/main/resources/less/header.less
index fd5e028c57..078a0f7035 100644
--- a/apps/common/main/resources/less/header.less
+++ b/apps/common/main/resources/less/header.less
@@ -403,6 +403,10 @@
         background-color: @icon-toolbar-header;
         color: @toolbar-header-text-on-background-ie;
         color: @toolbar-header-text-on-background;
+        .pdf-form & {
+            color: @toolbar-header-text-on-background-pdf-ie;
+            color: @toolbar-header-text-on-background-pdf;
+        }
         vertical-align: middle;
         background-size: cover;
         background-position: center;
@@ -517,8 +521,7 @@
 }
 
 #box-document-title {
-    background-color: @header-background-color-ie;
-    background-color: @header-background-color;
+    .header-background-color();
     display: flex;
     height: 100%;
     color: @text-toolbar-header-ie;
diff --git a/apps/common/main/resources/less/synchronize-tip.less b/apps/common/main/resources/less/synchronize-tip.less
index 2300df36c6..5154cda520 100644
--- a/apps/common/main/resources/less/synchronize-tip.less
+++ b/apps/common/main/resources/less/synchronize-tip.less
@@ -29,13 +29,10 @@
 
     &.theme-color {
         .asc-synchronizetip {
-            background-color: @header-background-color-ie;
-            background-color: @header-background-color;
+            .header-background-color();
             color: @text-toolbar-header-ie;
             color: @text-toolbar-header;
-            border-color: @header-background-color-ie;
-            border-color: @header-background-color;
-
+            .header-border-color();
             .close {
                 &:before, &:after {
                     background-color: @text-toolbar-header-ie;
@@ -45,14 +42,11 @@
         }
 
         .tip-arrow:before {
-            background-color: @header-background-color-ie;
-            background-color: @header-background-color;
-            border-color: @header-background-color-ie !important;
-            border-color: @header-background-color !important;
+            .header-background-color();
+            .header-border-color();
         }
         .tip-arrow:after {
-            border-color: @header-background-color-ie !important;
-            border-color: @header-background-color !important;
+            .header-border-color();
         }
     }
 
diff --git a/apps/common/main/resources/less/toolbar.less b/apps/common/main/resources/less/toolbar.less
index 249778a258..8b19f96f98 100644
--- a/apps/common/main/resources/less/toolbar.less
+++ b/apps/common/main/resources/less/toolbar.less
@@ -38,9 +38,7 @@
         align-items: stretch;
 
         .extra {
-            background-color: @header-background-color-ie;
-            background-color: @header-background-color;
-
+            .header-background-color();
             box-shadow: inset 0 @minus-px 0 0 @border-toolbar-active-panel-top;
         }
 
@@ -60,8 +58,7 @@
 
     .tabs {
         //flex-grow: 1;
-        background-color: @header-background-color-ie;
-        background-color: @header-background-color;
+        .header-background-color();
         position: relative;
         overflow: hidden;
         display: flex;
@@ -174,6 +171,10 @@
             &.left{
                 box-shadow: 5px 0 20px 5px @header-background-color-ie;
                 box-shadow: 18px calc(@tabs-scroller-height - @scaled-one-px-value) 0 10px @border-toolbar-active-panel-top, 5px 0 20px 5px @header-background-color;
+                .pdf-form & {
+                    box-shadow: 5px 0 20px 5px @header-background-color-pdf-ie;
+                    box-shadow: 18px calc(@tabs-scroller-height - @scaled-one-px-value) 0 10px @border-toolbar-active-panel-top, 5px 0 20px 5px @header-background-color-pdf;
+                }
 
                 &:after {
                     transform: rotate(135deg);
@@ -188,6 +189,10 @@
             &.right{
                 box-shadow: -5px 0 20px 5px @header-background-color-ie;
                 box-shadow: -10px calc(@tabs-scroller-height - @scaled-one-px-value) 0 10px @border-toolbar-active-panel-top, -5px 0 20px 5px @header-background-color;
+                .pdf-form & {
+                    box-shadow: -5px 0 20px 5px @header-background-color-pdf-ie;
+                    box-shadow: -10px calc(@tabs-scroller-height - @scaled-one-px-value) 0 10px @border-toolbar-active-panel-top, -5px 0 20px 5px @header-background-color-pdf;
+                }
 
                 &:after {
                     transform: rotate(-45deg);
@@ -466,7 +471,7 @@
     .toolbar {
         @underscore_height: 3px;
 
-        .tabs, .extra {
+        .tabs, .box-tabs .extra {
             background-color: transparent;
             box-shadow: inset 0 -1px 0 0 @border-regular-control-ie;
             box-shadow: inset 0 -1px 0 0 @border-regular-control;
@@ -652,8 +657,7 @@
 
         &.editor-native-color {
             .tabs li:after {
-                border-color: @header-background-color-ie;
-                border-color: @header-background-color;
+                .header-border-color();
             }
         }
     }
diff --git a/apps/common/main/resources/less/variables.less b/apps/common/main/resources/less/variables.less
index d02a0fef86..2d03274209 100644
--- a/apps/common/main/resources/less/variables.less
+++ b/apps/common/main/resources/less/variables.less
@@ -40,6 +40,11 @@
 @brand-danger:          #d9534f;
 @brand-info:            #5bc0de;
 
+@header-background-color-pdf-ie: @toolbar-header-pdf-ie;
+@header-background-color-pdf: var(--toolbar-header-pdf);
+@toolbar-header-text-on-background-pdf-ie: @text-toolbar-header-on-background-pdf-ie;
+@toolbar-header-text-on-background-pdf: var(--text-toolbar-header-on-background-pdf);
+
 // Scaffolding
 // -------------------------
 
diff --git a/apps/documenteditor/main/app/controller/DocumentHolder.js b/apps/documenteditor/main/app/controller/DocumentHolder.js
index c0fa8ad4a3..dd6d84316f 100644
--- a/apps/documenteditor/main/app/controller/DocumentHolder.js
+++ b/apps/documenteditor/main/app/controller/DocumentHolder.js
@@ -265,7 +265,7 @@ define([
             var me = this,
                 view = me.documentHolder;
 
-            if (type=='view') {
+            if (type==='view') {
                 view.menuViewCopy.on('click', _.bind(me.onCutCopyPaste, me));
                 view.menuViewPaste.on('click', _.bind(me.onCutCopyPaste, me));
                 view.menuViewCut.on('click', _.bind(me.onCutCopyPaste, me));
@@ -277,9 +277,17 @@ define([
                 view.menuSignatureRemove.on('click', _.bind(me.onSignatureClick, me));
                 view.menuViewPrint.on('click', _.bind(me.onPrintSelection, me));
                 return;
-            } else if (type=='pdf') {
+            } else if (type==='pdf') {
                 view.menuPDFViewCopy.on('click', _.bind(me.onCutCopyPaste, me));
                 return;
+            } else if (type==='forms') {
+                view.menuPDFFormsUndo.on('click', _.bind(me.onUndo, me));
+                view.menuPDFFormsRedo.on('click', _.bind(me.onRedo, me));
+                view.menuPDFFormsClear.on('click', _.bind(me.onClear, me));
+                view.menuPDFFormsCut.on('click', _.bind(me.onCutCopyPaste, me));
+                view.menuPDFFormsCopy.on('click', _.bind(me.onCutCopyPaste, me));
+                view.menuPDFFormsPaste.on('click', _.bind(me.onCutCopyPaste, me));
+                return;
             }
 
             // type == 'edit'
@@ -605,12 +613,50 @@ define([
             return (!noobject) ? {menu_to_show: menu_to_show, menu_props: menu_props} : null;
         },
 
+        fillFormsMenuProps: function(selectedElements) {
+            if (!selectedElements || !_.isArray(selectedElements)) return;
+
+            var documentHolder = this.documentHolder;
+            if (!documentHolder.formsPDFMenu)
+                documentHolder.createDelayedElementsPDFForms();
+            var menu_props = {},
+                menu_to_show = documentHolder.formsPDFMenu,
+                noobject = true;
+            for (var i = 0; i <selectedElements.length; i++) {
+                var elType = selectedElements[i].get_ObjectType();
+                var elValue = selectedElements[i].get_ObjectValue();
+                if (Asc.c_oAscTypeSelectElement.Image == elType) {
+                    //image
+                    menu_props.imgProps = {};
+                    menu_props.imgProps.value = elValue;
+                    menu_props.imgProps.locked = (elValue) ? elValue.get_Locked() : false;
+
+                    var control_props = this.api.asc_IsContentControl() ? this.api.asc_GetContentControlProperties() : null,
+                        lock_type = (control_props) ? control_props.get_Lock() : Asc.c_oAscSdtLockType.Unlocked;
+                    menu_props.imgProps.content_locked = lock_type==Asc.c_oAscSdtLockType.SdtContentLocked || lock_type==Asc.c_oAscSdtLockType.ContentLocked;
+
+                    noobject = false;
+                } else if (Asc.c_oAscTypeSelectElement.Paragraph == elType) {
+                    menu_props.paraProps = {};
+                    menu_props.paraProps.value = elValue;
+                    menu_props.paraProps.locked = (elValue) ? elValue.get_Locked() : false;
+                    noobject = false;
+                } else if (Asc.c_oAscTypeSelectElement.Header == elType) {
+                    menu_props.headerProps = {};
+                    menu_props.headerProps.locked = (elValue) ? elValue.get_Locked() : false;
+                }
+            }
+            return (!noobject) ? {menu_to_show: menu_to_show, menu_props: menu_props} : null;
+        },
+
         showObjectMenu: function(event, docElement, eOpts){
             var me = this;
             if (me.api){
-                var docProtection = me.documentHolder._docProtection;
-                var obj = (me.mode.isEdit && !(me._isDisabled || docProtection.isReadOnly || docProtection.isFormsOnly || docProtection.isCommentsOnly)) ?
-                            me.fillMenuProps(me.api.getSelectedElements()) : me.fillViewMenuProps(me.api.getSelectedElements());
+                var docProtection = me.documentHolder._docProtection,
+                    disableEditing = me._isDisabled || docProtection.isReadOnly || docProtection.isFormsOnly || docProtection.isCommentsOnly,
+                    obj = me.mode.isEdit && !disableEditing ? me.fillMenuProps(me.api.getSelectedElements()) :
+                          me.mode.isPDFForm && me.mode.canFillForms && me.mode.isRestrictedEdit && !disableEditing ? me.fillFormsMenuProps(me.api.getSelectedElements()) :
+                            me.fillViewMenuProps(me.api.getSelectedElements());
                 if (obj) me.showPopupMenu(obj.menu_to_show, obj.menu_props, event, docElement, eOpts);
             }
         },
@@ -637,9 +683,11 @@ define([
             var me = this,
                 currentMenu = me.documentHolder.currentMenu;
             if (currentMenu && currentMenu.isVisible() && currentMenu !== me.documentHolder.hdrMenu){
-                var docProtection = me.documentHolder._docProtection;
-                var obj = (me.mode.isEdit && !(me._isDisabled || docProtection.isReadOnly || docProtection.isFormsOnly || docProtection.isCommentsOnly)) ?
-                            me.fillMenuProps(selectedElements) : me.fillViewMenuProps(selectedElements);
+                var docProtection = me.documentHolder._docProtection,
+                    disableEditing = me._isDisabled || docProtection.isReadOnly || docProtection.isFormsOnly || docProtection.isCommentsOnly,
+                    obj = me.mode.isEdit && !disableEditing ? me.fillMenuProps(selectedElements) :
+                          me.mode.isPDFForm && me.mode.canFillForms && me.mode.isRestrictedEdit && !disableEditing ? me.fillFormsMenuProps(selectedElements) :
+                          me.fillViewMenuProps(selectedElements);
                 if (obj) {
                     if (obj.menu_to_show===currentMenu) {
                         currentMenu.options.initMenu(obj.menu_props);
@@ -1941,7 +1989,20 @@ define([
         },
 
         onUndo: function () {
-            this.api.Undo();
+            this.api && this.api.Undo();
+        },
+
+        onRedo: function () {
+            this.api && this.api.Redo();
+        },
+
+        onClear: function () {
+            if (this.api) {
+                var props = this.api.asc_IsContentControl() ? this.api.asc_GetContentControlProperties() : null;
+                if (props) {
+                    this.api.asc_ClearContentControl(props.get_InternalId());
+                }
+            }
         },
 
         onAcceptRejectChange: function(item, e) {
diff --git a/apps/documenteditor/main/app/controller/FormsTab.js b/apps/documenteditor/main/app/controller/FormsTab.js
index 87a4844dd9..352ce379e3 100644
--- a/apps/documenteditor/main/app/controller/FormsTab.js
+++ b/apps/documenteditor/main/app/controller/FormsTab.js
@@ -80,7 +80,7 @@ define([
                 this.api.asc_registerCallback('asc_onError', _.bind(this.onError, this));
                 this.api.asc_registerCallback('asc_onDownloadUrl', _.bind(this.onDownloadUrl, this));
                 this.api.asc_registerCallback('asc_onUpdateOFormRoles', _.bind(this.onRefreshRolesList, this));
-
+                this.api.asc_registerCallback('sync_onAllRequiredFormsFilled', _.bind(this.onFillRequiredFields, this));
                 // this.api.asc_registerCallback('asc_onShowContentControlsActions',_.bind(this.onShowContentControlsActions, this));
                 // this.api.asc_registerCallback('asc_onHideContentControlsActions',_.bind(this.onHideContentControlsActions, this));
             }
@@ -98,14 +98,20 @@ define([
                 config: config.config
             });
             var dirRight = Common.UI.isRTL() ? 'left' : 'right',
-                dirLeft = Common.UI.isRTL() ? 'right' : 'left';
+                dirLeft = Common.UI.isRTL() ? 'right' : 'left',
+                me = this;
             this._helpTips = {
                 'create': {name: 'de-form-tip-create', placement: 'bottom-' + dirRight, text: this.view.tipCreateField, link: false, target: '#slot-btn-form-field'},
                 'key': {name: 'de-form-tip-settings-key', placement: dirLeft + '-bottom', text: this.view.tipFormKey, link: {text: this.view.tipFieldsLink, src: 'UsageInstructions\/CreateFillableForms.htm'}, target:  '#form-combo-key'},
                 'group-key': {name: 'de-form-tip-settings-group', placement: dirLeft + '-bottom', text: this.view.tipFormGroupKey, link: false, target:  '#form-combo-group-key'},
                 'settings': {name: 'de-form-tip-settings', placement: dirLeft + '-top', text: this.view.tipFieldSettings, link: {text: this.view.tipFieldsLink, src: 'UsageInstructions\/CreateFillableForms.htm'}, target:  '#id-right-menu-form'},
                 'roles': {name: 'de-form-tip-roles', placement: 'bottom-' + dirLeft, text: this.view.tipHelpRoles, link: {text: this.view.tipRolesLink, src: 'UsageInstructions\/CreateFillableForms.htm#managing_roles'}, target: '#slot-btn-manager'},
-                'save': this.appConfig.canDownloadForms ? {name: 'de-form-tip-save', placement: 'bottom-' + dirLeft, text: this.view.tipSaveFile, link: false, target: '#slot-btn-form-save'} : undefined
+                'save': this.appConfig.canDownloadForms ? {name: 'de-form-tip-save', placement: 'bottom-' + dirLeft, text: this.view.tipSaveFile, link: false, target: '#slot-btn-form-save'} : undefined,
+                'submit': this.appConfig.isRestrictedEdit ? {name: 'de-form-tip-submit', placement: 'bottom-' + dirRight, text: this.view.textRequired, link: false, target: '#slot-btn-form-submit',
+                                                            callback: function() {
+                                                                me.api.asc_MoveToFillingForm(true, true, true);
+                                                                me.view.btnSubmit.updateHint(me.view.textRequired);
+                                                            }} : undefined
             };
             !Common.localStorage.getItem(this._helpTips['key'].name) && this.addListeners({'RightMenu': {'rightmenuclick': this.onRightMenuClick}});
             this.addListeners({
@@ -352,12 +358,20 @@ define([
 
         onSaveFormClick: function() {
             this.closeHelpTip('save', true);
-            this.showRolesList(function() {
-                this.isFromFormSaveAs = this.appConfig.canRequestSaveAs || !!this.appConfig.saveAsUrl;
-                var options = new Asc.asc_CDownloadOptions(Asc.c_oAscFileType.PDF, this.isFromFormSaveAs);
-                options.asc_setIsSaveAs(this.isFromFormSaveAs);
-                this.api.asc_DownloadAs(options);
-            });
+            var me = this,
+                callback = function() {
+                    if (me.appConfig.isOffline)
+                        me.api.asc_DownloadAs(new Asc.asc_CDownloadOptions(Asc.c_oAscFileType.PDF));
+                    else {
+                        me.isFromFormSaveAs = me.appConfig.canRequestSaveAs || !!me.appConfig.saveAsUrl;
+                        var options = new Asc.asc_CDownloadOptions(Asc.c_oAscFileType.PDF, me.isFromFormSaveAs);
+                        options.asc_setIsSaveAs(me.isFromFormSaveAs);
+                        me.api.asc_DownloadAs(options);
+                    }
+                };
+            if (this.api && this.appConfig.canDownload) {
+                this.appConfig.isRestrictedEdit && this.appConfig.canFillForms ? callback() : this.showRolesList(callback);
+            }
         },
 
         onDownloadUrl: function(url, fileType) {
@@ -430,13 +444,13 @@ define([
             if (id==Asc.c_oAscAsyncAction['Submit'] && this.view.btnSubmit) {
                 this._submitFail = false;
                 this.submitedTooltip && this.submitedTooltip.hide();
-                this.view.btnSubmit.setDisabled(true);
+                Common.Utils.lockControls(Common.enumLock.submit, true, {array: [this.view.btnSubmit]})
             }
         },
 
         onLongActionEnd: function(type, id) {
             if (id==Asc.c_oAscAsyncAction['Submit'] && this.view.btnSubmit) {
-                this.view.btnSubmit.setDisabled(false);
+                Common.Utils.lockControls(Common.enumLock.submit, false, {array: [this.view.btnSubmit]})
                 if (!this.submitedTooltip) {
                     this.submitedTooltip = new Common.UI.SynchronizeTip({
                         text: this.view.textSubmited,
@@ -472,6 +486,10 @@ define([
                 // }
 
                 config.isEdit && config.canFeatureContentControl && config.isFormCreator && !config.isOForm && me.showHelpTip('create'); // show tip only when create form in docxf
+                if (config.isRestrictedEdit && me.view && me.view.btnSubmit && me.api && !me.api.asc_IsAllRequiredFormsFilled()) {
+                    Common.Utils.lockControls(Common.enumLock.requiredNotFilled, true, {array: [me.view.btnSubmit]});
+                    me.showHelpTip('submit');
+                }
                 me.onRefreshRolesList();
                 me.onChangeProtectDocument();
             });
@@ -521,6 +539,7 @@ define([
                     },
                     'close': function() {
                         Common.localStorage.setItem(props.name, 1);
+                        props.callback && props.callback();
                     }
                 });
                 props.tip.show();
@@ -600,7 +619,11 @@ define([
                 this.closeHelpTip('group-key');
                 this.closeHelpTip('settings');
             }
-        }
+        },
+
+        onFillRequiredFields: function(isFilled) {
+            this.appConfig.isRestrictedEdit && this.appConfig.canFillForms && this.view.btnSubmit && Common.Utils.lockControls(Common.enumLock.requiredNotFilled, !isFilled, {array: [this.view.btnSubmit]});
+        },
 
     }, DE.Controllers.FormsTab || {}));
 });
\ No newline at end of file
diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js
index fbb551e92d..9ce0b1493f 100644
--- a/apps/documenteditor/main/app/controller/Main.js
+++ b/apps/documenteditor/main/app/controller/Main.js
@@ -459,10 +459,10 @@ define([
                 this.appOptions.canFeatureComparison = true;
                 this.appOptions.canFeatureContentControl = true;
                 this.appOptions.canFeatureForms = !!this.api.asc_isSupportFeature("forms");
+                this.appOptions.isPDFForm = !!window.isPDFForm;
                 this.appOptions.uiRtl = !(Common.Controllers.Desktop.isActive() && Common.Controllers.Desktop.uiRtlSupported()) && !Common.Utils.isIE;
                 this.appOptions.disableNetworkFunctionality = !!(window["AscDesktopEditor"] && window["AscDesktopEditor"]["isSupportNetworkFunctionality"] && false === window["AscDesktopEditor"]["isSupportNetworkFunctionality"]());
                 this.appOptions.mentionShare = !((typeof (this.appOptions.customization) == 'object') && (this.appOptions.customization.mentionShare==false));
-
                 this.appOptions.user.guest && this.appOptions.canRenameAnonymous && Common.NotificationCenter.on('user:rename', _.bind(this.showRenameUserDialog, this));
 
                 this.appOptions.canRequestClose = this.editorConfig.canRequestClose;
@@ -549,13 +549,13 @@ define([
 //                    docInfo.put_Review(this.permissions.review);
 
                     var type = /^(?:(pdf|djvu|xps|oxps))$/.exec(data.doc.fileType);
-                    var coEditMode = (type && typeof type[1] === 'string') ? 'strict' :  // offline viewer for pdf|djvu|xps|oxps
+                    var coEditMode = (type && typeof type[1] === 'string' && !this.appOptions.isPDFForm) ? 'strict' :  // offline viewer for pdf|djvu|xps|oxps
                                     !(this.editorConfig.coEditing && typeof this.editorConfig.coEditing == 'object') ? 'fast' : // fast by default
                                     this.editorConfig.mode === 'view' && this.editorConfig.coEditing.change!==false ? 'fast' : // if can change mode in viewer - set fast for using live viewer
                                     this.editorConfig.coEditing.mode || 'fast';
                     docInfo.put_CoEditingMode(coEditMode);
 
-                    if (type && typeof type[1] === 'string') {
+                    if (type && typeof type[1] === 'string' && !this.appOptions.isPDFForm) {
                         this.permissions.edit = this.permissions.review = false;
                     }
                 }
@@ -568,8 +568,8 @@ define([
                         $('#editor-container').find('.doc-placeholder').css('margin-top', 19);
                 }
 
-                var type = data.doc ? /^(?:(docxf|oform))$/.exec(data.doc.fileType) : false;
-                this.appOptions.isFormCreator = !!(type && typeof type[1] === 'string') && this.appOptions.canFeatureForms; // show forms only for docxf or oform
+                var type = data.doc ? /^(?:(docxf|oform)|(pdf))$/.exec(data.doc.fileType) : false;
+                this.appOptions.isFormCreator = !!(type && (typeof type[1] === 'string' || typeof type[2] === 'string' && this.appOptions.isPDFForm)) && this.appOptions.canFeatureForms; // show forms only for docxf or oform
 
                 type = data.doc ? /^(?:(oform))$/.exec(data.doc.fileType) : false;
                 this.appOptions.isOForm = !!(type && typeof type[1] === 'string');
@@ -642,7 +642,7 @@ define([
                         Asc.c_oAscFileType.PNG
                     ];
                 var type = /^(?:(pdf|djvu|xps|oxps))$/.exec(this.document.fileType);
-                if (type && typeof type[1] === 'string') {
+                if (type && typeof type[1] === 'string' && !this.appOptions.isPDFForm) {
                     if (!(format && (typeof format == 'string')) || type[1]===format.toLowerCase()) {
                         var options = new Asc.asc_CDownloadOptions();
                         options.asc_setIsDownloadEvent(true);
@@ -1418,7 +1418,9 @@ define([
                         }
                     }, 50);
                 } else {
+                    me.appOptions.isRestrictedEdit && me.appOptions.canFillForms && me.api.asc_SetHighlightRequiredFields(true);
                     documentHolderController.getView().createDelayedElementsViewer();
+                    toolbarController.createDelayedElementsViewer();
                     Common.Utils.injectSvgIcons();
                     Common.NotificationCenter.trigger('document:ready', 'main');
                     me.applyLicense();
@@ -1564,7 +1566,7 @@ define([
 
                 if ( this.onServerVersion(params.asc_getBuildVersion()) || !this.onLanguageLoaded()) return;
 
-                var isPDFViewer = /^(?:(pdf|djvu|xps|oxps))$/.test(this.document.fileType);
+                var isPDFViewer = /^(?:(pdf|djvu|xps|oxps))$/.test(this.document.fileType) && !this.appOptions.isPDFForm;
 
                 this.permissions.review = (this.permissions.review === undefined) ? (this.permissions.edit !== false) : this.permissions.review;
 
@@ -1633,12 +1635,15 @@ define([
                 this.appOptions.canProtect     = (this.permissions.protect!==false);
                 this.appOptions.canEditContentControl = (this.permissions.modifyContentControl!==false);
                 this.appOptions.canHelp        = !((typeof (this.editorConfig.customization) == 'object') && this.editorConfig.customization.help===false);
-                this.appOptions.canSubmitForms = false; // this.appOptions.canLicense && (typeof (this.editorConfig.customization) == 'object') && !!this.editorConfig.customization.submitForm;
                 this.appOptions.canFillForms   = this.appOptions.canLicense && (this.appOptions.isEdit ? true : this.permissions.fillForms) && (this.editorConfig.mode !== 'view');
                 this.appOptions.isRestrictedEdit = !this.appOptions.isEdit && (this.appOptions.canComments || this.appOptions.canFillForms);
                 if (this.appOptions.isRestrictedEdit && this.appOptions.canComments && this.appOptions.canFillForms) // must be one restricted mode, priority for filling forms
                     this.appOptions.canComments = false;
                 this.appOptions.canSwitchMode  = this.appOptions.isEdit;
+                this.appOptions.canSubmitForms = this.appOptions.isRestrictedEdit && this.appOptions.canFillForms && this.appOptions.canLicense && (typeof (this.editorConfig.customization) == 'object') && !!this.editorConfig.customization.submitForm && !this.appOptions.isOffline;
+
+                this.appOptions.compactHeader = this.appOptions.customization && (typeof (this.appOptions.customization) == 'object') && !!this.appOptions.customization.compactHeader;
+                this.appOptions.twoLevelHeader = this.appOptions.isEdit || this.appOptions.isPDFForm && this.appOptions.canFillForms && this.appOptions.isRestrictedEdit; // when compactHeader=true some buttons move to toolbar
 
                 if ( this.appOptions.isLightVersion ) {
                     this.appOptions.canUseHistory =
@@ -1654,7 +1659,7 @@ define([
                 this.appOptions.canDownloadOrigin = false;
                 this.appOptions.canDownload       = this.permissions.download !== false;
                 this.appOptions.canUseSelectHandTools = this.appOptions.canUseThumbnails = this.appOptions.canUseViwerNavigation = isPDFViewer;
-                this.appOptions.canDownloadForms = this.appOptions.canLicense && this.appOptions.canDownload;
+                this.appOptions.canDownloadForms = this.appOptions.canLicense && this.appOptions.canDownload && this.appOptions.isRestrictedEdit && this.appOptions.canFillForms; // don't show download form button in edit mode
 
                 this.appOptions.fileKey = this.document.key;
 
@@ -1710,7 +1715,6 @@ define([
                 this.api.asc_setViewMode(!this.appOptions.isEdit && !this.appOptions.isRestrictedEdit);
                 this.appOptions.isRestrictedEdit && this.appOptions.canComments && this.api.asc_setRestriction(Asc.c_oAscRestrictionType.OnlyComments);
                 this.appOptions.isRestrictedEdit && this.appOptions.canFillForms && this.api.asc_setRestriction(Asc.c_oAscRestrictionType.OnlyForms);
-                this.appOptions.isRestrictedEdit && this.appOptions.canFillForms && this.api.asc_SetHighlightRequiredFields(true);
                 this.api.asc_LoadDocument();
             },
 
diff --git a/apps/documenteditor/main/app/controller/Toolbar.js b/apps/documenteditor/main/app/controller/Toolbar.js
index 0c931ad6d2..f1cd1c5142 100644
--- a/apps/documenteditor/main/app/controller/Toolbar.js
+++ b/apps/documenteditor/main/app/controller/Toolbar.js
@@ -461,6 +461,10 @@ define([
                 this.api.asc_registerCallback('asc_onFocusObject', _.bind(this.onApiFocusObjectRestrictedEdit, this));
                 this.api.asc_registerCallback('asc_onCoAuthoringDisconnect', _.bind(this.onApiCoAuthoringDisconnect, this));
                 Common.NotificationCenter.on('api:disconnect', _.bind(this.onApiCoAuthoringDisconnect, this));
+                if (this.mode.isPDFForm && this.mode.canFillForms) {
+                    this.api.asc_registerCallback('asc_onCanUndo', _.bind(this.onApiCanRevert, this, 'undo'));
+                    this.api.asc_registerCallback('asc_onCanRedo', _.bind(this.onApiCanRevert, this, 'redo'));
+                }
             }
             this.api.asc_registerCallback('asc_onDownloadUrl', _.bind(this.onDownloadUrl, this));
             Common.NotificationCenter.on('protect:doclock', _.bind(this.onChangeProtectDocument, this));
@@ -549,12 +553,12 @@ define([
         onApiCanRevert: function(which, can) {
             if (which=='undo') {
                 if (this._state.can_undo !== can) {
-                    this.toolbar.lockToolbar(Common.enumLock.undoLock, !can, {array: [this.toolbar.btnUndo]});
+                    this.toolbar.btnUndo ? this.toolbar.lockToolbar(Common.enumLock.undoLock, !can, {array: [this.toolbar.btnUndo]}) : this.onBtnChangeState('undo:disabled', null, !can);
                     this._state.can_undo = can;
                 }
             } else {
                 if (this._state.can_redo !== can) {
-                    this.toolbar.lockToolbar(Common.enumLock.redoLock, !can, {array: [this.toolbar.btnRedo]});
+                    this.toolbar.btnRedo ? this.toolbar.lockToolbar(Common.enumLock.redoLock, !can, {array: [this.toolbar.btnRedo]}) : this.onBtnChangeState('redo:disabled', null, !can);
                     this._state.can_redo = can;
                 }
             }
@@ -3388,6 +3392,10 @@ define([
             Common.Utils.injectSvgIcons();
         },
 
+        createDelayedElementsViewer: function() {
+            this.onBtnChangeState('print:disabled', null, !this.mode.canPrint);
+        },
+
         onAppShowed: function (config) {
             var me = this,
                 application = this.getApplication();
@@ -3415,7 +3423,7 @@ define([
 
                 me.toolbar.btnSave.on('disabled', _.bind(me.onBtnChangeState, me, 'save:disabled'));
 
-                if (!(config.customization && config.customization.compactHeader)) {
+                if (!config.compactHeader) {
                     // hide 'print' and 'save' buttons group and next separator
                     me.toolbar.btnPrint.$el.parents('.group').hide().next().hide();
 
diff --git a/apps/documenteditor/main/app/controller/Viewport.js b/apps/documenteditor/main/app/controller/Viewport.js
index 871e49bca8..bd4bbb67c4 100644
--- a/apps/documenteditor/main/app/controller/Viewport.js
+++ b/apps/documenteditor/main/app/controller/Viewport.js
@@ -77,7 +77,7 @@ define([
                     'render:before' : function (toolbar) {
                         var config = DE.getController('Main').appOptions;
                         toolbar.setExtra('right', me.header.getPanel('right', config));
-                        if (!config.isEdit || config.customization && !!config.customization.compactHeader)
+                        if (!config.twoLevelHeader || config.compactHeader)
                             toolbar.setExtra('left', me.header.getPanel('left', config));
 
                         var value = Common.localStorage.getBool("de-settings-quick-print-button", true);
@@ -181,7 +181,7 @@ define([
                     me.viewport.vlayout.getItem('toolbar').el.addClass('style-skip-docname');
             }
 
-            if ( config.isEdit && (!(config.customization && config.customization.compactHeader))) {
+            if ( config.twoLevelHeader && !config.compactHeader) {
                 var $title = me.viewport.vlayout.getItem('title').el;
                 $title.html(me.header.getPanel('title', config)).show();
                 $title.find('.extra').html(me.header.getPanel('left', config));
@@ -197,8 +197,10 @@ define([
 
                 $filemenu.css('top', (Common.UI.LayoutManager.isElementVisible('toolbar') ? _tabs_new_height : 0) + _intvars.get('document-title-height'));
 
-                toolbar = me.getApplication().getController('Toolbar').getView();
-                toolbar.btnCollabChanges = me.header.btnSave;
+                if (config.isEdit) {
+                    toolbar = me.getApplication().getController('Toolbar').getView();
+                    toolbar.btnCollabChanges = me.header.btnSave;
+                }
             }
 
             me.header.btnSearch.on('toggle', me.onSearchToggle.bind(this));
diff --git a/apps/documenteditor/main/app/view/DocumentHolder.js b/apps/documenteditor/main/app/view/DocumentHolder.js
index cbe47e045c..d7e756aebb 100644
--- a/apps/documenteditor/main/app/view/DocumentHolder.js
+++ b/apps/documenteditor/main/app/view/DocumentHolder.js
@@ -267,6 +267,80 @@ define([
             this.fireEvent('createdelayedelements', [this, 'pdf']);
         },
 
+        createDelayedElementsPDFForms: function() {
+            var me = this;
+
+            me.menuPDFFormsCopy = new Common.UI.MenuItem({
+                iconCls: 'menu__icon btn-copy',
+                caption: me.textCopy,
+                value: 'copy'
+            });
+
+            me.menuPDFFormsPaste = new Common.UI.MenuItem({
+                iconCls: 'menu__icon btn-paste',
+                caption : me.textPaste,
+                value : 'paste'
+            });
+
+            me.menuPDFFormsCut = new Common.UI.MenuItem({
+                iconCls: 'menu__icon btn-cut',
+                caption : me.textCut,
+                value : 'cut'
+            });
+
+            me.menuPDFFormsUndo = new Common.UI.MenuItem({
+                iconCls: 'menu__icon btn-undo',
+                caption: me.textUndo
+            });
+
+            me.menuPDFFormsRedo = new Common.UI.MenuItem({
+                iconCls: 'menu__icon btn-redo',
+                caption: me.textRedo
+            });
+
+            me.menuPDFFormsClear = new Common.UI.MenuItem({
+                iconCls: 'menu__icon btn-clearstyle',
+                caption: me.textClearField
+            });
+
+            me.formsPDFMenu = new Common.UI.Menu({
+                cls: 'shifted-right',
+                initMenu: function (value) {
+                    var cancopy = me.api.can_CopyCut(),
+                        disabled = value.paraProps && value.paraProps.locked || value.headerProps && value.headerProps.locked ||
+                            value.imgProps && (value.imgProps.locked || value.imgProps.content_locked) || me._isDisabled;
+                    me.menuPDFFormsUndo.setDisabled(disabled || !me.api.asc_getCanUndo()); // undo
+                    me.menuPDFFormsRedo.setDisabled(disabled || !me.api.asc_getCanRedo()); // redo
+
+                    me.menuPDFFormsClear.setDisabled(disabled || !me.api.asc_IsContentControl()); // clear
+                    me.menuPDFFormsCut.setDisabled(disabled || !cancopy); // cut
+                    me.menuPDFFormsCopy.setDisabled(!cancopy); // copy
+                    me.menuPDFFormsPaste.setDisabled(disabled) // paste;
+                },
+                items: [
+                    me.menuPDFFormsUndo,
+                    me.menuPDFFormsRedo,
+                    { caption: '--' },
+                    me.menuPDFFormsClear,
+                    { caption: '--' },
+                    me.menuPDFFormsCut,
+                    me.menuPDFFormsCopy,
+                    me.menuPDFFormsPaste
+                ]
+            }).on('hide:after', function (menu, e, isFromInputControl) {
+                me.clearCustomItems(menu);
+                me.currentMenu = null;
+                if (me.suppressEditComplete) {
+                    me.suppressEditComplete = false;
+                    return;
+                }
+
+                if (!isFromInputControl) me.fireEvent('editcomplete', me);
+            });
+
+            this.fireEvent('createdelayedelements', [this, 'forms']);
+        },
+
         createDelayedElements: function() {
             var me = this;
 
@@ -3349,7 +3423,9 @@ define([
         showEqToolbar: 'Show Equation Toolbar',
         textIndents: 'Adjust list indents',
         txtInsImage: 'Insert image from File',
-        txtInsImageUrl: 'Insert image from URL'
+        txtInsImageUrl: 'Insert image from URL',
+        textClearField: 'Clear field',
+        textRedo: 'Redo'
 
 }, DE.Views.DocumentHolder || {}));
 });
\ No newline at end of file
diff --git a/apps/documenteditor/main/app/view/FileMenuPanels.js b/apps/documenteditor/main/app/view/FileMenuPanels.js
index 6d3d63f974..2c228a0456 100644
--- a/apps/documenteditor/main/app/view/FileMenuPanels.js
+++ b/apps/documenteditor/main/app/view/FileMenuPanels.js
@@ -879,7 +879,7 @@ define([
             $('tr.ui-rtl', this.el)[mode.uiRtl ? 'show' : 'hide']();
             /** coauthoring end **/
 
-            $('tr.quick-print', this.el)[mode.canQuickPrint && !(mode.customization && mode.customization.compactHeader && mode.isEdit) ? 'show' : 'hide']();
+            $('tr.quick-print', this.el)[mode.canQuickPrint && !(mode.compactHeader && mode.isEdit) ? 'show' : 'hide']();
             $('tr.macros', this.el)[(mode.customization && mode.customization.macros===false) ? 'hide' : 'show']();
             if ( !Common.UI.Themes.available() ) {
                 $('tr.themes, tr.themes + tr.divider', this.el).hide();
diff --git a/apps/documenteditor/main/app/view/FormsTab.js b/apps/documenteditor/main/app/view/FormsTab.js
index 25458eb283..590428391b 100644
--- a/apps/documenteditor/main/app/view/FormsTab.js
+++ b/apps/documenteditor/main/app/view/FormsTab.js
@@ -45,6 +45,19 @@ define([
 ], function () {
     'use strict';
 
+    if (!Common.enumLock)
+        Common.enumLock = {};
+
+    var enumLock = {
+        requiredNotFilled: 'required-not-filled',
+        submit: 'submit'
+    };
+    for (var key in enumLock) {
+        if (enumLock.hasOwnProperty(key)) {
+            Common.enumLock[key] = enumLock[key];
+        }
+    }
+
     DE.Views.FormsTab = Common.UI.BaseView.extend(_.extend((function(){
         var template =
         '<section class="panel" data-tab="forms">' +
@@ -75,6 +88,9 @@ define([
                 '<span class="btn-slot text x-huge" id="slot-btn-form-prev"></span>' +
                 '<span class="btn-slot text x-huge" id="slot-btn-form-next"></span>' +
                 '<span class="btn-slot text x-huge" id="slot-btn-form-clear"></span>' +
+            '</div>' +
+            '<div class="separator long save-separator" style="display: none;"></div>' +
+            '<div class="group no-group-mask" style="">' +
                 '<span class="btn-slot text x-huge" id="slot-btn-form-submit"></span>' +
                 '<span class="btn-slot text x-huge" id="slot-btn-form-save"></span>' +
             '</div>' +
@@ -393,7 +409,7 @@ define([
                     cls: 'btn-toolbar x-huge icon-top',
                     iconCls: 'toolbar__icon btn-clear-style',
                     caption: this.textClear,
-                    visible: false,
+                    visible: this.appConfig.isRestrictedEdit && this.appConfig.canFillForms && this.appConfig.isPDFForm,
                     dataHint: '1',
                     dataHintDirection: 'bottom',
                     dataHintOffset: 'small'
@@ -404,7 +420,7 @@ define([
                     iconCls: 'toolbar__icon btn-previous-field',
                     lock: [ _set.previewReviewMode, _set.lostConnect, _set.disableOnStart, _set.docLockView, _set.docLockComments, _set.viewMode],
                     caption: this.capBtnPrev,
-                    visible: false,
+                    visible: this.appConfig.isRestrictedEdit && this.appConfig.canFillForms && this.appConfig.isPDFForm,
                     // disabled: this.appConfig.isEdit && this.appConfig.canFeatureContentControl && this.appConfig.canFeatureForms, // disable only for edit mode
                     dataHint: '1',
                     dataHintDirection: 'bottom',
@@ -417,7 +433,7 @@ define([
                     iconCls: 'toolbar__icon btn-next-field',
                     lock: [ _set.previewReviewMode, _set.lostConnect, _set.disableOnStart, _set.docLockView, _set.docLockComments, _set.viewMode],
                     caption: this.capBtnNext,
-                    visible: false,
+                    visible: this.appConfig.isRestrictedEdit && this.appConfig.canFillForms && this.appConfig.isPDFForm,
                     // disabled: this.appConfig.isEdit && this.appConfig.canFeatureContentControl && this.appConfig.canFeatureForms, // disable only for edit mode,
                     dataHint: '1',
                     dataHintDirection: 'bottom',
@@ -429,7 +445,7 @@ define([
                     this.btnSubmit = new Common.UI.Button({
                         cls: 'btn-toolbar x-huge icon-top',
                         iconCls: 'toolbar__icon btn-submit-form',
-                        lock: [_set.lostConnect, _set.disableOnStart],
+                        lock: [_set.lostConnect, _set.disableOnStart, _set.requiredNotFilled, _set.submit],
                         caption: this.capBtnSubmit,
                         // disabled: this.appConfig.isEdit && this.appConfig.canFeatureContentControl && this.appConfig.canFeatureForms, // disable only for edit mode,
                         dataHint: '1',
@@ -437,13 +453,12 @@ define([
                         dataHintOffset: 'small'
                     });
                     !(this.appConfig.isRestrictedEdit && this.appConfig.canFillForms) && this.paragraphControls.push(this.btnSubmit);
-                }
-                if (this.appConfig.canDownloadForms) {
+                } else if (this.appConfig.canDownloadForms) {
                     this.btnSaveForm = new Common.UI.Button({
                         cls: 'btn-toolbar x-huge icon-top',
                         lock: [_set.lostConnect, _set.disableOnStart],
                         iconCls: 'toolbar__icon btn-save-form',
-                        caption: this.appConfig.canRequestSaveAs || !!this.appConfig.saveAsUrl || this.appConfig.isOffline ? this.capBtnSaveForm : this.capBtnDownloadForm,
+                        caption: this.appConfig.canRequestSaveAs || !!this.appConfig.saveAsUrl ? this.capBtnSaveForm : (this.appConfig.isOffline ? this.capBtnSaveFormDesktop : this.capBtnDownloadForm),
                         // disabled: this.appConfig.isEdit && this.appConfig.canFeatureContentControl && this.appConfig.canFeatureForms, // disable only for edit mode,
                         dataHint: '1',
                         dataHintDirection: 'bottom',
@@ -538,9 +553,6 @@ define([
                 this.$el = $(_.template(template)( {} ));
                 var $host = this.$el;
 
-                this.appConfig.canSubmitForms && this.btnSubmit.render($host.find('#slot-btn-form-submit'));
-                this.appConfig.canDownloadForms && this.btnSaveForm.render($host.find('#slot-btn-form-save'));
-
                 if (this.appConfig.isRestrictedEdit && this.appConfig.canFillForms) {
                 } else {
                     this.btnTextField.render($host.find('#slot-btn-form-field'));
@@ -565,6 +577,10 @@ define([
                 this.btnPrevForm.render($host.find('#slot-btn-form-prev'));
                 this.btnNextForm.render($host.find('#slot-btn-form-next'));
 
+                this.btnSubmit && this.btnSubmit.render($host.find('#slot-btn-form-submit'));
+                this.btnSaveForm && this.btnSaveForm.render($host.find('#slot-btn-form-save'));
+                (this.btnSubmit || this.btnSaveForm) && $host.find('.save-separator').show();
+
                 return this.$el;
             },
 
@@ -696,8 +712,8 @@ define([
             tipHelpRoles: 'Use the Manage Roles feature to group fields by purpose and assign the responsible team members.',
             tipSaveFile: 'Click “Save as pdf” to save the form in the format ready for filling.',
             tipRolesLink: 'Learn more about roles',
-            tipFieldsLink: 'Learn more about field parameters'
-
+            tipFieldsLink: 'Learn more about field parameters',
+            capBtnSaveFormDesktop: 'Save as...'
         }
     }()), DE.Views.FormsTab || {}));
 });
\ No newline at end of file
diff --git a/apps/documenteditor/main/app/view/Toolbar.js b/apps/documenteditor/main/app/view/Toolbar.js
index 46f664b4e9..4166e14e30 100644
--- a/apps/documenteditor/main/app/view/Toolbar.js
+++ b/apps/documenteditor/main/app/view/Toolbar.js
@@ -2923,7 +2923,7 @@ define([
 
             createSynchTip: function () {
                 this.synchTooltip = new Common.UI.SynchronizeTip({
-                    extCls: (this.mode.customization && !!this.mode.customization.compactHeader) ? undefined : 'inc-index',
+                    extCls: (this.mode.compactHeader) ? undefined : 'inc-index',
                     placement: this.mode.isDesktopApp ? 'bottom-right' : 'right-bottom',
                     target: this.btnCollabChanges.$el
                 });
diff --git a/apps/documenteditor/main/index.html b/apps/documenteditor/main/index.html
index 3f95d647ef..8008cf8a51 100644
--- a/apps/documenteditor/main/index.html
+++ b/apps/documenteditor/main/index.html
@@ -59,6 +59,11 @@
             background: var(--toolbar-header-document, #446995);
         }
 
+        .pdf-form .loadmask > .brendpanel {
+            background: #AA5252;
+            background: var(--toolbar-header-pdf, #AA5252);
+        }
+
         .loadmask > .brendpanel > div {
             display: flex;
             align-items: center;
@@ -256,10 +261,12 @@
             lang = (params["lang"] || 'en').split(/[\-\_]/)[0],
             hideLogo = params["headerlogo"]==='',
             logo = params["headerlogo"] ? encodeUrlParam(params["headerlogo"]) : null,
-            logoDark = params["headerlogodark"] ? encodeUrlParam(params["headerlogodark"]) : null;
+            logoDark = params["headerlogodark"] ? encodeUrlParam(params["headerlogodark"]) : null,
+            isForm = params["isForm"]==='true';
 
         window.frameEditorId = params["frameEditorId"];
         window.parentOrigin = params["parentOrigin"];
+        window.isPDFForm = isForm;
 
         if(/MSIE \d|Trident.*rv:/.test(navigator.userAgent)) {
             document.write('<script src="../../common/main/lib/util/fix-ie-compat.js"><\/script>');
@@ -295,6 +302,7 @@
             view = params["mode"] == 'view',
             visible = true;
 
+        isForm && document.body.classList.add('pdf-form');
         (compact || view || notoolbar) && document.querySelector('.brendpanel > :nth-child(2)').remove();
 
         if (compact || view) {
diff --git a/apps/documenteditor/main/index.html.deploy b/apps/documenteditor/main/index.html.deploy
index 14d6d80fda..7d9436e2bd 100644
--- a/apps/documenteditor/main/index.html.deploy
+++ b/apps/documenteditor/main/index.html.deploy
@@ -37,6 +37,11 @@
             background: var(--toolbar-header-document, #446995);
         }
 
+        .pdf-form .loadmask > .brendpanel {
+            background: #AA5252;
+            background: var(--toolbar-header-pdf, #AA5252);
+        }
+
         .loadmask > .brendpanel > div {
             display: flex;
             align-items: center;
@@ -229,10 +234,12 @@
             lang = (params["lang"] || 'en').split(/[\-\_]/)[0],
             hideLogo = params["headerlogo"]==='',
             logo = params["headerlogo"] ? encodeUrlParam(params["headerlogo"]) : null,
-            logoDark = params["headerlogodark"] ? encodeUrlParam(params["headerlogodark"]) : null;
+            logoDark = params["headerlogodark"] ? encodeUrlParam(params["headerlogodark"]) : null,
+            isForm = params["isForm"]==='true';
 
         window.frameEditorId = params["frameEditorId"];
         window.parentOrigin = params["parentOrigin"];
+        window.isPDFForm = isForm;
     </script>
 
     <link rel="stylesheet" type="text/css" href="../../../apps/documenteditor/main/resources/css/app.css">
@@ -259,6 +266,7 @@
             view = params["mode"] == 'view',
             visible = true;
 
+        isForm && document.body.classList.add('pdf-form');
         (compact || view || notoolbar) && document.querySelector('.brendpanel > :nth-child(2)').remove();
 
         if (compact || view) {
diff --git a/apps/documenteditor/main/index_loader.html b/apps/documenteditor/main/index_loader.html
index 6bb5a21201..701351df10 100644
--- a/apps/documenteditor/main/index_loader.html
+++ b/apps/documenteditor/main/index_loader.html
@@ -219,9 +219,11 @@
             customer = params["customer"] ? ('<div class="loader-page-text-customer">' + encodeUrlParam(params["customer"]) + '</div>') : '',
             margin = (customer !== '') ? 50 : 20,
             loading = 'Loading...',
-            logo = params["logo"] ? ((params["logo"] !== 'none') ? ('<img src="' + encodeUrlParam(params["logo"]) + '" class="loader-logo" />') : '') : null;
+            logo = params["logo"] ? ((params["logo"] !== 'none') ? ('<img src="' + encodeUrlParam(params["logo"]) + '" class="loader-logo" />') : '') : null,
+            isForm = params["isForm"]==='true';
         window.frameEditorId = params["frameEditorId"];
         window.parentOrigin = params["parentOrigin"];
+        window.isPDFForm = isForm;
         if ( lang == 'de')      loading = 'Ladevorgang...';
         else if ( lang == 'es') loading = 'Cargando...';
         else if ( lang == 'fr') loading = 'Chargement en cours...';
@@ -267,7 +269,9 @@
 <body>
 <script src="../../common/main/lib/util/htmlutils.js"></script>
 <div id="viewport"></div>
-
+<script>
+    isForm && document.body.classList.add('pdf-form');
+</script>
 <script src="../../../vendor/svg-injector/svg-injector.min.js"></script>
 <img class="inline-svg" src="../../common/main/resources/img/header/icons.svg">
 <img class="inline-svg" src="../../common/main/resources/img/toolbar/shapetypes.svg">
diff --git a/apps/documenteditor/main/index_loader.html.deploy b/apps/documenteditor/main/index_loader.html.deploy
index 3f42947d24..88dfd295c5 100644
--- a/apps/documenteditor/main/index_loader.html.deploy
+++ b/apps/documenteditor/main/index_loader.html.deploy
@@ -241,11 +241,12 @@
             customer = params["customer"] ? ('<div class="loader-page-text-customer">' + encodeUrlParam(params["customer"]) + '</div>') : '',
             margin = (customer !== '') ? 50 : 20,
             loading = 'Loading...',
-            logo = params["logo"] ? ((params["logo"] !== 'none') ? ('<img src="' + encodeUrlParam(params["logo"]) + '" class="loader-logo" />') : '') : null;
+            logo = params["logo"] ? ((params["logo"] !== 'none') ? ('<img src="' + encodeUrlParam(params["logo"]) + '" class="loader-logo" />') : '') : null,
+            isForm = params["isForm"]==='true';
 
         window.frameEditorId = params["frameEditorId"];
         window.parentOrigin = params["parentOrigin"];
-
+        window.isPDFForm = isForm;
         if ( lang == 'de')      loading = 'Ladevorgang...';
         else if ( lang == 'es') loading = 'Cargando...';
         else if ( lang == 'fr') loading = 'Chargement en cours...';
@@ -290,7 +291,9 @@
 </head>
 <body>
     <script src="../../../../../apps/common/main/lib/util/htmlutils.js?__inline=true"></script>
-
+    <script>
+        isForm && document.body.classList.add('pdf-form');
+    </script>
     <script>
         window.requireTimeourError = function(){
             var reqerr;
diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json
index 4fc5227479..169b025395 100644
--- a/apps/documenteditor/main/locale/en.json
+++ b/apps/documenteditor/main/locale/en.json
@@ -1991,6 +1991,8 @@
   "DE.Views.DocumentHolder.unicodeText": "Unicode",
   "DE.Views.DocumentHolder.updateStyleText": "Update %1 style",
   "DE.Views.DocumentHolder.vertAlignText": "Vertical alignment",
+  "DE.Views.DocumentHolder.textClearField": "Clear field",
+  "DE.Views.DocumentHolder.textRedo": "Redo",
   "DE.Views.DropcapSettingsAdvanced.strBorders": "Borders & Fill",
   "DE.Views.DropcapSettingsAdvanced.strDropcap": "Drop cap",
   "DE.Views.DropcapSettingsAdvanced.strMargins": "Margins",
@@ -2305,6 +2307,7 @@
   "DE.Views.FormsTab.txtInlineDesc": "Insert inline text field",
   "DE.Views.FormsTab.txtInlineText": "Inline",
   "DE.Views.FormsTab.txtUntitled": "Untitled",
+  "DE.Views.FormsTab.capBtnSaveFormDesktop": "Save As...",
   "DE.Views.HeaderFooterSettings.textBottomCenter": "Bottom center",
   "DE.Views.HeaderFooterSettings.textBottomLeft": "Bottom left",
   "DE.Views.HeaderFooterSettings.textBottomPage": "Bottom of page",
diff --git a/apps/pdfeditor/main/app/controller/Main.js b/apps/pdfeditor/main/app/controller/Main.js
index bb042fe9d8..60fb87d7c7 100644
--- a/apps/pdfeditor/main/app/controller/Main.js
+++ b/apps/pdfeditor/main/app/controller/Main.js
@@ -399,9 +399,7 @@ define([
                 this.appOptions.canRequestSharingSettings = this.editorConfig.canRequestSharingSettings;
                 this.appOptions.compatibleFeatures = true;
                 this.appOptions.uiRtl = !(Common.Controllers.Desktop.isActive() && Common.Controllers.Desktop.uiRtlSupported()) && !Common.Utils.isIE;
-
                 this.appOptions.mentionShare = !((typeof (this.appOptions.customization) == 'object') && (this.appOptions.customization.mentionShare==false));
-
                 this.appOptions.user.guest && this.appOptions.canRenameAnonymous && Common.NotificationCenter.on('user:rename', _.bind(this.showRenameUserDialog, this));
 
                 this.appOptions.canRequestClose = this.editorConfig.canRequestClose;
@@ -1258,6 +1256,9 @@ define([
                 this.appOptions.isAnonymousSupport = !!this.api.asc_isAnonymousSupport();
                 this.appOptions.isRestrictedEdit = !this.appOptions.isEdit && this.appOptions.canFillForms;
 
+                this.appOptions.compactHeader = this.appOptions.customization && (typeof (this.appOptions.customization) == 'object') && !!this.appOptions.customization.compactHeader;
+                this.appOptions.twoLevelHeader = this.appOptions.isEdit || this.appOptions.isRestrictedEdit; // when compactHeader=true some buttons move to toolbar
+
                 if ( !this.appOptions.canCoAuthoring ) {
                     this.appOptions.canChat = false;
                 }
diff --git a/apps/pdfeditor/main/app/controller/Toolbar.js b/apps/pdfeditor/main/app/controller/Toolbar.js
index 66ae82eec1..78eeec0122 100644
--- a/apps/pdfeditor/main/app/controller/Toolbar.js
+++ b/apps/pdfeditor/main/app/controller/Toolbar.js
@@ -853,7 +853,7 @@ define([
 
             if ( config.isEdit || config.isRestrictedEdit) {
                 me.toolbar.setMode(config);
-                if (!(config.customization && config.customization.compactHeader)) {
+                if (!config.compactHeader) {
                     // hide 'print' and 'save' buttons group and next separator
                     me.toolbar.btnPrint.$el.parents('.group').hide().next().hide();
 
diff --git a/apps/pdfeditor/main/app/controller/Viewport.js b/apps/pdfeditor/main/app/controller/Viewport.js
index 0764579199..bdb12e03c9 100644
--- a/apps/pdfeditor/main/app/controller/Viewport.js
+++ b/apps/pdfeditor/main/app/controller/Viewport.js
@@ -77,7 +77,7 @@ define([
                     'render:before' : function (toolbar) {
                         var config = PDFE.getController('Main').appOptions;
                         toolbar.setExtra('right', me.header.getPanel('right', config));
-                        if (!config.isEdit && !config.isRestrictedEdit || config.customization && !!config.customization.compactHeader)
+                        if (!config.twoLevelHeader || config.compactHeader)
                             toolbar.setExtra('left', me.header.getPanel('left', config));
 
                         var value = Common.localStorage.getBool("pdfe-settings-quick-print-button", true);
@@ -179,7 +179,7 @@ define([
                     me.viewport.vlayout.getItem('toolbar').el.addClass('style-skip-docname');
             }
 
-            if ( (config.isEdit || config.isRestrictedEdit) && !(config.customization && config.customization.compactHeader)) {
+            if ( config.twoLevelHeader && !config.compactHeader) {
                 var $title = me.viewport.vlayout.getItem('title').el;
                 $title.html(me.header.getPanel('title', config)).show();
                 $title.find('.extra').html(me.header.getPanel('left', config));
diff --git a/apps/pdfeditor/main/app/view/FileMenuPanels.js b/apps/pdfeditor/main/app/view/FileMenuPanels.js
index bbb229c969..3c1e0ad93b 100644
--- a/apps/pdfeditor/main/app/view/FileMenuPanels.js
+++ b/apps/pdfeditor/main/app/view/FileMenuPanels.js
@@ -680,7 +680,7 @@ define([
             $('tr.ui-rtl', this.el)[mode.uiRtl ? 'show' : 'hide']();
             /** coauthoring end **/
 
-            $('tr.quick-print', this.el)[mode.canQuickPrint && !(mode.customization && mode.customization.compactHeader && mode.isEdit) ? 'show' : 'hide']();
+            $('tr.quick-print', this.el)[mode.canQuickPrint && !(mode.compactHeader && mode.isEdit) ? 'show' : 'hide']();
             if ( !Common.UI.Themes.available() ) {
                 $('tr.themes, tr.themes + tr.divider', this.el).hide();
             }
diff --git a/apps/pdfeditor/main/app/view/Toolbar.js b/apps/pdfeditor/main/app/view/Toolbar.js
index 54b9546acc..b0d586e26b 100644
--- a/apps/pdfeditor/main/app/view/Toolbar.js
+++ b/apps/pdfeditor/main/app/view/Toolbar.js
@@ -789,7 +789,7 @@ define([
 
             createSynchTip: function () {
                 this.synchTooltip = new Common.UI.SynchronizeTip({
-                    extCls: (this.mode.customization && !!this.mode.customization.compactHeader) ? undefined : 'inc-index',
+                    extCls: (this.mode.compactHeader) ? undefined : 'inc-index',
                     placement: this.mode.isDesktopApp ? 'bottom-right' : 'right-bottom',
                     target: this.btnCollabChanges.$el
                 });
diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js
index 86e6670f67..cd2a836501 100644
--- a/apps/presentationeditor/main/app/controller/Main.js
+++ b/apps/presentationeditor/main/app/controller/Main.js
@@ -411,7 +411,6 @@ define([
                 this.appOptions.canRequestSharingSettings = this.editorConfig.canRequestSharingSettings;
                 this.appOptions.mentionShare = !((typeof (this.appOptions.customization) == 'object') && (this.appOptions.customization.mentionShare==false));
                 this.appOptions.uiRtl = !(Common.Controllers.Desktop.isActive() && Common.Controllers.Desktop.uiRtlSupported()) && !Common.Utils.isIE;
-
                 this.appOptions.user.guest && this.appOptions.canRenameAnonymous && Common.NotificationCenter.on('user:rename', _.bind(this.showRenameUserDialog, this));
 
                 this.appOptions.canRequestClose = this.editorConfig.canRequestClose;
@@ -1288,6 +1287,9 @@ define([
                 this.appOptions.canHelp        = !((typeof (this.editorConfig.customization) == 'object') && this.editorConfig.customization.help===false);
                 this.appOptions.isRestrictedEdit = !this.appOptions.isEdit && this.appOptions.canComments;
 
+                this.appOptions.compactHeader = this.appOptions.customization && (typeof (this.appOptions.customization) == 'object') && !!this.appOptions.customization.compactHeader;
+                this.appOptions.twoLevelHeader = this.appOptions.isEdit; // when compactHeader=true some buttons move to toolbar
+
                 this.appOptions.canUseHistory  = this.appOptions.canLicense && this.editorConfig.canUseHistory && this.appOptions.canCoAuthoring && !this.appOptions.isOffline;
                 this.appOptions.canHistoryClose  = this.editorConfig.canHistoryClose;
                 this.appOptions.canHistoryRestore= this.editorConfig.canHistoryRestore;
diff --git a/apps/presentationeditor/main/app/controller/Toolbar.js b/apps/presentationeditor/main/app/controller/Toolbar.js
index 87ec0cff04..b6de3a4dca 100644
--- a/apps/presentationeditor/main/app/controller/Toolbar.js
+++ b/apps/presentationeditor/main/app/controller/Toolbar.js
@@ -2743,7 +2743,7 @@ define([
 
                 me.toolbar.btnSave.on('disabled', _.bind(me.onBtnChangeState, me, 'save:disabled'));
 
-                if (!(config.customization && config.customization.compactHeader)) {
+                if (!config.compactHeader) {
                     // hide 'print' and 'save' buttons group and next separator
                     me.toolbar.btnPrint.$el.parents('.group').hide().next().hide();
 
diff --git a/apps/presentationeditor/main/app/controller/Viewport.js b/apps/presentationeditor/main/app/controller/Viewport.js
index d243da09c5..a88fb91402 100644
--- a/apps/presentationeditor/main/app/controller/Viewport.js
+++ b/apps/presentationeditor/main/app/controller/Viewport.js
@@ -78,7 +78,7 @@ define([
                     'render:before' : function (toolbar) {
                         var config = PE.getController('Main').appOptions;
                         toolbar.setExtra('right', me.header.getPanel('right', config));
-                        if (!config.isEdit || config.customization && !!config.customization.compactHeader)
+                        if (!config.twoLevelHeader || config.compactHeader)
                             toolbar.setExtra('left', me.header.getPanel('left', config));
                         var value = Common.localStorage.getBool("pe-settings-quick-print-button", true);
                         Common.Utils.InternalSettings.set("pe-settings-quick-print-button", value);
@@ -171,7 +171,7 @@ define([
                 me.viewport.vlayout.getItem('toolbar').height = _intvars.get('toolbar-height-compact');
             }
 
-            if ( config.isEdit && (!(config.customization && config.customization.compactHeader))) {
+            if ( config.twoLevelHeader && !config.compactHeader) {
                 var $title = me.viewport.vlayout.getItem('title').el;
                 $title.html(me.header.getPanel('title', config)).show();
                 $title.find('.extra').html(me.header.getPanel('left', config));
diff --git a/apps/presentationeditor/main/app/view/FileMenuPanels.js b/apps/presentationeditor/main/app/view/FileMenuPanels.js
index f533ebdcdd..cd5d0e0eb1 100644
--- a/apps/presentationeditor/main/app/view/FileMenuPanels.js
+++ b/apps/presentationeditor/main/app/view/FileMenuPanels.js
@@ -696,7 +696,7 @@ define([
             $('tr.live-viewer', this.el)[mode.canLiveView && !mode.isOffline && mode.canChangeCoAuthoring ? 'show' : 'hide']();
             $('tr.macros', this.el)[(mode.customization && mode.customization.macros===false) ? 'hide' : 'show']();
             $('tr.spellcheck', this.el)[mode.isEdit && Common.UI.FeaturesManager.canChange('spellcheck') ? 'show' : 'hide']();
-            $('tr.quick-print', this.el)[mode.canQuickPrint && !(mode.customization && mode.customization.compactHeader && mode.isEdit) ? 'show' : 'hide']();
+            $('tr.quick-print', this.el)[mode.canQuickPrint && !(mode.compactHeader && mode.isEdit) ? 'show' : 'hide']();
             $('tr.ui-rtl', this.el)[mode.uiRtl ? 'show' : 'hide']();
 
             if ( !Common.UI.Themes.available() ) {
diff --git a/apps/presentationeditor/main/app/view/Toolbar.js b/apps/presentationeditor/main/app/view/Toolbar.js
index 895bec8475..2c4c245934 100644
--- a/apps/presentationeditor/main/app/view/Toolbar.js
+++ b/apps/presentationeditor/main/app/view/Toolbar.js
@@ -1949,7 +1949,7 @@ define([
 
             createSynchTip: function () {
                 this.synchTooltip = new Common.UI.SynchronizeTip({
-                    extCls: (this.mode.customization && !!this.mode.customization.compactHeader) ? undefined : 'inc-index',
+                    extCls: (this.mode.compactHeader) ? undefined : 'inc-index',
                     placement: this.mode.isDesktopApp ? 'bottom-right' : 'right-bottom',
                     target: this.btnCollabChanges.$el
                 });
diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js
index 207bf0716d..86fde891de 100644
--- a/apps/spreadsheeteditor/main/app/controller/Main.js
+++ b/apps/spreadsheeteditor/main/app/controller/Main.js
@@ -466,7 +466,6 @@ define([
                 this.appOptions.canRequestReferenceData = this.editorConfig.canRequestReferenceData;
                 this.appOptions.canRequestOpen = this.editorConfig.canRequestOpen;
                 this.appOptions.canRequestReferenceSource = this.editorConfig.canRequestReferenceSource;
-                
                 if (this.appOptions.user.guest && this.appOptions.canRenameAnonymous && !this.appOptions.isEditDiagram && !this.appOptions.isEditMailMerge && !this.appOptions.isEditOle)
                     Common.NotificationCenter.on('user:rename', _.bind(this.showRenameUserDialog, this));
 
@@ -1425,6 +1424,9 @@ define([
                 this.appOptions.canHelp        = !((typeof (this.editorConfig.customization) == 'object') && this.editorConfig.customization.help===false);
                 this.appOptions.isRestrictedEdit = !this.appOptions.isEdit && this.appOptions.canComments;
 
+                this.appOptions.compactHeader = this.appOptions.customization && (typeof (this.appOptions.customization) == 'object') && !!this.appOptions.customization.compactHeader;
+                this.appOptions.twoLevelHeader = this.appOptions.isEdit; // when compactHeader=true some buttons move to toolbar
+
                 // change = true by default in editor
                 this.appOptions.canLiveView = !!params.asc_getLiveViewerSupport() && (this.editorConfig.mode === 'view'); // viewer: change=false when no flag canLiveViewer (i.g. old license), change=true by default when canLiveViewer==true
                 this.appOptions.canChangeCoAuthoring = this.appOptions.isEdit && !(this.appOptions.isEditDiagram || this.appOptions.isEditMailMerge || this.appOptions.isEditOle) && this.appOptions.canCoAuthoring &&
diff --git a/apps/spreadsheeteditor/main/app/controller/Toolbar.js b/apps/spreadsheeteditor/main/app/controller/Toolbar.js
index 4a6ff58512..3dc882aae2 100644
--- a/apps/spreadsheeteditor/main/app/controller/Toolbar.js
+++ b/apps/spreadsheeteditor/main/app/controller/Toolbar.js
@@ -4631,7 +4631,7 @@ define([
                         }
                     }
 
-                    if (!(config.customization && config.customization.compactHeader)) {
+                    if (!config.compactHeader) {
                         // hide 'print' and 'save' buttons group and next separator
                         me.toolbar.btnPrint.$el.parents('.group').hide().next().hide();
 
diff --git a/apps/spreadsheeteditor/main/app/controller/Viewport.js b/apps/spreadsheeteditor/main/app/controller/Viewport.js
index 58b61d8c53..66898109a9 100644
--- a/apps/spreadsheeteditor/main/app/controller/Viewport.js
+++ b/apps/spreadsheeteditor/main/app/controller/Viewport.js
@@ -83,10 +83,10 @@ define([
                         if (!config.isEditDiagram && !config.isEditMailMerge && !config.isEditOle)
                             toolbar.setExtra('right', me.header.getPanel('right', config));
 
-                        if (!config.isEdit || config.customization && !!config.customization.compactHeader)
+                        if (!config.twoLevelHeader || config.compactHeader)
                             toolbar.setExtra('left', me.header.getPanel('left', config));
 
-                        if ( me.appConfig && me.appConfig.isEdit && !(config.customization && config.customization.compactHeader) && toolbar.btnCollabChanges )
+                        if ( me.appConfig && me.appConfig.isEdit && !config.compactHeader && toolbar.btnCollabChanges )
                             toolbar.btnCollabChanges = me.header.btnSave;
 
                         var value = Common.localStorage.getBool("sse-settings-quick-print-button", true);
@@ -151,7 +151,7 @@ define([
                 me.viewport.vlayout.getItem('toolbar').height = 41;
             }
 
-            if ( config.isEdit && !config.isEditDiagram && !config.isEditMailMerge && !config.isEditOle && !(config.customization && config.customization.compactHeader)) {
+            if ( config.twoLevelHeader && !config.isEditDiagram && !config.isEditMailMerge && !config.isEditOle && !config.compactHeader) {
                 var $title = me.viewport.vlayout.getItem('title').el;
                 $title.html(me.header.getPanel('title', config)).show();
                 $title.find('.extra').html(me.header.getPanel('left', config));
diff --git a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js
index a54c98bf1b..ca430a6299 100644
--- a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js
+++ b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js
@@ -867,7 +867,7 @@ define([
             $('tr.coauth.changes', this.el)[mode.isEdit && !mode.isOffline && mode.canCoAuthoring && mode.canChangeCoAuthoring ? 'show' : 'hide']();
             $('tr.live-viewer', this.el)[mode.canLiveView && !mode.isOffline && mode.canChangeCoAuthoring ? 'show' : 'hide']();
             $('tr.macros', this.el)[(mode.customization && mode.customization.macros===false) ? 'hide' : 'show']();
-            $('tr.quick-print', this.el)[mode.canQuickPrint && !(mode.customization && mode.customization.compactHeader && mode.isEdit) ? 'show' : 'hide']();
+            $('tr.quick-print', this.el)[mode.canQuickPrint && !(mode.compactHeader && mode.isEdit) ? 'show' : 'hide']();
 
             if ( !Common.UI.Themes.available() ) {
                 $('tr.themes, tr.themes + tr.divider', this.el).hide();
diff --git a/apps/spreadsheeteditor/main/app/view/Toolbar.js b/apps/spreadsheeteditor/main/app/view/Toolbar.js
index 3ccb1dfd81..1bc3cceaad 100644
--- a/apps/spreadsheeteditor/main/app/view/Toolbar.js
+++ b/apps/spreadsheeteditor/main/app/view/Toolbar.js
@@ -3214,7 +3214,7 @@ define([
 
         createSynchTip: function () {
             this.synchTooltip = new Common.UI.SynchronizeTip({
-                extCls: (this.mode.customization && !!this.mode.customization.compactHeader) ? undefined : 'inc-index',
+                extCls: (this.mode.compactHeader) ? undefined : 'inc-index',
                 placement: this.mode.isDesktopApp ? 'bottom-right' : 'right-bottom',
                 target: this.btnCollabChanges.$el
             });
diff --git a/build/Gruntfile.js b/build/Gruntfile.js
index 0f1f1dfcdf..788702ebc5 100644
--- a/build/Gruntfile.js
+++ b/build/Gruntfile.js
@@ -316,6 +316,11 @@ module.exports = function(grunt) {
                     files: packageFile['apps-common'].svgicons.common
                 }
             },
+            inline: {
+                dist: {
+                    src: packageFile['apps-common'].copy.indexhtml.dest + '/*.html'
+                }
+            }
         }
     });
     doRegisterTask('socketio');
@@ -764,7 +769,7 @@ module.exports = function(grunt) {
     var copyTask = grunt.option('desktop')? "copy": "copy:script";
 
     grunt.registerTask('deploy-api',                    ['api-init', 'clean', copyTask, 'replace:writeVersion']);
-    grunt.registerTask('deploy-apps-common',            ['apps-common-init', 'clean', 'copy', 'imagemin', 'svgmin']);
+    grunt.registerTask('deploy-apps-common',            ['apps-common-init', 'clean', 'copy', 'inline', 'imagemin', 'svgmin']);
     grunt.registerTask('deploy-sdk',                    ['sdk-init', 'clean', copyTask]);
 
     grunt.registerTask('deploy-socketio',               ['socketio-init', 'clean', 'copy']);
diff --git a/build/common.json b/build/common.json
index 238c9e3f92..c4cfdec49b 100644
--- a/build/common.json
+++ b/build/common.json
@@ -103,6 +103,13 @@
                     "!**/src/**"
                 ],
                 "dest": "../deploy/web-apps/apps/common/main/resources/help/"
+            },
+            "indexhtml": {
+                "expand": true,
+                "cwd": "../apps/common",
+                "src": "*.html.deploy",
+                "ext": ".html",
+                "dest": "../deploy/web-apps/apps/common"
             }
         },
         "imagemin": {