diff --git a/code/game/machinery/status_display.dm b/code/game/machinery/status_display.dm
index d527328e7f..e3d1d7454e 100644
--- a/code/game/machinery/status_display.dm
+++ b/code/game/machinery/status_display.dm
@@ -307,6 +307,14 @@
 					set_picture("ai_friend")
 				if("Tribunal")
 					set_picture("tribunal")
+				if("Beer mug")
+					set_picture("ai_beer")
+				if("Dwarf")
+					set_picture("ai_dwarf")
+				if("Fishtank")
+					set_picture("ai_fishtank")
+				if("Plump Helmet")
+					set_picture("ai_plump")
 
 			return
 
diff --git a/code/game/verbs/AI_status.dm b/code/game/verbs/AI_status.dm
index 73c6714183..39cbc65483 100644
--- a/code/game/verbs/AI_status.dm
+++ b/code/game/verbs/AI_status.dm
@@ -5,7 +5,7 @@
 	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", "Sad", "BSOD", "Blank", "Problems?", "Awesome", "Facepalm", "Friend Computer", "Beer mug", "Dwarf", "Fishtank", "Plump Helmet")
 	if(src.ckey == "serithi")
 		ai_emotions.Add("Tribunal","Tribunal Malfunctioning")
 	var/emote = input("Please, select a status!", "AI Status", null, null) in ai_emotions
diff --git a/icons/obj/status_display.dmi b/icons/obj/status_display.dmi
index 1c00dd4ec9..49a62bf52e 100644
Binary files a/icons/obj/status_display.dmi and b/icons/obj/status_display.dmi differ