diff --git a/apps/common/main/resources/img/controls/toolbarbig.png b/apps/common/main/resources/img/controls/toolbarbig.png
index 5982df154..e6c0bf152 100644
Binary files a/apps/common/main/resources/img/controls/toolbarbig.png and b/apps/common/main/resources/img/controls/toolbarbig.png differ
diff --git a/apps/common/main/resources/less/toolbar.less b/apps/common/main/resources/less/toolbar.less
index 6094c22c4..fee05cace 100644
--- a/apps/common/main/resources/less/toolbar.less
+++ b/apps/common/main/resources/less/toolbar.less
@@ -281,3 +281,14 @@
 .button-normal-icon(review-next,          16, @toolbar-big-icon-size);
 .button-normal-icon(review-prev,          17, @toolbar-big-icon-size);
 .button-normal-icon(btn-dropcap,          18, @toolbar-big-icon-size);
+.button-normal-icon(~'x-huge .btn-pagebreak', 19, @toolbar-big-icon-size);
+
+.button-normal-icon(btn-pageorient,       21, @toolbar-big-icon-size);
+.button-normal-icon(btn-pagemargins,      22, @toolbar-big-icon-size);
+.button-normal-icon(btn-pagesize,         23, @toolbar-big-icon-size);
+.button-normal-icon(btn-columns,          24, @toolbar-big-icon-size);
+.button-normal-icon(btn-img-align,        25, @toolbar-big-icon-size);
+.button-normal-icon(btn-img-group,        26, @toolbar-big-icon-size);
+.button-normal-icon(btn-img-bkwd,         27, @toolbar-big-icon-size);
+.button-normal-icon(btn-img-frwd,         28, @toolbar-big-icon-size);
+.button-normal-icon(btn-img-wrap,         29, @toolbar-big-icon-size);
diff --git a/apps/documenteditor/main/app/template/Toolbar.template b/apps/documenteditor/main/app/template/Toolbar.template
index 43ac7fd15..ded87a9b2 100644
--- a/apps/documenteditor/main/app/template/Toolbar.template
+++ b/apps/documenteditor/main/app/template/Toolbar.template
@@ -145,51 +145,19 @@
             </section>
             <section class="panel" data-tab="layout">
                 <div class="group">
-                    <div class="elset">
-                        <span class="btn-slot text" id="slot-btn-pageorient"></span>
-                    </div>
-                    <div class="elset">
-                        <span class="btn-slot text" id="slot-btn-pagesize"></span>
-                    </div>
-                </div>
-                <div class="group">
-                    <div class="elset">
-                        <span class="btn-slot text" id="slot-btn-pagemargins"></span>
-                    </div>
-                    <div class="elset">
-                        <span class="btn-slot text" id="slot-btn-columns"></span>
-                    </div>
-                </div>
-                <div class="group">
-                    <div class="elset">
-                        <span class="btn-slot text btn-pagebreak"></span>
-                    </div>
-                    <div class="elset">
-                    </div>
+                    <span class="btn-slot text x-huge btn-pagebreak"></span>
+                    <span class="btn-slot text x-huge" id="slot-btn-pageorient"></span>
+                    <span class="btn-slot text x-huge" id="slot-btn-pagemargins"></span>
+                    <span class="btn-slot text x-huge" id="slot-btn-pagesize"></span>
+                    <span class="btn-slot text x-huge" id="slot-btn-columns"></span>
                 </div>
                 <div class="separator long"></div>
                 <div class="group">
-                    <div class="elset">
-                        <span class="btn-slot text" id="slot-img-align"></span>
-                    </div>
-                    <div class="elset">
-                        <span class="btn-slot text" id="slot-img-group"></span>
-                    </div>
-                </div>
-                <div class="group">
-                    <div class="elset">
-                        <span class="btn-slot text" id="slot-img-movefrwd"></span>
-                    </div>
-                    <div class="elset">
-                        <span class="btn-slot text" id="slot-img-movebkwd"></span>
-                    </div>
-                </div>
-                <div class="group">
-                    <div class="elset">
-                        <span class="btn-slot text" id="slot-img-wrapping"></span>
-                    </div>
-                    <div class="elset">
-                    </div>
+                    <span class="btn-slot text x-huge" id="slot-img-align"></span>
+                    <span class="btn-slot text x-huge" id="slot-img-group"></span>
+                    <span class="btn-slot text x-huge" id="slot-img-movefrwd"></span>
+                    <span class="btn-slot text x-huge" id="slot-img-movebkwd"></span>
+                    <span class="btn-slot text x-huge" id="slot-img-wrapping"></span>
                 </div>
             </section>
         </section>
diff --git a/apps/documenteditor/main/app/view/Toolbar.js b/apps/documenteditor/main/app/view/Toolbar.js
index 7374ef304..8ce9cc211 100644
--- a/apps/documenteditor/main/app/view/Toolbar.js
+++ b/apps/documenteditor/main/app/view/Toolbar.js
@@ -608,7 +608,7 @@ define([
 
                 this.btnColumns = new Common.UI.Button({
                     id: 'tlb-btn-columns',
-                    cls: 'btn-toolbar',
+                    cls: 'btn-toolbar x-huge icon-top',
                     iconCls: 'btn-columns',
                     caption: me.capBtnColumns,
                     menu: new Common.UI.Menu({
@@ -658,7 +658,7 @@ define([
 
                 this.btnPageOrient = new Common.UI.Button({
                     id: 'tlb-btn-pageorient',
-                    cls: 'btn-toolbar',
+                    cls: 'btn-toolbar x-huge icon-top',
                     iconCls: 'btn-pageorient',
                     caption: me.capBtnPageOrient,
                     menu: new Common.UI.Menu({
@@ -694,7 +694,7 @@ define([
 
                 this.btnPageMargins = new Common.UI.Button({
                     id: 'tlb-btn-pagemargins',
-                    cls: 'btn-toolbar',
+                    cls: 'btn-toolbar x-huge icon-top',
                     iconCls: 'btn-pagemargins',
                     caption: me.capBtnMargins,
                     menu: new Common.UI.Menu({
@@ -753,7 +753,7 @@ define([
 
                 this.btnPageSize = new Common.UI.Button({
                     id: 'tlb-btn-pagesize',
-                    cls: 'btn-toolbar',
+                    cls: 'btn-toolbar x-huge icon-top',
                     iconCls: 'btn-pagesize',
                     caption: me.capBtnPageSize,
                     menu: new Common.UI.Menu({
@@ -967,34 +967,34 @@ define([
                 this.toolbarControls.push(this.btnAdvSettings);
 
                 me.btnImgAlign = new Common.UI.Button({
-                    cls: 'btn-toolbar',
+                    cls: 'btn-toolbar x-huge icon-top',
                     iconCls: 'btn-img-align',
                     caption: me.capImgAlign,
                     menu: true
                 });
 
                 me.btnImgGroup = new Common.UI.Button({
-                    cls: 'btn-toolbar',
+                    cls: 'btn-toolbar x-huge icon-top',
                     iconCls: 'btn-img-group',
                     caption: me.capImgGroup,
                     menu: true
                 });
                 me.btnImgForward = new Common.UI.Button({
-                    cls: 'btn-toolbar',
+                    cls: 'btn-toolbar x-huge icon-top',
                     iconCls: 'btn-img-frwd',
                     caption: me.capImgForward,
                     split: true,
                     menu: true
                 });
                 me.btnImgBackward = new Common.UI.Button({
-                    cls: 'btn-toolbar',
+                    cls: 'btn-toolbar x-huge icon-top',
                     iconCls: 'btn-img-bkwd',
                     caption: me.capImgBackward,
                     split: true,
                     menu: true
                 });
                 me.btnImgWrapping = new Common.UI.Button({
-                    cls: 'btn-toolbar',
+                    cls: 'btn-toolbar x-huge icon-top',
                     iconCls: 'btn-img-wrap',
                     caption: me.capImgWrapping,
                     menu: true
@@ -1205,7 +1205,7 @@ define([
                 });
 
                 if ( me.isCompactView )
-                    me.setFolded(true); else
+                    me.setFolded(true), me.collapse(); else
                     me.setTab('home');
 
                 var top = Common.localStorage.getItem("de-pgmargins-top"),
@@ -1304,8 +1304,11 @@ define([
 
                     var $slots = $host.find('.btn-slot.btn-pagebreak');
                     $slots.each(function(index, el) {
+                        var _cls = 'btn-toolbar';
+                        /x-huge/.test(el.className) && (_cls += ' x-huge icon-top');
+
                         var button = new Common.UI.Button({
-                            cls: 'btn-toolbar',
+                            cls: _cls,
                             iconCls: 'btn-pagebreak',
                             caption: me.capBtnInsPagebreak,
                             split: true,
diff --git a/apps/documenteditor/main/resources/less/toolbar.less b/apps/documenteditor/main/resources/less/toolbar.less
index 583d10a67..69181f0b7 100644
--- a/apps/documenteditor/main/resources/less/toolbar.less
+++ b/apps/documenteditor/main/resources/less/toolbar.less
@@ -266,8 +266,8 @@
 .button-normal-icon(btn-setmarkers,       21, @toolbar-icon-size);
 .button-normal-icon(btn-multilevels,      22, @toolbar-icon-size);
 .button-normal-icon(btn-numbering,        23, @toolbar-icon-size);
-.button-normal-icon(btn-pageorient,       24, @toolbar-icon-size);
-.button-normal-icon(btn-pagesize,         25, @toolbar-icon-size);
+//.button-normal-icon(btn-pageorient,       24, @toolbar-icon-size);
+//.button-normal-icon(btn-pagesize,         25, @toolbar-icon-size);
 .button-normal-icon(btn-paste,            26, @toolbar-icon-size);
 .button-normal-icon(btn-print,            27, @toolbar-icon-size);
 .button-normal-icon(btn-redo,             28, @toolbar-icon-size);
@@ -297,13 +297,13 @@
 .button-normal-icon(mmerge-last,          72, @toolbar-icon-size);
 .button-normal-icon(mmerge-prev,          73, @toolbar-icon-size);
 .button-normal-icon(mmerge-first,         74, @toolbar-icon-size);
-.button-normal-icon(btn-columns,          75, @toolbar-icon-size);
-.button-normal-icon(btn-pagemargins,      76, @toolbar-icon-size);
-.button-normal-icon(btn-img-frwd,         83, @toolbar-icon-size);
-.button-normal-icon(btn-img-bkwd,         84, @toolbar-icon-size);
-.button-normal-icon(btn-img-wrap,         85, @toolbar-icon-size);
-.button-normal-icon(btn-img-group,        86, @toolbar-icon-size);
-.button-normal-icon(btn-img-align,        87, @toolbar-icon-size);
+//.button-normal-icon(btn-columns,          75, @toolbar-icon-size);
+//.button-normal-icon(btn-pagemargins,      76, @toolbar-icon-size);
+//.button-normal-icon(btn-img-frwd,         83, @toolbar-icon-size);
+//.button-normal-icon(btn-img-bkwd,         84, @toolbar-icon-size);
+//.button-normal-icon(btn-img-wrap,         85, @toolbar-icon-size);
+//.button-normal-icon(btn-img-group,        86, @toolbar-icon-size);
+//.button-normal-icon(btn-img-align,        87, @toolbar-icon-size);
 .button-normal-icon(btn-goback,           88, @toolbar-icon-size);
 
 //.button-normal-icon(btn-insertimage,      17, @toolbar-icon-size);