diff --git a/apps/common/main/lib/component/ThemeColorPalette.js b/apps/common/main/lib/component/ThemeColorPalette.js
index 7a6361078c..cedc96e697 100644
--- a/apps/common/main/lib/component/ThemeColorPalette.js
+++ b/apps/common/main/lib/component/ThemeColorPalette.js
@@ -365,6 +365,12 @@ define([
                     aEffectIdx++;
                 }
             }
+
+            var selected = $(this.el).find('a.' + this.selectedCls);
+            if (selected.length && selected.hasClass('palette-color-effect')) {
+                this.value = selected[0].className.match(this.colorRe)[1].toUpperCase();
+            }
+
             this.options.updateColorsArr = undefined;
         },
 
diff --git a/apps/common/main/resources/less/asc-mixins.less b/apps/common/main/resources/less/asc-mixins.less
index 69a4fcedc9..382d03dbfe 100644
--- a/apps/common/main/resources/less/asc-mixins.less
+++ b/apps/common/main/resources/less/asc-mixins.less
@@ -74,7 +74,7 @@
 }
 
 .options-btn-icon(@icon-class, @index, @icon-size) {
-                      .@{icon-class} {background-position:   -@icon-size -@index*@icon-size;}
+                      .@{icon-class} {background-position:   0 -@index*@icon-size;}
     button.over     > .@{icon-class} {background-position: -1*@icon-size -@index*@icon-size;}
 //    .btn-group.open > .@{icon-class},
     button.active   > .@{icon-class},
diff --git a/apps/documenteditor/main/app/view/TableSettings.js b/apps/documenteditor/main/app/view/TableSettings.js
index fb360ef6b9..7600349a15 100644
--- a/apps/documenteditor/main/app/view/TableSettings.js
+++ b/apps/documenteditor/main/app/view/TableSettings.js
@@ -687,8 +687,10 @@ define([
         UpdateThemeColors: function() {
             if (this.colorsBack)
                 this.colorsBack.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors());
-            if (this.borderColor)
+            if (this.borderColor) {
                 this.borderColor.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors());
+                this.btnBorderColor.setColor(this.borderColor.getColor());
+            }
         },
 
         _onInitTemplates: function(Templates){
diff --git a/apps/presentationeditor/main/app/view/TableSettings.js b/apps/presentationeditor/main/app/view/TableSettings.js
index 9f9b2220d6..138a59e38f 100644
--- a/apps/presentationeditor/main/app/view/TableSettings.js
+++ b/apps/presentationeditor/main/app/view/TableSettings.js
@@ -583,8 +583,10 @@ define([
         UpdateThemeColors: function() {
             if (this.colorsBack)
                 this.colorsBack.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors());
-            if (this.borderColor)
+            if (this.borderColor) {
                 this.borderColor.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors());
+                this.btnBorderColor.setColor(this.borderColor.getColor());
+            }
         },
 
         _onInitTemplates: function(Templates){