diff --git a/Skins/Blizzard_Classic.lua b/Skins/Blizzard_Classic.lua
index c6f4a1b..0ab18af 100644
--- a/Skins/Blizzard_Classic.lua
+++ b/Skins/Blizzard_Classic.lua
@@ -661,25 +661,15 @@ local Skin = {
 		EdgeTexture = [[Interface\Cooldown\edge]],
 		PulseTexture = [[Interface\Cooldown\star4]],
 		Color = {0, 0, 0, 0.8},
-		Width = 34,
-		Height = 34,
+		Width = 32,
+		Height = 32,
 		Point = "CENTER",
 		RelPoint = "CENTER",
 		OffsetX = 0,
 		OffsetY = 0,
 		-- SetAllPoints = nil,
 	},
-	ChargeCooldown = {
-		EdgeTexture = [[Interface\Cooldown\edge]],
-		PulseTexture = [[Interface\Cooldown\star4]],
-		Width = 34,
-		Height = 34,
-		Point = "CENTER",
-		RelPoint = "CENTER",
-		OffsetX = 0,
-		OffsetY = 0,
-		-- SetAllPoints = true,
-	},
+	ChargeCooldown = "Cooldown",
 	-- [ SpellAlert ]
 	-- SpellAlert = Default.SpellAlert,
 }
diff --git a/Skins/Blizzard_Modern.lua b/Skins/Blizzard_Modern.lua
index fe5dd3b..16b30b0 100644
--- a/Skins/Blizzard_Modern.lua
+++ b/Skins/Blizzard_Modern.lua
@@ -861,8 +861,8 @@ local Skin = {
 		Height = 37, -- 31
 		Point = "CENTER",
 		RelPoint = "CENTER",
-		OffsetX = 0.5,
-		OffsetY = -0.5,
+		OffsetX = 0,
+		OffsetY = 0,
 		-- SetAllPoints = nil,
 	},
 	AutoCast_Shine = {
@@ -922,18 +922,6 @@ local Skin = {
 		EdgeTexture = [[Interface\Cooldown\UI-HUD-ActionBar-SecondaryCooldown]],
 		PulseTexture = [[Interface\Cooldown\star4]],
 		Color = {0, 0, 0, 0.8},
-		Width = 34,
-		Height = 34,
-		Anchor = "Icon",
-		Point = "CENTER",
-		RelPoint = "CENTER",
-		OffsetX = 0,
-		OffsetY = 0,
-		-- SetAllPoints = nil,
-	},
-	ChargeCooldown = {
-		EdgeTexture = [[Interface\Cooldown\UI-HUD-ActionBar-SecondaryCooldown]],
-		PulseTexture = [[Interface\Cooldown\star4]],
 		Width = 31,
 		Height = 31,
 		Anchor = "Icon",
@@ -941,8 +929,9 @@ local Skin = {
 		RelPoint = "CENTER",
 		OffsetX = 0,
 		OffsetY = 0,
-		--SetAllPoints = true,
+		-- SetAllPoints = nil,
 	},
+	ChargeCooldown = "Cooldown",
 	-- [ SpellAlert ]
 	-- SpellAlert = Default.SpellAlert,
 }
diff --git a/Skins/Classic_Enhanced.lua b/Skins/Classic_Enhanced.lua
index 682c587..7cc1ee0 100644
--- a/Skins/Classic_Enhanced.lua
+++ b/Skins/Classic_Enhanced.lua
@@ -419,8 +419,8 @@ Core.AddSkin("Classic Enhanced", {
 		-- UseAtlasSize = false,
 		Texture = [[Interface\AddOns\Masque\Textures\Modern\AutoCast-Mask]],
 		-- TexCoords = {0, 1, 0, 1},
-		Width = 34,
-		Height = 34,
+		Width = 28,
+		Height = 28,
 		Point = "CENTER",
 		RelPoint = "CENTER",
 		OffsetX = 0,
@@ -458,25 +458,15 @@ Core.AddSkin("Classic Enhanced", {
 		EdgeTexture = [[Interface\AddOns\Masque\Textures\Modern\Edge]],
 		PulseTexture = [[Interface\Cooldown\star4]],
 		Color = {0, 0, 0, 0.8},
-		Width = 34,
-		Height = 34,
-		Point = "CENTER",
-		RelPoint = "CENTER",
-		OffsetX = 0,
-		OffsetY = 0,
-		-- SetAllPoints = nil,
-	},
-	ChargeCooldown = {
-		EdgeTexture = [[Interface\AddOns\Masque\Textures\Modern\Edge]],
-		PulseTexture = [[Interface\Cooldown\star4]],
 		Width = 32,
 		Height = 32,
 		Point = "CENTER",
 		RelPoint = "CENTER",
 		OffsetX = 0,
 		OffsetY = 0,
-		-- SetAllPoints = true,
+		-- SetAllPoints = nil,
 	},
+	ChargeCooldown = "Cooldown",
 	--ChargeCooldown = "Cooldown",
 	-- [ SpellAlert ]
 	SpellAlert = {
diff --git a/Skins/Dream.lua b/Skins/Dream.lua
index 3d27d74..7fcec3d 100644
--- a/Skins/Dream.lua
+++ b/Skins/Dream.lua
@@ -423,28 +423,14 @@ Core.AddSkin("Dream", {
 	},
 	-- [ AutoCastOverlay (Retail) ]
 	-- AutoCast_Frame = Template.AutoCast_Frame,
-	AutoCast_Shine = {
-		Atlas = "UI-HUD-ActionBar-PetAutoCast-Ants",
-		UseAtlasSize = false,
-		-- Color = {1, 1, 1, 1},
-		BlendMode = "BLEND",
-		DrawLayer = "OVERLAY",
-		DrawLevel = 0,
-		Width = 44,
-		Height = 44,
-		Point = "CENTER",
-		RelPoint = "CENTER",
-		OffsetX = 0,
-		OffsetY = 0,
-		-- SetAllPoints = nil,
-	},
+	-- AutoCast_Shine = Template.AutoCast_Shine,
 	AutoCast_Mask = {
 		-- Atlas = "UI-HUD-ActionBar-PetAutoCast-Mask",
 		-- UseAtlasSize = false,
 		Texture = [[Interface\AddOns\Masque\Textures\Square\AutoCast-Mask]],
 		-- TexCoords = {0, 1, 0, 1},
-		Width = 32,
-		Height = 32,
+		Width = 28,
+		Height = 28,
 		Point = "CENTER",
 		RelPoint = "CENTER",
 		OffsetX = 0,
diff --git a/Skins/Modern_Enhanced.lua b/Skins/Modern_Enhanced.lua
index 343fae2..0d35f94 100644
--- a/Skins/Modern_Enhanced.lua
+++ b/Skins/Modern_Enhanced.lua
@@ -362,12 +362,12 @@ Core.AddSkin("Modern Enhanced", {
 		-- UseAtlasSize = false,
 		Texture = [[Interface\AddOns\Masque\Textures\Modern\AutoCast-Mask]],
 		-- TexCoords = {0, 1, 0, 1},
-		Width = 34,
-		Height = 34,
+		Width = 30,
+		Height = 30,
 		Point = "CENTER",
 		RelPoint = "CENTER",
 		OffsetX = 0,
-		OffsetY = 0.5,
+		OffsetY = 0,
 		-- SetAllPoints = nil,
 	},
 	AutoCast_Corners = {
@@ -393,18 +393,6 @@ Core.AddSkin("Modern Enhanced", {
 		EdgeTexture = [[Interface\AddOns\Masque\Textures\Modern\Edge]],
 		PulseTexture = [[Interface\Cooldown\star4]],
 		Color = {0, 0, 0, 0.8},
-		Width = 34,
-		Height = 34,
-		Anchor = "Icon",
-		Point = "CENTER",
-		RelPoint = "CENTER",
-		OffsetX = 0,
-		OffsetY = 0,
-		-- SetAllPoints = nil,
-	},
-	ChargeCooldown = {
-		EdgeTexture = [[Interface\AddOns\Masque\Textures\Modern\Edge]],
-		PulseTexture = [[Interface\Cooldown\star4]],
 		Width = 31,
 		Height = 31,
 		Anchor = "Icon",
@@ -412,8 +400,9 @@ Core.AddSkin("Modern Enhanced", {
 		RelPoint = "CENTER",
 		OffsetX = 0,
 		OffsetY = 0,
-		--SetAllPoints = true,
+		-- SetAllPoints = nil,
 	},
+	ChargeCooldown = "Cooldown",
 	-- [ SpellAlert ]
 	SpellAlert = {
 		Height = 29,
diff --git a/Skins/Zoomed.lua b/Skins/Zoomed.lua
index 6acf3a9..ccd502c 100644
--- a/Skins/Zoomed.lua
+++ b/Skins/Zoomed.lua
@@ -385,8 +385,8 @@ Core.AddSkin("Zoomed", {
 		-- UseAtlasSize = false,
 		Texture = [[Interface\AddOns\Masque\Textures\Square\AutoCast-Mask]],
 		-- TexCoords = {0, 1, 0, 1},
-		Width = 38,
-		Height = 38,
+		Width = 34,
+		Height = 34,
 		Point = "CENTER",
 		RelPoint = "CENTER",
 		OffsetX = 0,
diff --git a/Textures/Circle/AutoCast-Mask.tga b/Textures/Circle/AutoCast-Mask.tga
index 4b2dbc0..d22050a 100644
Binary files a/Textures/Circle/AutoCast-Mask.tga and b/Textures/Circle/AutoCast-Mask.tga differ
diff --git a/Textures/Circle/Mask.tga b/Textures/Circle/Mask.tga
index b77bf9b..10b0526 100644
Binary files a/Textures/Circle/Mask.tga and b/Textures/Circle/Mask.tga differ
diff --git a/Textures/Hexagon-Rotated/AutoCast-Mask.tga b/Textures/Hexagon-Rotated/AutoCast-Mask.tga
index be0f4fe..babc07f 100644
Binary files a/Textures/Hexagon-Rotated/AutoCast-Mask.tga and b/Textures/Hexagon-Rotated/AutoCast-Mask.tga differ
diff --git a/Textures/Hexagon-Rotated/Mask.tga b/Textures/Hexagon-Rotated/Mask.tga
index 8fdbf7b..631a62d 100644
Binary files a/Textures/Hexagon-Rotated/Mask.tga and b/Textures/Hexagon-Rotated/Mask.tga differ
diff --git a/Textures/Hexagon/AutoCast-Mask.tga b/Textures/Hexagon/AutoCast-Mask.tga
index 80d0f58..0c5b3c8 100644
Binary files a/Textures/Hexagon/AutoCast-Mask.tga and b/Textures/Hexagon/AutoCast-Mask.tga differ
diff --git a/Textures/Hexagon/Mask.tga b/Textures/Hexagon/Mask.tga
index 68ae933..4733fa6 100644
Binary files a/Textures/Hexagon/Mask.tga and b/Textures/Hexagon/Mask.tga differ
diff --git a/Textures/Modern/AutoCast-Mask.tga b/Textures/Modern/AutoCast-Mask.tga
index 5f322d2..feadcf6 100644
Binary files a/Textures/Modern/AutoCast-Mask.tga and b/Textures/Modern/AutoCast-Mask.tga differ
diff --git a/Textures/Modern/Mask.tga b/Textures/Modern/Mask.tga
index 8b489f4..cd1e3f8 100644
Binary files a/Textures/Modern/Mask.tga and b/Textures/Modern/Mask.tga differ
diff --git a/Textures/Square/AutoCast-Mask.tga b/Textures/Square/AutoCast-Mask.tga
index 110d873..5596331 100644
Binary files a/Textures/Square/AutoCast-Mask.tga and b/Textures/Square/AutoCast-Mask.tga differ