diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm
index ab31fabe9f2..b1505dc6d23 100644
--- a/code/modules/mob/living/silicon/ai/ai.dm
+++ b/code/modules/mob/living/silicon/ai/ai.dm
@@ -304,7 +304,7 @@ var/list/ai_verbs_default = list(
 
 			if(Entry[2] == ckey && Entry[3] == real_name)	//They're in the list? Custom sprite time, var and icon change required
 				custom_sprite = 1
-				icon = 'icons/mob/custom-synthetic.dmi'
+				icon = 'icons/mob/custom_synthetic/custom-synthetic.dmi'
 
 
 		//if(icon_state == initial(icon_state))
@@ -971,10 +971,10 @@ var/list/ai_verbs_default = list(
 					if("ancient machine")
 						holo_icon = getHologramIcon(icon('icons/mob/ancient_machine.dmi', "ancient_machine"))
 					if("custom")
-						if("[ckey]-ai-holo" in icon_states('icons/mob/custom-synthetic.dmi'))
-							holo_icon = getHologramIcon(icon('icons/mob/custom-synthetic.dmi', "[ckey]-ai-holo"))
-						else if("[ckey]-ai-holo" in icon_states('icons/mob/custom-synthetic64.dmi'))
-							holo_icon = getHologramIcon(icon('icons/mob/custom-synthetic64.dmi', "[ckey]-ai-holo"))
+						if("[ckey]-ai-holo" in icon_states('icons/mob/custom_synthetic/custom-synthetic.dmi'))
+							holo_icon = getHologramIcon(icon('icons/mob/custom_synthetic/custom-synthetic.dmi', "[ckey]-ai-holo"))
+						else if("[ckey]-ai-holo" in icon_states('icons/mob/custom_synthetic/custom-synthetic64.dmi'))
+							holo_icon = getHologramIcon(icon('icons/mob/custom_synthetic/custom-synthetic64.dmi', "[ckey]-ai-holo"))
 						else
 							holo_icon = getHologramIcon(icon('icons/mob/AI.dmi',"holo1"))
 
diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm
index 959f7bbbd22..9deba78f410 100644
--- a/code/modules/mob/living/silicon/pai/pai.dm
+++ b/code/modules/mob/living/silicon/pai/pai.dm
@@ -414,7 +414,7 @@
 
 			if(Entry[2] == ckey && Entry[3] == real_name)	//They're in the list? Custom sprite time, var and icon change required
 				custom_sprite = 1
-				icon = 'icons/mob/custom-synthetic.dmi'
+				icon = 'icons/mob/custom_synthetic/custom-synthetic.dmi'
 
 	if(custom_sprite)
 		chassis = "[ckey]-pai"
@@ -594,10 +594,11 @@
 		icon_state = "[chassis]"
 		resting = 0
 	if(custom_sprite)
-		H.icon_override = 'icons/mob/custom-synthetic.dmi'
-		H.lefthand_file = 'icons/mob/custom-synthetic.dmi'		//unless we want to make a new file for the left and right in-hands for custom pAIs...
-		H.righthand_file = 'icons/mob/custom-synthetic.dmi'		//you'll want to just use one in-hand sprite that looks the same in both hands. --FalseIncarnate
-		H.icon_state = "[icon_state]_head"
+		H.icon = 'icons/mob/custom_synthetic/custom-synthetic.dmi'
+		H.icon_override = 'icons/mob/custom_synthetic/custom_head.dmi'
+		H.lefthand_file = 'icons/mob/custom_synthetic/custom_lefthand.dmi'
+		H.righthand_file = 'icons/mob/custom_synthetic/custom_righthand.dmi'
+		H.icon_state = "[icon_state]"
 		H.item_state = "[icon_state]_hand"
 	else
 		H.icon_state = "pai-[icon_state]"
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 33b6719e82d..0461919511a 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -189,7 +189,7 @@ var/list/robot_verbs_default = list(
 
 				if(Entry[2] == ckey && Entry[3] == real_name)	//They're in the list? Custom sprite time, var and icon change required
 					custom_sprite = 1
-					icon = 'icons/mob/custom-synthetic.dmi'
+					icon = 'icons/mob/custom_synthetic/custom-synthetic.dmi'
 
 	return 1
 
diff --git a/icons/mob/custom-synthetic.dmi b/icons/mob/custom_synthetic/custom-synthetic.dmi
similarity index 89%
rename from icons/mob/custom-synthetic.dmi
rename to icons/mob/custom_synthetic/custom-synthetic.dmi
index ec9a2b424d8..29917049c85 100644
Binary files a/icons/mob/custom-synthetic.dmi and b/icons/mob/custom_synthetic/custom-synthetic.dmi differ
diff --git a/icons/mob/custom-synthetic64.dmi b/icons/mob/custom_synthetic/custom-synthetic64.dmi
similarity index 100%
rename from icons/mob/custom-synthetic64.dmi
rename to icons/mob/custom_synthetic/custom-synthetic64.dmi
diff --git a/icons/mob/custom_synthetic/custom_head.dmi b/icons/mob/custom_synthetic/custom_head.dmi
new file mode 100644
index 00000000000..76ffcedcc82
Binary files /dev/null and b/icons/mob/custom_synthetic/custom_head.dmi differ
diff --git a/icons/mob/custom_synthetic/custom_lefthand.dmi b/icons/mob/custom_synthetic/custom_lefthand.dmi
new file mode 100644
index 00000000000..8d469195434
Binary files /dev/null and b/icons/mob/custom_synthetic/custom_lefthand.dmi differ
diff --git a/icons/mob/custom_synthetic/custom_righthand.dmi b/icons/mob/custom_synthetic/custom_righthand.dmi
new file mode 100644
index 00000000000..8d469195434
Binary files /dev/null and b/icons/mob/custom_synthetic/custom_righthand.dmi differ