diff --git a/code/game/objects/items/devices/paicard.dm b/code/game/objects/items/devices/paicard.dm
index 0867033aad..a77cca0d6c 100644
--- a/code/game/objects/items/devices/paicard.dm
+++ b/code/game/objects/items/devices/paicard.dm
@@ -1,6 +1,6 @@
 /obj/item/paicard
 	name = "personal AI device"
-	icon = 'icons/obj/aicards.dmi'
+	icon = 'modular_citadel/icons/obj/aicards.dmi' // CITADEL EDIT
 	icon_state = "pai"
 	item_state = "electronic"
 	lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
@@ -147,6 +147,10 @@
 				src.add_overlay("pai-what")
 			if(10)
 				src.add_overlay("pai-null")
+			if(11)
+				src.add_overlay("pai-exclamation") // CITADEL EDIT
+			if(12)
+				src.add_overlay("pai-question") // CITADEL EDIT
 
 /obj/item/paicard/proc/alertUpdate()
 	visible_message("<span class ='info'>[src] flashes a message across its screen, \"Additional personalities available for download.\"", "<span class='notice'>[src] bleeps electronically.</span>")
diff --git a/code/modules/mob/living/silicon/pai/software.dm b/code/modules/mob/living/silicon/pai/software.dm
index 9fd16bbbb2..90070f1d5d 100644
--- a/code/modules/mob/living/silicon/pai/software.dm
+++ b/code/modules/mob/living/silicon/pai/software.dm
@@ -140,7 +140,7 @@
 			radio.attack_self(src)
 
 		if("image")
-			var/newImage = input("Select your new display image.", "Display Image", "Happy") in list("Happy", "Cat", "Extremely Happy", "Face", "Laugh", "Off", "Sad", "Angry", "What")
+			var/newImage = input("Select your new display image.", "Display Image", "Happy") in list("Happy", "Cat", "Extremely Happy", "Face", "Laugh", "Off", "Sad", "Angry", "What" , "Exclamation" ,"Question") // CITADEL EDIT
 			var/pID = 1
 
 			switch(newImage)
@@ -164,6 +164,10 @@
 					pID = 9
 				if("Null")
 					pID = 10
+				if("Exclamation") // CITADEL EDIT
+					pID = 11
+				if("Question") // CITADEL EDIT
+					pID = 12
 			card.setEmotion(pID)
 
 		if("signaller")
diff --git a/modular_citadel/icons/obj/aicards.dmi b/modular_citadel/icons/obj/aicards.dmi
new file mode 100644
index 0000000000..66ec58b65a
Binary files /dev/null and b/modular_citadel/icons/obj/aicards.dmi differ