diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm
index 62cc73d7d68..23f21f1576b 100644
--- a/code/modules/clothing/head/jobs.dm
+++ b/code/modules/clothing/head/jobs.dm
@@ -60,47 +60,47 @@
 /obj/item/clothing/head/beret/sec
 	name = "security beret"
 	desc = "A beret with the security insignia emblazoned on it. For officers that are more inclined towards style than safety."
-	icon_state = "beret_badge"
+	icon_state = "beret_officer"
 /obj/item/clothing/head/beret/sec/navy/officer
 	name = "officer beret"
 	desc = "A navy blue beret with an officer's rank emblem. For officers that are more inclined towards style than safety."
-	icon_state = "officerberet"
+	icon_state = "beret_navy_officer"
 /obj/item/clothing/head/beret/sec/navy/hos
 	name = "officer beret"
 	desc = "A navy blue beret with a commander's rank emblem. For officers that are more inclined towards style than safety."
-	icon_state = "hosberet"
+	icon_state = "beret_navy_hos"
 /obj/item/clothing/head/beret/sec/navy/warden
 	name = "warden beret"
 	desc = "A navy blue beret with a warden's rank emblem. For officers that are more inclined towards style than safety."
-	icon_state = "wardenberet"
+	icon_state = "beret_navy_warden"
 /obj/item/clothing/head/beret/sec/corporate/officer
 	name = "officer beret"
 	desc = "A corporate black beret with an officer's rank emblem. For officers that are more inclined towards style than safety."
-	icon_state = "officerberet"
+	icon_state = "beret_corporate_officer"
 /obj/item/clothing/head/beret/sec/corporate/hos
 	name = "officer beret"
 	desc = "A corporate black beret with a commander's rank emblem. For officers that are more inclined towards style than safety."
-	icon_state = "hosberet"
+	icon_state = "beret_corporate_hos"
 /obj/item/clothing/head/beret/sec/corporate/warden
 	name = "warden beret"
 	desc = "A corporate black beret with a warden's rank emblem. For officers that are more inclined towards style than safety."
-	icon_state = "wardenberet"
+	icon_state = "beret_corporate_warden"
 /obj/item/clothing/head/beret/engineering
 	name = "engineering beret"
 	desc = "A beret with the engineering insignia emblazoned on it. For engineers that are more inclined towards style than safety."
-	icon_state = "e_beret_badge"
+	icon_state = "beret_engineering"
 /obj/item/clothing/head/beret/purple
 	name = "purple beret"
 	desc = "A stylish, if purple, beret."
-	icon_state = "purpleberet"
+	icon_state = "beret_purple"
 /obj/item/clothing/head/beret/centcom/officer
 	name = "officers beret"
 	desc = "A black beret adorned with the shield - a silver kite shield with an engraved sword - of the corporate security forces."
-	icon_state = "centcomofficer"
+	icon_state = "beret_centcom_officer"
 /obj/item/clothing/head/beret/centcom/captain
 	name = "captains beret"
 	desc = "A white beret adorned with the shield - a silver kite shield with an engraved sword - of the corporate security forces."
-	icon_state = "centcomcaptain"
+	icon_state = "beret_centcom_captain"
 
 //Medical
 /obj/item/clothing/head/surgery
diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi
index 0bb42b99618..260a2c73c3d 100644
Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ
diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi
index 9106b467787..2f7bb6d3740 100644
Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ