diff --git a/apps/spreadsheeteditor/main/app/template/ProtectRangesDlg.template b/apps/spreadsheeteditor/main/app/template/ProtectRangesDlg.template
index a4dfc88b41..2ea6064965 100644
--- a/apps/spreadsheeteditor/main/app/template/ProtectRangesDlg.template
+++ b/apps/spreadsheeteditor/main/app/template/ProtectRangesDlg.template
@@ -1,9 +1,6 @@
 <div class="settings-panel active">
     <div class="inner-content">
         <table cols="2" style="width: 100%;" role="presentation">
-            <tr>
-                <td colspan=2 class="padding-small"></td>
-            </tr>
             <tr>
                 <td colspan=2 class="padding-small">
                     <label><%= scope.textRangesDesc %></label>
diff --git a/apps/spreadsheeteditor/main/app/view/ChartDataDialog.js b/apps/spreadsheeteditor/main/app/view/ChartDataDialog.js
index b084423e47..3b66531484 100644
--- a/apps/spreadsheeteditor/main/app/view/ChartDataDialog.js
+++ b/apps/spreadsheeteditor/main/app/view/ChartDataDialog.js
@@ -52,7 +52,7 @@ define([
 
             _.extend(this.options, {
                 title: this.textTitle,
-                contentStyle: 'padding: 0 10px;',
+                contentStyle: 'padding: 5px 5px 0;',
                 contentTemplate: _.template([
                     '<div class="settings-panel active">',
                         '<div class="inner-content">',
diff --git a/apps/spreadsheeteditor/main/app/view/ChartTypeDialog.js b/apps/spreadsheeteditor/main/app/view/ChartTypeDialog.js
index 87aca4b2c5..dc5129df60 100644
--- a/apps/spreadsheeteditor/main/app/view/ChartTypeDialog.js
+++ b/apps/spreadsheeteditor/main/app/view/ChartTypeDialog.js
@@ -74,7 +74,7 @@ define([
 
             _.extend(this.options, {
                 title: this.textTitle,
-                contentStyle: 'padding: 0 10px;',
+                contentStyle: 'padding: 5px 5px 0;',
                 contentTemplate: _.template([
                     '<div class="settings-panel active">',
                         '<div class="inner-content">',
diff --git a/apps/spreadsheeteditor/main/app/view/CreatePivotDialog.js b/apps/spreadsheeteditor/main/app/view/CreatePivotDialog.js
index 85bedaaa8c..8e2d42587e 100644
--- a/apps/spreadsheeteditor/main/app/view/CreatePivotDialog.js
+++ b/apps/spreadsheeteditor/main/app/view/CreatePivotDialog.js
@@ -52,7 +52,7 @@ define([
 
             _.extend(this.options, {
                 title: this.textTitle,
-                contentStyle: 'padding: 0 10px;',
+                contentStyle: 'padding: 5px 5px 0;',
                 contentTemplate: _.template([
                     '<div class="settings-panel active">',
                         '<div class="inner-content">',
diff --git a/apps/spreadsheeteditor/main/app/view/CreateSparklineDialog.js b/apps/spreadsheeteditor/main/app/view/CreateSparklineDialog.js
index 8dc8988433..26b544870e 100644
--- a/apps/spreadsheeteditor/main/app/view/CreateSparklineDialog.js
+++ b/apps/spreadsheeteditor/main/app/view/CreateSparklineDialog.js
@@ -51,7 +51,7 @@ define([
 
             _.extend(this.options, {
                 title: this.textTitle,
-                contentStyle: 'padding: 0 10px;',
+                contentStyle: 'padding: 5px 5px 0;',
                 contentTemplate: _.template([
                     '<div class="settings-panel active">',
                         '<div class="inner-content">',
diff --git a/apps/spreadsheeteditor/main/app/view/ExternalLinksDlg.js b/apps/spreadsheeteditor/main/app/view/ExternalLinksDlg.js
index ebf5a4ed44..e47419bf6a 100644
--- a/apps/spreadsheeteditor/main/app/view/ExternalLinksDlg.js
+++ b/apps/spreadsheeteditor/main/app/view/ExternalLinksDlg.js
@@ -57,7 +57,7 @@ define([
             var me = this;
             _.extend(this.options, {
                 title: this.txtTitle,
-                contentStyle: 'padding: 0;',
+                contentStyle: 'padding: 10px 0 0;',
                 contentTemplate: _.template([
                         '<div class="settings-panel active">',
                             '<div class="inner-content">',
diff --git a/apps/spreadsheeteditor/main/app/view/FillSeriesDialog.js b/apps/spreadsheeteditor/main/app/view/FillSeriesDialog.js
index ee9a14726c..08508a19c7 100644
--- a/apps/spreadsheeteditor/main/app/view/FillSeriesDialog.js
+++ b/apps/spreadsheeteditor/main/app/view/FillSeriesDialog.js
@@ -52,7 +52,7 @@ define([
 
             _.extend(this.options, {
                 title: this.textTitle,
-                contentStyle: 'padding: 0 5px;',
+                contentStyle: 'padding: 5px;',
                 contentTemplate: _.template([
                     '<div class="settings-panel active">',
                     '<div class="inner-content">',
diff --git a/apps/spreadsheeteditor/main/app/view/FormatRulesEditDlg.js b/apps/spreadsheeteditor/main/app/view/FormatRulesEditDlg.js
index cf7c9afec7..d230780c6f 100644
--- a/apps/spreadsheeteditor/main/app/view/FormatRulesEditDlg.js
+++ b/apps/spreadsheeteditor/main/app/view/FormatRulesEditDlg.js
@@ -57,7 +57,7 @@ define([
             
             _.extend(this.options, {
                 title: this.txtTitleNew,
-                contentStyle: 'padding: 0;',
+                contentStyle: 'padding: 5px 0 0;',
                 contentTemplate: _.template(contentTemplate)({scope: this})
             }, options);
 
@@ -1486,7 +1486,7 @@ define([
                 (cmbData.length>0) && this.cmbRule.setValue((ruleType!==undefined) ? ruleType : cmbData[0].value);
             }
             this.setControls(index, this.cmbRule.getValue());
-            this.setInnerHeight(index==9 ? 360 : 280);
+            this.setInnerHeight(index==9 ? 370 : 280);
 
             if (rec) {
                 var type = rec.get('type');
diff --git a/apps/spreadsheeteditor/main/app/view/FormatRulesManagerDlg.js b/apps/spreadsheeteditor/main/app/view/FormatRulesManagerDlg.js
index 7462c28269..2653676cb6 100644
--- a/apps/spreadsheeteditor/main/app/view/FormatRulesManagerDlg.js
+++ b/apps/spreadsheeteditor/main/app/view/FormatRulesManagerDlg.js
@@ -94,7 +94,7 @@ define([
             var me = this;
             _.extend(this.options, {
                 title: this.txtTitle,
-                contentStyle: 'padding: 0;',
+                contentStyle: 'padding: 5px 0 0;',
                 contentTemplate: _.template(contentTemplate)({scope: this})
             }, options);
 
diff --git a/apps/spreadsheeteditor/main/app/view/FormatSettingsDialog.js b/apps/spreadsheeteditor/main/app/view/FormatSettingsDialog.js
index 54ad0155b4..7214c777bb 100644
--- a/apps/spreadsheeteditor/main/app/view/FormatSettingsDialog.js
+++ b/apps/spreadsheeteditor/main/app/view/FormatSettingsDialog.js
@@ -44,7 +44,7 @@ define([
     SSE.Views.FormatSettingsDialog = Common.Views.AdvancedSettingsWindow.extend(_.extend({
         options: {
             contentWidth: 284,
-            contentHeight: 255
+            contentHeight: 260
         },
 
         initialize : function(options) {
@@ -84,11 +84,11 @@ define([
             this.props      = options.props;
             this.linked     = options.linked || false;
 
-            var height = this.linked ? 275 : 255;
+            var height = this.linked ? 275 : 260;
             _.extend(this.options, {
                 title: this.textTitle,
                 contentHeight: height,
-                contentStyle: 'padding: 0 10px;',
+                contentStyle: 'padding: 5px;',
                 contentTemplate: _.template([
                     '<div class="settings-panel active">',
                     '<div class="inner-content">',
diff --git a/apps/spreadsheeteditor/main/app/view/GoalSeekDlg.js b/apps/spreadsheeteditor/main/app/view/GoalSeekDlg.js
index 91e1aff7b4..2784c851c5 100644
--- a/apps/spreadsheeteditor/main/app/view/GoalSeekDlg.js
+++ b/apps/spreadsheeteditor/main/app/view/GoalSeekDlg.js
@@ -52,7 +52,7 @@ define([
 
             _.extend(this.options, {
                 title: this.textTitle,
-                contentStyle: 'padding: 0 10px;',
+                contentStyle: 'padding: 5px 5px 0;',
                 contentTemplate: _.template([
                     '<div class="settings-panel active">',
                         '<div class="inner-content">',
diff --git a/apps/spreadsheeteditor/main/app/view/GoalSeekStatusDlg.js b/apps/spreadsheeteditor/main/app/view/GoalSeekStatusDlg.js
index b99591a6d9..afd0f5aea2 100644
--- a/apps/spreadsheeteditor/main/app/view/GoalSeekStatusDlg.js
+++ b/apps/spreadsheeteditor/main/app/view/GoalSeekStatusDlg.js
@@ -52,7 +52,7 @@ define([
 
             _.extend(this.options, {
                 title: this.textTitle,
-                contentStyle: 'padding: 0 10px;',
+                contentStyle: 'padding: 10px 10px 0;',
                 contentTemplate: _.template([
                     '<div class="settings-panel active">',
                         '<div class="inner-content">',
diff --git a/apps/spreadsheeteditor/main/app/view/HyperlinkSettingsDialog.js b/apps/spreadsheeteditor/main/app/view/HyperlinkSettingsDialog.js
index 7dd39e0e71..7a965d76c9 100644
--- a/apps/spreadsheeteditor/main/app/view/HyperlinkSettingsDialog.js
+++ b/apps/spreadsheeteditor/main/app/view/HyperlinkSettingsDialog.js
@@ -74,8 +74,8 @@ define([], function () { 'use strict';
                             '<div class="get-link float-right">',
                                 '<label class="link dropdown-toggle float-right" data-toggle="dropdown" id="id-dlg-hyperlink-get-link">' + this.textGetLink + '</label>',
                                 '<div id="id-clip-copy-box" class="dropdown-menu">',
-                                    '<div id="id-dlg-clip-copy"></div>',
-                                    '<button id="id-dlg-copy-btn" class="btn btn-text-default margin-left-5">' + this.textCopy + '</button>',
+                                    '<div id="id-dlg-clip-copy" class="display-inline-block-middle"></div>',
+                                    '<button id="id-dlg-copy-btn" class="btn btn-text-default margin-left-5 display-inline-block-middle">' + this.textCopy + '</button>',
                                 '</div>',
                             '</div>',
                         '</div>',
diff --git a/apps/spreadsheeteditor/main/app/view/ImportFromXmlDialog.js b/apps/spreadsheeteditor/main/app/view/ImportFromXmlDialog.js
index f571f325e8..f1dc77764a 100644
--- a/apps/spreadsheeteditor/main/app/view/ImportFromXmlDialog.js
+++ b/apps/spreadsheeteditor/main/app/view/ImportFromXmlDialog.js
@@ -51,7 +51,7 @@ define([
 
             _.extend(this.options, {
                 title: this.textTitle,
-                contentStyle: 'padding: 0 10px;',
+                contentStyle: 'padding: 5px 5px 0;',
                 contentTemplate: _.template([
                     '<div class="settings-panel active">',
                         '<div class="inner-content">',
diff --git a/apps/spreadsheeteditor/main/app/view/NameManagerDlg.js b/apps/spreadsheeteditor/main/app/view/NameManagerDlg.js
index a3b998c9a3..2754c3b250 100644
--- a/apps/spreadsheeteditor/main/app/view/NameManagerDlg.js
+++ b/apps/spreadsheeteditor/main/app/view/NameManagerDlg.js
@@ -58,7 +58,7 @@ define([
             var me = this;
             _.extend(this.options, {
                 title: this.txtTitle,
-                contentStyle: 'padding: 0;',
+                contentStyle: 'padding: 5px 0 0;',
                 contentTemplate: _.template(contentTemplate)({scope: this})
             }, options);
 
diff --git a/apps/spreadsheeteditor/main/app/view/NamedRangeEditDlg.js b/apps/spreadsheeteditor/main/app/view/NamedRangeEditDlg.js
index b163de9de8..e2fe90db02 100644
--- a/apps/spreadsheeteditor/main/app/view/NamedRangeEditDlg.js
+++ b/apps/spreadsheeteditor/main/app/view/NamedRangeEditDlg.js
@@ -55,7 +55,7 @@ define([
             
             _.extend(this.options, {
                 title: this.txtTitleNew,
-                contentStyle: 'padding: 0;',
+                contentStyle: 'padding: 5px 0 0;',
                 contentTemplate: _.template([
                     '<div class="settings-panel active">',
                         '<div class="inner-content">',
diff --git a/apps/spreadsheeteditor/main/app/view/NamedRangePasteDlg.js b/apps/spreadsheeteditor/main/app/view/NamedRangePasteDlg.js
index 301c3026a8..06a886f22f 100644
--- a/apps/spreadsheeteditor/main/app/view/NamedRangePasteDlg.js
+++ b/apps/spreadsheeteditor/main/app/view/NamedRangePasteDlg.js
@@ -56,7 +56,7 @@ define([
 
             _.extend(this.options, {
                 title: this.txtTitle,
-                contentStyle: 'padding: 0;',
+                contentStyle: 'padding: 5px 0 0;',
                 contentTemplate: _.template([
                     '<div class="settings-panel active">',
                         '<div class="inner-content">',
diff --git a/apps/spreadsheeteditor/main/app/view/PivotShowDetailDialog.js b/apps/spreadsheeteditor/main/app/view/PivotShowDetailDialog.js
index 53d3bcdeb0..9f5925f1a5 100644
--- a/apps/spreadsheeteditor/main/app/view/PivotShowDetailDialog.js
+++ b/apps/spreadsheeteditor/main/app/view/PivotShowDetailDialog.js
@@ -56,7 +56,7 @@ define([
 
             _.extend(this.options, {
                 title: this.txtTitle,
-                contentStyle: 'padding: 0;',
+                contentStyle: 'padding: 5px 0 0;',
                 contentTemplate: _.template([
                     '<div class="settings-panel active">',
                         '<div class="inner-content">',
diff --git a/apps/spreadsheeteditor/main/app/view/ProtectRangesDlg.js b/apps/spreadsheeteditor/main/app/view/ProtectRangesDlg.js
index 9bbc2edad0..a8a183679b 100644
--- a/apps/spreadsheeteditor/main/app/view/ProtectRangesDlg.js
+++ b/apps/spreadsheeteditor/main/app/view/ProtectRangesDlg.js
@@ -57,7 +57,7 @@ define([
             var me = this;
             _.extend(this.options, {
                 title: this.txtTitle,
-                contentStyle: 'padding: 0;',
+                contentStyle: 'padding: 5px 0 0;',
                 contentTemplate: _.template(contentTemplate)({scope: this})
             }, options);
 
diff --git a/apps/spreadsheeteditor/main/app/view/ProtectedRangesManagerDlg.js b/apps/spreadsheeteditor/main/app/view/ProtectedRangesManagerDlg.js
index 8e8d3533fe..98381b0d2b 100644
--- a/apps/spreadsheeteditor/main/app/view/ProtectedRangesManagerDlg.js
+++ b/apps/spreadsheeteditor/main/app/view/ProtectedRangesManagerDlg.js
@@ -57,7 +57,7 @@ define([
             var me = this;
             _.extend(this.options, {
                 title: this.txtTitle,
-                contentStyle: 'padding: 0;',
+                contentStyle: 'padding: 5px 0 0;',
                 contentTemplate: _.template(contentTemplate)({scope: this})
             }, options);
 
diff --git a/apps/spreadsheeteditor/main/app/view/SortDialog.js b/apps/spreadsheeteditor/main/app/view/SortDialog.js
index d1ac465619..507ef2ad8f 100644
--- a/apps/spreadsheeteditor/main/app/view/SortDialog.js
+++ b/apps/spreadsheeteditor/main/app/view/SortDialog.js
@@ -79,7 +79,7 @@ define([
             var me = this;
             _.extend(this.options, {
                 title: this.txtTitle,
-                contentStyle: 'padding: 0;',
+                contentStyle: 'padding: 5px 0 0;',
                 contentTemplate: _.template(contentTemplate)({scope: this})
             }, options);
 
diff --git a/apps/spreadsheeteditor/main/app/view/SpecialPasteDialog.js b/apps/spreadsheeteditor/main/app/view/SpecialPasteDialog.js
index e1306a39ea..5f1c34c0ab 100644
--- a/apps/spreadsheeteditor/main/app/view/SpecialPasteDialog.js
+++ b/apps/spreadsheeteditor/main/app/view/SpecialPasteDialog.js
@@ -52,7 +52,7 @@ define([
 
             _.extend(this.options, {
                 title: this.textTitle,
-                contentStyle: 'padding: 0 5px;',
+                contentStyle: 'padding: 5px 5px 0;',
                 contentTemplate: _.template([
                     '<div class="settings-panel active">',
                         '<div class="inner-content">',
diff --git a/apps/spreadsheeteditor/main/app/view/ValueFieldSettingsDialog.js b/apps/spreadsheeteditor/main/app/view/ValueFieldSettingsDialog.js
index cc9712de17..cee22cf8d9 100644
--- a/apps/spreadsheeteditor/main/app/view/ValueFieldSettingsDialog.js
+++ b/apps/spreadsheeteditor/main/app/view/ValueFieldSettingsDialog.js
@@ -52,14 +52,14 @@ define([
 
             _.extend(this.options, {
                 title: this.textTitle,
-                contentStyle: 'padding: 0 10px;',
+                contentStyle: 'padding: 5px 5px 0;',
                 contentTemplate: _.template([
                     '<div class="settings-panel active">',
                     '<div class="inner-content">',
                         '<table cols="2" style="width: 100%;">',
                         '<tr>',
                             '<td colspan="2" class="padding-small" style="white-space: nowrap;">',
-                                '<label class="header" class="margin-right-4" style="vertical-align: middle;">' + me.txtSourceName + '</label>',
+                                '<label class="header margin-right-2" class="margin-right-4" style="vertical-align: middle;">' + me.txtSourceName + '</label>',
                                 '<label id="value-field-settings-source" style="vertical-align: middle; max-width: 220px; overflow: hidden; text-overflow: ellipsis;"></label>',
                             '</td>',
                         '</tr>',
diff --git a/apps/spreadsheeteditor/main/app/view/ViewManagerDlg.js b/apps/spreadsheeteditor/main/app/view/ViewManagerDlg.js
index 00ec9f2e17..5e76e91f93 100644
--- a/apps/spreadsheeteditor/main/app/view/ViewManagerDlg.js
+++ b/apps/spreadsheeteditor/main/app/view/ViewManagerDlg.js
@@ -59,7 +59,7 @@ define([
                     {value: 'ok', caption: this.textGoTo, primary: true},
                     'close'
                 ],
-                contentStyle: 'padding: 0;',
+                contentStyle: 'padding: 5px 0 0;',
                 contentTemplate: _.template([
                     '<div class="settings-panel active">',
                         '<div class="inner-content">',
diff --git a/apps/spreadsheeteditor/main/app/view/WatchDialog.js b/apps/spreadsheeteditor/main/app/view/WatchDialog.js
index 36e1fde2a7..caee31ed58 100644
--- a/apps/spreadsheeteditor/main/app/view/WatchDialog.js
+++ b/apps/spreadsheeteditor/main/app/view/WatchDialog.js
@@ -59,7 +59,7 @@ define([
             var me = this;
             _.extend(this.options, {
                 title: this.txtTitle,
-                contentStyle: 'padding: 0;',
+                contentStyle: 'padding: 10px 0 0;',
                 contentTemplate: _.template(contentTemplate)({scope: this})
             }, options);
 
diff --git a/apps/spreadsheeteditor/main/resources/less/advanced-settings.less b/apps/spreadsheeteditor/main/resources/less/advanced-settings.less
index cc955510cd..a5f55ab60a 100644
--- a/apps/spreadsheeteditor/main/resources/less/advanced-settings.less
+++ b/apps/spreadsheeteditor/main/resources/less/advanced-settings.less
@@ -415,8 +415,8 @@
         .preview-databar {
             border: 1px solid #cbcbcb;
             width: 150px;
-            height: 40px;
-            padding: 3px;
+            height: 24px;
+            padding: 2px;
             #format-rules-edit-preview-databar {
                 width: 100%;
                 height: 100%;
@@ -591,7 +591,6 @@
 
 #window-goal-seek-status {
     .settings-panel {
-        margin-top: 16px;
         .row-1 {
             width: 100%;
             display: flex;