diff --git a/code/modules/mob/holder.dm b/code/modules/mob/holder.dm
index 7a6cd1fbf9a..3779b7075f4 100644
--- a/code/modules/mob/holder.dm
+++ b/code/modules/mob/holder.dm
@@ -95,6 +95,9 @@ var/list/holder_mob_icon_cache = list()
 /obj/item/weapon/holder/drone
 	origin_tech = list(TECH_MAGNET = 3, TECH_ENGINEERING = 5)
 
+/obj/item/weapon/holder/pai
+	origin_tech = list(TECH_DATA = 2)
+
 /obj/item/weapon/holder/mouse
 	w_class = ITEMSIZE_TINY
 
diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm
index 0ad35e7faec..2165287dbde 100644
--- a/code/modules/mob/living/silicon/pai/pai.dm
+++ b/code/modules/mob/living/silicon/pai/pai.dm
@@ -1,12 +1,14 @@
 /mob/living/silicon/pai
 	name = "pAI"
 	icon = 'icons/mob/pai.dmi'
-	icon_state = "repairbot"
+	icon_state = "pai-repairbot"
 
 	emote_type = 2		// pAIs emotes are heard, not seen, so they can be seen through a container (eg. person)
 	pass_flags = 1
 	mob_size = MOB_SMALL
 
+	holder_type = /obj/item/weapon/holder/pai
+
 	can_pull_size = ITEMSIZE_SMALL
 	can_pull_mobs = MOB_PULL_SMALLER
 
@@ -23,8 +25,9 @@
 	var/obj/item/device/radio/radio		// Our primary radio
 	var/obj/item/device/communicator/integrated/communicator	// Our integrated communicator.
 
-	var/chassis = "repairbot"   // A record of your chosen chassis.
+	var/chassis = "pai-repairbot"   // A record of your chosen chassis.
 	var/global/list/possible_chassis = list(
+<<<<<<< HEAD
 		"Drone" = "repairbot",
 		"Cat" = "cat",
 		"Mouse" = "mouse",
@@ -34,6 +37,16 @@
 		"Parrot" = "parrot",
 		"Rabbit" = "rabbit",
 		"Bear" = "bear"  //VOREStation Edit
+=======
+		"Drone" = "pai-repairbot",
+		"Cat" = "pai-cat",
+		"Mouse" = "pai-mouse",
+		"Monkey" = "pai-monkey",
+		"Corgi" = "pai-borgi",
+		"Fox" = "pai-fox",
+		"Parrot" = "pai-parrot",
+		"Rabbit" = "pai-rabbit"
+>>>>>>> e714515... Merge pull request #5443 from PrismaticGynoid/somemorepaifixes
 		)
 
 	var/global/list/possible_say_verbs = list(
@@ -431,7 +444,8 @@
 	var/obj/item/weapon/holder/H = ..(grabber, self_drop)
 	if(!istype(H))
 		return
-	H.icon_state = "pai-[icon_state]"
+
+	H.icon_state = "[chassis]"
 	grabber.update_inv_l_hand()
 	grabber.update_inv_r_hand()
 	return H
diff --git a/code/modules/mob/living/silicon/pai/software.dm b/code/modules/mob/living/silicon/pai/software.dm
index 472125cef9a..ab2b0b53cd7 100644
--- a/code/modules/mob/living/silicon/pai/software.dm
+++ b/code/modules/mob/living/silicon/pai/software.dm
@@ -126,6 +126,6 @@ var/global/list/default_pai_software = list()
 
 	else if(href_list["image"])
 		var/img = text2num(href_list["image"])
-		if(1 <= img && img <= 9)
+		if(1 <= img && img <= (pai_emotions.len))
 			card.setEmotion(img)
 		return 1
diff --git a/html/changelogs/PrismaticGynoid-somemorepaifixes.yml b/html/changelogs/PrismaticGynoid-somemorepaifixes.yml
new file mode 100644
index 00000000000..2173f3cc59e
--- /dev/null
+++ b/html/changelogs/PrismaticGynoid-somemorepaifixes.yml
@@ -0,0 +1,6 @@
+author: PrismaticGynoid
+
+delete-after: True
+
+changes: 
+  - tweak: "pAIs can now be picked up while unfolded, and can display more than 9 emotions."
diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi
index c93e3b2caa3..202624cabf6 100644
Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ
diff --git a/icons/mob/items/lefthand_holder.dmi b/icons/mob/items/lefthand_holder.dmi
index a3af18a5d0a..9f47a4743a1 100644
Binary files a/icons/mob/items/lefthand_holder.dmi and b/icons/mob/items/lefthand_holder.dmi differ
diff --git a/icons/mob/items/righthand_holder.dmi b/icons/mob/items/righthand_holder.dmi
index ee4b26869e6..7ac02b77204 100644
Binary files a/icons/mob/items/righthand_holder.dmi and b/icons/mob/items/righthand_holder.dmi differ
diff --git a/icons/mob/pai.dmi b/icons/mob/pai.dmi
index 23744fddda6..df6010159b3 100644
Binary files a/icons/mob/pai.dmi and b/icons/mob/pai.dmi differ