diff --git a/code/modules/clothing/costume.dm b/code/modules/clothing/costume.dm
index 2c589dc2def..539aa2af730 100644
--- a/code/modules/clothing/costume.dm
+++ b/code/modules/clothing/costume.dm
@@ -12,10 +12,9 @@
 	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)
+/obj/effect/landmark/costume/gladiator/New()
+	new /obj/item/clothing/under/gladiator(src.loc)
+	new /obj/item/clothing/head/helmet/gladiator(src.loc)
 	del(src)
 
 /obj/effect/landmark/costume/madscientist/New()
diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm
index 5ada5d89493..f6939441334 100644
--- a/code/modules/mob/living/silicon/ai/ai.dm
+++ b/code/modules/mob/living/silicon/ai/ai.dm
@@ -126,26 +126,20 @@
 
 		//if(icon_state == initial(icon_state))
 	var/icontype = ""
-	var/list/icons = list("Blue", "HAL9000", "Monochrome", "Rainbow", "HAL9000 Mark2", "Inverted", "Firewall", "Green", "Text", "Smiley", "Angry", "Dorf", "Matrix", "Bliss")
+	var/list/icons = list("Blue", "Monochrome", "Rainbow", "Inverted", "Firewall", "Green", "Text", "Smiley", "Angry", "Dorf", "Matrix", "Bliss", "Red", "Static")
 	if (src.name == "B.A.N.N.E.D." && src.ckey == "spaceman96")
 		icons += "B.A.N.N.E.D."
 	icontype = input("Please, select a display!", "AI", null/*, null*/) in icons
 	if(icontype == "Blue")
 		icon_state = "ai"
-	else if(icontype == "HAL9000")
-		icon_state = "ai-hal9000-2"
 	else if(icontype == "Monochrome")
 		icon_state = "ai-mono"
 	else if(icontype == "Rainbow")
 		icon_state = "ai-clown"
-	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 if(icontype == "Green")
 		icon_state = "ai-wierd"
 	else if(icontype == "Text")
@@ -160,6 +154,10 @@
 		icon_state = "ai-bliss"
 	else if(icontype == "B.A.N.N.E.D.")
 		icon_state = "ai-banned"
+	else if(icontype == "Red")
+		icon_state = "ai-malf"
+	else if(icontype == "Static")
+		icon_state = "ai-static"
 	else//(icontype == "Matrix")
 		icon_state = "ai-matrix"
 
diff --git a/icons/mob/AI.dmi b/icons/mob/AI.dmi
index 4c348449c21..822dc60911b 100644
Binary files a/icons/mob/AI.dmi and b/icons/mob/AI.dmi differ