diff --git a/apps/common/main/resources/less/buttons.less b/apps/common/main/resources/less/buttons.less
index 4d15029ff..e8df917d2 100644
--- a/apps/common/main/resources/less/buttons.less
+++ b/apps/common/main/resources/less/buttons.less
@@ -449,6 +449,10 @@
             display: none;
         }
     }
+
+    &.align-left {
+        text-align: left;
+    }
 }
 
 .btn-category {
diff --git a/apps/documenteditor/main/app/template/TableSettings.template b/apps/documenteditor/main/app/template/TableSettings.template
index bdbdf810e..43682ae7c 100644
--- a/apps/documenteditor/main/app/template/TableSettings.template
+++ b/apps/documenteditor/main/app/template/TableSettings.template
@@ -96,8 +96,7 @@
     </tr>
     <tr>
         <td class="padding-small" colspan=2>
-            <label class="header" style="margin-top: 3px;"><%= scope.textEdit %></label>
-            <div id="table-btn-edit" style="display: inline-block; float:right;"></div>
+            <div id="table-btn-edit" style="width:100%;"></div>
         </td>
     </tr>
     <tr>
diff --git a/apps/documenteditor/main/app/view/TableSettings.js b/apps/documenteditor/main/app/view/TableSettings.js
index 692d8e3b0..09a540c39 100644
--- a/apps/documenteditor/main/app/view/TableSettings.js
+++ b/apps/documenteditor/main/app/view/TableSettings.js
@@ -347,9 +347,11 @@ define([
 
             this.btnEdit = new Common.UI.Button({
                 parentEl: $('#table-btn-edit'),
-                cls: 'btn-icon-default',
-                iconCls: 'btn-edit-table',
-                menu        : new Common.UI.Menu({
+                cls         : 'btn-toolbar align-left',
+                iconCls     : 'toolbar__icon rows-and-columns',
+                caption     : this.textEdit,
+                style       : 'width: 100%;',
+                menu: new Common.UI.Menu({
                     menuAlign: 'tr-br',
                     items: [
                         { caption: this.selectRowText, value: 0 },
@@ -370,9 +372,9 @@ define([
                         { caption: this.splitCellsText,  value: 12 }
                     ]
                 }),
-                dataHint: '1',
-                dataHintDirection: 'bottom',
-                dataHintOffset: 'big'
+                dataHint    : '1',
+                dataHintDirection: 'left',
+                dataHintOffset: 'small'
             });
             this.mnuMerge = this.btnEdit.menu.items[this.btnEdit.menu.items.length-2];
             this.mnuSplit = this.btnEdit.menu.items[this.btnEdit.menu.items.length-1];
diff --git a/apps/presentationeditor/main/app/template/TableSettings.template b/apps/presentationeditor/main/app/template/TableSettings.template
index 3a57799ab..673ed83a9 100644
--- a/apps/presentationeditor/main/app/template/TableSettings.template
+++ b/apps/presentationeditor/main/app/template/TableSettings.template
@@ -96,8 +96,7 @@
     </tr>
     <tr>
         <td class="padding-small" colspan=2>
-            <label class="header" style="margin-top: 3px;"><%= scope.textEdit %></label>
-            <div id="table-btn-edit" style="display: inline-block; float:right;"></div>
+            <div id="table-btn-edit" style="width:100%;"></div>
         </td>
     </tr>
     <tr>
diff --git a/apps/presentationeditor/main/app/view/TableSettings.js b/apps/presentationeditor/main/app/view/TableSettings.js
index f0ef9c70c..9eb9bb92f 100644
--- a/apps/presentationeditor/main/app/view/TableSettings.js
+++ b/apps/presentationeditor/main/app/view/TableSettings.js
@@ -334,9 +334,11 @@ define([
 
             this.btnEdit = new Common.UI.Button({
                 parentEl: $('#table-btn-edit'),
-                cls: 'btn-icon-default',
-                iconCls: 'btn-edit-table',
-                menu        : new Common.UI.Menu({
+                cls         : 'btn-toolbar align-left',
+                iconCls     : 'toolbar__icon rows-and-columns',
+                caption     : this.textEdit,
+                style       : 'width: 100%;',
+                menu: new Common.UI.Menu({
                     menuAlign: 'tr-br',
                     items: [
                         { caption: this.selectRowText, value: 0 },
@@ -357,9 +359,9 @@ define([
                         { caption: this.splitCellsText,  value: 12 }
                     ]
                 }),
-                dataHint: '1',
-                dataHintDirection: 'bottom',
-                dataHintOffset: 'big'
+                dataHint    : '1',
+                dataHintDirection: 'left',
+                dataHintOffset: 'small'
             });
             this.mnuMerge = this.btnEdit.menu.items[this.btnEdit.menu.items.length-2];
             this.mnuSplit = this.btnEdit.menu.items[this.btnEdit.menu.items.length-1];
diff --git a/apps/spreadsheeteditor/main/app/template/TableSettings.template b/apps/spreadsheeteditor/main/app/template/TableSettings.template
index 03dd5bd64..c50d11d43 100644
--- a/apps/spreadsheeteditor/main/app/template/TableSettings.template
+++ b/apps/spreadsheeteditor/main/app/template/TableSettings.template
@@ -62,15 +62,13 @@
         </td>
     </tr>
     <tr>
-        <td class="padding-large" colspan=2>
-            <label class="header" style="margin-top: 3px;"><%= scope.textResize %></label>
-            <button type="button" class="btn btn-text-default" id="table-btn-select-data" style="display: inline-block; float:right; min-width: 100px;width: auto;" data-hint="1" data-hint-direction="bottom" data-hint-offset="big"><%= scope.textSelectData %></button>
+        <td class="padding-small" colspan=2>
+            <div id="table-btn-select-data" style="width:100%;"></div>
         </td>
     </tr>
     <tr>
         <td class="padding-small" colspan=2>
-            <label class="header" style="margin-top: 3px;"><%= scope.textEdit %></label>
-            <div id="table-btn-edit" style="display: inline-block; float:right;"></div>
+            <div id="table-btn-edit" style="width:100%;"></div>
         </td>
     </tr>
     <tr>
diff --git a/apps/spreadsheeteditor/main/app/view/CellSettings.js b/apps/spreadsheeteditor/main/app/view/CellSettings.js
index 3964e3a74..b45ba0114 100644
--- a/apps/spreadsheeteditor/main/app/view/CellSettings.js
+++ b/apps/spreadsheeteditor/main/app/view/CellSettings.js
@@ -561,15 +561,15 @@ define([
 
             this.btnCondFormat = new Common.UI.Button({
                 parentEl: $('#cell-btn-cond-format'),
-                cls         : 'btn-toolbar',
+                cls         : 'btn-toolbar align-left',
                 iconCls     : 'toolbar__icon btn-cond-format',
                 caption     : this.textCondFormat,
-                style       : 'width: 100%;text-align: left;',
+                style       : 'width: 100%;',
                 menu: true,
                 disabled: this._locked,
                 dataHint    : '1',
-                dataHintDirection: 'bottom',
-                dataHintOffset: 'big'
+                dataHintDirection: 'left',
+                dataHintOffset: 'small'
             });
             this.lockedControls.push(this.btnCondFormat);
         },
diff --git a/apps/spreadsheeteditor/main/app/view/TableSettings.js b/apps/spreadsheeteditor/main/app/view/TableSettings.js
index 03484359b..7ff952f02 100644
--- a/apps/spreadsheeteditor/main/app/view/TableSettings.js
+++ b/apps/spreadsheeteditor/main/app/view/TableSettings.js
@@ -273,16 +273,25 @@ define([
             this.lockedControls.push(this.txtTableName);
 
             this.btnSelectData = new Common.UI.Button({
-                el: $('#table-btn-select-data')
+                parentEl: $('#table-btn-select-data'),
+                cls         : 'btn-toolbar align-left',
+                iconCls     : 'toolbar__icon resize-table',
+                caption     : this.textResize,
+                style       : 'width: 100%;',
+                dataHint    : '1',
+                dataHintDirection: 'left',
+                dataHintOffset: 'small'
             });
             this.btnSelectData.on('click', _.bind(this.onSelectData, this));
             this.lockedControls.push(this.btnSelectData);
 
             this.btnEdit = new Common.UI.Button({
                 parentEl: $('#table-btn-edit'),
-                cls: 'btn-icon-default',
-                iconCls: 'btn-edit-table',
-                menu        : new Common.UI.Menu({
+                cls         : 'btn-toolbar align-left',
+                iconCls     : 'toolbar__icon rows-and-columns',
+                caption     : this.textEdit,
+                style       : 'width: 100%;',
+                menu: new Common.UI.Menu({
                     menuAlign: 'tr-br',
                     items: [
                         { caption: this.selectRowText,      value:  Asc.c_oAscChangeSelectionFormatTable.row,   idx: 0 },
@@ -300,10 +309,11 @@ define([
                         { caption: this.deleteTableText,    value: Asc.c_oAscDeleteOptions.DeleteTable,     idx: 10 }
                     ]
                 }),
-                dataHint: '1',
-                dataHintDirection: 'bottom',
-                dataHintOffset: 'medium'
+                dataHint    : '1',
+                dataHintDirection: 'left',
+                dataHintOffset: 'small'
             });
+
             this.btnEdit.menu.on('show:after', _.bind( function(menu){
                 if (this.api) {
                     menu.items[5].setDisabled(!this._originalProps.asc_getIsInsertRowAbove());
@@ -321,10 +331,10 @@ define([
 
             this.btnConvertRange = new Common.UI.Button({
                 parentEl: $('#table-btn-convert-range'),
-                cls         : 'btn-toolbar',
+                cls         : 'btn-toolbar align-left',
                 iconCls     : 'toolbar__icon btn-convert-to-range',
                 caption     : this.textConvertRange,
-                style       : 'width: 100%;text-align: left;',
+                style       : 'width: 100%;',
                 dataHint    : '1',
                 dataHintDirection: 'left',
                 dataHintOffset: 'small'
@@ -338,10 +348,10 @@ define([
 
             this.btnRemDuplicates = new Common.UI.Button({
                 parentEl: $('#table-btn-rem-duplicates'),
-                cls         : 'btn-toolbar',
+                cls         : 'btn-toolbar align-left',
                 iconCls     : 'toolbar__icon btn-remove-duplicates',
                 caption     : this.textRemDuplicates,
-                style       : 'width: 100%;text-align: left;',
+                style       : 'width: 100%;',
                 dataHint    : '1',
                 dataHintDirection: 'left',
                 dataHintOffset: 'small'
@@ -353,10 +363,10 @@ define([
 
             this.btnSlicer = new Common.UI.Button({
                 parentEl: $('#table-btn-slicer'),
-                cls         : 'btn-toolbar',
+                cls         : 'btn-toolbar align-left',
                 iconCls     : 'toolbar__icon btn-slicer',
                 caption     : this.textSlicer,
-                style       : 'width: 100%;text-align: left;',
+                style       : 'width: 100%;',
                 dataHint    : '1',
                 dataHintDirection: 'left',
                 dataHintOffset: 'small'
@@ -366,10 +376,10 @@ define([
 
             this.btnPivot = new Common.UI.Button({
                 parentEl: $('#table-btn-pivot'),
-                cls         : 'btn-toolbar',
+                cls         : 'btn-toolbar align-left',
                 iconCls     : 'toolbar__icon btn-pivot-sum',
                 caption     : this.textPivot,
-                style       : 'width: 100%;text-align: left;',
+                style       : 'width: 100%;',
                 dataHint    : '1',
                 dataHintDirection: 'left',
                 dataHintOffset: 'small'