diff --git a/ButtonBar.lua b/ButtonBar.lua
index f0fa5a4..494b42f 100644
--- a/ButtonBar.lua
+++ b/ButtonBar.lua
@@ -162,13 +162,10 @@ function ButtonBar:UpdateButtonLayout()
 	if not LBF then
 		for i = 1, #buttons do
 			local button = buttons[i]
-			if button.icon then
+			if button.icon and self.config.skin.Zoom then
 				button.icon:SetTexCoord(0.07,0.93,0.07,0.93)
-				if self.config.skin.Zoom then
-					button.normalTexture:Hide()
-				else
-					button.normalTexture:Show()
-				end
+			elseif button.icon then
+				button.icon:SetTexCoord(0,1,0,1)
 			end
 		end
 	end
diff --git a/Options/ButtonBar.lua b/Options/ButtonBar.lua
index c950c90..3388bb9 100644
--- a/Options/ButtonBar.lua
+++ b/Options/ButtonBar.lua
@@ -64,9 +64,9 @@ function ButtonBar:GetOptionObject()
 		},
 		zoom = {
 			order = 59,
-			name = L["Button Border"],
+			name = L["Zoom"],
 			type = "toggle",
-			desc = L["Toggle Button Border\nFor more style options you need to install ButtonFacade"],
+			desc = L["Toggle Button Zoom\nFor more style options you need to install ButtonFacade"],
 			get = optGetter,
 			set = optSetter,
 			hidden = function() return LibStub("LibButtonFacade", true) and true or false end,
diff --git a/locale/deDE.lua b/locale/deDE.lua
index ae2d74a..e137279 100644
--- a/locale/deDE.lua
+++ b/locale/deDE.lua
@@ -17,7 +17,6 @@ if not L then return end
 -- L["Bars unlocked. Move them now and click Lock when you are done."] = true
 -- L["Bartender4"] = true
 -- L["Button %s"] = true
--- L["Button Border"] = true
 -- L["Button Grid"] = true
 -- L["Button Lock"] = true
 -- L["Button Look"] = true
@@ -124,7 +123,7 @@ if not L then return end
 -- L["The default behaviour of this bar when no state-based paging option affects it."] = true
 -- L["This bar will be hidden once you enter combat."] = true
 -- L["This bar will be hidden whenever you are not in combat."] = true
--- L["Toggle Button Border\nFor more style options you need to install ButtonFacade"] = true
+-- L["Toggle Button Zoom\nFor more style options you need to install ButtonFacade"] = true
 -- L["Toggle the button grid."] = true
 -- L["Toggle the use of the modifier-based focus-cast functionality."] = true
 -- L["Toggle the use of the modifier-based self-cast functionality."] = true
@@ -135,5 +134,6 @@ if not L then return end
 -- L["You can set the bar to be always hidden, if you only wish to access it using key-bindings."] = true
 -- L["You can use any macro conditionals in the custom string, using \"show\" and \"hide\" as values.\n\nExample: [combat]hide;show"] = true
 -- L["You can use any macro conditionals in the custom string, using the number of the bar as target value.\nExample: [form:1]9;0"] = true
+-- L["Zoom"] = true
 -- L["|cffffff00Click|r to toggle bar lock"] = true
 -- L["|cffffff00Right-click|r to open the options menu"] = true
diff --git a/locale/enUS.lua b/locale/enUS.lua
index 901a72b..307607e 100644
--- a/locale/enUS.lua
+++ b/locale/enUS.lua
@@ -17,7 +17,6 @@ L["Bars"] = true
 L["Bars unlocked. Move them now and click Lock when you are done."] = true
 L["Bartender4"] = true
 L["Button %s"] = true
-L["Button Border"] = true
 L["Button Grid"] = true
 L["Button Lock"] = true
 L["Button Look"] = true
@@ -124,7 +123,7 @@ L["The bar default is to be visible all the time, you can configure conditions h
 L["The default behaviour of this bar when no state-based paging option affects it."] = true
 L["This bar will be hidden once you enter combat."] = true
 L["This bar will be hidden whenever you are not in combat."] = true
-L["Toggle Button Border\nFor more style options you need to install ButtonFacade"] = true
+L["Toggle Button Zoom\nFor more style options you need to install ButtonFacade"] = true
 L["Toggle the button grid."] = true
 L["Toggle the use of the modifier-based focus-cast functionality."] = true
 L["Toggle the use of the modifier-based self-cast functionality."] = true
@@ -135,5 +134,6 @@ L["XP Bar"] = true
 L["You can set the bar to be always hidden, if you only wish to access it using key-bindings."] = true
 L["You can use any macro conditionals in the custom string, using \"show\" and \"hide\" as values.\n\nExample: [combat]hide;show"] = true
 L["You can use any macro conditionals in the custom string, using the number of the bar as target value.\nExample: [form:1]9;0"] = true
+L["Zoom"] = true
 L["|cffffff00Click|r to toggle bar lock"] = true
 L["|cffffff00Right-click|r to open the options menu"] = true
diff --git a/locale/esES.lua b/locale/esES.lua
index 98aced1..49549c3 100644
--- a/locale/esES.lua
+++ b/locale/esES.lua
@@ -17,7 +17,6 @@ if not L then return end
 -- L["Bars unlocked. Move them now and click Lock when you are done."] = true
 -- L["Bartender4"] = true
 -- L["Button %s"] = true
--- L["Button Border"] = true
 -- L["Button Grid"] = true
 -- L["Button Lock"] = true
 -- L["Button Look"] = true
@@ -124,7 +123,7 @@ if not L then return end
 -- L["The default behaviour of this bar when no state-based paging option affects it."] = true
 -- L["This bar will be hidden once you enter combat."] = true
 -- L["This bar will be hidden whenever you are not in combat."] = true
--- L["Toggle Button Border\nFor more style options you need to install ButtonFacade"] = true
+-- L["Toggle Button Zoom\nFor more style options you need to install ButtonFacade"] = true
 -- L["Toggle the button grid."] = true
 -- L["Toggle the use of the modifier-based focus-cast functionality."] = true
 -- L["Toggle the use of the modifier-based self-cast functionality."] = true
@@ -135,5 +134,6 @@ if not L then return end
 -- L["You can set the bar to be always hidden, if you only wish to access it using key-bindings."] = true
 -- L["You can use any macro conditionals in the custom string, using \"show\" and \"hide\" as values.\n\nExample: [combat]hide;show"] = true
 -- L["You can use any macro conditionals in the custom string, using the number of the bar as target value.\nExample: [form:1]9;0"] = true
+-- L["Zoom"] = true
 -- L["|cffffff00Click|r to toggle bar lock"] = true
 -- L["|cffffff00Right-click|r to open the options menu"] = true
diff --git a/locale/esMX.lua b/locale/esMX.lua
index 7f608ea..48c5968 100644
--- a/locale/esMX.lua
+++ b/locale/esMX.lua
@@ -17,7 +17,6 @@ if not L then return end
 -- L["Bars unlocked. Move them now and click Lock when you are done."] = true
 -- L["Bartender4"] = true
 -- L["Button %s"] = true
--- L["Button Border"] = true
 -- L["Button Grid"] = true
 -- L["Button Lock"] = true
 -- L["Button Look"] = true
@@ -124,7 +123,7 @@ if not L then return end
 -- L["The default behaviour of this bar when no state-based paging option affects it."] = true
 -- L["This bar will be hidden once you enter combat."] = true
 -- L["This bar will be hidden whenever you are not in combat."] = true
--- L["Toggle Button Border\nFor more style options you need to install ButtonFacade"] = true
+-- L["Toggle Button Zoom\nFor more style options you need to install ButtonFacade"] = true
 -- L["Toggle the button grid."] = true
 -- L["Toggle the use of the modifier-based focus-cast functionality."] = true
 -- L["Toggle the use of the modifier-based self-cast functionality."] = true
@@ -135,5 +134,6 @@ if not L then return end
 -- L["You can set the bar to be always hidden, if you only wish to access it using key-bindings."] = true
 -- L["You can use any macro conditionals in the custom string, using \"show\" and \"hide\" as values.\n\nExample: [combat]hide;show"] = true
 -- L["You can use any macro conditionals in the custom string, using the number of the bar as target value.\nExample: [form:1]9;0"] = true
+-- L["Zoom"] = true
 -- L["|cffffff00Click|r to toggle bar lock"] = true
 -- L["|cffffff00Right-click|r to open the options menu"] = true
diff --git a/locale/frFR.lua b/locale/frFR.lua
index dc4d061..6c6d05b 100644
--- a/locale/frFR.lua
+++ b/locale/frFR.lua
@@ -17,7 +17,6 @@ L["Bars"] = "Barres"
 L["Bars unlocked. Move them now and click Lock when you are done."] = "Barres déverrouillées. Déplacez-les maintenant et cliquez sur Verr. une fois que vous avez terminé."
 L["Bartender4"] = "Bartender4"
 -- L["Button %s"] = true
--- L["Button Border"] = true
 L["Button Grid"] = "Grille des boutons"
 L["Button Lock"] = "Verrouiller les boutons"
 L["Button Look"] = "Look des boutons"
@@ -124,7 +123,7 @@ L["The bar default is to be visible all the time, you can configure conditions h
 L["The default behaviour of this bar when no state-based paging option affects it."] = "Le comportement par défaut de cette barre quand les options de permutation basées sur les états ne l'affecte pas."
 L["This bar will be hidden once you enter combat."] = "Cache cette barre quand vous êtes en combat."
 L["This bar will be hidden whenever you are not in combat."] = "Cache cette barre quand vous n'êtes pas en combat."
--- L["Toggle Button Border\nFor more style options you need to install ButtonFacade"] = true
+L["Toggle Button Zoom\nFor more style options you need to install ButtonFacade"] = "Zoome ou non sur les boutons.\nPour plus d'options de style, installez ButtonFacade."
 L["Toggle the button grid."] = "Affiche ou non la grille des boutons."
 L["Toggle the use of the modifier-based focus-cast functionality."] = "Utilise ou non la fonctionnalité du ciblage de la focalisation basée sur les modificateurs."
 L["Toggle the use of the modifier-based self-cast functionality."] = "Utilise ou non la fonctionnalité d'auto-ciblage basée sur les modificateurs."
@@ -135,5 +134,6 @@ L["XP Bar"] = "Barre d'expérience"
 L["You can set the bar to be always hidden, if you only wish to access it using key-bindings."] = "Vous pouvez configurer la barre afin qu'elle soit toujours cachée si vous ne souhaitez y accéder que via des raccourcis claviers."
 L["You can use any macro conditionals in the custom string, using \"show\" and \"hide\" as values.\n\nExample: [combat]hide;show"] = "Vous pouvez utiliser n'importe quelles conditionnelles des macros dans le string personnalisé, en utilisant \"show\" et \"hide\" comme valeurs.\n\nExemple : [combat]hide;show"
 L["You can use any macro conditionals in the custom string, using the number of the bar as target value.\nExample: [form:1]9;0"] = "Vous pouvez utiliser n'importe quelles conditionnelles des macros dans le string personnalisé, en utilisant le numéro de la barre comme valeur-cible.\n\nExemple : [form:1]9;0"
+L["Zoom"] = "Zoom"
 L["|cffffff00Click|r to toggle bar lock"] = "|cffffff00Clic gauche|r pour (dé)verrouiller les barres."
 L["|cffffff00Right-click|r to open the options menu"] = "|cffffff00Clic droit|r pour ouvrir le menu des options."
diff --git a/locale/koKR.lua b/locale/koKR.lua
index 0935196..e8bb1c8 100644
--- a/locale/koKR.lua
+++ b/locale/koKR.lua
@@ -17,7 +17,6 @@ L["Bars"] = "바"
 -- L["Bars unlocked. Move them now and click Lock when you are done."] = true
 -- L["Bartender4"] = true
 -- L["Button %s"] = true
--- L["Button Border"] = true
 L["Button Grid"] = "버튼 무늬"
 L["Button Lock"] = "버튼 고정"
 L["Button Look"] = "버튼 외형"
@@ -124,7 +123,7 @@ L["The bar default is to be visible all the time, you can configure conditions h
 L["The default behaviour of this bar when no state-based paging option affects it."] = "형세-기반에 근거한 페이지 교체 옵션에 영향을 미치지 않는 경우에 이 바의 기본 동작을 설정합니다."
 L["This bar will be hidden once you enter combat."] = "현재 행동바는 전투에 참가하면 숨겨집니다."
 L["This bar will be hidden whenever you are not in combat."] = "현재 행동바는 전투가 종료되면 숨겨집니다."
--- L["Toggle Button Border\nFor more style options you need to install ButtonFacade"] = true
+L["Toggle Button Zoom\nFor more style options you need to install ButtonFacade"] = "버튼 확대를 전환합니다. /n보다 더 많은 양식 옵션을 위해서는 애드온 ButtonFacade의 설치가 필요합니다."
 L["Toggle the button grid."] = "버튼 무늬를 전환합니다."
 -- L["Toggle the use of the modifier-based focus-cast functionality."] = true
 L["Toggle the use of the modifier-based self-cast functionality."] = "기능키-기반 자신에게 시전 기능의 사용을 전환합니다."
@@ -135,5 +134,6 @@ L["Visibility"] = "보이기"
 L["You can set the bar to be always hidden, if you only wish to access it using key-bindings."] = "단축키로 지정해서 사용한다면 모든 바를 숨길 수 있습니다."
 L["You can use any macro conditionals in the custom string, using \"show\" and \"hide\" as values.\n\nExample: [combat]hide;show"] = "매크로 조건을 통해 바의 상태를 변경할 수 있습니다. 예를 들어 '보기', '숨기기' 등은 [combat]hide;show와 같이 사용이 가능합니다."
 -- L["You can use any macro conditionals in the custom string, using the number of the bar as target value.\nExample: [form:1]9;0"] = true
+L["Zoom"] = "확대"
 L["|cffffff00Click|r to toggle bar lock"] = "|cffffff00클릭|r하면 바를 고정합니다."
 L["|cffffff00Right-click|r to open the options menu"] = "|cffffff00오른쪽 클릭|r하면 설정 창을 엽니다."
diff --git a/locale/ruRU.lua b/locale/ruRU.lua
index f5614e4..4cbd20c 100644
--- a/locale/ruRU.lua
+++ b/locale/ruRU.lua
@@ -17,7 +17,6 @@ L["Bars"] = "Панели"
 -- L["Bars unlocked. Move them now and click Lock when you are done."] = true
 -- L["Bartender4"] = true
 -- L["Button %s"] = true
--- L["Button Border"] = true
 L["Button Grid"] = "Пустые кнопоки"
 L["Button Lock"] = "Блокировать кнопки"
 L["Button Look"] = "Вид кнопок"
@@ -124,7 +123,7 @@ L["The Alignment menu is still on the TODO.\n\nAs a quick preview of whats plann
 L["The default behaviour of this bar when no state-based paging option affects it."] = "Поведение данной панели когда она не попадает под какие-либо другие модификаторы состояния."
 -- L["This bar will be hidden once you enter combat."] = true
 -- L["This bar will be hidden whenever you are not in combat."] = true
--- L["Toggle Button Border\nFor more style options you need to install ButtonFacade"] = true
+L["Toggle Button Zoom\nFor more style options you need to install ButtonFacade"] = "Переключение увеличения кнопок\nДля дополнительных стилей и настроек необходимо установить ButtonFacade"
 L["Toggle the button grid."] = "Переключение отображения пустых кнопок."
 -- L["Toggle the use of the modifier-based focus-cast functionality."] = true
 L["Toggle the use of the modifier-based self-cast functionality."] = "Переключение использования функции Чтение на себя по умолчанию."
@@ -135,5 +134,6 @@ L["Toggle the use of the right-click self-cast functionality."] = "Перекл
 -- L["You can set the bar to be always hidden, if you only wish to access it using key-bindings."] = true
 -- L["You can use any macro conditionals in the custom string, using \"show\" and \"hide\" as values.\n\nExample: [combat]hide;show"] = true
 -- L["You can use any macro conditionals in the custom string, using the number of the bar as target value.\nExample: [form:1]9;0"] = true
+L["Zoom"] = "Увеличение"
 -- L["|cffffff00Click|r to toggle bar lock"] = true
 -- L["|cffffff00Right-click|r to open the options menu"] = true
diff --git a/locale/zhCN.lua b/locale/zhCN.lua
index 6543cf6..712022e 100644
--- a/locale/zhCN.lua
+++ b/locale/zhCN.lua
@@ -17,7 +17,6 @@ L["Bars"] = "动作条"
 L["Bars unlocked. Move them now and click Lock when you are done."] = "动作条已解锁. 现在可以移动，完成后点击锁定."
 L["Bartender4"] = "Bartender4"
 -- L["Button %s"] = true
--- L["Button Border"] = true
 L["Button Grid"] = "显示空按钮"
 L["Button Lock"] = "按钮锁定"
 L["Button Look"] = "按钮外观"
@@ -124,7 +123,7 @@ L["The bar default is to be visible all the time, you can configure conditions h
 L["The default behaviour of this bar when no state-based paging option affects it."] = "当没有状态配置作用于该动作条时的动作条默认行为"
 L["This bar will be hidden once you enter combat."] = "当你进入战斗状态时将隐藏."
 L["This bar will be hidden whenever you are not in combat."] = "当你脱离战斗状态时将隐藏."
--- L["Toggle Button Border\nFor more style options you need to install ButtonFacade"] = true
+L["Toggle Button Zoom\nFor more style options you need to install ButtonFacade"] = "开启/关闭 按钮缩放\n若需要进一步改变按钮风格，您需要安装插件ButtonFacade"
 L["Toggle the button grid."] = "勾选该选项将显示空的按钮。"
 L["Toggle the use of the modifier-based focus-cast functionality."] = "关闭/开启 焦点施法功能。"
 L["Toggle the use of the modifier-based self-cast functionality."] = "关闭/开启 自我施法功能。"
@@ -135,5 +134,6 @@ L["XP Bar"] = "经验条"
 L["You can set the bar to be always hidden, if you only wish to access it using key-bindings."] = "你能设置动作条一直隐藏,仅用按键绑定来使用动作条."
 L["You can use any macro conditionals in the custom string, using \"show\" and \"hide\" as values.\n\nExample: [combat]hide;show"] = "你可以在自定义字符串里使用任意宏命令条件, 使用 \"show\" 和 \"hide\" 为参数值.\n\n例如: [combat]hide;show"
 L["You can use any macro conditionals in the custom string, using the number of the bar as target value.\nExample: [form:1]9;0"] = "你可以在自定义字符串里使用任意宏命令条件, 使用动作条编号为目标参数值.\n例如: [form:1]9;0"
+L["Zoom"] = "缩放"
 L["|cffffff00Click|r to toggle bar lock"] = "|cffffff00点击|r 锁定/解锁动作条"
 L["|cffffff00Right-click|r to open the options menu"] = "|cffffff00右键点击|r 打开选项菜单"
diff --git a/locale/zhTW.lua b/locale/zhTW.lua
index 4154b7c..2de68fb 100644
--- a/locale/zhTW.lua
+++ b/locale/zhTW.lua
@@ -17,7 +17,6 @@ L["Bars"] = "動作條"
 -- L["Bars unlocked. Move them now and click Lock when you are done."] = true
 -- L["Bartender4"] = true
 -- L["Button %s"] = true
--- L["Button Border"] = true
 L["Button Grid"] = "顯示空按鈕"
 L["Button Lock"] = "按鈕鎖定"
 L["Button Look"] = "按鈕外觀"
@@ -124,7 +123,7 @@ L["The Alignment menu is still on the TODO.\n\nAs a quick preview of whats plann
 L["The default behaviour of this bar when no state-based paging option affects it."] = "沒有狀態設定於動作條為此動作條預設行為"
 -- L["This bar will be hidden once you enter combat."] = true
 -- L["This bar will be hidden whenever you are not in combat."] = true
--- L["Toggle Button Border\nFor more style options you need to install ButtonFacade"] = true
+L["Toggle Button Zoom\nFor more style options you need to install ButtonFacade"] = "切換按鈕放大/n 如需更多風格的按鈕你需要安裝 ButtonFacade"
 L["Toggle the button grid."] = "顯示空白按鈕"
 -- L["Toggle the use of the modifier-based focus-cast functionality."] = true
 L["Toggle the use of the modifier-based self-cast functionality."] = "切換使用自我施法功能"
@@ -135,5 +134,6 @@ L["Toggle the use of the right-click self-cast functionality."] = "切換使用
 -- L["You can set the bar to be always hidden, if you only wish to access it using key-bindings."] = true
 -- L["You can use any macro conditionals in the custom string, using \"show\" and \"hide\" as values.\n\nExample: [combat]hide;show"] = true
 -- L["You can use any macro conditionals in the custom string, using the number of the bar as target value.\nExample: [form:1]9;0"] = true
+L["Zoom"] = "放大"
 -- L["|cffffff00Click|r to toggle bar lock"] = true
 -- L["|cffffff00Right-click|r to open the options menu"] = true