diff --git a/apps/presentationeditor/main/app/template/ShapeSettings.template b/apps/presentationeditor/main/app/template/ShapeSettings.template
index 97967fdfcb..76d5743891 100644
--- a/apps/presentationeditor/main/app/template/ShapeSettings.template
+++ b/apps/presentationeditor/main/app/template/ShapeSettings.template
@@ -206,7 +206,7 @@
             </div>
         </td>
     </tr>
-    <tr>
+    <tr class="change-type">
         <td class="padding-small" colspan=2>
             <div class="separator horizontal"></div>
         </td>
diff --git a/apps/presentationeditor/main/app/view/ShapeSettings.js b/apps/presentationeditor/main/app/view/ShapeSettings.js
index e5231a3246..4cd8d32212 100644
--- a/apps/presentationeditor/main/app/view/ShapeSettings.js
+++ b/apps/presentationeditor/main/app/view/ShapeSettings.js
@@ -1214,9 +1214,6 @@ define([
                     this._state.GradColor = color;
                 }
 
-                //TODO: Измненить на новую кнопку
-                //this.chShadow.setDisabled(!!props.get_FromChart() || this._locked);
-
 
                 var shadow = props.asc_getShadow(),
                     shadowPresetRecord = null;
@@ -1736,7 +1733,7 @@ define([
                 parentEl: $('#shape-button-shadow-shape'),
                 cls: 'btn-toolbar align-left',
                 caption: this.textShadow,
-                iconCls: 'toolbar__icon btn-menu-shape',
+                iconCls: 'toolbar__icon btn-shadow',
                 style: "width:100%;",
                 menu: true,
                 dataHint: '1',
@@ -2010,6 +2007,7 @@ define([
             shadowProps.putColor(Common.Utils.ThemeColor.getRgbColor(color));
             shapeProps.asc_putShadow(shadowProps);
             this.api.ShapeApply(shapeProps);
+            this.fireEvent('editcomplete', this);
         },
         
         onApiAutoShapes: function(btnChangeShape) {
diff --git a/apps/presentationeditor/main/app/view/ShapeShadowDialog.js b/apps/presentationeditor/main/app/view/ShapeShadowDialog.js
index 7faf2d9675..8373c7195a 100644
--- a/apps/presentationeditor/main/app/view/ShapeShadowDialog.js
+++ b/apps/presentationeditor/main/app/view/ShapeShadowDialog.js
@@ -138,7 +138,8 @@ define([
                 el: $('#shape-shadow-transparency-spin'),
                 step: 1,
                 width: 62,
-                value: this.oldTransparency + ' %',
+                allowDecimal: false,
+                value: '0 %',
                 defaultUnit : "%",
                 maxValue: 100,
                 minValue: 0,
@@ -146,6 +147,7 @@ define([
                 dataHintDirection: 'bottom',
                 dataHintOffset: 'big'
             });
+            this.spinTransparency.setValue(this.oldTransparency, true);
             this.spinTransparency.on('change', _.bind(this.onSpinnerTransparencyChange, this));
 
 
@@ -162,7 +164,8 @@ define([
                 el: $('#shape-shadow-size-spin'),
                 step: 1,
                 width: 62,
-                value: this.oldSize + ' %',
+                allowDecimal: false,
+                value: '0 %',
                 defaultUnit : "%",
                 maxValue: 200,
                 minValue: 1,
@@ -170,6 +173,7 @@ define([
                 dataHintDirection: 'bottom',
                 dataHintOffset: 'big'
             });
+            this.spinSize.setValue(this.oldSize, true);
             this.spinSize.on('change', _.bind(this.onSpinnerSizeChange, this));
 
 
@@ -187,7 +191,8 @@ define([
                 el: $('#shape-shadow-angle-spin'),
                 step: 1,
                 width: 62,
-                value: this.oldAngle + ' °',
+                allowDecimal: false,
+                value: '0 °',
                 defaultUnit : "°",
                 maxValue: 359,
                 minValue: 0,
@@ -195,6 +200,7 @@ define([
                 dataHintDirection: 'bottom',
                 dataHintOffset: 'big'
             });
+            this.spinAngle.setValue(this.oldAngle, true);
             this.spinAngle.on('change', _.bind(this.onSpinnerAngleChange, this));
 
 
@@ -222,6 +228,7 @@ define([
                 dataHintDirection: 'bottom',
                 dataHintOffset: 'big'
             });
+            this.spinDistance.setValue(this.oldDistance, true);
             this.spinDistance.on('change', _.bind(this.onSpinnerDistanceChange, this));