diff --git a/code/game/machinery/status_display.dm b/code/game/machinery/status_display.dm
index c779bf85ca..91d8592fae 100644
--- a/code/game/machinery/status_display.dm
+++ b/code/game/machinery/status_display.dm
@@ -274,6 +274,12 @@
 					set_picture("ai_confused")
 				if("Sad")
 					set_picture("ai_sad")
+				if("Surprised")
+					set_picture("ai_surprised")
+				if("Upset")
+					set_picture("ai_upset")
+				if("Angry")
+					set_picture("ai_angry")
 				if("BSOD")
 					set_picture("ai_bsod")
 				if("Blank")
diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm
index 5833f43666..b34f7aa641 100644
--- a/code/modules/mob/living/silicon/ai/ai.dm
+++ b/code/modules/mob/living/silicon/ai/ai.dm
@@ -612,7 +612,7 @@ var/list/ai_list = list()
 	if(usr.stat == 2)
 		usr <<"You cannot change your emotional status because you are dead!"
 		return
-	var/list/ai_emotions = list("Very Happy", "Happy", "Neutral", "Unsure", "Confused", "Sad", "BSOD", "Blank", "Problems?", "Awesome", "Facepalm", "Friend Computer")
+	var/list/ai_emotions = list("Very Happy", "Happy", "Neutral", "Unsure", "Confused", "Surprised", "Sad", "Upset", "Angry", "Awesome", "BSOD", "Blank", "Problems?", "Facepalm", "Friend Computer")
 	var/emote = input("Please, select a status!", "AI Status", null, null) in ai_emotions
 	for (var/obj/machinery/M in machines) //change status
 		if(istype(M, /obj/machinery/ai_status_display))
diff --git a/icons/obj/status_display.dmi b/icons/obj/status_display.dmi
index 49a62bf52e..864310b6ab 100644
Binary files a/icons/obj/status_display.dmi and b/icons/obj/status_display.dmi differ