diff --git a/DarkMode.toc b/DarkMode.toc
index d0e419d..79f3376 100644
--- a/DarkMode.toc
+++ b/DarkMode.toc
@@ -4,7 +4,7 @@
 ## Interface-Cata: 40400
 ## Interface: 110002
 
-## Version: 0.5.115
+## Version: 0.5.116
 ## Title: DarkMode by |cff3FC7EBD4KiR |T132115:16:16:0:0|t 
 ## Notes: Improve Any Ui or Frame
 ## Author: D4KiR
diff --git a/DarkMode_Cata.toc b/DarkMode_Cata.toc
index 6799fe7..2533006 100644
--- a/DarkMode_Cata.toc
+++ b/DarkMode_Cata.toc
@@ -1,5 +1,5 @@
 ## Interface: 40400
-## Version: 0.5.115
+## Version: 0.5.116
 ## Title: DarkMode |T136122:16:16:0:0|t by |cff3FC7EBD4KiR |T132115:16:16:0:0|t 
 ## Notes: Improve Any Ui or Frame
 ## Author: D4KiR
diff --git a/DarkMode_TBC.toc b/DarkMode_TBC.toc
index 46dfe26..35ce263 100644
--- a/DarkMode_TBC.toc
+++ b/DarkMode_TBC.toc
@@ -1,5 +1,5 @@
 ## Interface: 20504
-## Version: 0.5.115
+## Version: 0.5.116
 ## Title: DarkMode |T136122:16:16:0:0|t by |cff3FC7EBD4KiR |T132115:16:16:0:0|t 
 ## Notes: Improve Any Ui or Frame
 ## Author: D4KiR
diff --git a/DarkMode_Vanilla.toc b/DarkMode_Vanilla.toc
index 3a00acb..b559309 100644
--- a/DarkMode_Vanilla.toc
+++ b/DarkMode_Vanilla.toc
@@ -1,5 +1,5 @@
 ## Interface: 11504
-## Version: 0.5.115
+## Version: 0.5.116
 ## Title: DarkMode |T136122:16:16:0:0|t by |cff3FC7EBD4KiR |T132115:16:16:0:0|t 
 ## Notes: Improve Any Ui or Frame
 ## Author: D4KiR
diff --git a/DarkMode_Wrath.toc b/DarkMode_Wrath.toc
index df2ed18..ffe9808 100644
--- a/DarkMode_Wrath.toc
+++ b/DarkMode_Wrath.toc
@@ -1,5 +1,5 @@
 ## Interface: 30403
-## Version: 0.5.115
+## Version: 0.5.116
 ## Title: DarkMode |T136122:16:16:0:0|t by |cff3FC7EBD4KiR |T132115:16:16:0:0|t 
 ## Notes: Improve Any Ui or Frame
 ## Author: D4KiR
diff --git a/core.lua b/core.lua
index 7bdb027..be55234 100644
--- a/core.lua
+++ b/core.lua
@@ -1060,8 +1060,9 @@ function DarkMode:SearchUi(from)
 			for i, btn in pairs(_G) do
 				if (strfind(i, "LibDBIcon10_", 1, true) or strfind(i, "MinimapButton_D4Lib_", 1, true)) and not strfind(i, "DMBorder", 1, true) then
 					local name = btn:GetName()
-					if btn and _G[name .. "DMBorder"] == nil and DarkMode:IsEnabled("MASKMINIMAPBUTTONS", true) and (btn.border == nil or btn.border == true) then
-						local border = btn:CreateTexture(name .. "DMBorder", "OVERLAY")
+					if btn and _G[name .. "DMBorder"] == nil and btn.CreateTexture ~= nil and DarkMode:IsEnabled("MASKMINIMAPBUTTONS", true) and (btn.border == nil or btn.border == true) then
+						btn.border = btn:CreateTexture(name .. "DMBorder", "OVERLAY")
+						local border = btn.border
 						border:SetTexture("Interface\\AddOns\\DarkMode\\media\\mmicon_border")
 						border:SetPoint("TOPLEFT", 0, 1)
 						border:SetParent(btn)
@@ -1618,7 +1619,7 @@ function DarkMode:Event(event, ...)
 								["name"] = "DarkMode",
 								["icon"] = 136122,
 								["dbtab"] = DMTAB,
-								["vTT"] = {{"DarkMode |T136122:16:16:0:0|t", "v|cff3FC7EB0.5.115"}, {DarkMode:Trans("LEFTCLICK"), DarkMode:Trans("MMBTNLEFT")}, {DarkMode:Trans("RIGHTCLICK"), DarkMode:Trans("MMBTNRIGHT")}},
+								["vTT"] = {{"DarkMode |T136122:16:16:0:0|t", "v|cff3FC7EB0.5.116"}, {DarkMode:Trans("LEFTCLICK"), DarkMode:Trans("MMBTNLEFT")}, {DarkMode:Trans("RIGHTCLICK"), DarkMode:Trans("MMBTNRIGHT")}},
 								["funcL"] = function()
 									DarkMode:ToggleSettings()
 								end,
diff --git a/settings.lua b/settings.lua
index ff335d5..cb0d3e4 100644
--- a/settings.lua
+++ b/settings.lua
@@ -372,8 +372,8 @@ function DarkMode:InitDMSettings()
 		DMSettings:Hide()
 	end
 
-	DarkMode:SetVersion(AddonName, 136122, "0.5.115")
-	DMSettings.TitleText:SetText(format("DarkMode |T136122:16:16:0:0|t v|cff3FC7EB%s", "0.5.115"))
+	DarkMode:SetVersion(AddonName, 136122, "0.5.116")
+	DMSettings.TitleText:SetText(format("DarkMode |T136122:16:16:0:0|t v|cff3FC7EB%s", "0.5.116"))
 	DMSettings.CloseButton:SetScript(
 		"OnClick",
 		function()