diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm
index ce4822e2049..59149ef0301 100644
--- a/code/game/objects/structures/crates_lockers/closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets.dm
@@ -60,8 +60,6 @@
 		// Ensure the storage cap is respected
 		if(++itemcount >= storage_capacity)
 			break
-	if(istype(src, /obj/structure/closet/secure_closet/guncabinet))
-		update_icon()
 
 // Fix for #383 - C4 deleting fridges with corpses
 /obj/structure/closet/Destroy()
diff --git a/code/game/objects/structures/crates_lockers/closets/l3closet.dm b/code/game/objects/structures/crates_lockers/closets/l3closet.dm
index cd0020c70d5..fe93f4700a5 100644
--- a/code/game/objects/structures/crates_lockers/closets/l3closet.dm
+++ b/code/game/objects/structures/crates_lockers/closets/l3closet.dm
@@ -10,8 +10,6 @@
 	new /obj/item/clothing/head/bio_hood/general( src )
 
 /obj/structure/closet/l3closet/general
-	icon_state = "bio"
-	open_door_sprite = "bio_door"
 
 /obj/structure/closet/l3closet/general/populate_contents()
 	new /obj/item/clothing/suit/bio_suit/general( src )
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/bar.dm b/code/game/objects/structures/crates_lockers/closets/secure/bar.dm
index 72b5cd1e34c..d27a430d7e9 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/bar.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/bar.dm
@@ -21,10 +21,3 @@
 	new /obj/item/reagent_containers/food/drinks/cans/beer(src)
 	new /obj/item/reagent_containers/food/drinks/cans/beer(src)
 	new /obj/item/reagent_containers/food/drinks/cans/beer(src)
-
-/obj/structure/closet/secure_closet/bar/update_icon()
-	if(!opened)
-		icon_state = icon_closed
-	else
-		icon_state = icon_opened
-	update_overlays()
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
index c7c99e2eb1d..50112fbd11b 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
@@ -1,12 +1,6 @@
 /obj/structure/closet/secure_closet/freezer
 	desc = "It's a card-locked refrigerative storage unit. This one is lead-lined."
 
-/obj/structure/closet/secure_closet/freezer/update_icon()
-	if(!opened)
-		icon_state = icon_closed
-	else
-		icon_state = icon_opened
-	update_overlays()
 /obj/structure/closet/secure_closet/freezer/ex_act(severity)
 	// IF INDIANA JONES CAN DO IT SO CAN YOU
 
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm b/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm
index d2372dd7fb4..33b5aec4919 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm
@@ -9,6 +9,10 @@
 	..()
 	update_icon()
 
+/obj/structure/closet/secure_closet/guncabinet/take_contents()
+	..()
+	update_icon()
+
 /obj/structure/closet/secure_closet/guncabinet/emag_act(mob/user)
 	if(!broken)
 		broken = TRUE
@@ -17,7 +21,7 @@
 		update_icon()
 
 /obj/structure/closet/secure_closet/guncabinet/update_overlays()
-	overlays.Cut()
+	cut_overlays()
 	if(!opened)
 		var/lazors = 0
 		var/shottas = 0
@@ -40,9 +44,8 @@
 				gun.pixel_x = i*4
 				overlays += gun
 
-		overlays += "door"
-
+		add_overlay("door")
 		if(broken)
-			overlays += "off"
+			add_overlay("off")
 		else if(locked)
-			overlays += "locked"
+			add_overlay("locked")
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm
index 45277a0568a..5e503b770d3 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm
@@ -21,8 +21,6 @@
 	new /obj/item/clothing/under/color/white( src )
 	new /obj/item/clothing/shoes/white( src )
 
-
-
 /obj/structure/closet/secure_closet/personal/cabinet
 	icon_state = "cabinet"
 	open_door_sprite = "cabient_door"
@@ -33,13 +31,6 @@
 	open_sound_volume = 25
 	close_sound_volume = 50
 
-/obj/structure/closet/secure_closet/personal/cabinet/update_icon()
-	if(!opened)
-		icon_state = icon_closed
-	else
-		icon_state = icon_opened
-	update_overlays()
-
 /obj/structure/closet/secure_closet/personal/cabinet/populate_contents()
 	new /obj/item/storage/backpack/satchel/withwallet( src )
 	new /obj/item/radio/headset( src )
@@ -63,9 +54,9 @@
 		//they can open all lockers, or nobody owns this, or they own this locker
 		locked = !locked
 		if(locked)
-			overlays += "locked"
+			add_overlay("locked")
 		else
-			overlays += "unlocked"
+			add_overlay("unlocked")
 			icon_state = icon_closed
 			registered_name = null
 			desc = initial(desc)
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
index 84ddfed58bc..8965c3f7361 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
@@ -4,10 +4,8 @@
 	icon = 'icons/obj/closet.dmi'
 	icon_state = "secure"
 	open_door_sprite = "secure_door"
-	density = TRUE
 	opened = FALSE
 	locked = TRUE
-	broken = FALSE
 	can_be_emaged = TRUE
 	max_integrity = 250
 	armor = list(MELEE = 30, BULLET = 50, LASER = 50, ENERGY = 100, BOMB = 0, BIO = 0, RAD = 0, FIRE = 80, ACID = 80)
@@ -98,14 +96,6 @@
 	else
 		to_chat(usr, "<span class='warning'>This mob type can't use this verb.</span>")
 
-/obj/structure/closet/secure_closet/update_icon()
-	if(!opened)
-		icon_state = icon_closed
-		update_overlays()
-		return
-	icon_state = icon_opened
-	update_overlays()
-
 /obj/structure/closet/secure_closet/update_overlays() //Putting the welded stuff in update_overlays() so it's easy to overwrite for special cases (Fridges, cabinets, and whatnot)
 	cut_overlays()
 	if(opened)