bug 51943

Merge branch 'develop' into fix/Bug-51943
bug 51943
2023-01-11 17:51:47 +03:00 · 2023-01-11 15:44:11 +03:00 · 2023-01-11 13:19:58 +03:00 · 2023-01-10 16:02:13 +03:00 · 2023-01-09 16:41:50 +03:00 · 2022-12-23 21:09:52 +03:00
1192 changed files with 53554 additions and 15971 deletions
--- a/apps/api/documents/api.js
+++ b/apps/api/documents/api.js
@ -23,6 +23,7 @@
                options: <advanced options>,
                key: 'key',
                vkey: 'vkey',
+                referenceData: 'data for external paste',
                info: {
                    owner: 'owner name',
                    folder: 'path to document',
@ -174,9 +175,12 @@
                        },
                        leftMenu: {
                            navigation: false/true,
-                            spellcheck: false/true // spellcheck button in sse
+                            spellcheck: false/true // spellcheck button in sse,
+                            mode: false/true // init value for left panel, true - is visible, false - is hidden, used for option "Left panel" on the View Tab
                        } / false / true, // use instead of customization.leftMenu
-                        rightMenu: false/true, // use instead of customization.rightMenu
+                        rightMenu: {
+                            mode: false/true // init value for right panel, true - is visible, false - is hidden, used for option "Right panel" on the View Tab
+                        } / false/true, // use instead of customization.rightMenu
                        statusBar: {
                            textLang: false/true // text language button in de/pe
                            docLang: false/true // document language button in de/pe
@ -189,6 +193,10 @@
                            change: false/true // hide/show feature in de/pe/sse
                        } / false / true // if false/true - use as init value in de/pe. use instead of customization.spellcheck parameter
                    },
+                    font: {
+                        name: "Arial",
+                        size: "11px";
+                    },
                    chat: true,
                    comments: true,
                    zoom: 100,
@ -264,6 +272,7 @@
                'onRequestCompareFile': <request file to compare>,// must call setRevisedFile method
                'onRequestSharingSettings': <request sharing settings>,// must call setSharingSettings method
                'onRequestCreateNew': <try to create document>,
+                'onRequestReferenceData': <try to refresh external data>,
            }
        }

@ -327,6 +336,7 @@
        _config.editorConfig.canRequestCompareFile = _config.events && !!_config.events.onRequestCompareFile;
        _config.editorConfig.canRequestSharingSettings = _config.events && !!_config.events.onRequestSharingSettings;
        _config.editorConfig.canRequestCreateNew = _config.events && !!_config.events.onRequestCreateNew;
+        _config.editorConfig.canRequestReferenceData = _config.events && !!_config.events.onRequestReferenceData;
        _config.frameEditorId = placeholderId;
        _config.parentOrigin = window.location.origin;

@ -736,6 +746,13 @@
            });
        };

+        var _setReferenceData = function(data) {
+            _sendCommand({
+                command: 'setReferenceData',
+                data: data
+            });
+        };
+
        var _serviceCommand = function(command, data) {
            _sendCommand({
                command: 'internalCommand',
@ -770,7 +787,8 @@
            setFavorite         : _setFavorite,
            requestClose        : _requestClose,
            grabFocus           : _grabFocus,
-            blurFocus           : _blurFocus
+            blurFocus           : _blurFocus,
+            setReferenceData    : _setReferenceData
        }
    };

--- a/apps/api/documents/cache-scripts.html
+++ b/apps/api/documents/cache-scripts.html
@ -10,7 +10,7 @@
 </head>
 <body>
    <script type="text/javascript" src="../../../vendor/jquery/jquery.min.js"></script>
-    <script type="text/javascript" src="../../../vendor/sockjs/sockjs.min.js"></script>
+    <script type="text/javascript" src="../../../vendor/socketio/socket.io.min.js"></script>
    <script type="text/javascript" src="../../../vendor/xregexp/xregexp-all-min.js"></script>
 	<script type="text/javascript" src="../../../../sdkjs/common/AllFonts.js"></script>
    <script type="text/javascript" src="../../../../sdkjs/word/sdk-all-min.js"></script>
--- a/apps/api/wopi/convert-and-edit-wopi.ejs
+++ b/apps/api/wopi/convert-and-edit-wopi.ejs
@ -0,0 +1,272 @@
+<!DOCTYPE html>
+<html>
+<head runat="server">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no" />
+    <meta name="apple-mobile-web-app-capable" content="yes" />
+    <meta name="mobile-web-app-capable" content="yes" />
+    <!--
+    *
+    * (c) Copyright Ascensio System SIA 2021
+    *
+    * Licensed under the Apache License, Version 2.0 (the "License");
+    * you may not use this file except in compliance with the License.
+    * You may obtain a copy of the License at
+    *
+    *     http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing, software
+    * distributed under the License is distributed on an "AS IS" BASIS,
+    * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    * See the License for the specific language governing permissions and
+    * limitations under the License.
+    *
+    -->
+    <title>ONLYOFFICE</title>
+<style type="text/css">
+html {
+    height: 100%;
+    width: 100%;
+    font-family: Arial, Helvetica, "Helvetica Neue", sans-serif;
+}
+
+body {
+    background: #fff;
+    color: #333;
+    font-size: 12px;
+    font-weight: normal;
+    height: 100%;
+    margin: 0;
+    overflow-y: hidden;
+    padding: 0;
+    text-decoration: none;
+}
+
+.form {
+    height: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
+
+.content {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: flex-end;
+}
+
+.title {
+    font-style: normal;
+    font-weight: 400;
+    font-size: 18px;
+    line-height: 160%;
+    display: flex;
+    align-items: center;
+    text-align: center;
+
+    color: #333333;
+}
+
+.description {
+    font-style: normal;
+    font-weight: 400;
+    font-size: 14px;
+    line-height: 160%;
+
+    display: flex;
+    align-items: center;
+    text-align: center;
+
+    margin-top: 8px;
+
+    color: #333333;
+}
+
+.icon {
+    margin-top: 49px;
+    width: 34px;
+    height: 48px;
+}
+
+.icon-succes {
+    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACIAAAAwCAYAAAB0WahSAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAENSURBVHgB7ZnBDYJAEEX/oN4pQTvQmxcTO7EEsQLtQKyA2AF2QOLFm5ZAB3InZB0WRDOJXCQbNPMSkmX3wGMyn8NAYEywHMMUES+nfPlwRwzKNxReUqolro4F3slYZjZkib2VIByBQUBhksEBtgAodjBYwYwiMuuFsSeUT8oSwSEs43Mh7rzMvOema4nqmU31fQ89QUUkKiLpjciw7bD5xnQEHc706ew3KtL2Bl2jzSrR1Eg0NRJtVommRqKpkWizSjQ1Ek2NRJtV8n+p+bafNDUSbVaJikhURFKK2FmnHb46ppo+v0Ru1W6xN8F8DEfUU+dtdYNTb34KeDyGTkGDGWvFcAu3hElKiXL8/gBwm2fFT+wjuQAAAABJRU5ErkJggg==");
+
+}
+
+.icon-error {
+    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACIAAAAwCAYAAAB0WahSAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAEBSURBVHgB7ZfRDYIwEIavtAM4QkfpA3uoE6gTiJswCIl99NEJSNyAAUhqz0BiGoOoVyjmvoTk6EP7c/ffAQDM0snz3OEFkciAiQBF2bg0DBmfGPIb8yZjVgEz02cuo5gBFHsomJmqqt5XhepFN2YfnqzMYhC9m1+1EfWn4dAZyXTN4EAbNWyISCYjLCRk0CNTdE0Pd00ImzXk/7rmVz9x14SwWUNYSAgLCUEhDQbGmBVMzPOZKOSKgVJqDxMjpVx3ocXfCeODc7dwaNu2tNY2EBHMhH/wnQ8LvHfObR6T04vBhSPMw8lP8EJiVNe11VrfhBBYMw3xwYxf/LX1IkpcuAMGtltNGCBFYAAAAABJRU5ErkJggg==");
+}
+
+#error .icon {
+    margin-bottom: 107px;
+}
+
+.spiner-image {
+    background-image: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyMCAyMCI+PGNpcmNsZSBjeD0iMTAiIGN5PSIxMCIgZmlsbD0ibm9uZSIgc3Ryb2tlPSIjNDQ0IiBzdHJva2Utd2lkdGg9IjEuNSIgcj0iNy4yNSIgc3Ryb2tlLWRhc2hhcnJheT0iMTYwJSwgNDAlIiAvPjwvc3ZnPg==");
+    margin-top: 49px;
+    width: 48px;
+    height: 48px;
+}
+
+#spiner {
+    animation-duration: .8s;
+    animation-name: rotation;
+    animation-iteration-count: infinite;
+    animation-timing-function: linear;
+}
+
+@keyframes rotation {
+    from {
+        transform: rotate(0);
+    }
+
+    to {
+        transform: rotate(360deg);
+    }
+}
+
+.button {
+    margin-top: 50px;
+    cursor: pointer;
+    display: inline-block;
+    border-width: 0px;
+    border-radius: 3px;
+    font-weight: 600;
+    line-height: 133%;
+    letter-spacing: 0.04em;
+    padding: 19px 24px;
+    text-align: center;
+    text-transform: uppercase;
+}
+
+button:disabled, button[disabled]{
+    cursor: default;
+}
+
+.button.gray {
+    color: #AAAAAA;
+    background: #444444;
+}
+
+
+.button.orange {
+    color: #FFFFFF;
+    border: 1px solid #FF6F3D;
+    background: #FF6F3D;
+}
+
+.button.orange:not(:disabled):hover {
+    background: #ff7a4b;
+}
+
+.button.orange:disabled, .button.orange[disabled]{
+    background: #EDC2B3;
+    border: 1px solid #EDC2B3;
+    cursor: default;
+}
+
+
+
+</style>
+</head>
+<body>
+    <div class="form">
+        <div id="progress">
+            <div class="content">
+                <div class="title">Converting your file so you can edit it...</div>
+                <i id="spiner" class="spiner-image"></i>
+                <button class="button orange" disabled>Open converted file</button>
+            </div>
+        </div>
+        <div id="success" style="display: none;">
+            <div class="content">
+                <div class="title">Converting your file so you can edit it...</div>
+                <i class="icon icon-succes"></i>
+                <button class="button orange" id="btn_end">Open converted file</button>
+            </div>
+        </div>
+        <div id="error" style="display: none;">
+            <div class="content">
+                <div class="title">Conversion failed</div>
+                <div class="description">Sorry, we weren't able to convert the file for editing.</div>
+                <i class="icon icon-error"></i>
+            </div>
+        </div>
+    </div>
+
+    <script type="text/javascript" language="javascript">
+
+		function redirect(url) {
+			try {
+				window.top.location.replace(url);
+			}
+			catch (err) {
+				console.err(err);
+			}
+		}
+		
+		function makeXHRRequest(url, success, error) {
+			var xhr = new XMLHttpRequest;
+			xhr.onreadystatechange = function() {
+				if (xhr.readyState == 4)
+					if (xhr.status == 200) {
+						success(xhr.responseText)
+					} else {
+						error()
+					}
+						
+			}
+			;
+			xhr.open("GET", url, !0);
+			xhr.send();
+		}
+		
+		function checkStatus(url, success, error) {
+			makeXHRRequest(url, function(responseText) {
+				let data = JSON.parse(responseText);
+                if(undefined !== data.error) {
+                    error();
+                } else if(data.endConvert) {
+                    success(data.fileUrl);
+                } else {
+                    setTimeout(function(){
+                        checkStatus(url, success, error);
+                    }, 1000);
+                }
+			}, error);
+		}
+		
+		function success(url) {
+            document.getElementById('progress').style.display = 'none';
+            document.getElementById('success').style.display = 'block';
+            document.getElementById('btn_end').onclick = function() {
+                redirect(url);
+            };
+		}
+		
+		function error() {
+            document.getElementById('progress').style.display = 'none';
+            document.getElementById('error').style.display = 'block';
+		}
+        
+		var convertFile = function () {
+
+            let statusHandler = <%- JSON.stringify(statusHandler) %>;
+			
+			if(!statusHandler) {
+				error();
+			}
+			
+			checkStatus(statusHandler, success, error);
+        };
+
+        if (window.addEventListener) {
+            window.addEventListener("load", convertFile);
+        } else if (window.attachEvent) {
+            window.attachEvent("onload", convertFile);
+        }
+    </script>
+</body>
+</html>
--- a/apps/api/wopi/editor-wopi.ejs
+++ b/apps/api/wopi/editor-wopi.ejs
@ -312,7 +312,7 @@ div {
 				"events": {
                    "onAppReady": onAppReady,
                    "onDocumentStateChange": fileInfo.EditNotificationPostMessage ? onDocumentStateChange : undefined,
-                    'onRequestEditRights': fileInfo.EditModePostMessage || fileInfo.HostEditUrl ? onRequestEditRights : undefined,
+                    'onRequestEditRights': fileInfo.EditModePostMessage || (fileInfo.HostEditUrl && !fileInfo.UserCanNotWriteRelative) ? onRequestEditRights : undefined,
                    "onError": onError,
                    "onRequestClose": fileInfo.ClosePostMessage || fileInfo.CloseUrl ? onRequestClose : undefined,
                    "onRequestRename": fileInfo.SupportsRename && fileInfo.UserCanRename ? onRequestRename : undefined,
--- a/apps/common/Gateway.js
+++ b/apps/common/Gateway.js
@ -138,6 +138,10 @@ if (window.Common === undefined) {

            'grabFocus': function(data) {
                $me.trigger('grabfocus', data);
+            },
+
+            'setReferenceData': function(data) {
+                $me.trigger('setreferencedata', data);
            }
        };

@ -347,6 +351,10 @@ if (window.Common === undefined) {
                _postMessage({event:'onRequestCreateNew'});
            },

+            requestReferenceData:  function (data) {
+                _postMessage({event:'onRequestReferenceData', data: data});
+            },
+
            pluginsReady: function() {
                _postMessage({ event: 'onPluginsReady' });
            },
--- a/apps/common/forms/resources/less/common.less
+++ b/apps/common/forms/resources/less/common.less
@ -202,6 +202,13 @@
                text-overflow: ellipsis;
            }
        }
+
+        .separator {
+            height: 22px;
+            margin: 0 9px;
+            border-left: 1px solid @border-divider-ie;
+            border-left: 1px solid @border-divider;
+        }
    }

    .margin-right-small {
@ -589,6 +596,7 @@
        height: 100%;

        &.disabled {
+            opacity: @component-disabled-opacity-ie;
            opacity: @component-disabled-opacity;
            cursor: default !important;
        }
@ -697,6 +705,14 @@
    .fontsize(@font-size-large);
 }

+.font-size-medium {
+    .fontsize(@font-size-medium);
+}
+
+.font-size-huge {
+    .fontsize(@font-size-huge);
+}
+
 .search-bar {
    z-index: 50;
 }
--- a/apps/common/locale.js
+++ b/apps/common/locale.js
@ -171,10 +171,15 @@ Common.Locale = new(function() {
        } else require(polyfills, _requireLang);
    } else _requireLang();

+    const _isCurrentRtl = function () {
+        return false;
+    };
+
    return {
        apply: _applyLocalization,
        get: _get,
        getCurrentLanguage: _getCurrentLanguage,
+        isCurrentLanguageRtl: _isCurrentRtl,
        getDefaultLanguage: _getDefaultLanguage
    };
    
--- a/apps/common/main/lib/component/Button.js
+++ b/apps/common/main/lib/component/Button.js
@ -237,7 +237,7 @@ define([

    var getWidthOfCaption = function (txt) {
        var el = document.createElement('span');
-        el.style.fontSize = '11px';
+        el.style.fontSize = document.documentElement.style.getPropertyValue("--font-size-base-app-custom") || '11px';
        el.style.fontFamily = 'Arial, Helvetica, "Helvetica Neue", sans-serif';
        el.style.position = "absolute";
        el.style.top = '-1000px';
@ -351,22 +351,37 @@ define([
        getCaptionWithBreaks: function (caption) {
            var words = caption.split(' '),
                newCaption = null,
-                maxWidth = 85 - 4;
+                maxWidth = 160 - 4, //85 - 4
+                containAnd = words.indexOf('&');
+            if (containAnd > -1) { // add & to previous word
+                words[containAnd - 1] += ' &';
+                words.splice(containAnd, 1);
+            }
            if (words.length > 1) {
                maxWidth = !!this.menu || this.split === true ? maxWidth - 10 : maxWidth;
                if (words.length < 3) {
+                    words[0] = getShortText(words[0], !!this.menu ? maxWidth + 10 : maxWidth);
                    words[1] = getShortText(words[1], maxWidth);
                    newCaption = words[0] + '<br>' + words[1];
                } else {
+                    var otherWords = '';
                    if (getWidthOfCaption(words[0] + ' ' + words[1]) < maxWidth) { // first and second words in first line
-                        words[2] = getShortText(words[2], maxWidth);
-                        newCaption = words[0] + ' ' + words[1] + '<br>' + words[2];
-                    } else if (getWidthOfCaption(words[1] + ' ' + words[2]) < maxWidth) { // second and third words in second line
-                        words[2] = getShortText(words[2], maxWidth);
-                        newCaption = words[0] + '<br>' + words[1] + ' ' + words[2];
-                    } else {
-                        words[1] = getShortText(words[1] + ' ' + words[2], maxWidth);
-                        newCaption = words[0] + '<br>' + words[1];
+                        for (var i = 2; i < words.length; i++) {
+                            otherWords += words[i] + ' ';
+                        }
+                        if (getWidthOfCaption(otherWords + (!!this.menu ? 10 : 0))*2 < getWidthOfCaption(words[0] + ' ' + words[1])) {
+                            otherWords = getShortText((words[1] + ' ' + otherWords).trim(), maxWidth);
+                            newCaption = words[0] + '<br>' + otherWords;
+                        } else {
+                            otherWords = getShortText(otherWords.trim(), maxWidth);
+                            newCaption = words[0] + ' ' + words[1] + '<br>' + otherWords;
+                        }
+                    } else { // only first word is in first line
+                        for (var j = 1; j < words.length; j++) {
+                            otherWords += words[j] + ' ';
+                        }
+                        otherWords = getShortText(otherWords.trim(), maxWidth);
+                        newCaption = words[0] + '<br>' + otherWords;
                    }
                }
            } else {
@ -754,7 +769,7 @@ define([
            return (this.cmpEl) ? this.cmpEl.is(":visible") : $(this.el).is(":visible");
        },

-        updateHint: function(hint) {
+        updateHint: function(hint, isHtml) {
            this.options.hint = hint;

            if (!this.rendered) return;
@ -780,10 +795,12 @@ define([
                this.btnMenuEl.removeData('bs.tooltip');

            this.btnEl.tooltip({
+                html: !!isHtml,
                title       : (typeof hint == 'string') ? hint : hint[0],
                placement   : this.options.hintAnchor||'cursor'
            });
            this.btnMenuEl && this.btnMenuEl.tooltip({
+                html: !!isHtml,
                title       : hint[1],
                placement   : this.options.hintAnchor||'cursor'
            });
--- a/apps/common/main/lib/component/ColorButton.js
+++ b/apps/common/main/lib/component/ColorButton.js
@ -91,7 +91,7 @@ define([
                    auto.push({
                        id: id + '-color-auto',
                        caption: (typeof options.auto == 'object') ? options.auto.caption || this.textAutoColor : this.textAutoColor,
-                        template: _.template('<a tabindex="-1" type="menuitem"><span class="menu-item-icon color-auto" style="background-image: none; width: 12px; height: 12px; margin: 1px 7px 0 1px; background-color: #' + this.autocolor + ';"></span><%= caption %></a>')
+                        template: _.template('<a tabindex="-1" type="menuitem"><span class="menu-item-icon color-auto" style="background-color: #' + this.autocolor + ';"></span><%= caption %></a>')
                    });
                    auto.push({caption: '--'});
                }
--- a/apps/common/main/lib/component/ComboBorderSize.js
+++ b/apps/common/main/lib/component/ComboBorderSize.js
@ -65,7 +65,7 @@ define([
                displayValue: null,
                pxValue: null,
                id: Common.UI.getId(),
-                offsety: undefined
+                imgId: undefined
            }
        }
    });
@ -78,7 +78,7 @@ define([
        template: _.template([
            '<div class="input-group combobox combo-border-size input-group-nr <%= cls %>" id="<%= id %>" style="<%= style %>">',
                '<div class="form-control" style="<%= style %>" data-hint="<%= dataHint %>" data-hint-direction="<%= dataHintDirection %>" data-hint-offset="<%= dataHintOffset %>">',
-                    '<i class="image"></i>',
+                    '<i class="img-line"><svg class="img-border-size" style="margin-top: -9.5px"><use xlink:href="#half-pt"></use></svg></i>',
                    '<span class="text"></span>',
                '</div>',
                '<div style="display: table-cell;"></div>',
@ -89,9 +89,11 @@ define([
                    '<% _.each(items, function(item) { %>',
                        '<li id="<%= item.id %>" data-value="<%= item.value %>"><a tabindex="-1" type="menuitem">',
                            '<span><%= item.displayValue %></span>',
-                            '<% if (item.offsety!==undefined) { %>',
-                                '<img src="data:image/gif;base64,R0lGODlhAQABAID/AMDAwAAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==" align="right" style="background-position: 0 -<%= item.offsety %>px;">',
-                            '<% } %>',
+                            '<span class="border-line">',
+                                '<svg class="img-border-size" style="height: <%= Math.ceil(item.pxValue) %>px; margin-top: -<%= Math.ceil(item.pxValue)/2 %>px">',
+                                    '<use xlink:href="#<%= item.imgId %>"></use>',
+                                '</svg>',
+                            '</span>',
                        '</a></li>',
                    '<% }); %>',
                '</ul>',
@ -101,13 +103,13 @@ define([
        initialize : function(options) {
            var txtPt = Common.Utils.Metric.getMetricName(Common.Utils.Metric.c_MetricUnits.pt),
                data = [
-                    {displayValue: '0.5 ' + txtPt,   value: 0.5, pxValue: 0.5, offsety: 0},
-                    {displayValue: '1 ' + txtPt,     value: 1,   pxValue: 1, offsety: 20},
-                    {displayValue: '1.5 ' + txtPt,   value: 1.5, pxValue: 2, offsety: 40},
-                    {displayValue: '2.25 ' + txtPt,  value: 2.25,pxValue: 3, offsety: 60},
-                    {displayValue: '3 ' + txtPt,     value: 3,   pxValue: 4, offsety: 80},
-                    {displayValue: '4.5 ' + txtPt,   value: 4.5, pxValue: 5, offsety: 100},
-                    {displayValue: '6 ' + txtPt,     value: 6,   pxValue: 6, offsety: 120}
+                    {displayValue: '0.5 ' + txtPt,   value: 0.5, pxValue: 0.5,  imgId: 'half-pt'},
+                    {displayValue: '1 ' + txtPt,     value: 1,   pxValue: 1,    imgId: 'one-pt'},
+                    {displayValue: '1.5 ' + txtPt,   value: 1.5, pxValue: 2,    imgId: 'one-and-half-pt'},
+                    {displayValue: '2.25 ' + txtPt,  value: 2.25,pxValue: 3,    imgId: 'two-and-quarter-pt'},
+                    {displayValue: '3 ' + txtPt,     value: 3,   pxValue: 4,    imgId: 'three-pt'},
+                    {displayValue: '4.5 ' + txtPt,   value: 4.5, pxValue: 6,    imgId: 'four-and-half-pt'},
+                    {displayValue: '6 ' + txtPt,     value: 6,   pxValue: 8,    imgId: 'six-pt'}
                ];
            if (options.allowNoBorders !== false)
                data.unshift({displayValue: this.txtNoBorders, value: 0, pxValue: 0 });
@ -144,11 +146,17 @@ define([

        updateFormControl: function(record) {
            var formcontrol = $(this.el).find('.form-control');
-            var image = formcontrol.find('> .image');
+            var image = formcontrol.find('> .img-line');
            var text = formcontrol.find('> .text');

            if (record.get('value')>0) {
-                image.css('background-position', '10px -' + record.get('offsety') + 'px').show();
+                var elm = formcontrol.find('use');
+                if(elm.length>0) {
+                    elm[0].setAttribute('xlink:href', '#' + record.get('imgId'));
+                    elm.parent().css('margin-top', (- Math.ceil(record.get('pxValue')/2))+'px');
+                    elm.parent().css('height', Math.ceil(record.get('pxValue'))+'px');
+                }
+                image.show();
                text.hide();
            } else {
                image.hide();
@ -190,10 +198,25 @@ define([
                '<ul class="dropdown-menu <%= menuCls %>" style="<%= menuStyle %>" role="menu">',
                    '<% _.each(items, function(item) { %>',
                        '<li id="<%= item.id %>" data-value="<%= item.value %>"><a tabindex="-1" type="menuitem">',
-                            '<span><%= item.displayValue %></span>',
-                            '<% if (item.offsety!==undefined) { %>',
-                             '<img src="data:image/gif;base64,R0lGODlhAQABAID/AMDAwAAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==" align="right" style="background-position: 0 -<%= item.offsety %>px;">',
+                        '<% if (!isRTL) { %>',
+                            '<span><%= item.displayValue %>' + '</span>',
+                            '<% if (item.imgId!==undefined) { %>',
+                            '<span class="border-line">',
+                                '<svg class="img-border-size" style="height: <%= Math.ceil(item.pxValue) %>px; margin-top: -<%= (Math.ceil(item.pxValue)/2) %>px">',
+                                    '<use xlink:href="#<%= item.imgId %>"></use>',
+                                '</svg>',
+                            '</span>',
+                             '<% } %>',
+                        '<% } else { %>',
+                            '<% if (item.imgId!==undefined) { %>',
+                            '<span class="border-line">',
+                                '<svg class="img-border-size" style="height: <%= Math.ceil(item.pxValue) %>px; margin-top: -<%= (Math.ceil(item.pxValue)/2) %>px">',
+                                    '<use xlink:href="#<%= item.imgId %>"></use>',
+                                '</svg>',
+                            '</span>',
                            '<% } %>',
+                            '<span><%= item.displayValue %>' + '</span>',
+                        '<% } %>',
                        '</a></li>',
                    '<% }); %>',
                '</ul>',
@ -204,13 +227,13 @@ define([
            this.txtNoBorders = options.txtNoBorders || this.txtNoBorders;
            var txtPt = Common.Utils.Metric.getMetricName(Common.Utils.Metric.c_MetricUnits.pt),
                data = [
-                    {displayValue: '0.5 ' + txtPt,   value: 0.5, pxValue: 0.5, offsety: 0},
-                    {displayValue: '1 ' + txtPt,     value: 1,   pxValue: 1, offsety: 20},
-                    {displayValue: '1.5 ' + txtPt,   value: 1.5, pxValue: 2, offsety: 40},
-                    {displayValue: '2.25 ' + txtPt,  value: 2.25,pxValue: 3, offsety: 60},
-                    {displayValue: '3 ' + txtPt,     value: 3,   pxValue: 4, offsety: 80},
-                    {displayValue: '4.5 ' + txtPt,   value: 4.5, pxValue: 5, offsety: 100},
-                    {displayValue: '6 ' + txtPt,     value: 6,   pxValue: 6, offsety: 120}
+                    {displayValue: '0.5 ' + txtPt,   value: 0.5, pxValue: 0.5,  imgId: 'half-pt'},
+                    {displayValue: '1 ' + txtPt,     value: 1,   pxValue: 1,    imgId: 'one-pt'},
+                    {displayValue: '1.5 ' + txtPt,   value: 1.5, pxValue: 2,    imgId: 'one-and-half-pt'},
+                    {displayValue: '2.25 ' + txtPt,  value: 2.25,pxValue: 3,    imgId: 'two-and-quarter-pt'},
+                    {displayValue: '3 ' + txtPt,     value: 3,   pxValue: 4,    imgId: 'three-pt'},
+                    {displayValue: '4.5 ' + txtPt,   value: 4.5, pxValue: 6,    imgId: 'four-and-half-pt'},
+                    {displayValue: '6 ' + txtPt,     value: 6,   pxValue: 8,    imgId: 'six-pt'}
                ];

            if (options.allowNoBorders !== false)
@ -234,9 +257,9 @@ define([

    Common.UI.ComboBorderType = Common.UI.ComboBorderSize.extend(_.extend({
        template: _.template([
-            '<div class="input-group combobox combo-border-size input-group-nr <%= cls %>" id="<%= id %>" style="<%= style %>">',
+            '<div class="input-group combobox combo-border-size combo-border-type input-group-nr <%= cls %>" id="<%= id %>" style="<%= style %>">',
                '<div class="form-control" style="<%= style %>" data-hint="<%= dataHint %>" data-hint-direction="<%= dataHintDirection %>" data-hint-offset="<%= dataHintOffset %>">',
-                    '<i class="image"></i>',
+                    '<i class="img-line"><svg><use xlink:href="#solid"></use></svg></i>',
                '</div>',
                '<div style="display: table-cell;"></div>',
                '<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">',
@ -244,10 +267,11 @@ define([
                '</button>',
                '<ul class="dropdown-menu <%= menuCls %>" style="<%= menuStyle %>" role="menu">',
                    '<% _.each(items, function(item) { %>',
-                        '<li id="<%= item.id %>" data-value="<%= item.value %>"><a tabindex="-1" type="menuitem" style="padding: 2px 0 2px 10px;">',
-                            '<span style="margin-top: 0;"></span>',
-                            '<% if (item.offsety!==undefined) { %>',
-                                '<img src="data:image/gif;base64,R0lGODlhAQABAID/AMDAwAAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==" align="left" style="background-position: 0 -<%= item.offsety %>px;">',
+                        '<li id="<%= item.id %>" data-value="<%= item.value %>"><a tabindex="-1" type="menuitem">',
+                            '<% if (item.imgId!==undefined) { %>',
+                            '<span>',
+                                '<svg class="img-border-size"><use xlink:href="#<%= item.imgId %>"></use></svg>',
+                            '</span>',
                            '<% } %>',
                        '</a></li>',
                    '<% }); %>',
@ -259,14 +283,14 @@ define([
            Common.UI.ComboBorderSize.prototype.initialize.call(this, _.extend({
                store: new Common.UI.BordersStore(),
                data: [
-                    {value: Asc.c_oDashType.solid, offsety: 140},
-                    {value: Asc.c_oDashType.sysDot, offsety: 160},
-                    {value: Asc.c_oDashType.sysDash, offsety: 180},
-                    {value: Asc.c_oDashType.dash, offsety: 200},
-                    {value: Asc.c_oDashType.dashDot, offsety: 220},
-                    {value: Asc.c_oDashType.lgDash, offsety: 240},
-                    {value: Asc.c_oDashType.lgDashDot, offsety: 260},
-                    {value: Asc.c_oDashType.lgDashDotDot, offsety: 280}
+                    {value: Asc.c_oDashType.solid,        imgId: "solid"},
+                    {value: Asc.c_oDashType.sysDot,       imgId: 'dots'},
+                    {value: Asc.c_oDashType.sysDash,      imgId: 'dashes'},
+                    {value: Asc.c_oDashType.dash,         imgId: 'dashes-spaced'},
+                    {value: Asc.c_oDashType.dashDot,      imgId: 'dash-dot'},
+                    {value: Asc.c_oDashType.lgDash,       imgId: 'dashes-wide'},
+                    {value: Asc.c_oDashType.lgDashDot,    imgId: 'wide-dash-dot'},
+                    {value: Asc.c_oDashType.lgDashDotDot, imgId: 'wide-dash-dot-dot'}
                ]
            }, options));
        },
@ -277,11 +301,18 @@ define([
        },

        updateFormControl: function(record) {
-            if (record)
-                $(this.el).find('.form-control > .image')
-                    .css('background-position', '10px -' + record.get('offsety') + 'px').show();
+            if (record) {
+               var elm = $(this.el).find('.form-control > .img-line use');
+                if(elm.length) {
+                    var height = Math.ceil(record.get('pxValue'));
+                    height = height ? height : 3;
+                    elm[0].setAttribute('xlink:href', '#' + record.get('imgId'));
+                    elm.parent().css('height', height + 'px');
+                }
+                $(this.el).find('.form-control > .img-line').show();
+            }
            else
-                $(this.el).find('.form-control > .image').hide();
+                $(this.el).find('.form-control > .img-line').hide();
        },

        setValue: function(value) {
@ -300,9 +331,9 @@ define([

    Common.UI.ComboBoxColor = Common.UI.ComboBox.extend(_.extend({
        template: _.template([
-            '<div class="input-group combobox combo-color input-group-nr <%= cls %>" id="<%= id %>" style="<%= style %>">',
-            '<div class="form-control" style="padding:2px 14px 2px 3px; <%= style %> display: block;">',
-                '<div style="display: inline-block;overflow: hidden;width: 100%;height: 100%;"></div>',
+            '<div class="input-group combobox combo-color combobox-color input-group-nr <%= cls %>" id="<%= id %>" style="<%= style %>">',
+            '<div class="form-control" style="<%= style %>">',
+                '<div></div>',
            '</div>',
            '<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">',
                '<span class="caret"></span>',
@ -313,7 +344,7 @@ define([
                    '<li id="<%= item.id %>" data-value="<%= item.value %>"><a tabindex="-1" type="menuitem"><%= scope.getDisplayValue(item) %></a></li>',
                '<% } else { %>',
                    '<li id="<%= item.id %>" data-value="<%= item.value %>">',
-                    '<a tabindex="-1" type="menuitem" style="padding: 5px;"><div style="height: 15px;<%= item.styleStr %>"><%= scope.getDisplayValue(item) %></div></a>',
+                    '<a tabindex="-1" type="menuitem"><div style="<%= item.styleStr %>"><%= scope.getDisplayValue(item) %></div></a>',
                    '</li>',
                '<% } %>',
            '<% }); %>',
@ -380,7 +411,7 @@ define([
                    '<li id="<%= item.id %>" data-value="<%= item.value %>"><a tabindex="-1" type="menuitem"><%= scope.getDisplayValue(item) %></a></li>',
                    '<% } else { %>',
                    '<li id="<%= item.id %>" data-value="<%= item.value %>">',
-                    '<a tabindex="-1" type="menuitem" style="padding: 5px;"><div style="height: 15px;<%= item.styleStr %>"><%= scope.getDisplayValue(item) %></div></a>',
+                    '<a tabindex="-1" type="menuitem""><div style="<%= item.styleStr %>"><%= scope.getDisplayValue(item) %></div></a>',
                    '</li>',
                    '<% } %>',
                    '<% }); %>'
@ -407,9 +438,9 @@ define([

    Common.UI.ComboBoxIcons= Common.UI.ComboBox.extend(_.extend({
        template: _.template([
-            '<div class="input-group combobox combo-color input-group-nr <%= cls %>" id="<%= id %>" style="<%= style %>">',
-                '<div class="form-control" style="padding:2px 0 2px 3px; <%= style %> display: block;">',
-                    '<div style="display: inline-block;overflow: hidden;width: 100%;height: 100%;"></div>',
+            '<div class="input-group combobox combobox-icons combo-color input-group-nr <%= cls %>" id="<%= id %>" style="<%= style %>">',
+                '<div class="form-control" style="<%= style %>">',
+                    '<div></div>',
                '</div>',
                '<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">',
                    '<span class="caret"></span>',
@ -420,9 +451,9 @@ define([
                            '<li id="<%= item.id %>" data-value="<%= item.value %>"><a tabindex="-1" type="menuitem"><%= scope.getDisplayValue(item) %></a></li>',
                        '<% } else { %>',
                            '<li id="<%= item.id %>" data-value="<%= item.value %>">',
-                                '<a tabindex="-1" type="menuitem" style="padding: 5px;">',
+                                '<a tabindex="-1" type="menuitem">',
                                    '<% _.each(item.data.iconSet, function(icon) { %>',
-                                    '<img src="<%= item.data.icons.at(icon-1).get(\'icon\') %>" style="width:16px;height:16px;margin-right: 5px;">',
+                                    '<img src="<%= item.data.icons.at(icon-1).get(\'icon\') %>">',
                                    '<% }) %>',
                                '</a>',
                            '</li>',
@ -454,7 +485,7 @@ define([
            if (record.get('value')!=-1) {
                var str = '';
                _.each(record.get('data').iconSet, function(icon) {
-                    str += '<img src="' + record.get('data').icons.at(icon-1).get("icon") + '" style="width:16px;height:16px;margin-right: 5px;">';
+                    str += '<img src="' + record.get('data').icons.at(icon-1).get("icon") + '">';
                });
                formcontrol[0].innerHTML = str;
                formcontrol.css({'margin-top': '0'});
@ -495,7 +526,7 @@ define([
                    '<li id="<%= item.id %>" data-value="<%= item.value %>">',
                        '<a tabindex="-1" type="menuitem" style="padding: 5px;">',
                            '<% _.each(item.data.iconSet, function(icon) { %>',
-                                '<img src="<%= item.data.icons.at(icon-1).get(\'icon\') %>" style="width:16px;height:16px;margin-right: 5px;">',
+                                '<img src="<%= item.data.icons.at(icon-1).get(\'icon\') %>">',
                            '<% }) %>',
                        '</a>',
                    '</li>',
--- a/apps/common/main/lib/component/ComboBox.js
+++ b/apps/common/main/lib/component/ComboBox.js
@ -153,7 +153,8 @@ define([
                        scope       : me,
                        dataHint    : this.options.dataHint,
                        dataHintDirection: this.options.dataHintDirection,
-                        dataHintOffset: this.options.dataHintOffset
+                        dataHintOffset: this.options.dataHintOffset,
+                        isRTL       : Common.UI.isRTL()
                    }));
                    if (this.itemsTemplate)
                        this.cmpEl.find('ul').html(
@ -311,7 +312,10 @@ define([
                var $list = this.cmpEl.find('ul');
                if ($list.hasClass('menu-absolute')) {
                    var offset = this.cmpEl.offset();
-                    $list.css({left: offset.left, top: offset.top + this.cmpEl.outerHeight() + 2});
+                    var left = offset.left;
+                    if (left + $list.outerWidth()>Common.Utils.innerWidth())
+                        left += (this.cmpEl.outerWidth() - $list.outerWidth());
+                    $list.css({left: left, top: offset.top + this.cmpEl.outerHeight() + 2});
                } else if ($list.hasClass('menu-aligned')) {
                    var offset = this.cmpEl.offset();
                    $list.toggleClass('show-top', offset.top + this.cmpEl.outerHeight() + $list.outerHeight() > Common.Utils.innerHeight());
@ -407,8 +411,9 @@ define([
            },

            selectCandidate: function() {
-                var index = this._search.index || 0,
+                var index = (this._search.index && this._search.index != -1) ? this._search.index : 0,
                    re = new RegExp('^' + ((this._search.full) ? this._search.text : this._search.char), 'i'),
+                    isFirstCharsEqual = re.test(this.store.at(index).get(this.displayField)),
                    itemCandidate, idxCandidate;

                for (var i=0; i<this.store.length; i++) {
@ -417,6 +422,8 @@ define([
                        if (!itemCandidate) {
                            itemCandidate = item;
                            idxCandidate = i;
+                            if(!isFirstCharsEqual) 
+                                break;  
                        }
                        if (this._search.full && i==index || i>index) {
                            itemCandidate = item;
@ -707,8 +714,8 @@ define([
                this.options.updateFormControl.call(this, this._selectedItem);
        },

-        setValue: function(value) {
-            Common.UI.ComboBox.prototype.setValue.call(this, value);
+        setValue: function(value, defValue) {
+            Common.UI.ComboBox.prototype.setValue.call(this, value, defValue);
            if (this.options.updateFormControl)
                this.options.updateFormControl.call(this, this._selectedItem);
        },
--- a/apps/common/main/lib/component/ComboDataView.js
+++ b/apps/common/main/lib/component/ComboDataView.js
@ -56,6 +56,7 @@ define([
            itemWidth           : 80,
            itemHeight          : 40,
            menuMaxHeight       : 300,
+            autoWidth           : false,
            enableKeyEvents     : false,
            beforeOpenHandler   : null,
            additionalMenuItems  : null,
@ -87,11 +88,13 @@ define([
            this.menuMaxHeight = this.options.menuMaxHeight;
            this.beforeOpenHandler = this.options.beforeOpenHandler;
            this.showLast    = this.options.showLast;
+            this.wrapWidth   = 0;
            this.rootWidth   = 0;
            this.rootHeight  = 0;
            this.rendered    = false;
            this.needFillComboView = false;
-            this.minWidth = this.options.minWidth;
+            this.minWidth    = this.options.minWidth;
+            this.autoWidth   = this.initAutoWidth = (Common.Utils.isIE10 || Common.Utils.isIE11) ? false : this.options.autoWidth;
            this.delayRenderTips = this.options.delayRenderTips || false;
            this.itemTemplate   = this.options.itemTemplate || _.template([
                '<div class="style" id="<%= id %>">',
@ -112,7 +115,7 @@ define([
            this.openButton = new Common.UI.Button({
                cls: 'open-menu',
                menu: new Common.UI.Menu({
-                    menuAlign: 'tl-tl',
+                    menuAlign: Common.UI.isRTL() ? 'tr-tr' : 'tl-tl',
                    offset: [0, 3],
                    items: [
                        {template: _.template('<div class="menu-picker-container"></div>')}
@ -208,10 +211,12 @@ define([
                me.fieldPicker.el.addEventListener('contextmenu', _.bind(me.onPickerComboContextMenu, me), false);
                me.menuPicker.el.addEventListener('contextmenu', _.bind(me.onPickerComboContextMenu, me), false);

+                Common.NotificationCenter.on('more:toggle', _.bind(this.onMoreToggle, this));
+
                me.onResize();

                me.rendered = true;
-
+                
                me.trigger('render:after', me);
            }
            if (this.disabled) {
@ -221,8 +226,26 @@ define([
            return this;
        },

+        onMoreToggle: function(btn, state) {
+            if(state) {
+                this.checkSize();
+            }
+        },
+
        checkSize: function() {
            if (this.cmpEl && this.cmpEl.is(':visible')) {
+                if(this.autoWidth && this.menuPicker.store.length > 0) {
+                    var wrapWidth = this.$el.width();
+                    if(wrapWidth != this.wrapWidth || this.needFillComboView){
+                        this.wrapWidth = wrapWidth;
+                        this.autoChangeWidth();
+
+                        var picker = this.menuPicker;
+                        var record = picker.getSelectedRec();
+                        this.fillComboView(record || picker.store.at(0), !!record, true);                   
+                    }
+                }
+                
                var me = this,
                    width  = this.cmpEl.width(),
                    height = this.cmpEl.height();
@ -265,7 +288,46 @@ define([
            if (!this.isSuspendEvents)
                this.trigger('resize', this);
        },
+    
+        autoChangeWidth: function() {
+            if(this.menuPicker.dataViewItems[0]){
+                var wrapEl = this.$el;
+                var wrapWidth = wrapEl.width();

+                var itemEl = this.menuPicker.dataViewItems[0].$el;
+                var itemWidth = this.itemWidth + parseFloat(itemEl.css('padding-left')) + parseFloat(itemEl.css('padding-right')) + 2 * parseFloat(itemEl.css('border-width'));
+                var itemMargins = parseFloat(itemEl.css('margin-left')) + parseFloat(itemEl.css('margin-right'));
+
+                var fieldPickerEl = this.fieldPicker.$el;
+                var fieldPickerPadding = parseFloat(fieldPickerEl.css(Common.UI.isRTL() ? 'padding-left' : 'padding-right'));
+                var fieldPickerBorder = parseFloat(fieldPickerEl.css('border-width'));
+                var dataviewPaddings = parseFloat(this.fieldPicker.$el.find('.dataview').css('padding-left')) + parseFloat(this.fieldPicker.$el.find('.dataview').css('padding-right'));
+
+                var cmbDataViewEl = this.cmpEl;
+                var cmbDataViewPaddings = parseFloat(cmbDataViewEl.css('padding-left')) + parseFloat(cmbDataViewEl.css('padding-right'));
+
+                var itemsCount =  Math.floor((wrapWidth - fieldPickerPadding - dataviewPaddings - 2 * fieldPickerBorder - cmbDataViewPaddings) / (itemWidth + itemMargins));
+                if(itemsCount > this.store.length) 
+                    itemsCount = this.store.length;
+
+                var widthCalc = Math.ceil((itemsCount * (itemWidth + itemMargins) + fieldPickerPadding + dataviewPaddings + 2 * fieldPickerBorder + cmbDataViewPaddings) * 10) / 10;
+                
+                var maxWidth = parseFloat(cmbDataViewEl.css('max-width'));
+                if(widthCalc > maxWidth)
+                    widthCalc = maxWidth;
+                    
+                cmbDataViewEl.css('width', widthCalc);
+
+                if(this.initAutoWidth) {
+                    this.initAutoWidth = false;
+                    cmbDataViewEl.css('position', 'absolute');
+                    cmbDataViewEl.css('top', '50%');
+                    cmbDataViewEl.css('bottom', '50%');
+                    cmbDataViewEl.css('margin', 'auto 0');
+                }
+            }
+        },
+        
        onBeforeShowMenu: function(e) {
            var me = this;

--- a/apps/common/main/lib/component/ComboDataViewShape.js
+++ b/apps/common/main/lib/component/ComboDataViewShape.js
@ -368,7 +368,10 @@ define([
            if (menu.cmpEl) {
                menu.menuAlignEl = this.cmpEl;
                var offset = this.cmpEl.width() - this.openButton.$el.width() - this.menuWidth + 1;
-                menu.setOffset(Math.min(offset, 0));
+                if (Common.UI.isRTL()) {
+                    offset = this.openButton.$el.width() - 1;
+                }
+                menu.setOffset(Common.UI.isRTL() ? offset : Math.min(offset, 0));
            }

            if (this.options.hint) {
--- a/apps/common/main/lib/component/DataView.js
+++ b/apps/common/main/lib/component/DataView.js
@ -328,6 +328,7 @@ define([
                if (this.listenStoreEvents) {
                    this.listenTo(this.store, 'add',    this.onAddItem);
                    this.listenTo(this.store, 'reset',  this.onResetItems);
+                    this.groups && this.listenTo(this.groups, 'add',  this.onAddGroup);
                }
                this.onResetItems();

@ -392,18 +393,36 @@ define([

            if (suspendEvents)
                this.suspendEvents();
-
-            if (!this.multiSelect) {
+            this.extremeSeletedRec = record;
+            if (!this.multiSelect || ( !this.pressedShift && !this.pressedCtrl) || !this.currentSelectedRec || (this.pressedShift && this.currentSelectedRec == record)) {
                _.each(this.store.where({selected: true}), function(rec){
                    rec.set({selected: false});
                });

                if (record) {
                    record.set({selected: true});
+                    this.currentSelectedRec = record;
                }
            } else {
-                if (record)
-                    record.set({selected: !record.get('selected')});
+                if (record) {
+                    if(this.pressedCtrl) {
+                        record.set({selected: !record.get('selected')});
+                        this.currentSelectedRec = record;
+                    }
+                    else if(this.pressedShift){
+                        var me =this;
+                        var inRange=false;
+                        _.each(me.store.models, function(rec){
+                            if(me.currentSelectedRec == rec || record == rec){
+                                inRange = !inRange;
+                                rec.set({selected: true});
+                            }
+                            else {
+                                rec.set({selected: (inRange)});
+                            }
+                        });
+                    }
+                }
            }

            if (suspendEvents)
@ -510,6 +529,35 @@ define([
            }
        },

+        onAddGroup: function(group) {
+            var el = $(_.template([
+                '<% if (group.headername !== undefined) { %>',
+                '<div class="header-name"><%= group.headername %></div>',
+                '<% } %>',
+                '<div class="grouped-data <% if (group.inline) { %> group.inline <% } %> <% if (!_.isEmpty(group.caption)) { %> margin <% } %>" id="<%= group.id %>">',
+                '<% if (!_.isEmpty(group.caption)) { %>',
+                    '<div class="group-description">',
+                        '<span><%= group.caption %></span>',
+                    '</div>',
+                '<% } %>',
+                    '<div class="group-items-container">',
+                    '</div>',
+                '</div>'
+            ].join(''))({
+                group: group.toJSON()
+            }));
+            var innerEl = $(this.el).find('.inner').addBack().filter('.inner');
+            if (innerEl) {
+                var idx = _.indexOf(this.groups.models, group);
+                var innerDivs = innerEl.find('.grouped-data');
+                if (idx > 0)
+                    $(innerDivs.get(idx - 1)).after(el);
+                else {
+                    (innerDivs.length > 0) ? $(innerDivs[idx]).before(el) : innerEl.append(el);
+                }
+            }
+        },
+
        onResetItems: function() {
            _.each(this.dataViewItems, function(item) {
                var tip = item.$el.data('bs.tooltip');
@ -678,13 +726,22 @@ define([
        onKeyDown: function (e, data) {
            if ( this.disabled ) return;
            if (data===undefined) data = e;
-            if (_.indexOf(this.moveKeys, data.keyCode)>-1 || data.keyCode==Common.UI.Keys.RETURN) {
+
+            if(this.multiSelect) {
+                if (data.keyCode == Common.UI.Keys.CTRL) {
+                    this.pressedCtrl = true;
+                } else if (data.keyCode == Common.UI.Keys.SHIFT) {
+                    this.pressedShift = true;
+                }
+            }
+
+                if (_.indexOf(this.moveKeys, data.keyCode)>-1 || data.keyCode==Common.UI.Keys.RETURN) {
                data.preventDefault();
                data.stopPropagation();
-                var rec = this.getSelectedRec();
-                if (this.lastSelectedRec===null)
+                var rec =(this.multiSelect) ? this.extremeSeletedRec : this.getSelectedRec();
+                if (this.lastSelectedRec === null)
                    this.lastSelectedRec = rec;
-                if (data.keyCode==Common.UI.Keys.RETURN) {
+                if (data.keyCode == Common.UI.Keys.RETURN) {
                    this.lastSelectedRec = null;
                    if (this.selectedBeforeHideRec) // only for ComboDataView menuPicker
                        rec = this.selectedBeforeHideRec;
@ -694,6 +751,7 @@ define([
                    if (this.parentMenu)
                        this.parentMenu.hide();
                } else {
+                    this.pressedCtrl=false;
                    var idx = _.indexOf(this.store.models, rec);
                    if (idx<0) {
                        if (data.keyCode==Common.UI.Keys.LEFT) {
@ -774,12 +832,20 @@ define([
            }
        },

+        onKeyUp: function(e){
+            if(e.keyCode == Common.UI.Keys.SHIFT)
+                this.pressedShift = false;
+            if(e.keyCode == Common.UI.Keys.CTRL)
+                this.pressedCtrl = false;
+        },
+
        attachKeyEvents: function() {
            if (this.enableKeyEvents && this.handleSelect) {
                var el = $(this.el).find('.inner').addBack().filter('.inner');
                el.addClass('canfocused');
                el.attr('tabindex', this.tabindex.toString());
                el.on((this.parentMenu && this.useBSKeydown) ? 'dataview:keydown' : 'keydown', _.bind(this.onKeyDown, this));
+                el.on((this.parentMenu && this.useBSKeydown) ? 'dataview:keyup' : 'keyup', _.bind(this.onKeyUp, this));
            }
        },

@ -789,7 +855,11 @@ define([
                this.scrollToRecord(this.lastSelectedRec);
                this.lastSelectedRec = null;
            } else {
-                this.scrollToRecord(this.getSelectedRec());
+                var selectedRec = this.getSelectedRec();
+                if (!this.multiSelect)
+                    this.scrollToRecord(selectedRec);
+                else if(selectedRec && selectedRec.length > 0)
+                    this.scrollToRecord(selectedRec[selectedRec.length - 1]);
            }
        },

@ -1298,12 +1368,30 @@ define([
                props = {minScrollbarLength  : this.minScrollbarLength};
            this.scrollAlwaysVisible && (props.alwaysVisibleY = this.scrollAlwaysVisible);

-            if (top + menuH > docH ) {
-                innerEl.css('max-height', (docH - top - paddings - margins) + 'px');
-                this.scroller.update(props);
-            } else if ( top + menuH < docH && innerEl.height() < this.options.restoreHeight ) {
-                innerEl.css('max-height', (Math.min(docH - top - paddings - margins, this.options.restoreHeight)) + 'px');
-                this.scroller.update(props);
+            var menuUp = false;
+            if (this.parentMenu.menuAlign) {
+                var m = this.parentMenu.menuAlign.match(/^([a-z]+)-([a-z]+)/);
+                menuUp = (m[1]==='bl' || m[1]==='br');
+            }
+            if (menuUp) {
+                var bottom = top + menuH;
+                if (top<0) {
+                    innerEl.css('max-height', (bottom - paddings - margins) + 'px');
+                    menuRoot.css('top', 0);
+                    this.scroller.update(props);
+                } else if (top>0 && innerEl.height() < this.options.restoreHeight) {
+                    innerEl.css('max-height', (Math.min(bottom - paddings - margins, this.options.restoreHeight)) + 'px');
+                    menuRoot.css('top', bottom - menuRoot.outerHeight());
+                    this.scroller.update(props);
+                }
+            } else {
+                if (top + menuH > docH ) {
+                    innerEl.css('max-height', (docH - top - paddings - margins) + 'px');
+                    this.scroller.update(props);
+                } else if ( top + menuH < docH && innerEl.height() < this.options.restoreHeight ) {
+                    innerEl.css('max-height', (Math.min(docH - top - paddings - margins, this.options.restoreHeight)) + 'px');
+                    this.scroller.update(props);
+                }
            }
        },

--- a/apps/common/main/lib/component/DimensionPicker.js
+++ b/apps/common/main/lib/component/DimensionPicker.js
@ -53,12 +53,13 @@ define([
                minRows     : 5,
                minColumns  : 5,
                maxRows     : 20,
-                maxColumns  : 20
+                maxColumns  : 20,
+                direction   : undefined // 'left', 'right'
            },

            template:_.template([
                '<div style="width: 100%; height: 100%;">',
-                    '<div class="dimension-picker-status">0x0</div>',
+                    '<div dir="ltr" class="dimension-picker-status">0x0</div>',
                    '<div class="dimension-picker-observecontainer">',
                        '<div class="dimension-picker-mousecatcher"></div>',
                        '<div class="dimension-picker-unhighlighted"></div>',
@ -84,12 +85,24 @@ define([
                me.maxRows     = me.options.maxRows;
                me.maxColumns  = me.options.maxColumns;

+                me.direction   = me.options.direction;
+                if (Common.UI.isRTL() && !me.direction) {
+                    me.direction = 'right';
+                }
+
                me.curColumns = 0;
                me.curRows = 0;

                var onMouseMove = function(event){
+                    var offsetX;
+                    if (me.direction === 'right' && me.areaMouseCatcher) {
+                        var width = me.areaMouseCatcher.width();
+                        offsetX = event.offsetX === undefined ? (width - event.originalEvent.layerX) : (width - event.offsetX)*Common.Utils.zoom()
+                    } else {
+                        offsetX = event.offsetX === undefined ? event.originalEvent.layerX : event.offsetX*Common.Utils.zoom();
+                    }
                    me.setTableSize(
-                        Math.ceil((event.offsetX === undefined ? event.originalEvent.layerX : event.offsetX*Common.Utils.zoom()) / me.itemSize),
+                        Math.ceil(offsetX / me.itemSize),
                        Math.ceil((event.offsetY === undefined ? event.originalEvent.layerY : event.offsetY*Common.Utils.zoom()) / me.itemSize),
                        event
                    );
@ -104,27 +117,31 @@ define([
                };

                if (rootEl){
-                    var areaMouseCatcher    = rootEl.find('.dimension-picker-mousecatcher');
+                    me.areaMouseCatcher    = rootEl.find('.dimension-picker-mousecatcher');
                    me.areaUnHighLighted   = rootEl.find('.dimension-picker-unhighlighted');
                    me.areaHighLighted     = rootEl.find('.dimension-picker-highlighted');
                    me.areaStatus          = rootEl.find('.dimension-picker-status');

                    rootEl.css({width: me.minColumns + 'em'});
-                    areaMouseCatcher.css('z-index', 1);
-                    areaMouseCatcher.width(me.maxColumns + 'em').height(me.maxRows + 'em');
+                    me.areaMouseCatcher.css('z-index', 1);
+                    me.areaMouseCatcher.width(me.maxColumns + 'em').height(me.maxRows + 'em');
                    me.areaUnHighLighted.width(me.minColumns + 'em').height(me.minRows + 'em');
-                    me.areaStatus.html(me.curColumns + ' x ' + me.curRows);
+                    me.areaStatus.html(!Common.UI.isRTL() ? this.curColumns + ' x ' + this.curRows : this.curRows + ' x ' + this.curColumns);
                    me.areaStatus.width(me.areaUnHighLighted.width());

-                    areaMouseCatcher.on('mousemove', onMouseMove);
+                    me.areaMouseCatcher.on('mousemove', onMouseMove);
                    me.areaHighLighted.on('mousemove', onMouseMove);
                    me.areaUnHighLighted.on('mousemove', onMouseMove);
-                    areaMouseCatcher.on('mouseleave', onMouseLeave);
+                    me.areaMouseCatcher.on('mouseleave', onMouseLeave);
                    me.areaHighLighted.on('mouseleave', onMouseLeave);
                    me.areaUnHighLighted.on('mouseleave', onMouseLeave);
-                    areaMouseCatcher.on('click', onHighLightedMouseClick);
+                    me.areaMouseCatcher.on('click', onHighLightedMouseClick);
                    me.areaHighLighted.on('click', onHighLightedMouseClick);
                    me.areaUnHighLighted.on('click', onHighLightedMouseClick);
+
+                    if (me.direction === 'right') {
+                        me.areaHighLighted.css({left: 'auto', right: '0'});
+                    }
                }
            },

@ -157,7 +174,7 @@ define([
                    );

                    this.cmpEl.width(this.areaUnHighLighted.width());
-                    this.areaStatus.html(this.curColumns + ' x ' + this.curRows);
+                    this.areaStatus.html(!Common.UI.isRTL() ? this.curColumns + ' x ' + this.curRows : this.curRows + ' x ' + this.curColumns);
                    this.areaStatus.width(this.areaUnHighLighted.width());

                    this.trigger('change', this, this.curColumns, this.curRows, event);
--- a/apps/common/main/lib/component/Layout.js
+++ b/apps/common/main/lib/component/Layout.js
@ -261,7 +261,7 @@ define([
            var panel             = e.data.panel;
            this.resize.type      = e.data.type;
            this.resize.$el       = panel.el;
-            this.resize.min       = panel.minpos;
+            this.resize.min       = panel.minpos > 0 ? panel.minpos : this.resize.$el.parent().width() + panel.minpos;
            this.resize.fmin      = panel.fmin;
            this.resize.fmax      = panel.fmax;
            this.resize.behaviour = panel.behaviour;
@ -365,15 +365,15 @@ define([
                oldValue = parseInt(panel.css(prop));
            } else {
                panel = this.resize.$el.next();
-                next = this.resize.$el.next();
+                next = this.resize.$el.prev();
                oldValue = parseInt(panel.css(prop));
                value = panel.parent()[prop]() - (value + this.resize[prop]);
            }

            if (this.resize.type == 'vertical')
                value -= panel.position().top;
-            if (this.resize.type == 'horizontal')
-                value -= panel.position().left;
+            // if (this.resize.type == 'horizontal')
+            //     value -= panel.position().left;

            panel.css(prop, value + 'px');

--- a/apps/common/main/lib/component/Menu.js
+++ b/apps/common/main/lib/component/Menu.js
@ -145,7 +145,7 @@ define([
                style       : '',
                itemTemplate: null,
                items       : [],
-                menuAlign   : 'tl-bl',
+                menuAlign   : 'tl-bl',//menu - parent
                menuAlignEl : null,
                offset      : [0, 0],
                cyclic      : true,
@ -173,6 +173,18 @@ define([
                this.search = this.options.search;
                this.outerMenu      = this.options.outerMenu;

+                if (Common.UI.isRTL()) {
+                    if (this.menuAlign === 'tl-tr') {
+                        this.menuAlign = 'tr-tl';
+                    } else if (this.menuAlign === 'tl-bl') {
+                        this.menuAlign = 'tr-br';
+                    } else if (this.menuAlign === 'tr-br') {
+                        this.menuAlign = 'tl-bl';
+                    } else if (this.menuAlign === 'bl-tl') {
+                        this.menuAlign = 'br-tr';
+                    }
+                }
+
                if (this.options.restoreHeight) {
                    this.options.restoreHeight = (typeof (this.options.restoreHeight) == "number") ? this.options.restoreHeight : (this.options.maxHeight ? this.options.maxHeight : 100000);
                    !this.options.maxHeight && (this.options.maxHeight = this.options.restoreHeight);
@ -472,8 +484,9 @@ define([
            },

            selectCandidate: function() {
-                var index = this._search.index || 0,
+                var index = (this._search.index && this._search.index != -1) ? this._search.index : 0,
                    re = new RegExp('^' + ((this._search.full) ? this._search.text : this._search.char), 'i'),
+                    isFirstCharsEqual = re.test(this.items[index].caption),
                    itemCandidate, idxCandidate;

                for (var i=0; i<this.items.length; i++) {
@ -482,6 +495,8 @@ define([
                        if (!itemCandidate) {
                            itemCandidate = item;
                            idxCandidate = i;
+                            if(!isFirstCharsEqual) 
+                                break;  
                        }
                        if (this._search.full && i==index || i>index) {
                            itemCandidate = item;
@ -713,6 +728,14 @@ define([
                }
            },

+            getChecked: function() {
+                for (var i=0; i<this.items.length; i++) {
+                    var item = this.items[i];
+                    if (item.isChecked && item.isChecked())
+                        return item;
+                }
+            },
+
            clearAll: function() {
                _.each(this.items, function(item){
                    if (item.setChecked)
@ -776,6 +799,18 @@ define([
            this.scrollAlwaysVisible = this.options.scrollAlwaysVisible;
            this.search = this.options.search;

+            if (Common.UI.isRTL()) {
+                if (this.menuAlign === 'tl-tr') {
+                    this.menuAlign = 'tr-tl';
+                } else if (this.menuAlign === 'tl-bl') {
+                    this.menuAlign = 'tr-br';
+                } else if (this.menuAlign === 'tr-br') {
+                    this.menuAlign = 'tl-bl';
+                } else if (this.menuAlign === 'bl-tl') {
+                    this.menuAlign = 'br-tr';
+                }
+            }
+
            if (this.options.restoreHeight) {
                this.options.restoreHeight = (typeof (this.options.restoreHeight) == "number") ? this.options.restoreHeight : (this.options.maxHeight ? this.options.maxHeight : 100000);
                !this.options.maxHeight && (this.options.maxHeight = this.options.restoreHeight);
@ -1051,8 +1086,9 @@ define([
        },

        selectCandidate: function() {
-            var index = this._search.index || 0,
+            var index = (this._search.index && this._search.index != -1) ? this._search.index : 0,
                re = new RegExp('^' + ((this._search.full) ? this._search.text : this._search.char), 'i'),
+                isFirstCharsEqual = re.test(this.items[index].caption),
                itemCandidate, idxCandidate;

            for (var i=0; i<this.items.length; i++) {
@ -1061,6 +1097,8 @@ define([
                    if (!itemCandidate) {
                        itemCandidate = item;
                        idxCandidate = i;
+                        if(!isFirstCharsEqual) 
+                            break;                    
                    }
                    if (this._search.full && i==index || i>index) {
                        itemCandidate = item;
--- a/apps/common/main/lib/component/Mixtbar.js
+++ b/apps/common/main/lib/component/Mixtbar.js
@ -56,7 +56,7 @@ define([

        var onScrollTabs = function(opts, e) {
            var sv = $boxTabs.scrollLeft();
-            if ( sv || opts == 'right' ) {
+            if (sv || opts == 'right' || Common.UI.isRTL() && opts == 'left') {
                $boxTabs.animate({scrollLeft: opts == 'left' ? sv - 100 : sv + 100}, 200);
            }
        };
@ -93,6 +93,7 @@ define([
                Common.UI.BaseView.prototype.initialize.call(this, options);

                var _template_tabs =
+                    !Common.UI.isRTL() ?
                    '<section class="tabs">' +
                        '<a class="scroll left" data-hint="0" data-hint-direction="bottom" data-hint-offset="-7, 0" data-hint-title="V"></a>' +
                        '<ul>' +
@ -108,6 +109,22 @@ define([
                            '<% } %>' +
                        '</ul>' +
                        '<a class="scroll right" data-hint="0" data-hint-direction="bottom" data-hint-offset="-7, 0" data-hint-title="R"></a>' +
+                    '</section>' :
+                    '<section class="tabs">' +
+                        '<a class="scroll right" data-hint="0" data-hint-direction="bottom" data-hint-offset="-7, 0" data-hint-title="R"></a>' +
+                        '<ul>' +
+                            '<% for(var i in items) { %>' +
+                                '<% if (typeof items[i] == "object") { %>' +
+                                '<li class="ribtab' +
+                                        '<% if (items[i].haspanel===false) print(" x-lone") %>' +
+                                        '<% if (items[i].extcls) print(\' \' + items[i].extcls) %>"' +
+                                        '<% if (typeof items[i].layoutname == "string") print(" data-layout-name=" + \' \' +  items[i].layoutname) + \' \' %>>' +
+                                    '<a data-tab="<%= items[i].action %>" data-title="<%= items[i].caption %>" data-hint="0" data-hint-direction="bottom" data-hint-offset="small" <% if (typeof items[i].dataHintTitle !== "undefined") { %> data-hint-title="<%= items[i].dataHintTitle %>" <% } %>><%= items[i].caption %></a>' +
+                                '</li>' +
+                                '<% } %>' +
+                            '<% } %>' +
+                        '</ul>' +
+                        '<a class="scroll left" data-hint="0" data-hint-direction="bottom" data-hint-offset="-7, 0" data-hint-title="V"></a>' +
                    '</section>';

                this.$layout = $(options.template({
@ -365,13 +382,13 @@ define([
                var _left_bound_ = Math.round($boxTabs.offset().left),
                    _right_bound_ = Math.round(_left_bound_ + $boxTabs.width());

-                var tab = this.$tabs.filter(':visible:first').get(0);
+                var tab = this.$tabs.filter(Common.UI.isRTL() ? ':visible:last' : ':visible:first').get(0);
                if ( !tab ) return false;

                var rect = tab.getBoundingClientRect();

                if ( !(Math.round(rect.left) < _left_bound_) ) {
-                    tab = this.$tabs.filter(':visible:last').get(0);
+                    tab = this.$tabs.filter(Common.UI.isRTL() ? ':visible:first' : ':visible:last').get(0);
                    rect = tab.getBoundingClientRect();

                    if (!(Math.round(rect.right) > _right_bound_))
@ -393,15 +410,19 @@ define([
                function _fc() {
                    var $active = panel || me.$panels.filter('.active');
                    if ( $active && $active.length ) {
-                        var _maxright = $active.parents('.box-controls').width();
+                        var _maxright = $active.parents('.box-controls').width(),
+                            _staticPanelWidth = $active.parents('.box-controls').find('.panel.static').outerWidth();
+                        if (!_staticPanelWidth) _staticPanelWidth = 0;
                        var data = $active.data(),
                            _rightedge = data.rightedge,
                            _btns = data.buttons,
                            _flex = data.flex;
                        var more_section = $active.find('.more-box');
-
+                        if (more_section.length===0) {
+                            me.setMoreButton($active.attr('data-tab'), $active);
+                        }
                        if ( !_rightedge ) {
-                            _rightedge = $active.get(0).getBoundingClientRect().right;
+                            _rightedge = $active.outerWidth() + _staticPanelWidth;
                        }
                        if ( !_btns ) {
                            _btns = [];
@ -419,12 +440,12 @@ define([
                            data.flex = _flex;
                        }

-                        if ( (_rightedge > _maxright)) {
+                        if (_rightedge > _maxright) {
                            if (!more_section.is(':visible') ) {
                                if (_flex.length>0) {
                                    for (var i=0; i<_flex.length; i++) {
                                        var item = _flex[i].el;
-                                        _rightedge = $active.get(0).getBoundingClientRect().right;
+                                        _rightedge = $active.outerWidth() + _staticPanelWidth;
                                        if (item.outerWidth() > parseInt(item.css('min-width'))) {
                                            data.rightedge = _rightedge;
                                            return;
@ -436,7 +457,7 @@ define([
                                    var btn = _btns[i];
                                    if ( !btn.hasClass('compactwidth') && !btn.hasClass('slot-btn-more')) {
                                        btn.addClass('compactwidth');
-                                        _rightedge = $active.get(0).getBoundingClientRect().right;
+                                        _rightedge = $active.outerWidth() + _staticPanelWidth;
                                        if (_rightedge <= _maxright)
                                            break;
                                    }
@ -451,10 +472,10 @@ define([
                                    var btn = _btns[i];
                                    if ( btn.hasClass('compactwidth') ) {
                                        btn.removeClass('compactwidth');
-                                        _rightedge = $active.get(0).getBoundingClientRect().right;
-                                        if ( _rightedge > _maxright) {
+                                        _rightedge = $active.outerWidth() + _staticPanelWidth;
+                                        if (_rightedge > _maxright) {
                                            btn.addClass('compactwidth');
-                                            _rightedge = $active.get(0).getBoundingClientRect().right;
+                                            _rightedge = $active.outerWidth() + _staticPanelWidth;
                                            break;
                                        }
                                    }
@ -504,7 +525,7 @@ define([
                var me = this;
                if (!btnsMore[tab]) {
                    var top = panel.position().top;
-                    var box = $('<div class="more-box" style="position: absolute;right: 0; top:'+ top +'px; padding-left: 12px;padding-right: 6px;display: none;">' +
+                    var box = $('<div class="more-box" style="top:'+ top +'px;">' +
                        '<div class="separator long" style="position: relative;display: table-cell;"></div>' +
                        '<div class="group" style=""><span class="btn-slot text x-huge slot-btn-more"></span></div>' +
                        '</div>');
@ -527,13 +548,35 @@ define([
                this.$moreBar = btnsMore[tab].panel;
            },

+            clearMoreButton: function(tab) {
+                var panel = this.$panels.filter('[data-tab=' + tab + ']');
+                if ( panel.length ) {
+                    var data = panel.data();
+                    data.buttons = data.flex = data.rightedge = data.leftedge = undefined;
+                    panel.find('.more-box').remove();
+                }
+                if (btnsMore[tab]) {
+                    var moreContainer = optsFold.$bar.find('.more-container[data-tab="' + tab + '"]');
+                    moreContainer.remove();
+                    btnsMore[tab].remove();
+                    delete btnsMore[tab];
+                }
+            },
+
            resizeToolbar: function(reset) {
                var $active = this.$panels.filter('.active'),
-                    more_section = $active.find('.more-box'),
-                    more_section_width = parseInt(more_section.css('width')) || 0,
+                    more_section = $active.find('.more-box');
+
+                if (more_section.length===0) {
+                    this.setMoreButton($active.attr('data-tab'), $active);
+                }
+
+                var more_section_width = parseInt(more_section.css('width')) || 0,
                    box_controls_width = $active.parents('.box-controls').width(),
-                    _maxright = box_controls_width,
-                    _rightedge = $active.get(0).getBoundingClientRect().right,
+                    _staticPanelWidth = $active.parents('.box-controls').find('.panel.static').outerWidth(),
+                    _maxright = box_controls_width;
+                if (!_staticPanelWidth) _staticPanelWidth = 0;
+                var _rightedge = $active.outerWidth() + _staticPanelWidth,
                    delta = (this._prevBoxWidth) ? (_maxright - this._prevBoxWidth) : -1,
                    hideAllMenus = false;
                this._prevBoxWidth = _maxright;
@ -545,7 +588,7 @@ define([

                if ( (reset || delta<0) && (_rightedge > _maxright)) { // from toolbar to more section
                    if (!more_section.is(':visible') ) {
-                        more_section.css('display', "");
+                        more_section.css('display', "block");
                        _maxright -= parseInt(more_section.css('width'));
                    }
                    var last_separator = null,
@ -567,11 +610,12 @@ define([
                            this.$moreBar.prepend(item);
                            hideAllMenus = true;
                        } else if (item.hasClass('group')) {
-                            _rightedge = $active.get(0).getBoundingClientRect().right;
+                            //_rightedge = $active.get(0).getBoundingClientRect().right;
+                            _rightedge = $active.outerWidth() + _staticPanelWidth;
                            if (_rightedge <= _maxright) // stop moving items
                                break;

-                            var offset = item.offset(),
+                            var rect = item.get(0).getBoundingClientRect(),
                                item_width = item.outerWidth(),
                                children = item.children();
                            if (!item.attr('inner-width') && item.attr('group-state') !== 'open') {
@ -581,7 +625,7 @@ define([
                                    child.attr('inner-width', child.outerWidth());
                                }
                            }
-                            if ((offset.left > _maxright || children.length==1) && item.attr('group-state') != 'open') {
+                            if (((rect.left > _maxright || Common.UI.isRTL() && box_controls_width - rect.right > _maxright) || children.length==1) && item.attr('group-state') != 'open') {
                                // move group
                                this.$moreBar.prepend(item);
                                if (last_separator) {
@ -589,7 +633,7 @@ define([
                                    last_separator.removeAttr('hidden-on-resize');
                                }
                                hideAllMenus = true;
-                            } else if ( offset.left+item_width > _maxright ) {
+                            } else if ((Common.UI.isRTL() ? box_controls_width - rect.right : rect.left)+item_width > _maxright ) {
                                // move buttons from group
                                for (var j=children.length-1; j>=0; j--) {
                                    var child = $(children[j]);
@ -602,9 +646,9 @@ define([
                                        hideAllMenus = true;
                                        break;
                                    } else {
-                                        var child_offset = child.offset(),
+                                        var child_rect = child.get(0).getBoundingClientRect(),
                                            child_width = child.outerWidth();
-                                        if (child_offset.left+child_width>_maxright) {
+                                        if ((Common.UI.isRTL() ? box_controls_width - child_rect.right : child_rect.left)+child_width>_maxright) {
                                            if (!last_group) {
                                                last_group = $('<div></div>');
                                                last_group.addClass(items[i].className);
@ -667,7 +711,7 @@ define([
                        // from more panel to toolbar
                        for (var i=0; i<items.length; i++) {
                            var item = $(items[i]);
-                            _rightedge = $active.get(0).getBoundingClientRect().right;
+                            _rightedge = $active.outerWidth() + _staticPanelWidth;
                            if (!item.is(':visible') && item.attr('data-hidden-tb-item')) { // move invisible items as is
                                item.removeAttr('data-hidden-tb-item');
                                more_section.before(item);
@ -702,7 +746,7 @@ define([
                                    for (var j=0; j<children.length; j++) {
                                        if (islast && j==children.length-1)
                                             _maxright = box_controls_width; // try to move last item from last group
-                                        _rightedge = $active.get(0).getBoundingClientRect().right;
+                                        _rightedge = $active.outerWidth() + _staticPanelWidth;
                                        var child = $(children[j]);
                                        if (child.hasClass('elset')) { // don't add group - no enough space
                                            need_break = true;
@ -787,13 +831,14 @@ define([
                    right = Common.Utils.innerWidth() - (showxy.left - parentxy.left + target.width()),
                    top = showxy.top - parentxy.top + target.height() + 10;

-                moreContainer.css({right: right, left: 'auto', top : top, 'max-width': Common.Utils.innerWidth() + 'px'});
+                var styles = Common.UI.isRTL() ? {left: '6px', right: 'auto', top : top, 'max-width': Common.Utils.innerWidth() + 'px'} : {right: right, left: 'auto', top : top, 'max-width': Common.Utils.innerWidth() + 'px'}
+                moreContainer.css(styles);
                moreContainer.show();
            },

            hideMoreBtns: function() {
                for (var btn in btnsMore) {
-                    btnsMore[btn] && btnsMore[btn].toggle(false);
+                    btnsMore[btn] && btnsMore[btn].isActive() && btnsMore[btn].toggle(false);
                }
            }
        };
--- a/apps/common/main/lib/component/Slider.js
+++ b/apps/common/main/lib/component/Slider.js
@ -156,7 +156,7 @@ define([
                $(document).off('mousemove', onMouseMove);

                me._dragstart = undefined;
-                me.trigger('changecomplete', me, me.value, me.lastValue);
+                me.trigger('changecomplete', me, Common.UI.isRTL() ? me.maxValue - me.value : me.value, me.lastValue);
            };

            var onMouseMove = function (e) {
@ -175,7 +175,7 @@ define([
                me.value = pos/me.delta + me.minValue;

                if (Math.abs(me.value-me.lastValue)>0.001)
-                    me.trigger('change', me, me.value, me.lastValue);
+                    me.trigger('change', me, Common.UI.isRTL() ? me.maxValue - me.value : me.value, me.lastValue);
            };

            var onMouseDown = function (e) {
@ -201,8 +201,8 @@ define([
                me.lastValue = me.value;
                me.value = pos/me.delta + me.minValue;

-                me.trigger('change', me, me.value, me.lastValue);
-                me.trigger('changecomplete', me, me.value, me.lastValue);
+                me.trigger('change', me, Common.UI.isRTL() ? me.maxValue - me.value : me.value, me.lastValue);
+                me.trigger('changecomplete', me, Common.UI.isRTL() ? me.maxValue - me.value : me.value, me.lastValue);
            };

            var updateslider;
@ -211,7 +211,7 @@ define([
                me.lastValue = me.value;
                me.value = Math.max(me.minValue, Math.min(me.maxValue, me.value + ((increase) ? me.step : -me.step)));
                me.setThumbPosition(Math.round((me.value-me.minValue)*me.delta));
-                me.trigger('change', me, me.value, me.lastValue);
+                me.trigger('change', me, Common.UI.isRTL() ? me.maxValue - me.value : me.value, me.lastValue);
            };

            var onKeyDown = function (e) {
@ -234,7 +234,7 @@ define([
                    clearInterval(updateslider);
                    moveThumb(e.keyCode==Common.UI.Keys.UP || e.keyCode==Common.UI.Keys.RIGHT);
                    el.on('keydown', 'input', onKeyDown);
-                    me.trigger('changecomplete', me, me.value, me.lastValue);
+                    me.trigger('changecomplete', me, Common.UI.isRTL() ? me.maxValue - me.value : me.value, me.lastValue);
                }
            };

@ -264,7 +264,7 @@ define([
        setValue: function(value) {
            this.lastValue = this.value;
            this.value = Math.max(this.minValue, Math.min(this.maxValue, value));
-            this.setThumbPosition(Math.round((value-this.minValue)*this.delta));
+            this.setThumbPosition(Math.round(((Common.UI.isRTL() ? this.maxValue - value : value)-this.minValue)*this.delta));
        },

        getValue: function() {
--- a/apps/common/main/lib/component/Tab.js
+++ b/apps/common/main/lib/component/Tab.js
@ -74,7 +74,9 @@ define([
        render: function() {
            var el      = this.template(this);
            this.$el    = $(el);
-
+            this.$el.find('span').tooltip({
+                title: this.label,
+                placement: 'cursor'});
            this.rendered = true;
            this.disable(this.disabled);
            return this;
--- a/apps/common/main/lib/component/TabBar.js
+++ b/apps/common/main/lib/component/TabBar.js
@ -569,8 +569,8 @@ define([

        checkInvisible: function(suppress) {
            var result = {
-                first: !this.isTabVisible(0),
-                last: !this.isTabVisible(this.tabs.length-1)
+                first: !this.isTabVisible(Common.UI.isRTL() ? this.tabs.length-1 : 0),
+                last: !this.isTabVisible(Common.UI.isRTL() ? 0 : this.tabs.length-1)
            };

            !suppress && this.fireEvent('tab:invisible', this, result);
--- a/apps/common/main/lib/component/TableStyler.js
+++ b/apps/common/main/lib/component/TableStyler.js
--- a/apps/common/main/lib/component/TextareaField.js
+++ b/apps/common/main/lib/component/TextareaField.js
@ -56,7 +56,8 @@ define([
                maxlength   : undefined,
                placeHolder : '',
                spellcheck  : false,
-                disabled: false
+                disabled: false,
+                resize: false
            },

            template: _.template([
@ -133,6 +134,7 @@ define([
                    this._input.on('blur',   _.bind(this.onInputChanged, this));
                    this._input.on('keydown',    _.bind(this.onKeyDown, this));
                    if (this.maxLength) this._input.attr('maxlength', this.maxLength);
+                    if (!this.resize) this._input.css('resize', 'none');

                    if (this.disabled)
                        this.setDisabled(this.disabled);
@ -140,6 +142,9 @@ define([

                me.rendered = true;

+                if (me.value)
+                    me.setValue(me.value);
+
                return this;
            },

--- a/apps/common/main/lib/component/ThemeColorPalette.js
+++ b/apps/common/main/lib/component/ThemeColorPalette.js
@ -64,11 +64,11 @@ define([

        template    :
            _.template(
-                '<div style="padding: 4px 0 0 12px;">' +
+                '<div class="palette-inner">' +
                '<% var me = this; var idx = 0; %>' +
                '<% $(colors).each(function(num, item) { %>' +
-                    '<% if (me.isBlankSeparator(item)) { %> <div class="palette-color-spacer" style="width:100%;height:8px;float:left;"></div>' +
-                    '<% } else if (me.isSeparator(item)) { %> </div><div class="divider" style="width:100%;float:left;"></div><div style="padding: 12px;">' +
+                    '<% if (me.isBlankSeparator(item)) { %> <div class="palette-color-spacer"></div>' +
+                    '<% } else if (me.isSeparator(item)) { %> </div><div class="divider"></div><div style="padding: 12px;">' +
                    '<% } else if (me.isColor(item)) { %> ' +
                        '<a class="palette-color color-<%=item%>" style="background:#<%=item%>" idx="<%=idx++%>">' +
                        '<em><span style="background:#<%=item%>;" unselectable="on">&#160;</span></em>' +
@ -79,20 +79,20 @@ define([
                        '</a>' +
                    '<% } else if (me.isEffect(item)) { %>' +
                        '<% if (idx>0 && me.columns>0 && idx%me.columns===0) { %> ' +
-                        '<div style="width:100%;height:0;float:left;"></div>' +
+                        '<div class="color-divider"></div>' +
                        '<% } %>' +
                        '<a effectid="<%=item.effectId%>" effectvalue="<%=item.effectValue%>" class="palette-color-effect color-<%=item.color%>" style="background:#<%=item.color%>" idx="<%=idx++%>">' +
                        '<em><span style="background:#<%=item.color%>;" unselectable="on">&#160;</span></em>' +
                        '</a>' +
                    '<% } else if (me.isCaption(item)) { %>' +
-                    '<div class="palette-color-caption" style="width:100%;float:left;font-size: 11px;"><%=item%></div>' +
+                    '<div class="palette-color-caption"><%=item%></div>' +
                    '<% } %>' +
                '<% }); %>' +
                '</div>' +
                '<% if (me.options.dynamiccolors!==undefined) { %>' +
-                '<div class="palette-color-dynamiccolors" style="padding: 4px 0 0 12px">' +
-                    '<div class="palette-color-spacer" style="width:100%;height:8px;float:left;"></div>' +
-                    '<div class="palette-color-caption" style="width:100%;float:left;font-size: 11px;"><%=me.textRecentColors%></div>' +
+                '<div class="palette-color-dynamiccolors">' +
+                    '<div class="palette-color-spacer"></div>' +
+                    '<div class="palette-color-caption"><%=me.textRecentColors%></div>' +
                    '<% for (var i=0; i<me.options.dynamiccolors; i++) { %>' +
                        '<a class="color-dynamic-<%=i%> dynamic-empty-color <%= me.emptyColorsClass %>" color="" idx="<%=idx++%>">' +
                        '<em><span unselectable="on">&#160;</span></em></a>' +
--- a/apps/common/main/lib/component/TreeView.js
+++ b/apps/common/main/lib/component/TreeView.js
@ -170,7 +170,7 @@ define([
            initialize : function(options) {
                options.store = options.store || new Common.UI.TreeViewStore();
                options.emptyItemText = options.emptyItemText || '';
-                options.itemTemplate = options.itemTemplate || _.template([
+                options.itemTemplate = options.itemTemplate || !Common.UI.isRTL() ? _.template([
                    '<div id="<%= id %>" class="tree-item <% if (!isVisible) { %>' + 'hidden' + '<% } %>" style="display: block;padding-left: <%= level*16 + 24 %>px;">',
                    '<% if (hasSubItems) { %>',
                        '<div class="tree-caret img-commonctrl ' + '<% if (!isExpanded) { %>' + 'up' + '<% } %>' + '" style="margin-left: <%= level*16 %>px;"></div>',
@ -183,6 +183,19 @@ define([
                        '<div class="name"><%= Common.Utils.String.htmlEncode(name) %></div>',
                    '<% } %>',
                    '</div>'
+                ].join('')) : _.template([
+                    '<div id="<%= id %>" class="tree-item <% if (!isVisible) { %>' + 'hidden' + '<% } %>" style="display: block;padding-right: <%= level*16 + 24 %>px;">',
+                    '<% if (hasSubItems) { %>',
+                        '<div class="tree-caret img-commonctrl ' + '<% if (!isExpanded) { %>' + 'up' + '<% } %>' + '" style="margin-right: <%= level*16 %>px;"></div>',
+                    '<% } %>',
+                    '<% if (isNotHeader) { %>',
+                        '<div class="name not-header"><%= Common.Utils.String.htmlEncode(name) %></div>',
+                    '<% } else if (isEmptyItem) { %>',
+                        '<div class="name empty">' + options.emptyItemText + '</div>',
+                    '<% } else { %>',
+                        '<div class="name"><%= Common.Utils.String.htmlEncode(name) %></div>',
+                    '<% } %>',
+                    '</div>'
                ].join(''));
                Common.UI.DataView.prototype.initialize.call(this, options);
            },
--- a/apps/common/main/lib/component/Window.js
+++ b/apps/common/main/lib/component/Window.js
@ -158,7 +158,8 @@ define([
                maxheight: undefined,
                minwidth: 0,
                minheight: 0,
-                enableKeyEvents: true
+                enableKeyEvents: true,
+                automove: true
        };

        var template = '<div class="asc-window<%= modal?" modal":"" %><%= cls?" "+cls:"" %>" id="<%= id %>" style="width:<%= width %>px;">' +
@ -265,8 +266,10 @@ define([
            var top  = main_geometry.top + Math.floor((parseInt(main_height) - parseInt(win_height)) / 2);
            var left = Math.floor((parseInt(main_width) - parseInt(win_width)) / 2);

-            this.$window.css('left',left);
-            this.$window.css('top',top);
+            this.$window.css({
+                left: left < 0 ? 0 : left,
+                top: top < 0 ? 0 : top
+            });
        }

        function _setVisible() {
@ -355,6 +358,23 @@ define([
            }
        }

+        function _onResizeMove(){
+            var main_geometry = _readDocumetGeometry(),
+                main_width = main_geometry.width,
+                main_height = main_geometry.height,
+                win_height = this.getHeight(),
+                win_width = this.getWidth(),
+                top = this.getTop(),
+                left = this.getLeft();
+
+            top = top + win_height > main_height ? main_height - win_height : top;
+            left = left + win_width > main_width ? main_width - win_width : left;
+
+            this.$window.css({
+                left: left < 0 ? 0 : left,
+                top: top < 0 ? 0 : top
+            });
+        }

        /* window resize functions */
        function _resizestart(event) {
@ -456,7 +476,7 @@ define([
            
            var template =  '<div class="info-box">' +
                                '<% if (typeof iconCls !== "undefined") { %><div class="icon <%= iconCls %>"></div><% } %>' +
-                                '<div class="text" <% if (typeof iconCls == "undefined") { %> style="padding-left:10px;" <% } %>><span><%= msg %></span>' +
+                                '<div class="text" dir="ltr" <% if (typeof iconCls == "undefined") { %> style="padding-left:10px;" <% } %>><span><%= msg %></span>' +
                                    '<% if (dontshow) { %><div class="dont-show-checkbox"></div><% } %>' +
                                '</div>' +
                            '</div>' +
@ -491,7 +511,8 @@ define([
                    text_cnt.height(Math.max(text.height(), icon_height) + ((check.length>0) ? (check.height() + parseInt(check.css('margin-top'))) : 0));
                    body.height(parseInt(text_cnt.css('height')) + parseInt(footer.css('height')));
                    var span_el = check.find('span');
-                     window.setSize(Math.max(text.width(), span_el.length>0 ? span_el.position().left + span_el.width() : 0) + text.position().left + parseInt(text_cnt.css('padding-right')),
+                    window.setSize(Math.max(text.width(), span_el.length>0 ? span_el.position().left + span_el.width() : 0) + text.position().left + parseInt(text_cnt.css('padding-right')) +
+                        (Common.UI.isRTL() && icon.length > 0 ? icon.width() + parseInt(icon.css('margin-right')) + parseInt(icon.css('margin-left')) : 0),
                        parseInt(body.css('height')) + parseInt(header.css('height')));
                } else {
                    text.css('white-space', 'normal');
@ -500,7 +521,7 @@ define([
                    body.height(parseInt(text_cnt.css('height')) + parseInt(footer.css('height')));
                    window.setHeight(parseInt(body.css('height')) + parseInt(header.css('height')));
                }
-                if (text.height() < icon_height-10)
+                if (text.height() < icon_height/2)
                    text.css({'vertical-align': 'baseline', 'line-height': icon_height+'px'});
            }

@ -658,7 +679,6 @@ define([
                    this.$window.find('.header').on('mousedown', this.binding.dragStart);
                    this.$window.find('.tool.close').on('click', _.bind(doclose, this));
                    this.$window.find('.tool.help').on('click', _.bind(dohelp, this));
-
                    if (!this.initConfig.modal)
                        Common.Gateway.on('processmouse', _.bind(_onProcessMouse, this));
                } else {
@ -742,6 +762,10 @@ define([
                }

                $(document).on('keydown.' + this.cid, this.binding.keydown);
+                if(this.initConfig.automove){
+                    this.binding.windowresize = _.bind(_onResizeMove, this);
+                    $(window).on('resize', this.binding.windowresize);
+                }

                var me = this;

@ -793,6 +817,7 @@ define([

            close: function(suppressevent) {
                $(document).off('keydown.' + this.cid);
+                this.initConfig.automove && $(window).off('resize', this.binding.windowresize);
                if ( this.initConfig.header ) {
                    this.$window.find('.header').off('mousedown', this.binding.dragStart);
                }
@ -838,6 +863,7 @@ define([

            hide: function() {
                $(document).off('keydown.' + this.cid);
+                this.initConfig.automove && $(window).off('resize', this.binding.windowresize);
                if (this.$window) {
                    if (this.initConfig.modal) {
                        var mask = _getMask(),
--- a/apps/common/main/lib/controller/Comments.js
+++ b/apps/common/main/lib/controller/Comments.js
@ -74,6 +74,7 @@ define([
        subEditStrings : {},
        filter : undefined,
        hintmode : false,
+        fullInfoHintMode: false,
        viewmode: false,
        isSelectedComment : false,
        uids : [],
@ -144,10 +145,20 @@ define([
                    }
                }, this, area);
            }.bind(this));
+            Common.NotificationCenter.on('app:ready', this.onAppReady.bind(this));
        },
        onLaunch: function () {
            var filter = Common.localStorage.getKeysFilter();
            this.appPrefix = (filter && filter.length) ? filter.split(',')[0] : '';
+            this._state = {
+                disableEditing: false, // disable editing when disconnect/signed file/mail merge preview/review final or original/forms preview
+                docProtection: {
+                    isReadOnly: false,
+                    isReviewOnly: false,
+                    isFormsOnly: false,
+                    isCommentsOnly: false
+                }
+            };

            this.collection                     =   this.getApplication().getCollection('Common.Collections.Comments');
            this.setComparator();
@ -176,7 +187,8 @@ define([
                this.currentUserId      =   data.config.user.id;
                this.sdkViewName        =   data['sdkviewname'] || this.sdkViewName;
                this.hintmode           =   data['hintmode'] || false;
-                this.viewmode        =   data['viewmode'] || false;
+                this.fullInfoHintMode   =   data['fullInfoHintMode'] || false;
+                this.viewmode           =   data['viewmode'] || false;
            }
        },
        setApi: function (api) {
@ -396,9 +408,11 @@ define([
                    reply = null,
                    addReply = null,
                    ascComment = buildCommentData(),   //  new asc_CCommentData(null),
-                    comment = t.findComment(id);
+                    comment = t.findComment(id),
+                    oldCommentVal = '';

                if (comment && ascComment) {
+                    oldCommentVal = comment.get('comment');
                    ascComment.asc_putText(commentVal);
                    ascComment.asc_putQuoteText(comment.get('quote'));
                    ascComment.asc_putTime(t.utcDateToString(new Date(comment.get('time'))));
@ -442,6 +456,7 @@ define([
                    }

                    t.api.asc_changeComment(id, ascComment);
+                    t.mode && t.mode.canRequestSendNotify && t.view.pickEMail(ascComment.asc_getGuid(), commentVal, oldCommentVal);

                    return true;
                }
@ -455,7 +470,8 @@ define([
                    reply = null,
                    addReply = null,
                    ascComment = buildCommentData(),   //  new asc_CCommentData(null),
-                    comment = me.findComment(id);
+                    comment = me.findComment(id),
+                    oldReplyVal = '';

                if (ascComment && comment) {
                    ascComment.asc_putText(comment.get('comment'));
@ -479,6 +495,7 @@ define([
                            addReply = buildCommentData();   //  new asc_CCommentData();
                            if (addReply) {
                                if (reply.get('id') === replyId && !_.isUndefined(replyVal)) {
+                                    oldReplyVal = reply.get('reply');
                                    addReply.asc_putText(replyVal);
                                    addReply.asc_putUserId(me.currentUserId);
                                    addReply.asc_putUserName(AscCommon.UserInfoParser.getCurrentName());
@ -498,7 +515,7 @@ define([
                    }

                    me.api.asc_changeComment(id, ascComment);
-
+                    me.mode && me.mode.canRequestSendNotify && me.view.pickEMail(ascComment.asc_getGuid(), replyVal, oldReplyVal);
                    return true;
                }
            }
@ -951,11 +968,11 @@ define([

                    if (!comment) continue;

-                    if (this.subEditStrings[saveTxtId] && !hint) {
+                    if (this.subEditStrings[saveTxtId] && (comment.get('fullInfoInHint') || !hint)) {
                        comment.set('editTextInPopover', true);
                        text = this.subEditStrings[saveTxtId];
                    }
-                    else if (this.subEditStrings[saveTxtReplyId] && !hint) {
+                    else if (this.subEditStrings[saveTxtReplyId] && (comment.get('fullInfoInHint') || !hint)) {
                        comment.set('showReplyInPopover', true);
                        text = this.subEditStrings[saveTxtReplyId];
                    }
@ -963,13 +980,16 @@ define([
                    comment.set('hint', !_.isUndefined(hint) ? hint : false);

                    if (!hint && this.hintmode) {
-                        if (same_uids && (this.uids.length === 0))
+                        if (same_uids)
                            animate = false;

                        if (this.oldUids.length && (0 === _.difference(this.oldUids, uids).length) && (0 === _.difference(uids, this.oldUids).length)) {
                            animate = false;
                            this.oldUids = [];
                        }
+
+                        if (same_uids && !apihint && !this.isModeChanged)
+                            this.api.asc_selectComment(comment.get('uid'));
                    }

                    if (this.animate) {
@ -991,7 +1011,7 @@ define([
                this.popoverComments.reset(comments);

                if (this.popoverComments.findWhere({hide: false})) {
-                    if (popover.isVisible()) {
+                    if (popover.isVisible() && (!same_uids || this.isModeChanged)) {
                        popover.hide();
                    }

@ -1340,6 +1360,7 @@ define([
                removable           : (this.mode.canDeleteComments || (data.asc_getUserId() == this.currentUserId)) && AscCommon.UserInfoParser.canDeleteComment(data.asc_getUserName()),
                hide                : !AscCommon.UserInfoParser.canViewComment(data.asc_getUserName()),
                hint                : !this.mode.canComments,
+                fullInfoInHint      : this.fullInfoHintMode,
                groupName           : (groupname && groupname.length>1) ? groupname[1] : null
            });
            if (comment) {
@ -1645,16 +1666,25 @@ define([
        },

        setPreviewMode: function(mode) {
-            if (this.viewmode === mode) return;
-            this.viewmode = mode;
-            if (mode)
+            this._state.disableEditing = mode;
+            this.updatePreviewMode();
+        },
+
+        updatePreviewMode: function() {
+            var docProtection = this._state.docProtection;
+            var viewmode = this._state.disableEditing || docProtection.isReadOnly || docProtection.isFormsOnly;
+
+            if (this.viewmode === viewmode) return;
+            this.viewmode = viewmode;
+
+            if (viewmode)
                this.prevcanComments = this.mode.canComments;
-            this.mode.canComments = (mode) ? false : this.prevcanComments;
+            this.mode.canComments = (viewmode) ? false : this.prevcanComments;
            this.closeEditing();
            this.setMode(this.mode);
            this.updateComments(true);
            if (this.getPopover())
-                mode ? this.getPopover().hide() : this.getPopover().update(true);
+                viewmode ? this.getPopover().hide() : this.getPopover().update(true);
        },

        clearCollections: function() {
@ -1718,6 +1748,27 @@ define([
                }
            }
            this.updateComments(true);
+        },
+
+        onAppReady: function (config) {
+            var me = this;
+            (new Promise(function (accept, reject) {
+                accept();
+            })).then(function(){
+                me.onChangeProtectDocument();
+                Common.NotificationCenter.on('protect:doclock', _.bind(me.onChangeProtectDocument, me));
+            });
+        },
+
+        onChangeProtectDocument: function(props) {
+            if (!props) {
+                var docprotect = this.getApplication().getController('DocProtection');
+                props = docprotect ? docprotect.getDocProps() : null;
+            }
+            if (props) {
+                this._state.docProtection = props;
+                this.updatePreviewMode();
+            }
        }

    }, Common.Controllers.Comments || {}));
--- a/apps/common/main/lib/controller/Desktop.js
+++ b/apps/common/main/lib/controller/Desktop.js
@ -46,7 +46,8 @@ define([
        eventloading: true,
        titlebuttons: true,
        uithemes: true,
-        quickprint: true,
+        btnhome: true,
+        quickprint: true
    };

    var native = window.desktop || window.AscDesktopEditor;
@ -61,7 +62,8 @@ define([
            'btn-save-coauth': 'coauth',
            'btn-synch': 'synch' };

-        var nativevars;
+        var nativevars,
+            helpUrl;

        if ( !!native ) {
            native.features = native.features || {};
@ -91,14 +93,12 @@ define([
                            $('.asc-window.modal').css('top', obj.skiptoparea);

                        Common.Utils.InternalSettings.set('window-inactive-area-top', obj.skiptoparea);
-                    } else
-                    if ( obj.lockthemes != undefined ) {
-                        // TODO: remove after 7.0.2. depricated. used is_win_xp variable instead
-                        // Common.UI.Themes.setAvailable(!obj.lockthemes);
                    }
+
                    if ( obj.singlewindow !== undefined ) {
-                        $('#box-document-title .hedset')[obj.singlewindow ? 'hide' : 'show']();
+                        // $('#box-document-title .hedset')[obj.singlewindow ? 'hide' : 'show']();
                        native.features.singlewindow = obj.singlewindow;
+                        titlebuttons.home && titlebuttons.home.btn.setVisible(obj.singlewindow);
                    }
                } else
                if (/editor:config/.test(cmd)) {
@ -237,6 +237,188 @@ define([
            }
        }

+        const _checkHelpAvailable = function () {
+            const me = this;
+            const build_url = function (arg1, arg2, arg3) {
+                const re_ls = /\/$/;
+                return (re_ls.test(arg1) ? arg1 : arg1 + '/') + arg2 + arg3;
+            }
+
+            fetch(build_url('resources/help/', Common.Locale.getDefaultLanguage(), '/Contents.json'))
+                .then(function (response) {
+                    if ( response.ok ) {
+                        /* local help avail */
+                        fetch(build_url('resources/help/', Common.Locale.getCurrentLanguage(), '/Contents.json'))
+                            .then(function (response){
+                                if ( response.ok )
+                                    helpUrl = build_url('resources/help/', Common.Locale.getCurrentLanguage(), '');
+                            })
+                            .catch(function (e) {
+                                helpUrl = build_url('resources/help/', Common.Locale.getDefaultLanguage(), '');
+                            })
+                    }
+                }).catch(function (e) {
+                    if ( me.helpUrl() ) {
+                        fetch(build_url(me.helpUrl(), Common.Locale.getDefaultLanguage(), '/Contents.json'))
+                            .then(function (response) {
+                                if ( response.ok ) {
+                                    /* remote help avail */
+                                    fetch(build_url(me.helpUrl(), Common.Locale.getCurrentLanguage(), '/Contents.json'))
+                                        .then(function (response) {
+                                            if ( response.ok ) {
+                                                helpUrl = build_url(me.helpUrl(), Common.Locale.getCurrentLanguage(), '');
+                                            }
+                                        })
+                                        .catch(function (e) {
+                                            helpUrl = build_url(me.helpUrl(), Common.Locale.getDefaultLanguage(), '');
+                                        });
+                                }
+                            })
+                    }
+                });
+        }
+
+        const _onAppReady = function (opts) {
+            _.extend(config, opts);
+            !!native && native.execCommand('doc:onready', '');
+
+            $('.toolbar').addClass('editor-native-color');
+        }
+
+        const _onDocumentReady = function () {
+            if ( config.isEdit ) {
+                function get_locked_message (t) {
+                    switch (t) {
+                        // case Asc.c_oAscLocalRestrictionType.Nosafe:
+                        case Asc.c_oAscLocalRestrictionType.ReadOnly:
+                            return Common.Locale.get("tipFileReadOnly",{name:"Common.Translation", default: "Document is read only. You can make changes and save its local copy later."});
+                        default: return Common.Locale.get("tipFileLocked",{name:"Common.Translation", default: "Document is locked for editing. You can make changes and save its local copy later."});
+                    }
+                }
+
+                const header = webapp.getController('Viewport').getView('Common.Views.Header');
+                const api = webapp.getController('Main').api;
+                const locktype = api.asc_getLocalRestrictions ? api.asc_getLocalRestrictions() : Asc.c_oAscLocalRestrictionType.None;
+                if ( Asc.c_oAscLocalRestrictionType.None !== locktype ) {
+                    features.readonly = true;
+
+                    header.setDocumentReadOnly(true);
+                    api.asc_setLocalRestrictions(Asc.c_oAscLocalRestrictionType.None);
+
+                    (new Common.UI.SynchronizeTip({
+                        extCls: 'no-arrow',
+                        placement: 'bottom',
+                        target: $('.toolbar'),
+                        text: get_locked_message(locktype),
+                        showLink: false,
+                    })).on('closeclick', function () {
+                        this.close();
+                    }).show();
+
+                    native.execCommand('webapps:features', JSON.stringify(features));
+
+                    api.asc_registerCallback('asc_onDocumentName', function () {
+                        if ( features.readonly ) {
+                            if ( api.asc_getLocalRestrictions() == Asc.c_oAscLocalRestrictionType.None ) {
+                                features.readonly = false;
+                                header.setDocumentReadOnly(false);
+                                native.execCommand('webapps:features', JSON.stringify(features));
+                            }
+                        }
+                    });
+                }
+
+                _checkHelpAvailable.call(this);
+            }
+        }
+
+        const _onHidePreloader = function (mode) {
+            features.viewmode = !mode.isEdit;
+            features.crypted = mode.isCrypted;
+            native.execCommand('webapps:features', JSON.stringify(features));
+
+            titlebuttons = {};
+            if ( mode.isEdit ) {
+                var header = webapp.getController('Viewport').getView('Common.Views.Header');
+
+                {
+                    header.btnHome = (new Common.UI.Button({
+                        cls: 'btn-header',
+                        iconCls: 'toolbar__icon icon--inverse btn-home',
+                        visible: false,
+                        hint: 'Show Main window',
+                        dataHint:'0',
+                        dataHintDirection: 'right',
+                        dataHintOffset: '10, -18',
+                        dataHintTitle: 'K'
+                    })).render($('#box-document-title #slot-btn-dt-home'));
+                    titlebuttons['home'] = {btn: header.btnHome};
+
+                    header.btnHome.on('click', function (e) {
+                        native.execCommand('title:button', JSON.stringify({click: "home"}));
+                    });
+
+                    $('#id-box-doc-name').on({
+                        'dblclick': function (e) {
+                            native.execCommand('title:dblclick', JSON.stringify({x: e.originalEvent.screenX, y: e.originalEvent.screenY}))
+                        },
+                        'mousedown': function (e) {
+                            native.execCommand('title:mousedown', JSON.stringify({x: e.originalEvent.screenX, y: e.originalEvent.screenY}))
+                        },
+                        'mousemove': function (e) {
+                            native.execCommand('title:mousemove', JSON.stringify({x: e.originalEvent.screenX, y: e.originalEvent.screenY}))
+                        },
+                        'mouseup': function (e) {
+                            native.execCommand('title:mouseup', JSON.stringify({x: e.originalEvent.screenX, y: e.originalEvent.screenY}))
+                        }
+                    });
+                }
+
+                if (!!header.btnSave) {
+                    titlebuttons['save'] = {btn: header.btnSave};
+
+                    var iconname = /\s?([^\s]+)$/.exec(titlebuttons.save.btn.$icon.attr('class'));
+                    !!iconname && iconname.length && (titlebuttons.save.icon = btnsave_icons[iconname]);
+                }
+
+                if (!!header.btnPrint)
+                    titlebuttons['print'] = {btn: header.btnPrint};
+
+                if (!!header.btnPrintQuick) {
+                    titlebuttons['quickprint'] = {
+                        btn: header.btnPrintQuick,
+                        visible: header.btnPrintQuick.isVisible(),
+                    };
+                }
+
+                if (!!header.btnUndo)
+                    titlebuttons['undo'] = {btn: header.btnUndo};
+
+                if (!!header.btnRedo)
+                    titlebuttons['redo'] = {btn: header.btnRedo};
+
+                for (var i in titlebuttons) {
+                    titlebuttons[i].btn.options.signals = ['disabled'];
+                    titlebuttons[i].btn.on('disabled', _onTitleButtonDisabled.bind(this, i));
+                }
+
+                if (!!titlebuttons.save) {
+                    titlebuttons.save.btn.options.signals.push('icon:changed');
+                    titlebuttons.save.btn.on('icon:changed', _onSaveIconChanged.bind(this));
+                }
+            }
+
+            if ( !!config.callback_editorconfig ) {
+                config.callback_editorconfig();
+                delete config.callback_editorconfig;
+            }
+
+            if ( native.features.singlewindow !== undefined ) {
+                // $('#box-document-title .hedset')[native.features.singlewindow ? 'hide' : 'show']();
+                !!titlebuttons.home && titlebuttons.home.btn.setVisible(native.features.singlewindow);
+            }
+        }
+
        return {
            init: function (opts) {
                _.extend(config, opts);
@ -245,101 +427,13 @@ define([
                    let is_win_xp = nativevars && nativevars.os === 'winxp';

                    Common.UI.Themes.setAvailable(!is_win_xp);
-                    Common.NotificationCenter.on('app:ready', function (opts) {
-                        _.extend(config, opts);
-                        !!native && native.execCommand('doc:onready', '');
-
-                        $('.toolbar').addClass('editor-native-color');
-                    });
-
-                    Common.NotificationCenter.on('document:ready', function () {
-                        if ( config.isEdit ) {
-                            function get_locked_message (t) {
-                                switch (t) {
-                                // case Asc.c_oAscLocalRestrictionType.Nosafe:
-                                case Asc.c_oAscLocalRestrictionType.ReadOnly:
-                                    return Common.Locale.get("tipFileReadOnly",{name:"Common.Translation", default: "Document is read only. You can make changes and save its local copy later."});
-                                default: return Common.Locale.get("tipFileLocked",{name:"Common.Translation", default: "Document is locked for editing. You can make changes and save its local copy later."});
-                                }
-                            }
-
-                            const header = webapp.getController('Viewport').getView('Common.Views.Header');
-                            const api = webapp.getController('Main').api;
-                            const locktype = api.asc_getLocalRestrictions ? api.asc_getLocalRestrictions() : Asc.c_oAscLocalRestrictionType.None;
-                            if ( Asc.c_oAscLocalRestrictionType.None !== locktype ) {
-                                features.readonly = true;
-
-                                header.setDocumentReadOnly(true);
-                                api.asc_setLocalRestrictions(Asc.c_oAscLocalRestrictionType.None);
-
-                                (new Common.UI.SynchronizeTip({
-                                    extCls: 'no-arrow',
-                                    placement: 'bottom',
-                                    target: $('.toolbar'),
-                                    text: get_locked_message(locktype),
-                                    showLink: false,
-                                })).on('closeclick', function () {
-                                    this.close();
-                                }).show();
-                            }
-                        }
-                    });
-
-                    Common.NotificationCenter.on('app:face', function (mode) {
-                        features.viewmode = !mode.isEdit;
-                        features.crypted = mode.isCrypted;
-                        native.execCommand('webapps:features', JSON.stringify(features));
-
-                        titlebuttons = {};
-                        if ( mode.isEdit ) {
-                            const header = webapp.getController('Viewport').getView('Common.Views.Header');
-                            if (!!header.btnSave) {
-                                titlebuttons['save'] = {btn: header.btnSave};
-
-                                var iconname = /\s?([^\s]+)$/.exec(titlebuttons.save.btn.$icon.attr('class'));
-                                !!iconname && iconname.length && (titlebuttons.save.icon = btnsave_icons[iconname]);
-                            }
-
-                            if (!!header.btnPrint)
-                                titlebuttons['print'] = {btn: header.btnPrint};
-
-                            if (!!header.btnPrintQuick) {
-                                titlebuttons['quickprint'] = {
-                                    btn: header.btnPrintQuick,
-                                    visible: header.btnPrintQuick.isVisible(),
-                                };
-                            }
-
-                            if (!!header.btnUndo)
-                                titlebuttons['undo'] = {btn: header.btnUndo};
-
-                            if (!!header.btnRedo)
-                                titlebuttons['redo'] = {btn: header.btnRedo};
-
-                            for (var i in titlebuttons) {
-                                titlebuttons[i].btn.options.signals = ['disabled'];
-                                titlebuttons[i].btn.on('disabled', _onTitleButtonDisabled.bind(this, i));
-                            }
-
-                            if (!!titlebuttons.save) {
-                                titlebuttons.save.btn.options.signals.push('icon:changed');
-                                titlebuttons.save.btn.on('icon:changed', _onSaveIconChanged.bind(this));
-                            }
-                        }
-
-                        if ( !!config.callback_editorconfig ) {
-                            config.callback_editorconfig();
-                            delete config.callback_editorconfig;
-                        }
-
-                        if ( native.features.singlewindow !== undefined ) {
-                            $('#box-document-title .hedset')[native.features.singlewindow ? 'hide' : 'show']();
-                        }
-                    });
-
                    Common.NotificationCenter.on({
+                        'app:ready': _onAppReady,
+                        'document:ready': _onDocumentReady.bind(this),
+                        'app:face': _onHidePreloader.bind(this),
                        'modal:show': _onModalDialog.bind(this, 'open'),
                        'modal:close': _onModalDialog.bind(this, 'close'),
+                        'modal:hide': _onModalDialog.bind(this, 'hide'),
                        'uitheme:changed' : function (name) {
                            if (Common.localStorage.getBool('ui-theme-use-system', false)) {
                                native.execCommand("uitheme:changed", JSON.stringify({name:'theme-system'}));
@ -415,6 +509,9 @@ define([
                }
            },
            helpUrl: function () {
+                if ( helpUrl )
+                    return helpUrl;
+
                if ( !!nativevars && nativevars.helpUrl ) {
                    var webapp = window.SSE ? 'spreadsheeteditor' :
                                    window.PE ? 'presentationeditor' : 'documenteditor';
@ -423,6 +520,9 @@ define([

                return undefined;
            },
+            isHelpAvailable: function () {
+                return !!helpUrl;
+            },
            getDefaultPrinterName: function () {
                return nativevars ? nativevars.defaultPrinterName : '';
            },
--- a/apps/common/main/lib/controller/ExternalDiagramEditor.js
+++ b/apps/common/main/lib/controller/ExternalDiagramEditor.js
@ -98,12 +98,14 @@ define([
                        'drag': _.bind(function(o, state){
                            externalEditor && externalEditor.serviceCommand('window:drag', state == 'start');
                        },this),
+                        'resize': _.bind(function(o, state){
+                            externalEditor && externalEditor.serviceCommand('window:resize', state == 'start');
+                        },this),
                        'show': _.bind(function(cmp){
                            var h = this.diagramEditorView.getHeight(),
                                innerHeight = Common.Utils.innerHeight() - Common.Utils.InternalSettings.get('window-inactive-area-top');
-                            if (innerHeight>h && h<700 || innerHeight<h) {
-                                h = Math.min(innerHeight, 700);
-                                this.diagramEditorView.setHeight(h);
+                            if (innerHeight<h) {
+                                this.diagramEditorView.setHeight(innerHeight);
                            }

                            if (externalEditor) {
@ -118,7 +120,9 @@ define([
                                }
                                externalEditor.attachMouseEvents();
                            } else {
-                                createExternalEditor.apply(this);
+                                require(['api'], function () {
+                                    createExternalEditor.apply(this);
+                                }.bind(this));
                            }
                            this.isExternalEditorVisible = true;
                            this.isHandlerCalled = false;
@ -227,13 +231,21 @@ define([
                    if (eventData.type == "processMouse") {
                        if (eventData.data.event == 'mouse:up') {
                            this.diagramEditorView.binding.dragStop();
+                            if (this.diagramEditorView.binding.resizeStop)  this.diagramEditorView.binding.resizeStop();
                        } else
                        if (eventData.data.event == 'mouse:move') {
                            var x = parseInt(this.diagramEditorView.$window.css('left')) + eventData.data.pagex,
                                y = parseInt(this.diagramEditorView.$window.css('top')) + eventData.data.pagey + 34;
                            this.diagramEditorView.binding.drag({pageX:x, pageY:y});
+                            if (this.diagramEditorView.binding.resize)  this.diagramEditorView.binding.resize({pageX:x, pageY:y});
                        }
                    } else
+                    if (eventData.type == "resize") {
+                        var w = eventData.data.width,
+                            h = eventData.data.height;
+                        if (w>0 && h>0)
+                            this.diagramEditorView.setInnerSize(w, h);
+                    } else
                    if (eventData.type == "frameToGeneralData") {
                        this.api && this.api.asc_getInformationBetweenFrameAndGeneralEditor(eventData.data);
                    } else
--- a/apps/common/main/lib/controller/ExternalMergeEditor.js
+++ b/apps/common/main/lib/controller/ExternalMergeEditor.js
@ -51,7 +51,8 @@ define([
        var appLang         = '{{DEFAULT_LANG}}',
            customization   = undefined,
            targetApp       = '',
-            externalEditor  = null;
+            externalEditor  = null,
+            isAppFirstOpened = true;


        var createExternalEditor = function() {
@ -96,24 +97,33 @@ define([
                        'drag': _.bind(function(o, state){
                            externalEditor && externalEditor.serviceCommand('window:drag', state == 'start');
                        },this),
+                        'resize': _.bind(function(o, state){
+                            externalEditor && externalEditor.serviceCommand('window:resize', state == 'start');
+                        },this),
                        'show': _.bind(function(cmp){
                            var h = this.mergeEditorView.getHeight(),
                                innerHeight = Common.Utils.innerHeight();
-                            if (innerHeight>h && h<700 || innerHeight<h) {
-                                h = Math.min(innerHeight, 700);
-                                this.mergeEditorView.setHeight(h);
+                            if (innerHeight<h) {
+                                this.mergeEditorView.setHeight(innerHeight);
                            }

                            if (externalEditor) {
                                externalEditor.serviceCommand('setAppDisabled',false);
+                                if (isAppFirstOpened && this.mergeEditorView._isExternalDocReady) {
+                                    isAppFirstOpened = false;
+                                    this.mergeEditorView._mergeData && this.setMergeData();
+                                }
                                if (this.needDisableEditing && this.mergeEditorView._isExternalDocReady) {
                                    this.onMergeEditingDisabled();
                                }
                                externalEditor.attachMouseEvents();
                            } else {
-                                createExternalEditor.apply(this);
+                                require(['api'], function () {
+                                    createExternalEditor.apply(this);
+                                }.bind(this))
                            }
                            this.isExternalEditorVisible = true;
+                            this.isHandlerCalled = false;
                        }, this),
                        'hide':  _.bind(function(cmp){
                            if (externalEditor) {
@ -139,14 +149,22 @@ define([
            },

            handler: function(result, value) {
-                externalEditor && externalEditor.serviceCommand('queryClose',{mr:result});
-                return true;
+                if (this.isHandlerCalled) return;
+                this.isHandlerCalled = true;
+                if (this.mergeEditorView._isExternalDocReady)
+                    externalEditor && externalEditor.serviceCommand('queryClose',{mr:result});
+                else {
+                    this.mergeEditorView.hide();
+                    this.isHandlerCalled = false;
+                }
            },

            setMergeData: function() {
-                externalEditor && externalEditor.serviceCommand('setMergeData', this.mergeEditorView._mergeData);
-                this.mergeEditorView.setEditMode(true);
-                this.mergeEditorView._mergeData = null;
+                if (!isAppFirstOpened) {
+                    externalEditor && externalEditor.serviceCommand('setMergeData', this.mergeEditorView._mergeData);
+                    this.mergeEditorView.setEditMode(true);
+                    this.mergeEditorView._mergeData = null;
+                }
            },

            loadConfig: function(data) {
@ -185,6 +203,7 @@ define([
                if (this.mergeEditorView) {
                    if (eventData.type == 'documentReady') {
                        this.mergeEditorView._isExternalDocReady = true;
+                        this.isExternalEditorVisible && (isAppFirstOpened = false);
                        this.mergeEditorView.setControlsDisabled(false);
                        if (this.mergeEditorView._mergeData) {
                            externalEditor && externalEditor.serviceCommand('setMergeData', this.mergeEditorView._mergeData);
@ -207,17 +226,26 @@ define([
                            }
                            this.mergeEditorView.hide();
                        }
+                        this.isHandlerCalled = false;
                    } else
                    if (eventData.type == "processMouse") {
                        if (eventData.data.event == 'mouse:up') {
                            this.mergeEditorView.binding.dragStop();
+                            if (this.mergeEditorView.binding.resizeStop)  this.mergeEditorView.binding.resizeStop();
                        } else
                        if (eventData.data.event == 'mouse:move') {
                            var x = parseInt(this.mergeEditorView.$window.css('left')) + eventData.data.pagex,
                                y = parseInt(this.mergeEditorView.$window.css('top')) + eventData.data.pagey + 34;
                            this.mergeEditorView.binding.drag({pageX:x, pageY:y});
+                            if (this.mergeEditorView.binding.resize)  this.mergeEditorView.binding.resize({pageX:x, pageY:y});
                        }
                    } else
+                    if (eventData.type == "resize") {
+                        var w = eventData.data.width,
+                            h = eventData.data.height;
+                        if (w>0 && h>0)
+                            this.mergeEditorView.setInnerSize(w, h);
+                    } else
                    if (eventData.type == "frameToGeneralData") {
                        this.api && this.api.asc_getInformationBetweenFrameAndGeneralEditor(eventData.data);
                    } else
--- a/apps/common/main/lib/controller/ExternalOleEditor.js
+++ b/apps/common/main/lib/controller/ExternalOleEditor.js
@ -98,12 +98,14 @@ define([
                        'drag': _.bind(function(o, state){
                            externalEditor && externalEditor.serviceCommand('window:drag', state == 'start');
                        },this),
+                        'resize': _.bind(function(o, state){
+                            externalEditor && externalEditor.serviceCommand('window:resize', state == 'start');
+                        },this),
                        'show': _.bind(function(cmp){
                            var h = this.oleEditorView.getHeight(),
                                innerHeight = Common.Utils.innerHeight() - Common.Utils.InternalSettings.get('window-inactive-area-top');
-                            if (innerHeight>h && h<700 || innerHeight<h) {
-                                h = Math.min(innerHeight, 700);
-                                this.oleEditorView.setHeight(h);
+                            if (innerHeight<h) {
+                                this.oleEditorView.setHeight(innerHeight);
                            }

                            if (externalEditor) {
@ -118,7 +120,9 @@ define([
                                }
                                externalEditor.attachMouseEvents();
                            } else {
-                                createExternalEditor.apply(this);
+                                require(['api'], function () {
+                                    createExternalEditor.apply(this);
+                                }.bind(this));
                            }
                            this.isExternalEditorVisible = true;
                            this.isHandlerCalled = false;
@ -131,8 +135,6 @@ define([
                        }, this)
                    }
                });
-
-
            },

            onLaunch: function() {
@ -228,12 +230,20 @@ define([
                    if (eventData.type == "processMouse") {
                        if (eventData.data.event == 'mouse:up') {
                            this.oleEditorView.binding.dragStop();
+                            if (this.oleEditorView.binding.resizeStop)  this.oleEditorView.binding.resizeStop();
                        } else
                        if (eventData.data.event == 'mouse:move') {
                            var x = parseInt(this.oleEditorView.$window.css('left')) + eventData.data.pagex,
                                y = parseInt(this.oleEditorView.$window.css('top')) + eventData.data.pagey + 34;
                            this.oleEditorView.binding.drag({pageX:x, pageY:y});
+                            if (this.oleEditorView.binding.resize)  this.oleEditorView.binding.resize({pageX:x, pageY:y});
                        }
+                    }  else
+                    if (eventData.type == "resize") {
+                        var w = eventData.data.width,
+                            h = eventData.data.height;
+                        if (w>0 && h>0)
+                            this.oleEditorView.setInnerSize(w, h);
                    } else
                    if (eventData.type == "frameToGeneralData") {
                        this.api && this.api.asc_getInformationBetweenFrameAndGeneralEditor(eventData.data);
--- a/apps/common/main/lib/controller/HintManager.js
+++ b/apps/common/main/lib/controller/HintManager.js
@ -121,7 +121,7 @@ Common.UI.HintManager = new(function() {
        _usedTitles = [],
        _appPrefix,
        _staticHints = { // for desktop buttons
-            "btnhome": 'K'
+            // "btnhome": 'K'
        };

    var _api;
@ -324,7 +324,7 @@ Common.UI.HintManager = new(function() {
                index++;
            }
            var title = el.attr('data-hint-title');
-            if (!title) {
+            if (!title && !(index > _arrLetters.length)) {
                el.attr('data-hint-title', _arrLetters[index].toUpperCase());
                index++;
            }
@ -457,6 +457,8 @@ Common.UI.HintManager = new(function() {
    };

    var _init = function(api) {
+        if (Common.Utils.isIE || Common.UI.isMac && Common.Utils.isGecko) // turn off hints on IE and FireFox (shortcut F6 selects link in address bar)
+            return;
        _api = api;

        var filter = Common.localStorage.getKeysFilter();
@ -478,7 +480,7 @@ Common.UI.HintManager = new(function() {
            _clearHints();
        });
        $(document).on('keyup', function(e) {
-            if (e.keyCode == Common.UI.Keys.ALT && _needShow && !(window.SSE && window.SSE.getController('Statusbar').getIsDragDrop())) {
+            if ((e.keyCode == Common.UI.Keys.ALT || e.keyCode === 91) && _needShow && !(window.SSE && window.SSE.getController('Statusbar').getIsDragDrop())) {
                e.preventDefault();
                if (!_hintVisible) {
                    $('input:focus').blur(); // to change value in inputField
@ -620,10 +622,11 @@ Common.UI.HintManager = new(function() {
                }
            }

-            _needShow = (Common.Utils.InternalSettings.get(_appPrefix + "settings-show-alt-hints") && !e.shiftKey && e.keyCode == Common.UI.Keys.ALT &&
+            _needShow = (Common.Utils.InternalSettings.get(_appPrefix + "settings-show-alt-hints") && !e.shiftKey &&
+                (!Common.Utils.isMac && e.keyCode == Common.UI.Keys.ALT || Common.Utils.isMac && e.metaKey && e.keyCode === Common.UI.Keys.F6) &&
                !Common.Utils.ModalWindow.isVisible() && _isDocReady && _arrAlphabet.length > 0 &&
                !(window.PE && $('#pe-preview').is(':visible')));
-            if (Common.Utils.InternalSettings.get(_appPrefix + "settings-show-alt-hints") && e.altKey && e.keyCode !== 115) {
+            if (Common.Utils.InternalSettings.get(_appPrefix + "settings-show-alt-hints") && !Common.Utils.isMac && e.altKey && e.keyCode !== 115) {
                e.preventDefault();
            }
        });
@ -661,6 +664,8 @@ Common.UI.HintManager = new(function() {
    };

    var _clearHints = function (isComplete) {
+        if (Common.Utils.isIE || Common.UI.isMac && Common.Utils.isGecko)
+            return;
        _hintVisible && _hideHints();
        if (_currentHints.length > 0) {
            _resetToDefault();
--- a/apps/common/main/lib/controller/LayoutManager.js
+++ b/apps/common/main/lib/controller/LayoutManager.js
@ -47,14 +47,16 @@ if (Common.UI === undefined) {
 }

 Common.UI.LayoutManager = new(function() {
-    var _config;
-    var _init = function(config) {
+    var _config,
+        _licensed;
+    var _init = function(config, licensed) {
        _config = config;
+        _licensed = licensed;
    };

    var _applyCustomization = function(config, el, prefix) {
        !config && (config = _config);
-        if (!config) return;
+        if (!_licensed || !config) return;

        for (var name in config) {
            if(config.hasOwnProperty(name)) {
@ -71,7 +73,7 @@ Common.UI.LayoutManager = new(function() {

    var _isElementVisible = function(value, config, prefix) {
        !config && (config = _config);
-        if (!config) return true;
+        if (!_licensed || !config) return true;

        var res = true;
        for (var name in config) {
@ -89,10 +91,31 @@ Common.UI.LayoutManager = new(function() {
        return res;
    };

+    var _getInitValue = function(name) {
+        if (_licensed && _config) {
+            var arr = name.split('-'),
+                i = 0,
+                obj = _config;
+            for (i=0; i<arr.length; i++) {
+                if (typeof obj[arr[i]] === 'object' && obj[arr[i]]) {
+                    obj = obj[arr[i]];
+                } else
+                    break;
+            }
+            if (i===arr.length) {
+                if (typeof obj === 'object' && obj)
+                    return obj.mode;
+                else
+                    return obj;
+            }
+        }
+    };
+
    return {
        init: _init,
        applyCustomization: _applyCustomization,
-        isElementVisible: _isElementVisible
+        isElementVisible: _isElementVisible,
+        getInitValue: _getInitValue
    }
 })();

--- a/apps/common/main/lib/controller/Plugins.js
+++ b/apps/common/main/lib/controller/Plugins.js
@ -66,7 +66,7 @@ define([
                        if ( !appOptions.isEditMailMerge && !appOptions.isEditDiagram && !appOptions.isEditOle ) {
                            var tab = {action: 'plugins', caption: me.panelPlugins.groupCaption, dataHintTitle: 'E', layoutname: 'toolbar-plugins'};
                            me.$toolbarPanelPlugins = me.panelPlugins.getPanel();
-
+                            me.toolbar = toolbar;
                            toolbar.addTab(tab, me.$toolbarPanelPlugins, 10);     // TODO: clear plugins list in left panel
                        }
                    }
@ -105,6 +105,7 @@ define([
            Common.NotificationCenter.on('app:face', this.onAppShowed.bind(this));
            Common.NotificationCenter.on('uitheme:changed', this.updatePluginsButtons.bind(this));
            Common.NotificationCenter.on('window:resize', this.updatePluginsButtons.bind(this));
+            Common.NotificationCenter.on('app:ready', this.onAppReady.bind(this));
        },

        loadConfig: function(data) {
@ -151,6 +152,16 @@ define([
        onAppShowed: function (config) {
        },

+        onAppReady: function (config) {
+            var me = this;
+            (new Promise(function (accept, reject) {
+                accept();
+            })).then(function(){
+                me.onChangeProtectDocument();
+                Common.NotificationCenter.on('protect:doclock', _.bind(me.onChangeProtectDocument, me));
+            });
+        },
+
        setApi: function(api) {
            this.api = api;

@ -225,6 +236,10 @@ define([
                var _group = $('> .group', me.$toolbarPanelPlugins);
                var $slot = $('<span class="btn-slot text x-huge"></span>').appendTo(_group);
                btn.render($slot);
+                var docProtection = me.panelPlugins._state.docProtection;
+                Common.Utils.lockControls(Common.enumLock.docLockView, docProtection.isReadOnly, {array: btn});
+                Common.Utils.lockControls(Common.enumLock.docLockForms, docProtection.isFormsOnly, {array: btn});
+                Common.Utils.lockControls(Common.enumLock.docLockComments, docProtection.isCommentsOnly, {array: btn});
            }
        },

@ -233,6 +248,7 @@ define([
            me.appOptions.canPlugins = !collection.isEmpty();
            if ( me.$toolbarPanelPlugins ) {
                me.$toolbarPanelPlugins.empty();
+                me.toolbar && me.toolbar.clearMoreButton('plugins');

                var _group = $('<div class="group"></div>'),
                    rank = -1,
@ -247,7 +263,7 @@ define([
                    } else {
                        _group.appendTo(me.$toolbarPanelPlugins);
                        $('<div class="separator long invisible"></div>').appendTo(me.$toolbarPanelPlugins);
-                        _group = $('<div class="group" style="padding-left: 0;"></div>');
+                        _group = $('<div class="group" style="' + (Common.UI.isRTL() ? 'padding-right: 0;' : 'padding-left: 0;') + '"></div>');
                    }

                    var btn = me.panelPlugins.createPluginButton(model);
@ -259,6 +275,11 @@ define([
                    rank = new_rank;
                });
                _group.appendTo(me.$toolbarPanelPlugins);
+                me.toolbar && me.toolbar.isTabActive('plugins') && me.toolbar.processPanelVisible(null, true, true);
+                var docProtection = me.panelPlugins._state.docProtection;
+                Common.Utils.lockControls(Common.enumLock.docLockView, docProtection.isReadOnly, {array: me.panelPlugins.lockedControls});
+                Common.Utils.lockControls(Common.enumLock.docLockForms, docProtection.isFormsOnly, {array: me.panelPlugins.lockedControls});
+                Common.Utils.lockControls(Common.enumLock.docLockComments, docProtection.isCommentsOnly, {array: me.panelPlugins.lockedControls});
            } else {
                console.error('toolbar panel isnot created');
            }
@ -518,10 +539,13 @@ define([
                    }

                    var variationsArr = [],
-                        pluginVisible = false;
+                        pluginVisible = false,
+                        isDisplayedInViewer = false;
                    item.variations.forEach(function(itemVar){
                        var visible = (isEdit || itemVar.isViewer && (itemVar.isDisplayedInViewer!==false)) && _.contains(itemVar.EditorsSupport, editor) && !itemVar.isSystem;
                        if ( visible ) pluginVisible = true;
+                        if (itemVar.isViewer && (itemVar.isDisplayedInViewer!==false))
+                            isDisplayedInViewer = true;

                        if (item.isUICustomizer ) {
                            visible && arrUI.push({
@ -571,7 +595,8 @@ define([
                            groupName: (item.group) ? item.group.name : '',
                            groupRank: (item.group) ? item.group.rank : 0,
                            minVersion: item.minVersion,
-                            original: item
+                            original: item,
+                            isDisplayedInViewer: isDisplayedInViewer
                        }));
                    }
                });
@ -720,6 +745,19 @@ define([
                    }, funcComplete);
            } else
                funcComplete();
+        },
+
+        onChangeProtectDocument: function(props) {
+            if (!props) {
+                var docprotect = this.getApplication().getController('DocProtection');
+                props = docprotect ? docprotect.getDocProps() : null;
+            }
+            if (props && this.panelPlugins) {
+                this.panelPlugins._state.docProtection = props;
+                Common.Utils.lockControls(Common.enumLock.docLockView, props.isReadOnly, {array: this.panelPlugins.lockedControls});
+                Common.Utils.lockControls(Common.enumLock.docLockForms, props.isFormsOnly, {array: this.panelPlugins.lockedControls});
+                Common.Utils.lockControls(Common.enumLock.docLockComments, props.isCommentsOnly, {array: this.panelPlugins.lockedControls});
+            }
        }
    }, Common.Controllers.Plugins || {}));
 });
--- a/apps/common/main/lib/controller/Protection.js
+++ b/apps/common/main/lib/controller/Protection.js
@ -147,6 +147,23 @@ define([
        },

        onAppReady: function (config) {
+            var me = this;
+            (new Promise(function (accept, reject) {
+                accept();
+            })).then(function(){
+                me.onChangeProtectDocument();
+                Common.NotificationCenter.on('protect:doclock', _.bind(me.onChangeProtectDocument, me));
+            });
+        },
+
+        onChangeProtectDocument: function(props) {
+            if (!props) {
+                var docprotect = this.getApplication().getController('DocProtection');
+                props = docprotect ? docprotect.getDocProps() : null;
+            }
+            if (props && this.view) {
+                this.view._state.docProtection = props;
+            }
        },

        addPassword: function() {
--- a/apps/common/main/lib/controller/ReviewChanges.js
+++ b/apps/common/main/lib/controller/ReviewChanges.js
@ -82,7 +82,8 @@ define([
                    'reviewchange:view':        _.bind(this.onReviewViewClick, this),
                    'reviewchange:compare':     _.bind(this.onCompareClick, this),
                    'lang:document':            _.bind(this.onDocLanguage, this),
-                    'collaboration:coauthmode': _.bind(this.onCoAuthMode, this)
+                    'collaboration:coauthmode': _.bind(this.onCoAuthMode, this),
+                    'protect:update':           _.bind(this.onChangeProtectDocument, this)
                },
                'Common.Views.ReviewChangesDialog': {
                    'reviewchange:accept':      _.bind(this.onAcceptClick, this),
@ -101,8 +102,18 @@ define([
            this.collection     =   this.getApplication().getCollection('Common.Collections.ReviewChanges');
            this.userCollection =   this.getApplication().getCollection('Common.Collections.Users');
            this.viewmode = false;
+            var filter = Common.localStorage.getKeysFilter();
+            this.appPrefix = (filter && filter.length) ? filter.split(',')[0] : '';

-            this._state = {posx: -1000, posy: -1000, popoverVisible: false, previewMode: false, compareSettings: null, wsLock: false, wsProps: []};
+            this._state = { posx: -1000, posy: -1000, popoverVisible: false, previewMode: false, compareSettings: null, wsLock: false, wsProps: [],
+                            disableEditing: false, // disable editing when disconnect/signed file/mail merge preview/review final or original/forms preview
+                            docProtection: {
+                                isReadOnly: false,
+                                isReviewOnly: false,
+                                isFormsOnly: false,
+                                isCommentsOnly: false
+                            }
+                          };

            Common.NotificationCenter.on('reviewchanges:turn', this.onTurnPreview.bind(this));
            Common.NotificationCenter.on('spelling:turn', this.onTurnSpelling.bind(this));
@ -164,26 +175,35 @@ define([
        SetDisabled: function(state, reviewMode, fillFormMode) {
            if (this.dlgChanges)
                this.dlgChanges.close();
-            if (reviewMode)
+            if (reviewMode) {
                this.lockToolbar(Common.enumLock.previewReviewMode, state);
-            else if (fillFormMode)
+                this.dlgChanges && Common.Utils.lockControls(Common.enumLock.previewReviewMode, state, {array: [this.dlgChanges.btnAccept, this.dlgChanges.btnReject]});
+            } else if (fillFormMode) {
                this.lockToolbar(Common.enumLock.viewFormMode, state);
-            else
+                this.dlgChanges && Common.Utils.lockControls(Common.enumLock.viewFormMode, state, {array: [this.dlgChanges.btnAccept, this.dlgChanges.btnReject]});
+            } else {
                this.lockToolbar(Common.enumLock.viewMode, state);
-
+            }
            this.setPreviewMode(state);
        },

        lockToolbar: function (causes, lock, opts) {
-            Common.Utils.lockControls(causes, lock, opts, this.view.getButtons());
+            this.view && Common.Utils.lockControls(causes, lock, opts, this.view.getButtons());
        },

        setPreviewMode: function(mode) { //disable accept/reject in popover
-            if (this.viewmode === mode) return;
-            this.viewmode = mode;
-            if (mode)
+            this._state.disableEditing = mode;
+            this.updatePreviewMode();
+        },
+
+        updatePreviewMode: function() {
+            var viewmode = this._state.disableEditing || this._state.docProtection.isReadOnly || this._state.docProtection.isFormsOnly || this._state.docProtection.isCommentsOnly;
+
+            if (this.viewmode === viewmode) return;
+            this.viewmode = viewmode;
+            if (viewmode)
                this.prevcanReview = this.appConfig.canReview;
-            this.appConfig.canReview = (mode) ? false : this.prevcanReview;
+            this.appConfig.canReview = (viewmode) ? false : this.prevcanReview;
            var me = this;
            this.popoverChanges && this.popoverChanges.each(function (model) {
                model.set('hint', !me.appConfig.canReview);
@ -207,19 +227,16 @@ define([
        onApiShowChange: function (sdkchange, isShow) {
            var btnlock = true,
                changes;
-            if (this.appConfig.canReview && !this.appConfig.isReviewOnly) {
+            if (this.appConfig.canReview && !(this.appConfig.isReviewOnly || this._state.docProtection.isReviewOnly)) {
                if (sdkchange && sdkchange.length>0) {
                    changes = this.readSDKChange(sdkchange);
                    btnlock = this.isSelectedChangesLocked(changes, isShow);
                }
                if (this._state.lock !== btnlock) {
                    Common.Utils.lockControls(Common.enumLock.reviewChangelock, btnlock, {array: [this.view.btnAccept, this.view.btnReject]});
-                    if (this.dlgChanges) {
-                        this.dlgChanges.btnAccept.setDisabled(btnlock);
-                        this.dlgChanges.btnReject.setDisabled(btnlock);
-                    }
+                    this.dlgChanges && Common.Utils.lockControls(Common.enumLock.reviewChangelock, btnlock, {array: [this.dlgChanges.btnAccept, this.dlgChanges.btnReject]});
                    this._state.lock = btnlock;
-                    Common.Utils.InternalSettings.set(this.view.appPrefix + "accept-reject-lock", btnlock);
+                    Common.Utils.InternalSettings.set(this.appPrefix + "accept-reject-lock", btnlock);
                }
            }

@ -384,7 +401,7 @@ define([
                        if (value.Get_SmallCaps() !== undefined)
                            proptext += ((value.Get_SmallCaps() ? '' : me.textNot) + me.textSmallCaps + ', ');
                        if (value.Get_VertAlign() !== undefined)
-                            proptext += (((value.Get_VertAlign()==1) ? me.textSuperScript : ((value.Get_VertAlign()==2) ? me.textSubScript : me.textBaseline)) + ', ');
+                            proptext += (((value.Get_VertAlign()===Asc.vertalign_SuperScript) ? me.textSuperScript : ((value.Get_VertAlign()===Asc.vertalign_SubScript) ? me.textSubScript : me.textBaseline)) + ', ');
                        if (value.Get_Color() !== undefined)
                            proptext += (me.textColor + ', ');
                        if (value.Get_Highlight() !== undefined)
@ -485,6 +502,7 @@ define([
                }
                var date = (item.get_DateTime() == '') ? new Date() : new Date(item.get_DateTime()),
                    user = me.userCollection.findOriginalUser(item.get_UserId()),
+                    isProtectedReview = me._state.docProtection.isReviewOnly,
                    change = new Common.Models.ReviewChange({
                        uid         : Common.UI.getId(),
                        userid      : item.get_UserId(),
@ -499,8 +517,9 @@ define([
                        changedata  : item,
                        scope       : me.view,
                        hint        : !me.appConfig.canReview,
+                        docProtection: me._state.docProtection,
                        goto        : (item.get_MoveType() == Asc.c_oAscRevisionsMove.MoveTo || item.get_MoveType() == Asc.c_oAscRevisionsMove.MoveFrom),
-                        editable    : me.appConfig.isReviewOnly && (item.get_UserId() == me.currentUserId) || !me.appConfig.isReviewOnly && (!me.appConfig.canUseReviewPermissions || AscCommon.UserInfoParser.canEditReview(item.get_UserName()))
+                        editable    : (me.appConfig.isReviewOnly || isProtectedReview) && (item.get_UserId() == me.currentUserId) || !(me.appConfig.isReviewOnly || isProtectedReview) && (!me.appConfig.canUseReviewPermissions || AscCommon.UserInfoParser.canEditReview(item.get_UserName()))
                    });

                arr.push(change);
@ -589,7 +608,7 @@ define([
        },

        onTurnPreview: function(state, global, fromApi) {
-            if ( this.appConfig.isReviewOnly ) {
+            if ( this.appConfig.isReviewOnly) {
                this.view.turnChanges(true);
            } else
            if ( this.appConfig.canReview ) {
@ -603,13 +622,13 @@ define([
        },

        onApiTrackRevisionsChange: function(localFlag, globalFlag, userId) {
-            if ( this.appConfig.isReviewOnly ) {
+            if ( this.appConfig.isReviewOnly || this._state.docProtection.isReviewOnly) {
                this.view.turnChanges(true);
            } else
            if ( this.appConfig.canReview ) {
                var global = (localFlag===null),
                    state = global ? globalFlag : localFlag;
-                Common.Utils.InternalSettings.set(this.view.appPrefix + "track-changes", (state ? 0 : 1) + (global ? 2 : 0));
+                Common.Utils.InternalSettings.set(this.appPrefix + "track-changes", (state ? 0 : 1) + (global ? 2 : 0));
                this.view.turnChanges(state, global);
                if (userId && this.userCollection) {
                    var rec = this.userCollection.findOriginalUser(userId);
@ -624,18 +643,20 @@ define([
            this.view && this.view.turnSpelling(state);

            if (Common.UI.FeaturesManager.canChange('spellcheck') && !suspend) {
-                Common.localStorage.setItem(this.view.appPrefix + "settings-spellcheck", state ? 1 : 0);
+                Common.localStorage.setItem(this.appPrefix + "settings-spellcheck", state ? 1 : 0);
                this.api.asc_setSpellCheck(state);
-                Common.Utils.InternalSettings.set(this.view.appPrefix + "settings-spellcheck", state);
+                Common.Utils.InternalSettings.set(this.appPrefix + "settings-spellcheck", state);
            }
        },

        onReviewViewClick: function(menu, item, e) {
            this.turnDisplayMode(item.value);
            if (!this.appConfig.isEdit && !this.appConfig.isRestrictedEdit)
-                Common.localStorage.setItem(this.view.appPrefix + "review-mode", item.value); // for viewer
-            else if (item.value=='markup' || item.value=='simple')
-                Common.localStorage.setItem(this.view.appPrefix + "review-mode-editor", item.value); // for editor save only markup modes
+                Common.localStorage.setItem(this.appPrefix + "review-mode", item.value); // for viewer
+            else if (item.value=='markup' || item.value=='simple') {
+                Common.localStorage.setItem(this.appPrefix + "review-mode-editor", item.value); // for editor save only markup modes
+                Common.Utils.InternalSettings.set(this.appPrefix + "review-mode-editor", item.value);
+            }
            Common.NotificationCenter.trigger('edit:complete', this.view);
        },

@ -766,14 +787,14 @@ define([
        },

        onCoAuthMode: function(menu, item, e) {
-            Common.localStorage.setItem(this.view.appPrefix + "settings-coauthmode", item.value);
-            Common.Utils.InternalSettings.set(this.view.appPrefix + "settings-coauthmode", item.value);
+            Common.localStorage.setItem(this.appPrefix + "settings-coauthmode", item.value);
+            Common.Utils.InternalSettings.set(this.appPrefix + "settings-coauthmode", item.value);

            if (this.api) {
                this.api.asc_SetFastCollaborative(item.value==1);

                if (this.api.SetCollaborativeMarksShowType) {
-                    var value = Common.localStorage.getItem(item.value ? this.view.appPrefix + "settings-showchanges-fast" : this.view.appPrefix + "settings-showchanges-strict");
+                    var value = Common.localStorage.getItem(item.value ? this.appPrefix + "settings-showchanges-fast" : this.appPrefix + "settings-showchanges-strict");
                    if (value !== null)
                        this.api.SetCollaborativeMarksShowType(value == 'all' ? Asc.c_oAscCollaborativeMarksShowType.All :
                            value == 'none' ? Asc.c_oAscCollaborativeMarksShowType.None : Asc.c_oAscCollaborativeMarksShowType.LastChanges);
@ -781,13 +802,13 @@ define([
                        this.api.SetCollaborativeMarksShowType(item.value ? Asc.c_oAscCollaborativeMarksShowType.None : Asc.c_oAscCollaborativeMarksShowType.LastChanges);
                }

-                value = Common.localStorage.getItem(this.view.appPrefix + "settings-autosave");
+                value = Common.localStorage.getItem(this.appPrefix + "settings-autosave");
                if (value===null && this.appConfig.customization && this.appConfig.customization.autosave===false)
                    value = 0;
                value = (!item.value && value!==null) ? parseInt(value) : 1;

-                Common.localStorage.setItem(this.view.appPrefix + "settings-autosave", value);
-                Common.Utils.InternalSettings.set(this.view.appPrefix + "settings-autosave", value);
+                Common.localStorage.setItem(this.appPrefix + "settings-autosave", value);
+                Common.Utils.InternalSettings.set(this.appPrefix + "settings-autosave", value);
                this.api.asc_setAutoSaveGap(value);
            }
            Common.NotificationCenter.trigger('edit:complete', this.view);
@ -805,7 +826,7 @@ define([
                rightMenu: {clear: disable, disable: true},
                statusBar: true,
                leftMenu: {disable: false, previewMode: true},
-                fileMenu: {protect: true},
+                fileMenu: {protect: true, info: true},
                navigation: {disable: false, previewMode: true},
                comments: {disable: false, previewMode: true},
                chat: false,
@ -829,14 +850,14 @@ define([

        onAppReady: function (config) {
            var me = this;
-            if ( config.canReview ) {
-                (new Promise(function (resolve) {
-                    resolve();
-                })).then(function () {
+            (new Promise(function (resolve) {
+                resolve();
+            })).then(function () {
+                if ( config.canReview ) {
                    // function _setReviewStatus(state, global) {
                    //     me.view.turnChanges(state, global);
                    //     !global && me.api.asc_SetLocalTrackRevisions(state);
-                    //     Common.Utils.InternalSettings.set(me.view.appPrefix + "track-changes", (state ? 0 : 1) + (global ? 2 : 0));
+                    //     Common.Utils.InternalSettings.set(me.appPrefix + "track-changes", (state ? 0 : 1) + (global ? 2 : 0));
                    // };

                    var trackChanges = me.appConfig.customization && me.appConfig.customization.review ? me.appConfig.customization.review.trackChanges : undefined;
@ -848,13 +869,13 @@ define([
                        me.onApiTrackRevisionsChange(me.api.asc_GetLocalTrackRevisions(), me.api.asc_GetGlobalTrackRevisions());
                    me.api.asc_HaveRevisionsChanges() && me.view.markChanges(true);

-                    var val = Common.localStorage.getItem(me.view.appPrefix + "review-mode-editor");
+                    var val = Common.localStorage.getItem(me.appPrefix + "review-mode-editor");
                    if (val===null) {
                        val = me.appConfig.customization && me.appConfig.customization.review ? me.appConfig.customization.review.reviewDisplay : undefined;
                        !val && (val = me.appConfig.customization ? me.appConfig.customization.reviewDisplay : undefined);
                        val = /^(original|final|markup|simple)$/i.test(val) ? val.toLocaleLowerCase() : 'markup';
                    }
-
+                    Common.Utils.InternalSettings.set(me.appPrefix + "review-mode-editor", val);
                    me.turnDisplayMode(val); // load display mode for all modes (viewer or editor)
                    me.view.turnDisplayMode(val);

@ -862,51 +883,54 @@ define([
                        (!me.appConfig.customization.review || me.appConfig.customization.review.showReviewChanges===undefined) && me.appConfig.customization.showReviewChanges==true) ) {
                        me.dlgChanges = (new Common.Views.ReviewChangesDialog({
                            popoverChanges  : me.popoverChanges,
-                            mode            : me.appConfig
+                            mode            : me.appConfig,
+                            docProtection   : me._state.docProtection
                        }));
                        var sdk = $('#editor_sdk'),
                            offset = sdk.offset();
                        me.dlgChanges.show(Math.max(10, offset.left + sdk.width() - 300), Math.max(10, offset.top + sdk.height() - 150));
                    }
-                });
-            } else if (config.canViewReview) {
-                config.canViewReview = (config.isEdit || me.api.asc_HaveRevisionsChanges(true)); // check revisions from all users
-                if (config.canViewReview) {
-                    var val = Common.localStorage.getItem(me.view.appPrefix + (config.isEdit || config.isRestrictedEdit ? "review-mode-editor" : "review-mode"));
-                    if (val===null) {
-                        val = me.appConfig.customization && me.appConfig.customization.review ? me.appConfig.customization.review.reviewDisplay : undefined;
-                        !val && (val = me.appConfig.customization ? me.appConfig.customization.reviewDisplay : undefined);
-                        val = /^(original|final|markup|simple)$/i.test(val) ? val.toLocaleLowerCase() : (config.isEdit || config.isRestrictedEdit ? 'markup' : 'original');
+                } else if (config.canViewReview) {
+                    config.canViewReview = (config.isEdit || me.api.asc_HaveRevisionsChanges(true)); // check revisions from all users
+                    if (config.canViewReview) {
+                        var val = Common.localStorage.getItem(me.appPrefix + (config.isEdit || config.isRestrictedEdit ? "review-mode-editor" : "review-mode"));
+                        if (val===null) {
+                            val = me.appConfig.customization && me.appConfig.customization.review ? me.appConfig.customization.review.reviewDisplay : undefined;
+                            !val && (val = me.appConfig.customization ? me.appConfig.customization.reviewDisplay : undefined);
+                            val = /^(original|final|markup|simple)$/i.test(val) ? val.toLocaleLowerCase() : (config.isEdit || config.isRestrictedEdit ? 'markup' : 'original');
+                        }
+                        me.turnDisplayMode(val);
+                        me.view.turnDisplayMode(val);
                    }
-                    me.turnDisplayMode(val);
-                    me.view.turnDisplayMode(val);
                }
-            }

-            if (me.view && me.view.btnChat) {
-                me.getApplication().getController('LeftMenu').leftMenu.btnChat.on('toggle', function(btn, state){
-                    if (state !== me.view.btnChat.pressed)
-                        me.view.turnChat(state);
-                });
-            }
-            me.onChangeProtectSheet();
-            if (me.view) {
-                me.lockToolbar(Common.enumLock.hideComments, !Common.localStorage.getBool(me.view.appPrefix + "settings-livecomment", true), {array: [me.view.btnCommentRemove, me.view.btnCommentResolve]});
-                me.lockToolbar(Common.enumLock['Objects'], !!this._state.wsProps['Objects'], {array: [me.view.btnCommentRemove, me.view.btnCommentResolve]});
-            }
+                if (me.view && me.view.btnChat) {
+                    me.getApplication().getController('LeftMenu').leftMenu.btnChat.on('toggle', function(btn, state){
+                        if (state !== me.view.btnChat.pressed)
+                            me.view.turnChat(state);
+                    });
+                }
+                me.onChangeProtectSheet();
+                if (me.view) {
+                    me.lockToolbar(Common.enumLock.hideComments, !Common.localStorage.getBool(me.appPrefix + "settings-livecomment", true), {array: [me.view.btnCommentRemove, me.view.btnCommentResolve]});
+                    me.lockToolbar(Common.enumLock['Objects'], !!me._state.wsProps['Objects'], {array: [me.view.btnCommentRemove, me.view.btnCommentResolve]});
+                }

-            var val = Common.localStorage.getItem(me.view.appPrefix + "settings-review-hover-mode");
-            if (val === null) {
-                val = me.appConfig.customization && me.appConfig.customization.review ? !!me.appConfig.customization.review.hoverMode : false;
-            } else
-                val = !!parseInt(val);
-            Common.Utils.InternalSettings.set(me.view.appPrefix + "settings-review-hover-mode", val);
-            me.appConfig.reviewHoverMode = val;
+                var val = Common.localStorage.getItem(me.appPrefix + "settings-review-hover-mode");
+                if (val === null) {
+                    val = me.appConfig.customization && me.appConfig.customization.review ? !!me.appConfig.customization.review.hoverMode : false;
+                } else
+                    val = !!parseInt(val);
+                Common.Utils.InternalSettings.set(me.appPrefix + "settings-review-hover-mode", val);
+                me.appConfig.reviewHoverMode = val;
+
+                me.view && me.view.onAppReady(config);
+            });
        },

        applySettings: function(menu) {
-            this.view && this.view.turnSpelling( Common.localStorage.getBool(this.view.appPrefix + "settings-spellcheck", true) );
-            this.view && this.view.turnCoAuthMode( Common.localStorage.getBool(this.view.appPrefix + "settings-coauthmode", true) );
+            this.view && this.view.turnSpelling( Common.localStorage.getBool(this.appPrefix + "settings-spellcheck", true) );
+            this.view && this.view.turnCoAuthMode( Common.localStorage.getBool(this.appPrefix + "settings-coauthmode", true) );
            if ((this.appConfig.canReview || this.appConfig.canViewReview) && this.appConfig.reviewHoverMode)
                this.onApiShowChange();
        },
@ -971,7 +995,8 @@ define([
        },

        onCoAuthoringDisconnect: function() {
-            this.lockToolbar(Common.enumLock.lostConnect, true)
+            this.lockToolbar(Common.enumLock.lostConnect, true);
+            this.dlgChanges && Common.Utils.lockControls(Common.enumLock.lostConnect, true, {array: [this.dlgChanges.btnAccept, this.dlgChanges.btnReject]});
        },

        onUpdateUsers: function() {
@ -995,7 +1020,7 @@ define([

        commentsShowHide: function(mode) {
            if (!this.view) return;
-            var value = Common.Utils.InternalSettings.get(this.view.appPrefix + "settings-livecomment");
+            var value = Common.Utils.InternalSettings.get(this.appPrefix + "settings-livecomment");
            (value!==undefined) && this.lockToolbar(Common.enumLock.hideComments, mode != 'show' && !value, {array: [this.view.btnCommentRemove, this.view.btnCommentResolve]});
        },

@ -1011,6 +1036,38 @@ define([
            this.lockToolbar(Common.enumLock['Objects'], !!this._state.wsProps['Objects'], {array: [this.view.btnCommentRemove, this.view.btnCommentResolve]});
        },

+        onChangeProtectDocument: function(props) {
+            if (!props) {
+                var docprotect = this.getApplication().getController('DocProtection');
+                props = docprotect ? docprotect.getDocProps() : null;
+            }
+            if (props) {
+                this._state.docProtection = props;
+                this.lockToolbar(Common.enumLock.docLockView, props.isReadOnly);
+                this.lockToolbar(Common.enumLock.docLockForms, props.isFormsOnly);
+                this.lockToolbar(Common.enumLock.docLockReview, props.isReviewOnly);
+                this.lockToolbar(Common.enumLock.docLockComments, props.isCommentsOnly);
+                if (this.dlgChanges) {
+                    Common.Utils.lockControls(Common.enumLock.docLockView, props.isReadOnly, {array: [this.dlgChanges.btnAccept, this.dlgChanges.btnReject]});
+                    Common.Utils.lockControls(Common.enumLock.docLockForms, props.isFormsOnly, {array: [this.dlgChanges.btnAccept, this.dlgChanges.btnReject]});
+                    Common.Utils.lockControls(Common.enumLock.docLockReview, props.isReviewOnly, {array: [this.dlgChanges.btnAccept, this.dlgChanges.btnReject]});
+                    Common.Utils.lockControls(Common.enumLock.docLockComments, props.isCommentsOnly, {array: [this.dlgChanges.btnAccept, this.dlgChanges.btnReject]});
+                }
+                if (!this.appConfig.isReviewOnly) {
+                    // protection in document is more important than permissions.review, call asc_SetLocalTrackRevisions even if canReview is false
+                    if (props.isReviewOnly) {
+                        this.api.asc_SetLocalTrackRevisions(true);
+                        this.onApiShowChange();
+                    } else if (this._state.prevReviewProtected) {
+                        this.api.asc_SetLocalTrackRevisions(false);
+                        this.onApiShowChange();
+                    }
+                    this._state.prevReviewProtected = props.isReviewOnly;
+                }
+                this.updatePreviewMode();
+            }
+        },
+
        textInserted: '<b>Inserted:</b>',
        textDeleted: '<b>Deleted:</b>',
        textParaInserted: '<b>Paragraph Inserted</b> ',
--- a/apps/common/main/lib/core/keymaster.js
+++ b/apps/common/main/lib/core/keymaster.js
@ -30,7 +30,8 @@
      '`': 192, '-': 189, '=': 187,
      ';': 186, '\'': 222,
      '[': 219, ']': 221, '\\': 220,
-      'ff-': 173, 'ff=': 61
+      'ff-': 173, 'ff=': 61,
+      numplus: 107, numminus: 109
    },
    code = function(x){
      return _MAP[x] || x.toUpperCase().charCodeAt(0);
--- a/apps/common/main/lib/model/Comment.js
+++ b/apps/common/main/lib/model/Comment.js
@ -82,6 +82,7 @@ define([
            hide                : false,
            filtered            : false,
            hint                : false,
+            fullInfoInHint      : false,
            dummy               : undefined,
            editable            : true,
            removable           : true
--- a/apps/common/main/lib/template/AutoCorrectDialog.template
+++ b/apps/common/main/lib/template/AutoCorrectDialog.template
@ -97,13 +97,43 @@
        </div>
    </div>
 </div>
-<div id="id-autocorrect-dialog-settings-autocorrect" class="settings-panel">
-    <div class="inner-content" style="width: 100%;">
-        <div class="padding-small">
-            <div id="id-autocorrect-dialog-chk-fl-sentence"></div>
-        </div>
-        <div class="padding-small">
-            <div id="id-autocorrect-dialog-chk-fl-cells"></div>
-        </div>
+<div id="id-autocorrect-dialog-settings-exceptions" class="settings-panel">
+    <div class="inner-content">
+        <table cols="1" style="width: 100%;">
+            <tr>
+                <td style="padding-bottom: 12px;">
+                    <div id="auto-correct-exceptions-chk-sentence" style="padding-bottom: 8px;"></div>
+                    <div id="auto-correct-exceptions-chk-cells"></div>
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <label><%= scope.textForLangFL %></label>
+                </td>
+            </tr>
+            <tr>
+                <td style="padding-bottom: 12px;">
+                    <div id="auto-correct-exceptions-lang" style="display: inline-block; margin-right: 15px;vertical-align: middle;"></div>
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <label><%= scope.textFLDont %></label>
+                    <div id="auto-correct-exceptions-find" style="height:22px;width: 100%;margin-bottom: 4px;"></div>
+                </td>
+            </tr>
+            <tr>
+                <td style="padding-bottom: 8px;">
+                    <div id="auto-correct-exceptions-list" class="" style="width:100%; height: 139px;"></div>
+                </td>
+            </tr>
+            <tr>
+                <td style="padding-bottom: 18px;">
+                    <button type="button" class="btn btn-text-default auto" id="auto-correct-btn-exceptions-reset" style="min-width: 86px;"><%= scope.textResetAll %></button>
+                    <button type="button" class="btn btn-text-default auto" id="auto-correct-btn-exceptions-delete" style="min-width: 86px;float: right;"><%= scope.textDelete %></button>
+                    <button type="button" class="btn btn-text-default auto" id="auto-correct-btn-exceptions-edit" style="min-width: 86px;float: right;margin-right:5px;"><%= scope.textAdd %></button>
+                </td>
+            </tr>
+        </table>
    </div>
 </div>
--- a/apps/common/main/lib/template/CommentsPanel.template
+++ b/apps/common/main/lib/template/CommentsPanel.template
@ -12,7 +12,7 @@
    </div>
    <div id="comments-header" class="">
        <label><%=textComments%></label>
-        <div id="comments-btn-close" style="float:right;margin-left: 4px;"></div>
-        <div id="comments-btn-sort" style="float:right;"></div>
+        <div id="comments-btn-close"></div>
+        <div id="comments-btn-sort"></div>
    </div>
 </div>
--- a/apps/common/main/lib/template/CommentsPopover.template
+++ b/apps/common/main/lib/template/CommentsPopover.template
@ -7,11 +7,11 @@
        <div class="color" style="display: inline-block; background-color: <% if (usercolor!==null) { %><%=usercolor%><% } else { %> #cfcfcf <% } %>; " ></div><%= scope.getEncodedName(parsedName) %>
    </div>
    <div class="user-date"><%=date%></div>
-    <% if (!editTextInPopover || hint || scope.viewmode) { %>
+    <% if (!editTextInPopover || (hint && !fullInfoInHint) || scope.viewmode) { %>
        <div oo_editor_input="true" tabindex="-1" class="user-message user-select"><%=scope.pickLink(comment)%></div>
    <% } else { %>
        <div class="inner-edit-ct">
-            <textarea class="msg-reply user-select" maxlength="maxCommLength" spellcheck="false" <% if (!!dummy) { %> placeholder="textMention"<% } %>><%=comment%></textarea>
+            <textarea class="msg-reply user-select" maxlength="maxCommLength" spellcheck="false" <% if (!!dummy) { %> placeholder="textMentionComment"<% } %>><%=comment%></textarea>
            <% if (hideAddReply) { %>
                <button class="btn normal dlg-btn primary btn-inner-edit" id="id-comments-change-popover">textAdd</button>
            <% } else { %>
@ -37,7 +37,7 @@
                <div class="user-date"><%=item.get("date")%></div>
                <% if (!item.get("editTextInPopover")) { %>
                    <div oo_editor_input="true" tabindex="-1" class="user-message user-select"><%=scope.pickLink(item.get("reply"))%></div>
-                    <% if (!hint && !scope.viewmode) { %>
+                    <% if ((fullInfoInHint || !hint) && !scope.viewmode) { %>
                        <div class="btns-reply-ct">
                            <% if (item.get("editable")) { %>
                                <div class="btn-edit img-commonctrl" data-value="<%=item.get("id")%>"></div>
@ -61,7 +61,7 @@

    <!-- add reply button -->

-    <% if (!showReplyInPopover && !hideAddReply && !hint && !scope.viewmode) { %>
+    <% if (!showReplyInPopover && !hideAddReply && (fullInfoInHint || !hint) && !scope.viewmode) { %>
        <% if (replys.length && !add_arrow) { %>
            <label class="user-reply" style="margin-left: 20px; margin-top: 5px;" role="presentation" tabindex="-1">textAddReply</label>
        <% } else { %>
@ -73,7 +73,7 @@

    <% if (!editTextInPopover && !lock) { %>
        <div class="edit-ct">
-            <% if (!hint && !scope.viewmode) { %>
+            <% if ((fullInfoInHint || !hint) && !scope.viewmode) { %>
                <% if (editable) { %>
                    <div class="btn-edit img-commonctrl"></div>
                <% } %>
@ -81,9 +81,9 @@
                    <div class="btn-delete img-commonctrl"></div>
                <% } %>
            <% } %>
-            <% if (editable && !hint && !scope.viewmode) { %>
+            <% if (editable && (fullInfoInHint || !hint) && !scope.viewmode) { %>
                <div class="btn-resolve <% if (resolved) print('comment-resolved') %>" data-toggle="tooltip"></div>
-            <% } else if (!hint && (!editable || scope.viewmode) && resolved) { %>
+            <% } else if ((fullInfoInHint || !hint) && (!editable || scope.viewmode) && resolved) { %>
                <div class="icon-resolve i-comment-resolved" data-toggle="tooltip"></div>
            <% } %>
        </div>
@ -93,7 +93,7 @@

    <% if (showReplyInPopover) { %>
        <div class="reply-ct">
-            <textarea class="msg-reply user-select" placeholder="textAddReply" maxlength="maxCommLength" spellcheck="false"></textarea>
+            <textarea class="msg-reply user-select" placeholder="textMentionReply" maxlength="maxCommLength" spellcheck="false"></textarea>
            <button class="btn normal dlg-btn primary btn-reply" id="id-comments-change-popover">textReply</button>
            <button class="btn normal dlg-btn btn-close">textClose</button>
        </div>
--- a/apps/common/main/lib/template/ExtendedColorDialog.template
+++ b/apps/common/main/lib/template/ExtendedColorDialog.template
@ -2,7 +2,7 @@
    <div id="id-hsb-colorpicker" style="vertical-align:top;">
    </div>
    <div class="color-info" style="">
-        <div style="margin-left:15px;">
+        <div class="color-preview">
            <label class="color-label"><%= txtNew %></label>
            <div id="field-new-color" class="color-cnt top"></div>
            <div id="field-start-color" class="color-cnt bottom"></div>
--- a/apps/common/main/lib/template/ReviewChangesPopover.template
+++ b/apps/common/main/lib/template/ReviewChangesPopover.template
@ -9,7 +9,7 @@
        <div class="btn-goto img-commonctrl"></div>
        <% } %>
        <% if (!hint) { %>
-            <% if (scope.appConfig.isReviewOnly) { %>
+            <% if (scope.appConfig.isReviewOnly || docProtection.isReviewOnly) { %>
                <% if (editable) { %>
                <div class="btn-delete img-commonctrl"></div>
                <% } %>
--- a/apps/common/main/lib/template/SearchPanel.template
+++ b/apps/common/main/lib/template/SearchPanel.template
@ -3,6 +3,7 @@
        <label id="search-adv-title"></label>
        <div id="search-btn-close"></div>
    </div>
+    <div id="search-container">
    <div id="search-adv-settings">
        <table cols="1">
            <tbody>
@ -60,4 +61,5 @@
    </div>
    <div id="search-results" class="ps-container oo">
    </div>
+    </div>
 </div>
--- a/apps/common/main/lib/util/define.js
+++ b/apps/common/main/lib/util/define.js
--- a/apps/common/main/lib/util/htmlutils.js
+++ b/apps/common/main/lib/util/htmlutils.js
@ -1,3 +1,17 @@
+var checkLocalStorage = (function () {
+    try {
+        var storage = window['localStorage'];
+        return true;
+    }
+    catch(e) {
+        return false;
+    }
+})();
+
+if ( checkLocalStorage && localStorage.getItem("ui-rtl") === '1' ) {
+    document.body.setAttribute('dir', 'rtl');
+    document.body.classList.add('rtl');
+}

 function checkScaling() {
    var matches = {
@ -42,16 +56,6 @@ var params = (function() {
    return urlParams;
 })();

-var checkLocalStorage = (function () {
-    try {
-        var storage = window['localStorage'];
-        return true;
-    }
-    catch(e) {
-        return false;
-    }
-})();
-
 if ( window.desktop ) {
    var theme = desktop.theme

@ -68,6 +72,7 @@ if ( window.desktop ) {
                delete params.uitheme;
            } else {
                localStorage.setItem("ui-theme-id", theme.id);
+                localStorage.removeItem("ui-theme-use-system");
            }

            localStorage.removeItem("ui-theme");
--- a/apps/common/main/lib/util/utils.js
+++ b/apps/common/main/lib/util/utils.js
@ -1095,4 +1095,13 @@ Common.Utils.getKeyByValue = function(obj, value) {
                return prop;
        }
    }
+};
+
+Common.UI.isRTL = function () {
+    if ( window.isrtl == undefined ) {
+        window.isrtl = Common.localStorage.itemExists('ui-rtl') ?
+                            Common.localStorage.getBool("ui-rtl") : Common.Locale.isCurrentLanguageRtl();
+    }
+
+    return window.isrtl;
 };
--- a/apps/common/main/lib/view/AutoCorrectDialog.js
+++ b/apps/common/main/lib/view/AutoCorrectDialog.js
@ -47,6 +47,8 @@ define([ 'text!common/main/lib/template/AutoCorrectDialog.template',
 ], function (contentTemplate) { 'use strict';
    var _mathStore = new Common.UI.DataViewStore();
    var _functionsStore = new Common.UI.DataViewStore();
+    var _exciptionsStore = new Common.UI.DataViewStore();
+    var _exciptionsLangs = [0x0409, 0x0419];

    Common.Views.AutoCorrectDialog = Common.Views.AdvancedSettingsWindow.extend(_.extend({
        options: {
@ -57,7 +59,8 @@ define([ 'text!common/main/lib/template/AutoCorrectDialog.template',
        },

        initialize : function(options) {
-            var filter = Common.localStorage.getKeysFilter();
+            var filter = Common.localStorage.getKeysFilter(),
+                me = this;
            this.appPrefix = (filter && filter.length) ? filter.split(',')[0] : '';

            var items = [
@ -66,7 +69,7 @@ define([ 'text!common/main/lib/template/AutoCorrectDialog.template',
            ];
            if (this.appPrefix=='de-' || this.appPrefix=='pe-') {
                items.push({panelId: 'id-autocorrect-dialog-settings-de-autoformat',  panelCaption: this.textAutoFormat});
-                items.push({panelId: 'id-autocorrect-dialog-settings-autocorrect',  panelCaption: this.textAutoCorrect});
+                items.push({panelId: 'id-autocorrect-dialog-settings-exceptions',  panelCaption: this.textAutoCorrect});

            } else if (this.appPrefix=='sse-')
                items.push({panelId: 'id-autocorrect-dialog-settings-sse-autoformat',  panelCaption: this.textAutoFormat});
@ -105,6 +108,19 @@ define([ 'text!common/main/lib/template/AutoCorrectDialog.template',
            this.arrAddRec = value ? JSON.parse(value) : [];
            value = Common.Utils.InternalSettings.get(path + "-rem");
            this.arrRemRec = value ? JSON.parse(value) : [];
+
+            this.arrAddExceptions = {};
+            this.arrRemExceptions = {};
+            _exciptionsLangs.forEach(function(lang) {
+                path = me.appPrefix + "settings-letter-exception";
+                
+                value = Common.Utils.InternalSettings.get(path + "-add-" + lang);
+                me.arrAddExceptions[lang] = value ? JSON.parse(value) : [];
+
+                value = Common.Utils.InternalSettings.get(path + "-rem-" + lang);
+                me.arrRemExceptions[lang] = value ? JSON.parse(value) : [];
+            });
+
            Common.Views.AdvancedSettingsWindow.prototype.initialize.call(this, this.options);
        },

@ -335,27 +351,121 @@ define([ 'text!common/main/lib/template/AutoCorrectDialog.template',
                    Common.Utils.InternalSettings.set(me.appPrefix + "settings-autoformat-double-space", checked);
                    me.api.asc_SetAutoCorrectDoubleSpaceWithPeriod(checked);
                });
+
+
                // AutoCorrect
-                this.chFLSentence = new Common.UI.CheckBox({
-                    el: $window.find('#id-autocorrect-dialog-chk-fl-sentence'),
+                var exciptionsActiveLang = Common.Utils.InternalSettings.get('settings-letter-exception-lang');
+                this.exceptionsLangCmb = new Common.UI.ComboBox({
+                    el          : $window.find('#auto-correct-exceptions-lang'),
+                    style       : 'width: 145px;',
+                    menuStyle   : 'min-width:100%;',
+                    editable    : false,
+                    takeFocusOnClose : true,
+                    menuCls     : 'menu-aligned',
+                    cls         : 'input-group-nr',
+                    dataHintDirection: 'bottom',
+                    data        : _exciptionsLangs.map(function(lang){
+                        var langName = Common.util.LanguageInfo.getLocalLanguageName(lang);
+                        return { 
+                            displayValue: langName[1], 
+                            shortName: langName[0],
+                            value: lang
+                        };
+                    })
+                }).on('selected', function(combo, record) {
+                    if(exciptionsActiveLang != record.value) {
+                        exciptionsActiveLang = record.value;
+                        Common.Utils.InternalSettings.set('settings-letter-exception-lang', exciptionsActiveLang);
+                        me.onInitExceptionsList(true);
+                        me.onChangeInputException(me.exceptionsFindInput, me.exceptionsFindInput.getValue());
+                    }
+                });
+
+                if(!exciptionsActiveLang) {
+                    var curLangObj = this.exceptionsLangCmb.store.findWhere({value: this.api.asc_getDefaultLanguage()});
+                    if (!curLangObj) {
+                        var nameLang = Common.util.LanguageInfo.getLocalLanguageName(this.api.asc_getDefaultLanguage())[0].split(/[\-\_]/)[0];
+                        curLangObj = this.exceptionsLangCmb.store.find(function(lang){
+                            return lang.get('shortName').indexOf(nameLang)==0;
+                        });
+                    }
+                    if(curLangObj) exciptionsActiveLang = curLangObj.get('value');
+                }
+                this.exceptionsLangCmb.setValue(exciptionsActiveLang ? exciptionsActiveLang : _exciptionsLangs[0]);
+
+                this.onInitExceptionsList(true);
+                this.exceptionsList = new Common.UI.ListView({
+                    el: $window.find('#auto-correct-exceptions-list'),
+                    store: new Common.UI.DataViewStore(_exciptionsStore.slice(0, 6)),
+                    simpleAddMode: false,
+                    template: _.template(['<div class="listview inner" style=""></div>'].join('')),
+                    itemTemplate: _.template([
+                        '<div id="<%= id %>" class="list-item" style="width: 340px;text-overflow: ellipsis;overflow: hidden;<% if (defaultDisabled) { %> font-style:italic; opacity: 0.5;<% } %>"><%= value + "."%></div>'
+                    ].join('')),
+                    scrollAlwaysVisible: true,
+                    tabindex: 1
+                });
+                this.exceptionsList.on('item:select', _.bind(this.onSelectExceptionItem, this));
+
+
+                this.exceptionsFindInput = new Common.UI.InputField({
+                    el               : $window.find('#auto-correct-exceptions-find'),
+                    allowBlank       : true,
+                    validateOnChange : true,
+                    maxLength        : 255,
+                    validation       : function () { return true; }
+                }).on ('changing', _.bind(this.onChangeInputException, this));
+    
+                this.exceptionsFindInput.cmpEl.find('input').on('keydown', function(event){
+                    if (event.key == 'ArrowDown') {
+                        var _selectedItem = me.exceptionsList.getSelectedRec() || me.exceptionsList.store.at(0);
+                        if (_selectedItem) {
+                            me.exceptionsList.selectRecord(_selectedItem);
+                            me.exceptionsList.scrollToRecord(_selectedItem);
+                        }
+                        _.delay(function(){
+                            me.exceptionsList.focus();
+                        },10);
+    
+                    }
+                });
+
+                this.btnResetExceptions = new Common.UI.Button({
+                    el: $window.find('#auto-correct-btn-exceptions-reset')
+                });
+                this.btnResetExceptions.on('click', _.bind(this.onResetExceptionsToDefault, this));
+    
+                this.btnAddExceptions = new Common.UI.Button({
+                    el: $window.find('#auto-correct-btn-exceptions-edit')
+                });
+                this.btnAddExceptions.on('click', _.bind(this.onAddException, this, false));
+    
+                this.btnDeleteExceptions = new Common.UI.Button({
+                    el: $window.find('#auto-correct-btn-exceptions-delete')
+                });
+                this.btnDeleteExceptions.on('click', _.bind(this.onDeleteException, this, false));
+
+                
+                this.chkSentenceExceptions = new Common.UI.CheckBox({
+                    el: $window.find('#auto-correct-exceptions-chk-sentence'),
                    labelText: this.textFLSentence,
-                    value: Common.Utils.InternalSettings.get(this.appPrefix + "settings-autoformat-fl-sentence")
+                    value: Common.Utils.InternalSettings.get(this.appPrefix + "settings-letter-exception-sentence")
                }).on('change', function(field, newValue, oldValue, eOpts){
                    var checked = (field.getValue()==='checked');
-                    Common.localStorage.setBool(me.appPrefix + "settings-autoformat-fl-sentence", checked);
-                    Common.Utils.InternalSettings.set(me.appPrefix + "settings-autoformat-fl-sentence", checked);
+                    Common.localStorage.setBool(me.appPrefix + "settings-letter-exception-sentence", checked);
+                    Common.Utils.InternalSettings.set(me.appPrefix + "settings-letter-exception-sentence", checked);
                    me.api.asc_SetAutoCorrectFirstLetterOfSentences && me.api.asc_SetAutoCorrectFirstLetterOfSentences(checked);
                });

-                this.chFLCells = new Common.UI.CheckBox({
-                    el: $window.find('#id-autocorrect-dialog-chk-fl-cells'),
+                this.chkSentenceCells = new Common.UI.CheckBox({
+                    el: $window.find('#auto-correct-exceptions-chk-cells'),
                    labelText: this.textFLCells,
-                    value: Common.Utils.InternalSettings.get(this.appPrefix + "settings-autoformat-fl-cells")
+                    value: Common.Utils.InternalSettings.get(this.appPrefix + "settings-letter-exception-cells")
                }).on('change', function(field, newValue, oldValue, eOpts){
                    var checked = (field.getValue()==='checked');
-                    Common.localStorage.setBool(me.appPrefix + "settings-autoformat-fl-cells", checked);
-                    Common.Utils.InternalSettings.set(me.appPrefix + "settings-autoformat-fl-cells", checked);
-                    me.api.asc_SetAutoCorrectFirstLetterOfCells && me.api.asc_SetAutoCorrectFirstLetterOfCells(checked);
+                    Common.localStorage.setBool(me.appPrefix + "settings-letter-exception-cells", checked);
+                    Common.Utils.InternalSettings.set(me.appPrefix + "settings-letter-exception-cells", checked);
+                    me.api.asc_SetAutoCorrectFirstLetterOfSentences && me.api.asc_SetAutoCorrectFirstLetterOfSentences(checked);
                });

                this.btnsCategory[3].on('click', _.bind(this.onAutocorrectCategoryClick, this, false));
@ -392,6 +502,7 @@ define([ 'text!common/main/lib/template/AutoCorrectDialog.template',
        afterRender: function() {
            this.updateControls();
            this.updateRecControls();
+            this.updateExceptionsControls();
            if (this.storageName) {
                var value = Common.localStorage.getItem(this.storageName);
                this.setActiveCategory((value!==null) ? parseInt(value) : 0);
@ -402,10 +513,9 @@ define([ 'text!common/main/lib/template/AutoCorrectDialog.template',
            var arr = [
                    this.chReplaceType, this.inputReplace, this.inputBy, this.mathList, this.btnReset, this.btnEdit, this.btnDelete, // 0 tab
                    this.inputRecFind, this.mathRecList, this.btnResetRec, this.btnAddRec, this.btnDeleteRec, // 1 tab
-                    this.chHyperlink // 2 tab
                ];
-            arr = arr.concat(this.chNewRows ? [this.chNewRows] : [this.chQuotes, this.chHyphens, this.chBulleted, this.chNumbered]);
-            arr = arr.concat(this.chFLSentence ? [this.chFLSentence, this.chFLCells] : []);
+            arr = arr.concat(this.chNewRows ? [this.chHyperlink, this.chNewRows] : [this.chQuotes, this.chHyphens, this.chHyperlink, this.chDoubleSpaces, this.chBulleted, this.chNumbered]);
+            arr = arr.concat(this.chkSentenceExceptions ? [this.chkSentenceExceptions, this.chkSentenceCells, this.exceptionsLangCmb, this.exceptionsFindInput, this.exceptionsList, this.btnResetExceptions, this.btnAddExceptions, this.btnDeleteExceptions] : []);
            return arr;
        },

@ -481,30 +591,45 @@ define([ 'text!common/main/lib/template/AutoCorrectDialog.template',
        onAutocorrectCategoryClick: function(delay) {
            var me = this;
            _.delay(function(){
-                me.chFLSentence.focus();
+                $('input', me.exceptionsFindInput.cmpEl).select().focus();
            },delay ? 50 : 0);
+
+            if (me.exceptionsList.store.length < _exciptionsStore.length) {
+                _.delay(function(){
+                    me.exceptionsList.setStore(_exciptionsStore);
+                    me.exceptionsList.onResetItems();
+                },delay ? 100 : 10);
+            }
        },

        onDelete: function() {
            var rec = this.mathList.getSelectedRec();
+            var path = '';
+            var val;
            if (rec) {
                if (rec.get('defaultValue')) {
-                    var path = this.appPrefix + "settings-math-correct-rem";
+                    path = this.appPrefix + "settings-math-correct-rem";
                    var disabled = !rec.get('defaultDisabled');
                    rec.set('defaultDisabled', disabled);
                    if (disabled)
                        this.arrRem.push(rec.get('replaced'));
                    else
                        this.arrRem.splice(this.arrRem.indexOf(rec.get('replaced')), 1);
-                    var val = JSON.stringify(this.arrRem);
+                    val = JSON.stringify(this.arrRem);
                    Common.Utils.InternalSettings.set(path, val);
                    Common.localStorage.setItem(path, val);
                    this.btnDelete.setCaption(disabled ? this.textRestore : this.textDelete);
                    disabled ? this.api.asc_deleteFromAutoCorrectMathSymbols(rec.get('replaced')) : this.api.asc_AddOrEditFromAutoCorrectMathSymbols(rec.get('replaced'), rec.get('defaultValue'));
                } else {
                    _mathStore.remove(rec);
+
+                    this.arrAdd.splice(this.arrAdd.indexOf(rec.get('replaced')), 1);
+                    path = this.appPrefix + "settings-math-correct-add";
+                    val = JSON.stringify(this.arrAdd);
+                    Common.Utils.InternalSettings.set(path, val);
+                    Common.localStorage.setItem(path, val);
                    this.mathList.scroller && this.mathList.scroller.update({});
-                    this.api.asc_deleteFromAutoCorrectMathSymbols(rec.get('replaced'));
+                    this.api.asc_deleteFromAutoCorrectMathSymbols(rec.get('replaced'));   
                }
                this.updateControls();
            }
@ -746,22 +871,30 @@ define([ 'text!common/main/lib/template/AutoCorrectDialog.template',

        onDeleteRec: function() {
            var rec = this.mathRecList.getSelectedRec();
+            var path;
+            var val;
            if (rec) {
                if (rec.get('defaultValue')) {
-                    var path = this.appPrefix + "settings-rec-functions-rem";
+                    path = this.appPrefix + "settings-rec-functions-rem";
                    var disabled = !rec.get('defaultDisabled');
                    rec.set('defaultDisabled', disabled);
                    if (disabled)
                        this.arrRemRec.push(rec.get('value'));
                    else
                        this.arrRemRec.splice(this.arrRemRec.indexOf(rec.get('value')), 1);
-                    var val = JSON.stringify(this.arrRemRec);
+                    val = JSON.stringify(this.arrRemRec);
                    Common.Utils.InternalSettings.set(path, val);
                    Common.localStorage.setItem(path, val);
                    this.btnDeleteRec.setCaption(disabled ? this.textRestore : this.textDelete);
                    disabled ? this.api.asc_deleteFromAutoCorrectMathFunctions(rec.get('value')) : this.api.asc_AddFromAutoCorrectMathFunctions(rec.get('value'));
                } else {
                    _functionsStore.remove(rec);
+
+                    this.arrAddRec.splice(this.arrAddRec.indexOf(rec.get('value')), 1);
+                    path = this.appPrefix + "settings-rec-functions-add";
+                    val = JSON.stringify(this.arrAddRec);
+                    Common.Utils.InternalSettings.set(path, val);
+                    Common.localStorage.setItem(path, val);
                    this.mathRecList.scroller && this.mathRecList.scroller.update({});
                    this.api.asc_deleteFromAutoCorrectMathFunctions(rec.get('value'));
                }
@ -822,6 +955,204 @@ define([ 'text!common/main/lib/template/AutoCorrectDialog.template',
            this.btnAddRec.setDisabled(!!rec || !value);
        },

+        onInitExceptionsList: function(overrideNotEmptyStore) {
+            if (_exciptionsStore.length>0 && !overrideNotEmptyStore) return;
+
+            _exciptionsStore.comparator = function(item1, item2) {
+                var n1 = item1.get('value').toLowerCase(),
+                    n2 = item2.get('value').toLowerCase();
+                if (n1==n2) return 0;
+                return (n1<n2) ? -1 : 1;
+            };
+            var activeLang = this.exceptionsLangCmb.getValue(),
+                arrAdd = this.arrAddExceptions[activeLang] ? this.arrAddExceptions[activeLang] : [],
+                arrRem = this.arrRemExceptions[activeLang] ? this.arrRemExceptions[activeLang] : [];
+
+            var arr = (this.api) ? this.api.asc_GetAutoCorrectSettings().get_FirstLetterExceptionManager()
+                                   .get_DefaultExceptions(activeLang) : [],
+                data = [];
+            _.each(arr, function(item, index){
+                data.push({
+                    value: item,
+                    defaultValue: true,
+                    defaultDisabled: arrRem.indexOf(item)>-1
+                });
+            });
+
+            var dataAdd = [];
+            _.each(arrAdd, function(item, index){
+                if (_.findIndex(data, {value: item})<0) {
+                    dataAdd.push({
+                        value: item,
+                        defaultValue: false,
+                        defaultDisabled: false
+                    });
+                }
+            });
+            _exciptionsStore.reset(data.concat(dataAdd));
+            this.updateExceptionsControls();
+        },
+
+        onResetExceptionsToDefault: function() {
+            var apiFlManager = this.api.asc_GetAutoCorrectSettings().get_FirstLetterExceptionManager();
+            var activeLang = this.exceptionsLangCmb.getValue();
+
+            Common.UI.warning({
+                maxwidth: 500,
+                msg: this.textWarnResetFL,
+                buttons: ['yes', 'no'],
+                primary: 'yes',
+                callback: _.bind(function(btn, dontshow){
+                    if (btn == 'yes') {
+                        apiFlManager.put_Exceptions(apiFlManager.get_DefaultExceptions(activeLang), activeLang);
+                        this.onResetExceptionsList();
+                    }
+                }, this)
+            });
+        },
+
+        onResetExceptionsList: function() {
+            var path = this.appPrefix + "settings-letter-exception";
+            var activeLang = this.exceptionsLangCmb.getValue();
+            var val = JSON.stringify([]);
+            Common.Utils.InternalSettings.set(path + "-add-" + activeLang, val);
+            Common.localStorage.setItem(path + "-add-" + activeLang, val);
+            Common.Utils.InternalSettings.set(path + "-rem-" + activeLang, val);
+            Common.localStorage.setItem(path + "-rem-" + activeLang, val);
+
+            this.arrAddExceptions[activeLang] = [];
+            this.arrRemExceptions[activeLang] = [];
+
+            _exciptionsStore.remove(_exciptionsStore.where({defaultValue: false}));
+            _exciptionsStore.each(function(item, index){
+                item.set('defaultDisabled', false);
+            });
+            this.exceptionsList.deselectAll();
+            if (this.exceptionsList.scroller) {
+                this.exceptionsList.scroller.update();
+                this.exceptionsList.scroller.scrollTop(0);
+            }
+            this.updateExceptionsControls();
+        },
+        
+        onDeleteException: function() {
+            var rec = this.exceptionsList.getSelectedRec();
+            var apiFlManager = this.api.asc_GetAutoCorrectSettings().get_FirstLetterExceptionManager();
+            var activeLang = this.exceptionsLangCmb.getValue();
+            if (rec) {
+                var val;
+                var path = '';
+                if (rec.get('defaultValue')) {
+                    var disabled = !rec.get('defaultDisabled');
+                    path = this.appPrefix + "settings-letter-exception-rem-" + activeLang;
+                    rec.set('defaultDisabled', disabled);
+                    if (disabled)
+                        this.arrRemExceptions[activeLang].push(rec.get('value'));
+                    else
+                        this.arrRemExceptions[activeLang].splice(this.arrRemExceptions[activeLang].indexOf(rec.get('value')), 1);
+                    
+                    val = JSON.stringify(this.arrRemExceptions[activeLang]);
+                    Common.Utils.InternalSettings.set(path, val);
+                    Common.localStorage.setItem(path, val);
+                    this.btnDeleteExceptions.setCaption(disabled ? this.textRestore : this.textDelete);
+                    disabled ? apiFlManager.remove_Exception(rec.get('value'), activeLang) : apiFlManager.add_Exception(rec.get('value'), activeLang);
+                } else {
+                    _exciptionsStore.remove(rec);
+                    
+                    this.arrAddExceptions[activeLang].splice(this.arrAddExceptions[activeLang].indexOf(rec.get('value')), 1);
+                    path = this.appPrefix + "settings-letter-exception-add-" + activeLang;
+                    val = JSON.stringify(this.arrAddExceptions[activeLang]);
+                    Common.Utils.InternalSettings.set(path, val);
+                    Common.localStorage.setItem(path, val);
+                    this.exceptionsList.scroller && this.exceptionsList.scroller.update({});
+                    apiFlManager.remove_Exception(rec.get('value'), activeLang);
+                }
+                this.updateExceptionsControls();
+            }
+        },
+
+        onAddException: function() {
+            var rec = this.exceptionsList.getSelectedRec(),
+                activeLang = this.exceptionsLangCmb.getValue(),
+                me = this,
+                value = this.exceptionsFindInput.getValue().trim(),
+                applySettings = function(record) {
+                    var path = me.appPrefix + "settings-letter-exception-add-" + activeLang;
+                    var val = JSON.stringify(me.arrAddExceptions[activeLang]);
+                    Common.Utils.InternalSettings.set(path, val);
+                    Common.localStorage.setItem(path, val);
+                    me.api.asc_GetAutoCorrectSettings().get_FirstLetterExceptionManager().add_Exception(record.get('value') ,activeLang);
+                    me.exceptionsList.selectRecord(record);
+                    me.exceptionsList.scrollToRecord(record);
+                };
+            if (!rec) {
+                rec = _exciptionsStore.findWhere({value: value})
+            }
+            if (!rec) {
+                if(value[value.length-1] === '.')
+                    value = value.slice(0, -1);
+                if (/^[^\%/\\&\?\,\.\s\d\'\;:!-+!@#\$\^*)(]{1,20}$/.test(value)) {
+                    rec = _exciptionsStore.add({
+                        value: value,
+                        defaultValue: false,
+                        defaultDisabled: false
+                    });
+                    this.arrAddExceptions[activeLang].push(rec.get('value'));
+                    applySettings(rec);
+                } else
+                    Common.UI.warning({
+                        maxwidth: 500,
+                        msg: this.textWarnAddFL
+                    });
+            } else {
+                me.exceptionsList.selectRecord(rec);
+                me.exceptionsList.scrollToRecord(rec);
+            }
+        },
+
+        onSelectExceptionItem: function(lisvView, itemView, record) {
+            if (record) {
+                this.exceptionsFindInput.setValue(record.get('value'));
+            }
+            this.updateExceptionsControls(record);
+        },
+
+        onChangeInputException: function (input, value) {
+            var _selectedItem;
+            value = value.trim();
+            if (value.length) {
+                if(value[value.length-1] === '.')
+                    value = value.slice(0, -1);
+
+                var store = this.exceptionsList.store;
+                _selectedItem = store.find(function(item) {
+                    if ( item.get('value').indexOf(value) == 0) {
+                        return true;
+                    }
+                });
+                if (_selectedItem) {
+                    this.exceptionsList.scrollToRecord(_selectedItem, true);
+                    if (_selectedItem.get('value') == value)
+                        this.exceptionsList.selectRecord(_selectedItem, true);
+                    else
+                        _selectedItem = null;
+                }
+            }
+            (!_selectedItem) && this.exceptionsList.deselectAll();
+            this.updateExceptionsControls(_selectedItem);
+        },
+
+        updateExceptionsControls: function(rec) {
+            if (!this.exceptionsList) return;
+
+            rec = rec || this.exceptionsList.getSelectedRec();
+            var value = this.exceptionsFindInput.getValue();
+
+            this.btnDeleteExceptions.setCaption(rec && rec.get('defaultDisabled') ? this.textRestore : this.textDelete);
+            this.btnDeleteExceptions.setDisabled(!rec);
+            this.btnAddExceptions.setDisabled(!!rec || !value);
+        },
+
        textTitle: 'AutoCorrect',
        textMathCorrect: 'Math AutoCorrect',
        textReplace: 'Replace',
@ -850,8 +1181,12 @@ define([ 'text!common/main/lib/template/AutoCorrectDialog.template',
        textNewRowCol: 'Include new rows and columns in table',
        textAutoCorrect: 'AutoCorrect',
        textFLSentence: 'Capitalize first letter of sentences',
+        textWarnResetFL: 'Any exceptions you added will be removed and the removed ones will be restored. Do you want to continue?',
+        textWarnAddFL: 'Exceptions must contain only the letters, uppercase or lowercase.',
+        textForLangFL: 'Exceptions for the language:',
        textHyperlink: 'Internet and network paths with hyperlinks',
        textFLCells: 'Capitalize first letter of table cells',
+        textFLDont: 'Don`t capitalize after',
        textDoubleSpaces: 'Add period with double-space'

    }, Common.Views.AutoCorrectDialog || {}))
--- a/apps/common/main/lib/view/Chat.js
+++ b/apps/common/main/lib/view/Chat.js
@ -336,9 +336,24 @@ define([
            // text box setup autosize input text

            this.setupAutoSizingTextBox();
-            this.txtMessage.bind('input propertychange',  _.bind(this.updateHeightTextBox, this));
+            this.disableTextBoxButton($(this.txtMessage));
+            this.txtMessage.bind('input propertychange',  _.bind(this.onTextareaInput, this));
        },
+        onTextareaInput: function(event) {
+            this.updateHeightTextBox(event);
+            this.disableTextBoxButton($(event.target));
+        },
+        disableTextBoxButton: function(textboxEl) {
+            var button = $(textboxEl.siblings('#chat-msg-btn-add')[0]);

+            if(textboxEl.val().trim().length > 0) {
+                button.removeAttr('disabled');
+                button.removeClass('disabled');
+            } else {
+                button.attr('disabled', true);
+                button.addClass('disabled');
+            }
+        },
        updateLayout: function (applyUsersAutoSizig) {
            var me = this;
            var height = this.panelBox.height();
--- a/apps/common/main/lib/view/Comments.js
+++ b/apps/common/main/lib/view/Comments.js
@ -98,6 +98,17 @@ define([
                var text = $(this.el).find('textarea');
                return (text && text.length) ? text.val().trim() : '';
            },
+            disableTextBoxButton: function(textboxEl) {
+                var button = $(textboxEl.siblings('#id-comments-change')[0]);
+
+                if(textboxEl.val().trim().length > 0) {
+                    button.removeAttr('disabled');
+                    button.removeClass('disabled');
+                } else {
+                    button.attr('disabled', true);
+                    button.addClass('disabled');
+                }
+            },
            autoHeightTextBox: function () {
                var view = this,
                    textBox = $(this.el).find('textarea'),
@ -127,13 +138,19 @@ define([
                    view.autoScrollToEditButtons();
                }

+                function onTextareaInput(event) {
+                    updateTextBoxHeight();
+                    view.disableTextBoxButton($(event.target));
+                }
+
                if (textBox && textBox.length) {
                    domTextBox = textBox.get(0);

+                    view.disableTextBoxButton(textBox);
                    if (domTextBox) {
                        lineHeight = parseInt(textBox.css('lineHeight'), 10) * 0.25;
                        updateTextBoxHeight();
-                        textBox.bind('input propertychange', updateTextBoxHeight)
+                        textBox.bind('input propertychange', onTextareaInput)
                    }
                }

@ -171,7 +188,7 @@ define([

        addCommentHeight: 45,
        newCommentHeight: 110,
-        textBoxAutoSizeLocked: undefined, // disable autosize textbox
+        textBoxAutoSizeLocked: undefined, // disable autoHeightTextBoxsize textbox
        viewmode: false,

        _commentsViewOnItemClick: function (picker, item, record, e) {
@ -694,7 +711,17 @@ define([
                this.layout.setResizeValue(0, container.height() - this.addCommentHeight);
            }
        },
+        disableTextBoxButton: function(textboxEl) {
+            var button = $(textboxEl.parent().siblings('.add')[0]);

+            if(textboxEl.val().trim().length > 0) {
+                button.removeAttr('disabled');
+                button.removeClass('disabled');
+            } else {
+                button.attr('disabled', true);
+                button.addClass('disabled');
+            }
+        },
        autoHeightTextBox: function () {
            var me = this, domTextBox = null, lineHeight = 0, minHeight = 44;
            var textBox = $('#comment-msg-new', this.el);
@ -736,9 +763,15 @@ define([
                        Math.min(height - contentHeight - textBoxMinHeightIndent, height - me.newCommentHeight)));
            }

+            function onTextareaInput(event) {
+                updateTextBoxHeight();
+                me.disableTextBoxButton($(event.target));
+            }
+
+            me.disableTextBoxButton(textBox);
            lineHeight = parseInt(textBox.css('lineHeight'), 10) * 0.25;
            updateTextBoxHeight();
-            textBox.bind('input propertychange', updateTextBoxHeight);
+            textBox.bind('input propertychange', onTextareaInput);

            this.textBox = textBox;
        },
@ -806,11 +839,19 @@ define([
            return str_res;
        },

-        pickEMail: function (commentId, message) {
+        pickEMail: function (commentId, message, oldMessage) {
+            var old_arr = [];
+            if (oldMessage) {
+                old_arr = Common.Utils.String.htmlEncode(oldMessage).match(/\B[@+][A-Z0-9._%+-]+@[A-Z0-9._-]+\.[A-Z]+\b/gi);
+                old_arr = _.map(old_arr, function(str){
+                    return str.slice(1, str.length);
+                });
+            }
            var arr = Common.Utils.String.htmlEncode(message).match(/\B[@+][A-Z0-9._%+-]+@[A-Z0-9._-]+\.[A-Z]+\b/gi);
            arr = _.map(arr, function(str){
                return str.slice(1, str.length);
            });
+            arr = _.difference(arr, old_arr);
            (arr.length>0) && Common.Gateway.requestSendNotify({
                emails: arr,
                actionId: commentId, // comment id
--- a/apps/common/main/lib/view/ExternalDiagramEditor.js
+++ b/apps/common/main/lib/view/ExternalDiagramEditor.js
@ -39,59 +39,30 @@
 */

 define([
-    'common/main/lib/component/Window'
+    'common/main/lib/view/ExternalEditor'
 ], function () { 'use strict';

-    Common.Views.ExternalDiagramEditor = Common.UI.Window.extend(_.extend({
+    Common.Views.ExternalDiagramEditor = Common.Views.ExternalEditor.extend(_.extend({
        initialize : function(options) {
            var _options = {};
-            var _inner_height = Common.Utils.innerHeight() - Common.Utils.InternalSettings.get('window-inactive-area-top');
            _.extend(_options,  {
+                id: 'id-external-diagram-editor',
                title: this.textTitle,
-                width: 910,
-                height: (_inner_height - 700)<0 ? _inner_height : 700,
-                cls: 'advanced-settings-dlg',
-                header: true,
-                toolclose: 'hide',
-                toolcallback: _.bind(this.onToolClose, this)
+                storageName: 'diagram-editor',
+                sdkplaceholder: 'id-diagram-editor-placeholder',
+                initwidth: 900,
+                initheight: 700,
+                minwidth: 730,
+                minheight: 275
            }, options);

-            this.template = [
-                '<div id="id-diagram-editor-container" class="box" style="height:' + (_options.height-85) + 'px;">',
-                    '<div id="id-diagram-editor-placeholder" style="width: 100%;height: 100%;"></div>',
-                '</div>',
-                '<div class="separator horizontal"></div>',
-                '<div class="footer" style="text-align: center;">',
-                    '<button id="id-btn-diagram-editor-apply" class="btn normal dlg-btn primary custom" result="ok" data-hint="1" data-hint-direction="bottom" data-hint-offset="big">' + this.textSave + '</button>',
-                    '<button id="id-btn-diagram-editor-cancel" class="btn normal dlg-btn" result="cancel" data-hint="1" data-hint-direction="bottom" data-hint-offset="big">' + this.textClose + '</button>',
-                '</div>'
-            ].join('');
-
-            _options.tpl = _.template(this.template)(_options);
-
-            this.handler = _options.handler;
            this._chartData = null;
-            this._isNewChart = true;
-            Common.UI.Window.prototype.initialize.call(this, _options);
-        },
-
-        render: function() {
-            Common.UI.Window.prototype.render.call(this);
-
-            this.btnSave = new Common.UI.Button({
-                el: $('#id-btn-diagram-editor-apply'),
-                disabled: true
-            });
-            this.btnCancel = new Common.UI.Button({
-                el: $('#id-btn-diagram-editor-cancel')
-            });
-
-            this.$window.find('.dlg-btn').on('click', _.bind(this.onDlgBtnClick, this));
+            Common.Views.ExternalEditor.prototype.initialize.call(this, _options);
        },

        show: function() {
            this.setPlaceholder();
-            Common.UI.Window.prototype.show.apply(this, arguments);
+            Common.Views.ExternalEditor.prototype.show.apply(this, arguments);
        },

        setChartData: function(data) {
@ -100,55 +71,6 @@ define([
                this.fireEvent('setchartdata', this);
        },

-        setEditMode: function(mode) {
-            this._isNewChart = !mode;
-        },
-
-        isEditMode: function() {
-            return !this._isNewChart;
-        },
-
-        setControlsDisabled: function(disable) {
-            this.btnSave.setDisabled(disable);
-            this.btnCancel.setDisabled(disable);
-            (disable) ? this.$window.find('.tool.close').addClass('disabled') : this.$window.find('.tool.close').removeClass('disabled');
-        },
-
-        onDlgBtnClick: function(event) {
-            if ( this.handler ) {
-                this.handler.call(this, event.currentTarget.attributes['result'].value);
-                return;
-            }
-            this.hide();
-        },
-
-        onToolClose: function() {
-            if ( this.handler ) {
-                this.handler.call(this, 'cancel');
-                return;
-            }
-            this.hide();
-        },
-
-        setHeight: function(height) {
-            if (height >= 0) {
-                var min = parseInt(this.$window.css('min-height'));
-                height < min && (height = min);
-                this.$window.height(height);
-
-                var header_height = (this.initConfig.header) ? parseInt(this.$window.find('> .header').css('height')) : 0;
-
-                this.$window.find('> .body').css('height', height-header_height);
-                this.$window.find('> .body > .box').css('height', height-85);
-
-                var top  = (Common.Utils.innerHeight() - Common.Utils.InternalSettings.get('window-inactive-area-top') - parseInt(height)) / 2;
-                var left = (Common.Utils.innerWidth() - parseInt(this.initConfig.width)) / 2;
-
-                this.$window.css('left',left);
-                this.$window.css('top', Common.Utils.InternalSettings.get('window-inactive-area-top') + top);
-            }
-        },
-
        setPlaceholder: function(placeholder) {
            this._placeholder = placeholder;
        },
@ -157,8 +79,6 @@ define([
            return this._placeholder;
        },

-        textSave: 'Save & Exit',
-        textClose: 'Close',
        textTitle: 'Chart Editor'
    }, Common.Views.ExternalDiagramEditor || {}));
 });
--- a/apps/common/main/lib/view/ExternalEditor.js
+++ b/apps/common/main/lib/view/ExternalEditor.js
@ -0,0 +1,195 @@
+/*
+ *
+ * (c) Copyright Ascensio System SIA 2010-2022
+ *
+ * This program is a free software product. You can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License (AGPL)
+ * version 3 as published by the Free Software Foundation. In accordance with
+ * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
+ * that Ascensio System SIA expressly excludes the warranty of non-infringement
+ * of any third-party rights.
+ *
+ * This program is distributed WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
+ * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
+ *
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
+ *
+ * The  interactive user interfaces in modified source and object code versions
+ * of the Program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU AGPL version 3.
+ *
+ * Pursuant to Section 7(b) of the License you must retain the original Product
+ * logo when distributing the program. Pursuant to Section 7(e) we decline to
+ * grant you any rights under trademark law for use of our trademarks.
+ *
+ * All the Product's GUI elements, including illustrations and icon sets, as
+ * well as technical writing content are licensed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International. See the License
+ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
+ *
+*/
+/**
+ *  ExternalEditor.js
+ *
+ *  Created by Julia Radzhabova on 22/06/22
+ *  Copyright (c) 2022 Ascensio System SIA. All rights reserved.
+ *
+ */
+
+define([
+    'common/main/lib/component/Window'
+], function () { 'use strict';
+
+    Common.Views.ExternalEditor = Common.UI.Window.extend(_.extend({
+        initialize : function(options) {
+            var filter = Common.localStorage.getKeysFilter(),
+                appPrefix = (filter && filter.length) ? filter.split(',')[0] : '';
+            this.storageName = appPrefix + (options.storageName || 'external-editor');
+
+            var _options = {},
+                width = options.initwidth || 900,
+                height = options.initheight || 700;
+            var value = Common.localStorage.getItem(this.storageName + '-width');
+            value && (width = parseInt(value));
+            value = Common.localStorage.getItem(this.storageName + '-height');
+            value && (height = parseInt(value));
+
+            var _inner_height = Common.Utils.innerHeight() - Common.Utils.InternalSettings.get('window-inactive-area-top');
+            _.extend(_options,  {
+                width: width,
+                height: (_inner_height - height)<0 ? _inner_height : height,
+                cls: 'advanced-settings-dlg',
+                header: true,
+                toolclose: 'hide',
+                toolcallback: _.bind(this.onToolClose, this),
+                resizable: true
+            }, options);
+
+            this._headerFooterHeight = 85;
+
+            this.template = [
+                '<div id="id-editor-container" class="box" style="height:' + (_options.height-this._headerFooterHeight) + 'px; padding: 0 5px;">',
+                    '<div id="' + (_options.sdkplaceholder || '') + '" style="width: 100%;height: 100%;"></div>',
+                '</div>',
+                '<div class="separator horizontal"></div>',
+                '<div class="footer" style="text-align: center;">',
+                    '<button id="id-btn-editor-apply" class="btn normal dlg-btn primary custom" result="ok" data-hint="1" data-hint-direction="bottom" data-hint-offset="big">' + this.textSave + '</button>',
+                    '<button id="id-btn-editor-cancel" class="btn normal dlg-btn" result="cancel" data-hint="1" data-hint-direction="bottom" data-hint-offset="big">' + this.textClose + '</button>',
+                '</div>'
+            ].join('');
+
+            _options.tpl = _.template(this.template)(_options);
+
+            this.handler = _options.handler;
+            this._isNewObject = true;
+            this.on('resize', _.bind(this.onWindowResize, this));
+            Common.UI.Window.prototype.initialize.call(this, _options);
+        },
+
+        render: function() {
+            Common.UI.Window.prototype.render.call(this);
+            this.boxEl = this.$window.find('.body > .box');
+
+            this.btnSave = new Common.UI.Button({
+                el: this.$window.find('#id-btn-editor-apply'),
+                disabled: true
+            });
+            this.btnCancel = new Common.UI.Button({
+                el: this.$window.find('#id-btn-editor-cancel')
+            });
+
+            this.$window.find('.dlg-btn').on('click', _.bind(this.onDlgBtnClick, this));
+        },
+
+        show: function() {
+            Common.UI.Window.prototype.show.apply(this, arguments);
+        },
+
+        setEditMode: function(mode) {
+            this._isNewObject = !mode;
+        },
+
+        isEditMode: function() {
+            return !this._isNewObject;
+        },
+
+        setControlsDisabled: function(disable) {
+            this.btnSave.setDisabled(disable);
+            this.btnCancel.setDisabled(disable);
+            (disable) ? this.$window.find('.tool.close').addClass('disabled') : this.$window.find('.tool.close').removeClass('disabled');
+        },
+
+        onDlgBtnClick: function(event) {
+            if ( this.handler ) {
+                this.handler.call(this, event.currentTarget.attributes['result'].value);
+                return;
+            }
+            this.hide();
+        },
+
+        onToolClose: function() {
+            if ( this.handler ) {
+                this.handler.call(this, 'cancel');
+                return;
+            }
+            this.hide();
+        },
+
+        setHeight: function(height) {
+            if (height >= 0) {
+                var min = parseInt(this.$window.css('min-height'));
+                height < min && (height = min);
+                this.$window.height(height);
+
+                var header_height = (this.initConfig.header) ? parseInt(this.$window.find('> .header').css('height')) : 0;
+
+                this.$window.find('> .body').css('height', height-header_height);
+                this.$window.find('> .body > .box').css('height', height-this._headerFooterHeight);
+            }
+        },
+
+        setInCenter: function() {
+            var height = this.$window.height(),
+                top  = (Common.Utils.innerHeight() - Common.Utils.InternalSettings.get('window-inactive-area-top') - parseInt(height)) / 2,
+                left = (Common.Utils.innerWidth() - parseInt(this.initConfig.width)) / 2;
+
+            this.$window.css('left',left);
+            this.$window.css('top', Common.Utils.InternalSettings.get('window-inactive-area-top') + top);
+        },
+
+        setInnerSize: function(width, height) {
+            var maxHeight = Common.Utils.innerHeight(),
+                maxWidth = Common.Utils.innerWidth(),
+                borders_width = (parseInt(this.$window.css('border-left-width')) + parseInt(this.$window.css('border-right-width'))),
+                paddings = (parseInt(this.boxEl.css('padding-left')) + parseInt(this.boxEl.css('padding-right')));
+            height += 90; // add toolbar and statusbar height
+            if (maxHeight<height + this._headerFooterHeight)
+                height = maxHeight - this._headerFooterHeight;
+            if (maxWidth<width + paddings + borders_width)
+                width = maxWidth - paddings - borders_width;
+
+            this.boxEl.css('height', height);
+
+            this.setHeight(height + this._headerFooterHeight);
+            this.setWidth(width + paddings + borders_width);
+
+            if (this.getLeft()<0)
+                this.$window.css('left', 0);
+            if (this.getTop() < Common.Utils.InternalSettings.get('window-inactive-area-top') )
+                this.$window.css('top', Common.Utils.InternalSettings.get('window-inactive-area-top'));
+        },
+
+        onWindowResize: function (args) {
+            if (args && args[1]=='end') {
+                var value = this.getSize();
+                Common.localStorage.setItem(this.storageName + '-width', value[0]);
+                Common.localStorage.setItem(this.storageName + '-height', value[1]);
+            }
+        },
+
+        textSave: 'Save & Exit',
+        textClose: 'Close'
+    }, Common.Views.ExternalEditor || {}));
+});
--- a/apps/common/main/lib/view/ExternalMergeEditor.js
+++ b/apps/common/main/lib/view/ExternalMergeEditor.js
@ -39,55 +39,25 @@
 */

 define([
-    'common/main/lib/component/Window'
+    'common/main/lib/view/ExternalEditor'
 ], function () { 'use strict';

-    Common.Views.ExternalMergeEditor = Common.UI.Window.extend(_.extend({
+    Common.Views.ExternalMergeEditor = Common.Views.ExternalEditor.extend(_.extend({
        initialize : function(options) {
            var _options = {};
            _.extend(_options,  {
+                id: 'id-external-merge-editor',
                title: this.textTitle,
-                width: 910,
-                height: (Common.Utils.innerHeight()-700)<0 ? Common.Utils.innerHeight(): 700,
-                cls: 'advanced-settings-dlg',
-                header: true,
-                toolclose: 'hide',
-                toolcallback: _.bind(this.onToolClose, this)
+                storageName: 'merge-editor',
+                sdkplaceholder: 'id-merge-editor-placeholder',
+                initwidth: 900,
+                initheight: 700,
+                minwidth: 370,
+                minheight: 275
            }, options);

-            this.template = [
-                '<div id="id-merge-editor-container" class="box" style="height:' + (_options.height-85) + 'px;">',
-                    '<div id="id-merge-editor-placeholder" style="width: 100%;height: 100%;"></div>',
-                '</div>',
-                '<div class="separator horizontal"></div>',
-                '<div class="footer" style="text-align: center;">',
-                    '<button id="id-btn-merge-editor-apply" class="btn normal dlg-btn primary custom" result="ok" data-hint="1" data-hint-direction="bottom" data-hint-offset="big">' + this.textSave + '</button>',
-                    '<button id="id-btn-merge-editor-cancel" class="btn normal dlg-btn" result="cancel" data-hint="1" data-hint-direction="bottom" data-hint-offset="big">' + this.textClose + '</button>',
-                '</div>'
-            ].join('');
-
-            _options.tpl = _.template(this.template)(_options);
-
-            this.handler = _options.handler;
            this._mergeData = null;
-            this._isNewMerge = true;
-            Common.UI.Window.prototype.initialize.call(this, _options);
-        },
-
-        render: function() {
-            Common.UI.Window.prototype.render.call(this);
-
-            this.btnSave = new Common.UI.Button({
-                el: $('#id-btn-merge-editor-apply'),
-                disabled: true
-            });
-            this.btnCancel = new Common.UI.Button({
-                el: $('#id-btn-merge-editor-cancel'),
-                disabled: true
-            });
-
-            this.$window.find('.tool.close').addClass('disabled');
-            this.$window.find('.dlg-btn').on('click', _.bind(this.onDlgBtnClick, this));
+            Common.Views.ExternalEditor.prototype.initialize.call(this, _options);
        },

        setMergeData: function(data) {
@ -96,54 +66,6 @@ define([
                this.fireEvent('setmergedata', this);
        },

-        setEditMode: function(mode) {
-            this._isNewMerge = !mode;
-        },
-
-        isEditMode: function() {
-            return !this._isNewMerge;
-        },
-
-        setControlsDisabled: function(disable) {
-            this.btnSave.setDisabled(disable);
-            this.btnCancel.setDisabled(disable);
-            (disable) ? this.$window.find('.tool.close').addClass('disabled') : this.$window.find('.tool.close').removeClass('disabled');
-        },
-
-        onDlgBtnClick: function(event) {
-            var state = event.currentTarget.attributes['result'].value;
-            if ( this.handler && this.handler.call(this, state) )
-                return;
-            this.hide();
-        },
-
-        onToolClose: function() {
-            if ( this.handler && this.handler.call(this, 'cancel') )
-                return;
-            this.hide();
-        },
-
-        setHeight: function(height) {
-            if (height >= 0) {
-                var min = parseInt(this.$window.css('min-height'));
-                height < min && (height = min);
-                this.$window.height(height);
-
-                var header_height = (this.initConfig.header) ? parseInt(this.$window.find('> .header').css('height')) : 0;
-
-                this.$window.find('> .body').css('height', height-header_height);
-                this.$window.find('> .body > .box').css('height', height-85);
-
-                var top  = (Common.Utils.innerHeight() - parseInt(height)) / 2;
-                var left = (Common.Utils.innerWidth() - parseInt(this.initConfig.width)) / 2;
-
-                this.$window.css('left',left);
-                this.$window.css('top',top);
-            }
-        },
-
-        textSave: 'Save & Exit',
-        textClose: 'Close',
        textTitle: 'Mail Merge Recipients'
    }, Common.Views.ExternalMergeEditor || {}));
 });
--- a/apps/common/main/lib/view/ExternalOleEditor.js
+++ b/apps/common/main/lib/view/ExternalOleEditor.js
@ -39,59 +39,25 @@
 */

 define([
-    'common/main/lib/component/Window'
+    'common/main/lib/view/ExternalEditor'
 ], function () { 'use strict';

-    Common.Views.ExternalOleEditor = Common.UI.Window.extend(_.extend({
+    Common.Views.ExternalOleEditor = Common.Views.ExternalEditor.extend(_.extend({
        initialize : function(options) {
            var _options = {};
-            var _inner_height = Common.Utils.innerHeight() - Common.Utils.InternalSettings.get('window-inactive-area-top');
            _.extend(_options,  {
+                id: 'id-external-ole-editor',
                title: this.textTitle,
-                width: 910,
-                height: (_inner_height - 700)<0 ? _inner_height : 700,
-                cls: 'advanced-settings-dlg',
-                header: true,
-                toolclose: 'hide',
-                toolcallback: _.bind(this.onToolClose, this)
+                storageName: 'ole-editor',
+                sdkplaceholder: 'id-ole-editor-placeholder',
+                initwidth: 900,
+                initheight: 700,
+                minwidth: 860,
+                minheight: 275
            }, options);

-            this.template = [
-                '<div id="id-ole-editor-container" class="box" style="height:' + (_options.height-85) + 'px;">',
-                    '<div id="id-ole-editor-placeholder" style="width: 100%;height: 100%;"></div>',
-                '</div>',
-                '<div class="separator horizontal"></div>',
-                '<div class="footer" style="text-align: center;">',
-                    '<button id="id-btn-ole-editor-apply" class="btn normal dlg-btn primary custom" result="ok" data-hint="1" data-hint-direction="bottom" data-hint-offset="big">' + this.textSave + '</button>',
-                    '<button id="id-btn-ole-editor-cancel" class="btn normal dlg-btn" result="cancel" data-hint="1" data-hint-direction="bottom" data-hint-offset="big">' + this.textClose + '</button>',
-                '</div>'
-            ].join('');
-
-            _options.tpl = _.template(this.template)(_options);
-
-            this.handler = _options.handler;
            this._oleData = null;
-            this._isNewOle = true;
-            Common.UI.Window.prototype.initialize.call(this, _options);
-        },
-
-        render: function() {
-            Common.UI.Window.prototype.render.call(this);
-
-            this.btnSave = new Common.UI.Button({
-                el: $('#id-btn-ole-editor-apply'),
-                disabled: true
-            });
-            this.btnCancel = new Common.UI.Button({
-                el: $('#id-btn-ole-editor-cancel')
-            });
-
-            this.$window.find('.dlg-btn').on('click', _.bind(this.onDlgBtnClick, this));
-        },
-
-        show: function() {
-            this.setPlaceholder();
-            Common.UI.Window.prototype.show.apply(this, arguments);
+            Common.Views.ExternalEditor.prototype.initialize.call(this, _options);
        },

        setOleData: function(data) {
@ -100,67 +66,6 @@ define([
                this.fireEvent('setoledata', this);
        },

-        setEditMode: function(mode) {
-            this._isNewOle = !mode;
-        },
-
-        isEditMode: function() {
-            return !this._isNewOle;
-        },
-
-        setControlsDisabled: function(disable) {
-            this.btnSave.setDisabled(disable);
-            this.btnCancel.setDisabled(disable);
-            (disable) ? this.$window.find('.tool.close').addClass('disabled') : this.$window.find('.tool.close').removeClass('disabled');
-        },
-
-        onDlgBtnClick: function(event) {
-            Common.NotificationCenter.trigger('modal:close', this);
-            if ( this.handler ) {
-                this.handler.call(this, event.currentTarget.attributes['result'].value);
-                return;
-            }
-            this.hide();
-        },
-
-        onToolClose: function() {
-            Common.NotificationCenter.trigger('modal:close', this);
-            if ( this.handler ) {
-                this.handler.call(this, 'cancel');
-                return;
-            }
-            this.hide();
-        },
-
-        setHeight: function(height) {
-            if (height >= 0) {
-                var min = parseInt(this.$window.css('min-height'));
-                height < min && (height = min);
-                this.$window.height(height);
-
-                var header_height = (this.initConfig.header) ? parseInt(this.$window.find('> .header').css('height')) : 0;
-
-                this.$window.find('> .body').css('height', height-header_height);
-                this.$window.find('> .body > .box').css('height', height-85);
-
-                var top  = (Common.Utils.innerHeight() - Common.Utils.InternalSettings.get('window-inactive-area-top') - parseInt(height)) / 2;
-                var left = (Common.Utils.innerWidth() - parseInt(this.initConfig.width)) / 2;
-
-                this.$window.css('left',left);
-                this.$window.css('top', Common.Utils.InternalSettings.get('window-inactive-area-top') + top);
-            }
-        },
-
-        setPlaceholder: function(placeholder) {
-            this._placeholder = placeholder;
-        },
-
-        getPlaceholder: function() {
-            return this._placeholder;
-        },
-
-        textSave: 'Save & Exit',
-        textClose: 'Close',
        textTitle: 'Spreadsheet Editor'
    }, Common.Views.ExternalOleEditor || {}));
 });
--- a/apps/common/main/lib/view/Header.js
+++ b/apps/common/main/lib/view/Header.js
@ -124,9 +124,10 @@ define([
                                '<div id="header-logo"><i></i></div>' +
                            '</section>';

-        var templateTitleBox = '<section id="box-document-title">' +
+            var templateTitleBox = '<section id="box-document-title">' +
                                '<div class="extra"></div>' +
                                '<div class="hedset">' +
+                                    '<div class="btn-slot" id="slot-btn-dt-home"></div>' +
                                    '<div class="btn-slot" id="slot-btn-dt-save" data-layout-name="header-save"></div>' +
                                    '<div class="btn-slot" id="slot-btn-dt-print"></div>' +
                                    '<div class="btn-slot" id="slot-btn-dt-print-quick"></div>' +
@ -151,7 +152,7 @@ define([
        function onResetUsers(collection, opts) {
            var usercount = collection.getVisibleEditingCount();
            if ( $userList ) {
-                if (usercount > 1 && appConfig && (appConfig.isEdit || appConfig.isRestrictedEdit)) {
+                if (appConfig && (usercount > 1 && (appConfig.isEdit || appConfig.isRestrictedEdit) || usercount >0 && appConfig.canLiveView)) {
                    $userList.html(templateUserList({
                        users: collection.chain().filter(function(item){return item.get('online') && !item.get('view') && !item.get('hidden')}).groupBy(function(item) {return item.get('idOriginal');}).value(),
                        usertpl: _.template(templateUserItem),
@ -181,8 +182,7 @@ define([

        function applyUsers(count, originalCount) {
            if (!$btnUsers) return;
-
-            var has_edit_users = count > 1 && appConfig && (appConfig.isEdit || appConfig.isRestrictedEdit); // has other user(s) who edit document
+            var has_edit_users = appConfig && (count > 1 && (appConfig.isEdit || appConfig.isRestrictedEdit) || count > 0 && appConfig.canLiveView); // has other user(s) who edit document
            if ( has_edit_users ) {
                $panelUsers['show']();
                $btnUsers.find('.caption').html(originalCount);
@ -315,7 +315,7 @@ define([
                    html: true
                });
                $btnUsers.on('click', onUsersClick.bind(me));
-                $panelUsers[(editingUsers > 1 && appConfig && (appConfig.isEdit || appConfig.isRestrictedEdit)) ? 'show' : 'hide']();
+                $panelUsers[(appConfig && (editingUsers > 1 && (appConfig.isEdit || appConfig.isRestrictedEdit) || editingUsers > 0 && appConfig.canLiveView)) ? 'show' : 'hide']();
                updateDocNamePosition(appConfig);
            }

--- a/apps/common/main/lib/view/InsertTableDialog.js
+++ b/apps/common/main/lib/view/InsertTableDialog.js
@ -51,6 +51,7 @@ define([
            height: 157,
            style: 'min-width: 230px;',
            cls: 'modal-dlg',
+            id: 'window-insert-table',
            split: false,
            buttons: ['ok', 'cancel']
        },
@ -63,10 +64,10 @@ define([
            this.template = [
                '<div class="box">',
                    '<div class="input-row">',
-                        '<label class="text columns-text" style="width: 130px;">' + this.txtColumns + '</label><div class="columns-val" style="float: right;"></div>',
+                        '<label class="text columns-text" style="width: 130px;">' + this.txtColumns + '</label><div class="columns-val"></div>',
                    '</div>',
                    '<div class="input-row" style="margin-top: 10px;">',
-                        '<label class="text rows-text" style="width: 130px;">' + this.txtRows + '</label><div class="rows-val" style="float: right;"></div>',
+                        '<label class="text rows-text" style="width: 130px;">' + this.txtRows + '</label><div class="rows-val"></div>',
                    '</div>',
                '</div>'
            ].join('');
--- a/apps/common/main/lib/view/LanguageDialog.js
+++ b/apps/common/main/lib/view/LanguageDialog.js
@ -93,7 +93,7 @@ define([
                    '<ul class="dropdown-menu <%= menuCls %>" style="<%= menuStyle %>" role="menu">',
                        '<% _.each(items, function(item) { %>',
                        '<li id="<%= item.id %>" data-value="<%= item.value %>">',
-                            '<a tabindex="-1" type="menuitem" style="padding-left: 28px !important;" langval="<%= item.value %>">',
+                            '<a tabindex="-1" type="menuitem" langval="<%= item.value %>">',
                                '<i class="icon <% if (item.spellcheck) { %> toolbar__icon btn-ic-docspell spellcheck-lang <% } %>"></i>',
                                '<%= scope.getDisplayValue(item) %>',
                            '</a>',
@ -137,7 +137,7 @@ define([

    onLangSelect: function(cmb, rec, e) {
        cmb.$el.find('.input-icon').toggleClass('spellcheck-lang', rec && rec.spellcheck);
-        cmb._input.css('padding-left', rec && rec.spellcheck ? 25 : 3);
+        cmb._input.css(Common.UI.isRTL() ? 'padding-right' : 'padding-left', rec && rec.spellcheck ? 25 : 3);
    },

    onPrimary: function() {
--- a/apps/common/main/lib/view/ListSettingsDialog.js
+++ b/apps/common/main/lib/view/ListSettingsDialog.js
@ -64,6 +64,7 @@ define([
            height: 261,
            style: 'min-width: 240px;',
            cls: 'modal-dlg',
+            id: 'window-list-settings',
            split: false,
            buttons: ['ok', 'cancel']
        },
@ -78,35 +79,35 @@ define([
            this.template = [
                '<div class="box">',
                    '<div style="margin-bottom: 16px;">',
-                        '<button type="button" class="btn btn-text-default auto" id="id-dlg-list-bullet" style="border-top-right-radius: 0;border-bottom-right-radius: 0;">', this.textBulleted,'</button>',
-                        '<button type="button" class="btn btn-text-default auto" id="id-dlg-list-numbering" style="border-top-left-radius: 0;border-bottom-left-radius: 0;border-left-width: 0;margin-left: -1px;">', this.textNumbering,'</button>',
+                        '<button type="button" class="btn btn-text-default auto" id="id-dlg-list-bullet">', this.textBulleted,'</button>',
+                        '<button type="button" class="btn btn-text-default auto" id="id-dlg-list-numbering">', this.textNumbering,'</button>',
                    '</div>',
                    '<div style="height:120px;">',
                        '<table cols="3">',
                            '<tr>',
-                                '<td style="padding-right: 5px;padding-bottom: 8px;min-width: 50px;">',
+                                '<td class="padding-right" style="padding-bottom: 8px;min-width: 50px;">',
                                    '<label class="text">' + this.txtType + '</label>',
                                '</td>',
-                                '<td style="padding-right: 5px;padding-bottom: 8px;width: 105px;">',
+                                '<td class="padding-right" style="padding-bottom: 8px;width: 105px;">',
                                    '<div id="id-dlg-list-numbering-format" class="input-group-nr" style="width: 105px;"></div>',
                                    '<div id="id-dlg-list-bullet-format" class="input-group-nr" style="width: 105px;"></div>',
                                '</td>',
                                '<td style="padding-bottom: 8px;"></td>',
                            '</tr>',
                            '<tr class="image">',
-                                '<td style="padding-right: 5px;padding-bottom: 8px;min-width: 50px;">',
+                                '<td class="padding-right" style="padding-bottom: 8px;min-width: 50px;">',
                                    '<label class="text">' + this.txtImport + '</label>',
                                '</td>',
-                                '<td style="padding-right: 5px;padding-bottom: 8px;width: 105px;">',
+                                '<td class="padding-right" style="padding-bottom: 8px;width: 105px;">',
                                    '<div id="id-dlg-list-image" style="width: 105px;"></div>',
                                '</td>',
                                '<td style="padding-bottom: 8px;"></td>',
                            '</tr>',
                            '<tr>',
-                                '<td style="padding-right: 5px;padding-bottom: 8px;min-width: 50px;">',
+                                '<td class="padding-right" style="padding-bottom: 8px;min-width: 50px;">',
                                    '<label class="text">' + this.txtSize + '</label>',
                                '</td>',
-                                '<td style="padding-right: 5px;padding-bottom: 8px;width: 105px;">',
+                                '<td class="padding-right" style="padding-bottom: 8px;width: 105px;">',
                                    '<div id="id-dlg-list-size"></div>',
                                '</td>',
                                '<td style="padding-bottom: 8px;">',
@ -114,19 +115,19 @@ define([
                                '</td>',
                            '</tr>',
                            '<tr class="numbering">',
-                                '<td style="padding-right: 5px;padding-bottom: 8px;min-width: 50px;">',
+                                '<td class="padding-right" style="padding-bottom: 8px;min-width: 50px;">',
                                    '<label class="text" style="white-space: nowrap;">' + this.txtStart + '</label>',
                                '</td>',
-                                '<td style="padding-right: 5px;padding-bottom: 8px;width: 105px;">',
+                                '<td class="padding-right" style="padding-bottom: 8px;width: 105px;">',
                                    '<div id="id-dlg-list-start"></div>',
                                '</td>',
                                '<td style="padding-bottom: 8px;"></td>',
                            '</tr>',
                            '<tr class="color">',
-                                '<td style="padding-right: 5px;padding-bottom: 8px;min-width: 50px;">',
+                                '<td class="padding-right" style="padding-bottom: 8px;min-width: 50px;">',
                                    '<label class="text">' + this.txtColor + '</label>',
                                '</td>',
-                                '<td style="padding-right: 5px;padding-bottom: 8px;width: 105px;">',
+                                '<td class="padding-right" style="padding-bottom: 8px;width: 105px;">',
                                    '<div id="id-dlg-list-color"></div>',
                                '</td>',
                                '<td style="padding-bottom: 8px;"></td>',
--- a/apps/common/main/lib/view/OpenDialog.js
+++ b/apps/common/main/lib/view/OpenDialog.js
@ -207,6 +207,7 @@ define([
                        type: 'password',
                        showCls: (this.options.iconType==='svg' ? 'svg-icon' : 'toolbar__icon') + ' btn-sheet-view',
                        hideCls: (this.options.iconType==='svg' ? 'svg-icon' : 'toolbar__icon') + ' hide-password',
+                        maxLength: this.options.maxPasswordLength,
                        validateOnBlur: false,
                        showPwdOnClick: true,
                        validation  : function(value) {
--- a/apps/common/main/lib/view/OptionsDialog.js
+++ b/apps/common/main/lib/view/OptionsDialog.js
@ -101,7 +101,10 @@ define([
                        this.checkedIndex = i;
                    }
                }
-                (this.checkedIndex>=0) && this.radio[this.checkedIndex].setValue(true);
+                if (this.checkedIndex>=0) {
+                    this.radio[this.checkedIndex].setValue(true);
+                    this.currentCell = this.radio[this.checkedIndex].options.value;
+                }
            }
            $window.find('.dlg-btn').on('click', _.bind(this.onBtnClick, this));
        },
--- a/apps/common/main/lib/view/PluginDlg.js
+++ b/apps/common/main/lib/view/PluginDlg.js
@ -54,7 +54,8 @@ define([
            var _options = {};
            _.extend(_options,  {
                header: true,
-                enableKeyEvents: false
+                enableKeyEvents: false,
+                automove: false
            }, options);

            var header_footer = (_options.buttons && _.size(_options.buttons)>0) ? 85 : 34;
@ -154,6 +155,8 @@ define([

            this.$window.css('left',(maxWidth - width - borders_width) / 2);
            this.$window.css('top',(maxHeight - height - this._headerFooterHeight) / 2);
+
+            this._restoreHeight = this._restoreWidth = undefined;
        },

        onWindowResize: function() {
@ -162,26 +165,38 @@ define([
                win_width = this.getWidth(),
                win_height = this.getHeight(),
                bordersOffset = (this.resizable) ? 0 : this.bordersOffset;
-            if (win_height<main_height-bordersOffset*2+0.1 && win_width<main_width-bordersOffset*2+0.1) {
-                var left = this.getLeft(),
-                    top = this.getTop();
-
+            if (win_height<main_height-bordersOffset*2+0.1 ) {
+                if (!this.resizable && this._restoreHeight>0 && win_height < this._restoreHeight) {
+                    var height = Math.max(Math.min(this._restoreHeight, main_height-bordersOffset*2), this.initConfig.minheight);
+                    this.setHeight(height);
+                    this.boxEl.css('height', height - this._headerFooterHeight);
+                }
+                var top = this.getTop();
                if (top<bordersOffset) this.$window.css('top', bordersOffset);
                else if (top+win_height>main_height-bordersOffset)
                    this.$window.css('top', main_height-bordersOffset - win_height);
+            } else {
+                if (this._restoreHeight===undefined) {
+                    this._restoreHeight = win_height;
+                }
+                this.setHeight(Math.max(main_height-bordersOffset*2, this.initConfig.minheight));
+                this.boxEl.css('height', Math.max(main_height-bordersOffset*2, this.initConfig.minheight) - this._headerFooterHeight);
+                this.$window.css('top', bordersOffset);
+            }
+            if (win_width<main_width-bordersOffset*2+0.1) {
+                if (!this.resizable && this._restoreWidth>0 && win_width < this._restoreWidth) {
+                    this.setWidth(Math.max(Math.min(this._restoreWidth, main_width-bordersOffset*2), this.initConfig.minwidth));
+                }
+                var left = this.getLeft();
                if (left<bordersOffset) this.$window.css('left', bordersOffset);
                else if (left+win_width>main_width-bordersOffset)
                    this.$window.css('left', main_width-bordersOffset-win_width);
            } else {
-                if (win_height>main_height-bordersOffset*2) {
-                    this.setHeight(Math.max(main_height-bordersOffset*2, this.initConfig.minheight));
-                    this.boxEl.css('height', Math.max(main_height-bordersOffset*2, this.initConfig.minheight) - this._headerFooterHeight);
-                    this.$window.css('top', bordersOffset);
-                }
-                if (win_width>main_width-bordersOffset*2) {
-                    this.setWidth(Math.max(main_width-bordersOffset*2, this.initConfig.minwidth));
-                    this.$window.css('left', bordersOffset);
+                if (this._restoreWidth===undefined) {
+                    this._restoreWidth = win_width;
                }
+                this.setWidth(Math.max(main_width-bordersOffset*2, this.initConfig.minwidth));
+                this.$window.css('left', bordersOffset);
            }
        },

--- a/apps/common/main/lib/view/Plugins.js
+++ b/apps/common/main/lib/view/Plugins.js
@ -74,14 +74,16 @@ define([
            _.extend(this, options);
            this._locked = false;
            this._state = {
-                DisabledControls: false
+                DisabledControls: false,
+                docProtection: {
+                    isReadOnly: false,
+                    isReviewOnly: false,
+                    isFormsOnly: false,
+                    isCommentsOnly: false
+                }
            };
            this.lockedControls = [];
            Common.UI.BaseView.prototype.initialize.call(this, arguments);
-
-            Common.NotificationCenter.on('app:ready', function (mode) {
-                Common.Utils.asyncCall(this._onAppReady, this, mode);
-            }.bind(this));
        },

        render: function(el) {
@ -153,6 +155,7 @@ define([
            if ( !this.storePlugins.isEmpty() ) {
                var me = this;
                var _group = $('<div class="group"></div>');
+                var _set = Common.enumLock;
                this.storePlugins.each(function (model) {
                    if (model.get('visible')) {
                        var modes = model.get('variations'),
@ -167,6 +170,7 @@ define([
                                split: modes && modes.length > 1,
                                value: guid,
                                hint: model.get('name'),
+                                lock: model.get('isDisplayedInViewer') ? [_set.viewMode, _set.previewReviewMode, _set.viewFormMode, _set.selRangeEdit, _set.editFormula] : [_set.viewMode, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.docLockView, _set.docLockForms, _set.docLockComments, _set.selRangeEdit, _set.editFormula],
                                dataHint: '1',
                                dataHintDirection: 'bottom',
                                dataHintOffset: 'small'
@ -179,6 +183,10 @@ define([
                        me.lockedControls.push(btn);
                    }
                });
+                var docProtection = me._state.docProtection
+                Common.Utils.lockControls(Common.enumLock.docLockView, docProtection.isReadOnly, {array: me.lockedControls});
+                Common.Utils.lockControls(Common.enumLock.docLockForms, docProtection.isFormsOnly, {array: me.lockedControls});
+                Common.Utils.lockControls(Common.enumLock.docLockComments, docProtection.isCommentsOnly, {array: me.lockedControls});

                parent.html(_group);
                $('<div class="separator long"></div>').prependTo(parent);
@ -204,6 +212,16 @@ define([
            }
        },

+        SetDisabled: function(disable, reviewMode, fillFormMode) {
+            if (reviewMode) {
+                Common.Utils.lockControls(Common.enumLock.previewReviewMode, disable, {array: this.lockedControls});
+            } else if (fillFormMode) {
+                Common.Utils.lockControls(Common.enumLock.viewFormMode, disable, {array: this.lockedControls});
+            } else {
+                Common.Utils.lockControls(Common.enumLock.viewMode, disable, {array: this.lockedControls});
+            }
+        },
+
        openInsideMode: function(name, url, frameId) {
            if (!this.pluginsPanel) return false;

@ -289,9 +307,6 @@ define([
                this.loadMask.hide();
        },

-        _onAppReady: function (mode) {
-        },
-
        parseIcons: function(icons) {
            if (icons.length && typeof icons[0] !== 'string') {
                var theme = Common.UI.Themes.currentThemeId().toLowerCase(),
@ -389,6 +404,7 @@ define([
                    });
            });

+            var _set = Common.enumLock;
            var btn = new Common.UI.Button({
                cls: 'btn-toolbar x-huge icon-top',
                iconImg: icon_url,
@ -397,6 +413,7 @@ define([
                split: _menu_items.length > 1,
                value: guid,
                hint: model.get('name'),
+                lock: model.get('isDisplayedInViewer') ? [_set.viewMode, _set.previewReviewMode, _set.viewFormMode, _set.selRangeEdit, _set.editFormula] : [_set.viewMode, _set.previewReviewMode, _set.viewFormMode, _set.docLockView, _set.docLockForms, _set.docLockComments, _set.selRangeEdit, _set.editFormula ],
                dataHint: '1',
                dataHintDirection: 'bottom',
                dataHintOffset: 'small'
--- a/apps/common/main/lib/view/Protection.js
+++ b/apps/common/main/lib/view/Protection.js
@ -78,16 +78,26 @@ define([
                    });
                });

+                this.btnPwd.on('click', function (b, e) {
+                    !b.pressed && me.fireEvent('protect:password', [b, 'delete']);
+                });
                this.btnPwd.menu.on('item:click', function (menu, item, e) {
                    me.fireEvent('protect:password', [menu, item.value]);
                });
            }

            if (me.appConfig.isSignatureSupport) {
-                if (this.btnSignature.menu)
+                if (this.btnSignature.menu) {
                    this.btnSignature.menu.on('item:click', function (menu, item, e) {
                        me.fireEvent('protect:signature', [item.value, false]);
                    });
+                    this.btnSignature.menu.on('show:after', function (menu, e) {
+                        if (me._state) {
+                            var isProtected = me._state.docProtection ? me._state.docProtection.isReadOnly || me._state.docProtection.isFormsOnly || me._state.docProtection.isCommentsOnly : false;
+                            menu.items && menu.items[1].setDisabled(isProtected || me._state.disabled);
+                        }
+                    });
+                }

                this.btnsInvisibleSignature.forEach(function(button) {
                    button.on('click', function (b, e) {
@ -132,6 +142,8 @@ define([
                        cls: 'btn-toolbar x-huge icon-top',
                        iconCls: 'toolbar__icon btn-ic-protect',
                        caption: this.txtEncrypt,
+                        split: true,
+                        enableToggle: true,
                        menu: true,
                        visible: false,
                        dataHint    : '1',
@ -172,7 +184,7 @@ define([
                    if ( config.canProtect) {
                        if ( config.isPasswordSupport) {
                            me.btnAddPwd.updateHint(me.hintAddPwd);
-                            me.btnPwd.updateHint(me.hintPwd);
+                            me.btnPwd.updateHint([me.hintDelPwd, me.hintPwd]);

                            me.btnPwd.setMenu(
                                new Common.UI.Menu({
@ -234,8 +246,7 @@ define([
                var me = this;
                if ( type == 'signature' ) {
                    var button = new Common.UI.Button({
-                        cls: 'btn-text-default',
-                        style: 'width: 100%;',
+                        cls: 'btn-text-default auto',
                        caption: this.txtInvisibleSignature,
                        disabled: this._state.invisibleSignDisabled,
                        dataHint: '2',
@ -251,8 +262,7 @@ define([
                    return button;
                } else if ( type == 'add-password' ) {
                    var button = new Common.UI.Button({
-                        cls: 'btn-text-default',
-                        style: 'width: 100%;',
+                        cls: 'btn-text-default auto',
                        caption: this.txtAddPwd,
                        disabled: this._state.disabled || this._state.disabledPassword,
                        visible: !this._state.hasPassword,
@ -269,8 +279,7 @@ define([
                    return button;
                } else if ( type == 'del-password' ) {
                    var button = new Common.UI.Button({
-                        cls: 'btn-text-default',
-                        style: 'width: 100%;',
+                        cls: 'btn-text-default auto',
                        caption: this.txtDeletePwd,
                        disabled: this._state.disabled || this._state.disabledPassword,
                        visible: this._state.hasPassword,
@ -287,8 +296,7 @@ define([
                    return button;
                } else if ( type == 'change-password' ) {
                    var button = new Common.UI.Button({
-                        cls: 'btn-text-default',
-                        style: 'width: 100%;',
+                        cls: 'btn-text-default auto',
                        caption: this.txtChangePwd,
                        disabled: this._state.disabled || this._state.disabledPassword,
                        visible: this._state.hasPassword,
@ -309,13 +317,14 @@ define([
            SetDisabled: function (state, canProtect) {
                this._state.disabled = state;
                this._state.invisibleSignDisabled = state && !canProtect;
+                var isProtected = this._state.docProtection ? this._state.docProtection.isReadOnly || this._state.docProtection.isFormsOnly || this._state.docProtection.isCommentsOnly : false;
                this.btnsInvisibleSignature && this.btnsInvisibleSignature.forEach(function(button) {
                    if ( button ) {
                        button.setDisabled(state && !canProtect);
                    }
                }, this);
                if (this.btnSignature && this.btnSignature.menu) {
-                    this.btnSignature.menu.items && this.btnSignature.menu.items[1].setDisabled(state); // disable adding signature line
+                    this.btnSignature.menu.items && this.btnSignature.menu.items[1].setDisabled(state || isProtected); // disable adding signature line
                    this.btnSignature.setDisabled(state && !canProtect); // disable adding any signature
                }
                this.btnsAddPwd.concat(this.btnsDelPwd, this.btnsChangePwd).forEach(function(button) {
@ -342,6 +351,7 @@ define([
                    }
                }, this);
                this.btnPwd.setVisible(hasPassword);
+                this.btnPwd.toggle(hasPassword, true);
            },

            txtEncrypt: 'Encrypt',
@ -353,7 +363,8 @@ define([
            txtDeletePwd: 'Delete password',
            txtAddPwd: 'Add password',
            txtInvisibleSignature: 'Add digital signature',
-            txtSignatureLine: 'Add Signature line'
+            txtSignatureLine: 'Add Signature line',
+            hintDelPwd: 'Delete password'
        }
    }()), Common.Views.Protection || {}));
 });
--- a/apps/common/main/lib/view/ReviewChanges.js
+++ b/apps/common/main/lib/view/ReviewChanges.js
@ -238,6 +238,10 @@ define([
                    me.fireEvent('comment:resolveComments', [item.value]);
                });
            }
+            Common.NotificationCenter.on('protect:doclock', function (e) {
+                me.fireEvent('protect:update');
+            });
+            me.fireEvent('protect:update');
        }

        return {
@ -259,7 +263,7 @@ define([
                        caption: this.txtAccept,
                        split: !this.appConfig.canUseReviewPermissions,
                        iconCls: 'toolbar__icon btn-review-save',
-                        lock: [_set.reviewChangelock, _set.isReviewOnly, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect],
+                        lock: [_set.reviewChangelock, _set.isReviewOnly, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.docLockView, _set.docLockForms, _set.docLockComments, _set.docLockReview],
                        dataHint: '1',
                        dataHintDirection: 'bottom',
                        dataHintOffset: 'small'
@ -271,7 +275,7 @@ define([
                        caption: this.txtReject,
                        split: !this.appConfig.canUseReviewPermissions,
                        iconCls: 'toolbar__icon btn-review-deny',
-                        lock: [_set.reviewChangelock, _set.isReviewOnly, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect],
+                        lock: [_set.reviewChangelock, _set.isReviewOnly, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.docLockView, _set.docLockForms, _set.docLockComments, _set.docLockReview],
                        dataHint: '1',
                        dataHintDirection: 'bottom',
                        dataHintOffset: 'small'
@ -284,7 +288,7 @@ define([
                            caption: this.txtCompare,
                            split: true,
                            iconCls: 'toolbar__icon btn-compare',
-                            lock: [_set.hasCoeditingUsers, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect],
+                            lock: [_set.hasCoeditingUsers, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.docLockView, _set.docLockForms, _set.docLockComments],
                            dataHint: '1',
                            dataHintDirection: 'bottom',
                            dataHintOffset: 'small'
@ -294,7 +298,7 @@ define([
                    this.btnTurnOn = new Common.UI.Button({
                        cls: 'btn-toolbar x-huge icon-top',
                        iconCls: 'toolbar__icon btn-ic-review',
-                        lock: [_set.previewReviewMode, _set.viewFormMode, _set.lostConnect],
+                        lock: [_set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.docLockView, _set.docLockForms, _set.docLockComments, _set.docLockReview],
                        caption: this.txtTurnon,
                        split: !this.appConfig.isReviewOnly,
                        enableToggle: true,
@ -309,7 +313,7 @@ define([
                    this.btnPrev = new Common.UI.Button({
                        cls: 'btn-toolbar x-huge icon-top',
                        iconCls: 'toolbar__icon btn-review-prev',
-                        lock: [_set.previewReviewMode, _set.viewFormMode, _set.lostConnect],
+                        lock: [_set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.docLockView, _set.docLockForms, _set.docLockComments],
                        caption: this.txtPrev,
                        dataHint: '1',
                        dataHintDirection: 'bottom',
@ -320,7 +324,7 @@ define([
                    this.btnNext = new Common.UI.Button({
                        cls: 'btn-toolbar x-huge icon-top',
                        iconCls: 'toolbar__icon btn-review-next',
-                        lock: [_set.previewReviewMode, _set.viewFormMode, _set.lostConnect],
+                        lock: [_set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.docLockView, _set.docLockForms, _set.docLockComments],
                        caption: this.txtNext,
                        dataHint: '1',
                        dataHintDirection: 'bottom',
@ -336,7 +340,7 @@ define([
                        this.btnReviewView = new Common.UI.Button({
                            cls: 'btn-toolbar x-huge icon-top',
                            iconCls: 'toolbar__icon btn-ic-reviewview',
-                            lock: [_set.viewFormMode, _set.lostConnect],
+                            lock: [_set.viewFormMode, _set.lostConnect, _set.docLockView, _set.docLockForms, _set.docLockComments],
                            caption: this.txtView,
                            menu: new Common.UI.Menu({
                                cls: 'ppm-toolbar',
@ -404,7 +408,7 @@ define([
                    this.btnCoAuthMode = new Common.UI.Button({
                        cls: 'btn-toolbar x-huge icon-top',
                        iconCls: 'toolbar__icon btn-ic-coedit',
-                        lock: [_set.viewFormMode, _set.lostConnect],
+                        lock: [_set.viewFormMode, _set.lostConnect, _set.docLockView],
                        caption: this.txtCoAuthMode,
                        menu: true,
                        dataHint: '1',
@ -445,12 +449,13 @@ define([
                }

                if ( this.appConfig.canCoAuthoring && this.appConfig.canComments ) {
+                    this.canComments = true; // fix for loading protected document
                    this.btnCommentRemove = new Common.UI.Button({
                        cls: 'btn-toolbar x-huge icon-top',
                        caption: this.txtCommentRemove,
                        split: true,
                        iconCls: 'toolbar__icon btn-rem-comment',
-                        lock: [_set.previewReviewMode, _set.viewFormMode, _set.hideComments, _set['Objects'], _set.lostConnect],
+                        lock: [_set.previewReviewMode, _set.viewFormMode, _set.hideComments, _set['Objects'], _set.lostConnect, _set.docLockView, _set.docLockForms],
                        dataHint: '1',
                        dataHintDirection: 'bottom',
                        dataHintOffset: 'small'
@ -461,15 +466,13 @@ define([
                        caption: this.txtCommentResolve,
                        split: true,
                        iconCls: 'toolbar__icon btn-resolve-all',
-                        lock: [_set.previewReviewMode, _set.viewFormMode, _set.hideComments, _set['Objects'], _set.lostConnect],
+                        lock: [_set.previewReviewMode, _set.viewFormMode, _set.hideComments, _set['Objects'], _set.lostConnect, _set.docLockView, _set.docLockForms],
                        dataHint: '1',
                        dataHintDirection: 'bottom',
                        dataHintOffset: 'small'
                    });
                    this.lockedControls.push(this.btnCommentResolve);
                }
-
-                Common.NotificationCenter.on('app:ready', this.onAppReady.bind(this));
            },

            render: function (el) {
@ -581,7 +584,7 @@ define([
                    }
                    me.btnSharing && me.btnSharing.updateHint(me.tipSharing);
                    me.btnHistory && me.btnHistory.updateHint(me.tipHistory);
-                    me.btnChat && me.btnChat.updateHint(me.txtChat + Common.Utils.String.platformKey('Alt+Q'));
+                    me.btnChat && me.btnChat.updateHint(me.txtChat + (!Common.Utils.isMac ? Common.Utils.String.platformKey('Alt+Q') : ''));

                    if (me.btnCoAuthMode) {
                        me.btnCoAuthMode.setMenu(
@ -658,7 +661,7 @@ define([
                    }

                    var separator_sharing = !(me.btnSharing || me.btnCoAuthMode) ? me.$el.find('.separator.sharing') : '.separator.sharing',
-                        separator_comments = !(config.canComments && config.canCoAuthoring) ? me.$el.find('.separator.comments') : '.separator.comments',
+                        separator_comments = !(me.btnCommentRemove || me.btnCommentResolve) ? me.$el.find('.separator.comments') : '.separator.comments',
                        separator_review = !(config.canReview || config.canViewReview) ? me.$el.find('.separator.review') : '.separator.review',
                        separator_compare = !(config.canReview && config.canFeatureComparison) ? me.$el.find('.separator.compare') : '.separator.compare',
                        separator_chat = !me.btnChat ? me.$el.find('.separator.chat') : '.separator.chat',
@ -692,8 +695,7 @@ define([
                    if (!me.btnHistory && separator_last)
                        me.$el.find(separator_last).hide();

-                    Common.NotificationCenter.trigger('tab:visible', 'review', (config.isEdit || config.canViewReview || config.canCoAuthoring && config.canComments) && Common.UI.LayoutManager.isElementVisible('toolbar-collaboration'));
-
+                    Common.NotificationCenter.trigger('tab:visible', 'review', (config.isEdit || config.canViewReview || me.canComments) && Common.UI.LayoutManager.isElementVisible('toolbar-collaboration'));
                    setEvents.call(me);
                });
            },
@ -731,7 +733,7 @@ define([
                    var button = new Common.UI.Button({
                        cls         : 'btn-toolbar',
                        iconCls     : 'toolbar__icon btn-ic-review',
-                        lock: [Common.enumLock.viewMode, Common.enumLock.previewReviewMode, Common.enumLock.viewFormMode, Common.enumLock.lostConnect],
+                        lock: [Common.enumLock.viewMode, Common.enumLock.previewReviewMode, Common.enumLock.viewFormMode, Common.enumLock.lostConnect, Common.enumLock.docLockView, Common.enumLock.docLockForms, Common.enumLock.docLockComments, Common.enumLock.docLockReview],
                        hintAnchor  : 'top',
                        hint        : this.tipReview,
                        split       : !this.appConfig.isReviewOnly,
@ -778,7 +780,7 @@ define([
                    button = new Common.UI.Button({
                        cls: 'btn-toolbar',
                        iconCls: 'toolbar__icon btn-ic-docspell',
-                        lock: [Common.enumLock.viewMode,  Common.enumLock.viewFormMode, Common.enumLock.previewReviewMode],
+                        lock: [Common.enumLock.viewMode,  Common.enumLock.viewFormMode, Common.enumLock.previewReviewMode, Common.enumLock.docLockView, Common.enumLock.docLockForms, Common.enumLock.docLockComments],
                        hintAnchor  : 'top',
                        hint: this.tipSetSpelling,
                        enableToggle: true,
@ -794,7 +796,7 @@ define([
                    button = new Common.UI.Button({
                        cls: 'btn-toolbar',
                        iconCls: 'toolbar__icon btn-ic-doclang',
-                        lock: [Common.enumLock.viewMode, Common.enumLock.previewReviewMode, Common.enumLock.viewFormMode, Common.enumLock.noSpellcheckLangs, Common.enumLock.lostConnect],
+                        lock: [Common.enumLock.viewMode, Common.enumLock.previewReviewMode, Common.enumLock.viewFormMode, Common.enumLock.noSpellcheckLangs, Common.enumLock.lostConnect, Common.enumLock.docLockView, Common.enumLock.docLockForms, Common.enumLock.docLockComments],
                        hintAnchor  : 'top',
                        hint: this.tipSetDocLang,
                        dataHint: '0',
@ -973,6 +975,7 @@ define([
            this.options.tpl = _.template(this.template)(this.options);
            this.popoverChanges = this.options.popoverChanges;
            this.mode = this.options.mode;
+            this.docProtection = this.options.docProtection;

            var filter = Common.localStorage.getKeysFilter();
            this.appPrefix = (filter && filter.length) ? filter.split(',')[0] : '';
@ -983,6 +986,7 @@ define([
        render: function() {
            Common.UI.Window.prototype.render.call(this);

+            var _set = Common.enumLock;
            this.btnPrev = new Common.UI.Button({
                cls: 'dlg-btn iconic',
                iconCls: 'img-commonctrl prev',
@ -1003,7 +1007,8 @@ define([
                cls         : 'btn-toolbar',
                caption     : this.txtAccept,
                split       : true,
-                disabled    : this.mode.isReviewOnly || !!Common.Utils.InternalSettings.get(this.appPrefix + "accept-reject-lock"),
+                disabled    : this.mode.isReviewOnly || this.docProtection.isReviewOnly || !!Common.Utils.InternalSettings.get(this.appPrefix + "accept-reject-lock"),
+                lock        : [_set.reviewChangelock, _set.isReviewOnly, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.docLockView, _set.docLockForms, _set.docLockComments, _set.docLockReview],
                menu        : this.mode.canUseReviewPermissions ? false : new Common.UI.Menu({
                    items: [
                        this.mnuAcceptCurrent = new Common.UI.MenuItem({
@ -1023,7 +1028,7 @@ define([
                cls         : 'btn-toolbar',
                caption     : this.txtReject,
                split       : true,
-                disabled    : this.mode.isReviewOnly || !!Common.Utils.InternalSettings.get(this.appPrefix + "accept-reject-lock"),
+                lock        : [_set.reviewChangelock, _set.isReviewOnly, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.docLockView, _set.docLockForms, _set.docLockComments, _set.docLockReview],
                menu        : this.mode.canUseReviewPermissions ? false : new Common.UI.Menu({
                    items: [
                        this.mnuRejectCurrent = new Common.UI.MenuItem({
@ -1038,6 +1043,13 @@ define([
                })
            });
            this.btnReject.render(this.$window.find('#id-review-button-reject'));
+            var arr = [this.btnAccept, this.btnReject];
+            Common.Utils.lockControls(Common.enumLock.isReviewOnly, this.mode.isReviewOnly, {array: arr});
+            Common.Utils.lockControls(Common.enumLock.docLockView, this.docProtection.isReadOnly, {array: arr});
+            Common.Utils.lockControls(Common.enumLock.docLockForms, this.docProtection.isFormsOnly, {array: arr});
+            Common.Utils.lockControls(Common.enumLock.docLockReview, this.docProtection.isReviewOnly, {array: arr});
+            Common.Utils.lockControls(Common.enumLock.docLockComments, this.docProtection.isCommentsOnly, {array: arr});
+            Common.Utils.lockControls(Common.enumLock.reviewChangelock, !!Common.Utils.InternalSettings.get(this.appPrefix + "accept-reject-lock"), {array: arr});

            var me = this;
            this.btnPrev.on('click', function (e) {
--- a/apps/common/main/lib/view/ReviewPopover.js
+++ b/apps/common/main/lib/view/ReviewPopover.js
@ -85,6 +85,7 @@ define([
                height: 120,
                header: false,
                modal: false,
+                automove: false,
                alias: 'Common.Views.ReviewPopover'
            }, options);

@ -173,6 +174,17 @@ define([
                        var text = $(this.el).find('textarea');
                        return (text && text.length) ? text.val().trim() : '';
                    },
+                    disableTextBoxButton: function(textboxEl) {
+                        var button = $(textboxEl.siblings('#id-comments-change-popover')[0]);
+
+                        if(textboxEl.val().trim().length > 0) {
+                            button.removeAttr('disabled');
+                            button.removeClass('disabled');
+                        } else {
+                            button.attr('disabled', true);
+                            button.addClass('disabled');
+                        }
+                    },
                    autoHeightTextBox: function () {
                        var view = this,
                            textBox = this.$el.find('textarea'),
@ -183,6 +195,7 @@ define([
                            oldHeight = 0,
                            newHeight = 0;

+
                        function updateTextBoxHeight() {
                            scrollPos = parentView.scroller.getScrollTop();
                            if (domTextBox.scrollHeight > domTextBox.clientHeight) {
@ -211,13 +224,20 @@ define([
                            parentView.autoScrollToEditButtons();
                        }

+                        function onTextareaInput(event) {
+                            updateTextBoxHeight();
+                            view.disableTextBoxButton($(event.target));
+                        }
+
+
                        if (textBox && textBox.length && parentView.scroller) {
                            domTextBox = textBox.get(0);

+                            view.disableTextBoxButton(textBox);
                            if (domTextBox) {
                                lineHeight = parseInt(textBox.css('lineHeight'), 10) * 0.25;
                                updateTextBoxHeight();
-                                textBox.bind('input propertychange', updateTextBoxHeight)
+                                textBox.bind('input propertychange', onTextareaInput)
                            }
                        }

@ -240,13 +260,14 @@ define([
                        el: $('#id-comments-popover'),
                        itemTemplate: _.template(replaceWords(commentsTemplate, {
                                textAddReply: me.textAddReply,
+                                textMentionReply: me.canRequestSendNotify ? (me.mentionShare ? me.textMention : me.textMentionNotify) : me.textAddReply,
                                textAdd: me.textAdd,
                                textCancel: me.textCancel,
                                textEdit: me.textEdit,
                                textReply: me.textReply,
                                textClose: me.textClose,
                                maxCommLength: Asc.c_oAscMaxCellOrCommentLength,
-                                textMention: me.canRequestSendNotify ? (me.mentionShare ? me.textMention : me.textMentionNotify) : ''
+                                textMentionComment: me.canRequestSendNotify ? (me.mentionShare ? me.textMention : me.textMentionNotify) : me.textEnterComment
                            })
                        )
                    });
@ -321,7 +342,9 @@ define([

                            if (record.get('hint')) {
                                me.fireEvent('comment:disableHint', [record]);
-                                return;
+
+                                if(!record.get('fullInfoInHint'))
+                                    return;
                            }

                            if (btn.hasClass('btn-edit')) {
@ -490,6 +513,7 @@ define([
                    this.emailMenu = new Common.UI.Menu({
                        maxHeight: 200,
                        cyclic: false,
+                        cls: 'font-size-medium',
                        items: []
                    }).on('render:after', function(mnu) {
                        this.scroller = new Common.UI.Scroller({
@ -516,8 +540,10 @@ define([
                        },
                        'animate:before': function () {
                            var text = me.$window.find('textarea');
-                            if (text && text.length)
+                            if (text && text.length){
                                text.focus();
+                                me.commentsView.disableTextBoxButton(text);
+                            }
                        }
                    });
                }
@ -1229,7 +1255,7 @@ define([
                            return (item.email && 0 === item.email.toLowerCase().indexOf(str) || item.name && 0 === item.name.toLowerCase().indexOf(str))
                        });
                    }
-                    var tpl = _.template('<a id="<%= id %>" tabindex="-1" type="menuitem" style="font-size: 12px;">' +
+                    var tpl = _.template('<a id="<%= id %>" tabindex="-1" type="menuitem">' +
                                            '<div style="overflow: hidden; text-overflow: ellipsis; max-width: 195px;"><%= Common.Utils.String.htmlEncode(caption) %></div>' +
                                            '<div style="overflow: hidden; text-overflow: ellipsis; max-width: 195px; color: #909090;"><%= Common.Utils.String.htmlEncode(options.value) %></div>' +
                                        '</a>'),
@ -1292,6 +1318,7 @@ define([
        textFollowMove          : 'Follow Move',
        textMention             : '+mention will provide access to the document and send an email',
        textMentionNotify       : '+mention will notify the user via email',
+        textEnterComment        : 'Enter your comment here',
        textViewResolved        : 'You have not permission for reopen comment',
        txtAccept: 'Accept',
        txtReject: 'Reject',
--- a/apps/common/main/lib/view/SearchBar.js
+++ b/apps/common/main/lib/view/SearchBar.js
@ -53,7 +53,8 @@ define([
            cls: 'search-bar',
            alias: 'SearchBar',
            showOpenPanel: true,
-            toolclose: 'hide'
+            toolclose: 'hide',
+            automove: false
        },

        initialize : function(options) {
--- a/apps/common/main/lib/view/SearchPanel.js
+++ b/apps/common/main/lib/view/SearchPanel.js
@ -176,6 +176,13 @@ define([
                this.$resultsContainer = $('#search-results');
                this.$resultsContainer.hide();

+                this.$searchContainer = $('#search-container');
+                this.$searchContainer.scroller = new Common.UI.Scroller({
+                    el              : $('#search-container'),
+                    useKeyboard     : true,
+                    minScrollbarLength: 40
+                });
+
                Common.NotificationCenter.on('search:updateresults', _.bind(this.disableNavButtons, this));
                if (window.SSE) {
                    this.cmbWithin = new Common.UI.ComboBox({
@ -327,10 +334,23 @@ define([
        ChangeSettings: function(props) {
        },

+        updateScrollers: function () {
+            this.$resultsContainer.scroller.update({alwaysVisibleY: true});
+            this.$searchContainer.scroller.update({alwaysVisibleY: true});
+
+            setTimeout(_.bind(function () {
+                if (this.$searchContainer.find('> .ps-scrollbar-y-rail').is(':visible')) {
+                    this.$resultsContainer.find('.ps-scrollbar-y-rail').addClass('set-left');
+                } else {
+                    this.$resultsContainer.find('.ps-scrollbar-y-rail').removeClass('set-left');
+                }
+            }, this), 100);
+        },
+
        updateResultsContainerHeight: function () {
            if (this.$resultsContainer) {
-                this.$resultsContainer.outerHeight($('#search-box').outerHeight() - $('#search-header').outerHeight() - $('#search-adv-settings').outerHeight());
-                this.$resultsContainer.scroller.update({alwaysVisibleY: true});
+                this.$resultsContainer.outerHeight(Math.max($('#search-box').outerHeight() - $('#search-header').outerHeight() - $('#search-adv-settings').outerHeight(), 112));
+                this.updateScrollers();
            }
        },

--- a/apps/common/main/lib/view/SignSettingsDialog.js
+++ b/apps/common/main/lib/view/SignSettingsDialog.js
@ -63,10 +63,7 @@ define([
            }, options || {});

            this.template = [
-                '<div class="box" style="height: 260px;">',
-                    '<div class="input-row">',
-                        '<label>' + this.textInfo + '</label>',
-                    '</div>',
+                '<div class="box" style="height: 250px;">',
                    '<div class="input-row">',
                        '<label>' + this.textInfoName + '</label>',
                    '</div>',
@ -82,7 +79,7 @@ define([
                    '<div class="input-row">',
                        '<label>' + this.textInstructions + '</label>',
                    '</div>',
-                    '<textarea id="id-dlg-sign-settings-instructions" class="form-control" style="width: 100%;height: 35px;margin-bottom: 10px;resize: none;"></textarea>',
+                    '<div id="id-dlg-sign-settings-instructions">',
                    '<div id="id-dlg-sign-settings-date"></div>',
                '</div>',
                '<div class="footer center">',
@ -124,19 +121,18 @@ define([
                disabled    : this.type=='view'
            });

-            me.textareaInstructions = this.$window.find('textarea');
-            me.textareaInstructions.keydown(function (event) {
-                if (event.keyCode == Common.UI.Keys.RETURN) {
-                    event.stopPropagation();
-                }
+            me.textareaInstructions = new Common.UI.TextareaField({
+                el          : $window.find('#id-dlg-sign-settings-instructions'),
+                style       : 'width: 100%; height: 35px;margin-bottom: 10px;',
+                value       : this.textDefInstruction,
+                disabled    : this.type=='view'
            });
-            (this.type=='view') ? this.textareaInstructions.attr('disabled', 'disabled') : this.textareaInstructions.removeAttr('disabled');
-            this.textareaInstructions.toggleClass('disabled', this.type=='view');

            this.chDate = new Common.UI.CheckBox({
                el: $('#id-dlg-sign-settings-date'),
                labelText: this.textShowDate,
-                disabled: this.type=='view'
+                disabled: this.type=='view',
+                value: 'checked'
            });

            $window.find('.dlg-btn').on('click', _.bind(this.onBtnClick, this));
@ -161,7 +157,7 @@ define([
                value = props.asc_getEmail();
                me.inputEmail.setValue(value ? value : '');
                value = props.asc_getInstructions();
-                me.textareaInstructions.val(value ? value : '');
+                me.textareaInstructions.setValue(value ? value : '');
                me.chDate.setValue(props.asc_getShowDate());

                me._currentGuid = props.asc_getGuid();
@ -175,7 +171,7 @@ define([
            props.asc_setSigner1(me.inputName.getValue());
            props.asc_setSigner2(me.inputTitle.getValue());
            props.asc_setEmail(me.inputEmail.getValue());
-            props.asc_setInstructions(me.textareaInstructions.val());
+            props.asc_setInstructions(me.textareaInstructions.getValue());
            props.asc_setShowDate(me.chDate.getValue()=='checked');
            (me._currentGuid!==undefined) && props.asc_setGuid(me._currentGuid);

@ -198,13 +194,14 @@ define([
        },

        textInfo:           'Signer Info',
-        textInfoName:       'Name',
-        textInfoTitle:      'Signer Title',
-        textInfoEmail:      'E-mail',
-        textInstructions:   'Instructions for Signer',
+        textInfoName:       'Suggested signer',
+        textInfoTitle:      'Suggested signer\'s title',
+        textInfoEmail:      'Suggested signer\'s e-mail',
+        textInstructions:   'Instructions for signer',
        txtEmpty:           'This field is required',
        textAllowComment:   'Allow signer to add comment in the signature dialog',
        textShowDate:       'Show sign date in signature line',
-        textTitle:          'Signature Setup'
+        textTitle:          'Signature Setup',
+        textDefInstruction: 'Before signing this document, verify that the content you are signing is correct.'
    }, Common.Views.SignSettingsDialog || {}))
 });
--- a/apps/common/main/lib/view/SymbolTableDialog.js
+++ b/apps/common/main/lib/view/SymbolTableDialog.js
@ -411,17 +411,17 @@ define([
            this.template = [
                '<div class="box">',
                    '<div style="margin-bottom: 16px;" class="'+ (this.special ? '' : 'hidden') +'">',
-                        '<button type="button" class="btn btn-text-default auto" id="symbol-table-symbols" style="border-top-right-radius: 0;border-bottom-right-radius: 0;">', this.textSymbols,'</button>',
-                        '<button type="button" class="btn btn-text-default auto" id="symbol-table-special" style="border-top-left-radius: 0;border-bottom-left-radius: 0;border-left-width: 0;margin-left: -1px;">', this.textSpecial,'</button>',
+                        '<button type="button" class="btn btn-text-default auto" id="symbol-table-symbols">', this.textSymbols,'</button>',
+                        '<button type="button" class="btn btn-text-default auto" id="symbol-table-special">', this.textSpecial,'</button>',
                    '</div>',
                    '<div id="symbol-table-pnl-symbols">',
                        '<table cols="2" style="width: 100%;max-width: 497px;">',
                            '<tr>',
-                                '<td style="padding-right: 5px;padding-bottom: 8px;width: 50%;">',
+                                '<td class="padding-right" style="padding-bottom: 8px;width: 50%;">',
                                    '<label class="input-label">' + this.textFont + '</label>',
                                    '<div id="symbol-table-cmb-fonts"></div>',
                                '</td>',
-                                '<td style="padding-left: 5px;padding-bottom: 8px;">',
+                                '<td class="padding-left" style="padding-bottom: 8px;">',
                                    '<label class="input-label">' + this.textRange + '</label>',
                                    '<div id="symbol-table-cmb-range"></div>',
                                '</td>',
@ -450,17 +450,17 @@ define([
                        '</table>',
                        '<table cols="2" style="width: 100%;max-width: 497px;">',
                            '<tr>',
-                                '<td style="padding-right: 5px; width: 50%;">',
+                                '<td class="padding-right" style="width: 50%;">',
                                    '<label class="input-label">' + this.textCode + '</label>',
                                '</td>',
-                                '<td style="padding-left: 5px;">',
+                                '<td class="padding-left">',
                                '</td>',
                            '</tr>',
                            '<tr>',
-                                '<td style="padding-right: 5px;">',
+                                '<td class="padding-right">',
                                    '<div id="symbol-table-text-code" oo_editor_input="true"></div>',
                                '</td>',
-                                '<td style="padding-left: 5px;">',
+                                '<td class="padding-left">',
                                    '<div id="symbol-table-label-font" style="overflow: hidden; text-overflow: ellipsis;white-space: nowrap;max-width: 160px;"></div>',
                                '</td>',
                            '</tr>',
@ -471,7 +471,7 @@ define([
                            '<tr>',
                                '<td>',
                                    '<label>' + this.textCharacter + '</label>',
-                                    '<label id="symbol-table-lbl-shortcut" style="float: right; width: 107px;">' + this.textShortcut + '</label>',
+                                    '<label id="symbol-table-lbl-shortcut" style="width: 107px;">' + this.textShortcut + '</label>',
                                '</td>',
                            '</tr>',
                            '<tr>',
@ -1093,7 +1093,7 @@ define([
                oCell.css('border-bottom', 'none');
                oRecentsDiv.append(oCell);
                if(i === (nCols - 1)){
-                    oCell.css('border-right', 'none');
+                    oCell.css(Common.UI.isRTL() ? 'border-left' : 'border-right', 'none');
                }
            }
        },
--- a/apps/common/main/resources/img/combo-border-size/BorderSize.svg
+++ b/apps/common/main/resources/img/combo-border-size/BorderSize.svg
@ -0,0 +1,81 @@
+<svg aria-hidden="true" style="position: absolute; width: 0; height: 0; overflow: hidden;" version="1.1"  xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <symbol id="half-pt" width="60" height="1" viewBox="0 0 60 1">
+        <rect opacity="0.5" width="60" height="1"/>
+    </symbol>
+    <symbol id="one-pt" width="60" height="1" viewBox="0 0 60 1">
+        <rect width="60" height="1"/>
+    </symbol>
+    <symbol id="one-and-half-pt" width="60" height="2" viewBox="0 0 60 2">
+        <rect width="60" height="2"/>
+    </symbol>
+    <symbol id="two-and-quarter-pt" width="60" height="3" viewBox="0 0 60 3">
+        <rect width="60" height="3"/>
+    </symbol>
+    <symbol id="three-pt" width="60" height="4" viewBox="0 0 60 4">
+        <rect width="60" height="4"/>
+    </symbol>
+    <symbol id="four-and-half-pt" width="60" height="6" viewBox="0 0 60 6">
+        <rect width="60" height="6"/>
+    </symbol>
+    <symbol id="six-pt" width="60" height="8" viewBox="0 0 60 8">
+        <rect width="60" height="8"/>
+    </symbol>
+    <symbol id="solid" width="60" height="3" viewBox="0 0 60 3">
+        <rect width="60" height="3"/>
+    </symbol>
+    <symbol id="dots" width="57" height="3" viewBox="0 0 57 3">
+        <path d="M0 0H3V3H0V0Z"/>
+        <path d="M6 0H9V3H6V0Z"/>
+        <path d="M12 0H15V3H12V0Z"/>
+        <path d="M18 0H21V3H18V0Z"/>
+        <path d="M24 0H27V3H24V0Z"/>
+        <path d="M30 0H33V3H30V0Z"/>
+        <path d="M36 0H39V3H36V0Z"/>
+        <path d="M42 0H45V3H42V0Z"/>
+        <path d="M48 0H51V3H48V0Z"/>
+        <path d="M54 0H57V3H54V0Z"/>
+    </symbol>
+    <symbol id="dashes" width="57" height="3" viewBox="0 0 57 3">
+        <path d="M0 0H9V3H0V0Z"/>
+        <path d="M12 0H21V3H12V0Z"/>
+        <path d="M24 0H33V3H24V0Z"/>
+        <path d="M36 0H45V3H36V0Z"/>
+        <path d="M48 0H57V3H48V0Z"/>
+    </symbol>
+    <symbol id="dashes-spaced" width="57" height="3" viewBox="0 0 57 3">
+        <path d="M0 0H9V3H0V0Z"/>
+        <path d="M16 0H25V3H16V0Z"/>
+        <path d="M32 0H41V3H32V0Z"/>
+        <path d="M48 0H57V3H48V0Z"/>
+    </symbol>
+    <symbol id="dash-dot" width="57" height="3" viewBox="0 0 57 3">
+        <path d="M0 0H12V3H0V0Z"/>
+        <path d="M21 0H24V3H21V0Z"/>
+        <path d="M33 0H45V3H33V0Z"/>
+        <path d="M54 0H57V3H54V0Z"/>
+    </symbol>
+    <symbol id="dashes-wide" width="60" height="3" viewBox="0 0 60 3">
+        <path d="M0 0H16V3H0V0Z"/>
+        <path d="M22 0H38V3H22V0Z"/>
+        <path d="M44 0H60V3H44V0Z"/>
+    </symbol>
+    <symbol id="wide-dash-dot" width="56" height="3" viewBox="0 0 56 3">
+        <path d="M0 0H16V3H0V0Z"/>
+        <path d="M31 0H47V3H31V0Z"/>
+        <path d="M22 0H25V3H22V0Z"/>
+        <path d="M53 0H56V3H53V0Z"/>
+    </symbol>
+    <symbol id="wide-dash-dot-dot" width="56" height="3" viewBox="0 0 56 3">
+        <path d="M0 0H16V3H0V0Z"/>
+        <path d="M40 0H56V3H40V0Z"/>
+        <path d="M22 0H25V3H22V0Z"/>
+        <path d="M31 0H34V3H31V0Z"/>
+    </symbol>
+</svg>
+
+
+
+
+
+
+
--- a/apps/common/main/resources/img/combo-border-size/BorderSize@1.25x.png
+++ b/apps/common/main/resources/img/combo-border-size/BorderSize@1.25x.png
--- a/apps/common/main/resources/img/combo-border-size/BorderSize@1.5x.png
+++ b/apps/common/main/resources/img/combo-border-size/BorderSize@1.5x.png
--- a/apps/common/main/resources/img/combo-border-size/BorderSize@1.75x.png
+++ b/apps/common/main/resources/img/combo-border-size/BorderSize@1.75x.png
--- a/apps/common/main/resources/img/controls/flags.png
+++ b/apps/common/main/resources/img/controls/flags.png
--- a/apps/common/main/resources/img/controls/flags@1.5x.png
+++ b/apps/common/main/resources/img/controls/flags@1.5x.png
--- a/apps/common/main/resources/img/controls/flags@2x.png
+++ b/apps/common/main/resources/img/controls/flags@2x.png
--- a/apps/common/main/resources/img/dimension-picker/dimension-highlighted.png
+++ b/apps/common/main/resources/img/dimension-picker/dimension-highlighted.png
--- a/apps/common/main/resources/img/dimension-picker/dimension-highlighted@1.25x.png
+++ b/apps/common/main/resources/img/dimension-picker/dimension-highlighted@1.25x.png
--- a/apps/common/main/resources/img/dimension-picker/dimension-highlighted@1.5x.png
+++ b/apps/common/main/resources/img/dimension-picker/dimension-highlighted@1.5x.png
--- a/apps/common/main/resources/img/dimension-picker/dimension-highlighted@1.75x.png
+++ b/apps/common/main/resources/img/dimension-picker/dimension-highlighted@1.75x.png
--- a/apps/common/main/resources/img/dimension-picker/dimension-highlighted@2x.png
+++ b/apps/common/main/resources/img/dimension-picker/dimension-highlighted@2x.png
--- a/apps/common/main/resources/img/dimension-picker/dimension-unhighlighted.png
+++ b/apps/common/main/resources/img/dimension-picker/dimension-unhighlighted.png
--- a/apps/common/main/resources/img/dimension-picker/dimension-unhighlighted@1.25x.png
+++ b/apps/common/main/resources/img/dimension-picker/dimension-unhighlighted@1.25x.png
--- a/apps/common/main/resources/img/dimension-picker/dimension-unhighlighted@1.5x.png
+++ b/apps/common/main/resources/img/dimension-picker/dimension-unhighlighted@1.5x.png
--- a/apps/common/main/resources/img/dimension-picker/dimension-unhighlighted@1.75x.png
+++ b/apps/common/main/resources/img/dimension-picker/dimension-unhighlighted@1.75x.png
--- a/apps/common/main/resources/img/dimension-picker/dimension-unhighlighted@2x.png
+++ b/apps/common/main/resources/img/dimension-picker/dimension-unhighlighted@2x.png
--- a/apps/common/main/resources/img/doc-formats/csv.svg
+++ b/apps/common/main/resources/img/doc-formats/csv.svg
@ -1,32 +1,13 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 127" version="1.1" width="100" height="127">
-<path d="M95 23V119C95 119.796 94.6839 120.559 94.1213 121.121C93.5587 121.684 92.7956 122 92 122H8C7.20435 122 6.44129 121.684 5.87868 121.121C5.31607 120.559 5 119.796 5 119V8C5 7.20435 5.31607 6.44129 5.87868 5.87868C6.44129 5.31607 7.20435 5 8 5H77L95 23Z" fill="#646464"/>
-<path opacity="0.2" d="M95 23H80C79.2044 23 78.4413 22.6839 77.8787 22.1213C77.3161 21.5587 77 20.7956 77 20V5L95 23Z" fill="black"/>
-<path d="M43.6868 106.822C43.0032 106.822 42.4739 107.08 42.0989 107.596C41.7239 108.107 41.5364 108.822 41.5364 109.74C41.5364 111.65 42.2532 112.605 43.6868 112.605C44.2883 112.605 45.0168 112.455 45.8723 112.154V113.678C45.1692 113.971 44.384 114.117 43.5168 114.117C42.2708 114.117 41.3176 113.74 40.6575 112.986C39.9973 112.229 39.6672 111.143 39.6672 109.729C39.6672 108.838 39.8293 108.059 40.1536 107.391C40.4778 106.719 40.9426 106.205 41.5481 105.85C42.1575 105.49 42.8704 105.311 43.6868 105.311C44.5188 105.311 45.3547 105.512 46.1946 105.914L45.6086 107.391C45.2883 107.238 44.9661 107.105 44.6418 106.992C44.3176 106.879 43.9993 106.822 43.6868 106.822ZM52.7571 111.621C52.7571 112.395 52.4778 113.004 51.9192 113.449C51.3645 113.895 50.5911 114.117 49.5989 114.117C48.6848 114.117 47.8762 113.945 47.1731 113.602V111.914C47.7512 112.172 48.2395 112.354 48.6379 112.459C49.0403 112.564 49.4075 112.617 49.7395 112.617C50.1379 112.617 50.4426 112.541 50.6536 112.389C50.8684 112.236 50.9758 112.01 50.9758 111.709C50.9758 111.541 50.929 111.393 50.8352 111.264C50.7415 111.131 50.6028 111.004 50.4192 110.883C50.2395 110.762 49.8704 110.568 49.3118 110.303C48.7883 110.057 48.3958 109.82 48.134 109.594C47.8723 109.367 47.6633 109.104 47.5071 108.803C47.3508 108.502 47.2727 108.15 47.2727 107.748C47.2727 106.99 47.5286 106.395 48.0403 105.961C48.5559 105.527 49.2668 105.311 50.1731 105.311C50.6184 105.311 51.0422 105.363 51.4446 105.469C51.8508 105.574 52.2747 105.723 52.7161 105.914L52.1301 107.326C51.6731 107.139 51.2942 107.008 50.9934 106.934C50.6965 106.859 50.4036 106.822 50.1145 106.822C49.7708 106.822 49.5071 106.902 49.3235 107.062C49.1399 107.223 49.0481 107.432 49.0481 107.689C49.0481 107.85 49.0852 107.99 49.1594 108.111C49.2336 108.229 49.3508 108.344 49.511 108.457C49.675 108.566 50.0598 108.766 50.6653 109.055C51.4661 109.438 52.0149 109.822 52.3118 110.209C52.6086 110.592 52.7571 111.062 52.7571 111.621ZM59.1965 105.434H61.0305L58.1184 114H56.1379L53.2317 105.434H55.0657L56.677 110.531C56.7668 110.832 56.8586 111.184 56.9524 111.586C57.05 111.984 57.1106 112.262 57.134 112.418C57.177 112.059 57.3235 111.43 57.5735 110.531L59.1965 105.434Z" fill="white"/>
-<path d="M38 90H21V92H38V90Z" fill="white"/>
-<path d="M38 83H21V85H38V83Z" fill="white"/>
-<path d="M38 76H21V78H38V76Z" fill="white"/>
-<path d="M38 69H21V71H38V69Z" fill="white"/>
-<path d="M38 62H21V64H38V62Z" fill="white"/>
-<path d="M38 55H21V57H38V55Z" fill="white"/>
-<path d="M38 48H21V50H38V48Z" fill="white"/>
-<path d="M38 41H21V43H38V41Z" fill="white"/>
-<path d="M38 34H21V36H38V34Z" fill="white"/>
-<path d="M59 90H42V92H59V90Z" fill="white"/>
-<path d="M59 83H42V85H59V83Z" fill="white"/>
-<path d="M59 76H42V78H59V76Z" fill="white"/>
-<path d="M59 69H42V71H59V69Z" fill="white"/>
-<path d="M59 62H42V64H59V62Z" fill="white"/>
-<path d="M59 55H42V57H59V55Z" fill="white"/>
-<path d="M59 48H42V50H59V48Z" fill="white"/>
-<path d="M59 41H42V43H59V41Z" fill="white"/>
-<path d="M59 34H42V36H59V34Z" fill="white"/>
-<path d="M80 90H63V92H80V90Z" fill="white"/>
-<path d="M80 83H63V85H80V83Z" fill="white"/>
-<path d="M80 76H63V78H80V76Z" fill="white"/>
-<path d="M80 69H63V71H80V69Z" fill="white"/>
-<path d="M80 62H63V64H80V62Z" fill="white"/>
-<path d="M80 55H63V57H80V55Z" fill="white"/>
-<path d="M80 48H63V50H80V48Z" fill="white"/>
-<path d="M80 41H63V43H80V41Z" fill="white"/>
-<path d="M80 34H63V36H80V34Z" fill="white"/>
+<svg width="80" height="100" viewBox="0 0 80 100" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_2964_22039)">
+<path d="M75 19V92.6667C75 93.2855 74.7542 93.879 74.3166 94.3166C73.879 94.7542 73.2855 95 72.6667 95H7.33333C6.71449 95 6.121 94.7542 5.68342 94.3166C5.24583 93.879 5 93.2855 5 92.6667V7.33333C5 6.71449 5.24583 6.121 5.68342 5.68342C6.121 5.24583 6.71449 5 7.33333 5H61L75 19Z" fill="#646464"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M31 33H21V35H31V33ZM31 38H21V40H31V38ZM21 43H31V45H21V43ZM31 48H21V50H31V48ZM21 53H31V55H21V53ZM31 58H21V60H31V58ZM21 63H31V65H21V63ZM45 33H35V35H45V33ZM45 38H35V40H45V38ZM35 43H45V45H35V43ZM45 48H35V50H45V48ZM35 53H45V55H35V53ZM45 58H35V60H45V58ZM35 63H45V65H35V63ZM49 33H59V35H49V33ZM49 38H59V40H49V38ZM59 43H49V45H59V43ZM49 48H59V50H49V48ZM59 53H49V55H59V53ZM49 58H59V60H49V58ZM59 63H49V65H59V63Z" fill="white"/>
+<path opacity="0.2" d="M75 19H63.3333C62.7145 19 62.121 18.7542 61.6834 18.3166C61.2458 17.879 61 17.2855 61 16.6667V5L75 19Z" fill="black"/>
+<path d="M33.6836 79.8223C33.3359 79.8223 33.0273 79.8906 32.7578 80.0273C32.4922 80.1602 32.2676 80.3535 32.084 80.6074C31.9043 80.8613 31.7676 81.168 31.6738 81.5273C31.5801 81.8867 31.5332 82.291 31.5332 82.7402C31.5332 83.3457 31.6074 83.8633 31.7559 84.293C31.9082 84.7188 32.1426 85.0449 32.459 85.2715C32.7754 85.4941 33.1836 85.6055 33.6836 85.6055C34.0312 85.6055 34.3789 85.5664 34.7266 85.4883C35.0781 85.4102 35.459 85.2988 35.8691 85.1543V86.6777C35.4902 86.834 35.1172 86.9453 34.75 87.0117C34.3828 87.082 33.9707 87.1172 33.5137 87.1172C32.6309 87.1172 31.9043 86.9355 31.334 86.5723C30.7676 86.2051 30.3477 85.6934 30.0742 85.0371C29.8008 84.377 29.6641 83.6074 29.6641 82.7285C29.6641 82.0801 29.752 81.4863 29.9277 80.9473C30.1035 80.4082 30.3613 79.9414 30.7012 79.5469C31.041 79.1523 31.4609 78.8477 31.9609 78.6328C32.4609 78.418 33.0352 78.3105 33.6836 78.3105C34.1094 78.3105 34.5352 78.3652 34.9609 78.4746C35.3906 78.5801 35.8008 78.7266 36.1914 78.9141L35.6055 80.3906C35.2852 80.2383 34.9629 80.1055 34.6387 79.9922C34.3145 79.8789 33.9961 79.8223 33.6836 79.8223ZM42.7539 84.6211C42.7539 85.1289 42.6309 85.5703 42.3848 85.9453C42.1387 86.3203 41.7793 86.6094 41.3066 86.8125C40.8379 87.0156 40.2676 87.1172 39.5957 87.1172C39.2988 87.1172 39.0078 87.0977 38.7227 87.0586C38.4414 87.0195 38.1699 86.9629 37.9082 86.8887C37.6504 86.8105 37.4043 86.7148 37.1699 86.6016V84.9141C37.5762 85.0938 37.998 85.2559 38.4355 85.4004C38.873 85.5449 39.3066 85.6172 39.7363 85.6172C40.0332 85.6172 40.2715 85.5781 40.4512 85.5C40.6348 85.4219 40.7676 85.3145 40.8496 85.1777C40.9316 85.041 40.9727 84.8848 40.9727 84.709C40.9727 84.4941 40.9004 84.3105 40.7559 84.1582C40.6113 84.0059 40.4121 83.8633 40.1582 83.7305C39.9082 83.5977 39.625 83.4551 39.3086 83.3027C39.1094 83.209 38.8926 83.0957 38.6582 82.9629C38.4238 82.8262 38.2012 82.6602 37.9902 82.4648C37.7793 82.2695 37.6055 82.0332 37.4688 81.7559C37.3359 81.4746 37.2695 81.1387 37.2695 80.748C37.2695 80.2363 37.3867 79.7988 37.6211 79.4355C37.8555 79.0723 38.1895 78.7949 38.623 78.6035C39.0605 78.4082 39.5762 78.3105 40.1699 78.3105C40.6152 78.3105 41.0391 78.3633 41.4414 78.4688C41.8477 78.5703 42.2715 78.7188 42.7129 78.9141L42.127 80.3262C41.7324 80.166 41.3789 80.043 41.0664 79.957C40.7539 79.8672 40.4355 79.8223 40.1113 79.8223C39.8848 79.8223 39.6914 79.8594 39.5312 79.9336C39.3711 80.0039 39.25 80.1055 39.168 80.2383C39.0859 80.3672 39.0449 80.5176 39.0449 80.6895C39.0449 80.8926 39.1035 81.0645 39.2207 81.2051C39.3418 81.3418 39.5215 81.4746 39.7598 81.6035C40.002 81.7324 40.3027 81.8828 40.6621 82.0547C41.0996 82.2617 41.4727 82.4785 41.7812 82.7051C42.0938 82.9277 42.334 83.1914 42.502 83.4961C42.6699 83.7969 42.7539 84.1719 42.7539 84.6211ZM51.0273 78.4336L48.1152 87H46.1348L43.2285 78.4336H45.0625L46.6738 83.5312C46.7012 83.6172 46.7461 83.7793 46.8086 84.0176C46.8711 84.252 46.9336 84.502 46.9961 84.7676C47.0625 85.0293 47.1074 85.2461 47.1309 85.418C47.1543 85.2461 47.1953 85.0293 47.2539 84.7676C47.3164 84.5059 47.377 84.2578 47.4355 84.0234C47.498 83.7852 47.543 83.6211 47.5703 83.5312L49.1934 78.4336H51.0273Z" fill="white"/>
+</g>
+<defs>
+<clipPath id="clip0_2964_22039">
+<rect width="80" height="100" fill="white"/>
+</clipPath>
+</defs>
 </svg>
--- a/apps/common/main/resources/img/doc-formats/djvu.svg
+++ b/apps/common/main/resources/img/doc-formats/djvu.svg
@ -1,18 +1,13 @@
-<svg style="position: absolute; width: 0; height: 0; overflow: hidden;" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 127" version="1.1" width="100" height="127">
-<symbol id="svg-format-djvu">
-  <path d="M95 23V119C95 119.796 94.6839 120.559 94.1213 121.121C93.5587 121.684 92.7956 122 92 122H8C7.20435 122 6.44129 121.684 5.87868 121.121C5.31607 120.559 5 119.796 5 119V8C5 7.20435 5.31607 6.44129 5.87868 5.87868C6.44129 5.31607 7.20435 5 8 5H77L95 23Z" fill="#BC8C18"/>
-  <path opacity="0.2" d="M95 23H80C79.2044 23 78.4413 22.6839 77.8787 22.1213C77.3161 21.5587 77 20.7956 77 20V5L95 23Z" fill="black"/>
-  <path d="M44.5845 109.635C44.5845 111.045 44.1821 112.125 43.3774 112.875C42.5767 113.625 41.4185 114 39.9028 114H37.4771V105.434H40.1665C41.5649 105.434 42.6509 105.803 43.4243 106.541C44.1978 107.279 44.5845 108.311 44.5845 109.635ZM42.6978 109.682C42.6978 107.842 41.8853 106.922 40.2603 106.922H39.2935V112.5H40.0728C41.8228 112.5 42.6978 111.561 42.6978 109.682ZM45.6919 116.883C45.2349 116.883 44.8423 116.834 44.5142 116.736V115.33C44.7876 115.404 45.0669 115.441 45.3521 115.441C45.6528 115.441 45.8716 115.357 46.0083 115.189C46.1489 115.021 46.2192 114.773 46.2192 114.445V107.449H48.0063V114.709C48.0063 115.404 47.8052 115.939 47.4028 116.314C47.0005 116.693 46.4302 116.883 45.6919 116.883ZM46.1431 105.756C46.1431 105.174 46.4673 104.883 47.1157 104.883C47.7642 104.883 48.0884 105.174 48.0884 105.756C48.0884 106.033 48.0063 106.25 47.8423 106.406C47.6821 106.559 47.4399 106.635 47.1157 106.635C46.4673 106.635 46.1431 106.342 46.1431 105.756ZM54.9146 105.434H56.7485L53.8364 114H51.856L48.9497 105.434H50.7837L52.395 110.531C52.4849 110.832 52.5767 111.184 52.6704 111.586C52.7681 111.984 52.8286 112.262 52.8521 112.418C52.895 112.059 53.0415 111.43 53.2915 110.531L54.9146 105.434ZM62.3325 114L62.0923 113.162H61.9985C61.8071 113.467 61.5356 113.703 61.1841 113.871C60.8325 114.035 60.4321 114.117 59.9829 114.117C59.2134 114.117 58.6333 113.912 58.2427 113.502C57.8521 113.088 57.6567 112.494 57.6567 111.721V107.449H59.4438V111.275C59.4438 111.748 59.5278 112.104 59.6958 112.342C59.8638 112.576 60.1313 112.693 60.4985 112.693C60.9985 112.693 61.3599 112.527 61.5825 112.195C61.8052 111.859 61.9165 111.305 61.9165 110.531V107.449H63.7036V114H62.3325Z" fill="white"/>
-  <path fill-rule="evenodd" clip-rule="evenodd" d="M27 58V52V50H29H35H44H50H52V52V58H50V52H44V74H49V76H44H35H30V74H35V52H29V58H27Z" fill="white"/>
-  <path fill-rule="evenodd" clip-rule="evenodd" d="M27 58V52V50H29H35H44H50H52V52V58H50V52H44V74H49V76H44H35H30V74H35V52H29V58H27Z" fill="white"/>
-  <rect x="55" y="50" width="19" height="2" fill="white"/>
-  <rect x="55" y="50" width="19" height="2" fill="white"/>
-  <rect x="55" y="58" width="19" height="2" fill="white"/>
-  <rect x="55" y="58" width="19" height="2" fill="white"/>
-  <rect x="55" y="66" width="19" height="2" fill="white"/>
-  <rect x="55" y="66" width="19" height="2" fill="white"/>
-  <rect x="55" y="74" width="19" height="2" fill="white"/>
-  <rect x="55" y="74" width="19" height="2" fill="white"/>
-  <path fill-rule="evenodd" clip-rule="evenodd" d="M80 43.4348H21V82.5653H80V43.4348ZM19 41.4348V84.5653H82V41.4348H19Z" fill="white"/>
-  </symbol>
+<svg width="80" height="100" viewBox="0 0 80 100" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_2966_22077)">
+<path d="M75 19V92.6667C75 93.2855 74.7542 93.879 74.3166 94.3166C73.879 94.7542 73.2855 95 72.6667 95H7.33333C6.71449 95 6.121 94.7542 5.68342 94.3166C5.24583 93.879 5 93.2855 5 92.6667V7.33333C5 6.71449 5.24583 6.121 5.68342 5.68342C6.121 5.24583 6.71449 5 7.33333 5H61L75 19Z" fill="#BC8C18"/>
+<path opacity="0.2" d="M75 19H63.3333C62.7145 19 62.121 18.7542 61.6834 18.3166C61.2458 17.879 61 17.2855 61 16.6667V5L75 19Z" fill="black"/>
+<path d="M33.3203 82.6348C33.3203 83.5996 33.1348 84.4062 32.7637 85.0547C32.3965 85.6992 31.8633 86.1855 31.1641 86.5137C30.4648 86.8379 29.623 87 28.6387 87H26.2129V78.4336H28.9023C29.8008 78.4336 30.5801 78.5938 31.2402 78.9141C31.9004 79.2305 32.4121 79.7012 32.7754 80.3262C33.1387 80.9473 33.3203 81.7168 33.3203 82.6348ZM31.4336 82.6816C31.4336 82.0488 31.3398 81.5293 31.1523 81.123C30.9688 80.7129 30.6953 80.4102 30.332 80.2148C29.9727 80.0195 29.5273 79.9219 28.9961 79.9219H28.0293V85.5H28.8086C29.6953 85.5 30.3535 85.2637 30.7832 84.791C31.2168 84.3184 31.4336 83.6152 31.4336 82.6816ZM34.1992 89.5195C33.9648 89.5195 33.7598 89.5059 33.584 89.4785C33.4043 89.4551 33.252 89.4258 33.127 89.3906V87.8789C33.252 87.9062 33.3867 87.9316 33.5312 87.9551C33.6719 87.9824 33.8223 87.9961 33.9824 87.9961C34.1934 87.9961 34.3828 87.9551 34.5508 87.873C34.7188 87.7949 34.8516 87.6445 34.9492 87.4219C35.0469 87.1992 35.0957 86.8789 35.0957 86.4609V78.4336H36.9121V86.4492C36.9121 87.1836 36.7969 87.7754 36.5664 88.2246C36.3398 88.6777 36.0215 89.0059 35.6113 89.209C35.2051 89.416 34.7344 89.5195 34.1992 89.5195ZM45.7891 78.4336L42.877 87H40.8965L37.9902 78.4336H39.8242L41.4355 83.5312C41.4629 83.6172 41.5078 83.7793 41.5703 84.0176C41.6328 84.252 41.6953 84.502 41.7578 84.7676C41.8242 85.0293 41.8691 85.2461 41.8926 85.418C41.916 85.2461 41.957 85.0293 42.0156 84.7676C42.0781 84.5059 42.1387 84.2578 42.1973 84.0234C42.2598 83.7852 42.3047 83.6211 42.332 83.5312L43.9551 78.4336H45.7891ZM53.8457 78.4336V83.9766C53.8457 84.5664 53.7148 85.0996 53.4531 85.5762C53.1953 86.0488 52.8027 86.4238 52.2754 86.7012C51.752 86.9785 51.0918 87.1172 50.2949 87.1172C49.1621 87.1172 48.2988 86.8281 47.7051 86.25C47.1113 85.6719 46.8145 84.9062 46.8145 83.9531V78.4336H48.625V83.6777C48.625 84.3848 48.7695 84.8809 49.0586 85.166C49.3477 85.4512 49.7754 85.5938 50.3418 85.5938C50.7402 85.5938 51.0625 85.5254 51.3086 85.3887C51.5586 85.252 51.7422 85.041 51.8594 84.7559C51.9766 84.4707 52.0352 84.1074 52.0352 83.666V78.4336H53.8457Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M39 60V37.5C39 37.5 33.375 33.6429 24 33V54.2143C24 54.2143 34.625 54.8571 39 60ZM56 54.2143V33C46.625 33.6429 41 37.5 41 37.5V60C45.375 54.8571 56 54.2143 56 54.2143ZM57.1 57.2927V37H59V59.1951C59 59.1951 50.7667 57.9268 40 63C29.2333 57.9268 21 59.1951 21 59.1951V37H22.9V57.2927C22.9 57.2927 32.4 57.2927 40 62.5561C47.6 57.2927 57.1 57.2927 57.1 57.2927Z" fill="white"/>
+</g>
+<defs>
+<clipPath id="clip0_2966_22077">
+<rect width="80" height="100" fill="white"/>
+</clipPath>
+</defs>
 </svg>
--- a/apps/common/main/resources/img/doc-formats/docm.svg
+++ b/apps/common/main/resources/img/doc-formats/docm.svg
@ -1,10 +1,14 @@
-<svg style="position: absolute; width: 0; height: 0; overflow: hidden;" width="100" height="127" viewBox="0 0 100 127" fill="none" xmlns="http://www.w3.org/2000/svg">
-
-<path d="M95 23V119C95 119.796 94.6839 120.559 94.1213 121.121C93.5587 121.684 92.7956 122 92 122H8C7.20435 122 6.44129 121.684 5.87868 121.121C5.31607 120.559 5 119.796 5 119V8C5 7.20435 5.31607 6.44129 5.87868 5.87868C6.44129 5.31607 7.20435 5 8 5H77L95 23Z" fill="#214479"/>
-<path opacity="0.2" d="M95 23H80C79.2044 23 78.4413 22.6839 77.8787 22.1213C77.3161 21.5587 77 20.7956 77 20V5L95 23Z" fill="black"/>
-<path d="M39.4824 109.635C39.4824 111.045 39.0801 112.125 38.2754 112.875C37.4746 113.625 36.3164 114 34.8008 114H32.375V105.434H35.0645C36.4629 105.434 37.5488 105.803 38.3223 106.541C39.0957 107.279 39.4824 108.311 39.4824 109.635ZM37.5957 109.682C37.5957 107.842 36.7832 106.922 35.1582 106.922H34.1914V112.5H34.9707C36.7207 112.5 37.5957 111.561 37.5957 109.682ZM49.0332 109.705C49.0332 111.123 48.6816 112.213 47.9785 112.975C47.2754 113.736 46.2676 114.117 44.9551 114.117C43.6426 114.117 42.6348 113.736 41.9316 112.975C41.2285 112.213 40.877 111.119 40.877 109.693C40.877 108.268 41.2285 107.18 41.9316 106.43C42.6387 105.676 43.6504 105.299 44.9668 105.299C46.2832 105.299 47.2891 105.678 47.9844 106.436C48.6836 107.193 49.0332 108.283 49.0332 109.705ZM42.7812 109.705C42.7812 110.662 42.9629 111.383 43.3262 111.867C43.6895 112.352 44.2324 112.594 44.9551 112.594C46.4043 112.594 47.1289 111.631 47.1289 109.705C47.1289 107.775 46.4082 106.811 44.9668 106.811C44.2441 106.811 43.6992 107.055 43.332 107.543C42.9648 108.027 42.7812 108.748 42.7812 109.705ZM54.4473 106.822C53.7637 106.822 53.2344 107.08 52.8594 107.596C52.4844 108.107 52.2969 108.822 52.2969 109.74C52.2969 111.65 53.0137 112.605 54.4473 112.605C55.0488 112.605 55.7773 112.455 56.6328 112.154V113.678C55.9297 113.971 55.1445 114.117 54.2773 114.117C53.0312 114.117 52.0781 113.74 51.418 112.986C50.7578 112.229 50.4277 111.143 50.4277 109.729C50.4277 108.838 50.5898 108.059 50.9141 107.391C51.2383 106.719 51.7031 106.205 52.3086 105.85C52.918 105.49 53.6309 105.311 54.4473 105.311C55.2793 105.311 56.1152 105.512 56.9551 105.914L56.3691 107.391C56.0488 107.238 55.7266 107.105 55.4023 106.992C55.0781 106.879 54.7598 106.822 54.4473 106.822ZM62.0879 114L60.0254 107.279H59.9727C60.0469 108.646 60.084 109.559 60.084 110.016V114H58.4609V105.434H60.9336L62.9609 111.984H62.9961L65.1465 105.434H67.6191V114H65.9258V109.945C65.9258 109.754 65.9277 109.533 65.9316 109.283C65.9395 109.033 65.9668 108.369 66.0137 107.291H65.9609L63.752 114H62.0879Z" fill="white"/>
-<path d="M67.8 48L61.5 75L54.5 48H51.5H48.5L41.5 75L35.2 48H29.4L37.9 82H44.3L51.5 54.1L58.7 82H65.1L73.6 48H67.8Z" fill="white"/>
-<path d="M15 17C15 15.8954 15.8954 15 17 15H29C30.1046 15 31 15.8954 31 17V26C31 27.1046 30.1046 28 29 28H17C15.8954 28 15 27.1046 15 26V17Z" fill="white"/>
-<path d="M22.2969 26L19.8125 18.8457H19.7656C19.832 19.9082 19.8652 20.9043 19.8652 21.834V26H18.5938V17.4336H20.5684L22.9473 24.248H22.9824L25.4316 17.4336H27.4121V26H26.0645V21.7637C26.0645 21.3379 26.0742 20.7832 26.0938 20.0996C26.1172 19.416 26.1367 19.002 26.1523 18.8574H26.1055L23.5332 26H22.2969Z" fill="#214479"/>
-
+<svg width="80" height="100" viewBox="0 0 80 100" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_2964_22032)">
+<path d="M75 19V92.6667C75 93.2855 74.7542 93.879 74.3166 94.3166C73.879 94.7542 73.2855 95 72.6667 95H7.33333C6.71449 95 6.121 94.7542 5.68342 94.3166C5.24583 93.879 5 93.2855 5 92.6667V7.33333C5 6.71449 5.24583 6.121 5.68342 5.68342C6.121 5.24583 6.71449 5 7.33333 5H61L75 19Z" fill="#214479"/>
+<path opacity="0.2" d="M75 19H63.3333C62.7145 19 62.121 18.7542 61.6834 18.3166C61.2458 17.879 61 17.2855 61 16.6667V5L75 19Z" fill="black"/>
+<path d="M29.4824 82.6348C29.4824 83.5996 29.2969 84.4062 28.9258 85.0547C28.5586 85.6992 28.0254 86.1855 27.3262 86.5137C26.627 86.8379 25.7852 87 24.8008 87H22.375V78.4336H25.0645C25.9629 78.4336 26.7422 78.5938 27.4023 78.9141C28.0625 79.2305 28.5742 79.7012 28.9375 80.3262C29.3008 80.9473 29.4824 81.7168 29.4824 82.6348ZM27.5957 82.6816C27.5957 82.0488 27.502 81.5293 27.3145 81.123C27.1309 80.7129 26.8574 80.4102 26.4941 80.2148C26.1348 80.0195 25.6895 79.9219 25.1582 79.9219H24.1914V85.5H24.9707C25.8574 85.5 26.5156 85.2637 26.9453 84.791C27.3789 84.3184 27.5957 83.6152 27.5957 82.6816ZM39.0332 82.7051C39.0332 83.3652 38.9512 83.9668 38.7871 84.5098C38.623 85.0488 38.373 85.5137 38.0371 85.9043C37.7051 86.2949 37.2832 86.5957 36.7715 86.8066C36.2598 87.0137 35.6543 87.1172 34.9551 87.1172C34.2559 87.1172 33.6504 87.0137 33.1387 86.8066C32.627 86.5957 32.2031 86.2949 31.8672 85.9043C31.5352 85.5137 31.2871 85.0469 31.123 84.5039C30.959 83.9609 30.877 83.3574 30.877 82.6934C30.877 81.8066 31.0215 81.0352 31.3105 80.3789C31.6035 79.7188 32.0527 79.207 32.6582 78.8438C33.2637 78.4805 34.0332 78.2988 34.9668 78.2988C35.8965 78.2988 36.6602 78.4805 37.2578 78.8438C37.8594 79.207 38.3047 79.7188 38.5938 80.3789C38.8867 81.0391 39.0332 81.8145 39.0332 82.7051ZM32.7812 82.7051C32.7812 83.3027 32.8555 83.8184 33.0039 84.252C33.1562 84.6816 33.3926 85.0137 33.7129 85.248C34.0332 85.4785 34.4473 85.5938 34.9551 85.5938C35.4707 85.5938 35.8887 85.4785 36.209 85.248C36.5293 85.0137 36.7617 84.6816 36.9062 84.252C37.0547 83.8184 37.1289 83.3027 37.1289 82.7051C37.1289 81.8066 36.9609 81.0996 36.625 80.584C36.2891 80.0684 35.7363 79.8105 34.9668 79.8105C34.4551 79.8105 34.0371 79.9277 33.7129 80.1621C33.3926 80.3926 33.1562 80.7246 33.0039 81.1582C32.8555 81.5879 32.7812 82.1035 32.7812 82.7051ZM44.4473 79.8223C44.0996 79.8223 43.791 79.8906 43.5215 80.0273C43.2559 80.1602 43.0312 80.3535 42.8477 80.6074C42.668 80.8613 42.5312 81.168 42.4375 81.5273C42.3438 81.8867 42.2969 82.291 42.2969 82.7402C42.2969 83.3457 42.3711 83.8633 42.5195 84.293C42.6719 84.7188 42.9062 85.0449 43.2227 85.2715C43.5391 85.4941 43.9473 85.6055 44.4473 85.6055C44.7949 85.6055 45.1426 85.5664 45.4902 85.4883C45.8418 85.4102 46.2227 85.2988 46.6328 85.1543V86.6777C46.2539 86.834 45.8809 86.9453 45.5137 87.0117C45.1465 87.082 44.7344 87.1172 44.2773 87.1172C43.3945 87.1172 42.668 86.9355 42.0977 86.5723C41.5312 86.2051 41.1113 85.6934 40.8379 85.0371C40.5645 84.377 40.4277 83.6074 40.4277 82.7285C40.4277 82.0801 40.5156 81.4863 40.6914 80.9473C40.8672 80.4082 41.125 79.9414 41.4648 79.5469C41.8047 79.1523 42.2246 78.8477 42.7246 78.6328C43.2246 78.418 43.7988 78.3105 44.4473 78.3105C44.873 78.3105 45.2988 78.3652 45.7246 78.4746C46.1543 78.5801 46.5645 78.7266 46.9551 78.9141L46.3691 80.3906C46.0488 80.2383 45.7266 80.1055 45.4023 79.9922C45.0781 79.8789 44.7598 79.8223 44.4473 79.8223ZM52.0879 87L50.0254 80.2793H49.9727C49.9805 80.4395 49.9922 80.6816 50.0078 81.0059C50.0273 81.3262 50.0449 81.668 50.0605 82.0312C50.0762 82.3945 50.084 82.7227 50.084 83.0156V87H48.4609V78.4336H50.9336L52.9609 84.9844H52.9961L55.1465 78.4336H57.6191V87H55.9258V82.9453C55.9258 82.6758 55.9297 82.3652 55.9375 82.0137C55.9492 81.6621 55.9629 81.3281 55.9785 81.0117C55.9941 80.6914 56.0059 80.4512 56.0137 80.291H55.9609L53.752 87H52.0879Z" fill="white"/>
+<path d="M51.8009 36L47.2398 56.6471L42.1719 36H40H37.8281L32.7602 56.6471L28.1991 36H24L30.1538 62H34.7873L40 40.6647L45.2127 62H49.8462L56 36H51.8009Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12 10C10.8954 10 10 10.8954 10 12V21C10 22.1046 10.8954 23 12 23H21C22.1046 23 23 22.1046 23 21V12C23 10.8954 22.1046 10 21 10H12ZM14.6641 12.8906H13.9902H13.4238H12.7549V20H14.2148V17.9785L14.0691 14.6767L15.9922 20H16.9883L18.9114 14.6767L18.7656 17.9785V20H20.2305V12.8906H19.5566H18.9902H18.3164L16.4902 18.1104L14.6641 12.8906Z" fill="white"/>
+</g>
+<defs>
+<clipPath id="clip0_2964_22032">
+<rect width="80" height="100" fill="white"/>
+</clipPath>
+</defs>
 </svg>
--- a/apps/common/main/resources/img/doc-formats/docx.svg
+++ b/apps/common/main/resources/img/doc-formats/docx.svg
@ -1,6 +1,13 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 127" version="1.1" width="100" height="127">
-<path d="M95 23V119C95 119.796 94.6839 120.559 94.1213 121.121C93.5587 121.684 92.7956 122 92 122H8C7.20435 122 6.44129 121.684 5.87868 121.121C5.31607 120.559 5 119.796 5 119V8C5 7.20435 5.31607 6.44129 5.87868 5.87868C6.44129 5.31607 7.20435 5 8 5H77L95 23Z" fill="#214479"/>
-<path opacity="0.2" d="M95 23H80C79.2044 23 78.4413 22.6839 77.8787 22.1213C77.3161 21.5587 77 20.7956 77 20V5L95 23Z" fill="black"/>
-<path d="M41.6406 109.635C41.6406 111.045 41.2383 112.125 40.4336 112.875C39.6328 113.625 38.4746 114 36.959 114H34.5332V105.434H37.2227C38.6211 105.434 39.707 105.803 40.4805 106.541C41.2539 107.279 41.6406 108.311 41.6406 109.635ZM39.7539 109.682C39.7539 107.842 38.9414 106.922 37.3164 106.922H36.3496V112.5H37.1289C38.8789 112.5 39.7539 111.561 39.7539 109.682ZM51.1914 109.705C51.1914 111.123 50.8398 112.213 50.1367 112.975C49.4336 113.736 48.4258 114.117 47.1133 114.117C45.8008 114.117 44.793 113.736 44.0898 112.975C43.3867 112.213 43.0352 111.119 43.0352 109.693C43.0352 108.268 43.3867 107.18 44.0898 106.43C44.7969 105.676 45.8086 105.299 47.125 105.299C48.4414 105.299 49.4473 105.678 50.1426 106.436C50.8418 107.193 51.1914 108.283 51.1914 109.705ZM44.9395 109.705C44.9395 110.662 45.1211 111.383 45.4844 111.867C45.8477 112.352 46.3906 112.594 47.1133 112.594C48.5625 112.594 49.2871 111.631 49.2871 109.705C49.2871 107.775 48.5664 106.811 47.125 106.811C46.4023 106.811 45.8574 107.055 45.4902 107.543C45.123 108.027 44.9395 108.748 44.9395 109.705ZM56.6055 106.822C55.9219 106.822 55.3926 107.08 55.0176 107.596C54.6426 108.107 54.4551 108.822 54.4551 109.74C54.4551 111.65 55.1719 112.605 56.6055 112.605C57.207 112.605 57.9355 112.455 58.791 112.154V113.678C58.0879 113.971 57.3027 114.117 56.4355 114.117C55.1895 114.117 54.2363 113.74 53.5762 112.986C52.916 112.229 52.5859 111.143 52.5859 109.729C52.5859 108.838 52.748 108.059 53.0723 107.391C53.3965 106.719 53.8613 106.205 54.4668 105.85C55.0762 105.49 55.7891 105.311 56.6055 105.311C57.4375 105.311 58.2734 105.512 59.1133 105.914L58.5273 107.391C58.207 107.238 57.8848 107.105 57.5605 106.992C57.2363 106.879 56.918 106.822 56.6055 106.822ZM67.5449 114H65.4707L63.4785 110.76L61.4863 114H59.541L62.3828 109.582L59.7227 105.434H61.7266L63.5723 108.516L65.3828 105.434H67.3398L64.6504 109.682L67.5449 114Z" fill="white"/>
-<path d="M67.8 48L61.5 75L54.5 48H51.5H48.5L41.5 75L35.2 48H29.4L37.9 82H44.3L51.5 54.1L58.7 82H65.1L73.6 48H67.8Z" fill="white"/>
+<svg width="80" height="100" viewBox="0 0 80 100" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_2964_22056)">
+<path d="M75 19V92.6667C75 93.2855 74.7542 93.879 74.3166 94.3166C73.879 94.7542 73.2855 95 72.6667 95H7.33333C6.71449 95 6.121 94.7542 5.68342 94.3166C5.24583 93.879 5 93.2855 5 92.6667V7.33333C5 6.71449 5.24583 6.121 5.68342 5.68342C6.121 5.24583 6.71449 5 7.33333 5H61L75 19Z" fill="#214479"/>
+<path opacity="0.2" d="M75 19H63.3333C62.7145 19 62.121 18.7542 61.6834 18.3166C61.2458 17.879 61 17.2855 61 16.6667V5L75 19Z" fill="black"/>
+<path d="M31.1406 82.6348C31.1406 83.5996 30.9551 84.4062 30.584 85.0547C30.2168 85.6992 29.6836 86.1855 28.9844 86.5137C28.2852 86.8379 27.4434 87 26.459 87H24.0332V78.4336H26.7227C27.6211 78.4336 28.4004 78.5938 29.0605 78.9141C29.7207 79.2305 30.2324 79.7012 30.5957 80.3262C30.959 80.9473 31.1406 81.7168 31.1406 82.6348ZM29.2539 82.6816C29.2539 82.0488 29.1602 81.5293 28.9727 81.123C28.7891 80.7129 28.5156 80.4102 28.1523 80.2148C27.793 80.0195 27.3477 79.9219 26.8164 79.9219H25.8496V85.5H26.6289C27.5156 85.5 28.1738 85.2637 28.6035 84.791C29.0371 84.3184 29.2539 83.6152 29.2539 82.6816ZM40.6914 82.7051C40.6914 83.3652 40.6094 83.9668 40.4453 84.5098C40.2812 85.0488 40.0312 85.5137 39.6953 85.9043C39.3633 86.2949 38.9414 86.5957 38.4297 86.8066C37.918 87.0137 37.3125 87.1172 36.6133 87.1172C35.9141 87.1172 35.3086 87.0137 34.7969 86.8066C34.2852 86.5957 33.8613 86.2949 33.5254 85.9043C33.1934 85.5137 32.9453 85.0469 32.7812 84.5039C32.6172 83.9609 32.5352 83.3574 32.5352 82.6934C32.5352 81.8066 32.6797 81.0352 32.9688 80.3789C33.2617 79.7188 33.7109 79.207 34.3164 78.8438C34.9219 78.4805 35.6914 78.2988 36.625 78.2988C37.5547 78.2988 38.3184 78.4805 38.916 78.8438C39.5176 79.207 39.9629 79.7188 40.252 80.3789C40.5449 81.0391 40.6914 81.8145 40.6914 82.7051ZM34.4395 82.7051C34.4395 83.3027 34.5137 83.8184 34.6621 84.252C34.8145 84.6816 35.0508 85.0137 35.3711 85.248C35.6914 85.4785 36.1055 85.5938 36.6133 85.5938C37.1289 85.5938 37.5469 85.4785 37.8672 85.248C38.1875 85.0137 38.4199 84.6816 38.5645 84.252C38.7129 83.8184 38.7871 83.3027 38.7871 82.7051C38.7871 81.8066 38.6191 81.0996 38.2832 80.584C37.9473 80.0684 37.3945 79.8105 36.625 79.8105C36.1133 79.8105 35.6953 79.9277 35.3711 80.1621C35.0508 80.3926 34.8145 80.7246 34.6621 81.1582C34.5137 81.5879 34.4395 82.1035 34.4395 82.7051ZM46.1055 79.8223C45.7578 79.8223 45.4492 79.8906 45.1797 80.0273C44.9141 80.1602 44.6895 80.3535 44.5059 80.6074C44.3262 80.8613 44.1895 81.168 44.0957 81.5273C44.002 81.8867 43.9551 82.291 43.9551 82.7402C43.9551 83.3457 44.0293 83.8633 44.1777 84.293C44.3301 84.7188 44.5645 85.0449 44.8809 85.2715C45.1973 85.4941 45.6055 85.6055 46.1055 85.6055C46.4531 85.6055 46.8008 85.5664 47.1484 85.4883C47.5 85.4102 47.8809 85.2988 48.291 85.1543V86.6777C47.9121 86.834 47.5391 86.9453 47.1719 87.0117C46.8047 87.082 46.3926 87.1172 45.9355 87.1172C45.0527 87.1172 44.3262 86.9355 43.7559 86.5723C43.1895 86.2051 42.7695 85.6934 42.4961 85.0371C42.2227 84.377 42.0859 83.6074 42.0859 82.7285C42.0859 82.0801 42.1738 81.4863 42.3496 80.9473C42.5254 80.4082 42.7832 79.9414 43.123 79.5469C43.4629 79.1523 43.8828 78.8477 44.3828 78.6328C44.8828 78.418 45.457 78.3105 46.1055 78.3105C46.5312 78.3105 46.957 78.3652 47.3828 78.4746C47.8125 78.5801 48.2227 78.7266 48.6133 78.9141L48.0273 80.3906C47.707 80.2383 47.3848 80.1055 47.0605 79.9922C46.7363 79.8789 46.418 79.8223 46.1055 79.8223ZM57.0449 87H54.9707L52.9785 83.7598L50.9863 87H49.041L51.8828 82.582L49.2227 78.4336H51.2266L53.0723 81.5156L54.8828 78.4336H56.8398L54.1504 82.6816L57.0449 87Z" fill="white"/>
+<path d="M51.8009 36L47.2398 56.6471L42.1719 36H40H37.8281L32.7602 56.6471L28.1991 36H24L30.1538 62H34.7873L40 40.6647L45.2127 62H49.8462L56 36H51.8009Z" fill="white"/>
+</g>
+<defs>
+<clipPath id="clip0_2964_22056">
+<rect width="80" height="100" fill="white"/>
+</clipPath>
+</defs>
 </svg>
--- a/apps/common/main/resources/img/doc-formats/docxf.svg
+++ b/apps/common/main/resources/img/doc-formats/docxf.svg
@ -1,14 +1,14 @@
-<svg width="100" height="127" viewBox="0 0 100 127" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g>    <path id="Vector" d="M95 23V119C95 119.796 94.6839 120.559 94.1213 121.121C93.5587 121.684 92.7956 122 92 122H8C7.20435 122 6.44129 121.684 5.87868 121.121C5.31607 120.559 5 119.796 5 119V8C5 7.20435 5.31607 6.44129 5.87868 5.87868C6.44129 5.31607 7.20435 5 8 5H77L95 23Z" fill="#27ABA3"/>
-    <path id="Vector_2" opacity="0.2" d="M95 23H80C79.2044 23 78.4413 22.6839 77.8787 22.1213C77.3161 21.5587 77 20.7956 77 20V5L95 23Z" fill="black"/>
-    <g id="DOCXF">
-        <path d="M38.3176 109.635C38.3176 111.045 37.9153 112.125 37.1106 112.875C36.3098 113.625 35.1516 114 33.636 114H31.2102V105.434H33.8997C35.2981 105.434 36.384 105.803 37.1575 106.541C37.9309 107.279 38.3176 108.311 38.3176 109.635ZM36.4309 109.682C36.4309 107.842 35.6184 106.922 33.9934 106.922H33.0266V112.5H33.8059C35.5559 112.5 36.4309 111.561 36.4309 109.682Z" fill="white"/>
-        <path d="M47.8684 109.705C47.8684 111.123 47.5168 112.213 46.8137 112.975C46.1106 113.736 45.1028 114.117 43.7903 114.117C42.4778 114.117 41.47 113.736 40.7668 112.975C40.0637 112.213 39.7122 111.119 39.7122 109.693C39.7122 108.268 40.0637 107.18 40.7668 106.43C41.4739 105.676 42.4856 105.299 43.802 105.299C45.1184 105.299 46.1243 105.678 46.8196 106.436C47.5188 107.193 47.8684 108.283 47.8684 109.705ZM41.6165 109.705C41.6165 110.662 41.7981 111.383 42.1614 111.867C42.5247 112.352 43.0676 112.594 43.7903 112.594C45.2395 112.594 45.9641 111.631 45.9641 109.705C45.9641 107.775 45.2434 106.811 43.802 106.811C43.0793 106.811 42.5344 107.055 42.1672 107.543C41.8 108.027 41.6165 108.748 41.6165 109.705Z" fill="white"/>
-        <path d="M53.2825 106.822C52.5989 106.822 52.0696 107.08 51.6946 107.596C51.3196 108.107 51.1321 108.822 51.1321 109.74C51.1321 111.65 51.8489 112.605 53.2825 112.605C53.884 112.605 54.6125 112.455 55.468 112.154V113.678C54.7649 113.971 53.9797 114.117 53.1125 114.117C51.8665 114.117 50.9133 113.74 50.2532 112.986C49.593 112.229 49.2629 111.143 49.2629 109.729C49.2629 108.838 49.425 108.059 49.7493 107.391C50.0735 106.719 50.5383 106.205 51.1438 105.85C51.7532 105.49 52.4661 105.311 53.2825 105.311C54.1145 105.311 54.9504 105.512 55.7903 105.914L55.2043 107.391C54.884 107.238 54.5618 107.105 54.2375 106.992C53.9133 106.879 53.595 106.822 53.2825 106.822Z" fill="white"/>
-        <path d="M64.2219 114H62.1477L60.1555 110.76L58.1633 114H56.218L59.0598 109.582L56.3997 105.434H58.4036L60.2493 108.516L62.0598 105.434H64.0168L61.3274 109.682L64.2219 114Z" fill="white"/>
-        <path d="M67.0872 114H65.3V105.434H70.2102V106.922H67.0872V109.131H69.9934V110.613H67.0872V114Z" fill="white"/>
-    </g>
-    <path id="Rectangle 381 (Stroke)" fill-rule="evenodd" clip-rule="evenodd" d="M22 58H78V44H22V58ZM20 42V60H80V42H20Z" fill="white"/>
-    <path id="Rectangle 387 (Stroke)" fill-rule="evenodd" clip-rule="evenodd" d="M22 82H78V68H22V82ZM20 66V84H80V66H20Z" fill="white"/>
+<svg width="80" height="100" viewBox="0 0 80 100" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_2964_22050)">
+<path d="M75 19V92.6667C75 93.2855 74.7542 93.879 74.3166 94.3166C73.879 94.7542 73.2855 95 72.6667 95H7.33333C6.71449 95 6.121 94.7542 5.68342 94.3166C5.24583 93.879 5 93.2855 5 92.6667V7.33333C5 6.71449 5.24583 6.121 5.68342 5.68342C6.121 5.24583 6.71449 5 7.33333 5H61L75 19Z" fill="#27ABA3"/>
+<path d="M18 34H54.1761H62V35.625V46H18V34Z" stroke="white" stroke-width="2"/>
+<path d="M18 52H54.1761H62V53.625V64H18V52Z" stroke="white" stroke-width="2"/>
+<path opacity="0.2" d="M75 19H63.3333C62.7145 19 62.121 18.7542 61.6834 18.3166C61.2458 17.879 61 17.2855 61 16.6667V5L75 19Z" fill="black"/>
+<path d="M27.8477 82.6348C27.8477 83.5996 27.6621 84.4062 27.291 85.0547C26.9238 85.6992 26.3906 86.1855 25.6914 86.5137C24.9922 86.8379 24.1504 87 23.166 87H20.7402V78.4336H23.4297C24.3281 78.4336 25.1074 78.5938 25.7676 78.9141C26.4277 79.2305 26.9395 79.7012 27.3027 80.3262C27.666 80.9473 27.8477 81.7168 27.8477 82.6348ZM25.9609 82.6816C25.9609 82.0488 25.8672 81.5293 25.6797 81.123C25.4961 80.7129 25.2227 80.4102 24.8594 80.2148C24.5 80.0195 24.0547 79.9219 23.5234 79.9219H22.5566V85.5H23.3359C24.2227 85.5 24.8809 85.2637 25.3105 84.791C25.7441 84.3184 25.9609 83.6152 25.9609 82.6816ZM37.3984 82.7051C37.3984 83.3652 37.3164 83.9668 37.1523 84.5098C36.9883 85.0488 36.7383 85.5137 36.4023 85.9043C36.0703 86.2949 35.6484 86.5957 35.1367 86.8066C34.625 87.0137 34.0195 87.1172 33.3203 87.1172C32.6211 87.1172 32.0156 87.0137 31.5039 86.8066C30.9922 86.5957 30.5684 86.2949 30.2324 85.9043C29.9004 85.5137 29.6523 85.0469 29.4883 84.5039C29.3242 83.9609 29.2422 83.3574 29.2422 82.6934C29.2422 81.8066 29.3867 81.0352 29.6758 80.3789C29.9688 79.7188 30.418 79.207 31.0234 78.8438C31.6289 78.4805 32.3984 78.2988 33.332 78.2988C34.2617 78.2988 35.0254 78.4805 35.623 78.8438C36.2246 79.207 36.6699 79.7188 36.959 80.3789C37.252 81.0391 37.3984 81.8145 37.3984 82.7051ZM31.1465 82.7051C31.1465 83.3027 31.2207 83.8184 31.3691 84.252C31.5215 84.6816 31.7578 85.0137 32.0781 85.248C32.3984 85.4785 32.8125 85.5938 33.3203 85.5938C33.8359 85.5938 34.2539 85.4785 34.5742 85.248C34.8945 85.0137 35.127 84.6816 35.2715 84.252C35.4199 83.8184 35.4941 83.3027 35.4941 82.7051C35.4941 81.8066 35.3262 81.0996 34.9902 80.584C34.6543 80.0684 34.1016 79.8105 33.332 79.8105C32.8203 79.8105 32.4023 79.9277 32.0781 80.1621C31.7578 80.3926 31.5215 80.7246 31.3691 81.1582C31.2207 81.5879 31.1465 82.1035 31.1465 82.7051ZM42.8125 79.8223C42.4648 79.8223 42.1562 79.8906 41.8867 80.0273C41.6211 80.1602 41.3965 80.3535 41.2129 80.6074C41.0332 80.8613 40.8965 81.168 40.8027 81.5273C40.709 81.8867 40.6621 82.291 40.6621 82.7402C40.6621 83.3457 40.7363 83.8633 40.8848 84.293C41.0371 84.7188 41.2715 85.0449 41.5879 85.2715C41.9043 85.4941 42.3125 85.6055 42.8125 85.6055C43.1602 85.6055 43.5078 85.5664 43.8555 85.4883C44.207 85.4102 44.5879 85.2988 44.998 85.1543V86.6777C44.6191 86.834 44.2461 86.9453 43.8789 87.0117C43.5117 87.082 43.0996 87.1172 42.6426 87.1172C41.7598 87.1172 41.0332 86.9355 40.4629 86.5723C39.8965 86.2051 39.4766 85.6934 39.2031 85.0371C38.9297 84.377 38.793 83.6074 38.793 82.7285C38.793 82.0801 38.8809 81.4863 39.0566 80.9473C39.2324 80.4082 39.4902 79.9414 39.8301 79.5469C40.1699 79.1523 40.5898 78.8477 41.0898 78.6328C41.5898 78.418 42.1641 78.3105 42.8125 78.3105C43.2383 78.3105 43.6641 78.3652 44.0898 78.4746C44.5195 78.5801 44.9297 78.7266 45.3203 78.9141L44.7344 80.3906C44.4141 80.2383 44.0918 80.1055 43.7676 79.9922C43.4434 79.8789 43.125 79.8223 42.8125 79.8223ZM53.752 87H51.6777L49.6855 83.7598L47.6934 87H45.748L48.5898 82.582L45.9297 78.4336H47.9336L49.7793 81.5156L51.5898 78.4336H53.5469L50.8574 82.6816L53.752 87ZM56.6172 87H54.8301V78.4336H59.7402V79.9219H56.6172V82.1309H59.5234V83.6133H56.6172V87Z" fill="white"/>
 </g>
+<defs>
+<clipPath id="clip0_2964_22050">
+<rect width="80" height="100" fill="white"/>
+</clipPath>
+</defs>
 </svg>
--- a/apps/common/main/resources/img/doc-formats/dotx.svg
+++ b/apps/common/main/resources/img/doc-formats/dotx.svg
@ -1,8 +1,14 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 127" version="1.1" width="100" height="127">
-<path d="M95 23V119C95 119.796 94.6839 120.559 94.1213 121.121C93.5587 121.684 92.7956 122 92 122H8C7.20435 122 6.44129 121.684 5.87868 121.121C5.31607 120.559 5 119.796 5 119V8C5 7.20435 5.31607 6.44129 5.87868 5.87868C6.44129 5.31607 7.20435 5 8 5H77L95 23Z" fill="#214479"/>
-<path opacity="0.2" d="M95 23H80C79.2044 23 78.4413 22.6839 77.8787 22.1213C77.3161 21.5587 77 20.7956 77 20V5L95 23Z" fill="black"/>
-<path d="M41.1855 109.635C41.1855 111.045 40.7832 112.125 39.9785 112.875C39.1777 113.625 38.0195 114 36.5039 114H34.0781V105.434H36.7676C38.166 105.434 39.252 105.803 40.0254 106.541C40.7988 107.279 41.1855 108.311 41.1855 109.635ZM39.2988 109.682C39.2988 107.842 38.4863 106.922 36.8613 106.922H35.8945V112.5H36.6738C38.4238 112.5 39.2988 111.561 39.2988 109.682ZM50.7363 109.705C50.7363 111.123 50.3848 112.213 49.6816 112.975C48.9785 113.736 47.9707 114.117 46.6582 114.117C45.3457 114.117 44.3379 113.736 43.6348 112.975C42.9316 112.213 42.5801 111.119 42.5801 109.693C42.5801 108.268 42.9316 107.18 43.6348 106.43C44.3418 105.676 45.3535 105.299 46.6699 105.299C47.9863 105.299 48.9922 105.678 49.6875 106.436C50.3867 107.193 50.7363 108.283 50.7363 109.705ZM44.4844 109.705C44.4844 110.662 44.666 111.383 45.0293 111.867C45.3926 112.352 45.9355 112.594 46.6582 112.594C48.1074 112.594 48.832 111.631 48.832 109.705C48.832 107.775 48.1113 106.811 46.6699 106.811C45.9473 106.811 45.4023 107.055 45.0352 107.543C44.668 108.027 44.4844 108.748 44.4844 109.705ZM55.8164 114H54V106.945H51.6738V105.434H58.1426V106.945H55.8164V114ZM66.3867 114H64.3125L62.3203 110.76L60.3281 114H58.3828L61.2246 109.582L58.5645 105.434H60.5684L62.4141 108.516L64.2246 105.434H66.1816L63.4922 109.682L66.3867 114Z" fill="white"/>
-<path d="M67.8 48L61.5 75L54.5 48H51.5H48.5L41.5 75L35.2 48H29.4L37.9 82H44.3L51.5 54.1L58.7 82H65.1L73.6 48H67.8Z" fill="white"/>
-<rect x="15" y="15" width="16" height="14" rx="2" fill="white"/>
-<path d="M23.0898 26H21.6895V18.6348H19.1699V17.4336H25.6094V18.6348H23.0898V26Z" fill="#214479"/>
+<svg width="80" height="100" viewBox="0 0 80 100" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_2964_22035)">
+<path d="M75 19V92.6667C75 93.2855 74.7542 93.879 74.3166 94.3166C73.879 94.7542 73.2855 95 72.6667 95H7.33333C6.71449 95 6.121 94.7542 5.68342 94.3166C5.24583 93.879 5 93.2855 5 92.6667V7.33333C5 6.71449 5.24583 6.121 5.68342 5.68342C6.121 5.24583 6.71449 5 7.33333 5H61L75 19Z" fill="#214479"/>
+<path opacity="0.2" d="M75 19H63.3333C62.7145 19 62.121 18.7542 61.6834 18.3166C61.2458 17.879 61 17.2855 61 16.6667V5L75 19Z" fill="black"/>
+<path d="M31.4922 82.6348C31.4922 83.5996 31.3066 84.4062 30.9355 85.0547C30.5684 85.6992 30.0352 86.1855 29.3359 86.5137C28.6367 86.8379 27.7949 87 26.8105 87H24.3848V78.4336H27.0742C27.9727 78.4336 28.752 78.5938 29.4121 78.9141C30.0723 79.2305 30.584 79.7012 30.9473 80.3262C31.3105 80.9473 31.4922 81.7168 31.4922 82.6348ZM29.6055 82.6816C29.6055 82.0488 29.5117 81.5293 29.3242 81.123C29.1406 80.7129 28.8672 80.4102 28.5039 80.2148C28.1445 80.0195 27.6992 79.9219 27.168 79.9219H26.2012V85.5H26.9805C27.8672 85.5 28.5254 85.2637 28.9551 84.791C29.3887 84.3184 29.6055 83.6152 29.6055 82.6816ZM41.043 82.7051C41.043 83.3652 40.9609 83.9668 40.7969 84.5098C40.6328 85.0488 40.3828 85.5137 40.0469 85.9043C39.7148 86.2949 39.293 86.5957 38.7812 86.8066C38.2695 87.0137 37.6641 87.1172 36.9648 87.1172C36.2656 87.1172 35.6602 87.0137 35.1484 86.8066C34.6367 86.5957 34.2129 86.2949 33.877 85.9043C33.5449 85.5137 33.2969 85.0469 33.1328 84.5039C32.9688 83.9609 32.8867 83.3574 32.8867 82.6934C32.8867 81.8066 33.0312 81.0352 33.3203 80.3789C33.6133 79.7188 34.0625 79.207 34.668 78.8438C35.2734 78.4805 36.043 78.2988 36.9766 78.2988C37.9062 78.2988 38.6699 78.4805 39.2676 78.8438C39.8691 79.207 40.3145 79.7188 40.6035 80.3789C40.8965 81.0391 41.043 81.8145 41.043 82.7051ZM34.791 82.7051C34.791 83.3027 34.8652 83.8184 35.0137 84.252C35.166 84.6816 35.4023 85.0137 35.7227 85.248C36.043 85.4785 36.457 85.5938 36.9648 85.5938C37.4805 85.5938 37.8984 85.4785 38.2188 85.248C38.5391 85.0137 38.7715 84.6816 38.916 84.252C39.0645 83.8184 39.1387 83.3027 39.1387 82.7051C39.1387 81.8066 38.9707 81.0996 38.6348 80.584C38.2988 80.0684 37.7461 79.8105 36.9766 79.8105C36.4648 79.8105 36.0469 79.9277 35.7227 80.1621C35.4023 80.3926 35.166 80.7246 35.0137 81.1582C34.8652 81.5879 34.791 82.1035 34.791 82.7051ZM46.123 87H44.3066V79.9453H41.9805V78.4336H48.4492V79.9453H46.123V87ZM56.6934 87H54.6191L52.627 83.7598L50.6348 87H48.6895L51.5312 82.582L48.8711 78.4336H50.875L52.7207 81.5156L54.5312 78.4336H56.4883L53.7988 82.6816L56.6934 87Z" fill="white"/>
+<path d="M51.8009 36L47.2398 56.6471L42.1719 36H40H37.8281L32.7602 56.6471L28.1991 36H24L30.1538 62H34.7873L40 40.6647L45.2127 62H49.8462L56 36H51.8009Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12 10C10.8954 10 10 10.8954 10 12V21C10 22.1046 10.8954 23 12 23H21C22.1046 23 23 22.1046 23 21V12C23 10.8954 22.1046 10 21 10H12ZM17.2129 20V14.0381H19.4004V12.8906H17.2129H15.7529H13.5996V14.0381H15.7529V20H17.2129Z" fill="white"/>
+</g>
+<defs>
+<clipPath id="clip0_2964_22035">
+<rect width="80" height="100" fill="white"/>
+</clipPath>
+</defs>
 </svg>
--- a/apps/common/main/resources/img/doc-formats/epub.svg
+++ b/apps/common/main/resources/img/doc-formats/epub.svg
@ -1,8 +1,13 @@
-<svg width="100" height="127" viewBox="0 0 100 127" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M95 23V119C95 119.796 94.6839 120.559 94.1213 121.121C93.5587 121.684 92.7956 122 92 122H8C7.20435 122 6.44129 121.684 5.87868 121.121C5.31607 120.559 5 119.796 5 119V8C5 7.20435 5.31607 6.44129 5.87868 5.87868C6.44129 5.31607 7.20435 5 8 5H77L95 23Z" fill="#5892B6"/>
-<path opacity="0.2" d="M95 23H80C79.2044 23 78.4413 22.6839 77.8787 22.1213C77.3161 21.5587 77 20.7956 77 20V5L95 23Z" fill="black"/>
-<path d="M40.3217 114H35.3881V105.434H40.3217V106.922H37.2045V108.803H40.1049V110.291H37.2045V112.5H40.3217V114ZM43.9311 109.465H44.5287C45.0873 109.465 45.5053 109.355 45.7827 109.137C46.06 108.914 46.1987 108.592 46.1987 108.17C46.1987 107.744 46.0815 107.43 45.8471 107.227C45.6166 107.023 45.2534 106.922 44.7573 106.922H43.9311V109.465ZM48.0327 108.105C48.0327 109.027 47.7436 109.732 47.1655 110.221C46.5912 110.709 45.7729 110.953 44.7104 110.953H43.9311V114H42.1147V105.434H44.851C45.8901 105.434 46.6791 105.658 47.2182 106.107C47.7612 106.553 48.0327 107.219 48.0327 108.105ZM56.6225 105.434V110.977C56.6225 111.609 56.4799 112.164 56.1948 112.641C55.9135 113.117 55.5053 113.482 54.9702 113.736C54.435 113.99 53.8022 114.117 53.0717 114.117C51.9702 114.117 51.1147 113.836 50.5053 113.273C49.8959 112.707 49.5912 111.934 49.5912 110.953V105.434H51.4018V110.678C51.4018 111.338 51.5346 111.822 51.8002 112.131C52.0659 112.439 52.5053 112.594 53.1186 112.594C53.7123 112.594 54.142 112.439 54.4077 112.131C54.6772 111.818 54.812 111.33 54.812 110.666V105.434H56.6225ZM58.7202 105.434H61.3862C62.601 105.434 63.4819 105.607 64.0287 105.955C64.5795 106.299 64.8549 106.848 64.8549 107.602C64.8549 108.113 64.7338 108.533 64.4916 108.861C64.2534 109.189 63.935 109.387 63.5366 109.453V109.512C64.0795 109.633 64.4702 109.859 64.7084 110.191C64.9506 110.523 65.0717 110.965 65.0717 111.516C65.0717 112.297 64.7885 112.906 64.2221 113.344C63.6596 113.781 62.894 114 61.9252 114H58.7202V105.434ZM60.5366 108.826H61.5912C62.0834 108.826 62.4389 108.75 62.6577 108.598C62.8803 108.445 62.9916 108.193 62.9916 107.842C62.9916 107.514 62.8705 107.279 62.6284 107.139C62.3901 106.994 62.0112 106.922 61.4916 106.922H60.5366V108.826ZM60.5366 110.268V112.5H61.7202C62.2202 112.5 62.5893 112.404 62.8276 112.213C63.0659 112.021 63.185 111.729 63.185 111.334C63.185 110.623 62.6772 110.268 61.6616 110.268H60.5366Z" fill="white"/>
-<path d="M49 84V49C49 49 40 43 25 42V75C25 75 42 76 49 84Z" fill="white"/>
-<path d="M75 75V42C60 43 51 49 51 49V84C58 76 75 75 75 75Z" fill="white"/>
-<path d="M77 47V79C77 79 62 79 50 87.3C38 79 23 79 23 79V47H20V82C20 82 33 80 50 88C67 80 80 82 80 82V47H77Z" fill="white"/>
+<svg width="80" height="100" viewBox="0 0 80 100" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_2964_22051)">
+<path d="M75 19V92.6667C75 93.2855 74.7542 93.879 74.3166 94.3166C73.879 94.7542 73.2855 95 72.6667 95H7.33333C6.71449 95 6.121 94.7542 5.68342 94.3166C5.24583 93.879 5 93.2855 5 92.6667V7.33333C5 6.71449 5.24583 6.121 5.68342 5.68342C6.121 5.24583 6.71449 5 7.33333 5H61L75 19Z" fill="#5892B6"/>
+<path opacity="0.2" d="M75 19H63.3333C62.7145 19 62.121 18.7542 61.6834 18.3166C61.2458 17.879 61 17.2855 61 16.6667V5L75 19Z" fill="black"/>
+<path d="M30.3145 87H25.3809V78.4336H30.3145V79.9219H27.1973V81.8027H30.0977V83.291H27.1973V85.5H30.3145V87ZM34.8438 78.4336C35.9492 78.4336 36.7559 78.6719 37.2637 79.1484C37.7715 79.6211 38.0254 80.2734 38.0254 81.1055C38.0254 81.4805 37.9688 81.8398 37.8555 82.1836C37.7422 82.5234 37.5566 82.8262 37.2988 83.0918C37.0449 83.3574 36.7051 83.5684 36.2793 83.7246C35.8535 83.877 35.3281 83.9531 34.7031 83.9531H33.9238V87H32.1074V78.4336H34.8438ZM34.75 79.9219H33.9238V82.4648H34.5215C34.8613 82.4648 35.1562 82.4199 35.4062 82.3301C35.6562 82.2402 35.8496 82.0996 35.9863 81.9082C36.123 81.7168 36.1914 81.4707 36.1914 81.1699C36.1914 80.748 36.0742 80.4355 35.8398 80.2324C35.6055 80.0254 35.2422 79.9219 34.75 79.9219ZM46.6152 78.4336V83.9766C46.6152 84.5664 46.4844 85.0996 46.2227 85.5762C45.9648 86.0488 45.5723 86.4238 45.0449 86.7012C44.5215 86.9785 43.8613 87.1172 43.0645 87.1172C41.9316 87.1172 41.0684 86.8281 40.4746 86.25C39.8809 85.6719 39.584 84.9062 39.584 83.9531V78.4336H41.3945V83.6777C41.3945 84.3848 41.5391 84.8809 41.8281 85.166C42.1172 85.4512 42.5449 85.5938 43.1113 85.5938C43.5098 85.5938 43.832 85.5254 44.0781 85.3887C44.3281 85.252 44.5117 85.041 44.6289 84.7559C44.7461 84.4707 44.8047 84.1074 44.8047 83.666V78.4336H46.6152ZM48.7129 78.4336H51.3789C52.5195 78.4336 53.3828 78.5938 53.9688 78.9141C54.5547 79.2344 54.8477 79.7969 54.8477 80.6016C54.8477 80.9258 54.7949 81.2188 54.6895 81.4805C54.5879 81.7422 54.4395 81.957 54.2441 82.125C54.0488 82.293 53.8105 82.4023 53.5293 82.4531V82.5117C53.8145 82.5703 54.0723 82.6719 54.3027 82.8164C54.5332 82.957 54.7168 83.1641 54.8535 83.4375C54.9941 83.707 55.0645 84.0664 55.0645 84.5156C55.0645 85.0352 54.9375 85.4805 54.6836 85.8516C54.4297 86.2227 54.0664 86.5078 53.5938 86.707C53.125 86.9023 52.5664 87 51.918 87H48.7129V78.4336ZM50.5293 81.8262H51.584C52.1113 81.8262 52.4766 81.7441 52.6797 81.5801C52.8828 81.4121 52.9844 81.166 52.9844 80.8418C52.9844 80.5137 52.8633 80.2793 52.6211 80.1387C52.3828 79.9941 52.0039 79.9219 51.4844 79.9219H50.5293V81.8262ZM50.5293 83.2676V85.5H51.7129C52.2598 85.5 52.6406 85.3945 52.8555 85.1836C53.0703 84.9727 53.1777 84.6895 53.1777 84.334C53.1777 84.123 53.1309 83.9375 53.0371 83.7773C52.9434 83.6172 52.7852 83.4922 52.5625 83.4023C52.3438 83.3125 52.041 83.2676 51.6543 83.2676H50.5293Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M39 60V37.5C39 37.5 33.375 33.6429 24 33V54.2143C24 54.2143 34.625 54.8571 39 60ZM56 54.2143V33C46.625 33.6429 41 37.5 41 37.5V60C45.375 54.8571 56 54.2143 56 54.2143ZM57.1 57.2927V37H59V59.1951C59 59.1951 50.7667 57.9268 40 63C29.2333 57.9268 21 59.1951 21 59.1951V37H22.9V57.2927C22.9 57.2927 32.4 57.2927 40 62.5561C47.6 57.2927 57.1 57.2927 57.1 57.2927Z" fill="white"/>
+</g>
+<defs>
+<clipPath id="clip0_2964_22051">
+<rect width="80" height="100" fill="white"/>
+</clipPath>
+</defs>
 </svg>
--- a/apps/common/main/resources/img/doc-formats/fb2.svg
+++ b/apps/common/main/resources/img/doc-formats/fb2.svg
@ -1,8 +1,13 @@
-<svg width="100" height="127" viewBox="0 0 100 127" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M95 23V119C95 119.796 94.6839 120.559 94.1213 121.121C93.5587 121.684 92.7956 122 92 122H8C7.20435 122 6.44129 121.684 5.87868 121.121C5.31607 120.559 5 119.796 5 119V8C5 7.20435 5.31607 6.44129 5.87868 5.87868C6.44129 5.31607 7.20435 5 8 5H77L95 23Z" fill="#B07408"/>
-<path opacity="0.2" d="M95 23H80C79.2044 23 78.4413 22.6839 77.8787 22.1213C77.3161 21.5587 77 20.7956 77 20V5L95 23Z" fill="black"/>
-<path d="M41.8652 114H40.0781V105.434H44.9883V106.922H41.8652V109.131H44.7715V110.613H41.8652V114ZM46.6641 105.434H49.3301C50.5449 105.434 51.4258 105.607 51.9727 105.955C52.5234 106.299 52.7988 106.848 52.7988 107.602C52.7988 108.113 52.6777 108.533 52.4355 108.861C52.1973 109.189 51.8789 109.387 51.4805 109.453V109.512C52.0234 109.633 52.4141 109.859 52.6523 110.191C52.8945 110.523 53.0156 110.965 53.0156 111.516C53.0156 112.297 52.7324 112.906 52.166 113.344C51.6035 113.781 50.8379 114 49.8691 114H46.6641V105.434ZM48.4805 108.826H49.5352C50.0273 108.826 50.3828 108.75 50.6016 108.598C50.8242 108.445 50.9355 108.193 50.9355 107.842C50.9355 107.514 50.8145 107.279 50.5723 107.139C50.334 106.994 49.9551 106.922 49.4355 106.922H48.4805V108.826ZM48.4805 110.268V112.5H49.6641C50.1641 112.5 50.5332 112.404 50.7715 112.213C51.0098 112.021 51.1289 111.729 51.1289 111.334C51.1289 110.623 50.6211 110.268 49.6055 110.268H48.4805ZM60.1172 114H54.1289V112.74L56.2793 110.566C56.916 109.914 57.332 109.463 57.5273 109.213C57.7227 108.959 57.8633 108.725 57.9492 108.51C58.0352 108.295 58.0781 108.072 58.0781 107.842C58.0781 107.498 57.9824 107.242 57.791 107.074C57.6035 106.906 57.3516 106.822 57.0352 106.822C56.7031 106.822 56.3809 106.898 56.0684 107.051C55.7559 107.203 55.4297 107.42 55.0898 107.701L54.1055 106.535C54.5273 106.176 54.877 105.922 55.1543 105.773C55.4316 105.625 55.7344 105.512 56.0625 105.434C56.3906 105.352 56.7578 105.311 57.1641 105.311C57.6992 105.311 58.1719 105.408 58.582 105.604C58.9922 105.799 59.3105 106.072 59.5371 106.424C59.7637 106.775 59.877 107.178 59.877 107.631C59.877 108.025 59.8066 108.396 59.666 108.744C59.5293 109.088 59.3145 109.441 59.0215 109.805C58.7324 110.168 58.2207 110.686 57.4863 111.357L56.3848 112.395V112.477H60.1172V114Z" fill="white"/>
-<path d="M49 84V49C49 49 40 43 25 42V75C25 75 42 76 49 84Z" fill="white"/>
-<path d="M75 75V42C60 43 51 49 51 49V84C58 76 75 75 75 75Z" fill="white"/>
-<path d="M77 47V79C77 79 62 79 50 87.3C38 79 23 79 23 79V47H20V82C20 82 33 80 50 88C67 80 80 82 80 82V47H77Z" fill="white"/>
+<svg width="80" height="100" viewBox="0 0 80 100" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_2964_22049)">
+<path d="M75 19V92.6667C75 93.2855 74.7542 93.879 74.3166 94.3166C73.879 94.7542 73.2855 95 72.6667 95H7.33333C6.71449 95 6.121 94.7542 5.68342 94.3166C5.24583 93.879 5 93.2855 5 92.6667V7.33333C5 6.71449 5.24583 6.121 5.68342 5.68342C6.121 5.24583 6.71449 5 7.33333 5H61L75 19Z" fill="#B07408"/>
+<path opacity="0.2" d="M75 19H63.3333C62.7145 19 62.121 18.7542 61.6834 18.3166C61.2458 17.879 61 17.2855 61 16.6667V5L75 19Z" fill="black"/>
+<path d="M32.1074 87H30.3203V78.4336H35.2305V79.9219H32.1074V82.1309H35.0137V83.6133H32.1074V87ZM36.9062 78.4336H39.5723C40.7129 78.4336 41.5762 78.5938 42.1621 78.9141C42.748 79.2344 43.041 79.7969 43.041 80.6016C43.041 80.9258 42.9883 81.2188 42.8828 81.4805C42.7812 81.7422 42.6328 81.957 42.4375 82.125C42.2422 82.293 42.0039 82.4023 41.7227 82.4531V82.5117C42.0078 82.5703 42.2656 82.6719 42.4961 82.8164C42.7266 82.957 42.9102 83.1641 43.0469 83.4375C43.1875 83.707 43.2578 84.0664 43.2578 84.5156C43.2578 85.0352 43.1309 85.4805 42.877 85.8516C42.623 86.2227 42.2598 86.5078 41.7871 86.707C41.3184 86.9023 40.7598 87 40.1113 87H36.9062V78.4336ZM38.7227 81.8262H39.7773C40.3047 81.8262 40.6699 81.7441 40.873 81.5801C41.0762 81.4121 41.1777 81.166 41.1777 80.8418C41.1777 80.5137 41.0566 80.2793 40.8145 80.1387C40.5762 79.9941 40.1973 79.9219 39.6777 79.9219H38.7227V81.8262ZM38.7227 83.2676V85.5H39.9062C40.4531 85.5 40.834 85.3945 41.0488 85.1836C41.2637 84.9727 41.3711 84.6895 41.3711 84.334C41.3711 84.123 41.3242 83.9375 41.2305 83.7773C41.1367 83.6172 40.9785 83.4922 40.7559 83.4023C40.5371 83.3125 40.2344 83.2676 39.8477 83.2676H38.7227ZM50.3594 87H44.3711V85.7402L46.5215 83.5664C46.9551 83.1211 47.3027 82.75 47.5645 82.4531C47.8301 82.1523 48.0215 81.8789 48.1387 81.6328C48.2598 81.3867 48.3203 81.123 48.3203 80.8418C48.3203 80.502 48.2246 80.248 48.0332 80.0801C47.8457 79.9082 47.5938 79.8223 47.2773 79.8223C46.9453 79.8223 46.623 79.8984 46.3105 80.0508C45.998 80.2031 45.6719 80.4199 45.332 80.7012L44.3477 79.5352C44.5938 79.3242 44.8535 79.125 45.127 78.9375C45.4043 78.75 45.7246 78.5996 46.0879 78.4863C46.4551 78.3691 46.8945 78.3105 47.4062 78.3105C47.9688 78.3105 48.4512 78.4121 48.8535 78.6152C49.2598 78.8184 49.5723 79.0957 49.791 79.4473C50.0098 79.7949 50.1191 80.1895 50.1191 80.6309C50.1191 81.1035 50.0254 81.5352 49.8379 81.9258C49.6504 82.3164 49.377 82.7031 49.0176 83.0859C48.6621 83.4688 48.2324 83.8926 47.7285 84.3574L46.627 85.3945V85.4766H50.3594V87Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M39 60V37.5C39 37.5 33.375 33.6429 24 33V54.2143C24 54.2143 34.625 54.8571 39 60ZM56 54.2143V33C46.625 33.6429 41 37.5 41 37.5V60C45.375 54.8571 56 54.2143 56 54.2143ZM57.1 57.2927V37H59V59.1951C59 59.1951 50.7667 57.9268 40 63C29.2333 57.9268 21 59.1951 21 59.1951V37H22.9V57.2927C22.9 57.2927 32.4 57.2927 40 62.5561C47.6 57.2927 57.1 57.2927 57.1 57.2927Z" fill="white"/>
+</g>
+<defs>
+<clipPath id="clip0_2964_22049">
+<rect width="80" height="100" fill="white"/>
+</clipPath>
+</defs>
 </svg>
--- a/apps/common/main/resources/img/doc-formats/html.svg
+++ b/apps/common/main/resources/img/doc-formats/html.svg
@ -1,8 +1,15 @@
-<svg width="100" height="127" viewBox="0 0 100 127" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M95 23V119C95 119.796 94.6839 120.559 94.1213 121.121C93.5587 121.684 92.7956 122 92 122H8C7.20435 122 6.44129 121.684 5.87868 121.121C5.31607 120.559 5 119.796 5 119V8C5 7.20435 5.31607 6.44129 5.87868 5.87868C6.44129 5.31607 7.20435 5 8 5H77L95 23Z" fill="#7C9A34"/>
-<path opacity="0.2" d="M95 23H80C79.2044 23 78.4413 22.6839 77.8787 22.1213C77.3161 21.5587 77 20.7956 77 20V5L95 23Z" fill="black"/>
-<path d="M40.9877 114H39.1771V110.303H35.7845V114H33.9681V105.434H35.7845V108.791H39.1771V105.434H40.9877V114ZM46.4603 114H44.6439V106.945H42.3177V105.434H48.7865V106.945H46.4603V114ZM53.7318 114L51.6693 107.279H51.6166C51.6908 108.646 51.7279 109.559 51.7279 110.016V114H50.1049V105.434H52.5775L54.6049 111.984H54.64L56.7904 105.434H59.2631V114H57.5697V109.945C57.5697 109.754 57.5717 109.533 57.5756 109.283C57.5834 109.033 57.6107 108.369 57.6576 107.291H57.6049L55.3959 114H53.7318ZM61.4252 114V105.434H63.2416V112.5H66.7162V114H61.4252Z" fill="white"/>
-<path d="M62 53V57.8L75.5 62.5L62 67.2V72L80 64.2V60.8L62 53Z" fill="white"/>
-<path d="M40 75H45.5L59.5 50H54L40 75Z" fill="white"/>
-<path d="M19 64.2L37 72V67.2L23.5 62.5L37 57.8V53L19 60.8V64.2Z" fill="white"/>
+<svg width="80" height="100" viewBox="0 0 80 100" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_2964_22059)">
+<path d="M75 19V92.6667C75 93.2855 74.7542 93.879 74.3166 94.3166C73.879 94.7542 73.2855 95 72.6667 95H7.33333C6.71449 95 6.121 94.7542 5.68342 94.3166C5.24583 93.879 5 93.2855 5 92.6667V7.33333C5 6.71449 5.24583 6.121 5.68342 5.68342C6.121 5.24583 6.71449 5 7.33333 5H61L75 19Z" fill="#7C9A34"/>
+<path opacity="0.2" d="M75 19H63.3333C62.7145 19 62.121 18.7542 61.6834 18.3166C61.2458 17.879 61 17.2855 61 16.6667V5L75 19Z" fill="black"/>
+<path d="M30.9766 87H29.166V83.3027H25.7734V87H23.957V78.4336H25.7734V81.791H29.166V78.4336H30.9766V87ZM36.4492 87H34.6328V79.9453H32.3066V78.4336H38.7754V79.9453H36.4492V87ZM43.7207 87L41.6582 80.2793H41.6055C41.6133 80.4395 41.625 80.6816 41.6406 81.0059C41.6602 81.3262 41.6777 81.668 41.6934 82.0312C41.709 82.3945 41.7168 82.7227 41.7168 83.0156V87H40.0938V78.4336H42.5664L44.5938 84.9844H44.6289L46.7793 78.4336H49.252V87H47.5586V82.9453C47.5586 82.6758 47.5625 82.3652 47.5703 82.0137C47.582 81.6621 47.5957 81.3281 47.6113 81.0117C47.627 80.6914 47.6387 80.4512 47.6465 80.291H47.5938L45.3848 87H43.7207ZM51.4141 87V78.4336H53.2305V85.5H56.7051V87H51.4141Z" fill="white"/>
+<path d="M30 42V45.7895L19.5 49.5L30 53.2105V57L16 50.8421V48.1579L30 42Z" fill="white"/>
+<path d="M50 42V45.7895L60.5 49.5L50 53.2105V57L64 50.8421V48.1579L50 42Z" fill="white"/>
+<path d="M32 59H36.2308L47 40H42.7692L32 59Z" fill="white"/>
+</g>
+<defs>
+<clipPath id="clip0_2964_22059">
+<rect width="80" height="100" fill="white"/>
+</clipPath>
+</defs>
 </svg>
--- a/apps/common/main/resources/img/doc-formats/jpg.svg
+++ b/apps/common/main/resources/img/doc-formats/jpg.svg
@ -1,12 +1,17 @@
-<svg width="100" height="127" viewBox="0 0 100 127" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g>
-<path d="M95 22V118C95 118.796 94.6839 119.559 94.1213 120.121C93.5587 120.684 92.7956 121 92 121H8C7.20435 121 6.44129 120.684 5.87868 120.121C5.31607 119.559 5 118.796 5 118V7C5 6.20435 5.31607 5.44129 5.87868 4.87868C6.44129 4.31607 7.20435 4 8 4H77L95 22Z" fill="#7371D8"/>
-<g>
-<path d="M39.5801 115.52C39.1699 115.52 38.8125 115.477 38.5078 115.391V113.879C38.8203 113.957 39.1055 113.996 39.3633 113.996C39.7617 113.996 40.0469 113.871 40.2188 113.621C40.3906 113.375 40.4766 112.988 40.4766 112.461V104.434H42.293V112.449C42.293 113.449 42.0645 114.211 41.6074 114.734C41.1504 115.258 40.4746 115.52 39.5801 115.52Z" fill="white"/>
-<path d="M46.2656 108.465H46.8633C47.4219 108.465 47.8398 108.355 48.1172 108.137C48.3945 107.914 48.5332 107.592 48.5332 107.17C48.5332 106.744 48.416 106.43 48.1816 106.227C47.9512 106.023 47.5879 105.922 47.0918 105.922H46.2656V108.465ZM50.3672 107.105C50.3672 108.027 50.0781 108.732 49.5 109.221C48.9258 109.709 48.1074 109.953 47.0449 109.953H46.2656V113H44.4492V104.434H47.1855C48.2246 104.434 49.0137 104.658 49.5527 105.107C50.0957 105.553 50.3672 106.219 50.3672 107.105Z" fill="white"/>
-<path d="M55.2363 108.189H58.6348V112.631C58.084 112.811 57.5645 112.936 57.0762 113.006C56.5918 113.08 56.0957 113.117 55.5879 113.117C54.2949 113.117 53.3066 112.738 52.623 111.98C51.9434 111.219 51.6035 110.127 51.6035 108.705C51.6035 107.322 51.998 106.244 52.7871 105.471C53.5801 104.697 54.6777 104.311 56.0801 104.311C56.959 104.311 57.8066 104.486 58.623 104.838L58.0195 106.291C57.3945 105.979 56.7441 105.822 56.0684 105.822C55.2832 105.822 54.6543 106.086 54.1816 106.613C53.709 107.141 53.4727 107.85 53.4727 108.74C53.4727 109.67 53.6621 110.381 54.041 110.873C54.4238 111.361 54.9785 111.605 55.7051 111.605C56.084 111.605 56.4688 111.566 56.8594 111.488V109.701H55.2363V108.189Z" fill="white"/>
-</g>
-<path d="M56 51.869L73.183 79H27.7869L39.5 59.912L44.274 67.6919L45.113 69.059L45.9712 67.7039L56 51.869ZM36 51.5C36 53.9853 33.9853 56 31.5 56C29.0147 56 27 53.9853 27 51.5C27 49.0147 29.0147 47 31.5 47C33.9853 47 36 49.0147 36 51.5Z" fill="white" stroke="white" stroke-width="2"/>
-<path opacity="0.2" d="M95 22H80C79.2044 22 78.4413 21.6839 77.8787 21.1213C77.3161 20.5587 77 19.7956 77 19V4L95 22Z" fill="black"/>
+<svg width="80" height="100" viewBox="0 0 80 100" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_2964_22040)">
+<path d="M75 19V92.6667C75 93.2855 74.7542 93.879 74.3166 94.3166C73.879 94.7542 73.2855 95 72.6667 95H7.33333C6.71449 95 6.121 94.7542 5.68342 94.3166C5.24583 93.879 5 93.2855 5 92.6667V7.33333C5 6.71449 5.24583 6.121 5.68342 5.68342C6.121 5.24583 6.71449 5 7.33333 5H61L75 19Z" fill="#7371D8"/>
+<path opacity="0.2" d="M75 19H63.3333C62.7145 19 62.121 18.7542 61.6834 18.3166C61.2458 17.879 61 17.2855 61 16.6667V5L75 19Z" fill="black"/>
+<path d="M30.0801 89.5195C29.8457 89.5195 29.6406 89.5059 29.4648 89.4785C29.2852 89.4551 29.1328 89.4258 29.0078 89.3906V87.8789C29.1328 87.9062 29.2676 87.9316 29.4121 87.9551C29.5527 87.9824 29.7031 87.9961 29.8633 87.9961C30.0742 87.9961 30.2637 87.9551 30.4316 87.873C30.5996 87.7949 30.7324 87.6445 30.8301 87.4219C30.9277 87.1992 30.9766 86.8789 30.9766 86.4609V78.4336H32.793V86.4492C32.793 87.1836 32.6777 87.7754 32.4473 88.2246C32.2207 88.6777 31.9023 89.0059 31.4922 89.209C31.0859 89.416 30.6152 89.5195 30.0801 89.5195ZM37.6855 78.4336C38.791 78.4336 39.5977 78.6719 40.1055 79.1484C40.6133 79.6211 40.8672 80.2734 40.8672 81.1055C40.8672 81.4805 40.8105 81.8398 40.6973 82.1836C40.584 82.5234 40.3984 82.8262 40.1406 83.0918C39.8867 83.3574 39.5469 83.5684 39.1211 83.7246C38.6953 83.877 38.1699 83.9531 37.5449 83.9531H36.7656V87H34.9492V78.4336H37.6855ZM37.5918 79.9219H36.7656V82.4648H37.3633C37.7031 82.4648 37.998 82.4199 38.248 82.3301C38.498 82.2402 38.6914 82.0996 38.8281 81.9082C38.9648 81.7168 39.0332 81.4707 39.0332 81.1699C39.0332 80.748 38.916 80.4355 38.6816 80.2324C38.4473 80.0254 38.084 79.9219 37.5918 79.9219ZM45.7363 82.1895H49.1348V86.6309C48.6855 86.7793 48.2188 86.8984 47.7344 86.9883C47.25 87.0742 46.7012 87.1172 46.0879 87.1172C45.2363 87.1172 44.5137 86.9492 43.9199 86.6133C43.3262 86.2773 42.875 85.7812 42.5664 85.125C42.2578 84.4688 42.1035 83.6621 42.1035 82.7051C42.1035 81.8066 42.2754 81.0293 42.6191 80.373C42.9668 79.7168 43.4727 79.209 44.1367 78.8496C44.8047 78.4902 45.6191 78.3105 46.5801 78.3105C47.0332 78.3105 47.4805 78.3594 47.9219 78.457C48.3633 78.5547 48.7637 78.6816 49.123 78.8379L48.5195 80.291C48.2578 80.1582 47.959 80.0469 47.623 79.957C47.2871 79.8672 46.9355 79.8223 46.5684 79.8223C46.041 79.8223 45.582 79.9434 45.1914 80.1855C44.8047 80.4277 44.5039 80.7676 44.2891 81.2051C44.0781 81.6387 43.9727 82.1504 43.9727 82.7402C43.9727 83.2988 44.0488 83.7949 44.2012 84.2285C44.3535 84.6582 44.5938 84.9961 44.9219 85.2422C45.25 85.4844 45.6777 85.6055 46.2051 85.6055C46.4629 85.6055 46.6797 85.5938 46.8555 85.5703C47.0352 85.543 47.2031 85.5156 47.3594 85.4883V83.7012H45.7363V82.1895Z" fill="white"/>
+<mask id="path-4-inside-1_2964_22040" fill="white">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M25.3677 44.4118C27.6906 44.4118 29.5736 42.5287 29.5736 40.2059C29.5736 37.883 27.6906 36 25.3677 36C23.0449 36 21.1619 37.883 21.1619 40.2059C21.1619 42.5287 23.0449 44.4118 25.3677 44.4118ZM44.103 39.0588L58.6325 62H21.1619L31.4854 45.1765L35.7879 52.188L44.103 39.0588Z"/>
+</mask>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M25.3677 44.4118C27.6906 44.4118 29.5736 42.5287 29.5736 40.2059C29.5736 37.883 27.6906 36 25.3677 36C23.0449 36 21.1619 37.883 21.1619 40.2059C21.1619 42.5287 23.0449 44.4118 25.3677 44.4118ZM44.103 39.0588L58.6325 62H21.1619L31.4854 45.1765L35.7879 52.188L44.103 39.0588Z" fill="white"/>
+<path d="M58.6325 62V64H62.2665L60.3221 60.9299L58.6325 62ZM44.103 39.0588L45.7927 37.9887L44.103 35.3208L42.4134 37.9887L44.103 39.0588ZM21.1619 62L19.4572 60.9539L17.5881 64H21.1619V62ZM31.4854 45.1765L33.19 44.1304L31.4854 41.3525L29.7807 44.1304L31.4854 45.1765ZM35.7879 52.188L34.0833 53.234L35.7611 55.9682L37.4775 53.2581L35.7879 52.188ZM27.5736 40.2059C27.5736 41.4242 26.586 42.4118 25.3677 42.4118V46.4118C28.7952 46.4118 31.5736 43.6333 31.5736 40.2059H27.5736ZM25.3677 38C26.586 38 27.5736 38.9876 27.5736 40.2059H31.5736C31.5736 36.7785 28.7952 34 25.3677 34V38ZM23.1619 40.2059C23.1619 38.9876 24.1495 38 25.3677 38V34C21.9403 34 19.1619 36.7785 19.1619 40.2059H23.1619ZM25.3677 42.4118C24.1495 42.4118 23.1619 41.4242 23.1619 40.2059H19.1619C19.1619 43.6333 21.9403 46.4118 25.3677 46.4118V42.4118ZM60.3221 60.9299L45.7927 37.9887L42.4134 40.1289L56.9428 63.0701L60.3221 60.9299ZM21.1619 64H58.6325V60H21.1619V64ZM29.7807 44.1304L19.4572 60.9539L22.8665 63.046L33.19 46.2225L29.7807 44.1304ZM37.4926 51.1419L33.19 44.1304L29.7807 46.2225L34.0833 53.234L37.4926 51.1419ZM42.4134 37.9887L34.0983 51.1179L37.4775 53.2581L45.7927 40.1289L42.4134 37.9887Z" fill="white" mask="url(#path-4-inside-1_2964_22040)"/>
 </g>
+<defs>
+<clipPath id="clip0_2964_22040">
+<rect width="80" height="100" fill="white"/>
+</clipPath>
+</defs>
 </svg>
--- a/apps/common/main/resources/img/doc-formats/odp.svg
+++ b/apps/common/main/resources/img/doc-formats/odp.svg
@ -1,7 +1,13 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 127" version="1.1" width="100" height="127">
-<path d="M95 23V119C95 119.796 94.6839 120.559 94.1213 121.121C93.5587 121.684 92.7956 122 92 122H8C7.20435 122 6.44129 121.684 5.87868 121.121C5.31607 120.559 5 119.796 5 119V8C5 7.20435 5.31607 6.44129 5.87868 5.87868C6.44129 5.31607 7.20435 5 8 5H77L95 23Z" fill="#DD9426"/>
-<path opacity="0.2" d="M95 23H80C79.2044 23 78.4413 22.6839 77.8787 22.1213C77.3161 21.5587 77 20.7956 77 20V5L95 23Z" fill="black"/>
-<path d="M45.8735 109.705C45.8735 111.123 45.522 112.213 44.8188 112.975C44.1157 113.736 43.1079 114.117 41.7954 114.117C40.4829 114.117 39.4751 113.736 38.772 112.975C38.0688 112.213 37.7173 111.119 37.7173 109.693C37.7173 108.268 38.0688 107.18 38.772 106.43C39.479 105.676 40.4907 105.299 41.8071 105.299C43.1235 105.299 44.1294 105.678 44.8247 106.436C45.5239 107.193 45.8735 108.283 45.8735 109.705ZM39.6216 109.705C39.6216 110.662 39.8032 111.383 40.1665 111.867C40.5298 112.352 41.0728 112.594 41.7954 112.594C43.2446 112.594 43.9692 111.631 43.9692 109.705C43.9692 107.775 43.2485 106.811 41.8071 106.811C41.0845 106.811 40.5396 107.055 40.1724 107.543C39.8052 108.027 39.6216 108.748 39.6216 109.705ZM54.7563 109.635C54.7563 111.045 54.354 112.125 53.5493 112.875C52.7485 113.625 51.5903 114 50.0747 114H47.6489V105.434H50.3384C51.7368 105.434 52.8228 105.803 53.5962 106.541C54.3696 107.279 54.7563 108.311 54.7563 109.635ZM52.8696 109.682C52.8696 107.842 52.0571 106.922 50.4321 106.922H49.4653V112.5H50.2446C51.9946 112.5 52.8696 111.561 52.8696 109.682ZM58.3481 109.465H58.9458C59.5044 109.465 59.9224 109.355 60.1997 109.137C60.4771 108.914 60.6157 108.592 60.6157 108.17C60.6157 107.744 60.4985 107.43 60.2642 107.227C60.0337 107.023 59.6704 106.922 59.1743 106.922H58.3481V109.465ZM62.4497 108.105C62.4497 109.027 62.1606 109.732 61.5825 110.221C61.0083 110.709 60.1899 110.953 59.1274 110.953H58.3481V114H56.5317V105.434H59.2681C60.3071 105.434 61.0962 105.658 61.6353 106.107C62.1782 106.553 62.4497 107.219 62.4497 108.105Z" fill="white"/>
-<path d="M78 52.74L77.71 52.59C75.5095 51.5323 73.0841 51.0277 70.6443 51.1201C68.2046 51.2125 65.8242 51.899 63.71 53.12C61.5369 51.8865 59.089 51.2182 56.5906 51.1763C54.0922 51.1344 51.6232 51.7202 49.41 52.88H49.33C49.2989 52.9033 49.2737 52.9335 49.2564 52.9682C49.239 53.0029 49.23 53.0412 49.23 53.08C49.23 53.149 49.2574 53.2151 49.3061 53.2639C49.3549 53.3126 49.421 53.34 49.49 53.34H49.55C50.9144 53.0837 52.3084 53.0231 53.69 53.16C57.69 53.53 61.12 54.76 63.55 57.52C63.68 57.65 63.79 57.64 63.92 57.52C67 54 71.68 52.6 76.72 53.07C77 53.07 77.28 53.13 77.55 53.18H77.88C77.9144 53.1847 77.9494 53.1815 77.9823 53.1708C78.0153 53.16 78.0455 53.142 78.0705 53.1179C78.0955 53.0939 78.1147 53.0645 78.1268 53.0319C78.1388 52.9994 78.1433 52.9645 78.14 52.93C78.1341 52.8893 78.1182 52.8506 78.0938 52.8174C78.0694 52.7843 78.0372 52.7577 78 52.74Z" fill="white"/>
-<path d="M72.16 65.21C68.1013 63.5273 63.6822 62.9007 59.3156 63.3886C54.9491 63.8765 50.7773 65.463 47.19 68C43.1649 66.2095 38.7509 65.4712 34.3622 65.8543C29.9735 66.2373 25.7541 67.7293 22.1 70.19H22.05C22.0071 70.2275 21.9725 70.2736 21.9484 70.3252C21.9243 70.3769 21.9112 70.433 21.91 70.49C21.91 70.5917 21.9497 70.6894 22.0207 70.7623C22.0917 70.8352 22.1883 70.8774 22.29 70.88H22.37C24.7999 70.1511 27.3232 69.7806 29.86 69.78C36.79 69.78 42.96 71.42 47.6 75.78C47.6698 75.8391 47.7586 75.8711 47.85 75.87C47.9075 75.8716 47.9645 75.8597 48.0166 75.8354C48.0686 75.8111 48.1143 75.775 48.15 75.73L48.37 75.42C53.09 68.97 60.87 65.79 69.53 65.79C70.15 65.79 70.76 65.79 71.37 65.85H71.92C72.0227 65.8475 72.1204 65.8056 72.193 65.733C72.2656 65.6604 72.3075 65.5626 72.31 65.46C72.3027 65.4105 72.2857 65.3629 72.26 65.32C72.2342 65.2771 72.2003 65.2397 72.16 65.21Z" fill="white"/>
+<svg width="80" height="100" viewBox="0 0 80 100" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_2964_22030)">
+<path d="M75 19V92.6667C75 93.2855 74.7542 93.879 74.3166 94.3166C73.879 94.7542 73.2855 95 72.6667 95H7.33333C6.71449 95 6.121 94.7542 5.68342 94.3166C5.24583 93.879 5 93.2855 5 92.6667V7.33333C5 6.71449 5.24583 6.121 5.68342 5.68342C6.121 5.24583 6.71449 5 7.33333 5H61L75 19Z" fill="#DD9426"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M64.6167 38.8763L64.8745 39.0096C64.9076 39.0254 64.9362 39.049 64.958 39.0785C64.9797 39.108 64.9938 39.1424 64.999 39.1786C65.002 39.2093 64.998 39.2403 64.9873 39.2692C64.9766 39.2982 64.9594 39.3243 64.9372 39.3457C64.915 39.3671 64.8882 39.3831 64.8588 39.3927C64.8295 39.4023 64.7984 39.4051 64.7678 39.4009H64.4744C64.4458 39.3956 64.4171 39.3902 64.3882 39.3847C64.175 39.3445 63.9557 39.3031 63.7364 39.3031C59.2548 38.8852 55.0934 40.13 52.3547 43.26C52.2391 43.3667 52.1413 43.3756 52.0257 43.26C49.865 40.8058 46.8151 39.7121 43.2583 39.3831C42.0298 39.2614 40.7903 39.3153 39.577 39.5432H39.5237C39.4624 39.5432 39.4036 39.5188 39.3602 39.4754C39.3169 39.4321 39.2925 39.3733 39.2925 39.312C39.2925 39.2775 39.3005 39.2434 39.316 39.2126C39.3314 39.1817 39.3538 39.1548 39.3814 39.1341H39.4526C41.4206 38.1028 43.6159 37.5819 45.8375 37.6192C48.059 37.6565 50.2357 38.2508 52.168 39.3475C54.0479 38.2618 56.1645 37.6514 58.3339 37.5692C60.5033 37.4871 62.66 37.9358 64.6167 38.8763ZM48.2607 48.4782C52.1435 48.0444 56.0728 48.6016 59.6819 50.0979C59.7176 50.1243 59.7478 50.1576 59.7707 50.1957C59.7936 50.2339 59.8087 50.2761 59.8152 50.3202C59.813 50.4114 59.7757 50.4983 59.7112 50.5629C59.6466 50.6274 59.5597 50.6647 59.4684 50.6669H58.9794C58.437 50.6136 57.8946 50.6136 57.3433 50.6136H57.3433C49.6429 50.6136 42.725 53.4412 38.528 59.1765L38.3324 59.4521C38.3006 59.4922 38.26 59.5243 38.2137 59.5459C38.1674 59.5675 38.1167 59.578 38.0656 59.5766C37.9843 59.5776 37.9054 59.5492 37.8433 59.4966C33.7175 55.6197 28.2312 54.1615 22.0691 54.1615C19.8133 54.162 17.5697 54.4915 15.409 55.1396H15.3379C15.2475 55.1372 15.1615 55.0997 15.0984 55.0349C15.0353 54.9701 15 54.8832 15 54.7928C15.0011 54.7421 15.0127 54.6922 15.0341 54.6463C15.0556 54.6004 15.0863 54.5594 15.1245 54.526H15.1689C18.4181 52.338 22.1699 51.0114 26.0723 50.6707C29.9747 50.3301 33.8996 50.9866 37.4787 52.5787C40.6685 50.3228 44.378 48.9121 48.2607 48.4782Z" fill="white"/>
+<path opacity="0.2" d="M75 19H63.3333C62.7145 19 62.121 18.7542 61.6834 18.3166C61.2458 17.879 61 17.2855 61 16.6667V5L75 19Z" fill="black"/>
+<path d="M35.8691 82.7051C35.8691 83.3652 35.7871 83.9668 35.623 84.5098C35.459 85.0488 35.209 85.5137 34.873 85.9043C34.541 86.2949 34.1191 86.5957 33.6074 86.8066C33.0957 87.0137 32.4902 87.1172 31.791 87.1172C31.0918 87.1172 30.4863 87.0137 29.9746 86.8066C29.4629 86.5957 29.0391 86.2949 28.7031 85.9043C28.3711 85.5137 28.123 85.0469 27.959 84.5039C27.7949 83.9609 27.7129 83.3574 27.7129 82.6934C27.7129 81.8066 27.8574 81.0352 28.1465 80.3789C28.4395 79.7188 28.8887 79.207 29.4941 78.8438C30.0996 78.4805 30.8691 78.2988 31.8027 78.2988C32.7324 78.2988 33.4961 78.4805 34.0938 78.8438C34.6953 79.207 35.1406 79.7188 35.4297 80.3789C35.7227 81.0391 35.8691 81.8145 35.8691 82.7051ZM29.6172 82.7051C29.6172 83.3027 29.6914 83.8184 29.8398 84.252C29.9922 84.6816 30.2285 85.0137 30.5488 85.248C30.8691 85.4785 31.2832 85.5938 31.791 85.5938C32.3066 85.5938 32.7246 85.4785 33.0449 85.248C33.3652 85.0137 33.5977 84.6816 33.7422 84.252C33.8906 83.8184 33.9648 83.3027 33.9648 82.7051C33.9648 81.8066 33.7969 81.0996 33.4609 80.584C33.125 80.0684 32.5723 79.8105 31.8027 79.8105C31.291 79.8105 30.873 79.9277 30.5488 80.1621C30.2285 80.3926 29.9922 80.7246 29.8398 81.1582C29.6914 81.5879 29.6172 82.1035 29.6172 82.7051ZM44.752 82.6348C44.752 83.5996 44.5664 84.4062 44.1953 85.0547C43.8281 85.6992 43.2949 86.1855 42.5957 86.5137C41.8965 86.8379 41.0547 87 40.0703 87H37.6445V78.4336H40.334C41.2324 78.4336 42.0117 78.5938 42.6719 78.9141C43.332 79.2305 43.8438 79.7012 44.207 80.3262C44.5703 80.9473 44.752 81.7168 44.752 82.6348ZM42.8652 82.6816C42.8652 82.0488 42.7715 81.5293 42.584 81.123C42.4004 80.7129 42.127 80.4102 41.7637 80.2148C41.4043 80.0195 40.959 79.9219 40.4277 79.9219H39.4609V85.5H40.2402C41.127 85.5 41.7852 85.2637 42.2148 84.791C42.6484 84.3184 42.8652 83.6152 42.8652 82.6816ZM49.2637 78.4336C50.3691 78.4336 51.1758 78.6719 51.6836 79.1484C52.1914 79.6211 52.4453 80.2734 52.4453 81.1055C52.4453 81.4805 52.3887 81.8398 52.2754 82.1836C52.1621 82.5234 51.9766 82.8262 51.7188 83.0918C51.4648 83.3574 51.125 83.5684 50.6992 83.7246C50.2734 83.877 49.748 83.9531 49.123 83.9531H48.3438V87H46.5273V78.4336H49.2637ZM49.1699 79.9219H48.3438V82.4648H48.9414C49.2812 82.4648 49.5762 82.4199 49.8262 82.3301C50.0762 82.2402 50.2695 82.0996 50.4062 81.9082C50.543 81.7168 50.6113 81.4707 50.6113 81.1699C50.6113 80.748 50.4941 80.4355 50.2598 80.2324C50.0254 80.0254 49.6621 79.9219 49.1699 79.9219Z" fill="white"/>
+</g>
+<defs>
+<clipPath id="clip0_2964_22030">
+<rect width="80" height="100" fill="white"/>
+</clipPath>
+</defs>
 </svg>
--- a/apps/common/main/resources/img/doc-formats/ods.svg
+++ b/apps/common/main/resources/img/doc-formats/ods.svg
@ -1,7 +1,13 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 127" version="1.1" width="100" height="127">
-<path d="M95 23V119C95 119.796 94.6839 120.559 94.1213 121.121C93.5587 121.684 92.7956 122 92 122H8C7.20435 122 6.44129 121.684 5.87868 121.121C5.31607 120.559 5 119.796 5 119V8C5 7.20435 5.31607 6.44129 5.87868 5.87868C6.44129 5.31607 7.20435 5 8 5H77L95 23Z" fill="#237453"/>
-<path opacity="0.2" d="M95 23H80C79.2044 23 78.4413 22.6839 77.8787 22.1213C77.3161 21.5587 77 20.7956 77 20V5L95 23Z" fill="black"/>
-<path d="M46.3335 109.705C46.3335 111.123 45.9819 112.213 45.2788 112.975C44.5757 113.736 43.5679 114.117 42.2554 114.117C40.9429 114.117 39.9351 113.736 39.2319 112.975C38.5288 112.213 38.1772 111.119 38.1772 109.693C38.1772 108.268 38.5288 107.18 39.2319 106.43C39.939 105.676 40.9507 105.299 42.2671 105.299C43.5835 105.299 44.5894 105.678 45.2847 106.436C45.9839 107.193 46.3335 108.283 46.3335 109.705ZM40.0815 109.705C40.0815 110.662 40.2632 111.383 40.6265 111.867C40.9897 112.352 41.5327 112.594 42.2554 112.594C43.7046 112.594 44.4292 111.631 44.4292 109.705C44.4292 107.775 43.7085 106.811 42.2671 106.811C41.5444 106.811 40.9995 107.055 40.6323 107.543C40.2651 108.027 40.0815 108.748 40.0815 109.705ZM55.2163 109.635C55.2163 111.045 54.814 112.125 54.0093 112.875C53.2085 113.625 52.0503 114 50.5347 114H48.1089V105.434H50.7983C52.1968 105.434 53.2827 105.803 54.0562 106.541C54.8296 107.279 55.2163 108.311 55.2163 109.635ZM53.3296 109.682C53.3296 107.842 52.5171 106.922 50.8921 106.922H49.9253V112.5H50.7046C52.4546 112.5 53.3296 111.561 53.3296 109.682ZM62.0483 111.621C62.0483 112.395 61.769 113.004 61.2104 113.449C60.6558 113.895 59.8823 114.117 58.8901 114.117C57.9761 114.117 57.1675 113.945 56.4644 113.602V111.914C57.0425 112.172 57.5308 112.354 57.9292 112.459C58.3315 112.564 58.6987 112.617 59.0308 112.617C59.4292 112.617 59.7339 112.541 59.9448 112.389C60.1597 112.236 60.2671 112.01 60.2671 111.709C60.2671 111.541 60.2202 111.393 60.1265 111.264C60.0327 111.131 59.894 111.004 59.7104 110.883C59.5308 110.762 59.1616 110.568 58.603 110.303C58.0796 110.057 57.687 109.82 57.4253 109.594C57.1636 109.367 56.9546 109.104 56.7983 108.803C56.6421 108.502 56.564 108.15 56.564 107.748C56.564 106.99 56.8198 106.395 57.3315 105.961C57.8472 105.527 58.5581 105.311 59.4644 105.311C59.9097 105.311 60.3335 105.363 60.7358 105.469C61.1421 105.574 61.5659 105.723 62.0073 105.914L61.4214 107.326C60.9644 107.139 60.5854 107.008 60.2847 106.934C59.9878 106.859 59.6948 106.822 59.4058 106.822C59.062 106.822 58.7983 106.902 58.6147 107.062C58.4312 107.223 58.3394 107.432 58.3394 107.689C58.3394 107.85 58.3765 107.99 58.4507 108.111C58.5249 108.229 58.6421 108.344 58.8022 108.457C58.9663 108.566 59.3511 108.766 59.9565 109.055C60.7573 109.438 61.3062 109.822 61.603 110.209C61.8999 110.592 62.0483 111.062 62.0483 111.621Z" fill="white"/>
-<path d="M78 52.74L77.71 52.59C75.5095 51.5323 73.0841 51.0277 70.6443 51.1201C68.2046 51.2125 65.8242 51.899 63.71 53.12C61.5369 51.8865 59.089 51.2182 56.5906 51.1763C54.0922 51.1344 51.6232 51.7202 49.41 52.88H49.33C49.2989 52.9033 49.2737 52.9335 49.2564 52.9682C49.239 53.0029 49.23 53.0412 49.23 53.08C49.23 53.149 49.2574 53.2151 49.3061 53.2639C49.3549 53.3126 49.421 53.34 49.49 53.34H49.55C50.9144 53.0837 52.3084 53.0231 53.69 53.16C57.69 53.53 61.12 54.76 63.55 57.52C63.68 57.65 63.79 57.64 63.92 57.52C67 54 71.68 52.6 76.72 53.07C77 53.07 77.28 53.13 77.55 53.18H77.88C77.9144 53.1847 77.9494 53.1815 77.9823 53.1708C78.0153 53.16 78.0455 53.142 78.0705 53.1179C78.0955 53.0939 78.1147 53.0645 78.1268 53.0319C78.1388 52.9994 78.1433 52.9645 78.14 52.93C78.1341 52.8893 78.1182 52.8506 78.0938 52.8174C78.0694 52.7843 78.0372 52.7577 78 52.74Z" fill="white"/>
-<path d="M72.16 65.21C68.1013 63.5273 63.6822 62.9007 59.3156 63.3886C54.9491 63.8765 50.7773 65.463 47.19 68C43.1649 66.2095 38.7509 65.4712 34.3622 65.8543C29.9735 66.2373 25.7541 67.7293 22.1 70.19H22.05C22.0071 70.2275 21.9725 70.2736 21.9484 70.3252C21.9243 70.3769 21.9112 70.433 21.91 70.49C21.91 70.5917 21.9497 70.6894 22.0207 70.7623C22.0917 70.8352 22.1883 70.8774 22.29 70.88H22.37C24.7999 70.1511 27.3232 69.7806 29.86 69.78C36.79 69.78 42.96 71.42 47.6 75.78C47.6698 75.8391 47.7586 75.8711 47.85 75.87C47.9075 75.8716 47.9645 75.8597 48.0166 75.8354C48.0686 75.8111 48.1143 75.775 48.15 75.73L48.37 75.42C53.09 68.97 60.87 65.79 69.53 65.79C70.15 65.79 70.76 65.79 71.37 65.85H71.92C72.0227 65.8475 72.1204 65.8056 72.193 65.733C72.2656 65.6604 72.3075 65.5626 72.31 65.46C72.3027 65.4105 72.2857 65.3629 72.26 65.32C72.2342 65.2771 72.2003 65.2397 72.16 65.21Z" fill="white"/>
+<svg width="80" height="100" viewBox="0 0 80 100" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_2964_22043)">
+<path d="M75 19V92.6667C75 93.2855 74.7542 93.879 74.3166 94.3166C73.879 94.7542 73.2855 95 72.6667 95H7.33333C6.71449 95 6.121 94.7542 5.68342 94.3166C5.24583 93.879 5 93.2855 5 92.6667V7.33333C5 6.71449 5.24583 6.121 5.68342 5.68342C6.121 5.24583 6.71449 5 7.33333 5H61L75 19Z" fill="#237453"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M64.6167 38.8762L64.8745 39.0096C64.9076 39.0253 64.9362 39.049 64.958 39.0785C64.9797 39.1079 64.9938 39.1423 64.999 39.1786C65.002 39.2093 64.998 39.2403 64.9873 39.2692C64.9766 39.2981 64.9594 39.3243 64.9372 39.3456C64.915 39.367 64.8882 39.3831 64.8588 39.3927C64.8295 39.4022 64.7984 39.405 64.7678 39.4009H64.4744C64.4458 39.3956 64.4171 39.3901 64.3882 39.3847C64.175 39.3444 63.9557 39.303 63.7364 39.303C59.2548 38.8851 55.0934 40.13 52.3547 43.2599C52.2391 43.3667 52.1413 43.3755 52.0257 43.2599C49.865 40.8058 46.8151 39.7121 43.2583 39.3831C42.0298 39.2614 40.7903 39.3153 39.577 39.5431H39.5237C39.4624 39.5431 39.4036 39.5188 39.3602 39.4754C39.3169 39.4321 39.2925 39.3733 39.2925 39.3119C39.2925 39.2774 39.3005 39.2434 39.316 39.2125C39.3314 39.1817 39.3538 39.1548 39.3814 39.1341H39.4526C41.4206 38.1028 43.6159 37.5819 45.8375 37.6192C48.059 37.6565 50.2357 38.2507 52.168 39.3475C54.0479 38.2618 56.1645 37.6513 58.3339 37.5692C60.5033 37.4871 62.66 37.9357 64.6167 38.8762ZM48.2607 48.4782C52.1435 48.0444 56.0728 48.6016 59.6819 50.0978C59.7176 50.1243 59.7478 50.1575 59.7707 50.1957C59.7936 50.2338 59.8087 50.2761 59.8152 50.3201C59.813 50.4114 59.7757 50.4983 59.7112 50.5628C59.6466 50.6274 59.5597 50.6647 59.4684 50.6669H58.9794C58.437 50.6136 57.8946 50.6136 57.3433 50.6136H57.3433C49.6429 50.6136 42.725 53.4412 38.528 59.1765L38.3324 59.4521C38.3006 59.4922 38.26 59.5243 38.2137 59.5459C38.1674 59.5675 38.1167 59.578 38.0656 59.5766C37.9843 59.5775 37.9054 59.5491 37.8433 59.4966C33.7175 55.6197 28.2312 54.1614 22.0691 54.1614C19.8133 54.1619 17.5697 54.4914 15.409 55.1395H15.3379C15.2475 55.1372 15.1615 55.0997 15.0984 55.0349C15.0353 54.9701 15 54.8832 15 54.7928C15.0011 54.7421 15.0127 54.6922 15.0341 54.6463C15.0556 54.6003 15.0863 54.5594 15.1245 54.526H15.1689C18.4181 52.3379 22.1699 51.0113 26.0723 50.6707C29.9747 50.3301 33.8996 50.9866 37.4787 52.5787C40.6685 50.3228 44.378 48.912 48.2607 48.4782Z" fill="white"/>
+<path opacity="0.2" d="M75 19H63.3333C62.7145 19 62.121 18.7542 61.6834 18.3166C61.2458 17.879 61 17.2855 61 16.6667V5L75 19Z" fill="black"/>
+<path d="M36.332 82.7051C36.332 83.3652 36.25 83.9668 36.0859 84.5098C35.9219 85.0488 35.6719 85.5137 35.3359 85.9043C35.0039 86.2949 34.582 86.5957 34.0703 86.8066C33.5586 87.0137 32.9531 87.1172 32.2539 87.1172C31.5547 87.1172 30.9492 87.0137 30.4375 86.8066C29.9258 86.5957 29.502 86.2949 29.166 85.9043C28.834 85.5137 28.5859 85.0469 28.4219 84.5039C28.2578 83.9609 28.1758 83.3574 28.1758 82.6934C28.1758 81.8066 28.3203 81.0352 28.6094 80.3789C28.9023 79.7188 29.3516 79.207 29.957 78.8438C30.5625 78.4805 31.332 78.2988 32.2656 78.2988C33.1953 78.2988 33.959 78.4805 34.5566 78.8438C35.1582 79.207 35.6035 79.7188 35.8926 80.3789C36.1855 81.0391 36.332 81.8145 36.332 82.7051ZM30.0801 82.7051C30.0801 83.3027 30.1543 83.8184 30.3027 84.252C30.4551 84.6816 30.6914 85.0137 31.0117 85.248C31.332 85.4785 31.7461 85.5938 32.2539 85.5938C32.7695 85.5938 33.1875 85.4785 33.5078 85.248C33.8281 85.0137 34.0605 84.6816 34.2051 84.252C34.3535 83.8184 34.4277 83.3027 34.4277 82.7051C34.4277 81.8066 34.2598 81.0996 33.9238 80.584C33.5879 80.0684 33.0352 79.8105 32.2656 79.8105C31.7539 79.8105 31.3359 79.9277 31.0117 80.1621C30.6914 80.3926 30.4551 80.7246 30.3027 81.1582C30.1543 81.5879 30.0801 82.1035 30.0801 82.7051ZM45.2148 82.6348C45.2148 83.5996 45.0293 84.4062 44.6582 85.0547C44.291 85.6992 43.7578 86.1855 43.0586 86.5137C42.3594 86.8379 41.5176 87 40.5332 87H38.1074V78.4336H40.7969C41.6953 78.4336 42.4746 78.5938 43.1348 78.9141C43.7949 79.2305 44.3066 79.7012 44.6699 80.3262C45.0332 80.9473 45.2148 81.7168 45.2148 82.6348ZM43.3281 82.6816C43.3281 82.0488 43.2344 81.5293 43.0469 81.123C42.8633 80.7129 42.5898 80.4102 42.2266 80.2148C41.8672 80.0195 41.4219 79.9219 40.8906 79.9219H39.9238V85.5H40.7031C41.5898 85.5 42.248 85.2637 42.6777 84.791C43.1113 84.3184 43.3281 83.6152 43.3281 82.6816ZM52.0469 84.6211C52.0469 85.1289 51.9238 85.5703 51.6777 85.9453C51.4316 86.3203 51.0723 86.6094 50.5996 86.8125C50.1309 87.0156 49.5605 87.1172 48.8887 87.1172C48.5918 87.1172 48.3008 87.0977 48.0156 87.0586C47.7344 87.0195 47.4629 86.9629 47.2012 86.8887C46.9434 86.8105 46.6973 86.7148 46.4629 86.6016V84.9141C46.8691 85.0938 47.291 85.2559 47.7285 85.4004C48.166 85.5449 48.5996 85.6172 49.0293 85.6172C49.3262 85.6172 49.5645 85.5781 49.7441 85.5C49.9277 85.4219 50.0605 85.3145 50.1426 85.1777C50.2246 85.041 50.2656 84.8848 50.2656 84.709C50.2656 84.4941 50.1934 84.3105 50.0488 84.1582C49.9043 84.0059 49.7051 83.8633 49.4512 83.7305C49.2012 83.5977 48.918 83.4551 48.6016 83.3027C48.4023 83.209 48.1855 83.0957 47.9512 82.9629C47.7168 82.8262 47.4941 82.6602 47.2832 82.4648C47.0723 82.2695 46.8984 82.0332 46.7617 81.7559C46.6289 81.4746 46.5625 81.1387 46.5625 80.748C46.5625 80.2363 46.6797 79.7988 46.9141 79.4355C47.1484 79.0723 47.4824 78.7949 47.916 78.6035C48.3535 78.4082 48.8691 78.3105 49.4629 78.3105C49.9082 78.3105 50.332 78.3633 50.7344 78.4688C51.1406 78.5703 51.5645 78.7188 52.0059 78.9141L51.4199 80.3262C51.0254 80.166 50.6719 80.043 50.3594 79.957C50.0469 79.8672 49.7285 79.8223 49.4043 79.8223C49.1777 79.8223 48.9844 79.8594 48.8242 79.9336C48.6641 80.0039 48.543 80.1055 48.4609 80.2383C48.3789 80.3672 48.3379 80.5176 48.3379 80.6895C48.3379 80.8926 48.3965 81.0645 48.5137 81.2051C48.6348 81.3418 48.8145 81.4746 49.0527 81.6035C49.2949 81.7324 49.5957 81.8828 49.9551 82.0547C50.3926 82.2617 50.7656 82.4785 51.0742 82.7051C51.3867 82.9277 51.627 83.1914 51.7949 83.4961C51.9629 83.7969 52.0469 84.1719 52.0469 84.6211Z" fill="white"/>
+</g>
+<defs>
+<clipPath id="clip0_2964_22043">
+<rect width="80" height="100" fill="white"/>
+</clipPath>
+</defs>
 </svg>
--- a/apps/common/main/resources/img/doc-formats/odt.svg
+++ b/apps/common/main/resources/img/doc-formats/odt.svg
@ -1,7 +1,13 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 127" version="1.1" width="100" height="127">
-<path d="M95 23V119C95 119.796 94.6839 120.559 94.1213 121.121C93.5587 121.684 92.7956 122 92 122H8C7.20435 122 6.44129 121.684 5.87868 121.121C5.31607 120.559 5 119.796 5 119V8C5 7.20435 5.31607 6.44129 5.87868 5.87868C6.44129 5.31607 7.20435 5 8 5H77L95 23Z" fill="#3C6D88"/>
-<path opacity="0.2" d="M95 23H80C79.2044 23 78.4413 22.6839 77.8787 22.1213C77.3161 21.5587 77 20.7956 77 20V5L95 23Z" fill="black"/>
-<path d="M46.1636 109.705C46.1636 111.123 45.812 112.213 45.1089 112.975C44.4058 113.736 43.3979 114.117 42.0854 114.117C40.7729 114.117 39.7651 113.736 39.062 112.975C38.3589 112.213 38.0073 111.119 38.0073 109.693C38.0073 108.268 38.3589 107.18 39.062 106.43C39.769 105.676 40.7808 105.299 42.0972 105.299C43.4136 105.299 44.4194 105.678 45.1147 106.436C45.814 107.193 46.1636 108.283 46.1636 109.705ZM39.9116 109.705C39.9116 110.662 40.0933 111.383 40.4565 111.867C40.8198 112.352 41.3628 112.594 42.0854 112.594C43.5347 112.594 44.2593 111.631 44.2593 109.705C44.2593 107.775 43.5386 106.811 42.0972 106.811C41.3745 106.811 40.8296 107.055 40.4624 107.543C40.0952 108.027 39.9116 108.748 39.9116 109.705ZM55.0464 109.635C55.0464 111.045 54.644 112.125 53.8394 112.875C53.0386 113.625 51.8804 114 50.3647 114H47.939V105.434H50.6284C52.0269 105.434 53.1128 105.803 53.8862 106.541C54.6597 107.279 55.0464 108.311 55.0464 109.635ZM53.1597 109.682C53.1597 107.842 52.3472 106.922 50.7222 106.922H49.7554V112.5H50.5347C52.2847 112.5 53.1597 111.561 53.1597 109.682ZM60.1265 114H58.3101V106.945H55.9839V105.434H62.4526V106.945H60.1265V114Z" fill="white"/>
-<path d="M78 52.74L77.71 52.59C75.5095 51.5323 73.0841 51.0277 70.6443 51.1201C68.2046 51.2125 65.8242 51.899 63.71 53.12C61.5369 51.8865 59.089 51.2182 56.5906 51.1763C54.0922 51.1344 51.6232 51.7202 49.41 52.88H49.33C49.2989 52.9033 49.2737 52.9335 49.2564 52.9682C49.239 53.0029 49.23 53.0412 49.23 53.08C49.23 53.149 49.2574 53.2151 49.3061 53.2639C49.3549 53.3126 49.421 53.34 49.49 53.34H49.55C50.9144 53.0837 52.3084 53.0231 53.69 53.16C57.69 53.53 61.12 54.76 63.55 57.52C63.68 57.65 63.79 57.64 63.92 57.52C67 54 71.68 52.6 76.72 53.07C77 53.07 77.28 53.13 77.55 53.18H77.88C77.9144 53.1847 77.9494 53.1815 77.9823 53.1708C78.0153 53.16 78.0455 53.142 78.0705 53.1179C78.0955 53.0939 78.1147 53.0645 78.1268 53.0319C78.1388 52.9994 78.1433 52.9645 78.14 52.93C78.1341 52.8893 78.1182 52.8506 78.0938 52.8174C78.0694 52.7843 78.0372 52.7577 78 52.74Z" fill="white"/>
-<path d="M72.1599 65.21C68.1011 63.5273 63.6821 62.9007 59.3155 63.3886C54.9489 63.8765 50.7772 65.463 47.1899 68C43.1648 66.2095 38.7507 65.4712 34.362 65.8543C29.9734 66.2373 25.754 67.7293 22.0999 70.19H22.0499C22.007 70.2275 21.9724 70.2736 21.9483 70.3252C21.9242 70.3769 21.9111 70.433 21.9099 70.49C21.9099 70.5917 21.9496 70.6894 22.0206 70.7623C22.0916 70.8352 22.1882 70.8774 22.2899 70.88H22.3699C24.7998 70.1511 27.323 69.7806 29.8599 69.78C36.7899 69.78 42.9599 71.42 47.5999 75.78C47.6697 75.8391 47.7585 75.8711 47.8499 75.87C47.9074 75.8716 47.9644 75.8597 48.0164 75.8354C48.0685 75.8111 48.1142 75.775 48.1499 75.73L48.3699 75.42C53.0899 68.97 60.8699 65.79 69.5299 65.79C70.1499 65.79 70.7599 65.79 71.3699 65.85H71.9199C72.0225 65.8475 72.1203 65.8056 72.1929 65.733C72.2655 65.6604 72.3074 65.5626 72.3099 65.46C72.3026 65.4105 72.2856 65.3629 72.2598 65.32C72.2341 65.2771 72.2001 65.2397 72.1599 65.21Z" fill="white"/>
+<svg width="80" height="100" viewBox="0 0 80 100" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_2964_22031)">
+<path d="M75 19V92.6667C75 93.2855 74.7542 93.879 74.3166 94.3166C73.879 94.7542 73.2855 95 72.6667 95H7.33333C6.71449 95 6.121 94.7542 5.68342 94.3166C5.24583 93.879 5 93.2855 5 92.6667V7.33333C5 6.71449 5.24583 6.121 5.68342 5.68342C6.121 5.24583 6.71449 5 7.33333 5H61L75 19Z" fill="#3C6D88"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M64.6167 38.8762L64.8745 39.0096C64.9076 39.0254 64.9362 39.049 64.958 39.0785C64.9797 39.1079 64.9938 39.1423 64.999 39.1786C65.002 39.2093 64.998 39.2403 64.9873 39.2692C64.9766 39.2981 64.9594 39.3243 64.9372 39.3456C64.915 39.367 64.8882 39.3831 64.8588 39.3927C64.8295 39.4022 64.7984 39.405 64.7678 39.4009H64.4744C64.4458 39.3956 64.4171 39.3901 64.3882 39.3847C64.175 39.3444 63.9557 39.303 63.7364 39.303C59.2548 38.8851 55.0934 40.13 52.3547 43.2599C52.2391 43.3667 52.1413 43.3755 52.0257 43.2599C49.865 40.8058 46.8151 39.7121 43.2583 39.3831C42.0298 39.2614 40.7903 39.3153 39.577 39.5431H39.5237C39.4624 39.5431 39.4036 39.5188 39.3602 39.4754C39.3169 39.4321 39.2925 39.3733 39.2925 39.3119C39.2925 39.2774 39.3005 39.2434 39.316 39.2125C39.3314 39.1817 39.3538 39.1548 39.3814 39.1341H39.4526C41.4206 38.1028 43.6159 37.5819 45.8375 37.6192C48.059 37.6565 50.2357 38.2507 52.168 39.3475C54.0479 38.2618 56.1645 37.6513 58.3339 37.5692C60.5033 37.4871 62.66 37.9357 64.6167 38.8762ZM48.2607 48.4782C52.1435 48.0444 56.0728 48.6016 59.6819 50.0978C59.7176 50.1243 59.7478 50.1575 59.7707 50.1957C59.7936 50.2338 59.8087 50.2761 59.8152 50.3201C59.813 50.4114 59.7757 50.4983 59.7112 50.5628C59.6466 50.6274 59.5597 50.6647 59.4684 50.6669H58.9794C58.437 50.6136 57.8946 50.6136 57.3433 50.6136H57.3433C49.6429 50.6136 42.725 53.4412 38.528 59.1765L38.3324 59.4521C38.3006 59.4922 38.26 59.5243 38.2137 59.5459C38.1674 59.5675 38.1167 59.578 38.0656 59.5766C37.9843 59.5775 37.9054 59.5491 37.8433 59.4966C33.7175 55.6197 28.2312 54.1614 22.0691 54.1614C19.8133 54.1619 17.5697 54.4914 15.409 55.1395H15.3379C15.2475 55.1372 15.1615 55.0997 15.0984 55.0349C15.0353 54.9701 15 54.8832 15 54.7928C15.0011 54.7421 15.0127 54.6922 15.0341 54.6463C15.0556 54.6003 15.0863 54.5594 15.1245 54.526H15.1689C18.4181 52.3379 22.1699 51.0113 26.0723 50.6707C29.9747 50.3301 33.8996 50.9866 37.4787 52.5787C40.6685 50.3228 44.378 48.912 48.2607 48.4782Z" fill="white"/>
+<path opacity="0.2" d="M75 19H63.3333C62.7145 19 62.121 18.7542 61.6834 18.3166C61.2458 17.879 61 17.2855 61 16.6667V5L75 19Z" fill="black"/>
+<path d="M36.1621 82.7051C36.1621 83.3652 36.0801 83.9668 35.916 84.5098C35.752 85.0488 35.502 85.5137 35.166 85.9043C34.834 86.2949 34.4121 86.5957 33.9004 86.8066C33.3887 87.0137 32.7832 87.1172 32.084 87.1172C31.3848 87.1172 30.7793 87.0137 30.2676 86.8066C29.7559 86.5957 29.332 86.2949 28.9961 85.9043C28.6641 85.5137 28.416 85.0469 28.252 84.5039C28.0879 83.9609 28.0059 83.3574 28.0059 82.6934C28.0059 81.8066 28.1504 81.0352 28.4395 80.3789C28.7324 79.7188 29.1816 79.207 29.7871 78.8438C30.3926 78.4805 31.1621 78.2988 32.0957 78.2988C33.0254 78.2988 33.7891 78.4805 34.3867 78.8438C34.9883 79.207 35.4336 79.7188 35.7227 80.3789C36.0156 81.0391 36.1621 81.8145 36.1621 82.7051ZM29.9102 82.7051C29.9102 83.3027 29.9844 83.8184 30.1328 84.252C30.2852 84.6816 30.5215 85.0137 30.8418 85.248C31.1621 85.4785 31.5762 85.5938 32.084 85.5938C32.5996 85.5938 33.0176 85.4785 33.3379 85.248C33.6582 85.0137 33.8906 84.6816 34.0352 84.252C34.1836 83.8184 34.2578 83.3027 34.2578 82.7051C34.2578 81.8066 34.0898 81.0996 33.7539 80.584C33.418 80.0684 32.8652 79.8105 32.0957 79.8105C31.584 79.8105 31.166 79.9277 30.8418 80.1621C30.5215 80.3926 30.2852 80.7246 30.1328 81.1582C29.9844 81.5879 29.9102 82.1035 29.9102 82.7051ZM45.0449 82.6348C45.0449 83.5996 44.8594 84.4062 44.4883 85.0547C44.1211 85.6992 43.5879 86.1855 42.8887 86.5137C42.1895 86.8379 41.3477 87 40.3633 87H37.9375V78.4336H40.627C41.5254 78.4336 42.3047 78.5938 42.9648 78.9141C43.625 79.2305 44.1367 79.7012 44.5 80.3262C44.8633 80.9473 45.0449 81.7168 45.0449 82.6348ZM43.1582 82.6816C43.1582 82.0488 43.0645 81.5293 42.877 81.123C42.6934 80.7129 42.4199 80.4102 42.0566 80.2148C41.6973 80.0195 41.252 79.9219 40.7207 79.9219H39.7539V85.5H40.5332C41.4199 85.5 42.0781 85.2637 42.5078 84.791C42.9414 84.3184 43.1582 83.6152 43.1582 82.6816ZM50.125 87H48.3086V79.9453H45.9824V78.4336H52.4512V79.9453H50.125V87Z" fill="white"/>
+</g>
+<defs>
+<clipPath id="clip0_2964_22031">
+<rect width="80" height="100" fill="white"/>
+</clipPath>
+</defs>
 </svg>
--- a/apps/common/main/resources/img/doc-formats/oform.svg
+++ b/apps/common/main/resources/img/doc-formats/oform.svg
@ -1,16 +1,18 @@
-<svg width="100" height="127" viewBox="0 0 100 127" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M95 23V119C95 119.796 94.6839 120.559 94.1213 121.121C93.5587 121.684 92.7956 122 92 122H8C7.20435 122 6.44129 121.684 5.87868 121.121C5.31607 120.559 5 119.796 5 119V8C5 7.20435 5.31607 6.44129 5.87868 5.87868C6.44129 5.31607 7.20435 5 8 5H77L95 23Z" fill="#2CA498"/>
-<path opacity="0.2" d="M95 23H80C79.2044 23 78.4413 22.6839 77.8787 22.1213C77.3161 21.5587 77 20.7956 77 20V5L95 23Z" fill="black"/>
-<path d="M36.8535 109.705C36.8535 111.123 36.502 112.213 35.7988 112.975C35.0957 113.736 34.0879 114.117 32.7754 114.117C31.4629 114.117 30.4551 113.736 29.752 112.975C29.0488 112.213 28.6973 111.119 28.6973 109.693C28.6973 108.268 29.0488 107.18 29.752 106.43C30.459 105.676 31.4707 105.299 32.7871 105.299C34.1035 105.299 35.1094 105.678 35.8047 106.436C36.5039 107.193 36.8535 108.283 36.8535 109.705ZM30.6016 109.705C30.6016 110.662 30.7832 111.383 31.1465 111.867C31.5098 112.352 32.0527 112.594 32.7754 112.594C34.2246 112.594 34.9492 111.631 34.9492 109.705C34.9492 107.775 34.2285 106.811 32.7871 106.811C32.0645 106.811 31.5195 107.055 31.1523 107.543C30.7852 108.027 30.6016 108.748 30.6016 109.705Z" fill="white"/>
-<path d="M40.416 114H38.6289V105.434H43.5391V106.922H40.416V109.131H43.3223V110.613H40.416V114Z" fill="white"/>
-<path d="M52.9902 109.705C52.9902 111.123 52.6387 112.213 51.9355 112.975C51.2324 113.736 50.2246 114.117 48.9121 114.117C47.5996 114.117 46.5918 113.736 45.8887 112.975C45.1855 112.213 44.834 111.119 44.834 109.693C44.834 108.268 45.1855 107.18 45.8887 106.43C46.5957 105.676 47.6074 105.299 48.9238 105.299C50.2402 105.299 51.2461 105.678 51.9414 106.436C52.6406 107.193 52.9902 108.283 52.9902 109.705ZM46.7383 109.705C46.7383 110.662 46.9199 111.383 47.2832 111.867C47.6465 112.352 48.1895 112.594 48.9121 112.594C50.3613 112.594 51.0859 111.631 51.0859 109.705C51.0859 107.775 50.3652 106.811 48.9238 106.811C48.2012 106.811 47.6562 107.055 47.2891 107.543C46.9219 108.027 46.7383 108.748 46.7383 109.705Z" fill="white"/>
-<path d="M56.582 109.236H57.168C57.7422 109.236 58.166 109.141 58.4395 108.949C58.7129 108.758 58.8496 108.457 58.8496 108.047C58.8496 107.641 58.709 107.352 58.4277 107.18C58.1504 107.008 57.7188 106.922 57.1328 106.922H56.582V109.236ZM56.582 110.713V114H54.7656V105.434H57.2617C58.4258 105.434 59.2871 105.646 59.8457 106.072C60.4043 106.494 60.6836 107.137 60.6836 108C60.6836 108.504 60.5449 108.953 60.2676 109.348C59.9902 109.738 59.5977 110.045 59.0898 110.268C60.3789 112.193 61.2188 113.438 61.6094 114H59.5938L57.5488 110.713H56.582Z" fill="white"/>
-<path d="M66.3145 114L64.252 107.279H64.1992C64.2734 108.646 64.3105 109.559 64.3105 110.016V114H62.6875V105.434H65.1602L67.1875 111.984H67.2227L69.373 105.434H71.8457V114H70.1523V109.945C70.1523 109.754 70.1543 109.533 70.1582 109.283C70.166 109.033 70.1934 108.369 70.2402 107.291H70.1875L67.9785 114H66.3145Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M19 85H81V41H19V85ZM17 39V87H83V39H17Z" fill="white"/>
-<rect x="19" y="41" width="62" height="44" fill="#41ADA2"/>
-<rect x="29" y="50" width="5" height="2" fill="white"/>
-<rect x="36" y="50" width="5" height="2" fill="white"/>
-<rect x="29" y="74" width="5" height="2" fill="white"/>
-<rect x="36" y="74" width="5" height="2" fill="white"/>
-<rect width="22" height="2" transform="matrix(-4.37114e-08 1 1 4.37114e-08 34 52)" fill="white"/>
+<svg width="80" height="100" viewBox="0 0 80 100" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_2964_22044)">
+<path d="M75 19V92.6667C75 93.2855 74.7542 93.879 74.3166 94.3166C73.879 94.7542 73.2855 95 72.6667 95H7.33333C6.71449 95 6.121 94.7542 5.68342 94.3166C5.24583 93.879 5 93.2855 5 92.6667V7.33333C5 6.71449 5.24583 6.121 5.68342 5.68342C6.121 5.24583 6.71449 5 7.33333 5H61L75 19Z" fill="#188079"/>
+<path d="M18 39H54.1761H62V42.7143V59H18V39Z" stroke="white" stroke-width="2"/>
+<rect x="21" y="42" width="3" height="2" fill="white"/>
+<rect x="26" y="42" width="3" height="2" fill="white"/>
+<rect x="21" y="54" width="3" height="2" fill="white"/>
+<rect x="26" y="54" width="3" height="2" fill="white"/>
+<rect width="10" height="2" transform="matrix(-7.10309e-08 1 1 2.68993e-08 24 44)" fill="white"/>
+<path opacity="0.2" d="M75 19H63.3333C62.7145 19 62.121 18.7542 61.6834 18.3166C61.2458 17.879 61 17.2855 61 16.6667V5L75 19Z" fill="black"/>
+<path d="M26.3887 82.7051C26.3887 83.3652 26.3066 83.9668 26.1426 84.5098C25.9785 85.0488 25.7285 85.5137 25.3926 85.9043C25.0605 86.2949 24.6387 86.5957 24.127 86.8066C23.6152 87.0137 23.0098 87.1172 22.3105 87.1172C21.6113 87.1172 21.0059 87.0137 20.4941 86.8066C19.9824 86.5957 19.5586 86.2949 19.2227 85.9043C18.8906 85.5137 18.6426 85.0469 18.4785 84.5039C18.3145 83.9609 18.2324 83.3574 18.2324 82.6934C18.2324 81.8066 18.377 81.0352 18.666 80.3789C18.959 79.7188 19.4082 79.207 20.0137 78.8438C20.6191 78.4805 21.3887 78.2988 22.3223 78.2988C23.252 78.2988 24.0156 78.4805 24.6133 78.8438C25.2148 79.207 25.6602 79.7188 25.9492 80.3789C26.2422 81.0391 26.3887 81.8145 26.3887 82.7051ZM20.1367 82.7051C20.1367 83.3027 20.2109 83.8184 20.3594 84.252C20.5117 84.6816 20.748 85.0137 21.0684 85.248C21.3887 85.4785 21.8027 85.5938 22.3105 85.5938C22.8262 85.5938 23.2441 85.4785 23.5645 85.248C23.8848 85.0137 24.1172 84.6816 24.2617 84.252C24.4102 83.8184 24.4844 83.3027 24.4844 82.7051C24.4844 81.8066 24.3164 81.0996 23.9805 80.584C23.6445 80.0684 23.0918 79.8105 22.3223 79.8105C21.8105 79.8105 21.3926 79.9277 21.0684 80.1621C20.748 80.3926 20.5117 80.7246 20.3594 81.1582C20.2109 81.5879 20.1367 82.1035 20.1367 82.7051ZM29.9512 87H28.1641V78.4336H33.0742V79.9219H29.9512V82.1309H32.8574V83.6133H29.9512V87ZM42.5254 82.7051C42.5254 83.3652 42.4434 83.9668 42.2793 84.5098C42.1152 85.0488 41.8652 85.5137 41.5293 85.9043C41.1973 86.2949 40.7754 86.5957 40.2637 86.8066C39.752 87.0137 39.1465 87.1172 38.4473 87.1172C37.748 87.1172 37.1426 87.0137 36.6309 86.8066C36.1191 86.5957 35.6953 86.2949 35.3594 85.9043C35.0273 85.5137 34.7793 85.0469 34.6152 84.5039C34.4512 83.9609 34.3691 83.3574 34.3691 82.6934C34.3691 81.8066 34.5137 81.0352 34.8027 80.3789C35.0957 79.7188 35.5449 79.207 36.1504 78.8438C36.7559 78.4805 37.5254 78.2988 38.459 78.2988C39.3887 78.2988 40.1523 78.4805 40.75 78.8438C41.3516 79.207 41.7969 79.7188 42.0859 80.3789C42.3789 81.0391 42.5254 81.8145 42.5254 82.7051ZM36.2734 82.7051C36.2734 83.3027 36.3477 83.8184 36.4961 84.252C36.6484 84.6816 36.8848 85.0137 37.2051 85.248C37.5254 85.4785 37.9395 85.5938 38.4473 85.5938C38.9629 85.5938 39.3809 85.4785 39.7012 85.248C40.0215 85.0137 40.2539 84.6816 40.3984 84.252C40.5469 83.8184 40.6211 83.3027 40.6211 82.7051C40.6211 81.8066 40.4531 81.0996 40.1172 80.584C39.7812 80.0684 39.2285 79.8105 38.459 79.8105C37.9473 79.8105 37.5293 79.9277 37.2051 80.1621C36.8848 80.3926 36.6484 80.7246 36.4961 81.1582C36.3477 81.5879 36.2734 82.1035 36.2734 82.7051ZM46.7969 78.4336C47.5742 78.4336 48.2148 78.5273 48.7188 78.7148C49.2266 78.9023 49.6035 79.1855 49.8496 79.5645C50.0957 79.9434 50.2188 80.4219 50.2188 81C50.2188 81.3906 50.1445 81.7324 49.9961 82.0254C49.8477 82.3184 49.6523 82.5664 49.4102 82.7695C49.168 82.9727 48.9062 83.1387 48.625 83.2676L51.1445 87H49.1289L47.084 83.7129H46.1172V87H44.3008V78.4336H46.7969ZM46.668 79.9219H46.1172V82.2363H46.7031C47.3047 82.2363 47.7344 82.1367 47.9922 81.9375C48.2539 81.7344 48.3848 81.4375 48.3848 81.0469C48.3848 80.6406 48.2441 80.3516 47.9629 80.1797C47.6855 80.0078 47.2539 79.9219 46.668 79.9219ZM55.8496 87L53.7871 80.2793H53.7344C53.7422 80.4395 53.7539 80.6816 53.7695 81.0059C53.7891 81.3262 53.8066 81.668 53.8223 82.0312C53.8379 82.3945 53.8457 82.7227 53.8457 83.0156V87H52.2227V78.4336H54.6953L56.7227 84.9844H56.7578L58.9082 78.4336H61.3809V87H59.6875V82.9453C59.6875 82.6758 59.6914 82.3652 59.6992 82.0137C59.7109 81.6621 59.7246 81.3281 59.7402 81.0117C59.7559 80.6914 59.7676 80.4512 59.7754 80.291H59.7227L57.5137 87H55.8496Z" fill="white"/>
+</g>
+<defs>
+<clipPath id="clip0_2964_22044">
+<rect width="80" height="100" fill="white"/>
+</clipPath>
+</defs>
 </svg>
--- a/Show more
+++ b/Show more