diff --git a/apps/documenteditor/main/app/template/ImageSettingsAdvanced.template b/apps/documenteditor/main/app/template/ImageSettingsAdvanced.template
index b549d867e3..8af0473dc9 100644
--- a/apps/documenteditor/main/app/template/ImageSettingsAdvanced.template
+++ b/apps/documenteditor/main/app/template/ImageSettingsAdvanced.template
@@ -2,19 +2,19 @@
     <div class="inner-content">
     <table cols="4" width="100%">
         <tr>
-            <td width="88px">
+            <td width="78px">
                 <label class="input-label"><%= scope.textWidth %></label>
                 <div id="image-advanced-spin-width"></div>
             </td>
             <td width="28px" style="vertical-align: bottom;">
                 <div id="image-advanced-button-ratio"></div>
             </td>
-            <td width="88px">
+            <td width="78px">
                 <label class="input-label"><%= scope.textHeight %></label>
                 <div id="image-advanced-spin-height"></div>
             </td>
             <td style="vertical-align: bottom;">
-                <button type="button" class="btn btn-text-default" id="image-advanced-button-original-size" style="width:100px;"><%= scope.textOriginalSize %></button>
+                <button type="button" class="btn btn-text-default auto" id="image-advanced-button-original-size" style="min-width:100px;"><%= scope.textOriginalSize %></button>
             </td>
         </tr>
     </table>
diff --git a/apps/documenteditor/main/app/view/ImageSettingsAdvanced.js b/apps/documenteditor/main/app/view/ImageSettingsAdvanced.js
index d5bd5ad40b..c9a4486084 100644
--- a/apps/documenteditor/main/app/view/ImageSettingsAdvanced.js
+++ b/apps/documenteditor/main/app/view/ImageSettingsAdvanced.js
@@ -117,7 +117,7 @@ define([    'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat
             this.spnWidth = new Common.UI.MetricSpinner({
                 el: $('#image-advanced-spin-width'),
                 step: .1,
-                width: 80,
+                width: 70,
                 defaultUnit : "cm",
                 value: '3 cm',
                 maxValue: 55.88,
@@ -145,7 +145,7 @@ define([    'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat
             this.spnHeight = new Common.UI.MetricSpinner({
                 el: $('#image-advanced-spin-height'),
                 step: .1,
-                width: 80,
+                width: 70,
                 defaultUnit : "cm",
                 value: '3 cm',
                 maxValue: 55.88,
diff --git a/apps/presentationeditor/main/app/template/ImageSettingsAdvanced.template b/apps/presentationeditor/main/app/template/ImageSettingsAdvanced.template
index 337aff709d..1a38e6b2f2 100644
--- a/apps/presentationeditor/main/app/template/ImageSettingsAdvanced.template
+++ b/apps/presentationeditor/main/app/template/ImageSettingsAdvanced.template
@@ -7,19 +7,19 @@
                 </td>
             </tr>
             <tr>
-                <td width="88px" class="padding-large">
+                <td width="78px" class="padding-large">
                     <label class="input-label"><%= scope.textWidth %></label>
                     <div id="image-advanced-spin-width"></div>
                 </td>
                 <td width="28px" style="vertical-align: bottom;" class="padding-large">
                     <div id="image-advanced-button-ratio"></div>
                 </td>
-                <td width="88px" class="padding-large">
+                <td width="78px" class="padding-large">
                     <label class="input-label"><%= scope.textHeight %></label>
                     <div id="image-advanced-spin-height"></div>
                 </td>
                 <td style="vertical-align: bottom;" class="padding-large">
-                    <button type="button" class="btn btn-text-default" id="image-advanced-button-original-size" style="width:100px;"><%= scope.textOriginalSize %></button>
+                    <button type="button" class="btn btn-text-default auto" id="image-advanced-button-original-size" style="min-width:100px;"><%= scope.textOriginalSize %></button>
                 </td>
             </tr>
         </table>
diff --git a/apps/presentationeditor/main/app/view/ImageSettingsAdvanced.js b/apps/presentationeditor/main/app/view/ImageSettingsAdvanced.js
index 54a8740377..665b8fa042 100644
--- a/apps/presentationeditor/main/app/view/ImageSettingsAdvanced.js
+++ b/apps/presentationeditor/main/app/view/ImageSettingsAdvanced.js
@@ -84,7 +84,7 @@ define([    'text!presentationeditor/main/app/template/ImageSettingsAdvanced.tem
             this.spnWidth = new Common.UI.MetricSpinner({
                 el: $('#image-advanced-spin-width'),
                 step: .1,
-                width: 80,
+                width: 70,
                 defaultUnit : "cm",
                 value: '3 cm',
                 maxValue: 55.88,
@@ -108,7 +108,7 @@ define([    'text!presentationeditor/main/app/template/ImageSettingsAdvanced.tem
             this.spnHeight = new Common.UI.MetricSpinner({
                 el: $('#image-advanced-spin-height'),
                 step: .1,
-                width: 80,
+                width: 70,
                 defaultUnit : "cm",
                 value: '3 cm',
                 maxValue: 55.88,