diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm
index cd50552f3915..191cfd801c66 100644
--- a/code/modules/clothing/spacesuits/hardsuit.dm
+++ b/code/modules/clothing/spacesuits/hardsuit.dm
@@ -827,3 +827,40 @@
 	strip_delay = 130
 	max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
 	actions_types = list()
+	
+//POWERARMORS
+//Currently are no different from normal hardsuits, except maybe for the higher armor ratings.
+
+/obj/item/clothing/head/helmet/space/hardsuit/powerarmor_t45b
+	name = "Salvaged T-45b helmet"
+	desc = "It's some barely-functional power armor helmet from a by-gone age."
+	icon_state = "hardsuit0-t45b"
+	item_state = "t45b_helm"
+	armor = list("melee" = 50, "bullet" = 48, "laser" = 25, "energy" = 25, "bomb" = 48, "bio" = 100, "rad" = 50, "fire" = 50, "acid" = 25) 
+	item_color = "t45b"
+
+/obj/item/clothing/suit/space/hardsuit/powerarmor_t45b
+	name = "Salvaged T-45b power armor"
+	desc = "It's some barely-functional power armor, probably hundreds of years old."
+	icon_state = "hardsuit-t45b"
+	item_state = "t45b_hardsuit"
+	armor = list("melee" = 50, "bullet" = 48, "laser" = 25, "energy" = 25, "bomb" = 48, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 25)
+	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/powerarmor_t45b
+	item_color = "t45b"
+	
+/obj/item/clothing/head/helmet/space/hardsuit/powerarmor_advanced
+	name = "Advanced power helmet"
+	desc = "It's an advanced power armor Mk I helmet. It looks somewhat threatening."
+	icon_state = "hardsuit0-advancedpa1"
+	item_state = "advpa1_helm"
+	armor = list("melee" = 50, "bullet" = 48, "laser" = 25, "energy" = 25, "bomb" = 48, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 25)
+	item_color = "advancedpa1"
+
+/obj/item/clothing/suit/space/hardsuit/powerarmor_advanced
+	name = "Advanced power armor"
+	desc = "An advanced suit of power armor. It looks pretty impressive and threatening."
+	icon_state = "hardsuit-advancedpa1"
+	item_state = "advpa1_hardsuit"
+	armor = list("melee" = 50, "bullet" = 48, "laser" = 25, "energy" = 25, "bomb" = 48, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 25)
+	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/powerarmor_advanced
+	item_color = "advancedpa1"
diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi
index 4360575601a6..97c8f9ddeaf3 100644
Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ
diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi
index bb2ba09ed5a2..475931dd804b 100644
Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ
diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi
index df4e995a7788..977dda0370ec 100644
Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ
diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi
index 3eef8910bb35..4f7884788ab4 100644
Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ
diff --git a/yogstation/code/modules/clothing/spacesuits/hardsuit.dm b/yogstation/code/modules/clothing/spacesuits/hardsuit.dm
index 8ec79c8a2ce2..eb3337028f89 100644
--- a/yogstation/code/modules/clothing/spacesuits/hardsuit.dm
+++ b/yogstation/code/modules/clothing/spacesuits/hardsuit.dm
@@ -3,41 +3,3 @@
 
 /obj/item/clothing/suit/space/hardsuit/security
   jetpack = /obj/item/tank/jetpack/suit
-
-//POWERARMORS
-//Currently are no different from normal hardsuits, except maybe for the higher armor ratings.
-/obj/item/clothing/head/helmet/space/hardsuit/powerarmor
-	alternate_worn_icon = 'yogstation/icons/mob/head.dmi'
-	icon = 'yogstation/icons/obj/clothing/hats.dmi'	
-/obj/item/clothing/suit/space/hardsuit/powerarmor
-	alternate_worn_icon = 'yogstation/icons/mob/suit.dmi'
-	icon = 'yogstation/icons/obj/clothing/suits.dmi'
-
-/obj/item/clothing/head/helmet/space/hardsuit/powerarmor/t45b
-	name = "Salvaged T-45b helmet"
-	desc = "It's some barely-functional power armor helmet from a by-gone age."
-	icon_state = "t45bhelmet"
-	item_state = "t45bhelmet"
-	armor = list("melee" = 50, "bullet" = 48, "laser" = 25, "energy" = 25, "bomb" = 48, "bio" = 100, "rad" = 50, "fire" = 50, "acid" = 25) 
-/obj/item/clothing/suit/space/hardsuit/powerarmor/t45b
-	name = "Salvaged T-45b power armor"
-	desc = "It's some barely-functional power armor, probably hundreds of years old."
-	icon_state = "t45bpowerarmor"
-	item_state = "t45bpowerarmor"
-	armor = list("melee" = 50, "bullet" = 48, "laser" = 25, "energy" = 25, "bomb" = 48, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 25)
-	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/powerarmor/t45b
-
-/obj/item/clothing/head/helmet/space/hardsuit/powerarmor/advanced
-	name = "Advanced power helmet"
-	desc = "It's an advanced power armor Mk I helmet. It looks somewhat threatening."
-	icon_state = "advhelmet1"
-	item_state = "advhelmet1"
-	armor = list("melee" = 50, "bullet" = 48, "laser" = 25, "energy" = 25, "bomb" = 48, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 25)
-/obj/item/clothing/suit/space/hardsuit/powerarmor/advanced
-	name = "Advanced power armor"
-	desc = "An advanced suit of power armor. It looks pretty impressive and threatening."
-	icon_state = "advpowerarmor1"
-	item_state = "advpowerarmor1"
-	armor = list("melee" = 50, "bullet" = 48, "laser" = 25, "energy" = 25, "bomb" = 48, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 25)
-	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/powerarmor/advanced
-