diff --git a/ElvUI/Modules/Skins/Blizzard/Friends.lua b/ElvUI/Modules/Skins/Blizzard/Friends.lua
index e406986..dddf2dd 100644
--- a/ElvUI/Modules/Skins/Blizzard/Friends.lua
+++ b/ElvUI/Modules/Skins/Blizzard/Friends.lua
@@ -41,29 +41,8 @@ function LoadSkin()
 		tab:SetScript("OnLeave", S.SetOriginalBackdrop)
 	end
 
-
-	local r, g, b = 0.8, 0.8, 0.8
-	local function StyleButton(f, scale)
-		f:SetHighlightTexture(nil)
-		local width, height = (f:GetWidth() * (scale or 0.5)), f:GetHeight()
-
-		local leftGrad = f:CreateTexture(nil, "HIGHLIGHT")
-		E:Width(leftGrad, width)
-		leftGrad:SetHeight(height)
-		E:Point(leftGrad, "LEFT", f, "CENTER")
-		leftGrad:SetTexture(E.media.blankTex)
-		leftGrad:SetGradientAlpha("Horizontal", r, g, b, 0.35, r, g, b, 0)
-
-		local rightGrad = f:CreateTexture(nil, "HIGHLIGHT")
-		E:Width(rightGrad, width)
-		rightGrad:SetHeight(height)
-		E:Point(rightGrad, "RIGHT", f, "CENTER")
-		rightGrad:SetTexture(E.media.blankTex)
-		rightGrad:SetGradientAlpha("Horizontal", r, g, b, 0, r, g, b, 0.35)
-	end
-
 	for i = 1, 10 do
-		StyleButton(_G["FriendsFrameFriendButton"..i], 0.6)
+		S:HandleButtonHighlight(_G["FriendsFrameFriendButton"..i], 0.6)
 	end
 
 	E:StripTextures(FriendsFrameFriendsScrollFrame)
@@ -97,7 +76,7 @@ function LoadSkin()
 	S:HandleButton(FriendsFrameStopIgnoreButton)
 
 	for i = 1, 20 do
-		StyleButton(_G["FriendsFrameIgnoreButton"..i])
+		S:HandleButtonHighlight(_G["FriendsFrameIgnoreButton"..i])
 	end
 
 	-- Who Frame
@@ -134,7 +113,7 @@ function LoadSkin()
 
 		E:CreateBackdrop(button, "Default", true)
 		button.backdrop:SetAllPoints(button.icon)
-		StyleButton(button)
+		S:HandleButtonHighlight(button)
 
 		level:ClearAllPoints()
 		E:Point(level, "TOPLEFT", 12, -2)
@@ -232,8 +211,8 @@ function LoadSkin()
 	for i = 1, GUILDMEMBERS_TO_DISPLAY do
 		local button = _G["GuildFrameButton"..i]
 
-		StyleButton(button)
-		StyleButton(_G["GuildFrameGuildStatusButton"..i])
+		S:HandleButtonHighlight(button)
+		S:HandleButtonHighlight(_G["GuildFrameGuildStatusButton"..i])
 
 		button.icon = button:CreateTexture("$parentIcon", "ARTWORK")
 		E:Point(button.icon, "LEFT", 48, -3)
diff --git a/ElvUI/Modules/Skins/Blizzard/Misc.lua b/ElvUI/Modules/Skins/Blizzard/Misc.lua
index 893a3f6..7c01da2 100644
--- a/ElvUI/Modules/Skins/Blizzard/Misc.lua
+++ b/ElvUI/Modules/Skins/Blizzard/Misc.lua
@@ -57,27 +57,11 @@ local function LoadSkin()
 		end
 	end
 
-	local function StyleButton(f)
-		local width, height = (f:GetWidth() * .54), f:GetHeight()
-
-		local left = f:CreateTexture(nil, "HIGHLIGHT")
-		E:Size(left, width, height)
-		E:Point(left, "LEFT", f, "CENTER")
-		left:SetTexture(1, 1, 1, 0.3)
-		E:Height(left, 16)
-
-		local right = f:CreateTexture(nil, "HIGHLIGHT")
-		E:Size(right, width, height)
-		E:Point(right, "RIGHT", f, "CENTER")
-		right:SetTexture(1, 1, 1, 0.3)
-		E:Height(right, 16)
-	end
-
 	for i = 1, UIDROPDOWNMENU_MAXBUTTONS do
-		StyleButton(_G["ChatMenuButton"..i])
-		StyleButton(_G["EmoteMenuButton"..i])
-		StyleButton(_G["LanguageMenuButton"..i])
-		StyleButton(_G["VoiceMacroMenuButton"..i])
+		E:StyleButton(_G["ChatMenuButton"..i])
+		E:StyleButton(_G["EmoteMenuButton"..i])
+		E:StyleButton(_G["LanguageMenuButton"..i])
+		E:StyleButton(_G["VoiceMacroMenuButton"..i])
 	end
 
 	-- UIDropDownMenu
diff --git a/ElvUI/Modules/Skins/Skins.lua b/ElvUI/Modules/Skins/Skins.lua
index d3fb6a6..f597e0f 100644
--- a/ElvUI/Modules/Skins/Skins.lua
+++ b/ElvUI/Modules/Skins/Skins.lua
@@ -74,6 +74,24 @@ function S:HandleButton(f, strip)
 	HookScript(f, "OnLeave", S.SetOriginalBackdrop)
 end
 
+function S:HandleButtonHighlight(frame)
+	if frame.SetHighlightTexture then
+		frame:SetHighlightTexture("")
+	end
+
+	local leftGrad = frame:CreateTexture(nil, "HIGHLIGHT")
+	E:Size(leftGrad, frame:GetWidth() * 0.5, frame:GetHeight() * 0.95)
+	E:Point(leftGrad, "LEFT", frame, "CENTER")
+	leftGrad:SetTexture(E.media.blankTex)
+	leftGrad:SetGradientAlpha("Horizontal", 0.9, 0.9, 0.9, 0.35, 0.9, 0.9, 0.9, 0)
+
+	local rightGrad = frame:CreateTexture(nil, "HIGHLIGHT")
+	E:Size(rightGrad, frame:GetWidth() * 0.5, frame:GetHeight() * 0.95)
+	E:Point(rightGrad, "RIGHT", frame, "CENTER")
+	rightGrad:SetTexture(E.media.blankTex)
+	rightGrad:SetGradientAlpha("Horizontal", 0.9, 0.9, 0.9, 0, 0.9, 0.9, 0.9, 0.35)
+end
+
 function S:HandleScrollBar(frame, thumbTrim)
 	local name = frame:GetName()
 	if _G[name.."BG"] then _G[name.."BG"]:SetTexture(nil) end