diff --git a/code/modules/clothing/spacesuits/rig/rig_pieces.dm b/code/modules/clothing/spacesuits/rig/rig_pieces.dm
index 0b03760f09e..d7ba9c35e1e 100644
--- a/code/modules/clothing/spacesuits/rig/rig_pieces.dm
+++ b/code/modules/clothing/spacesuits/rig/rig_pieces.dm
@@ -51,7 +51,11 @@
 	breach_threshold = 38
 	resilience = 0.2
 	can_breach = 1
-	sprite_sheets = list("Tajara" = 'icons/mob/species/tajaran/suit.dmi',"Unathi" = 'icons/mob/species/unathi/suit.dmi', "Machine = 'icons/mob/species/machine/suit.dmi")
+	sprite_sheets = list(
+		"Tajara" = 'icons/mob/species/tajaran/suit.dmi',
+		"Unathi" = 'icons/mob/species/unathi/suit.dmi',
+		"Machine" = 'icons/mob/species/machine/suit.dmi'
+		)
 	species_restricted = list("exclude","Diona","Xenomorph","Golem","Vaurca","Vox")
 
 	supporting_limbs = list()
diff --git a/code/modules/clothing/spacesuits/rig/suits/light.dm b/code/modules/clothing/spacesuits/rig/suits/light.dm
index 588d1572e63..2f0b679e765 100644
--- a/code/modules/clothing/spacesuits/rig/suits/light.dm
+++ b/code/modules/clothing/spacesuits/rig/suits/light.dm
@@ -124,9 +124,9 @@
 	species_restricted = list("exclude","Diona","Xenomorph", "Golem")
 	sprite_sheets = list(
 		"Tajara" = 'icons/mob/species/tajaran/suit.dmi',
-		"Skrell" = 'icons/mob/species/skrell/suit.dmi',
 		"Unathi" = 'icons/mob/species/unathi/suit.dmi',
-		"Vaurca" = "icons/mob/species/vaurca/suit.dmi"
+		"Vaurca" = "icons/mob/species/vaurca/suit.dmi",
+		"Machine" = 'icons/mob/species/machine/suit.dmi'
 		)
 	breach_threshold = 38 //comparable to regular hardsuits
 
@@ -136,7 +136,8 @@
 		"Tajara" = 'icons/mob/species/tajaran/helmet.dmi',
 		"Skrell" = 'icons/mob/species/skrell/helmet.dmi',
 		"Unathi" = 'icons/mob/species/unathi/helmet.dmi',
-		"Vaurca" = "icons/mob/species/vaurca/helmet.dmi"
+		"Vaurca" = "icons/mob/species/vaurca/helmet.dmi",
+		"Machine" = 'icons/mob/species/machine/helmet.dmi'
 	)
 
 /obj/item/weapon/rig/light/stealth
diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm
index a5a83472e6a..de4a699b417 100644
--- a/code/modules/mob/living/carbon/human/update_icons.dm
+++ b/code/modules/mob/living/carbon/human/update_icons.dm
@@ -890,6 +890,7 @@ There are several things that need to be remembered:
 		update_inv_shoes(0)
 
 	update_collar(0)
+	update_inv_w_uniform(0)
 
 	if(update_icons)
 		update_icons()
diff --git a/icons/mob/species/machine/suit.dmi b/icons/mob/species/machine/suit.dmi
index 8ad91181c03..41ccaf7b139 100644
Binary files a/icons/mob/species/machine/suit.dmi and b/icons/mob/species/machine/suit.dmi differ