diff --git a/code/game/objects/structures/crates_lockers/closets/job_closets.dm b/code/game/objects/structures/crates_lockers/closets/job_closets.dm
index 9521d8f1912..56b661dbcd2 100644
--- a/code/game/objects/structures/crates_lockers/closets/job_closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets/job_closets.dm
@@ -65,7 +65,7 @@
 /obj/structure/closet/jcloset
 	name = "custodial closet"
 	desc = "It's a storage unit for janitorial clothes and gear."
-	closed_door_sprite = "mixed"
+	icon_state = "janitor"
 
 
 /obj/structure/closet/jcloset/populate_contents()
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/cargo_lockers.dm b/code/game/objects/structures/crates_lockers/closets/secure/cargo_lockers.dm
index 45b88525f35..4b54b199635 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/cargo_lockers.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/cargo_lockers.dm
@@ -80,9 +80,8 @@
 /obj/structure/closet/secure_closet/smith
 	name = "smith's locker"
 	req_access = list(ACCESS_SMITH)
-	icon_state = "cargo"
+	icon_state = "smith"
 	opened_door_sprite = "cargo"
-	closed_door_sprite = "smith"
 
 /obj/structure/closet/secure_closet/smith/populate_contents()
 	new /obj/item/radio/headset/headset_cargo(src)
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/engineering_lockers.dm b/code/game/objects/structures/crates_lockers/closets/secure/engineering_lockers.dm
index c7a159add47..0ab663b0d95 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/engineering_lockers.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering_lockers.dm
@@ -74,8 +74,7 @@
 /obj/structure/closet/secure_closet/engineering_personal
 	name = "engineer's locker"
 	req_access = list(ACCESS_ENGINE_EQUIP)
-	icon_state = "eng"
-	closed_door_sprite = "eng_secure"
+	icon_state = "eng_secure"
 
 /obj/structure/closet/secure_closet/engineering_personal/populate_contents()
 	if(prob(50))
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security_lockers.dm b/code/game/objects/structures/crates_lockers/closets/secure/security_lockers.dm
index 145f42bcfdd..f89e99fd640 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/security_lockers.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/security_lockers.dm
@@ -43,6 +43,7 @@
 	name = "head of security's locker"
 	req_access = list(ACCESS_HOS)
 	icon_state = "hos"
+	opened_door_sprite = "sec"
 
 /obj/structure/closet/secure_closet/hos/populate_contents()
 	if(prob(50))
@@ -121,8 +122,8 @@
 /obj/structure/closet/secure_closet/blueshield
 	name = "blueshield's locker"
 	req_access = list(ACCESS_BLUESHIELD)
-	icon_state = "hop"
-	closed_door_sprite = "bs"
+	icon_state = "bs"
+	opened_door_sprite = "hop"
 
 /obj/structure/closet/secure_closet/blueshield/populate_contents()
 	new /obj/item/storage/backpack/blueshield(src)
@@ -142,8 +143,8 @@
 /obj/structure/closet/secure_closet/ntrep
 	name = "\improper Nanotrasen Representative's locker"
 	req_access = list(ACCESS_NTREP)
-	icon_state = "hop"
-	closed_door_sprite = "ntr"
+	icon_state = "ntr"
+	opened_door_sprite = "hop"
 
 /obj/structure/closet/secure_closet/ntrep/populate_contents()
 	new /obj/item/book/manual/wiki/faxes(src)
@@ -308,7 +309,7 @@
 	name = "\improper Magistrate's locker"
 	req_access = list(ACCESS_MAGISTRATE)
 	icon_state = "magi"
-	opened_door_sprite = "chaplain"
+	opened_door_sprite = "cap"
 
 /obj/structure/closet/secure_closet/magistrate/populate_contents()
 	new /obj/item/book/manual/wiki/faxes(src)
@@ -325,9 +326,8 @@
 /obj/structure/closet/secure_closet/iaa
 	name = "internal affairs locker"
 	req_access = list(ACCESS_INTERNAL_AFFAIRS)
-	icon_state = "magi"
+	icon_state = "iaa"
 	opened_door_sprite = "chaplain"
-	closed_door_sprite = "iaa"
 
 /obj/structure/closet/secure_closet/iaa/populate_contents()
 	new /obj/item/book/manual/wiki/faxes(src)
diff --git a/icons/obj/closet.dmi b/icons/obj/closet.dmi
index 7b23a5c496f..9a1a22a4e42 100644
Binary files a/icons/obj/closet.dmi and b/icons/obj/closet.dmi differ