diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6c3069c3..35fedba5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,10 +1,11 @@
 ## v11.0.7
 * #1857 - Add LibCustomGlow animations.
+* Fix: #2191 - Icon Shown condition ignoring Shown/Hidden checkboxes for disabled icons/groups.
+* Fix: #2193 - Icon overlay and border animations starting in the wrong state.
 * Fix: #2215 - Spell Charges condition not updating for countable spells without true charges.
 * Fix: #2217 - Error in item cooldown conditions
-* Fix: #2220 - GCD state not ending when GCD ends.
 * Fix: #2219 - Prevent cooldown finish pulse from showing on hidden icons
-* Fix: #2193 - Icon overlay and border animations starting in the wrong state.
+* Fix: #2220 - GCD state not ending when GCD ends.
 
 ## v11.0.6
 * #2190: Added options to Buff/Debuff icons to source stack count from tooltip numbers.
diff --git a/Components/Core/Conditions/Categories/Misc.lua b/Components/Core/Conditions/Categories/Misc.lua
index 87c17e50..cf8c64a1 100644
--- a/Components/Core/Conditions/Categories/Misc.lua
+++ b/Components/Core/Conditions/Categories/Misc.lua
@@ -59,20 +59,17 @@ ConditionCategory:RegisterCondition(1,	 "ICON", {
 	unit = false,
 	icon = "Interface\\Icons\\INV_Misc_PocketWatch_01",
 	tcoords = CNDT.COMMON.standardtcoords,
-	funcstr = function(c, icon)
-		if c.Icon == "" or c.Icon == icon:GetGUID() then
-			--return [[true]]
+	Env = {
+		IsIconShown = function(icon)
+			if not icon or not icon.attributes.shown then return false end
+			icon:Update()
+			return icon.attributes.realAlpha > 0
 		end
-
+	},
+	funcstr = function(c, icon)
 		TMW:QueueValidityCheck(icon, c.Icon, L["VALIDITY_CONDITION_DESC"])
 
-		local str = [[( c.Icon and c.Icon.attributes.shown and not c.Icon:Update())]]
-		if c.Level == 0 then
-			str = str .. [[and c.Icon.attributes.realAlpha > 0]]
-		else
-			str = str .. [[and c.Icon.attributes.realAlpha == 0]]
-		end
-		return str
+		return "BOOLCHECK(IsIconShown(c.Icon))"
 	end,
 	--[[events = function(ConditionObject, c)
 		local event = TMW.Classes.IconDataProcessor.ProcessorsByName.REALALPHA.changedEvent
diff --git a/Options/CHANGELOG.lua b/Options/CHANGELOG.lua
index 38fc4f27..241d58d1 100644
--- a/Options/CHANGELOG.lua
+++ b/Options/CHANGELOG.lua
@@ -5,11 +5,12 @@ TMW.CHANGELOG_LASTVER="10.0.0"
 TMW.CHANGELOG = [==[
 ## v11.0.7
 * #1857 - Add LibCustomGlow animations.
+* Fix: #2191 - Icon Shown condition ignoring Shown/Hidden checkboxes for disabled icons/groups.
+* Fix: #2193 - Icon overlay and border animations starting in the wrong state.
 * Fix: #2215 - Spell Charges condition not updating for countable spells without true charges.
 * Fix: #2217 - Error in item cooldown conditions
-* Fix: #2220 - GCD state not ending when GCD ends.
 * Fix: #2219 - Prevent cooldown finish pulse from showing on hidden icons
-* Fix: #2193 - Icon overlay and border animations starting in the wrong state.
+* Fix: #2220 - GCD state not ending when GCD ends.
 
 ## v11.0.6
 * #2190: Added options to Buff/Debuff icons to source stack count from tooltip numbers.