diff --git a/2/3/4/5/6/7/ElvUI/Modules/Skins/Blizzard/Craft.lua b/2/3/4/5/6/7/ElvUI/Modules/Skins/Blizzard/Craft.lua
index be31bd5..493d2ce 100644
--- a/2/3/4/5/6/7/ElvUI/Modules/Skins/Blizzard/Craft.lua
+++ b/2/3/4/5/6/7/ElvUI/Modules/Skins/Blizzard/Craft.lua
@@ -70,14 +70,11 @@ local function LoadSkin()
 	end
 
 	hooksecurefunc("CraftFrame_SetSelection", function(id)
-		CraftIcon:SetBackdrop({
-			bgFile = E.media.blankTex,
-			edgeFile = E["media"].blankTex,
-			tile = false, tileSize = 0, edgeSize = E.mult,
-			insets = {left = 0, right = 0, top = 0, bottom = 0}
-		})
+		E:SetTemplate(CraftIcon, "Default", true)
+		E:StyleButton(CraftIcon, nil, true)
 		CraftIcon:GetNormalTexture():SetTexCoord(unpack(E.TexCoords))
 		E:SetInside(CraftIcon:GetNormalTexture())
+
 		CraftIcon:SetWidth(40)
 		CraftIcon:SetHeight(40)
 		CraftIcon:SetPoint("TOPLEFT", 4, -3)
@@ -89,7 +86,7 @@ local function LoadSkin()
 		if skillEnchantID or skillItemID then
 			CraftRequirements:SetTextColor(1, 0.80, 0.10)
 			local quality = select(3, GetItemInfo(skillID))
-			if quality then
+			if quality and quality > 1 then
 				CraftIcon:SetBackdropBorderColor(GetItemQualityColor(quality))
 				CraftName:SetTextColor(GetItemQualityColor(quality))
 			else
diff --git a/2/3/4/5/6/7/ElvUI/Modules/Skins/Blizzard/TradeSkill.lua b/2/3/4/5/6/7/ElvUI/Modules/Skins/Blizzard/TradeSkill.lua
index f2755ac..0db39c5 100644
--- a/2/3/4/5/6/7/ElvUI/Modules/Skins/Blizzard/TradeSkill.lua
+++ b/2/3/4/5/6/7/ElvUI/Modules/Skins/Blizzard/TradeSkill.lua
@@ -132,17 +132,18 @@ local function LoadSkin()
 	S:HandleCloseButton(TradeSkillFrameCloseButton)
 
 	hooksecurefunc("TradeSkillFrame_SetSelection", function(id)
-		if TradeSkillSkillIcon:GetNormalTexture() then
-			TradeSkillSkillIcon:SetAlpha(1)
-			TradeSkillSkillIcon:GetNormalTexture():SetTexCoord(unpack(E.TexCoords))
-			E:SetInside(TradeSkillSkillIcon:GetNormalTexture())
-		else
-			TradeSkillSkillIcon:SetAlpha(0)
-		end
+		E:SetTemplate(TradeSkillSkillIcon, "Default", true)
+		E:StyleButton(TradeSkillSkillIcon, nil, true)
+		TradeSkillSkillIcon:GetNormalTexture():SetTexCoord(unpack(E.TexCoords))
+		E:SetInside(TradeSkillSkillIcon:GetNormalTexture())
+
+		TradeSkillSkillIcon:SetWidth(40)
+		TradeSkillSkillIcon:SetHeight(40)
+		TradeSkillSkillIcon:SetPoint("TOPLEFT", 4, -3)
 
 		local skillLink = GetTradeSkillItemLink(id)
 		local skillID = select(3, strfind(skillLink, "item:(%d+)"))
-		if skillLink then
+		if skillID then
 			TradeSkillRequirementLabel:SetTextColor(1, 0.80, 0.10)
 			local quality = select(3, GetItemInfo(skillID))