diff --git a/code/game/area/ss13_areas.dm b/code/game/area/ss13_areas.dm
index fcb1068574d..f5d509094b2 100644
--- a/code/game/area/ss13_areas.dm
+++ b/code/game/area/ss13_areas.dm
@@ -1400,6 +1400,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	for(var/obj/structure/closet/secure_closet/brig/temp_closet in src)
 		temp_closet.locked = 0
 		temp_closet.close()
+		temp_closet.update_icon()
 	for(var/obj/machinery/door_timer/temp_timer in src)
 		temp_timer.releasetime = 1
 	..()
diff --git a/code/game/machinery/doors/brigdoors.dm b/code/game/machinery/doors/brigdoors.dm
index 0ea43c82520..ba2f836507a 100644
--- a/code/game/machinery/doors/brigdoors.dm
+++ b/code/game/machinery/doors/brigdoors.dm
@@ -208,6 +208,7 @@
 			continue
 		C.locked = TRUE
 		C.close()
+		C.update_icon()
 
 	for(var/obj/machinery/treadmill_monitor/T in targets)
 		T.total_joules = 0
diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm
index 59be20a12f5..4535ad44a2a 100644
--- a/code/game/objects/structures/crates_lockers/closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets.dm
@@ -31,11 +31,10 @@
 /obj/structure/closet/Initialize(mapload)
 	. = ..()
 	icon_closed = "[icon_state]"
-	if(!is_wardrobe)
-		icon_opened = "[icon_state]_open"
-	else if(shared_open_sprite)
+	icon_opened = "[icon_state]_open"
+	if(shared_open_sprite)
 		icon_opened = shared_open_sprite
-	else
+	if(is_wardrobe)
 		icon_opened = "generic_open"
 		open_door_sprite = "generic_door"
 	if(mapload && !opened)
@@ -314,8 +313,11 @@
 		icon_state = icon_opened
 	update_overlays()
 
-/obj/structure/closet/proc/update_overlays()
+/obj/structure/closet/proc/update_overlays(transparent = FALSE)
 	overlays.Cut()
+	if(transparent && opened)
+		overlays += "[open_door_sprite]_trans"
+		return
 	if(opened)
 		overlays += open_door_sprite
 		return
@@ -396,6 +398,7 @@
 	desc = "A storage unit that moves and stores through the fourth dimension."
 	density = 0
 	icon_state = "bluespace"
+	open_door_sprite = "bluespace_door"
 	storage_capacity = 60
 	var/materials = list(MAT_METAL = 5000, MAT_PLASMA = 2500, MAT_TITANIUM = 500, MAT_BLUESPACE = 500)
 
@@ -412,10 +415,12 @@
 	icon_opened = transparent ? "bluespace_open_trans" : "bluespace_open"
 	icon_closed = transparent ? "bluespace_trans" : "bluespace"
 	icon_state = opened ? icon_opened : icon_closed
+	update_overlays(transparent)
 
 /obj/structure/closet/bluespace/Crossed(atom/movable/AM, oldloc)
 	if(AM.density)
 		icon_state = opened ? "bluespace_open_trans" : "bluespace_trans"
+		update_overlays(TRUE)
 
 /obj/structure/closet/bluespace/Move(NewLoc, direct) // Allows for "phasing" throug objects but doesn't allow you to stuff your EOC homebois in one of these and push them through walls.
 	var/turf/T = get_turf(NewLoc)
diff --git a/code/game/objects/structures/crates_lockers/crittercrate.dm b/code/game/objects/structures/crates_lockers/crittercrate.dm
index 69067bf740a..a89a5e68a11 100644
--- a/code/game/objects/structures/crates_lockers/crittercrate.dm
+++ b/code/game/objects/structures/crates_lockers/crittercrate.dm
@@ -4,6 +4,7 @@
 	icon_state = "critter"
 	icon_opened = "critteropen"
 	icon_closed = "critter"
+	open_door_sprite = null
 	var/already_opened = 0
 	var/content_mob = null
 	var/amount = 1
diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
index 3e0de827192..01441ae391b 100644
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -1297,6 +1297,7 @@
 		var/obj/structure/closet/secure_closet/brig/locker = new /obj/structure/closet/secure_closet/brig(prison_cell)
 		locker.opened = FALSE
 		locker.locked = TRUE
+		locker.update_icon()
 
 		//strip their stuff and stick it in the crate
 		for(var/obj/item/I in M)
diff --git a/icons/obj/closet.dmi b/icons/obj/closet.dmi
index a07e00da163..678df03e0d3 100644
Binary files a/icons/obj/closet.dmi and b/icons/obj/closet.dmi differ
diff --git a/icons/obj/walllocker.dmi b/icons/obj/walllocker.dmi
index 3eb10b14406..89f45dc995e 100644
Binary files a/icons/obj/walllocker.dmi and b/icons/obj/walllocker.dmi differ