diff --git a/apps/common/locale.js b/apps/common/locale.js
index 9cf5cbf96..d954165fc 100644
--- a/apps/common/locale.js
+++ b/apps/common/locale.js
@@ -38,7 +38,8 @@ Common.Locale = new(function() {
     "use strict";
     var l10n = null;
     var loadcallback,
-        apply = false;
+        apply = false,
+        currentLang = 'en';
 
     var _applyLocalization = function(callback) {
         try {
@@ -78,6 +79,10 @@ Common.Locale = new(function() {
         return res || (scope ? eval(scope.name).prototype[prop] : '');
     };
 
+    var _getCurrentLanguage = function() {
+        return (currentLang || 'en');
+    };
+
     var _getUrlParameterByName = function(name) {
         name = name.replace(/[\[]/, "\\\[").replace(/[\]]/, "\\\]");
         var regex = new RegExp("[\\?&]" + name + "=([^&#]*)"),
@@ -87,9 +92,11 @@ Common.Locale = new(function() {
 
     var _requireLang = function () {
         var lang = (_getUrlParameterByName('lang') || 'en').split(/[\-_]/)[0];
+        currentLang = lang;
         fetch('locale/' + lang + '.json')
             .then(function(response) {
                 if (!response.ok) {
+                    currentLang = 'en';
                     if (lang != 'en')
                         /* load default lang if fetch failed */
                         return fetch('locale/en.json');
@@ -130,7 +137,8 @@ Common.Locale = new(function() {
 
     return {
         apply: _applyLocalization,
-        get: _get
+        get: _get,
+        getCurrentLanguage: _getCurrentLanguage
     };
     
 })();
diff --git a/apps/common/main/lib/component/CheckBox.js b/apps/common/main/lib/component/CheckBox.js
index 019c1013f..c42f26253 100644
--- a/apps/common/main/lib/component/CheckBox.js
+++ b/apps/common/main/lib/component/CheckBox.js
@@ -94,7 +94,8 @@ define([
         checked     : false,
         value       : 'unchecked',
 
-        template    : _.template('<label class="checkbox-indeterminate"><input type="button" class="button__checkbox"><span><%= labelText %></span></label>'),
+        template    : _.template('<label class="checkbox-indeterminate"><input id="<%= id %>" type="checkbox" class="checkbox__native">' +
+                                    '<label for="<%= id %>" class="checkbox__shape" /><span><%= labelText %></span></label>'),
 
         initialize : function(options) {
             Common.UI.BaseView.prototype.initialize.call(this, options);
@@ -106,19 +107,19 @@ define([
         render: function (parentEl) {
             var me = this;
             if (!me.rendered) {
+                var elem = this.template({
+                    labelText: this.options.labelText,
+                    id: Common.UI.getId('chb-')
+                });
                 if (parentEl) {
                     this.setElement(parentEl, false);
-                    parentEl.html(this.template({
-                        labelText: this.options.labelText
-                    }));
+                    parentEl.html(elem);
                 } else {
-                    me.$el.html(this.template({
-                        labelText: this.options.labelText
-                    }));
+                    me.$el.html(elem);
                 }
 
-                this.$chk = me.$el.find('input[type=button]');
-                this.$label = me.$el.find('label');
+                this.$chk = me.$el.find('input[type=checkbox]');
+                this.$label = me.$el.find('label.checkbox-indeterminate');
                 this.$chk.on('click', this.onItemCheck.bind(this));
 
                 this.rendered = true;
@@ -166,18 +167,18 @@ define([
             this.checked = (value === true || value === 'true' || value === '1' || value === 1 || value === 'checked');
             this.indeterminate = (value === 'indeterminate');
 
-            this.$chk.toggleClass('checked', this.checked);
-            this.$chk.toggleClass('indeterminate', this.indeterminate);
-
             this.value = this.indeterminate ? 'indeterminate' : (this.checked ? 'checked' : 'unchecked');
+            this.$chk.prop({indeterminate: this.indeterminate, checked: this.checked});
         },
 
         setValue: function(value, suspendchange) {
             if (this.rendered) {
-                this.lastValue = this.value;
-                this.setRawValue(value);
-                if (suspendchange !== true && this.lastValue !== value)
-                    this.trigger('change', this, this.value, this.lastValue);
+                if ( value != this.value ) {
+                    this.lastValue = this.value;
+                    this.setRawValue(value);
+                    if (suspendchange !== true)
+                        this.trigger('change', this, this.value, this.lastValue);
+                }
             } else {
                 this.options.value = value;
             }
diff --git a/apps/common/main/lib/component/ComboBox.js b/apps/common/main/lib/component/ComboBox.js
index bd4229d95..6f27af0a2 100644
--- a/apps/common/main/lib/component/ComboBox.js
+++ b/apps/common/main/lib/component/ComboBox.js
@@ -355,6 +355,7 @@ define([
                     return false;
                 }
                 else if (e.keyCode == Common.UI.Keys.ESC && this.isMenuOpen()) {
+                    this._input.val(this.lastValue);
                     this.closeMenu();
                     this.onAfterHideMenu(e);
                     return false;
@@ -420,6 +421,7 @@ define([
                 var me = this;
 
                 if (e.keyCode == Common.UI.Keys.ESC){
+                    this._input.val(this.lastValue);
                     this.closeMenu();
                     this.onAfterHideMenu(e);
                 } else if (e.keyCode == Common.UI.Keys.UP || e.keyCode == Common.UI.Keys.DOWN) {
diff --git a/apps/common/main/lib/component/Menu.js b/apps/common/main/lib/component/Menu.js
index 6d0d0bd92..e5ee14ebc 100644
--- a/apps/common/main/lib/component/Menu.js
+++ b/apps/common/main/lib/component/Menu.js
@@ -523,7 +523,7 @@ define([
                     menuParent  = this.menuAlignEl || menuRoot.parent(),
                     m           = this.menuAlign.match(/^([a-z]+)-([a-z]+)/),
                     offset      = menuParent.offset(),
-                    docW        = Common.Utils.innerWidth(),
+                    docW        = Common.Utils.innerWidth() - 10,
                     docH        = Common.Utils.innerHeight() - 10, // Yep, it's magic number
                     menuW       = menuRoot.outerWidth(),
                     menuH       = menuRoot.outerHeight(),
diff --git a/apps/common/main/lib/component/MetricSpinner.js b/apps/common/main/lib/component/MetricSpinner.js
index 673847da4..81cf96b1d 100644
--- a/apps/common/main/lib/component/MetricSpinner.js
+++ b/apps/common/main/lib/component/MetricSpinner.js
@@ -145,7 +145,12 @@ define([
             if (!this.options.allowDecimal)
                 el.on('keypress',   '.form-control', _.bind(this.onKeyPress, this));
             el.on('focus', 'input.form-control', function() {
-                me.$input && me.$input.select();
+                setTimeout(function(){me.$input && me.$input.select();}, 1);
+            });
+            Common.Utils.isGecko && el.on('blur', 'input.form-control', function() {
+                setTimeout(function(){
+                    me.$input && (me.$input[0].selectionStart = me.$input[0].selectionEnd = 0);
+                }, 1);
             });
 
             this.switches = {
@@ -359,6 +364,9 @@ define([
             } else {
                 this._fromKeyDown = true;
             }
+
+            if (e.keyCode == Common.UI.Keys.ESC)
+                this.setRawValue(this.value);
             if (e.keyCode==Common.UI.Keys.RETURN || e.keyCode==Common.UI.Keys.ESC)
                 this.trigger('inputleave', this);
         },
diff --git a/apps/common/main/lib/component/RadioBox.js b/apps/common/main/lib/component/RadioBox.js
index 39fdcb585..b26e23aa8 100644
--- a/apps/common/main/lib/component/RadioBox.js
+++ b/apps/common/main/lib/component/RadioBox.js
@@ -71,7 +71,8 @@ define([
         disabled    : false,
         rendered    : false,
 
-        template    : _.template('<label class="radiobox"><input type="button" name="<%= name %>" class="button__radiobox"><span><%= labelText %></span></label>'),
+        template    : _.template('<label class="radiobox"><input type="radio" name="<%= name %>" id="<%= id %>" class="button__radiobox">' +
+                                    '<label for="<%= id %>" class="radiobox__shape" /><span><%= labelText %></span></label>'),
 
         initialize : function(options) {
             Common.UI.BaseView.prototype.initialize.call(this, options);
@@ -96,11 +97,12 @@ define([
             var el = this.$el || $(this.el);
             el.html(this.template({
                 labelText: this.options.labelText,
-                name: this.name
+                name: this.name,
+                id: Common.UI.getId('rdb-')
             }));
 
-            this.$radio = el.find('input[type=button]');
-            this.$label = el.find('label');
+            this.$radio = el.find('input[type=radio]');
+            this.$label = el.find('label.radiobox');
             this.rendered = true;
 
             return this;
@@ -129,8 +131,9 @@ define([
 
         setRawValue: function(value) {
             var value = (value === true || value === 'true' || value === '1' || value === 1 );
-            $('input[type=button][name=' + this.name + ']').removeClass('checked');
+            $('input[type=radio][name=' + this.name + ']').removeClass('checked');
             this.$radio.toggleClass('checked', value);
+            this.$radio.prop('checked', value);
         },
 
         setValue: function(value, suspendchange) {
@@ -138,14 +141,14 @@ define([
                 var lastValue = this.$radio.hasClass('checked');
                 this.setRawValue(value);
                 if (suspendchange !== true && lastValue !== value)
-                    this.trigger('change', this, this.$radio.hasClass('checked'));
+                    this.trigger('change', this, this.$radio.is(':checked'));
             } else {
                 this.options.checked = value;
             }
         },
 
         getValue: function() {
-            return this.$radio.hasClass('checked');
+            return this.$radio.is(':checked');
         },
 
         setCaption: function(text) {
diff --git a/apps/common/main/lib/component/TabBar.js b/apps/common/main/lib/component/TabBar.js
index 44e58de0b..9b77da678 100644
--- a/apps/common/main/lib/component/TabBar.js
+++ b/apps/common/main/lib/component/TabBar.js
@@ -123,183 +123,6 @@ define([
                     }
                 },
 
-                setAbsTabs: function () {
-                    var me = this, tab = null, length = this.bounds.length;
-
-                    for (var i = 0; i < length; ++i) {
-                        tab = me.bar.tabs[i].$el;
-                        tab.css('position', 'absolute');
-                        tab.css('left', (me.bounds[i].left - me.tabBarLeft - this.scrollLeft) + 'px');
-
-                        if (tab.hasClass('active')) {
-                            tab.css('top', '1px');
-                        } else {
-                            tab.css('top', '0px');
-                        }
-                    }
-                },
-
-                updatePositions: function () {
-                    this.drag.place = undefined;
-
-                    var i, tabBound, center, place = -1, next = -this.scrollLeft,
-                        tabsCount = this.bounds.length,
-                        dragBound = this.drag.tab.$el.get(0).getBoundingClientRect();
-
-                    if (this.drag.moveX - this.drag.mouseX > 0) {
-                        for (i = tabsCount - 1; i >= 0; --i) {
-                            tabBound = this.bounds[i];
-                            center = (tabBound.right + tabBound.left) * 0.5;
-                            if (dragBound.left < center && center < dragBound.right) {
-                                place = i;
-                                break;
-                            }
-                        }
-
-                        if (-1 === place) {
-                            for (i = tabsCount - 1; i >= 0; --i) {
-                                tabBound = dragBound;
-                                center = (tabBound.right + tabBound.left) * 0.5;
-                                if (this.bounds[i].left < center && center < this.bounds[i].right) {
-                                    place = i;
-                                    break;
-                                }
-                            }
-                        }
-
-                    } else {
-                        for (i = 0; i < tabsCount; ++i) {
-                            tabBound = this.bounds[i];
-                            center = (tabBound.right + tabBound.left) * 0.5;
-                            if (dragBound.left < center && center < dragBound.right) {
-                                place = i;
-                                break;
-                            }
-                        }
-
-                        if (-1 === place) {
-                            for (i = 0; i < tabsCount; ++i) {
-                                tabBound = dragBound;
-                                center = (tabBound.right + tabBound.left) * 0.5;
-                                if (this.bounds[i].left < center && center < this.bounds[i].right) {
-                                    place = i;
-                                    break;
-                                }
-                            }
-                        }
-                    }
-
-                    if (-1 !== place) {
-
-                        this.drag.place = place;
-
-                        for (i = 0; i < tabsCount; ++i) {
-                            if (i === place) {
-                                if (place < this.drag.index) {
-                                    next += this.drag.tabWidth;
-                                }
-                            }
-
-                            if (place > this.drag.index) {
-                                if (i === place + 1) {
-                                    next += this.drag.tabWidth;
-                                }
-                            }
-
-                            if (i !== this.drag.index) {
-                                this.bar.tabs[i].$el.css('left', next + 'px');
-                            } else {
-                                if (this.drag.index === place) {
-                                    next += this.drag.tabWidth;
-                                }
-
-                                continue;
-                            }
-
-                            next += this.bounds[i].width;
-                        }
-                    }
-                },
-
-                setHook: function(e, bar, tab) {
-                    var me = this;
-
-                    function dragComplete() {
-                        if (!_.isUndefined(me.drag)) {
-                            me.drag.tab.removeClass('dragged');
-                            me.drag.tab.$el.css('z-index', '');
-                            me.bar.dragging = false;
-                            var tab = null;
-                            for (var i = me.bar.tabs.length - 1; i >= 0; --i) {
-                                tab = me.bar.tabs[i].$el;
-                                if (tab) {
-                                    tab.css('top', '');
-                                    tab.css('position', '');
-                                    tab.css('left', '');
-                                }
-                            }
-
-                            if (!_.isUndefined(me.drag.place)) {
-                                me.bar.trigger('tab:move', me.drag.index, me.drag.place);
-                                me.bar.$bar.scrollLeft(me.scrollLeft);
-                                me.bar.scrollX = undefined;
-                            } else {
-                                me.bar.trigger('tab:move', me.drag.index);
-                                me.bar.$bar.scrollLeft(me.scrollLeft);
-                                me.bar.scrollX = undefined;
-                            }
-
-                            me.drag  = undefined;
-                        }
-                    }
-
-                    function dragMove (e) {
-                        if (!_.isUndefined(me.drag)) {
-                            me.drag.moveX = e.clientX*Common.Utils.zoom();
-                            var leftPos = Math.max(me.drag.moveX - me.drag.anchorX - me.tabBarLeft - me.scrollLeft, 0);
-                            leftPos = Math.min(leftPos, me.tabBarRight - me.tabBarLeft - me.drag.tabWidth - me.scrollLeft);
-
-                            me.drag.tab.$el.css('left', leftPos + 'px');
-                            me.drag.tab.$el.css('z-index','100');
-
-                            me.updatePositions();
-                        }
-                    }
-
-                    function dragDropText (e) { // disable firefox drag&drop
-                        e.preventDefault();
-                    }
-
-                    if (!_.isUndefined(bar) && !_.isUndefined(tab) && bar.tabs.length > 1) {
-                        tab.addClass('dragged');
-
-                        var index   = bar.tabs.indexOf(tab),
-                            _clientX = e.clientX*Common.Utils.zoom();
-                        me.bar      = bar;
-                        me.drag     = {tab: tab, index: index};
-                        bar.dragging = true;
-
-                        this.calculateBounds();
-                        this.setAbsTabs();
-
-                        me.drag.moveX       = _clientX;
-                        me.drag.mouseX      = _clientX;
-                        me.drag.anchorX     = _clientX - this.bounds[index].left;
-                        me.drag.tabWidth    = this.bounds[index].width;
-
-                        document.addEventListener('dragstart',dragDropText);
-
-                        $(document).on('mousemove.tabbar', dragMove);
-                        $(document).on('mouseup.tabbar', function (e) {
-                            dragComplete(e);
-                            $(document).off('mouseup.tabbar');
-                            $(document).off('mousemove.tabbar');
-
-                            document.removeEventListener('dragstart',dragDropText);
-                        });
-                    }
-                },
-
                 setHookTabs: function (e, bar, tabs) {
                     var me = this;
                     function dragComplete() {
@@ -410,11 +233,9 @@ define([
             mousedown: $.proxy(function (e) {
                 if (this.bar.options.draggable && !_.isUndefined(dragHelper) && (3 !== e.which)) {
                     if (!tab.isLockTheDrag) {
-                        if (this.bar.selectTabs.length > 1) {
-                            dragHelper.setHookTabs(e, this.bar, this.bar.selectTabs);
-                        } else {
-                            dragHelper.setHook(e, this.bar, tab);
-                        }
+                        if (!e.ctrlKey && !e.metaKey && !e.shiftKey)
+                            tab.changeState();
+                        dragHelper.setHookTabs(e, this.bar, this.bar.selectTabs);
                     }
                 }
             }, this)
diff --git a/apps/common/main/lib/component/Window.js b/apps/common/main/lib/component/Window.js
index e90270a40..0f4583993 100644
--- a/apps/common/main/lib/component/Window.js
+++ b/apps/common/main/lib/component/Window.js
@@ -601,6 +601,9 @@ define([
 
                 this.$window = $('#' + this.initConfig.id);
 
+                if (Common.Locale.getCurrentLanguage() !== 'en')
+                    this.$window.attr('applang', Common.Locale.getCurrentLanguage());
+
                 this.binding.keydown = _.bind(_keydown,this);
                // $(document).on('keydown', this.binding.keydown);
 
diff --git a/apps/common/main/lib/util/utils.js b/apps/common/main/lib/util/utils.js
index 2268d5764..50e6430b7 100644
--- a/apps/common/main/lib/util/utils.js
+++ b/apps/common/main/lib/util/utils.js
@@ -123,20 +123,19 @@ Common.Utils = _.extend(new(function() {
                 // считаем: 0 < window.devicePixelRatio < 2 => _devicePixelRatio = 1; zoom = window.devicePixelRatio / _devicePixelRatio;
                 // считаем: window.devicePixelRatio >= 2 => _devicePixelRatio = 2; zoom = window.devicePixelRatio / _devicePixelRatio;
                 if (window.devicePixelRatio > 0.1) {
-                    var _fraction = window.devicePixelRatio % 1;
-                    var _devicePixelRatio = Math.floor(window.devicePixelRatio);
-
-                    if ( !(_fraction < .5) ) {
-                        _devicePixelRatio += .5;
+                    if (window.devicePixelRatio < 1.99)
+                    {
+                        var _devicePixelRatio = 1;
+                        me.zoom = window.devicePixelRatio / _devicePixelRatio;
                     }
-
-                    me.zoom = window.devicePixelRatio / _devicePixelRatio;
-                    document.firstElementChild.style.zoom = 1.0 / me.zoom;
-
-                    if ( _devicePixelRatio % 1 > 0 )
-                        $('#editor_sdk').css('zoom', 1.0 / _devicePixelRatio);
-                    else $('#editor_sdk').css('zoom', '');
-                }
+                    else
+                    {
+                        var _devicePixelRatio = 2;
+                        me.zoom = window.devicePixelRatio / _devicePixelRatio;
+                    }
+                    // chrome 54.x: zoom = "reset" - clear retina zoom (windows)
+                    //document.firstElementChild.style.zoom = "reset";
+                    document.firstElementChild.style.zoom = 1.0 / me.zoom;                }
                 else
                     document.firstElementChild.style.zoom = "normal";
             }
diff --git a/apps/common/main/lib/view/LanguageDialog.js b/apps/common/main/lib/view/LanguageDialog.js
index cee215f17..efd4bf487 100644
--- a/apps/common/main/lib/view/LanguageDialog.js
+++ b/apps/common/main/lib/view/LanguageDialog.js
@@ -86,13 +86,13 @@ define([
             template: _.template([
                 '<span class="input-group combobox <%= cls %> combo-langs" id="<%= id %>" style="<%= style %>">',
                     '<input type="text" class="form-control">',
-                    '<span class="icon input-icon spellcheck-lang img-toolbarmenu"></span>',
+                    '<span class="icon input-icon spellcheck-lang toolbar__icon btn-ic-docspell"></span>',
                     '<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"><span class="caret img-commonctrl"></span></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-left: 28px !important;" langval="<%= item.value %>">',
-                                '<i class="icon <% if (item.spellcheck) { %> img-toolbarmenu spellcheck-lang <% } %>"></i>',
+                                '<i class="icon <% if (item.spellcheck) { %> toolbar__icon btn-ic-docspell spellcheck-lang <% } %>"></i>',
                                 '<%= scope.getDisplayValue(item) %>',
                             '</a>',
                         '</li>',
diff --git a/apps/common/main/lib/view/ListSettingsDialog.js b/apps/common/main/lib/view/ListSettingsDialog.js
index a48cba60b..b18fd2537 100644
--- a/apps/common/main/lib/view/ListSettingsDialog.js
+++ b/apps/common/main/lib/view/ListSettingsDialog.js
@@ -248,7 +248,9 @@ define([
         _setDefaults: function (props) {
             if (props) {
                 this.spnSize.setValue(props.asc_getBulletSize() || '', true);
-                this.spnStart.setValue(props.get_NumStartAt() || '', true);
+                var value = props.get_NumStartAt();
+                this.spnStart.setValue(value || '', true);
+                this.spnStart.setDisabled(value===null);
                 var color = props.asc_getBulletColor();
                 if (color) {
                     if (color.get_type() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) {
diff --git a/apps/common/main/resources/img/controls/common-controls@1.5x.png b/apps/common/main/resources/img/controls/common-controls@1.5x.png
new file mode 100644
index 000000000..1d29d593f
Binary files /dev/null and b/apps/common/main/resources/img/controls/common-controls@1.5x.png differ
diff --git a/apps/common/main/resources/img/controls/flags@1.5x.png b/apps/common/main/resources/img/controls/flags@1.5x.png
new file mode 100644
index 000000000..da34fd60d
Binary files /dev/null and b/apps/common/main/resources/img/controls/flags@1.5x.png differ
diff --git 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
new file mode 100644
index 000000000..2859225c7
Binary files /dev/null and b/apps/common/main/resources/img/dimension-picker/dimension-highlighted@1.5x.png differ
diff --git 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
new file mode 100644
index 000000000..8594bcf9b
Binary files /dev/null and b/apps/common/main/resources/img/dimension-picker/dimension-unhighlighted@1.5x.png differ
diff --git a/apps/common/main/resources/img/hsbcolorpicker/hsb-colorpicker@1.5x.png b/apps/common/main/resources/img/hsbcolorpicker/hsb-colorpicker@1.5x.png
new file mode 100644
index 000000000..09e7704a5
Binary files /dev/null and b/apps/common/main/resources/img/hsbcolorpicker/hsb-colorpicker@1.5x.png differ
diff --git a/apps/common/main/resources/img/right-panels/Begin-EndStyle@1.5x.png b/apps/common/main/resources/img/right-panels/Begin-EndStyle@1.5x.png
new file mode 100644
index 000000000..44066ea97
Binary files /dev/null and b/apps/common/main/resources/img/right-panels/Begin-EndStyle@1.5x.png differ
diff --git a/apps/common/main/resources/img/right-panels/gradients@1.5x.png b/apps/common/main/resources/img/right-panels/gradients@1.5x.png
new file mode 100644
index 000000000..cd4b7019b
Binary files /dev/null and b/apps/common/main/resources/img/right-panels/gradients@1.5x.png differ
diff --git a/apps/common/main/resources/img/right-panels/patterns@1.5x.png b/apps/common/main/resources/img/right-panels/patterns@1.5x.png
new file mode 100644
index 000000000..3f69c9aa3
Binary files /dev/null and b/apps/common/main/resources/img/right-panels/patterns@1.5x.png differ
diff --git a/apps/common/main/resources/img/right-panels/rowscols_icon@1.5x.png b/apps/common/main/resources/img/right-panels/rowscols_icon@1.5x.png
new file mode 100644
index 000000000..ed7943a0b
Binary files /dev/null and b/apps/common/main/resources/img/right-panels/rowscols_icon@1.5x.png differ
diff --git a/apps/common/main/resources/img/toolbar/1.5x/big/.css.handlebars b/apps/common/main/resources/img/toolbar/1.5x/big/.css.handlebars
index 6b49c6432..e355e2822 100644
--- a/apps/common/main/resources/img/toolbar/1.5x/big/.css.handlebars
+++ b/apps/common/main/resources/img/toolbar/1.5x/big/.css.handlebars
@@ -1,7 +1,8 @@
 {{#spritesheet}}
 @media only screen {
-    @media (-webkit-min-device-pixel-ratio: 1.5),
-            (min-resolution: 1.5dppx), (min-resolution: 144dpi)
+    @media (-webkit-min-device-pixel-ratio: 1.5) and (-webkit-max-device-pixel-ratio: 1.9),
+            (min-resolution: 1.5dppx) and (max-resolution: 1.9dppx),
+                (min-resolution: 144dpi) and (max-resolution: 191dpi)
     {
         .x-huge .toolbar__icon {
             background-image: url(resources/{{{escaped_image}}});
diff --git a/apps/common/main/resources/img/toolbar/1.5x/big/btn-editheader.png b/apps/common/main/resources/img/toolbar/1.5x/big/btn-editheader.png
index d3fbb98f6..30a67f6d9 100644
Binary files a/apps/common/main/resources/img/toolbar/1.5x/big/btn-editheader.png and b/apps/common/main/resources/img/toolbar/1.5x/big/btn-editheader.png differ
diff --git a/apps/common/main/resources/img/toolbar/1.5x/big/btn-insertchart.png b/apps/common/main/resources/img/toolbar/1.5x/big/btn-insertchart.png
index f769fb6c3..ec7057402 100644
Binary files a/apps/common/main/resources/img/toolbar/1.5x/big/btn-insertchart.png and b/apps/common/main/resources/img/toolbar/1.5x/big/btn-insertchart.png differ
diff --git a/apps/common/main/resources/img/toolbar/1.5x/big/btn-insertequation.png b/apps/common/main/resources/img/toolbar/1.5x/big/btn-insertequation.png
index f9c2425d7..28cd98b7f 100644
Binary files a/apps/common/main/resources/img/toolbar/1.5x/big/btn-insertequation.png and b/apps/common/main/resources/img/toolbar/1.5x/big/btn-insertequation.png differ
diff --git a/apps/common/main/resources/img/toolbar/1.5x/btn-border-bottom.png b/apps/common/main/resources/img/toolbar/1.5x/btn-border-bottom.png
index 69558ec5b..d94a2f3c4 100644
Binary files a/apps/common/main/resources/img/toolbar/1.5x/btn-border-bottom.png and b/apps/common/main/resources/img/toolbar/1.5x/btn-border-bottom.png differ
diff --git a/apps/common/main/resources/img/toolbar/1.5x/btn-border-diagdown.png b/apps/common/main/resources/img/toolbar/1.5x/btn-border-diagdown.png
index de0658aac..f59796891 100644
Binary files a/apps/common/main/resources/img/toolbar/1.5x/btn-border-diagdown.png and b/apps/common/main/resources/img/toolbar/1.5x/btn-border-diagdown.png differ
diff --git a/apps/common/main/resources/img/toolbar/1.5x/btn-border-diagup.png b/apps/common/main/resources/img/toolbar/1.5x/btn-border-diagup.png
index 713af90ab..c6f6b653f 100644
Binary files a/apps/common/main/resources/img/toolbar/1.5x/btn-border-diagup.png and b/apps/common/main/resources/img/toolbar/1.5x/btn-border-diagup.png differ
diff --git a/apps/common/main/resources/img/toolbar/1.5x/btn-border-inside.png b/apps/common/main/resources/img/toolbar/1.5x/btn-border-inside.png
index 1eafa9965..905f01169 100644
Binary files a/apps/common/main/resources/img/toolbar/1.5x/btn-border-inside.png and b/apps/common/main/resources/img/toolbar/1.5x/btn-border-inside.png differ
diff --git a/apps/common/main/resources/img/toolbar/1.5x/btn-border-insidehor.png b/apps/common/main/resources/img/toolbar/1.5x/btn-border-insidehor.png
index 6bb0440cc..47a208987 100644
Binary files a/apps/common/main/resources/img/toolbar/1.5x/btn-border-insidehor.png and b/apps/common/main/resources/img/toolbar/1.5x/btn-border-insidehor.png differ
diff --git a/apps/common/main/resources/img/toolbar/1.5x/btn-border-insidevert.png b/apps/common/main/resources/img/toolbar/1.5x/btn-border-insidevert.png
index 230282079..803e5e325 100644
Binary files a/apps/common/main/resources/img/toolbar/1.5x/btn-border-insidevert.png and b/apps/common/main/resources/img/toolbar/1.5x/btn-border-insidevert.png differ
diff --git a/apps/common/main/resources/img/toolbar/1.5x/btn-border-left.png b/apps/common/main/resources/img/toolbar/1.5x/btn-border-left.png
index 9f0b04aea..066865d5b 100644
Binary files a/apps/common/main/resources/img/toolbar/1.5x/btn-border-left.png and b/apps/common/main/resources/img/toolbar/1.5x/btn-border-left.png differ
diff --git a/apps/common/main/resources/img/toolbar/1.5x/btn-border-no.png b/apps/common/main/resources/img/toolbar/1.5x/btn-border-no.png
index 6567db1a0..4b4538a05 100644
Binary files a/apps/common/main/resources/img/toolbar/1.5x/btn-border-no.png and b/apps/common/main/resources/img/toolbar/1.5x/btn-border-no.png differ
diff --git a/apps/common/main/resources/img/toolbar/1.5x/btn-border-out.png b/apps/common/main/resources/img/toolbar/1.5x/btn-border-out.png
index ce6098242..1f8277ddc 100644
Binary files a/apps/common/main/resources/img/toolbar/1.5x/btn-border-out.png and b/apps/common/main/resources/img/toolbar/1.5x/btn-border-out.png differ
diff --git a/apps/common/main/resources/img/toolbar/1.5x/btn-border-right.png b/apps/common/main/resources/img/toolbar/1.5x/btn-border-right.png
index bd4f53343..2a2bf1f36 100644
Binary files a/apps/common/main/resources/img/toolbar/1.5x/btn-border-right.png and b/apps/common/main/resources/img/toolbar/1.5x/btn-border-right.png differ
diff --git a/apps/common/main/resources/img/toolbar/1.5x/btn-border-top.png b/apps/common/main/resources/img/toolbar/1.5x/btn-border-top.png
index 40991545e..10efc943a 100644
Binary files a/apps/common/main/resources/img/toolbar/1.5x/btn-border-top.png and b/apps/common/main/resources/img/toolbar/1.5x/btn-border-top.png differ
diff --git a/apps/common/main/resources/img/toolbar/1.5x/btn-close.png b/apps/common/main/resources/img/toolbar/1.5x/btn-close.png
new file mode 100644
index 000000000..50b538004
Binary files /dev/null and b/apps/common/main/resources/img/toolbar/1.5x/btn-close.png differ
diff --git a/apps/common/main/resources/img/toolbar/1.5x/btn-colorschemas.png b/apps/common/main/resources/img/toolbar/1.5x/btn-colorschemas.png
index 99c9d24d3..95516be95 100644
Binary files a/apps/common/main/resources/img/toolbar/1.5x/btn-colorschemas.png and b/apps/common/main/resources/img/toolbar/1.5x/btn-colorschemas.png differ
diff --git a/apps/common/main/resources/img/toolbar/1.5x/btn-firstitem.png b/apps/common/main/resources/img/toolbar/1.5x/btn-firstitem.png
index 7f2bb7772..fc63b8053 100644
Binary files a/apps/common/main/resources/img/toolbar/1.5x/btn-firstitem.png and b/apps/common/main/resources/img/toolbar/1.5x/btn-firstitem.png differ
diff --git a/apps/common/main/resources/img/toolbar/1.5x/btn-lastitem.png b/apps/common/main/resources/img/toolbar/1.5x/btn-lastitem.png
index 4031695f1..cd68472d9 100644
Binary files a/apps/common/main/resources/img/toolbar/1.5x/btn-lastitem.png and b/apps/common/main/resources/img/toolbar/1.5x/btn-lastitem.png differ
diff --git a/apps/common/main/resources/img/toolbar/1.5x/btn-nextitem.png b/apps/common/main/resources/img/toolbar/1.5x/btn-nextitem.png
index 451c40f6e..c65c71e8b 100644
Binary files a/apps/common/main/resources/img/toolbar/1.5x/btn-nextitem.png and b/apps/common/main/resources/img/toolbar/1.5x/btn-nextitem.png differ
diff --git a/apps/common/main/resources/img/toolbar/1.5x/btn-previtem.png b/apps/common/main/resources/img/toolbar/1.5x/btn-previtem.png
index 4ee9040da..e4f674f0d 100644
Binary files a/apps/common/main/resources/img/toolbar/1.5x/btn-previtem.png and b/apps/common/main/resources/img/toolbar/1.5x/btn-previtem.png differ
diff --git a/apps/common/main/resources/img/toolbar/1.5x/btn-settings.png b/apps/common/main/resources/img/toolbar/1.5x/btn-settings.png
index efc9b4147..8a0b4804a 100644
Binary files a/apps/common/main/resources/img/toolbar/1.5x/btn-settings.png and b/apps/common/main/resources/img/toolbar/1.5x/btn-settings.png differ
diff --git a/apps/common/main/resources/img/toolbar/1x/big/btn-insertequation.png b/apps/common/main/resources/img/toolbar/1x/big/btn-insertequation.png
index cb65838ac..105a3307a 100644
Binary files a/apps/common/main/resources/img/toolbar/1x/big/btn-insertequation.png and b/apps/common/main/resources/img/toolbar/1x/big/btn-insertequation.png differ
diff --git a/apps/common/main/resources/img/toolbar/1x/big/btn-inserttable.png b/apps/common/main/resources/img/toolbar/1x/big/btn-inserttable.png
index e76fbc90f..b79208136 100644
Binary files a/apps/common/main/resources/img/toolbar/1x/big/btn-inserttable.png and b/apps/common/main/resources/img/toolbar/1x/big/btn-inserttable.png differ
diff --git a/apps/common/main/resources/img/toolbar/1x/btn-border-bottom.png b/apps/common/main/resources/img/toolbar/1x/btn-border-bottom.png
index 3cdf4900c..66d4e6f5b 100644
Binary files a/apps/common/main/resources/img/toolbar/1x/btn-border-bottom.png and b/apps/common/main/resources/img/toolbar/1x/btn-border-bottom.png differ
diff --git a/apps/common/main/resources/img/toolbar/1x/btn-border-diagdown.png b/apps/common/main/resources/img/toolbar/1x/btn-border-diagdown.png
index 881124c09..db5c09b37 100644
Binary files a/apps/common/main/resources/img/toolbar/1x/btn-border-diagdown.png and b/apps/common/main/resources/img/toolbar/1x/btn-border-diagdown.png differ
diff --git a/apps/common/main/resources/img/toolbar/1x/btn-border-diagup.png b/apps/common/main/resources/img/toolbar/1x/btn-border-diagup.png
index 0ee5aecda..551a44f5a 100644
Binary files a/apps/common/main/resources/img/toolbar/1x/btn-border-diagup.png and b/apps/common/main/resources/img/toolbar/1x/btn-border-diagup.png differ
diff --git a/apps/common/main/resources/img/toolbar/1x/btn-border-inside.png b/apps/common/main/resources/img/toolbar/1x/btn-border-inside.png
index ca05a76ac..7b7ed8fd0 100644
Binary files a/apps/common/main/resources/img/toolbar/1x/btn-border-inside.png and b/apps/common/main/resources/img/toolbar/1x/btn-border-inside.png differ
diff --git a/apps/common/main/resources/img/toolbar/1x/btn-border-insidehor.png b/apps/common/main/resources/img/toolbar/1x/btn-border-insidehor.png
index 23b8f2634..e40040328 100644
Binary files a/apps/common/main/resources/img/toolbar/1x/btn-border-insidehor.png and b/apps/common/main/resources/img/toolbar/1x/btn-border-insidehor.png differ
diff --git a/apps/common/main/resources/img/toolbar/1x/btn-border-insidevert.png b/apps/common/main/resources/img/toolbar/1x/btn-border-insidevert.png
index ff3d9d6d4..875f8c532 100644
Binary files a/apps/common/main/resources/img/toolbar/1x/btn-border-insidevert.png and b/apps/common/main/resources/img/toolbar/1x/btn-border-insidevert.png differ
diff --git a/apps/common/main/resources/img/toolbar/1x/btn-border-left.png b/apps/common/main/resources/img/toolbar/1x/btn-border-left.png
index 0e4d160a7..2fcf03237 100644
Binary files a/apps/common/main/resources/img/toolbar/1x/btn-border-left.png and b/apps/common/main/resources/img/toolbar/1x/btn-border-left.png differ
diff --git a/apps/common/main/resources/img/toolbar/1x/btn-border-no.png b/apps/common/main/resources/img/toolbar/1x/btn-border-no.png
index c7f1994e7..1b0542ea3 100644
Binary files a/apps/common/main/resources/img/toolbar/1x/btn-border-no.png and b/apps/common/main/resources/img/toolbar/1x/btn-border-no.png differ
diff --git a/apps/common/main/resources/img/toolbar/1x/btn-border-out.png b/apps/common/main/resources/img/toolbar/1x/btn-border-out.png
index bd851e41a..8b195b0f1 100644
Binary files a/apps/common/main/resources/img/toolbar/1x/btn-border-out.png and b/apps/common/main/resources/img/toolbar/1x/btn-border-out.png differ
diff --git a/apps/common/main/resources/img/toolbar/1x/btn-border-right.png b/apps/common/main/resources/img/toolbar/1x/btn-border-right.png
index 67d248fbb..994cf1d96 100644
Binary files a/apps/common/main/resources/img/toolbar/1x/btn-border-right.png and b/apps/common/main/resources/img/toolbar/1x/btn-border-right.png differ
diff --git a/apps/common/main/resources/img/toolbar/1x/btn-border-top.png b/apps/common/main/resources/img/toolbar/1x/btn-border-top.png
index 8b1c9196b..b4ab7ffca 100644
Binary files a/apps/common/main/resources/img/toolbar/1x/btn-border-top.png and b/apps/common/main/resources/img/toolbar/1x/btn-border-top.png differ
diff --git a/apps/common/main/resources/img/toolbar/1x/btn-close.png b/apps/common/main/resources/img/toolbar/1x/btn-close.png
new file mode 100644
index 000000000..5c847e7b2
Binary files /dev/null and b/apps/common/main/resources/img/toolbar/1x/btn-close.png differ
diff --git a/apps/common/main/resources/img/toolbar/1x/btn-colorschemas.png b/apps/common/main/resources/img/toolbar/1x/btn-colorschemas.png
index 3bea84e40..6135c8dfc 100644
Binary files a/apps/common/main/resources/img/toolbar/1x/btn-colorschemas.png and b/apps/common/main/resources/img/toolbar/1x/btn-colorschemas.png differ
diff --git a/apps/common/main/resources/img/toolbar/1x/btn-firstitem.png b/apps/common/main/resources/img/toolbar/1x/btn-firstitem.png
index 7b6dbc816..09b16037c 100644
Binary files a/apps/common/main/resources/img/toolbar/1x/btn-firstitem.png and b/apps/common/main/resources/img/toolbar/1x/btn-firstitem.png differ
diff --git a/apps/common/main/resources/img/toolbar/1x/btn-lastitem.png b/apps/common/main/resources/img/toolbar/1x/btn-lastitem.png
index 8b9e773e3..322451fa5 100644
Binary files a/apps/common/main/resources/img/toolbar/1x/btn-lastitem.png and b/apps/common/main/resources/img/toolbar/1x/btn-lastitem.png differ
diff --git a/apps/common/main/resources/img/toolbar/1x/btn-menu-shape.png b/apps/common/main/resources/img/toolbar/1x/btn-menu-shape.png
index c686d6018..261363125 100644
Binary files a/apps/common/main/resources/img/toolbar/1x/btn-menu-shape.png and b/apps/common/main/resources/img/toolbar/1x/btn-menu-shape.png differ
diff --git a/apps/common/main/resources/img/toolbar/1x/btn-nextitem.png b/apps/common/main/resources/img/toolbar/1x/btn-nextitem.png
index bf3f37644..9e24fe7e1 100644
Binary files a/apps/common/main/resources/img/toolbar/1x/btn-nextitem.png and b/apps/common/main/resources/img/toolbar/1x/btn-nextitem.png differ
diff --git a/apps/common/main/resources/img/toolbar/1x/btn-previtem.png b/apps/common/main/resources/img/toolbar/1x/btn-previtem.png
index 0b4502a6c..724d70298 100644
Binary files a/apps/common/main/resources/img/toolbar/1x/btn-previtem.png and b/apps/common/main/resources/img/toolbar/1x/btn-previtem.png differ
diff --git a/apps/common/main/resources/img/toolbar/1x/btn-settings.png b/apps/common/main/resources/img/toolbar/1x/btn-settings.png
index bff9990c3..285a8c3d3 100644
Binary files a/apps/common/main/resources/img/toolbar/1x/btn-settings.png and b/apps/common/main/resources/img/toolbar/1x/btn-settings.png differ
diff --git a/apps/common/main/resources/img/toolbar/2x/big/btn-insertequation.png b/apps/common/main/resources/img/toolbar/2x/big/btn-insertequation.png
index 9f5eccfa4..8cbda4575 100644
Binary files a/apps/common/main/resources/img/toolbar/2x/big/btn-insertequation.png and b/apps/common/main/resources/img/toolbar/2x/big/btn-insertequation.png differ
diff --git a/apps/common/main/resources/img/toolbar/2x/btn-border-bottom.png b/apps/common/main/resources/img/toolbar/2x/btn-border-bottom.png
index 8d321babc..37bb63cef 100644
Binary files a/apps/common/main/resources/img/toolbar/2x/btn-border-bottom.png and b/apps/common/main/resources/img/toolbar/2x/btn-border-bottom.png differ
diff --git a/apps/common/main/resources/img/toolbar/2x/btn-border-diagdown.png b/apps/common/main/resources/img/toolbar/2x/btn-border-diagdown.png
index 533924579..b2b7bef31 100644
Binary files a/apps/common/main/resources/img/toolbar/2x/btn-border-diagdown.png and b/apps/common/main/resources/img/toolbar/2x/btn-border-diagdown.png differ
diff --git a/apps/common/main/resources/img/toolbar/2x/btn-border-diagup.png b/apps/common/main/resources/img/toolbar/2x/btn-border-diagup.png
index 3e8d5414f..91f05a25d 100644
Binary files a/apps/common/main/resources/img/toolbar/2x/btn-border-diagup.png and b/apps/common/main/resources/img/toolbar/2x/btn-border-diagup.png differ
diff --git a/apps/common/main/resources/img/toolbar/2x/btn-border-inside.png b/apps/common/main/resources/img/toolbar/2x/btn-border-inside.png
index 256c3b1a7..c1ba944e3 100644
Binary files a/apps/common/main/resources/img/toolbar/2x/btn-border-inside.png and b/apps/common/main/resources/img/toolbar/2x/btn-border-inside.png differ
diff --git a/apps/common/main/resources/img/toolbar/2x/btn-border-insidehor.png b/apps/common/main/resources/img/toolbar/2x/btn-border-insidehor.png
index 1a692518c..bcbee3334 100644
Binary files a/apps/common/main/resources/img/toolbar/2x/btn-border-insidehor.png and b/apps/common/main/resources/img/toolbar/2x/btn-border-insidehor.png differ
diff --git a/apps/common/main/resources/img/toolbar/2x/btn-border-insidevert.png b/apps/common/main/resources/img/toolbar/2x/btn-border-insidevert.png
index c1e0e178d..d90fceb4c 100644
Binary files a/apps/common/main/resources/img/toolbar/2x/btn-border-insidevert.png and b/apps/common/main/resources/img/toolbar/2x/btn-border-insidevert.png differ
diff --git a/apps/common/main/resources/img/toolbar/2x/btn-border-left.png b/apps/common/main/resources/img/toolbar/2x/btn-border-left.png
index b5767a820..19b77b40d 100644
Binary files a/apps/common/main/resources/img/toolbar/2x/btn-border-left.png and b/apps/common/main/resources/img/toolbar/2x/btn-border-left.png differ
diff --git a/apps/common/main/resources/img/toolbar/2x/btn-border-no.png b/apps/common/main/resources/img/toolbar/2x/btn-border-no.png
index d7dab8444..3488405ff 100644
Binary files a/apps/common/main/resources/img/toolbar/2x/btn-border-no.png and b/apps/common/main/resources/img/toolbar/2x/btn-border-no.png differ
diff --git a/apps/common/main/resources/img/toolbar/2x/btn-border-out.png b/apps/common/main/resources/img/toolbar/2x/btn-border-out.png
index f6118859c..ee8a9ca06 100644
Binary files a/apps/common/main/resources/img/toolbar/2x/btn-border-out.png and b/apps/common/main/resources/img/toolbar/2x/btn-border-out.png differ
diff --git a/apps/common/main/resources/img/toolbar/2x/btn-border-right.png b/apps/common/main/resources/img/toolbar/2x/btn-border-right.png
index 84ee24705..9de64956c 100644
Binary files a/apps/common/main/resources/img/toolbar/2x/btn-border-right.png and b/apps/common/main/resources/img/toolbar/2x/btn-border-right.png differ
diff --git a/apps/common/main/resources/img/toolbar/2x/btn-border-top.png b/apps/common/main/resources/img/toolbar/2x/btn-border-top.png
index 6b4fe61bd..ddfcfc574 100644
Binary files a/apps/common/main/resources/img/toolbar/2x/btn-border-top.png and b/apps/common/main/resources/img/toolbar/2x/btn-border-top.png differ
diff --git a/apps/common/main/resources/img/toolbar/2x/btn-close.png b/apps/common/main/resources/img/toolbar/2x/btn-close.png
new file mode 100644
index 000000000..7ed9594da
Binary files /dev/null and b/apps/common/main/resources/img/toolbar/2x/btn-close.png differ
diff --git a/apps/common/main/resources/img/toolbar/2x/btn-colorschemas.png b/apps/common/main/resources/img/toolbar/2x/btn-colorschemas.png
index 66e15a335..763b7ad57 100644
Binary files a/apps/common/main/resources/img/toolbar/2x/btn-colorschemas.png and b/apps/common/main/resources/img/toolbar/2x/btn-colorschemas.png differ
diff --git a/apps/common/main/resources/img/toolbar/2x/btn-firstitem.png b/apps/common/main/resources/img/toolbar/2x/btn-firstitem.png
index a16e472be..24b955aa1 100644
Binary files a/apps/common/main/resources/img/toolbar/2x/btn-firstitem.png and b/apps/common/main/resources/img/toolbar/2x/btn-firstitem.png differ
diff --git a/apps/common/main/resources/img/toolbar/2x/btn-lastitem.png b/apps/common/main/resources/img/toolbar/2x/btn-lastitem.png
index 6253b7713..fdd192c86 100644
Binary files a/apps/common/main/resources/img/toolbar/2x/btn-lastitem.png and b/apps/common/main/resources/img/toolbar/2x/btn-lastitem.png differ
diff --git a/apps/common/main/resources/img/toolbar/2x/btn-menu-shape.png b/apps/common/main/resources/img/toolbar/2x/btn-menu-shape.png
index 00843af19..a50fd230a 100644
Binary files a/apps/common/main/resources/img/toolbar/2x/btn-menu-shape.png and b/apps/common/main/resources/img/toolbar/2x/btn-menu-shape.png differ
diff --git a/apps/common/main/resources/img/toolbar/2x/btn-nextitem.png b/apps/common/main/resources/img/toolbar/2x/btn-nextitem.png
index e6bfc5f38..24a5a5960 100644
Binary files a/apps/common/main/resources/img/toolbar/2x/btn-nextitem.png and b/apps/common/main/resources/img/toolbar/2x/btn-nextitem.png differ
diff --git a/apps/common/main/resources/img/toolbar/2x/btn-previtem.png b/apps/common/main/resources/img/toolbar/2x/btn-previtem.png
index 76899c209..6d06a1adf 100644
Binary files a/apps/common/main/resources/img/toolbar/2x/btn-previtem.png and b/apps/common/main/resources/img/toolbar/2x/btn-previtem.png differ
diff --git a/apps/common/main/resources/img/toolbar/2x/btn-settings.png b/apps/common/main/resources/img/toolbar/2x/btn-settings.png
index e105a2f95..f3a6afb50 100644
Binary files a/apps/common/main/resources/img/toolbar/2x/btn-settings.png and b/apps/common/main/resources/img/toolbar/2x/btn-settings.png differ
diff --git a/apps/common/main/resources/img/toolbar/charttypes@1.5x.png b/apps/common/main/resources/img/toolbar/charttypes@1.5x.png
new file mode 100644
index 000000000..57a3ed1dc
Binary files /dev/null and b/apps/common/main/resources/img/toolbar/charttypes@1.5x.png differ
diff --git a/apps/common/main/resources/less/asc-mixins.less b/apps/common/main/resources/less/asc-mixins.less
index a70329675..8cf2ee651 100644
--- a/apps/common/main/resources/less/asc-mixins.less
+++ b/apps/common/main/resources/less/asc-mixins.less
@@ -200,7 +200,7 @@
 
 @common-controls-width: 100px;
 .img-commonctrl, 
-        .theme-colorpalette .color-transparent, .palette-color-ext .color-transparent, .dropdown-menu li .checked:before, .input-error:before,
+        .dropdown-menu li .checked:before, .input-error:before,
         .btn-toolbar .icon.img-commonctrl, .list-item div.checked:before
 {
     background-image: if(@icon-src-base64, data-uri(%("%s",'@{common-image-path}/@{common-controls}')), ~"url(@{common-image-const-path}/@{common-controls})");
@@ -228,34 +228,8 @@
     }
 }
 
-@toolbarmenu-sprite-width: 60px;
-.img-toolbarmenu
-{
-    background-image: if(@icon-src-base64, data-uri(%("%s",'@{app-image-path}/toolbar-menu.png')), ~"url(@{app-image-const-path}/toolbar-menu.png)");
-    background-repeat: no-repeat;
-
-    @media only screen {
-        @media (-webkit-min-device-pixel-ratio: 1.5) and (-webkit-max-device-pixel-ratio: 1.9),
-                    (min-resolution: 1.5dppx) and (max-resolution: 1.9dppx),
-                    (min-resolution: 144dpi) and (max-resolution: 191dpi)
-        {
-            background-image: ~"url(@{app-image-const-path}/toolbar-menu@1.5x.png)";
-            background-size:  @toolbarmenu-sprite-width auto;
-        }
-
-        @media (-webkit-min-device-pixel-ratio: 2),
-                (min-resolution: 2dppx),
-                (min-resolution: 192dpi)
-        {
-            background-image: ~"url(@{app-image-const-path}/toolbar-menu@2x.png)";
-            background-size:  @toolbarmenu-sprite-width auto;
-        }
-    }
-}
-
 @img-colorpicker-width: 205px;
-.img-colorpicker,
-    .color-transparent, .hsb-colorpicker .empty-color:before
+.img-colorpicker, .hsb-colorpicker .empty-color:before
 {
     background-image: if(@icon-src-base64, data-uri(%("%s",'@{common-image-path}/hsbcolorpicker/hsb-colorpicker.png')), ~"url(@{common-image-const-path}/hsbcolorpicker/hsb-colorpicker.png)");
     background-repeat: no-repeat;
diff --git a/apps/common/main/resources/less/buttons.less b/apps/common/main/resources/less/buttons.less
index ddbaba9d1..5216035c5 100644
--- a/apps/common/main/resources/less/buttons.less
+++ b/apps/common/main/resources/less/buttons.less
@@ -565,7 +565,11 @@
     }
 
     .color-transparent {
-        background-position: -37px -196px;
+        &:before {
+            height: 40px;
+            transform: translate(20px, -12px) rotate(69deg);
+            left: 0;
+        }
     }
 }
 
diff --git a/apps/common/main/resources/less/checkbox.less b/apps/common/main/resources/less/checkbox.less
index 1d91f83d2..acf23c4c3 100644
--- a/apps/common/main/resources/less/checkbox.less
+++ b/apps/common/main/resources/less/checkbox.less
@@ -4,21 +4,23 @@
     .font-size-normal();
     font-weight: normal;
     position: relative;
+    min-height: 1em;
 
-    input[type=button] {
-        background-position: @checkbox-offset-x @checkbox-offset-y;
-        margin-left: -22px;
-        margin-right: 6px;
-        width: 14px;
-        height: 14px;
-        cursor: default;
-        vertical-align: top;
-        margin-top: -1px;
-        background: #fff;
-        border: 1px solid @gray;
+    input[type=checkbox] {
+        display: none;
 
-        &.checked {
-            + span {
+        + label {
+            width: 14px;
+            height: 14px;
+            background: #fff;
+            border: 1px solid @gray;
+            position: absolute;
+            left: 0;
+            margin-top: auto;
+        }
+
+        &:checked:not(:indeterminate) {
+            + label {
                 &::before {
                     content: '';
                     position: absolute;
@@ -27,14 +29,14 @@
                     transform: rotate(45deg);
                     width: 6px;
                     height: 10px;
-                    left: 4px;
+                    left: 3px;
                     top: -1px;
                 }
             }
         }
 
-        &.indeterminate {
-            + span {
+        &:indeterminate {
+            + label {
                 &::before {
                     content: '';
                     position: absolute;
@@ -42,16 +44,17 @@
                     background: @gray-soft;
                     width: 8px;
                     height: 8px;
-                    left: 3px;
+                    left: 2px;
                     top: 2px;
                 }
             }
         }
 
-        &.disabled {
+        &.disabled,
+        &:disabled {
             opacity: .4;
 
-            + span {
+            + label {
                 &::before {
                     opacity: .4;
                 }
diff --git a/apps/common/main/resources/less/colorpalette.less b/apps/common/main/resources/less/colorpalette.less
index 08cd85b7b..4f16620b7 100644
--- a/apps/common/main/resources/less/colorpalette.less
+++ b/apps/common/main/resources/less/colorpalette.less
@@ -12,6 +12,16 @@
     }
 }
 
+.color-transparent {
+    &:before {
+        content: '';
+        position: absolute;
+        border-right: 2px solid red;
+        height: 14px;
+        transform: translate(5px,-1px) rotate(45deg);
+    }
+}
+
 .palette-color-ext {
     padding: 10px;
     .palette-color-item {
@@ -46,8 +56,6 @@
     }
 
     .color-transparent {
-        background-position: @nocolor-offset-x @nocolor-offset-y;
-
         em span {
             border:solid 1px #C0C0C0;
         }
diff --git a/apps/common/main/resources/less/combobox.less b/apps/common/main/resources/less/combobox.less
index a52c77b75..cc3cb36b8 100644
--- a/apps/common/main/resources/less/combobox.less
+++ b/apps/common/main/resources/less/combobox.less
@@ -21,11 +21,6 @@
 
     &.input-group-nr > .form-control {
         padding-right: 7px + 2 * @padding-base-horizontal;
-
-        &:focus,
-        &:focus ~ button.dropdown-toggle {
-            border-color: @gray-darker;
-        }
     }
 
     &.input-group-nr > .btn {
@@ -71,13 +66,20 @@
         border-color: @input-border;
     }
 
-    &.input-group-nr.open {
+    &.input-group-nr.open:not(.no-highlighted) {
         & > .form-control,
         & > .btn {
             border-color: @gray-darker;
         }
     }
 
+    &.input-group-nr:not(.no-highlighted) > .form-control {
+        &:focus,
+        &:focus ~ button.dropdown-toggle {
+            border-color: @gray-darker;
+        }
+    }
+
     li {
         a {
             white-space: pre;
@@ -129,3 +131,12 @@
         position: fixed;
     }
 }
+
+.open > .combobox.combo-dataview-menu {
+    &.input-group-nr:not(.no-highlighted) {
+        & > .form-control,
+        & > .btn {
+            border-color: @gray-darker;
+        }
+    }
+}
\ No newline at end of file
diff --git a/apps/common/main/resources/less/dimension-picker.less b/apps/common/main/resources/less/dimension-picker.less
index 6738d6a17..028123f3b 100644
--- a/apps/common/main/resources/less/dimension-picker.less
+++ b/apps/common/main/resources/less/dimension-picker.less
@@ -21,12 +21,14 @@
 
 .dimension-picker-unhighlighted {
     //background: transparent repeat scroll 0 0;
-    .background-ximage('@{common-image-path}/dimension-picker/dimension-unhighlighted.png', '@{common-image-path}/dimension-picker/dimension-unhighlighted@2x.png', 18px, auto, repeat);
+    .background-ximage-v2('dimension-picker/dimension-unhighlighted.png', 18px);
+    background-repeat: repeat;
 }
 
 .dimension-picker div.dimension-picker-highlighted {
     //background: transparent repeat scroll 0 0;
-    .background-ximage('@{common-image-path}/dimension-picker/dimension-highlighted.png', '@{common-image-path}/dimension-picker/dimension-highlighted@2x.png', 18px, auto, repeat);
+    .background-ximage-v2('dimension-picker/dimension-highlighted.png', 18px);
+    background-repeat: repeat;
 }
 
 .dimension-picker-status {
diff --git a/apps/common/main/resources/less/extended-color-picker.less b/apps/common/main/resources/less/extended-color-picker.less
index f43e991b8..f2460425f 100644
--- a/apps/common/main/resources/less/extended-color-picker.less
+++ b/apps/common/main/resources/less/extended-color-picker.less
@@ -53,7 +53,10 @@
         }
 
         .color-transparent {
-            background-position: -76px -196px;
+            &:before {
+                height: 64px;
+                transform: translate(29px, -22px) rotate(73deg);
+            }
         }
     }
 
diff --git a/apps/common/main/resources/less/radiobox.less b/apps/common/main/resources/less/radiobox.less
index e356a52cd..c95c3657f 100644
--- a/apps/common/main/resources/less/radiobox.less
+++ b/apps/common/main/resources/less/radiobox.less
@@ -4,22 +4,27 @@
     .font-size-normal();
     font-weight: normal;
     position: relative;
+    min-height: 1em;
 
-    input[type=button] {
-        margin-left: -22px;
-        margin-right: 6px;
-        padding-bottom: 4px;
-        width: 14px;
-        height: 14px;
-        cursor: default;
-        vertical-align: top;
+    input[type=radio] {
 
-        background: #fff;
-        border: 1px solid @gray;
-        border-radius: 50%;
+        display: none;
 
-        &.checked {
-            + span {
+        + label {
+            position: absolute;
+            left: 0;
+            margin-top: auto;
+            padding-bottom: 4px;
+            width: 14px;
+            height: 14px;
+
+            background: #fff;
+            border: 1px solid @gray;
+            border-radius: 50%;
+        }
+
+        &:checked {
+            + label {
                 &::before {
                     content: '';
                     position: absolute;
@@ -27,16 +32,16 @@
                     border-radius: 50%;
                     width: 8px;
                     height: 8px;
-                    left: 3px;
-                    top: 3px;
+                    left: 2px;
+                    top: 2px;
                 }
             }
         }
 
-        &.disabled {
+        &.disabled, &:disabled {
             opacity: .4;
 
-            + span {
+            + label {
                 &::before {
                     opacity: .4;
                 }
diff --git a/apps/common/main/resources/less/theme-colorpalette.less b/apps/common/main/resources/less/theme-colorpalette.less
index 20e2c8955..c712f0594 100644
--- a/apps/common/main/resources/less/theme-colorpalette.less
+++ b/apps/common/main/resources/less/theme-colorpalette.less
@@ -41,8 +41,6 @@
     }
 
     .color-transparent {
-        background-position: @nocolor-offset-x @nocolor-offset-y;
-
         em span {
             border:solid 1px #C0C0C0;
         }
diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js
index 994b9034e..747664e63 100644
--- a/apps/documenteditor/main/app/controller/Main.js
+++ b/apps/documenteditor/main/app/controller/Main.js
@@ -135,7 +135,8 @@ define([
                     "Hyperlink": this.txtHyperlink,
                     "Error! Main Document Only.": this.txtMainDocOnly,
                     "Error! Not a valid bookmark self-reference.": this.txtNotValidBookmark,
-                    "Error! No text of specified style in document.": this.txtNoText
+                    "Error! No text of specified style in document.": this.txtNoText,
+                    "Choose an item.": this.txtChoose
                 };
                 styleNames.forEach(function(item){
                     translate[item] = me['txtStyle_' + item.replace(/ /g, '_')] || item;
@@ -2509,7 +2510,8 @@ define([
             uploadDocSizeMessage: 'Maximum document size limit exceeded.',
             uploadDocExtMessage: 'Unknown document format.',
             uploadDocFileCountMessage: 'No documents uploaded.',
-            errorUpdateVersionOnDisconnect: 'Internet connection has been restored, and the file version has been changed.<br>Before you can continue working, you need to download the file or copy its content to make sure nothing is lost, and then reload this page.'
+            errorUpdateVersionOnDisconnect: 'Internet connection has been restored, and the file version has been changed.<br>Before you can continue working, you need to download the file or copy its content to make sure nothing is lost, and then reload this page.',
+            txtChoose: 'Choose an item.'
         }
     })(), DE.Controllers.Main || {}))
 });
\ No newline at end of file
diff --git a/apps/documenteditor/main/app/view/ControlSettingsDialog.js b/apps/documenteditor/main/app/view/ControlSettingsDialog.js
index a2f55ec33..9dfdf88b5 100644
--- a/apps/documenteditor/main/app/view/ControlSettingsDialog.js
+++ b/apps/documenteditor/main/app/view/ControlSettingsDialog.js
@@ -411,7 +411,8 @@ define([ 'text!documenteditor/main/app/template/ControlSettingsDialog.template',
 
             // for list controls
             if (this.type == Asc.c_oAscContentControlSpecificType.ComboBox || this.type == Asc.c_oAscContentControlSpecificType.DropDownList) {
-                var specProps = new AscCommon.CSdtComboBoxPr();
+                var specProps = (this.type == Asc.c_oAscContentControlSpecificType.ComboBox) ? this.props.get_ComboBoxPr() : this.props.get_DropDownListPr();
+                specProps.clear();
                 this.list.store.each(function (item, index) {
                     specProps.add_Item(item.get('name'), item.get('value'));
                 });
@@ -420,7 +421,7 @@ define([ 'text!documenteditor/main/app/template/ControlSettingsDialog.template',
 
             //for date picker
             if (this.type == Asc.c_oAscContentControlSpecificType.DateTime) {
-                var specProps = new AscCommon.CSdtDatePickerPr();
+                var specProps = this.props.get_DateTimePr();
                 specProps.put_DateFormat(this.txtDate.getValue());
                 specProps.put_LangId(this.cmbLang.getValue());
                 props.put_DateTimePr(specProps);
@@ -429,7 +430,7 @@ define([ 'text!documenteditor/main/app/template/ControlSettingsDialog.template',
             // for check box
             if (this.type == Asc.c_oAscContentControlSpecificType.CheckBox) {
                 if (this.checkedBox && this.checkedBox.changed || this.uncheckedBox && this.uncheckedBox.changed) {
-                    var specProps = new AscCommon.CSdtCheckBoxPr();
+                    var specProps = this.props.get_CheckBoxPr();
                     if (this.checkedBox) {
                         specProps.put_CheckedSymbol(this.checkedBox.code);
                         specProps.put_CheckedFont(this.checkedBox.font);
diff --git a/apps/documenteditor/main/app/view/DocumentHolder.js b/apps/documenteditor/main/app/view/DocumentHolder.js
index 111358579..580dd1ded 100644
--- a/apps/documenteditor/main/app/view/DocumentHolder.js
+++ b/apps/documenteditor/main/app/view/DocumentHolder.js
@@ -633,7 +633,7 @@ define([
 
                     me.btnSpecialPaste = new Common.UI.Button({
                         cls         : 'btn-toolbar',
-                        iconCls     : 'btn-paste',
+                        iconCls     : 'toolbar__icon btn-paste',
                         menu        : new Common.UI.Menu({items: []})
                     });
                     me.btnSpecialPaste.render($('#id-document-holder-btn-special-paste')) ;
@@ -2804,7 +2804,7 @@ define([
 
             var langTemplate = _.template([
                 '<a id="<%= id %>" tabindex="-1" type="menuitem" style="padding-left: 28px !important;" langval="<%= value %>" class="<% if (checked) { %> checked <% } %>">',
-                '<i class="icon <% if (spellcheck) { %> img-toolbarmenu spellcheck-lang <% } %>"></i>',
+                '<i class="icon <% if (spellcheck) { %> toolbar__icon btn-ic-docspell spellcheck-lang <% } %>"></i>',
                 '<%= caption %>',
                 '</a>'
             ].join(''));
@@ -4003,11 +4003,9 @@ define([
                     firstday: 1
                 });
                 this.cmpCalendar.on('date:click', function (cmp, date) {
-                    var props = me._dateObj,
-                        specProps = props.get_DateTimePr(),
-                        id = props.get_InternalId();
+                    var specProps = me._dateObj.get_DateTimePr();
                     specProps.put_FullDate(new  Date(date));
-                    me.api.asc_SetContentControlProperties(props, id);
+                    me.api.asc_SetContentControlDatePickerDate(specProps);
                     controlsContainer.hide();
                     me.api.asc_UncheckContentControlButtons();
                     me.fireEvent('editcomplete', me);
@@ -4063,7 +4061,7 @@ define([
                 });
                 menu.on('item:click', function(menu, item) {
                     setTimeout(function(){
-                        me.api.asc_SelectContentControlListItem(item.value, me._listObj.get_InternalId());
+                        (item.value!==-1) && me.api.asc_SelectContentControlListItem(item.value, me._listObj.get_InternalId());
                     }, 1);
                 });
 
@@ -4089,6 +4087,12 @@ define([
                         value       : specProps.get_ItemValue(i)
                     }));
                 }
+                if (count<1) {
+                    menu.addItem(new Common.UI.MenuItem({
+                        caption     : this.txtEmpty,
+                        value       : -1
+                    }));
+                }
             }
 
             menuContainer.css({left: x, top : y});
@@ -4341,7 +4345,8 @@ define([
         txtPrintSelection: 'Print Selection',
         textCells: 'Cells',
         textSeveral: 'Several Rows/Columns',
-        txtInsertCaption: 'Insert Caption'
+        txtInsertCaption: 'Insert Caption',
+        txtEmpty: '(Empty)'
 
     }, DE.Views.DocumentHolder || {}));
 });
\ No newline at end of file
diff --git a/apps/documenteditor/main/app/view/EditListItemDialog.js b/apps/documenteditor/main/app/view/EditListItemDialog.js
index 56b05eca2..282836075 100644
--- a/apps/documenteditor/main/app/view/EditListItemDialog.js
+++ b/apps/documenteditor/main/app/view/EditListItemDialog.js
@@ -81,6 +81,7 @@ define([
                 allowBlank  : false,
                 blankError  : me.textNameError,
                 style       : 'width: 100%;',
+                maxLength   : 256,
                 validateOnBlur: false,
                 validation  : function(value) {
                     return value ? true : '';
@@ -99,6 +100,7 @@ define([
             me.inputValue = new Common.UI.InputField({
                 el          : $('#id-dlg-label-value'),
                 style       : 'width: 100%;',
+                maxLength   : 256,
                 validateOnBlur: false,
                 validation  : function(value) {
                     if (value!=='' && me.options.store) {
diff --git a/apps/documenteditor/main/app/view/FileMenuPanels.js b/apps/documenteditor/main/app/view/FileMenuPanels.js
index d982e9fad..a412af2a5 100644
--- a/apps/documenteditor/main/app/view/FileMenuPanels.js
+++ b/apps/documenteditor/main/app/view/FileMenuPanels.js
@@ -952,7 +952,7 @@ define([
             if (this.coreProps) {
                 var value = this.coreProps.asc_getCreated();
                 if (value)
-                    this.lblDate.text(value.toLocaleString());
+                    this.lblDate.text(value.toLocaleString(this.mode.lang, {year: 'numeric', month: '2-digit', day: '2-digit'}) + ' ' + value.toLocaleString(this.mode.lang, {timeStyle: 'short'}));
                 this._ShowHideInfoItem(this.lblDate, !!value);
             }
         },
@@ -978,7 +978,7 @@ define([
                 var visible = false;
                 value = props.asc_getModified();
                 if (value)
-                    this.lblModifyDate.text(value.toLocaleString());
+                    this.lblModifyDate.text(value.toLocaleString(this.mode.lang, {year: 'numeric', month: '2-digit', day: '2-digit'}) + ' ' + value.toLocaleString(this.mode.lang, {timeStyle: 'short'}));
                 visible = this._ShowHideInfoItem(this.lblModifyDate, !!value) || visible;
                 value = props.asc_getLastModifiedBy();
                 if (value)
diff --git a/apps/documenteditor/main/app/view/Statusbar.js b/apps/documenteditor/main/app/view/Statusbar.js
index c8b9cc613..1d9ded350 100644
--- a/apps/documenteditor/main/app/view/Statusbar.js
+++ b/apps/documenteditor/main/app/view/Statusbar.js
@@ -234,7 +234,7 @@ define([
                     restoreHeight: 285,
                     itemTemplate: _.template([
                         '<a id="<%= id %>" tabindex="-1" type="menuitem" style="padding-left: 28px !important;" langval="<%= value.value %>" class="<% if (checked) { %> checked <% } %>">',
-                            '<i class="icon <% if (spellcheck) { %> img-toolbarmenu spellcheck-lang <% } %>"></i>',
+                            '<i class="icon <% if (spellcheck) { %> toolbar__icon btn-ic-docspell spellcheck-lang <% } %>"></i>',
                             '<%= caption %>',
                         '</a>'
                     ].join('')),
diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json
index d1b7a270b..ca5f8d54e 100644
--- a/apps/documenteditor/main/locale/en.json
+++ b/apps/documenteditor/main/locale/en.json
@@ -716,6 +716,7 @@
   "DE.Controllers.Main.warnNoLicense": "This version of %1 editors has certain limitations for concurrent connections to the document server.<br>If you need more please consider purchasing a commercial license.",
   "DE.Controllers.Main.warnNoLicenseUsers": "This version of %1 editors has certain limitations for concurrent users.<br>If you need more please consider purchasing a commercial license.",
   "DE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.",
+  "DE.Controllers.Main.txtChoose": "Choose an item.",
   "DE.Controllers.Navigation.txtBeginning": "Beginning of document",
   "DE.Controllers.Navigation.txtGotoBeginning": "Go to the beginning of the document",
   "DE.Controllers.Statusbar.textHasChanges": "New changes have been tracked",
@@ -1377,6 +1378,7 @@
   "DE.Views.DocumentHolder.txtUngroup": "Ungroup",
   "DE.Views.DocumentHolder.updateStyleText": "Update %1 style",
   "DE.Views.DocumentHolder.vertAlignText": "Vertical Alignment",
+  "DE.Views.DocumentHolder.txtEmpty": "(Empty)",
   "DE.Views.DropcapSettingsAdvanced.strBorders": "Borders & Fill",
   "DE.Views.DropcapSettingsAdvanced.strDropcap": "Drop Cap",
   "DE.Views.DropcapSettingsAdvanced.strMargins": "Margins",
diff --git a/apps/documenteditor/main/locale/ru.json b/apps/documenteditor/main/locale/ru.json
index da81f10f4..a54bf4de0 100644
--- a/apps/documenteditor/main/locale/ru.json
+++ b/apps/documenteditor/main/locale/ru.json
@@ -672,6 +672,7 @@
   "DE.Controllers.Main.warnNoLicense": "Эта версия редакторов %1 имеет некоторые ограничения по количеству одновременных подключений к серверу документов.<br>Если требуется больше, рассмотрите вопрос о покупке коммерческой лицензии.",
   "DE.Controllers.Main.warnNoLicenseUsers": "Эта версия редакторов %1 имеет некоторые ограничения по числу одновременно работающих пользователей.<br>Если требуется больше, рассмотрите вопрос о покупке коммерческой лицензии.",
   "DE.Controllers.Main.warnProcessRightsChange": "Вам было отказано в праве на редактирование этого файла.",
+  "DE.Controllers.Main.txtChoose": "Выберите элемент.",
   "DE.Controllers.Navigation.txtBeginning": "Начало документа",
   "DE.Controllers.Navigation.txtGotoBeginning": "Перейти в начало документа",
   "DE.Controllers.Statusbar.textHasChanges": "Отслежены новые изменения",
diff --git a/apps/documenteditor/main/resources/img/toolbar/1.5x/big/btn-blankpage.png b/apps/documenteditor/main/resources/img/toolbar/1.5x/big/btn-blankpage.png
index 023bc51b6..3261de512 100644
Binary files a/apps/documenteditor/main/resources/img/toolbar/1.5x/big/btn-blankpage.png and b/apps/documenteditor/main/resources/img/toolbar/1.5x/big/btn-blankpage.png differ
diff --git a/apps/documenteditor/main/resources/img/toolbar/1.5x/big/btn-bookmarks.png b/apps/documenteditor/main/resources/img/toolbar/1.5x/big/btn-bookmarks.png
index 902b5fbcd..00852969e 100644
Binary files a/apps/documenteditor/main/resources/img/toolbar/1.5x/big/btn-bookmarks.png and b/apps/documenteditor/main/resources/img/toolbar/1.5x/big/btn-bookmarks.png differ
diff --git a/apps/documenteditor/main/resources/img/toolbar/1.5x/big/btn-caption.png b/apps/documenteditor/main/resources/img/toolbar/1.5x/big/btn-caption.png
index e1d0b2983..e89f1f0af 100644
Binary files a/apps/documenteditor/main/resources/img/toolbar/1.5x/big/btn-caption.png and b/apps/documenteditor/main/resources/img/toolbar/1.5x/big/btn-caption.png differ
diff --git a/apps/documenteditor/main/resources/img/toolbar/1.5x/big/btn-columns.png b/apps/documenteditor/main/resources/img/toolbar/1.5x/big/btn-columns.png
index 577d33cdb..8ec36c701 100644
Binary files a/apps/documenteditor/main/resources/img/toolbar/1.5x/big/btn-columns.png and b/apps/documenteditor/main/resources/img/toolbar/1.5x/big/btn-columns.png differ
diff --git a/apps/documenteditor/main/resources/img/toolbar/1.5x/big/btn-contents-update.png b/apps/documenteditor/main/resources/img/toolbar/1.5x/big/btn-contents-update.png
index ddda2b443..504a074e6 100644
Binary files a/apps/documenteditor/main/resources/img/toolbar/1.5x/big/btn-contents-update.png and b/apps/documenteditor/main/resources/img/toolbar/1.5x/big/btn-contents-update.png differ
diff --git a/apps/documenteditor/main/resources/img/toolbar/1.5x/big/btn-contents.png b/apps/documenteditor/main/resources/img/toolbar/1.5x/big/btn-contents.png
index 0e4affb49..34bb89288 100644
Binary files a/apps/documenteditor/main/resources/img/toolbar/1.5x/big/btn-contents.png and b/apps/documenteditor/main/resources/img/toolbar/1.5x/big/btn-contents.png differ
diff --git a/apps/documenteditor/main/resources/img/toolbar/1.5x/big/btn-controls.png b/apps/documenteditor/main/resources/img/toolbar/1.5x/big/btn-controls.png
index 7f7f5c20a..14ff00f77 100644
Binary files a/apps/documenteditor/main/resources/img/toolbar/1.5x/big/btn-controls.png and b/apps/documenteditor/main/resources/img/toolbar/1.5x/big/btn-controls.png differ
diff --git a/apps/documenteditor/main/resources/img/toolbar/1.5x/big/btn-dropcap.png b/apps/documenteditor/main/resources/img/toolbar/1.5x/big/btn-dropcap.png
index dff92a85f..99a021a66 100644
Binary files a/apps/documenteditor/main/resources/img/toolbar/1.5x/big/btn-dropcap.png and b/apps/documenteditor/main/resources/img/toolbar/1.5x/big/btn-dropcap.png differ
diff --git a/apps/documenteditor/main/resources/img/toolbar/1.5x/big/btn-ic-review.png b/apps/documenteditor/main/resources/img/toolbar/1.5x/big/btn-ic-review.png
index c52001396..ce43590f1 100644
Binary files a/apps/documenteditor/main/resources/img/toolbar/1.5x/big/btn-ic-review.png and b/apps/documenteditor/main/resources/img/toolbar/1.5x/big/btn-ic-review.png differ
diff --git a/apps/documenteditor/main/resources/img/toolbar/1.5x/big/btn-ic-reviewview.png b/apps/documenteditor/main/resources/img/toolbar/1.5x/big/btn-ic-reviewview.png
index a843a20e3..f75873f1d 100644
Binary files a/apps/documenteditor/main/resources/img/toolbar/1.5x/big/btn-ic-reviewview.png and b/apps/documenteditor/main/resources/img/toolbar/1.5x/big/btn-ic-reviewview.png differ
diff --git a/apps/documenteditor/main/resources/img/toolbar/1.5x/big/btn-img-wrap.png b/apps/documenteditor/main/resources/img/toolbar/1.5x/big/btn-img-wrap.png
index ec30a9f1d..ec4cb1fb1 100644
Binary files a/apps/documenteditor/main/resources/img/toolbar/1.5x/big/btn-img-wrap.png and b/apps/documenteditor/main/resources/img/toolbar/1.5x/big/btn-img-wrap.png differ
diff --git a/apps/documenteditor/main/resources/img/toolbar/1.5x/big/btn-notes.png b/apps/documenteditor/main/resources/img/toolbar/1.5x/big/btn-notes.png
index 0a579352e..963382c77 100644
Binary files a/apps/documenteditor/main/resources/img/toolbar/1.5x/big/btn-notes.png and b/apps/documenteditor/main/resources/img/toolbar/1.5x/big/btn-notes.png differ
diff --git a/apps/documenteditor/main/resources/img/toolbar/1.5x/big/btn-pagebreak.png b/apps/documenteditor/main/resources/img/toolbar/1.5x/big/btn-pagebreak.png
index de3e66023..a7dcb8bfb 100644
Binary files a/apps/documenteditor/main/resources/img/toolbar/1.5x/big/btn-pagebreak.png and b/apps/documenteditor/main/resources/img/toolbar/1.5x/big/btn-pagebreak.png differ
diff --git a/apps/documenteditor/main/resources/img/toolbar/1.5x/big/btn-review-deny.png b/apps/documenteditor/main/resources/img/toolbar/1.5x/big/btn-review-deny.png
index d63c91faa..5541eedfd 100644
Binary files a/apps/documenteditor/main/resources/img/toolbar/1.5x/big/btn-review-deny.png and b/apps/documenteditor/main/resources/img/toolbar/1.5x/big/btn-review-deny.png differ
diff --git a/apps/documenteditor/main/resources/img/toolbar/1.5x/big/btn-review-next.png b/apps/documenteditor/main/resources/img/toolbar/1.5x/big/btn-review-next.png
index 5a6df6529..9ee35b6e6 100644
Binary files a/apps/documenteditor/main/resources/img/toolbar/1.5x/big/btn-review-next.png and b/apps/documenteditor/main/resources/img/toolbar/1.5x/big/btn-review-next.png differ
diff --git a/apps/documenteditor/main/resources/img/toolbar/1.5x/big/btn-review-prev.png b/apps/documenteditor/main/resources/img/toolbar/1.5x/big/btn-review-prev.png
index 4e8415c80..6cd32151f 100644
Binary files a/apps/documenteditor/main/resources/img/toolbar/1.5x/big/btn-review-prev.png and b/apps/documenteditor/main/resources/img/toolbar/1.5x/big/btn-review-prev.png differ
diff --git a/apps/documenteditor/main/resources/img/toolbar/1.5x/big/btn-review-save.png b/apps/documenteditor/main/resources/img/toolbar/1.5x/big/btn-review-save.png
index 3a784fdb1..f27cf8e1f 100644
Binary files a/apps/documenteditor/main/resources/img/toolbar/1.5x/big/btn-review-save.png and b/apps/documenteditor/main/resources/img/toolbar/1.5x/big/btn-review-save.png differ
diff --git a/apps/documenteditor/main/resources/img/toolbar/1.5x/big/btn-watermark.png b/apps/documenteditor/main/resources/img/toolbar/1.5x/big/btn-watermark.png
index 64f2200aa..84a656d84 100644
Binary files a/apps/documenteditor/main/resources/img/toolbar/1.5x/big/btn-watermark.png and b/apps/documenteditor/main/resources/img/toolbar/1.5x/big/btn-watermark.png differ
diff --git a/apps/documenteditor/main/resources/img/toolbar/1x/big/btn-notes.png b/apps/documenteditor/main/resources/img/toolbar/1x/big/btn-notes.png
index 754c1df51..5f0e501e3 100644
Binary files a/apps/documenteditor/main/resources/img/toolbar/1x/big/btn-notes.png and b/apps/documenteditor/main/resources/img/toolbar/1x/big/btn-notes.png differ
diff --git a/apps/documenteditor/main/resources/img/toolbar/2x/big/btn-blankpage.png b/apps/documenteditor/main/resources/img/toolbar/2x/big/btn-blankpage.png
index 0f0b677cb..043d48c41 100644
Binary files a/apps/documenteditor/main/resources/img/toolbar/2x/big/btn-blankpage.png and b/apps/documenteditor/main/resources/img/toolbar/2x/big/btn-blankpage.png differ
diff --git a/apps/documenteditor/main/resources/img/toolbar/2x/big/btn-bookmarks.png b/apps/documenteditor/main/resources/img/toolbar/2x/big/btn-bookmarks.png
index aaf48d9f0..3c43158e8 100644
Binary files a/apps/documenteditor/main/resources/img/toolbar/2x/big/btn-bookmarks.png and b/apps/documenteditor/main/resources/img/toolbar/2x/big/btn-bookmarks.png differ
diff --git a/apps/documenteditor/main/resources/img/toolbar/2x/big/btn-caption.png b/apps/documenteditor/main/resources/img/toolbar/2x/big/btn-caption.png
index 2493ea0ee..5c61262b1 100644
Binary files a/apps/documenteditor/main/resources/img/toolbar/2x/big/btn-caption.png and b/apps/documenteditor/main/resources/img/toolbar/2x/big/btn-caption.png differ
diff --git a/apps/documenteditor/main/resources/img/toolbar/2x/big/btn-columns.png b/apps/documenteditor/main/resources/img/toolbar/2x/big/btn-columns.png
index 8a32ccdf8..9fe921ea0 100644
Binary files a/apps/documenteditor/main/resources/img/toolbar/2x/big/btn-columns.png and b/apps/documenteditor/main/resources/img/toolbar/2x/big/btn-columns.png differ
diff --git a/apps/documenteditor/main/resources/img/toolbar/2x/big/btn-contents-update.png b/apps/documenteditor/main/resources/img/toolbar/2x/big/btn-contents-update.png
index 03b657a7a..6c2ea793a 100644
Binary files a/apps/documenteditor/main/resources/img/toolbar/2x/big/btn-contents-update.png and b/apps/documenteditor/main/resources/img/toolbar/2x/big/btn-contents-update.png differ
diff --git a/apps/documenteditor/main/resources/img/toolbar/2x/big/btn-contents.png b/apps/documenteditor/main/resources/img/toolbar/2x/big/btn-contents.png
index 7347b9d1d..5b421e2a7 100644
Binary files a/apps/documenteditor/main/resources/img/toolbar/2x/big/btn-contents.png and b/apps/documenteditor/main/resources/img/toolbar/2x/big/btn-contents.png differ
diff --git a/apps/documenteditor/main/resources/img/toolbar/2x/big/btn-controls.png b/apps/documenteditor/main/resources/img/toolbar/2x/big/btn-controls.png
index 21bca2497..3a2b9e0e5 100644
Binary files a/apps/documenteditor/main/resources/img/toolbar/2x/big/btn-controls.png and b/apps/documenteditor/main/resources/img/toolbar/2x/big/btn-controls.png differ
diff --git a/apps/documenteditor/main/resources/img/toolbar/2x/big/btn-dropcap.png b/apps/documenteditor/main/resources/img/toolbar/2x/big/btn-dropcap.png
index f74ffc90e..9b7c69477 100644
Binary files a/apps/documenteditor/main/resources/img/toolbar/2x/big/btn-dropcap.png and b/apps/documenteditor/main/resources/img/toolbar/2x/big/btn-dropcap.png differ
diff --git a/apps/documenteditor/main/resources/img/toolbar/2x/big/btn-ic-review.png b/apps/documenteditor/main/resources/img/toolbar/2x/big/btn-ic-review.png
index cc91714cd..340a45021 100644
Binary files a/apps/documenteditor/main/resources/img/toolbar/2x/big/btn-ic-review.png and b/apps/documenteditor/main/resources/img/toolbar/2x/big/btn-ic-review.png differ
diff --git a/apps/documenteditor/main/resources/img/toolbar/2x/big/btn-ic-reviewview.png b/apps/documenteditor/main/resources/img/toolbar/2x/big/btn-ic-reviewview.png
index b61d526ae..027dd5df6 100644
Binary files a/apps/documenteditor/main/resources/img/toolbar/2x/big/btn-ic-reviewview.png and b/apps/documenteditor/main/resources/img/toolbar/2x/big/btn-ic-reviewview.png differ
diff --git a/apps/documenteditor/main/resources/img/toolbar/2x/big/btn-img-wrap.png b/apps/documenteditor/main/resources/img/toolbar/2x/big/btn-img-wrap.png
index e767dbf2c..b82d5852b 100644
Binary files a/apps/documenteditor/main/resources/img/toolbar/2x/big/btn-img-wrap.png and b/apps/documenteditor/main/resources/img/toolbar/2x/big/btn-img-wrap.png differ
diff --git a/apps/documenteditor/main/resources/img/toolbar/2x/big/btn-notes.png b/apps/documenteditor/main/resources/img/toolbar/2x/big/btn-notes.png
index 146fecb7b..8565cd9e9 100644
Binary files a/apps/documenteditor/main/resources/img/toolbar/2x/big/btn-notes.png and b/apps/documenteditor/main/resources/img/toolbar/2x/big/btn-notes.png differ
diff --git a/apps/documenteditor/main/resources/img/toolbar/2x/big/btn-pagebreak.png b/apps/documenteditor/main/resources/img/toolbar/2x/big/btn-pagebreak.png
index cd953860e..8ebfd6041 100644
Binary files a/apps/documenteditor/main/resources/img/toolbar/2x/big/btn-pagebreak.png and b/apps/documenteditor/main/resources/img/toolbar/2x/big/btn-pagebreak.png differ
diff --git a/apps/documenteditor/main/resources/img/toolbar/2x/big/btn-review-deny.png b/apps/documenteditor/main/resources/img/toolbar/2x/big/btn-review-deny.png
index acafb4e5c..20faad0fc 100644
Binary files a/apps/documenteditor/main/resources/img/toolbar/2x/big/btn-review-deny.png and b/apps/documenteditor/main/resources/img/toolbar/2x/big/btn-review-deny.png differ
diff --git a/apps/documenteditor/main/resources/img/toolbar/2x/big/btn-review-next.png b/apps/documenteditor/main/resources/img/toolbar/2x/big/btn-review-next.png
index 0c3a7c2ac..d960f3675 100644
Binary files a/apps/documenteditor/main/resources/img/toolbar/2x/big/btn-review-next.png and b/apps/documenteditor/main/resources/img/toolbar/2x/big/btn-review-next.png differ
diff --git a/apps/documenteditor/main/resources/img/toolbar/2x/big/btn-review-prev.png b/apps/documenteditor/main/resources/img/toolbar/2x/big/btn-review-prev.png
index 3e9cea827..3c0e71c75 100644
Binary files a/apps/documenteditor/main/resources/img/toolbar/2x/big/btn-review-prev.png and b/apps/documenteditor/main/resources/img/toolbar/2x/big/btn-review-prev.png differ
diff --git a/apps/documenteditor/main/resources/img/toolbar/2x/big/btn-review-save.png b/apps/documenteditor/main/resources/img/toolbar/2x/big/btn-review-save.png
index 199b71641..2b0f4338d 100644
Binary files a/apps/documenteditor/main/resources/img/toolbar/2x/big/btn-review-save.png and b/apps/documenteditor/main/resources/img/toolbar/2x/big/btn-review-save.png differ
diff --git a/apps/documenteditor/main/resources/img/toolbar/2x/big/btn-watermark.png b/apps/documenteditor/main/resources/img/toolbar/2x/big/btn-watermark.png
index dcf3a751d..73252c7e2 100644
Binary files a/apps/documenteditor/main/resources/img/toolbar/2x/big/btn-watermark.png and b/apps/documenteditor/main/resources/img/toolbar/2x/big/btn-watermark.png differ
diff --git a/apps/documenteditor/main/resources/img/toolbar/AutoColor.png b/apps/documenteditor/main/resources/img/toolbar/AutoColor.png
deleted file mode 100644
index ea5e643c9..000000000
Binary files a/apps/documenteditor/main/resources/img/toolbar/AutoColor.png and /dev/null differ
diff --git a/apps/documenteditor/main/resources/img/toolbar/nocolor.png b/apps/documenteditor/main/resources/img/toolbar/nocolor.png
deleted file mode 100644
index 881342c55..000000000
Binary files a/apps/documenteditor/main/resources/img/toolbar/nocolor.png and /dev/null differ
diff --git a/apps/documenteditor/mobile/app/controller/Settings.js b/apps/documenteditor/mobile/app/controller/Settings.js
index 3ce28feef..ae3df00a3 100644
--- a/apps/documenteditor/mobile/app/controller/Settings.js
+++ b/apps/documenteditor/mobile/app/controller/Settings.js
@@ -86,7 +86,8 @@ define([
             _fileKey,
             templateInsert,
             _metricText = Common.Utils.Metric.getCurrentMetricName(),
-            _isEdit;
+            _isEdit,
+            _lang;
 
         var mm2Cm = function(mm) {
             return parseFloat((mm/10.).toFixed(2));
@@ -149,6 +150,7 @@ define([
                 _isReviewOnly = mode.isReviewOnly;
                 _fileKey = mode.fileKey;
                 _isEdit = mode.isEdit;
+                _lang = mode.lang;
             },
 
             initEvents: function () {
@@ -436,11 +438,11 @@ define([
                         value = props.asc_getDescription();
                         value ? $('#settings-doc-comment').html(value) : $('.display-comment').remove();
                         value = props.asc_getModified();
-                        value ? $('#settings-doc-last-mod').html(value.toLocaleString()) : $('.display-last-mode').remove();
+                        value ? $('#settings-doc-last-mod').html(value.toLocaleString(_lang, {year: 'numeric', month: '2-digit', day: '2-digit'}) + ' ' + value.toLocaleString(_lang, {timeStyle: 'short'})) : $('.display-last-mode').remove();
                         value = props.asc_getLastModifiedBy();
                         value ? $('#settings-doc-mod-by').html(value) : $('.display-mode-by').remove();
                         value = props.asc_getCreated();
-                        value ? $('#settings-doc-date').html(value.toLocaleString()) : $('.display-created-date').remove();
+                        value ? $('#settings-doc-date').html(value.toLocaleString(_lang, {year: 'numeric', month: '2-digit', day: '2-digit'}) + ' ' + value.toLocaleString(_lang, {timeStyle: 'short'})) : $('.display-created-date').remove();
                         value = props.asc_getCreator();
                         var templateCreator = "";
                         value && value.split(/\s*[,;]\s*/).forEach(function(item) {
diff --git a/apps/presentationeditor/main/app/template/LeftMenu.template b/apps/presentationeditor/main/app/template/LeftMenu.template
index 2e85b7171..33401f1b9 100644
--- a/apps/presentationeditor/main/app/template/LeftMenu.template
+++ b/apps/presentationeditor/main/app/template/LeftMenu.template
@@ -6,7 +6,7 @@
         <button id="left-btn-comments" class="btn btn-category" content-target="left-panel-comments"><i class="icon toolbar__icon btn-menu-comments">&nbsp;</i></button>
         <button id="left-btn-chat" class="btn btn-category" content-target="left-panel-chat"><i class="icon toolbar__icon btn-menu-chat">&nbsp;</i></button>
         <!-- /** coauthoring end **/ -->
-        <button id="left-btn-plugins" class="btn btn-category" content-target=""><i class="icon img-toolbarmenu btn-menu-plugin">&nbsp;</i></button>
+        <button id="left-btn-plugins" class="btn btn-category" content-target=""><i class="icon toolbar__icon btn-menu-plugin">&nbsp;</i></button>
         <button id="left-btn-support" class="btn btn-category" content-target=""><i class="icon toolbar__icon btn-menu-support">&nbsp;</i></button>
         <button id="left-btn-about" class="btn btn-category" content-target=""><i class="icon toolbar__icon btn-menu-about">&nbsp;</i></button>
     </div>
diff --git a/apps/presentationeditor/main/app/view/DocumentHolder.js b/apps/presentationeditor/main/app/view/DocumentHolder.js
index 091c5dd41..d5833243d 100644
--- a/apps/presentationeditor/main/app/view/DocumentHolder.js
+++ b/apps/presentationeditor/main/app/view/DocumentHolder.js
@@ -1506,7 +1506,7 @@ define([
 
                     me.btnSpecialPaste = new Common.UI.Button({
                         cls         : 'btn-toolbar',
-                        iconCls     : 'btn-paste',
+                        iconCls     : 'toolbar__icon btn-paste',
                         menu        : new Common.UI.Menu({items: []})
                     });
                     me.btnSpecialPaste.render($('#id-document-holder-btn-special-paste')) ;
@@ -2179,7 +2179,7 @@ define([
 
             var langTemplate = _.template([
                 '<a id="<%= id %>" tabindex="-1" type="menuitem" style="padding-left: 28px !important;" langval="<%= value %>" class="<% if (checked) { %> checked <% } %>">',
-                '<i class="icon <% if (spellcheck) { %> img-toolbarmenu spellcheck-lang <% } %>"></i>',
+                '<i class="icon <% if (spellcheck) { %> toolbar__icon btn-ic-docspell spellcheck-lang <% } %>"></i>',
                 '<%= caption %>',
                 '</a>'
             ].join(''));
diff --git a/apps/presentationeditor/main/app/view/DocumentPreview.js b/apps/presentationeditor/main/app/view/DocumentPreview.js
index f701805d0..c47749871 100644
--- a/apps/presentationeditor/main/app/view/DocumentPreview.js
+++ b/apps/presentationeditor/main/app/view/DocumentPreview.js
@@ -72,9 +72,9 @@ define([
                 '<div id="presentation-preview" style="width:100%; height:100%"></div>',
                 '<div id="preview-controls-panel" class="preview-controls" style="position: absolute; bottom: 0;">',
                     '<div class="preview-group" style="">',
-                        '<button id="btn-preview-prev" type="button" class="btn small btn-toolbar"><span class="icon">&nbsp;</span></button>',
-                        '<button id="btn-preview-play" type="button" class="btn small btn-toolbar"><span class="icon">&nbsp;</span></button>',
-                        '<button id="btn-preview-next" type="button" class="btn small btn-toolbar"><span class="icon">&nbsp;</span></button>',
+                        '<button id="btn-preview-prev" type="button" class="btn small btn-toolbar"><span class="icon toolbar__icon btn-previtem">&nbsp;</span></button>',
+                        '<button id="btn-preview-play" type="button" class="btn small btn-toolbar"><span class="icon toolbar__icon btn-preview-play">&nbsp;</span></button>',
+                        '<button id="btn-preview-next" type="button" class="btn small btn-toolbar"><span class="icon toolbar__icon btn-nextitem">&nbsp;</span></button>',
                     '<div class="separator"/>',
                     '</div>',
                     '<div class="preview-group dropup">',
@@ -86,9 +86,9 @@ define([
                     '</div>',
                     '<div class="preview-group" style="">',
                         '<div class="separator"/>',
-                        '<button id="btn-preview-fullscreen" type="button" class="btn small btn-toolbar"><span class="icon">&nbsp;</span></button>',
+                        '<button id="btn-preview-fullscreen" type="button" class="btn small btn-toolbar"><span class="icon toolbar__icon btn-preview-fullscreen">&nbsp;</span></button>',
                         '<div class="separator fullscreen"/>',
-                        '<button id="btn-preview-close" type="button" class="btn small btn-toolbar"><span class="icon">&nbsp;</span></button>',
+                        '<button id="btn-preview-close" type="button" class="btn small btn-toolbar"><span class="icon toolbar__icon btn-close">&nbsp;</span></button>',
                     '</div>',
                 '</div>'
             ].join('');
@@ -129,13 +129,15 @@ define([
             });
             this.btnPlay.on('click', _.bind(function(btn) {
                 var iconEl = $('.icon', this.btnPlay.cmpEl);
-                if (iconEl.hasClass('btn-pause')) {
-                    iconEl.removeClass('btn-pause');
+                if (iconEl.hasClass('btn-preview-pause')) {
+                    iconEl.removeClass('btn-preview-pause');
+                    iconEl.addClass('btn-preview-play');
                     this.btnPlay.updateHint(this.txtPlay);
                     if (this.api)
                         this.api.DemonstrationPause();
                 } else {
-                    iconEl.addClass('btn-pause');
+                    iconEl.addClass('btn-preview-pause');
+                    iconEl.removeClass('btn-preview-play');
                     this.btnPlay.updateHint(this.txtPause);
                     if (this.api)
                         this.api.DemonstrationPlay ();
@@ -232,7 +234,8 @@ define([
 
             $(document).on("webkitfullscreenchange mozfullscreenchange fullscreenchange MSFullscreenChange",function(){
                 var fselem = (document.fullscreenElement || document.mozFullScreenElement || document.webkitFullscreenElement || document.msFullscreenElement );
-                me.btnFullScreen.cmpEl.toggleClass('fullscreen', fselem !== undefined && fselem !== null);
+                $('.icon', me.btnFullScreen.cmpEl).toggleClass('btn-preview-exit-fullscreen', fselem !== undefined && fselem !== null);
+                $('.icon', me.btnFullScreen.cmpEl).toggleClass('btn-preview-fullscreen', fselem == undefined || fselem == null);
 
                 setTimeout( function() {
                     me.previewControls.css('display', '');
@@ -242,7 +245,7 @@ define([
                 if (Common.Utils.isIE) { // for tooltips in IE
                     me.btnFullScreen.updateHint( fselem ? '' : me.txtFullScreen);
                     me.btnPrev.updateHint( fselem ? '' : me.txtPrev);
-                    me.btnPlay.updateHint( fselem ? '' : ($('.icon', me.btnPlay.cmpEl).hasClass('btn-pause') ? me.txtPause : me.txtPlay));
+                    me.btnPlay.updateHint( fselem ? '' : ($('.icon', me.btnPlay.cmpEl).hasClass('btn-preview-pause') ? me.txtPause : me.txtPlay));
                     me.btnNext.updateHint( fselem ? '' : me.txtNext);
                     me.btnClose.updateHint( fselem ? '' : me.txtClose);
                 } else
@@ -275,8 +278,9 @@ define([
             Common.UI.BaseView.prototype.show.call(this,arguments);
 
             var iconEl = $('.icon', this.btnPlay.cmpEl);
-            if (!iconEl.hasClass('btn-pause')) {
-                iconEl.addClass('btn-pause');
+            if (!iconEl.hasClass('btn-preview-pause')) {
+                iconEl.addClass('btn-preview-pause');
+                iconEl.removeClass('btn-preview-play');
                 this.btnPlay.updateHint(this.txtPause);
             }
 
@@ -367,7 +371,8 @@ define([
 
         onDemonstrationStatus: function(status) {
             var iconEl = $('.icon', this.btnPlay.cmpEl);
-            iconEl.toggleClass('btn-pause', status=="play");
+            iconEl.toggleClass('btn-preivew-pause', status=="play");
+            iconEl.toggleClass('btn-preivew-play', status!=="play");
             this.btnPlay.updateHint((status=="play") ? this.txtPause : this.txtPlay);
         },
 
diff --git a/apps/presentationeditor/main/app/view/FileMenuPanels.js b/apps/presentationeditor/main/app/view/FileMenuPanels.js
index ce3116090..6bedd8268 100644
--- a/apps/presentationeditor/main/app/view/FileMenuPanels.js
+++ b/apps/presentationeditor/main/app/view/FileMenuPanels.js
@@ -827,7 +827,7 @@ define([
             if (this.coreProps) {
                 var value = this.coreProps.asc_getCreated();
                 if (value)
-                    this.lblDate.text(value.toLocaleString());
+                    this.lblDate.text(value.toLocaleString(this.mode.lang, {year: 'numeric', month: '2-digit', day: '2-digit'}) + ' ' + value.toLocaleString(this.mode.lang, {timeStyle: 'short'}));
                 this._ShowHideInfoItem(this.lblDate, !!value);
             }
         },
@@ -853,7 +853,7 @@ define([
                 var visible = false;
                 value = props.asc_getModified();
                 if (value)
-                    this.lblModifyDate.text(value.toLocaleString());
+                    this.lblModifyDate.text(value.toLocaleString(this.mode.lang, {year: 'numeric', month: '2-digit', day: '2-digit'}) + ' ' + value.toLocaleString(this.mode.lang, {timeStyle: 'short'}));
                 visible = this._ShowHideInfoItem(this.lblModifyDate, !!value) || visible;
                 value = props.asc_getLastModifiedBy();
                 if (value)
diff --git a/apps/presentationeditor/main/app/view/ParagraphSettingsAdvanced.js b/apps/presentationeditor/main/app/view/ParagraphSettingsAdvanced.js
index 67a59a72a..21d23d1a8 100644
--- a/apps/presentationeditor/main/app/view/ParagraphSettingsAdvanced.js
+++ b/apps/presentationeditor/main/app/view/ParagraphSettingsAdvanced.js
@@ -210,7 +210,7 @@ define([    'text!presentationeditor/main/app/template/ParagraphSettingsAdvanced
                     var properties = (this._originalProps) ? this._originalProps : new Asc.asc_CParagraphProperty();
                     this.Spacing = properties.get_Spacing();
                 }
-                this.Spacing.Before = Common.Utils.Metric.fnRecalcToMM(field.getNumberValue());
+                this.Spacing.put_Before(Common.Utils.Metric.fnRecalcToMM(field.getNumberValue()));
             }, this));
             this.spinners.push(this.numSpacingBefore);
 
@@ -230,7 +230,7 @@ define([    'text!presentationeditor/main/app/template/ParagraphSettingsAdvanced
                     var properties = (this._originalProps) ? this._originalProps : new Asc.asc_CParagraphProperty();
                     this.Spacing = properties.get_Spacing();
                 }
-                this.Spacing.After = Common.Utils.Metric.fnRecalcToMM(field.getNumberValue());
+                this.Spacing.put_After(Common.Utils.Metric.fnRecalcToMM(field.getNumberValue()));
             }, this));
             this.spinners.push(this.numSpacingAfter);
 
@@ -745,14 +745,14 @@ define([    'text!presentationeditor/main/app/template/ParagraphSettingsAdvanced
                 var properties = (this._originalProps) ? this._originalProps : new Asc.asc_CParagraphProperty();
                 this.Spacing = properties.get_Spacing();
             }
-            this.Spacing.LineRule = record.value;
+            this.Spacing.put_LineRule(record.value);
             var selectItem = _.findWhere(this._arrLineRule, {value: record.value}),
                 indexSelectItem = this._arrLineRule.indexOf(selectItem);
             if ( this.CurLineRuleIdx !== indexSelectItem ) {
                 this.numLineHeight.setDefaultUnit(this._arrLineRule[indexSelectItem].defaultUnit);
                 this.numLineHeight.setMinValue(this._arrLineRule[indexSelectItem].minValue);
                 this.numLineHeight.setStep(this._arrLineRule[indexSelectItem].step);
-                if (this.Spacing.LineRule === c_paragraphLinerule.LINERULE_AUTO) {
+                if (this.Spacing.get_LineRule() === c_paragraphLinerule.LINERULE_AUTO) {
                     this.numLineHeight.setValue(this._arrLineRule[indexSelectItem].defaultValue);
                 } else {
                     this.numLineHeight.setValue(Common.Utils.Metric.fnRecalcFromMM(this._arrLineRule[indexSelectItem].defaultValue));
@@ -768,7 +768,7 @@ define([    'text!presentationeditor/main/app/template/ParagraphSettingsAdvanced
                 var properties = (this._originalProps) ? this._originalProps : new Asc.asc_CParagraphProperty();
                 this.Spacing = properties.get_Spacing();
             }
-            this.Spacing.Line = (this.cmbLineRule.getValue()==c_paragraphLinerule.LINERULE_AUTO) ? field.getNumberValue() : Common.Utils.Metric.fnRecalcToMM(field.getNumberValue());
+            this.Spacing.put_Line((this.cmbLineRule.getValue()==c_paragraphLinerule.LINERULE_AUTO) ? field.getNumberValue() : Common.Utils.Metric.fnRecalcToMM(field.getNumberValue()));
         },
 
         textTitle:      'Paragraph - Advanced Settings',
diff --git a/apps/presentationeditor/main/app/view/Statusbar.js b/apps/presentationeditor/main/app/view/Statusbar.js
index bc1f27ab4..80480d35c 100644
--- a/apps/presentationeditor/main/app/view/Statusbar.js
+++ b/apps/presentationeditor/main/app/view/Statusbar.js
@@ -254,7 +254,7 @@ define([
                     restoreHeight: 285,
                     itemTemplate: _.template([
                         '<a id="<%= id %>" tabindex="-1" type="menuitem" style="padding-left: 28px !important;" langval="<%= value.value %>" class="<% if (checked) { %> checked <% } %>">',
-                        '<i class="icon <% if (spellcheck) { %> img-toolbarmenu spellcheck-lang <% } %>"></i>',
+                        '<i class="icon <% if (spellcheck) { %> toolbar__icon btn-ic-docspell spellcheck-lang <% } %>"></i>',
                         '<%= caption %>',
                         '</a>'
                     ].join('')),
diff --git a/apps/presentationeditor/main/app/view/Toolbar.js b/apps/presentationeditor/main/app/view/Toolbar.js
index ee7c56ce9..9b43161e4 100644
--- a/apps/presentationeditor/main/app/view/Toolbar.js
+++ b/apps/presentationeditor/main/app/view/Toolbar.js
@@ -1466,7 +1466,7 @@ define([
                 var me = this;
                 if (!me.binding.onShowBeforeAddSlide) {
                     me.binding.onShowBeforeAddSlide = function(menu) {
-                        var change = (this.iconCls == 'btn-changeslide');
+                        var change = (this.iconCls.indexOf('btn-changeslide')>-1);
                         var picker = new Common.UI.DataView({
                             el: $('.menu-layouts', menu.$el),
                             parentMenu: menu,
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/btn-presenter-view.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/btn-presenter-view.png
new file mode 100644
index 000000000..a9f145c3c
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/btn-presenter-view.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/btn-preview-exit-fullscreen.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/btn-preview-exit-fullscreen.png
new file mode 100644
index 000000000..1bcb2906f
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/btn-preview-exit-fullscreen.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/btn-preview-fullscreen.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/btn-preview-fullscreen.png
new file mode 100644
index 000000000..f16be7431
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/btn-preview-fullscreen.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/btn-preview-pause.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/btn-preview-pause.png
new file mode 100644
index 000000000..d52494e04
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/btn-preview-pause.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/btn-preview-play.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/btn-preview-play.png
new file mode 100644
index 000000000..65ce6b421
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/btn-preview-play.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/btn-presenter-view.png b/apps/presentationeditor/main/resources/img/toolbar/1x/btn-presenter-view.png
new file mode 100644
index 000000000..dfdb88145
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1x/btn-presenter-view.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/btn-preview-exit-fullscreen.png b/apps/presentationeditor/main/resources/img/toolbar/1x/btn-preview-exit-fullscreen.png
new file mode 100644
index 000000000..ff528b8df
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1x/btn-preview-exit-fullscreen.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/btn-preview-fullscreen.png b/apps/presentationeditor/main/resources/img/toolbar/1x/btn-preview-fullscreen.png
new file mode 100644
index 000000000..a411a7698
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1x/btn-preview-fullscreen.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/btn-preview-pause.png b/apps/presentationeditor/main/resources/img/toolbar/1x/btn-preview-pause.png
new file mode 100644
index 000000000..2794a6e63
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1x/btn-preview-pause.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/btn-preview-play.png b/apps/presentationeditor/main/resources/img/toolbar/1x/btn-preview-play.png
new file mode 100644
index 000000000..e6f581666
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1x/btn-preview-play.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/btn-presenter-view.png b/apps/presentationeditor/main/resources/img/toolbar/2x/btn-presenter-view.png
new file mode 100644
index 000000000..b7f3919f6
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/2x/btn-presenter-view.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/btn-preview-exit-fullscreen.png b/apps/presentationeditor/main/resources/img/toolbar/2x/btn-preview-exit-fullscreen.png
new file mode 100644
index 000000000..2a3c91b07
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/2x/btn-preview-exit-fullscreen.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/btn-preview-fullscreen.png b/apps/presentationeditor/main/resources/img/toolbar/2x/btn-preview-fullscreen.png
new file mode 100644
index 000000000..8062b1a76
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/2x/btn-preview-fullscreen.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/btn-preview-pause.png b/apps/presentationeditor/main/resources/img/toolbar/2x/btn-preview-pause.png
new file mode 100644
index 000000000..b5a76ded1
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/2x/btn-preview-pause.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/btn-preview-play.png b/apps/presentationeditor/main/resources/img/toolbar/2x/btn-preview-play.png
new file mode 100644
index 000000000..0dcae4a6c
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/2x/btn-preview-play.png differ
diff --git a/apps/presentationeditor/main/resources/less/document-preview.less b/apps/presentationeditor/main/resources/less/document-preview.less
index dc6160cfb..8587861dc 100644
--- a/apps/presentationeditor/main/resources/less/document-preview.less
+++ b/apps/presentationeditor/main/resources/less/document-preview.less
@@ -27,39 +27,9 @@
 
     #btn-preview-prev {
         margin-left: 10px;
-        .btn-tpl(-1240px);
-    }
-    #btn-preview-next {
-        .btn-tpl(-1260px);
-    }
-    #btn-preview-play {
-        .btn-tpl(-1280px);
-
-        .icon.btn-pause {
-            background-position: 0 -1320px;
-
-            &:active {
-                background-position: -20px -1320px;
-            }
-        }
-
-        &[disabled] .icon.btn-pause {
-            background-position: -60px -1320px;
-        }
-
-        &.active {
-            .icon.btn-pause {
-                background-position: -20px -1320px;
-            }
-        }
     }
     #btn-preview-close {
         margin-right: 10px;
-        .btn-tpl(-1300px);
-    }
-
-    #btn-preview-fullscreen {
-        .btn-tpl(-1440px);
     }
 
     .separator {
@@ -86,9 +56,3 @@
           }
     }
 }
-
-:-webkit-full-screen #btn-preview-fullscreen{ .btn-tpl(-1420px); }
-:-moz-full-screen #btn-preview-fullscreen   { .btn-tpl(-1420px); }
-:-ms-fullscreen #btn-preview-fullscreen     { .btn-tpl(-1420px); }
-:fullscreen #btn-preview-fullscreen         { .btn-tpl(-1420px); }
-#btn-preview-fullscreen.fullscreen     { .btn-tpl(-1420px); }
diff --git a/apps/presentationeditor/mobile/app/controller/Settings.js b/apps/presentationeditor/mobile/app/controller/Settings.js
index c8efc0556..e034693f2 100644
--- a/apps/presentationeditor/mobile/app/controller/Settings.js
+++ b/apps/presentationeditor/mobile/app/controller/Settings.js
@@ -57,7 +57,8 @@ define([
             infoObj,
             modalView,
             _licInfo,
-            templateInsert;
+            templateInsert,
+            _lang;
 
         var _slideSizeArr = [
             [254, 190.5], [254, 143]
@@ -96,6 +97,7 @@ define([
                 this.getView('Settings').setMode(mode);
                 if (mode.canBranding)
                     _licInfo = mode.customization;
+                _lang = mode.lang;
             },
 
             initEvents: function () {
@@ -221,11 +223,11 @@ define([
                     value = props.asc_getDescription();
                     value ? $('#settings-pe-comment').html(value) : $('.display-comment').remove();
                     value = props.asc_getModified();
-                    value ? $('#settings-pe-last-mod').html(value.toLocaleString()) : $('.display-last-mode').remove();
+                    value ? $('#settings-pe-last-mod').html(value.toLocaleString(_lang, {year: 'numeric', month: '2-digit', day: '2-digit'}) + ' ' + value.toLocaleString(_lang, {timeStyle: 'short'})) : $('.display-last-mode').remove();
                     value = props.asc_getLastModifiedBy();
                     value ? $('#settings-pe-mod-by').html(value) : $('.display-mode-by').remove();
                     value = props.asc_getCreated();
-                    value ? $('#settings-pe-date').html(value.toLocaleString()) : $('.display-created-date').remove();
+                    value ? $('#settings-pe-date').html(value.toLocaleString(_lang, {year: 'numeric', month: '2-digit', day: '2-digit'}) + ' ' + value.toLocaleString(_lang, {timeStyle: 'short'})) : $('.display-created-date').remove();
                     value = props.asc_getCreator();
                     var templateCreator = "";
                     value && value.split(/\s*[,;]\s*/).forEach(function(item) {
diff --git a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js
index e4b1b96e8..c62edcc75 100644
--- a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js
+++ b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js
@@ -2278,7 +2278,7 @@ define([
 
                 me.btnSpecialPaste = new Common.UI.Button({
                     cls         : 'btn-toolbar',
-                    iconCls     : 'btn-paste',
+                    iconCls     : 'toolbar__icon btn-paste',
                     menu        : new Common.UI.Menu({items: []})
                 });
                 me.btnSpecialPaste.render($('#id-document-holder-btn-special-paste')) ;
@@ -2424,7 +2424,7 @@ define([
 
                 me.btnAutoCorrectPaste = new Common.UI.Button({
                     cls         : 'btn-toolbar',
-                    iconCls     : 'btn-paste',
+                    iconCls     : 'toolbar__icon btn-paste',
                     menu        : new Common.UI.Menu({items: []})
                 });
                 me.btnAutoCorrectPaste.render($('#id-document-holder-btn-autocorrect-paste')) ;
diff --git a/apps/spreadsheeteditor/main/app/controller/LeftMenu.js b/apps/spreadsheeteditor/main/app/controller/LeftMenu.js
index 5720d7559..1a34fbb57 100644
--- a/apps/spreadsheeteditor/main/app/controller/LeftMenu.js
+++ b/apps/spreadsheeteditor/main/app/controller/LeftMenu.js
@@ -387,8 +387,17 @@ define([
                 this.api.asc_setAutoSaveGap(value);
             }
 
-            value = Common.localStorage.getItem("sse-settings-reg-settings");
-            if (value!==null) this.api.asc_setLocale(parseInt(value));
+            var reg = Common.localStorage.getItem("sse-settings-reg-settings"),
+                baseRegSettings = Common.Utils.InternalSettings.get("sse-settings-use-base-separator");
+            if (reg === null) {
+                reg = this.api.asc_getLocale();
+            }
+            if (baseRegSettings) {
+                this.api.asc_setLocale(parseInt(reg), undefined, undefined);
+            }
+            else {
+                this.api.asc_setLocale(parseInt(reg), Common.localStorage.getItem("sse-settings-decimal-separator"), Common.localStorage.getItem("sse-settings-group-separator"));
+            }
 
             menu.hide();
 
diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js
index 8ac7e05aa..065e93958 100644
--- a/apps/spreadsheeteditor/main/app/controller/Main.js
+++ b/apps/spreadsheeteditor/main/app/controller/Main.js
@@ -345,20 +345,28 @@ define([
                 this.headerView.setCanBack(this.appOptions.canBackToFolder === true, (this.appOptions.canBackToFolder) ? this.editorConfig.customization.goback.text : '')
                                 .setUserName(this.appOptions.user.fullname);
 
-                var value = Common.localStorage.getItem("sse-settings-reg-settings");
-                if (value!==null)
-                    this.api.asc_setLocale(parseInt(value));
+                var reg = Common.localStorage.getItem("sse-settings-reg-settings"),
+                    isUseBaseSeparator = Common.localStorage.getBool("sse-settings-use-base-separator", true),
+                    decimal = undefined,
+                    group = undefined;
+                Common.Utils.InternalSettings.set("sse-settings-use-base-separator", isUseBaseSeparator);
+                if (!isUseBaseSeparator) {
+                    decimal = Common.localStorage.getItem("sse-settings-decimal-separator");
+                    group = Common.localStorage.getItem("sse-settings-group-separator");
+                }
+                if (reg!==null)
+                    this.api.asc_setLocale(parseInt(reg), decimal, group);
                 else {
-                    value = this.appOptions.region;
-                    value = Common.util.LanguageInfo.getLanguages().hasOwnProperty(value) ? value : Common.util.LanguageInfo.getLocalLanguageCode(value);
-                    if (value!==null)
-                        value = parseInt(value);
+                    reg = this.appOptions.region;
+                    reg = Common.util.LanguageInfo.getLanguages().hasOwnProperty(reg) ? reg : Common.util.LanguageInfo.getLocalLanguageCode(reg);
+                    if (reg!==null)
+                        reg = parseInt(reg);
                     else
-                        value = (this.editorConfig.lang) ? parseInt(Common.util.LanguageInfo.getLocalLanguageCode(this.editorConfig.lang)) : 0x0409;
-                    this.api.asc_setLocale(value);
+                        reg = (this.editorConfig.lang) ? parseInt(Common.util.LanguageInfo.getLocalLanguageCode(this.editorConfig.lang)) : 0x0409;
+                    this.api.asc_setLocale(reg, decimal, group);
                 }
 
-                value = Common.localStorage.getBool("sse-settings-r1c1");
+                var value = Common.localStorage.getBool("sse-settings-r1c1");
                 Common.Utils.InternalSettings.set("sse-settings-r1c1", value);
                 this.api.asc_setR1C1Mode(value);
 
diff --git a/apps/spreadsheeteditor/main/app/template/SortDialog.template b/apps/spreadsheeteditor/main/app/template/SortDialog.template
index d4f8168b9..f06364964 100644
--- a/apps/spreadsheeteditor/main/app/template/SortDialog.template
+++ b/apps/spreadsheeteditor/main/app/template/SortDialog.template
@@ -13,8 +13,8 @@
             </tr>
             <tr>
                 <td>
-                    <label id="sort-dialog-label-column" class="header" style="width: 156px;"><%= scope.textColumn %></label>
-                    <label class="header" style="width: 152px;"><%= scope.textSort %></label>
+                    <label id="sort-dialog-label-column" class="header" style="width: 243px;"><%= scope.textColumn %></label>
+                    <label id="sort-dialog-label-sort" class="header" style="width: 141px;"><%= scope.textSort %></label>
                     <label class="header" style=""><%= scope.textOrder %></label>
                 </td>
             </tr>
diff --git a/apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js b/apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js
index 23bae9a5f..ff7d3fc29 100644
--- a/apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js
+++ b/apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js
@@ -758,14 +758,8 @@ define([
                     itemTemplate: _.template([
                         '<div>',
                             '<label class="checkbox-indeterminate" style="position:absolute;">',
-                                '<% if (check=="indeterminate") { %>',
-                                    '<input type="button" class="indeterminate button__checkbox">',
-                                '<% } else if (check) { %>',
-                                    '<input type="button" class="checked button__checkbox">',
-                                '<% } else { %>',
-                                    '<input type="button" class="button__checkbox">',
-                                '<% } %>',
-                                '<span class="checkmark"/>',
+                                '<input id="afcheckbox-<%= id %>" type="checkbox" class="button__checkbox">',
+                                '<label for="afcheckbox-<%= id %>" class="checkbox__shape" />',
                             '</label>',
                             '<div id="<%= id %>" class="list-item" style="pointer-events:none; margin-left: 20px;display: flex;">',
                                 '<div style="flex-grow: 1;"><%= Common.Utils.String.htmlEncode(value) %></div>',
@@ -791,7 +785,11 @@ define([
                     if (n1==n2) return 0;
                     return (n2=='' || n1!=='' && n1<n2) ? -1 : 1;
                 };
-                this.cellsList.on('item:select', _.bind(this.onCellCheck, this));
+                this.cellsList.on({
+                    'item:change': this.onItemChanged.bind(this),
+                    'item:add': this.onItemChanged.bind(this),
+                    'item:select': this.onCellCheck.bind(this)
+                });
                 this.cellsList.onKeyDown = _.bind(this.onListKeyDown, this);
             }
 
@@ -999,11 +997,10 @@ define([
             if (this.checkCellTrigerBlock)
                 return;
 
-            var target = '', type = '', isLabel = false, bound = null;
+            var target = '', isLabel = false, bound = null;
 
             var event = window.event ? window.event : window._event;
             if (event) {
-                type = event.target.type;
                 target = $(event.currentTarget).find('.list-item');
 
                 if (target.length) {
@@ -1016,7 +1013,7 @@ define([
                     }
                 }
 
-                if (type === 'button' || isLabel || event.target.className.match('checkmark')) {
+                if (isLabel || event.target.className.match('checkbox')) {
                     this.updateCellCheck(listView, record);
 
                     _.delay(function () {
@@ -1044,7 +1041,7 @@ define([
 
         updateCellCheck: function (listView, record) {
             if (record && listView) {
-                listView.isSuspendEvents = true;
+                // listView.isSuspendEvents = true;
 
                 var check = !record.get('check'),
                     me = this,
@@ -1077,7 +1074,7 @@ define([
                 this.btnOk.setDisabled(false);
                 this.configTo.asc_getFilterObj().asc_setType(Asc.c_oAscAutoFilterTypes.Filters);
 
-                listView.isSuspendEvents = false;
+                // listView.isSuspendEvents = false;
                 listView.scroller.update({minScrollbarLength  : 40, alwaysVisibleY: true, suppressScrollX: true});
             }
         },
@@ -1400,6 +1397,13 @@ define([
             Common.Utils.InternalSettings.set('sse-settings-size-filter-window', size);
         },
 
+        onItemChanged: function (view, record) {
+            var state = record.model.get('check');
+            if ( state == 'indeterminate' )
+                $('input[type=checkbox]', record.$el).prop('indeterminate', true);
+            else $('input[type=checkbox]', record.$el).prop({checked: state, indeterminate: false});
+        },
+
         btnCustomFilter     : 'Custom Filter',
         textSelectAll       : 'Select All',
         txtTitle            : 'Filter',
diff --git a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js
index 07218e341..f9675c37b 100644
--- a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js
+++ b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js
@@ -595,6 +595,18 @@ define([
                         '<div><div id="fms-cmb-reg-settings" style="display: inline-block; margin-right: 15px;vertical-align: middle;"/>',
                         '<label id="fms-lbl-reg-settings" style="vertical-align: middle;"></label></div></td>',
                 '</tr>','<tr class="divider edit"></tr>',
+                '<tr class="edit">',
+                    '<td class="left"><label><%= scope.strSeparator %></label></td>',
+                    '<td class="right"><div id="fms-chb-separator-settings"/></td>',
+                '</tr>',
+                '<tr class="edit">',
+                    '<td class="left"></td>',
+                    '<td class="right"><div id="fms-decimal-separator"/><label class="label-separator" style="margin-left: 10px; padding-top: 4px;"><%= scope.strDecimalSeparator %></label></td>',
+                '</tr>',
+                '<tr class="edit">',
+                    '<td class="left"></td>',
+                    '<td class="right"><div id="fms-thousands-separator"/><label class="label-separator" style="margin-left: 10px; padding-top: 4px;"><%= scope.strThousandsSeparator %></label></td>',
+                '</tr>','<tr class="divider edit"></tr>',
                 '<tr>',
                     '<td class="left"></td>',
                     '<td class="right"><button id="fms-btn-apply" class="btn normal dlg-btn primary"><%= scope.okButtonText %></button></td>',
@@ -761,9 +773,61 @@ define([
                     '</span>'].join(''))
             }).on('selected', function(combo, record) {
                 me.updateRegionalExample(record.value);
+                var isBaseSettings = me.chSeparator.getValue();
+                if (isBaseSettings === 'checked') {
+                    me.inputDecimalSeparator.setValue(me.api.asc_getDecimalSeparator(record.value), true);
+                    me.inputThousandsSeparator.setValue(me.api.asc_getGroupSeparator(record.value), true);
+                }
             });
             if (this.cmbRegSettings.scroller) this.cmbRegSettings.scroller.update({alwaysVisibleY: true});
 
+            this.chSeparator = new Common.UI.CheckBox({
+                el: $markup.findById('#fms-chb-separator-settings'),
+                labelText: this.strUseSeparatorsBasedOnRegionalSettings
+            }).on('change', _.bind(function(field, newValue, oldValue, eOpts){
+                var checked = field.getValue() === 'checked';
+                if (checked) {
+                    var lang = this.cmbRegSettings.getValue(),
+                        decimal = this.api.asc_getDecimalSeparator(_.isNumber(lang) ? lang : undefined),
+                        group = this.api.asc_getGroupSeparator(_.isNumber(lang) ? lang : undefined);
+                    this.inputDecimalSeparator.setValue(decimal);
+                    this.inputThousandsSeparator.setValue(group);
+                }
+                this.inputDecimalSeparator.setDisabled(checked);
+                this.inputThousandsSeparator.setDisabled(checked);
+                if (checked) {
+                    this.$el.find('.label-separator').addClass('disabled');
+                } else {
+                    this.$el.find('.label-separator').removeClass('disabled');
+                }
+            }, this));
+
+            var keyDown = function(event){
+                var key = event.key,
+                    value = event.target.value;
+                if (key !== 'ArrowLeft' && key !== 'ArrowDown' && key !== 'ArrowUp' && key !== 'ArrowRight' &&
+                    key !== 'Home' && key !== 'End' && key !== 'Backspace' && key !== 'Delete' && value.length > 0 &&
+                    event.target.selectionEnd - event.target.selectionStart === 0) {
+                    event.preventDefault();
+                }
+            };
+
+            this.inputDecimalSeparator = new Common.UI.InputField({
+                el: $markup.findById('#fms-decimal-separator'),
+                style: 'width: 35px;',
+                validateOnBlur: false
+            });
+            var $decimalSeparatorInput = this.inputDecimalSeparator.$el.find('input');
+            $decimalSeparatorInput.on('keydown', keyDown);
+
+            this.inputThousandsSeparator = new Common.UI.InputField({
+                el: $markup.findById('#fms-thousands-separator'),
+                style: 'width: 35px;',
+                validateOnBlur: false
+            });
+            var $thousandsSeparatorInput = this.inputThousandsSeparator.$el.find('input');
+            $thousandsSeparatorInput.on('keydown', keyDown);
+
             this.btnApply = new Common.UI.Button({
                 el: $markup.findById('#fms-btn-apply')
             });
@@ -855,6 +919,28 @@ define([
                 this.cmbRegSettings.setValue(Common.util.LanguageInfo.getLocalLanguageName(value)[1]);
             }
             this.updateRegionalExample(value);
+
+            var isBaseSettings = Common.Utils.InternalSettings.get("sse-settings-use-base-separator");
+            this.chSeparator.setValue(isBaseSettings, true);
+            var decimal,
+                group;
+            if (!isBaseSettings) {
+                decimal = Common.Utils.InternalSettings.get("sse-settings-decimal-separator") || this.api.asc_getDecimalSeparator();
+                group = Common.Utils.InternalSettings.get("sse-settings-group-separator") || this.api.asc_getGroupSeparator();
+            } else {
+                var lang = this.cmbRegSettings.getValue();
+                decimal = this.api.asc_getDecimalSeparator(_.isNumber(lang) ? lang : undefined);
+                group = this.api.asc_getGroupSeparator(_.isNumber(lang) ? lang : undefined);
+            }
+            this.inputDecimalSeparator.setValue(decimal);
+            this.inputThousandsSeparator.setValue(group);
+            this.inputDecimalSeparator.setDisabled(isBaseSettings);
+            this.inputThousandsSeparator.setDisabled(isBaseSettings);
+            if (isBaseSettings) {
+                this.$el.find('.label-separator').addClass('disabled');
+            } else {
+                this.$el.find('.label-separator').removeClass('disabled');
+            }
         },
 
         applySettings: function() {
@@ -876,6 +962,23 @@ define([
             if (this.cmbRegSettings.getSelectedRecord())
                 Common.localStorage.setItem("sse-settings-reg-settings", this.cmbRegSettings.getValue());
 
+            var value,
+                isChecked = this.chSeparator.isChecked();
+            if (!isChecked) {
+                value = this.inputDecimalSeparator.getValue();
+                if (value.length > 0) {
+                    Common.localStorage.setItem("sse-settings-decimal-separator", value);
+                    Common.Utils.InternalSettings.set("sse-settings-decimal-separator", value);
+                }
+                value = this.inputThousandsSeparator.getValue();
+                if (value.length > 0) {
+                    Common.localStorage.setItem("sse-settings-group-separator", value);
+                    Common.Utils.InternalSettings.set("sse-settings-group-separator", value);
+                }
+            }
+            Common.localStorage.setBool("sse-settings-use-base-separator", isChecked);
+            Common.Utils.InternalSettings.set("sse-settings-use-base-separator", isChecked);
+
             Common.localStorage.save();
             if (this.menu) {
                 this.menu.fireEvent('settings:apply', [this.menu]);
@@ -955,7 +1058,11 @@ define([
         strForcesave: 'Always save to server (otherwise save to server on document close)',
         strResolvedComment: 'Turn on display of the resolved comments',
         textRefStyle: 'Reference Style',
-        strR1C1: 'Turn on R1C1 style'
+        strR1C1: 'Turn on R1C1 style',
+        strSeparator: 'Separator',
+        strUseSeparatorsBasedOnRegionalSettings: 'Use separators based on regional settings',
+        strDecimalSeparator: 'Decimal separator',
+        strThousandsSeparator: 'Thousands separator'
     }, SSE.Views.FileMenuPanels.MainSettingsGeneral || {}));
 
     SSE.Views.FileMenuPanels.MainSpellCheckSettings = Common.UI.BaseView.extend(_.extend({
@@ -1469,7 +1576,7 @@ define([
             if (this.coreProps) {
                 var value = this.coreProps.asc_getCreated();
                 if (value)
-                    this.lblDate.text(value.toLocaleString());
+                    this.lblDate.text(value.toLocaleString(this.mode.lang, {year: 'numeric', month: '2-digit', day: '2-digit'}) + ' ' + value.toLocaleString(this.mode.lang, {timeStyle: 'short'}));
                 this._ShowHideInfoItem(this.lblDate, !!value);
             }
         },
@@ -1495,7 +1602,7 @@ define([
                 var visible = false;
                 value = props.asc_getModified();
                 if (value)
-                    this.lblModifyDate.text(value.toLocaleString());
+                    this.lblModifyDate.text(value.toLocaleString(this.mode.lang, {year: 'numeric', month: '2-digit', day: '2-digit'}) + ' ' + value.toLocaleString(this.mode.lang, {timeStyle: 'short'}));
                 visible = this._ShowHideInfoItem(this.lblModifyDate, !!value) || visible;
                 value = props.asc_getLastModifiedBy();
                 if (value)
diff --git a/apps/spreadsheeteditor/main/app/view/NameManagerDlg.js b/apps/spreadsheeteditor/main/app/view/NameManagerDlg.js
index 16c0588e3..175d3dd24 100644
--- a/apps/spreadsheeteditor/main/app/view/NameManagerDlg.js
+++ b/apps/spreadsheeteditor/main/app/view/NameManagerDlg.js
@@ -121,7 +121,7 @@ define([  'text!spreadsheeteditor/main/app/template/NameManagerDlg.template',
                 template: _.template(['<div class="listview inner" style=""></div>'].join('')),
                 itemTemplate: _.template([
                         '<div id="<%= id %>" class="list-item" style="width: 100%;display:inline-block;<% if (!lock) { %>pointer-events:none;<% } %>">',
-                            '<div class="listitem-icon <% if (isTable) {%>listitem-table<%} %>"></div>',
+                            '<div class="listitem-icon toolbar__icon <% print(isTable?"btn-menu-table":"btn-named-range") %>"></div>',
                             '<div style="width:141px;padding-right: 5px;"><%= name %></div>',
                             '<div style="width:94px;padding-right: 5px;"><%= scopeName %></div>',
                             '<div style="width:212px;"><%= range %></div>',
diff --git a/apps/spreadsheeteditor/main/app/view/ParagraphSettingsAdvanced.js b/apps/spreadsheeteditor/main/app/view/ParagraphSettingsAdvanced.js
index ca324c36e..61c6d67f1 100644
--- a/apps/spreadsheeteditor/main/app/view/ParagraphSettingsAdvanced.js
+++ b/apps/spreadsheeteditor/main/app/view/ParagraphSettingsAdvanced.js
@@ -210,7 +210,7 @@ define([    'text!spreadsheeteditor/main/app/template/ParagraphSettingsAdvanced.
                     var properties = (this._originalProps) ? this._originalProps : new Asc.asc_CParagraphProperty();
                     this.Spacing = properties.asc_getSpacing();
                 }
-                this.Spacing.Before = Common.Utils.Metric.fnRecalcToMM(field.getNumberValue());
+                this.Spacing.put_Before(Common.Utils.Metric.fnRecalcToMM(field.getNumberValue()));
             }, this));
             this.spinners.push(this.numSpacingBefore);
 
@@ -230,7 +230,7 @@ define([    'text!spreadsheeteditor/main/app/template/ParagraphSettingsAdvanced.
                     var properties = (this._originalProps) ? this._originalProps : new Asc.asc_CParagraphProperty();
                     this.Spacing = properties.asc_getSpacing();
                 }
-                this.Spacing.After = Common.Utils.Metric.fnRecalcToMM(field.getNumberValue());
+                this.Spacing.put_After(Common.Utils.Metric.fnRecalcToMM(field.getNumberValue()));
             }, this));
             this.spinners.push(this.numSpacingAfter);
 
@@ -748,14 +748,14 @@ define([    'text!spreadsheeteditor/main/app/template/ParagraphSettingsAdvanced.
                 var properties = (this._originalProps) ? this._originalProps : new Asc.asc_CParagraphProperty();
                 this.Spacing = properties.asc_getSpacing();
             }
-            this.Spacing.LineRule = record.value;
+            this.Spacing.put_LineRule(record.value);
             var selectItem = _.findWhere(this._arrLineRule, {value: record.value}),
                 indexSelectItem = this._arrLineRule.indexOf(selectItem);
             if ( this.CurLineRuleIdx !== indexSelectItem ) {
                 this.numLineHeight.setDefaultUnit(this._arrLineRule[indexSelectItem].defaultUnit);
                 this.numLineHeight.setMinValue(this._arrLineRule[indexSelectItem].minValue);
                 this.numLineHeight.setStep(this._arrLineRule[indexSelectItem].step);
-                if (this.Spacing.LineRule === c_paragraphLinerule.LINERULE_AUTO) {
+                if (this.Spacing.get_LineRule() === c_paragraphLinerule.LINERULE_AUTO) {
                     this.numLineHeight.setValue(this._arrLineRule[indexSelectItem].defaultValue);
                 } else {
                     this.numLineHeight.setValue(Common.Utils.Metric.fnRecalcFromMM(this._arrLineRule[indexSelectItem].defaultValue));
@@ -771,7 +771,7 @@ define([    'text!spreadsheeteditor/main/app/template/ParagraphSettingsAdvanced.
                 var properties = (this._originalProps) ? this._originalProps : new Asc.asc_CParagraphProperty();
                 this.Spacing = properties.asc_getSpacing();
             }
-            this.Spacing.Line = (this.cmbLineRule.getValue()==c_paragraphLinerule.LINERULE_AUTO) ? field.getNumberValue() : Common.Utils.Metric.fnRecalcToMM(field.getNumberValue());
+            this.Spacing.put_Line((this.cmbLineRule.getValue()==c_paragraphLinerule.LINERULE_AUTO) ? field.getNumberValue() : Common.Utils.Metric.fnRecalcToMM(field.getNumberValue()));
         },
 
         textTitle:      'Paragraph - Advanced Settings',
diff --git a/apps/spreadsheeteditor/main/app/view/SortDialog.js b/apps/spreadsheeteditor/main/app/view/SortDialog.js
index f80251533..255baed32 100644
--- a/apps/spreadsheeteditor/main/app/view/SortDialog.js
+++ b/apps/spreadsheeteditor/main/app/view/SortDialog.js
@@ -74,7 +74,7 @@ define([  'text!spreadsheeteditor/main/app/template/SortDialog.template',
 
         options: {
             alias: 'SortDialog',
-            contentWidth: 500,
+            contentWidth: 560,
             height: 294,
             buttons: ['ok', 'cancel']
         },
@@ -112,6 +112,14 @@ define([  'text!spreadsheeteditor/main/app/template/SortDialog.template',
             Common.Views.AdvancedSettingsWindow.prototype.render.call(this);
             var me = this;
 
+            var span = $('<span style="position: absolute; visibility: hidden;"/>');
+            me.$window.append(span);
+            span.text(this.textSortBy);
+            var captionWidth = span.width();
+            span.text(this.textThenBy);
+            captionWidth = Math.ceil(Math.max(captionWidth, span.width()))+10;
+            span.remove();
+
             this.sortList = new Common.UI.ListView({
                 el: $('#sort-dialog-list', this.$window),
                 store: new Common.UI.DataViewStore(),
@@ -119,15 +127,18 @@ define([  'text!spreadsheeteditor/main/app/template/SortDialog.template',
                 enableKeyEvents: false,
                 template: _.template(['<div class="listview inner" style=""></div>'].join('')),
                 itemTemplate: _.template([
-                        '<div class="list-item" style="width: 100%;display:inline-block;" id="sort-dialog-item-<%= levelIndex %>">',
-                            '<div style="width:33%;padding-right: 5px;display: inline-block;vertical-align: top;"><div id="sort-dialog-cmb-col-<%= levelIndex %>" class="input-group-nr"></div></div>',
-                            '<div style="width:33%;padding-right: 5px;display: inline-block;vertical-align: top;"><div id="sort-dialog-cmb-sort-<%= levelIndex %>" class="input-group-nr"></div></div>',
-                            '<% if (sort==Asc.c_oAscSortOptions.ByColorFill || sort==Asc.c_oAscSortOptions.ByColorFont) { %>',
-                                '<div style="width:17%;display: inline-block;vertical-align: top;"><div id="sort-dialog-btn-color-<%= levelIndex %>" class="input-group-nr"></div></div>',
-                                '<div style="width:17%;padding-left: 5px;display: inline-block;vertical-align: top;"><div id="sort-dialog-cmb-order-<%= levelIndex %>" class="input-group-nr" style="display: inline-block;"></div></div>',
-                            '<% } else { %>',
-                                '<div style="width:34%;display: inline-block;vertical-align: top;"><div id="sort-dialog-cmb-order-<%= levelIndex %>" class="input-group-nr" style="display: inline-block;"></div></div>',
-                            '<% } %>',
+                        '<div class="list-item" style="width: 100%;display: flex;align-items:center;" id="sort-dialog-item-<%= levelIndex %>">',
+                            '<label class="level-caption" style="padding-right: 5px;width: ' + captionWidth + 'px;flex-shrink:0;cursor: pointer;"></label>',
+                            '<div style="display:inline-block;flex-grow: 1;">',
+                                '<div style="width: 33%;padding: 0 5px;display: inline-block;vertical-align: top;"><div id="sort-dialog-cmb-col-<%= levelIndex %>" class="input-group-nr" style=""></div></div>',
+                                '<div style="width: 33%;padding: 0 5px;display: inline-block;vertical-align: top;"><div id="sort-dialog-cmb-sort-<%= levelIndex %>" class="input-group-nr"></div></div>',
+                                '<% if (sort==Asc.c_oAscSortOptions.ByColorFill || sort==Asc.c_oAscSortOptions.ByColorFont) { %>',
+                                    '<div style="width: 17%;padding: 0 5px;display: inline-block;vertical-align: top;"><div id="sort-dialog-btn-color-<%= levelIndex %>" class="input-group-nr"></div></div>',
+                                    '<div style="width: 17%;padding: 0 5px;display: inline-block;vertical-align: top;"><div id="sort-dialog-cmb-order-<%= levelIndex %>" class="input-group-nr" style=""></div></div>',
+                                '<% } else { %>',
+                                    '<div style="width: 34%;padding: 0 5px;display: inline-block;vertical-align: top;"><div id="sort-dialog-cmb-order-<%= levelIndex %>" class="input-group-nr" style=""></div></div>',
+                                '<% } %>',
+                            '</div>',
                         '</div>'
                 ].join(''))
             });
@@ -177,6 +188,7 @@ define([  'text!spreadsheeteditor/main/app/template/SortDialog.template',
             this.btnDown.on('click', _.bind(this.onMoveClick, this, false));
 
             this.lblColumn = $('#sort-dialog-label-column');
+            this.lblSort = $('#sort-dialog-label-sort');
 
             this.afterRender();
         },
@@ -213,6 +225,7 @@ define([  'text!spreadsheeteditor/main/app/template/SortDialog.template',
                 this.sortList.on('item:add', _.bind(this.addControls, this));
                 this.sortList.on('item:change', _.bind(this.addControls, this));
                 this.refreshList(props.asc_getLevels());
+                this.initListHeaders();
             }
         },
 
@@ -220,23 +233,32 @@ define([  'text!spreadsheeteditor/main/app/template/SortDialog.template',
             this.levels = [];
 
             var arr = [];
+            if (!levels && this.column_data.length==1) {
+                levels = [{
+                    columnIndex: this.column_data[0].value,
+                    sort: Asc.c_oAscSortOptions.ByValue,
+                    order: Asc.c_oAscSortOptions.Ascending
+                }];
+            }
             if (levels) {
                 for (var i=0; i<levels.length; i++) {
                     var level = levels[i],
-                        levelProps = this.props.asc_getLevelProps(level.asc_getIndex()),
+                        columnIndex = level.asc_getIndex ? level.asc_getIndex() : level.columnIndex,
+                        levelProps = this.props.asc_getLevelProps(columnIndex),
+                        levelSort = level.asc_getSortBy ? level.asc_getSortBy() : level.sort,
                         istext = levelProps ? levelProps.asc_getIsTextData() : true,
-                        iscolor = (level.asc_getSortBy() !== Asc.c_oAscSortOptions.ByValue);
+                        iscolor = (levelSort !== Asc.c_oAscSortOptions.ByValue);
                     arr.push({
-                        columnIndex: level.asc_getIndex(),
+                        columnIndex: columnIndex,
                         levelIndex: i,
-                        sort: level.asc_getSortBy(),
-                        order: level.asc_getDescending(),
-                        color: level.asc_getColor()
+                        sort: levelSort,
+                        order: level.asc_getDescending ? level.asc_getDescending() : level.order,
+                        color: level.asc_getColor ? level.asc_getColor() : undefined
                     });
                     if (iscolor) {
-                        var color_data = [{ value: -1, displayValue: (level.asc_getSortBy()==Asc.c_oAscSortOptions.ByColorFill) ? this.textNone : this.textAuto , color: null}];
+                        var color_data = [{ value: -1, displayValue: (levelSort==Asc.c_oAscSortOptions.ByColorFill) ? this.textNone : this.textAuto , color: null}];
                         if (levelProps) {
-                            var levelColors = (level.asc_getSortBy()==Asc.c_oAscSortOptions.ByColorFill) ? levelProps.asc_getColorsFill() : levelProps.asc_getColorsFont();
+                            var levelColors = (levelSort==Asc.c_oAscSortOptions.ByColorFill) ? levelProps.asc_getColorsFill() : levelProps.asc_getColorsFont();
                             levelColors.forEach(function(item, index) {
                                 item && color_data.push({
                                     value: Common.Utils.ThemeColor.getHexColor(item.get_r(), item.get_g(), item.get_b()).toLocaleUpperCase(),
@@ -269,6 +291,14 @@ define([  'text!spreadsheeteditor/main/app/template/SortDialog.template',
             this.updateButtons();
         },
 
+        initListHeaders: function() {
+            var pos = this.sortList.cmpEl.find('#sort-dialog-cmb-sort-0').position();
+            pos && this.lblColumn.width(Math.floor(pos.left)-3);
+            pos = this.sortList.cmpEl.find('#sort-dialog-btn-color-0').position();
+            !pos && (pos = this.sortList.cmpEl.find('#sort-dialog-cmb-order-0').position());
+            pos && this.lblSort.width(Math.floor(pos.left)-5 - this.lblColumn.width());
+        },
+
         addControls: function(listView, itemView, item) {
             if (!item) return;
 
@@ -283,7 +313,7 @@ define([  'text!spreadsheeteditor/main/app/template/SortDialog.template',
             var combo = new Common.UI.ComboBox({
                     el          : cmpEl.find('#sort-dialog-cmb-col-' + i),
                     editable    : false,
-                    cls         : 'input-group-nr',
+                    cls         : 'input-group-nr no-highlighted',
                     menuCls     : 'menu-absolute',
                     menuStyle   : 'max-height: 135px;',
                     data        : this.column_data
@@ -305,7 +335,7 @@ define([  'text!spreadsheeteditor/main/app/template/SortDialog.template',
             combo = new Common.UI.ComboBox({
                 el          : cmpEl.find('#sort-dialog-cmb-sort-' + i),
                 editable    : false,
-                cls         : 'input-group-nr',
+                cls         : 'input-group-nr no-highlighted',
                 menuCls     : 'menu-absolute',
                 data        : this.sort_data
             }).on('selected', function(combo, record) {
@@ -322,6 +352,7 @@ define([  'text!spreadsheeteditor/main/app/template/SortDialog.template',
                     el          : cmpEl.find('#sort-dialog-btn-color-' + i),
                     editable    : false,
                     menuCls     : 'menu-absolute',
+                    cls         : 'no-highlighted',
                     menuStyle   : 'max-height: 135px;',
                     data        : level.color_data
                 }).on('selected', function(combo, record) {
@@ -337,7 +368,7 @@ define([  'text!spreadsheeteditor/main/app/template/SortDialog.template',
             combo = new Common.UI.ComboBox({
                 el          : cmpEl.find('#sort-dialog-cmb-order-' + i),
                 editable    : false,
-                cls         : 'input-group-nr',
+                cls         : 'input-group-nr no-highlighted',
                 menuCls     : 'menu-absolute',
                 data        : level.order_data
             }).on('selected', function(combo, record) {
@@ -350,6 +381,8 @@ define([  'text!spreadsheeteditor/main/app/template/SortDialog.template',
             cmpEl.on('mousedown', '.combobox', function(){
                 me.sortList.selectRecord(item);
             });
+
+            this.updateLevelCaptions(true);
         },
 
         onOptions: function () {
@@ -401,10 +434,24 @@ define([  'text!spreadsheeteditor/main/app/template/SortDialog.template',
 
         onAddLevel: function() {
             var store = this.sortList.store,
-                rec = this.sortList.getSelectedRec();
+                rec = this.sortList.getSelectedRec(),
+                columnIndex = (this.column_data.length==1) ? this.column_data[0].value : null,
+                levelIndex = this.levels.length;
+            if (columnIndex!==null) {
+                var levelProps = this.props.asc_getLevelProps(columnIndex),
+                    istext = levelProps ? levelProps.asc_getIsTextData() : true;
+                this.levels[levelIndex] = {
+                    levelProps: levelProps,
+                    order_data: [
+                        { value: Asc.c_oAscSortOptions.Ascending, displayValue: (istext ? this.textAZ : this.textAsc) },
+                        { value: Asc.c_oAscSortOptions.Descending, displayValue: (istext ? this.textZA : this.textDesc)}
+                    ]
+                };
+            }
+
             rec = store.add({
-                columnIndex: null,
-                levelIndex: this.levels.length,
+                columnIndex: columnIndex,
+                levelIndex: levelIndex,
                 sort: Asc.c_oAscSortOptions.ByValue,
                 order: Asc.c_oAscSortOptions.Ascending
             }, {at: rec ? store.indexOf(rec)+1 : store.length});
@@ -465,6 +512,7 @@ define([  'text!spreadsheeteditor/main/app/template/SortDialog.template',
                 this.sortList.scrollToRecord(rec);
             }
             this.updateMoveButtons();
+            this.updateLevelCaptions();
         },
 
         onSelectLevel: function(lisvView, itemView, record) {
@@ -584,6 +632,7 @@ define([  'text!spreadsheeteditor/main/app/template/SortDialog.template',
             this.btnCopy.setDisabled(this.sortList.store.length<1);
             this.btnDelete.setDisabled(this.sortList.store.length<1);
             this.updateMoveButtons();
+            this.updateLevelCaptions(true);
             this.sortList.scroller && this.sortList.scroller.update();
         },
 
@@ -594,6 +643,17 @@ define([  'text!spreadsheeteditor/main/app/template/SortDialog.template',
             this.btnDown.setDisabled(index<0 || index==this.sortList.store.length-1);
         },
 
+        updateLevelCaptions: function(all) {
+            var captions = this.$window.find('.level-caption');
+            if (captions.length<1) return;
+
+            if (all)
+                captions.text(this.textThenBy);
+            else
+                (captions.length>1) && (captions[1].innerText = this.textThenBy);
+            captions[0].innerText = this.textSortBy;
+        },
+
         onSelectOther: function(combo, item) {
             var me = this;
             if (me.api) {
@@ -664,7 +724,7 @@ define([  'text!spreadsheeteditor/main/app/template/SortDialog.template',
         textLeft: 'Left',
         textRight: 'Right',
         errorEmpty: 'All sort criteria must have a column or row specified.',
-        textAuto: 'Automatic',
+        textAuto: 'Auto',
         textNone: 'None',
         errorNotOriginalCol: 'The column you selected is not in the original selected range.',
         errorNotOriginalRow: 'The row you selected is not in the original selected range.',
@@ -674,7 +734,8 @@ define([  'text!spreadsheeteditor/main/app/template/SortDialog.template',
         textMoreRows: '(More rows...)',
         textMoreCols: '(More columns...)',
         errorSameColumnValue: "%1 is being sorted by values more than once.<br>Delete the duplicate sort criteria and try again.",
-        errorSameColumnColor: "%1 is being sorted by the same color more than once.<br>Delete the duplicate sort criteria and try again."
-
+        errorSameColumnColor: "%1 is being sorted by the same color more than once.<br>Delete the duplicate sort criteria and try again.",
+        textSortBy: 'Sort by',
+        textThenBy: 'Then by'
     }, SSE.Views.SortDialog || {}));
 });
\ No newline at end of file
diff --git a/apps/spreadsheeteditor/main/app/view/Toolbar.js b/apps/spreadsheeteditor/main/app/view/Toolbar.js
index d2fe1a385..487cfdbac 100644
--- a/apps/spreadsheeteditor/main/app/view/Toolbar.js
+++ b/apps/spreadsheeteditor/main/app/view/Toolbar.js
@@ -1781,7 +1781,7 @@ define([
                             id          : 'id-toolbar-mnu-item-border-color',
                             caption     : this.textBordersColor,
                             iconCls     : 'mnu-icon-item mnu-border-color',
-                            template    : _.template('<a id="<%= id %>"tabindex="-1" type="menuitem"><span class="menu-item-icon" style="background-image: none; width: 11px; height: 11px; margin: 2px 7px 0 -9px; border-style: solid; border-width: 3px; border-color: #000;"></span><%= caption %></a>'),
+                            template    : _.template('<a id="<%= id %>"tabindex="-1" type="menuitem"><span class="menu-item-icon" style="background-image: none; width: 12px; height: 12px; margin: 2px 9px 0 -11px; border-style: solid; border-width: 3px; border-color: #000;"></span><%= caption %></a>'),
                             menu        : new Common.UI.Menu({
                                 menuAlign   : 'tl-tr',
                                 items       : [
diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json
index 8c3d60f57..334854f02 100644
--- a/apps/spreadsheeteditor/main/locale/en.json
+++ b/apps/spreadsheeteditor/main/locale/en.json
@@ -1632,6 +1632,10 @@
   "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtPt": "Point",
   "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtRu": "Russian",
   "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWin": "as Windows",
+  "SSE.Views.FileMenuPanels.MainSettingsGeneral.strSeparator": "Separator",
+  "SSE.Views.FileMenuPanels.MainSettingsGeneral.strUseSeparatorsBasedOnRegionalSettings": "Use separators based on regional settings",
+  "SSE.Views.FileMenuPanels.MainSettingsGeneral.strDecimalSeparator": "Decimal separator",
+  "SSE.Views.FileMenuPanels.MainSettingsGeneral.strThousandsSeparator": "Thousands separator",
   "SSE.Views.FileMenuPanels.MainSpellCheckSettings.strIgnoreWordsInUPPERCASE": "Ignore words in UPPERCASE",
   "SSE.Views.FileMenuPanels.MainSpellCheckSettings.strIgnoreWordsWithNumbers": "Ignore words with numbers",
   "SSE.Views.FileMenuPanels.MainSpellCheckSettings.strDictionaryLanguage": "Dictionary language",
@@ -2173,7 +2177,7 @@
   "SSE.Views.SortDialog.textLeft": "Left",
   "SSE.Views.SortDialog.textRight": "Right",
   "SSE.Views.SortDialog.errorEmpty": "All sort criteria must have a column or row specified.",
-  "SSE.Views.SortDialog.textAuto": "Automatic",
+  "SSE.Views.SortDialog.textAuto": "Auto",
   "SSE.Views.SortDialog.textNone": "None",
   "SSE.Views.SortDialog.errorNotOriginalCol": "The column you selected is not in the original selected range.",
   "SSE.Views.SortDialog.errorNotOriginalRow": "The row you selected is not in the original selected range.",
@@ -2184,6 +2188,8 @@
   "SSE.Views.SortDialog.textMoreCols": "(More columns...)",
   "SSE.Views.SortDialog.errorSameColumnValue": "%1 is being sorted by values more than once.<br>Delete the duplicate sort criteria and try again.",
   "SSE.Views.SortDialog.errorSameColumnColor": "%1 is being sorted by the same color more than once.<br>Delete the duplicate sort criteria and try again.",
+  "SSE.Views.SortDialog.textSortBy": "Sort by",
+  "SSE.Views.SortDialog.textThenBy": "Then by",
   "SSE.Views.SortOptionsDialog.textTitle": "Sort Options",
   "SSE.Views.SortOptionsDialog.textHeaders": "My data has headers",
   "SSE.Views.SortOptionsDialog.textCase": "Case sensitive",
@@ -2546,18 +2552,7 @@
   "SSE.Views.Top10FilterDialog.txtItems": "Item",
   "SSE.Views.Top10FilterDialog.txtPercent": "Percent",
   "SSE.Views.Top10FilterDialog.txtTitle": "Top 10 AutoFilter",
-<<<<<<< HEAD
   "SSE.Views.Top10FilterDialog.txtTop": "Top",
-  "SSE.Views.ScaleDialog.textTitle": "Scale Settings",
-  "SSE.Views.ScaleDialog.textWidth": "Width",
-  "SSE.Views.ScaleDialog.textHeight": "Height",
-  "SSE.Views.ScaleDialog.textAuto": "Auto",
-  "SSE.Views.ScaleDialog.textOnePage": "page",
-  "SSE.Views.ScaleDialog.textFewPages": "pages",
-  "SSE.Views.ScaleDialog.textManyPages": "pages",
-  "SSE.Views.ScaleDialog.textError": "The entered value is incorrect.",
-  "SSE.Views.ScaleDialog.textScaleTo": "Scale To",
-  "SSE.Views.ScaleDialog.textFitTo": "Fit To",
   "SSE.Views.ValueFieldSettingsDialog.textTitle": "Value Field Settings",
   "SSE.Views.ValueFieldSettingsDialog.txtSourceName": "Source name:",
   "SSE.Views.ValueFieldSettingsDialog.txtCustomName": "Custom name",
@@ -2586,7 +2581,4 @@
   "SSE.Views.ValueFieldSettingsDialog.txtPercentOfTotal": "Percent of Row",
   "SSE.Views.ValueFieldSettingsDialog.txtIndex": "Index",
   "SSE.Views.ValueFieldSettingsDialog.txtByField": "by field"
-=======
-  "SSE.Views.Top10FilterDialog.txtTop": "Top"
->>>>>>> develop
 }
\ No newline at end of file
diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1.5x/big/btn-datetime.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1.5x/big/btn-datetime.png
index 5f4384cf6..95f813519 100644
Binary files a/apps/spreadsheeteditor/main/resources/img/toolbar/1.5x/big/btn-datetime.png and b/apps/spreadsheeteditor/main/resources/img/toolbar/1.5x/big/btn-datetime.png differ
diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1.5x/btn-clear-filter.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1.5x/btn-clear-filter.png
index 0ba05154f..ca6d6aa4d 100644
Binary files a/apps/spreadsheeteditor/main/resources/img/toolbar/1.5x/btn-clear-filter.png and b/apps/spreadsheeteditor/main/resources/img/toolbar/1.5x/btn-clear-filter.png differ
diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1.5x/btn-merge.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1.5x/btn-merge.png
index 36527c9aa..77df500c4 100644
Binary files a/apps/spreadsheeteditor/main/resources/img/toolbar/1.5x/btn-merge.png and b/apps/spreadsheeteditor/main/resources/img/toolbar/1.5x/btn-merge.png differ
diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1.5x/btn-named-range.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1.5x/btn-named-range.png
index 473571599..4bc4f3e21 100644
Binary files a/apps/spreadsheeteditor/main/resources/img/toolbar/1.5x/btn-named-range.png and b/apps/spreadsheeteditor/main/resources/img/toolbar/1.5x/btn-named-range.png differ
diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1x/btn-clear-filter.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1x/btn-clear-filter.png
index 826b9208b..7f1817133 100644
Binary files a/apps/spreadsheeteditor/main/resources/img/toolbar/1x/btn-clear-filter.png and b/apps/spreadsheeteditor/main/resources/img/toolbar/1x/btn-clear-filter.png differ
diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1x/btn-merge.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1x/btn-merge.png
index 577a18672..6f08aac88 100644
Binary files a/apps/spreadsheeteditor/main/resources/img/toolbar/1x/btn-merge.png and b/apps/spreadsheeteditor/main/resources/img/toolbar/1x/btn-merge.png differ
diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1x/btn-named-range.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1x/btn-named-range.png
index c21506f87..599d7bf33 100644
Binary files a/apps/spreadsheeteditor/main/resources/img/toolbar/1x/btn-named-range.png and b/apps/spreadsheeteditor/main/resources/img/toolbar/1x/btn-named-range.png differ
diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/2x/btn-clear-filter.png b/apps/spreadsheeteditor/main/resources/img/toolbar/2x/btn-clear-filter.png
index 7e089f25d..7812cf135 100644
Binary files a/apps/spreadsheeteditor/main/resources/img/toolbar/2x/btn-clear-filter.png and b/apps/spreadsheeteditor/main/resources/img/toolbar/2x/btn-clear-filter.png differ
diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/2x/btn-function.png b/apps/spreadsheeteditor/main/resources/img/toolbar/2x/btn-function.png
index 7c6628aac..9aa89e5f4 100644
Binary files a/apps/spreadsheeteditor/main/resources/img/toolbar/2x/btn-function.png and b/apps/spreadsheeteditor/main/resources/img/toolbar/2x/btn-function.png differ
diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/2x/btn-merge.png b/apps/spreadsheeteditor/main/resources/img/toolbar/2x/btn-merge.png
index 5c712159a..ecdadb4ac 100644
Binary files a/apps/spreadsheeteditor/main/resources/img/toolbar/2x/btn-merge.png and b/apps/spreadsheeteditor/main/resources/img/toolbar/2x/btn-merge.png differ
diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/2x/btn-named-range.png b/apps/spreadsheeteditor/main/resources/img/toolbar/2x/btn-named-range.png
index 1f2363ff0..49761e20f 100644
Binary files a/apps/spreadsheeteditor/main/resources/img/toolbar/2x/btn-named-range.png and b/apps/spreadsheeteditor/main/resources/img/toolbar/2x/btn-named-range.png differ
diff --git a/apps/spreadsheeteditor/main/resources/less/advanced-settings.less b/apps/spreadsheeteditor/main/resources/less/advanced-settings.less
index 16ec159bc..4b53ba3b4 100644
--- a/apps/spreadsheeteditor/main/resources/less/advanced-settings.less
+++ b/apps/spreadsheeteditor/main/resources/less/advanced-settings.less
@@ -46,26 +46,16 @@
         }
 
         .listitem-icon {
-            .background-ximage('@{app-image-path}/toolbar-menu.png', '@{app-image-path}/toolbar-menu@2x.png', 20px);
-            background-repeat: no-repeat;
-            background-position: 0 -1560px;
             width: 20px;
             height: 20px;
             vertical-align: middle;
             margin-right: 5px;
         }
 
-        .listitem-table {
-            background-position: 0 -1580px;
-        }
-
         .selected {
             .listitem-icon {
-                background-position: -20px -1560px;
-            }
-
-            .listitem-table {
-                background-position: -20px -1580px;
+                background-position-x: -20px;
+                --bgX: -20px;
             }
         }
 
diff --git a/apps/spreadsheeteditor/main/resources/less/statusbar.less b/apps/spreadsheeteditor/main/resources/less/statusbar.less
index 5581c2205..138443085 100644
--- a/apps/spreadsheeteditor/main/resources/less/statusbar.less
+++ b/apps/spreadsheeteditor/main/resources/less/statusbar.less
@@ -241,11 +241,11 @@
 
                 &.mousemove {
                     > a {
-                        background: linear-gradient(to right, @black, @gray-light 1px);
+                        background: linear-gradient(to right, #49795d, @gray-light 3px);
                     }
                     &.right {
                         > a {
-                            background: linear-gradient(to left, @black, @gray-light 1px);
+                            background: linear-gradient(to left, #49795d, @gray-light 3px);
                         }
                     }
                 }
diff --git a/apps/spreadsheeteditor/mobile/app/controller/Settings.js b/apps/spreadsheeteditor/mobile/app/controller/Settings.js
index f6a13471c..b8a176d08 100644
--- a/apps/spreadsheeteditor/mobile/app/controller/Settings.js
+++ b/apps/spreadsheeteditor/mobile/app/controller/Settings.js
@@ -90,7 +90,8 @@ define([
             _regDataCode = [{ value: 0x042C }, { value: 0x0402 }, { value: 0x0405 }, { value: 0x0407 },  {value: 0x0807}, { value: 0x0408 }, { value: 0x0C09 }, { value: 0x0809 }, { value: 0x0409 }, { value: 0x0C0A }, { value: 0x080A },
             { value: 0x040B }, { value: 0x040C }, { value: 0x0410 }, { value: 0x0411 }, { value: 0x0412 }, { value: 0x0426 }, { value: 0x0413 }, { value: 0x0415 }, { value: 0x0416 },
             { value: 0x0816 }, { value: 0x0419 }, { value: 0x041B }, { value: 0x0424 }, { value: 0x081D }, { value: 0x041D }, { value: 0x041F }, { value: 0x0422 }, { value: 0x042A }, { value: 0x0804 }],
-            _regdata = [];
+            _regdata = [],
+            _lang;
 
 
         var mm2Cm = function(mm) {
@@ -151,6 +152,7 @@ define([
                 this.getView('Settings').setMode(mode);
                 if (mode.canBranding)
                     _licInfo = mode.customization;
+                _lang = mode.lang;
             },
 
             initEvents: function () {
@@ -291,11 +293,11 @@ define([
                     value = props.asc_getDescription();
                     value ? $('#settings-sse-comment').html(value) : $('.display-comment').remove();
                     value = props.asc_getModified();
-                    value ? $('#settings-sse-last-mod').html(value.toLocaleString()) : $('.display-last-mode').remove();
+                    value ? $('#settings-sse-last-mod').html(value.toLocaleString(_lang, {year: 'numeric', month: '2-digit', day: '2-digit'}) + ' ' + value.toLocaleString(_lang, {timeStyle: 'short'})) : $('.display-last-mode').remove();
                     value = props.asc_getLastModifiedBy();
                     value ? $('#settings-sse-mod-by').html(value) : $('.display-mode-by').remove();
                     value = props.asc_getCreated();
-                    value ? $('#settings-sse-date').html(value.toLocaleString()) : $('.display-created-date').remove();
+                    value ? $('#settings-sse-date').html(value.toLocaleString(_lang, {year: 'numeric', month: '2-digit', day: '2-digit'}) + ' ' + value.toLocaleString(_lang, {timeStyle: 'short'})) : $('.display-created-date').remove();
                     value = props.asc_getCreator();
                     var templateCreator = "";
                     value && value.split(/\s*[,;]\s*/).forEach(function(item) {