diff --git a/code/defines/obj/clothing/gimmick.dm b/code/defines/obj/clothing/gimmick.dm
index d9e208704db..f65cb7ecdcf 100644
--- a/code/defines/obj/clothing/gimmick.dm
+++ b/code/defines/obj/clothing/gimmick.dm
@@ -9,6 +9,21 @@
 	desc = "Meow?"
 	icon_state = "kitty"
 	flags = FPRINT | TABLEPASS | HEADSPACE
+	var/icon/mob
+	var/icon/mob2
+
+	update_icon(var/mob/living/carbon/human/user)
+		if(!istype(user)) return
+		mob = new/icon("icon" = 'head.dmi', "icon_state" = "kitty")
+		mob2 = new/icon("icon" = 'head.dmi', "icon_state" = "kitty2")
+		mob.Blend(rgb(user.r_hair, user.g_hair, user.b_hair), ICON_ADD)
+		mob2.Blend(rgb(user.r_hair, user.g_hair, user.b_hair), ICON_ADD)
+
+//		var/icon/earbit = new/icon("icon" = 'head.dmi', "icon_state" = "kitty")
+//		var/icon/earbit2 = new/icon("icon" = 'head.dmi', "icon_state" = "kitty2")
+//		mob.Blend(earbit, ICON_OVERLAY)
+//		mob2.Blend(earbit2, ICON_OVERLAY)
+// Once you've dug up the sprites, update the first two lines then uncomment them. --NEO
 
 /obj/item/clothing/under/blackskirt
 	name = "Black skirt"
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index 93b4cbd2519..06840de055e 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -827,6 +827,8 @@
 				return
 			src.u_equip(W)
 			src.head = W
+			if(istype(W,/obj/item/clothing/head/kitty))
+				W.update_icon(src)
 			W.equipped(src, text)
 		if("ears")
 			if (src.ears)
@@ -1253,6 +1255,8 @@
 	if (src.head)
 		var/t1 = src.head.icon_state
 		var/icon/head_icon = icon('head.dmi', text("[][]", t1, (!( src.lying ) ? null : "2")))
+		if(istype(src.head,/obj/item/clothing/head/kitty))
+			head_icon = (( src.lying ) ? src.head:mob2 : src.head:mob)
 		src.overlays += image("icon" = head_icon, "layer" = MOB_LAYER)
 		if (src.head.blood_DNA)
 			var/icon/stain_icon = icon('blood.dmi', "helmetblood[!src.lying ? "" : "2"]")
@@ -1347,11 +1351,6 @@
 			shielded = 2
 			break
 
-	for (var/obj/item/clothing/suit/space/space_ninja/S in src)
-		if (S.active)
-			shielded = 2
-			break
-
 	if (shielded == 2)
 		src.invisibility = 2
 	else
diff --git a/icons/mob/zone_sel.dmi b/icons/mob/zone_sel.dmi
index eea6dad08b4..c80eddb82b8 100644
Binary files a/icons/mob/zone_sel.dmi and b/icons/mob/zone_sel.dmi differ