diff --git a/ImproveAny.toc b/ImproveAny.toc
index b456d54..73cacdc 100644
--- a/ImproveAny.toc
+++ b/ImproveAny.toc
@@ -4,7 +4,7 @@
 ## Interface-Cata: 40400
 ## Interface: 110002
 
-## Version: 0.9.106
+## Version: 0.9.107
 ## Title: ImproveAny by |cff3FC7EBD4KiR |T132115:16:16:0:0|t 
 ## Notes: Improve Any Ui or Frame
 ## Author: D4KiR
diff --git a/ImproveAny_Cata.toc b/ImproveAny_Cata.toc
index 1ac4321..3b26569 100644
--- a/ImproveAny_Cata.toc
+++ b/ImproveAny_Cata.toc
@@ -1,5 +1,5 @@
 ## Interface: 40400
-## Version: 0.9.106
+## Version: 0.9.107
 ## Title: ImproveAny |T136033:16:16:0:0|t by |cff3FC7EBD4KiR |T132115:16:16:0:0|t 
 ## Notes: Improve Any Ui or Frame
 ## Author: D4KiR
diff --git a/ImproveAny_TBC.toc b/ImproveAny_TBC.toc
index 2221cf1..d018be3 100644
--- a/ImproveAny_TBC.toc
+++ b/ImproveAny_TBC.toc
@@ -1,5 +1,5 @@
 ## Interface: 20504
-## Version: 0.9.106
+## Version: 0.9.107
 ## Title: ImproveAny |T136033:16:16:0:0|t by |cff3FC7EBD4KiR |T132115:16:16:0:0|t 
 ## Notes: Improve Any Ui or Frame
 ## Author: D4KiR
diff --git a/ImproveAny_Vanilla.toc b/ImproveAny_Vanilla.toc
index 0d2c029..b11a5cd 100644
--- a/ImproveAny_Vanilla.toc
+++ b/ImproveAny_Vanilla.toc
@@ -1,5 +1,5 @@
 ## Interface: 11504
-## Version: 0.9.106
+## Version: 0.9.107
 ## Title: ImproveAny |T136033:16:16:0:0|t by |cff3FC7EBD4KiR |T132115:16:16:0:0|t 
 ## Notes: Improve Any Ui or Frame
 ## Author: D4KiR
diff --git a/ImproveAny_Wrath.toc b/ImproveAny_Wrath.toc
index b7555e4..bc2db56 100644
--- a/ImproveAny_Wrath.toc
+++ b/ImproveAny_Wrath.toc
@@ -1,5 +1,5 @@
 ## Interface: 30403
-## Version: 0.9.106
+## Version: 0.9.107
 ## Title: ImproveAny |T136033: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 082de4e..46cfb64 100644
--- a/core.lua
+++ b/core.lua
@@ -268,7 +268,7 @@ function ImproveAny:Event(event, ...)
 						["icon"] = 136033,
 						["var"] = mmbtn,
 						["dbtab"] = IATAB,
-						["vTT"] = {{"ImproveAny |T136033:16:16:0:0|t", "v|cff3FC7EB0.9.106"}, {ImproveAny:GT("LEFTCLICK"), ImproveAny:GT("MMBTNLEFT")}, {ImproveAny:GT("RIGHTCLICK"), ImproveAny:GT("MMBTNRIGHT")}},
+						["vTT"] = {{"ImproveAny |T136033:16:16:0:0|t", "v|cff3FC7EB0.9.107"}, {ImproveAny:GT("LEFTCLICK"), ImproveAny:GT("MMBTNLEFT")}, {ImproveAny:GT("RIGHTCLICK"), ImproveAny:GT("MMBTNRIGHT")}},
 						["funcL"] = function()
 							ImproveAny:ToggleSettings()
 						end,
diff --git a/ele/minimap.lua b/ele/minimap.lua
index 23fae10..b3c481f 100644
--- a/ele/minimap.lua
+++ b/ele/minimap.lua
@@ -254,7 +254,7 @@ function ImproveAny:InitMinimap()
 		C_Timer.After(
 			0.3,
 			function()
-				local mmBtnsNames = {"Lib_GPI_Minimap_", "D4Lib_MMBTN_", "LibDBIcon10_", "BtWQuests", "MinimapButton", "MinimapIcon", "_Minimap_"}
+				local mmBtnsNames = {"Lib_GPI_Minimap_", "MinimapButton_D4Lib_", "LibDBIcon10_", "BtWQuests", "MinimapButton", "MinimapIcon", "_Minimap_"}
 				local IAMMBtnsBliz = {}
 				local IAMMBtnsFrame = CreateFrame("Frame", "IAMMBtnsFrame", UIParent)
 				IAMMBtnsFrame:SetSize(100, 100)
diff --git a/libs/D4Lib/D4MinimapButtons.lua b/libs/D4Lib/D4MinimapButtons.lua
index 7c7a3ea..44019dc 100644
--- a/libs/D4Lib/D4MinimapButtons.lua
+++ b/libs/D4Lib/D4MinimapButtons.lua
@@ -76,8 +76,8 @@ function D4:CreateMinimapButton(params)
     end
 
     params.dbtab[params.name] = params.dbtab[params.name] or {}
-    _G["D4Lib_MMBTN_" .. params.name] = CreateFrame("Button", "D4Lib_MMBTN_" .. params.name, Minimap)
-    local btn = _G["D4Lib_MMBTN_" .. params.name]
+    _G["MinimapButton_D4Lib_" .. params.name] = CreateFrame("Button", "MinimapButton_D4Lib_" .. params.name, Minimap)
+    local btn = _G["MinimapButton_D4Lib_" .. params.name]
     btn.border = params.border
     btn.db = params.dbtab
     btn.db.minimapPos = btn.db.minimapPos or 0
@@ -241,7 +241,12 @@ function D4:ShowMMBtn(name)
         return
     end
 
-    D4:GetMMBtn("D4Lib_MMBTN_" .. name):Show()
+    local btn = D4:GetMMBtn("MinimapButton_D4Lib_" .. name)
+    if btn then
+        btn:Show()
+    else
+        D4:MSG("[ShowMMBtn] Missing Button", name)
+    end
 end
 
 function D4:HideMMBtn(name)
@@ -251,5 +256,10 @@ function D4:HideMMBtn(name)
         return
     end
 
-    D4:GetMMBtn("D4Lib_MMBTN_" .. name):Hide()
+    local btn = D4:GetMMBtn("MinimapButton_D4Lib_" .. name)
+    if btn then
+        btn:Hide()
+    else
+        D4:MSG("[HideMMBtn] Missing Button", name)
+    end
 end
diff --git a/settings.lua b/settings.lua
index 47b77ee..20e34e3 100644
--- a/settings.lua
+++ b/settings.lua
@@ -441,8 +441,8 @@ function ImproveAny:InitIASettings()
 		IASettings:Hide()
 	end
 
-	ImproveAny:SetVersion(AddonName, 136033, "0.9.106")
-	IASettings.TitleText:SetText(format("ImproveAny |T136033:16:16:0:0|t v|cff3FC7EB%s", "0.9.106"))
+	ImproveAny:SetVersion(AddonName, 136033, "0.9.107")
+	IASettings.TitleText:SetText(format("ImproveAny |T136033:16:16:0:0|t v|cff3FC7EB%s", "0.9.107"))
 	IASettings.CloseButton:SetScript(
 		"OnClick",
 		function()