diff --git a/code/game/objects/structures/crates_lockers/closets/secure/antimatter_am.dm b/code/game/objects/structures/crates_lockers/closets/secure/antimatter_am.dm
index c6b8d02a5a..8ced446d2d 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/antimatter_am.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/antimatter_am.dm
@@ -1,13 +1,7 @@
 /obj/structure/closet/secure_closet/am_closet
 	name = "Antimatter Equipment"
 	req_access = list(access_all_personal_lockers)
-	icon_state = "secureeng1"
-	icon_closed = "secureeng"
-	icon_locked = "secureeng1"
-	icon_opened = "secureengopen"
-	icon_broken = "secureengbroken"
-	icon_off = "secureengoff"
-
+	closet_appearance = /decl/closet_appearance/secure_closet/engineering
 
 	New()
 		..()
diff --git a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm
index 8b71600aff..f969b17d73 100644
--- a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm
+++ b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm
@@ -103,8 +103,7 @@
 /obj/structure/closet/wardrobe/monastary
 	name = "Monastary wardrobe"
 	desc = "It's a storage unit for approved religious attire."
-	icon_state = "black"
-	icon_closed = "black"
+	closet_appearance = /decl/closet_appearance/wardrobe/black
 
 	starts_with = list(
 		/obj/item/clothing/suit/unathi/mantle = 2,
diff --git a/maps/yw/structures/closets/engineering.dm b/maps/yw/structures/closets/engineering.dm
index 0c757ad011..e6b19269ae 100644
--- a/maps/yw/structures/closets/engineering.dm
+++ b/maps/yw/structures/closets/engineering.dm
@@ -5,12 +5,7 @@
 
 /obj/structure/closet/secure_closet/engineering_chief_wardrobe
 	name = "chief engineer's wardrobe"
-	icon_state = "securece1"
-	icon_closed = "securece"
-	icon_locked = "securece1"
-	icon_opened = "secureceopen"
-	icon_broken = "securecebroken"
-	icon_off = "secureceoff"
+	closet_appearance = /decl/closet_appearance/secure_closet/engineering/ce
 	req_access = list(access_ce)
 
 	starts_with = list(
diff --git a/maps/yw/structures/closets/medical.dm b/maps/yw/structures/closets/medical.dm
index 0ea515d974..52b668000a 100644
--- a/maps/yw/structures/closets/medical.dm
+++ b/maps/yw/structures/closets/medical.dm
@@ -5,12 +5,7 @@
 
 /obj/structure/closet/secure_closet/CMO_wardrobe
 	name = "chief medical officer's locker"
-	icon_state = "cmosecure1"
-	icon_closed = "cmosecure"
-	icon_locked = "cmosecure1"
-	icon_opened = "cmosecureopen"
-	icon_broken = "cmosecurebroken"
-	icon_off = "cmosecureoff"
+	closet_appearance = /decl/closet_appearance/secure_closet/cmo
 	req_access = list(access_cmo)
 
 	starts_with = list(
diff --git a/maps/yw/structures/closets/misc.dm b/maps/yw/structures/closets/misc.dm
index f80e751a54..633ed83a24 100644
--- a/maps/yw/structures/closets/misc.dm
+++ b/maps/yw/structures/closets/misc.dm
@@ -73,14 +73,8 @@
 /obj/structure/closet/secure_closet/sar
 	name = "search and rescue locker"
 	desc = "Supplies for a wilderness first responder."
-	icon_state = "medical1"
-	icon_closed = "medical"
-	icon_locked = "medical1"
-	icon_opened = "medicalopen"
-	icon_broken = "medicalbroken"
-	icon_off = "medicaloff"
+	closet_appearance = /decl/closet_appearance/secure_closet/medical
 	req_access = list(access_fieldmedic)
-
 	starts_with = list(
 		/obj/item/weapon/storage/backpack/dufflebag/emt,
 		/obj/item/weapon/storage/box/autoinjectors,
diff --git a/maps/yw/structures/closets/misc_vr.dm b/maps/yw/structures/closets/misc_vr.dm
index ab7119d301..a1dc8a12f8 100644
--- a/maps/yw/structures/closets/misc_vr.dm
+++ b/maps/yw/structures/closets/misc_vr.dm
@@ -1,12 +1,6 @@
 /obj/structure/closet/secure_closet/explorer
 	icon = 'icons/obj/closet_vr.dmi'
-	icon_state = "secureexp1"
-	icon_closed = "secureexp"
-	icon_locked = "secureexp1"
-	icon_opened = "secureexpopen"
-	icon_broken = "secureexpbroken"
-	icon_off = "secureexpoff"
-
+	closet_appearance = /decl/closet_appearance/secure_closet/exploration
 	starts_with = list(
 		/obj/item/clothing/under/explorer,
 		/obj/item/clothing/suit/storage/hooded/explorer,
@@ -30,7 +24,7 @@
 
 /obj/structure/closet/secure_closet/sar
 	name = "field medic locker"
-
+	closet_appearance = /decl/closet_appearance/secure_closet/medical
 	starts_with = list(
 		/obj/item/weapon/storage/backpack/dufflebag/emt,
 		/obj/item/weapon/storage/box/autoinjectors,
@@ -65,6 +59,7 @@
 		/obj/item/device/cataloguer/compact)
 
 /obj/structure/closet/secure_closet/pilot
+	closet_appearance = /decl/closet_appearance/secure_closet/exploration/pilot
 	starts_with = list(
 		/obj/item/weapon/storage/backpack/parachute,
 		/obj/item/weapon/material/knife/tacknife/survival,
@@ -89,15 +84,8 @@
 
 /obj/structure/closet/secure_closet/pathfinder
 	name = "pathfinder locker"
-	icon = 'icons/obj/closet_vr.dmi'
-	icon_state = "secureexp1"
-	icon_closed = "secureexp"
-	icon_locked = "secureexp1"
-	icon_opened = "secureexpopen"
-	icon_broken = "secureexpbroken"
-	icon_off = "secureexpoff"
+	closet_appearance = /decl/closet_appearance/secure_closet/exploration/pathfinder
 	req_access = list(access_pathfinder)
-
 	starts_with = list(
 		/obj/item/clothing/under/explorer,
 		/obj/item/clothing/suit/storage/hooded/explorer,
diff --git a/maps/yw/structures/closets/research.dm b/maps/yw/structures/closets/research.dm
index 6630706df9..edabddde17 100644
--- a/maps/yw/structures/closets/research.dm
+++ b/maps/yw/structures/closets/research.dm
@@ -5,12 +5,7 @@
 
 /obj/structure/closet/secure_closet/RD_wardrobe
 	name = "research director's locker"
-	icon_state = "rdsecure1"
-	icon_closed = "rdsecure"
-	icon_locked = "rdsecure1"
-	icon_opened = "rdsecureopen"
-	icon_broken = "rdsecurebroken"
-	icon_off = "rdsecureoff"
+	closet_appearance = /decl/closet_appearance/secure_closet/rd
 	req_access = list(access_rd)
 
 	starts_with = list(
diff --git a/maps/yw/structures/closets/security.dm b/maps/yw/structures/closets/security.dm
index 1bde2d7a34..d0e6ab2fb6 100644
--- a/maps/yw/structures/closets/security.dm
+++ b/maps/yw/structures/closets/security.dm
@@ -5,12 +5,7 @@
 
 /obj/structure/closet/secure_closet/hos_wardrobe
 	name = "head of security's locker"
-	icon_state = "hossecure1"
-	icon_closed = "hossecure"
-	icon_locked = "hossecure1"
-	icon_opened = "hossecureopen"
-	icon_broken = "hossecurebroken"
-	icon_off = "hossecureoff"
+	closet_appearance = /decl/closet_appearance/secure_closet/security/hos
 	req_access = list(access_hos)
 
 	starts_with = list(