diff --git a/2/3/4/5/6/7/ElvUI/Modules/Skins/Blizzard/Mail.lua b/2/3/4/5/6/7/ElvUI/Modules/Skins/Blizzard/Mail.lua
index d52c5d9..9a61ecb 100644
--- a/2/3/4/5/6/7/ElvUI/Modules/Skins/Blizzard/Mail.lua
+++ b/2/3/4/5/6/7/ElvUI/Modules/Skins/Blizzard/Mail.lua
@@ -141,6 +141,13 @@ local function LoadSkin()
 	E:StyleButton(OpenMailPackageButton)
 	E:SetTemplate(OpenMailPackageButton, "Default", true)
 
+	for _, region in ipairs({OpenMailPackageButton:GetRegions()}) do
+		if region:GetObjectType() == "Texture" then
+			region:SetTexCoord(unpack(E.TexCoords))
+			E:SetInside(region)
+		end
+	end
+
 	--[[for i = 1, OpenMailPackageButton:GetNumRegions() do
 		local region = select(i, OpenMailPackageButton:GetRegions())
 		if region:GetObjectType() == "Texture" then
diff --git a/2/3/4/5/6/7/ElvUI/Modules/Skins/Blizzard/Merchant.lua b/2/3/4/5/6/7/ElvUI/Modules/Skins/Blizzard/Merchant.lua
index 875b615..355dee8 100644
--- a/2/3/4/5/6/7/ElvUI/Modules/Skins/Blizzard/Merchant.lua
+++ b/2/3/4/5/6/7/ElvUI/Modules/Skins/Blizzard/Merchant.lua
@@ -52,14 +52,21 @@ local function LoadSkin()
 	E:StyleButton(MerchantRepairItemButton)
 	E:SetTemplate(MerchantRepairItemButton, "Default", true)
 
-	for i = 1, MerchantRepairItemButton:GetNumRegions() do
-		local region = select(i, MerchantRepairItemButton:GetRegions())
+	for _, region in ipairs({MerchantRepairItemButton:GetRegions()}) do
 		if region:GetObjectType() == "Texture" then
 			region:SetTexCoord(0.04, 0.24, 0.06, 0.5)
 			E:SetInside(region)
 		end
 	end
 
+	--[[for i = 1, MerchantRepairItemButton:GetNumRegions() do
+		local region = select(i, MerchantRepairItemButton:GetRegions())
+		if region:GetObjectType() == "Texture" then
+			region:SetTexCoord(0.04, 0.24, 0.06, 0.5)
+			E:SetInside(region)
+		end
+	end--]]
+
 	E:StyleButton(MerchantRepairAllButton)
 	E:SetTemplate(MerchantRepairAllButton, "Default", true)
 	MerchantRepairAllIcon:SetTexCoord(0.34, 0.1, 0.34, 0.535, 0.535, 0.1, 0.535, 0.535)
diff --git a/2/3/4/5/6/7/ElvUI/Modules/Skins/Blizzard/Misc.lua b/2/3/4/5/6/7/ElvUI/Modules/Skins/Blizzard/Misc.lua
index 8fbcaf8..a54a471 100644
--- a/2/3/4/5/6/7/ElvUI/Modules/Skins/Blizzard/Misc.lua
+++ b/2/3/4/5/6/7/ElvUI/Modules/Skins/Blizzard/Misc.lua
@@ -361,14 +361,21 @@ local function LoadSkin()
 		HookScript(tab, "OnLeave", S.SetOriginalBackdrop)
 	end
 
-	for i = 1, UIOptionsFrame:GetNumChildren() do
-		local child = select(i, UIOptionsFrame:GetChildren())
+	for _, child in ipairs({UIOptionsFrame:GetChildren()}) do
 		if child.GetPushedTexture and child:GetPushedTexture() and not child:GetName() then
 			child:SetFrameLevel(UIOptionsFrame:GetFrameLevel() + 2)
 			S:HandleCloseButton(child, UIOptionsFrame.backdrop)
 		end
 	end
 
+	--[[for i = 1, UIOptionsFrame:GetNumChildren() do
+		local child = select(i, UIOptionsFrame:GetChildren())
+		if child.GetPushedTexture and child:GetPushedTexture() and not child:GetName() then
+			child:SetFrameLevel(UIOptionsFrame:GetFrameLevel() + 2)
+			S:HandleCloseButton(child, UIOptionsFrame.backdrop)
+		end
+	end--]]
+
 	OptionsFrameDefaults:ClearAllPoints()
 	OptionsFrameDefaults:SetPoint("TOPLEFT", OptionsFrame, "BOTTOMLEFT", 15, 36)