diff --git a/nsv13/code/modules/clothing/custom_clothes.dm b/nsv13/code/modules/clothing/custom_clothes.dm
index 8d5bd877b4c..422a40db8e9 100644
--- a/nsv13/code/modules/clothing/custom_clothes.dm
+++ b/nsv13/code/modules/clothing/custom_clothes.dm
@@ -523,12 +523,11 @@
 /obj/item/clothing/head/helmet/space/hardsuit/master_at_arms
 	name = "Master-At-Arm's Bombsuit Helmet"
 	desc = "Use in case of bomb."
-	icon = 'nsv13/icons/obj/clothing/hats.dmi' //Placeholder subtype for our own iconsets
+	icon = 'nsv13/icons/obj/clothing/hats.dmi'
 	worn_icon = 'nsv13/icons/mob/head.dmi'
-	icon_state = "hardsuit0_maa_bombsuit"
-	item_state = "maa_bombsuit"
-	worn_icon_state = "maa_bombsuit"
-	armor = list("melee" = 25, "bullet" = 15, "laser" = 20,"energy" = 10, "bomb" = 100, "bio" = 100, "rad" = 50, "fire" = 85, "acid" = 50)
+	icon_state = "hardsuit0-maa"
+	hardsuit_type = "maa"
+	armor = list("melee" = 20, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 100, "bio" = 100, "rad" = 50, "fire" = 80, "acid" = 65, "stamina" = 10)
 	min_cold_protection_temperature = EMERGENCY_HELM_MIN_TEMP_PROTECT
 
 /obj/item/clothing/suit/space/hardsuit/master_at_arms
@@ -537,10 +536,9 @@
 	icon = 'nsv13/icons/obj/clothing/suits.dmi'
 	worn_icon = 'nsv13/icons/mob/suit.dmi'
 	icon_state = "maa_bombsuit"
-	item_state = "maa_bombsuit"
-	armor = list("melee" = 25, "bullet" = 15, "laser" = 20,"energy" = 10, "bomb" = 100, "bio" = 100, "rad" = 50, "fire" = 85, "acid" = 50)
+	armor = list("melee" = 20, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 100, "bio" = 100, "rad" = 50, "fire" = 80, "acid" = 65, "stamina" = 10)
 	min_cold_protection_temperature = EMERGENCY_SUIT_MIN_TEMP_PROTECT
-	slowdown = 2
+	slowdown = 1.5
 	permeability_coefficient = 0.01
 	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/master_at_arms
 
diff --git a/nsv13/icons/mob/head.dmi b/nsv13/icons/mob/head.dmi
index 9db6b16434c..4712873d81c 100644
Binary files a/nsv13/icons/mob/head.dmi and b/nsv13/icons/mob/head.dmi differ
diff --git a/nsv13/icons/mob/suit.dmi b/nsv13/icons/mob/suit.dmi
index 11e86cd757f..dc755129717 100644
Binary files a/nsv13/icons/mob/suit.dmi and b/nsv13/icons/mob/suit.dmi differ
diff --git a/nsv13/icons/obj/clothing/hats.dmi b/nsv13/icons/obj/clothing/hats.dmi
index 62366b0b4e3..f5ffeda3036 100644
Binary files a/nsv13/icons/obj/clothing/hats.dmi and b/nsv13/icons/obj/clothing/hats.dmi differ
diff --git a/nsv13/icons/obj/clothing/suits.dmi b/nsv13/icons/obj/clothing/suits.dmi
index a84613439d6..97cec84c0be 100644
Binary files a/nsv13/icons/obj/clothing/suits.dmi and b/nsv13/icons/obj/clothing/suits.dmi differ