diff --git a/code/game/objects/structures/crates_lockers/_closets_appearance_definitions_yw.dm b/code/game/objects/structures/crates_lockers/_closets_appearance_definitions_yw.dm
new file mode 100644
index 0000000000..effcb5a2a6
--- /dev/null
+++ b/code/game/objects/structures/crates_lockers/_closets_appearance_definitions_yw.dm
@@ -0,0 +1,36 @@
+/decl/closet_appearance/wall/autolok/shuttleemerg
+	color = COLOR_YELLOW_GRAY
+	decals = list(
+		"upper_side_vent",
+		"lower_side_vent"
+    )
+
+/decl/closet_appearance/secure_closet/lumber
+	can_lock = FALSE
+	color = COLOR_WARM_YELLOW
+	decals = list(
+		"upper_side_vent",
+		"lower_side_vent"
+	)
+	extra_decals = list(
+		"stripe_vertical_mid_full" = COLOR_BEASTY_BROWN,
+		"stripe_vertical_left_full" = COLOR_BEASTY_BROWN
+	)
+
+/decl/closet_appearance/secure_closet/blueshield
+	color = COLOR_PALE_BLUE_GRAY
+	decals = list("lower_side_vent")
+	extra_decals = list(
+		"stripe_vertical_mid_full" = COLOR_CLOSET_GOLD,
+		"command" = COLOR_CLOSET_GOLD
+	)
+
+/decl/closet_appearance/secure_closet/security_pilot
+	color = COLOR_NT_RED
+	decals = list(
+		"lower_holes"
+	)
+	extra_decals = list(
+		"stripe_vertical_mid_partial" = COLOR_WARM_YELLOW,
+		"hop" = COLOR_WARM_YELLOW
+	)
\ No newline at end of file
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
index 0196736d8d..6ee9c88ba7 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
@@ -89,9 +89,8 @@
 
 /obj/structure/closet/lumber
 	name = "Lumberjack's equipment"
-	icon_state = "mining"
-	icon_closed = "mining"
-	icon_opened = "miningopen"
+	desc = "It's a storage unit for Lumberjack equpiment, though it seems the lock is broken."
+	closet_appearance = /decl/closet_appearance/secure_closet/lumber
 
 	starts_with = list(
 		/obj/item/device/radio/headset/headset_mine,
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/closets_yw.dm b/code/game/objects/structures/crates_lockers/closets/secure/closets_yw.dm
index f986211cfa..e7ff3d88f2 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/closets_yw.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/closets_yw.dm
@@ -1,13 +1,7 @@
 /obj/structure/closet/secure_closet/blueshield
-	name = "blueshield's locker"
+	name = "blueshield's closet"
 	req_access = list(access_blueshield)
-	icon = 'icons/obj/closet_yw.dmi'
-	icon_state = "bssecure1"
-	icon_closed = "bssecure"
-	icon_locked = "bssecure1"
-	icon_opened = "bssecureopen"
-	icon_broken = "bssecurebroken"
-	icon_off = "bssecureoff"
+	closet_appearance = /decl/closet_appearance/secure_closet/blueshield
 	storage_capacity = 2.5 * MOB_MEDIUM
 
 	starts_with = list(
@@ -39,13 +33,7 @@
 /obj/structure/closet/secure_closet/security_pilot
 	name = "security pilot's locker"
 	req_access = list(access_secpilot)
-	icon = 'icons/obj/closet_yw.dmi'
-	icon_state = "secpilot1"
-	icon_closed = "secpilot"
-	icon_locked = "secpilot1"
-	icon_opened = "secpilotopen"
-	icon_broken = "secpilotbroken"
-	icon_off = "secpilotoff"
+	closet_appearance = /decl/closet_appearance/secure_closet/security_pilot
 	storage_capacity = 2.5 * MOB_MEDIUM
 
 	starts_with = list(
diff --git a/code/game/objects/structures/crates_lockers/closets/utility_closets_yw.dm b/code/game/objects/structures/crates_lockers/closets/utility_closets_yw.dm
index d93f8f5838..0fcc284053 100644
--- a/code/game/objects/structures/crates_lockers/closets/utility_closets_yw.dm
+++ b/code/game/objects/structures/crates_lockers/closets/utility_closets_yw.dm
@@ -1,10 +1,7 @@
 /obj/structure/closet/shuttleemerg //wall mounted fire closet
 	name = "emergency repairs closet"
 	desc = "It's a storage unit for emergency repair supplies."
-	icon = 'icons/obj/closet_yw.dmi'
-	icon_state = "engicloset"
-	icon_closed = "engicloset"
-	icon_opened = "engicloset_open"
+	closet_appearance = /decl/closet_appearance/wall/autolok/shuttleemerg
 	plane = TURF_PLANE
 	layer = ABOVE_TURF_LAYER
 	anchored = 1
diff --git a/vorestation.dme b/vorestation.dme
index 75334581ff..e0b4fb7e65 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -1433,6 +1433,7 @@
 #include "code\game\objects\structures\crates_lockers\__closets.dm"
 #include "code\game\objects\structures\crates_lockers\_closets_appearance_definitions.dm"
 #include "code\game\objects\structures\crates_lockers\_closets_appearance_definitions_vr.dm"
+#include "code\game\objects\structures\crates_lockers\_closets_appearance_definitions_yw.dm"
 #include "code\game\objects\structures\crates_lockers\crates.dm"
 #include "code\game\objects\structures\crates_lockers\crates_vr.dm"
 #include "code\game\objects\structures\crates_lockers\largecrate.dm"