diff --git a/code/game/objects/structures/crates_lockers/walllocker.dm b/code/game/objects/structures/crates_lockers/walllocker.dm
index 2937e7b58ac..03a81a7ca5b 100644
--- a/code/game/objects/structures/crates_lockers/walllocker.dm
+++ b/code/game/objects/structures/crates_lockers/walllocker.dm
@@ -11,6 +11,10 @@
 	icon_closed = "wall-locker"
 	icon_opened = "wall-lockeropen"
 
+/obj/structure/closet/walllocker/close()
+	..()
+	density = 0 //It's a locker in a wall, you aren't going to be walking into it.
+
 //spawns endless (3 sets) amounts of breathmask, emergency oxy tank and crowbar
 
 /obj/structure/closet/walllocker/emerglocker
@@ -19,12 +23,14 @@
 	var/list/spawnitems = list(/obj/item/weapon/tank/emergency_oxygen,/obj/item/clothing/mask/breath,/obj/item/weapon/crowbar)
 	var/amount = 3 // spawns each items X times.
 	icon_state = "emerg"
+	icon_closed = "emerg"
+	icon_opened = "emergopen"
 
 /obj/structure/closet/walllocker/emerglocker/attack_hand(mob/user as mob)
 	if (istype(user, /mob/living/silicon/ai))	//Added by Strumpetplaya - AI shouldn't be able to
 		return									//activate emergency lockers.  This fixes that.  (Does this make sense, the AI can't call attack_hand, can it? --Mloc)
 	if(!amount)
-		usr << "<spawn class='notice'>It's empty.."
+		usr << "<spawn class='notice'>It's empty."
 		return
 	if(amount)
 		usr << "<spawn class='notice'>You take out some items from \the [src]."
diff --git a/icons/obj/walllocker.dmi b/icons/obj/walllocker.dmi
index 1b3fe851f0d..4c9389ec1aa 100644
Binary files a/icons/obj/walllocker.dmi and b/icons/obj/walllocker.dmi differ