diff --git a/code/defines/obj/clothing/costume.dm b/code/defines/obj/clothing/costume.dm
index e1e9f177489..d495a549902 100644
--- a/code/defines/obj/clothing/costume.dm
+++ b/code/defines/obj/clothing/costume.dm
@@ -12,12 +12,6 @@
 	new /obj/item/clothing/suit/chickensuit(src.loc)
 	del(src)
 
-/obj/effect/landmark/costume/justice/New()
-	new /obj/item/clothing/suit/justice(src.loc)
-	var/CHOICE = pick( /obj/item/clothing/head/justice , /obj/item/clothing/head/justice/blue , /obj/item/clothing/head/justice/yellow , /obj/item/clothing/head/justice/green , /obj/item/clothing/head/justice/pink )
-	new CHOICE(src.loc)
-	del(src)
-
 /obj/effect/landmark/costume/madscientist/New()
 	new /obj/item/clothing/under/gimmick/rank/captain/suit(src.loc)
 	new /obj/item/clothing/head/flatcap(src.loc)
diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm
index a72163d49fa..38e49576def 100644
--- a/code/modules/mob/living/silicon/ai/ai.dm
+++ b/code/modules/mob/living/silicon/ai/ai.dm
@@ -79,24 +79,18 @@
 		return
 
 		//if(icon_state == initial(icon_state))
-	var/icontype = input("Please, select a display!", "AI", null/*, null*/) in list("Clown", "HAL9000", "Monochrome", "Blue", "HAL9000 Mark2", "Inverted", "Firewall", "Green")
+	var/icontype = input("Please, select a display!", "AI", null/*, null*/) in list("Clown", "Monochrome", "Blue", "Inverted", "Firewall", "Green")
 	if(icontype == "Clown")
 		icon_state = "ai-clown2"
-	else if(icontype == "HAL9000")
-		icon_state = "ai-hal9000-2"
 	else if(icontype == "Monochrome")
 		icon_state = "ai-mono"
 	else if(icontype == "Blue")
 		icon_state = "ai"
-	else if(icontype == "HAL9000 Mark2")
-		icon_state = "ai-hal9000-3"
 	else if(icontype == "Inverted")
 		icon_state = "ai-u"
 	else if(icontype == "Firewall")
 		icon_state = "ai-magma"
-	else if(icontype == "Funny")
-		icon_state = "ai-yesman"
-	else//(icontype == "Green")
+	else if(icontype == "Green")
 		icon_state = "ai-wierd"
 
 	//else
diff --git a/icons/mob/AI.dmi b/icons/mob/AI.dmi
index 3802d6cecb6..00f6497f009 100644
Binary files a/icons/mob/AI.dmi and b/icons/mob/AI.dmi differ
diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi
index 3a2e9032c44..4e285f1d135 100644
Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ
diff --git a/icons/mob/mask.dmi b/icons/mob/mask.dmi
index d04a6663f14..a08898cb81f 100644
Binary files a/icons/mob/mask.dmi and b/icons/mob/mask.dmi differ
diff --git a/icons/mob/robots.dmi b/icons/mob/robots.dmi
index 631546a011c..8c234054ab6 100644
Binary files a/icons/mob/robots.dmi and b/icons/mob/robots.dmi differ
diff --git a/icons/mob/suit_nosides.dmi b/icons/mob/suit_nosides.dmi
index 1c95a4dfe7b..3fb7b73e257 100644
Binary files a/icons/mob/suit_nosides.dmi and b/icons/mob/suit_nosides.dmi differ
diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi
index 6c8a59fa57d..890c96bc98b 100644
Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ
diff --git a/icons/mob/uniform_nosides.dmi b/icons/mob/uniform_nosides.dmi
index 55cabf84f39..5fb62c509f4 100644
Binary files a/icons/mob/uniform_nosides.dmi and b/icons/mob/uniform_nosides.dmi differ
diff --git a/icons/obj/decals.dmi b/icons/obj/decals.dmi
index 21ed7e94b70..8057832d238 100644
Binary files a/icons/obj/decals.dmi and b/icons/obj/decals.dmi differ