diff --git a/code/game/objects/closets/secure/medical.dm b/code/game/objects/closets/secure/medical.dm
index 3d220fb37de..383296c9636 100644
--- a/code/game/objects/closets/secure/medical.dm
+++ b/code/game/objects/closets/secure/medical.dm
@@ -1,12 +1,12 @@
 /obj/structure/closet/secure_closet/medicine
 	name = "Medicine Closet"
 	desc = "Filled with medical junk."
-	icon_state = "medical1"
-	icon_closed = "medical"
-	icon_locked = "medical1"
-	icon_opened = "medicalopen"
-	icon_broken = "medicalbroken"
-	icon_off = "medical1"
+	icon_state = "securemed1"
+	icon_closed = "securemed"
+	icon_locked = "securemed1"
+	icon_opened = "securemedopen"
+	icon_broken = "securemedbroken"
+	icon_off = "securemed1"
 	req_access = list(access_medical)
 
 
@@ -28,13 +28,13 @@
 
 /obj/structure/closet/secure_closet/anaesthetic
 	name = "Anesthetic"
-	desc = "Used to knock people out, either by sleeping gas or brute force."
-	icon_state = "medical1"
-	icon_closed = "medical"
-	icon_locked = "medical1"
-	icon_opened = "medicalopen"
-	icon_broken = "medicalbroken"
-	icon_off = "medical1"
+	desc = "Used to knock people out."
+	icon_state = "securemed1"
+	icon_closed = "securemed"
+	icon_locked = "securemed1"
+	icon_opened = "securemedopen"
+	icon_broken = "securemedbroken"
+	icon_off = "securemed1"
 	req_access = list(access_medical)
 
 
@@ -51,6 +51,31 @@
 
 
 
+/obj/structure/closet/secure_closet/doctor_personal
+	name = "Doctor's Locker"
+	req_access = list(access_medical)
+	icon_state = "securemed1"
+	icon_closed = "securemed"
+	icon_locked = "securemed1"
+	icon_opened = "securemedopen"
+	icon_broken = "securemedbroken"
+	icon_off = "securemed1"
+
+	New()
+		..()
+		sleep(2)
+		new /obj/item/wardrobe/doctor(src)
+		//
+		var/obj/item/weapon/storage/backpack/medic/BPK = new /obj/item/weapon/storage/backpack/medic(src)
+		var/obj/item/weapon/storage/box/B = new(BPK)
+		new /obj/item/weapon/pen(B)
+		new /obj/item/device/pda/medical(src)
+		new /obj/item/weapon/storage/firstaid/regular(src)
+		new /obj/item/device/flashlight/pen(src)
+		new /obj/item/weapon/cartridge/medical(src)
+		new /obj/item/device/radio/headset/headset_med(src)
+		return
+
 /obj/structure/closet/secure_closet/chemist_personal
 	name = "Chemist's Locker"
 	req_access = list(access_chemistry)
@@ -67,25 +92,6 @@
 		new /obj/item/device/pda/toxins(src)
 		return
 
-/obj/structure/closet/secure_closet/doctor_personal
-	name = "Doctor's Locker"
-	req_access = list(access_medical)
-
-	New()
-		..()
-		sleep(2)
-		new /obj/item/wardrobe/doctor(src)
-		//
-		var/obj/item/weapon/storage/backpack/medic/BPK = new /obj/item/weapon/storage/backpack/medic(src)
-		var/obj/item/weapon/storage/box/B = new(BPK)
-		new /obj/item/weapon/pen(B)
-		new /obj/item/device/pda/medical(src)
-		new /obj/item/weapon/storage/firstaid/regular(src)
-		new /obj/item/device/flashlight/pen(src)
-		new /obj/item/weapon/cartridge/medical(src)
-		new /obj/item/device/radio/headset/headset_med(src)
-		return
-
 /obj/structure/closet/secure_closet/genetics_personal
 	name = "Geneticist's Locker"
 	req_access = list(access_medlab)
@@ -122,6 +128,12 @@
 /obj/structure/closet/secure_closet/CMO
 	name = "Chief Medical Officer's Locker"
 	req_access = list(access_cmo)
+	icon_state = "cmosecure1"
+	icon_closed = "cmosecure"
+	icon_locked = "cmosecure1"
+	icon_opened = "cmosecureopen"
+	icon_broken = "cmosecurebroken"
+	icon_off = "cmosecure1"
 
 	New()
 		..()
@@ -159,12 +171,12 @@
 /obj/structure/closet/secure_closet/chemical
 	name = "Chemical Closet"
 	desc = "Store dangerous chemicals in here."
-	icon_state = "medical1"
-	icon_closed = "medical"
-	icon_locked = "medical1"
-	icon_opened = "medicalopen"
-	icon_broken = "medicalbroken"
-	icon_off = "medical1"
+	icon_state = "securemed1"
+	icon_closed = "securemed"
+	icon_locked = "securemed1"
+	icon_opened = "securemedopen"
+	icon_broken = "securemedbroken"
+	icon_off = "securemed1"
 	req_access = list(access_medical)
 
 
diff --git a/code/game/objects/closets/secure/research.dm b/code/game/objects/closets/secure/research.dm
index ebfc674f687..77caa212bd4 100755
--- a/code/game/objects/closets/secure/research.dm
+++ b/code/game/objects/closets/secure/research.dm
@@ -1,7 +1,37 @@
+/obj/structure/closet/secure_closet/scientist
+	name = "Scientist's Locker"
+	req_access = list(access_research)
+	icon_state = "secureres1"
+	icon_closed = "secureres"
+	icon_locked = "secureres1"
+	icon_opened = "secureresopen"
+	icon_broken = "secureresbroken"
+	icon_off = "secureres1"
+
+	New()
+		..()
+		sleep(2)
+		new /obj/item/wardrobe/scientist(src)
+		//
+		var/obj/item/weapon/storage/backpack/BPK = new /obj/item/weapon/storage/backpack(src)
+		var/obj/item/weapon/storage/box/B = new(BPK)
+		new /obj/item/weapon/pen(B)
+		new /obj/item/device/pda/toxins(src)
+		new /obj/item/weapon/tank/oxygen(src)
+		new /obj/item/clothing/mask/gas(src)
+		new /obj/item/device/radio/headset/headset_sci(src)
+
+
 
 /obj/structure/closet/secure_closet/rd
 	name = "Research Director's Locker"
 	req_access = list(access_rd)
+	icon_state = "rdsecure1"
+	icon_closed = "rdsecure"
+	icon_locked = "rdsecure1"
+	icon_opened = "rdsecureopen"
+	icon_broken = "rdsecurebroken"
+	icon_off = "rdsecure1"
 
 	New()
 		..()
@@ -16,21 +46,4 @@
 		new /obj/item/clothing/mask/gas(src)
 		new /obj/item/device/flash(src)
 		new /obj/item/device/radio/headset/heads/rd(src)
-		//
-
-/obj/structure/closet/secure_closet/scientist
-	name = "Scientist's Locker"
-	req_access = list(access_research)
-
-	New()
-		..()
-		sleep(2)
-		new /obj/item/wardrobe/scientist(src)
-		//
-		var/obj/item/weapon/storage/backpack/BPK = new /obj/item/weapon/storage/backpack(src)
-		var/obj/item/weapon/storage/box/B = new(BPK)
-		new /obj/item/weapon/pen(B)
-		new /obj/item/device/pda/toxins(src)
-		new /obj/item/weapon/tank/oxygen(src)
-		new /obj/item/clothing/mask/gas(src)
-		new /obj/item/device/radio/headset/headset_sci(src)
\ No newline at end of file
+		//
\ No newline at end of file
diff --git a/code/game/objects/closets/secure/scientist.dm b/code/game/objects/closets/secure/scientist.dm
index 57c5981e6ec..e28b2212f49 100644
--- a/code/game/objects/closets/secure/scientist.dm
+++ b/code/game/objects/closets/secure/scientist.dm
@@ -1,7 +1,12 @@
 /obj/structure/closet/secure_closet/RD
 	name = "Research Director"
 	req_access = list(access_rd)
-
+	icon_state = "rdsecure1"
+	icon_closed = "rdsecure"
+	icon_locked = "rdsecure1"
+	icon_opened = "rdsecureopen"
+	icon_broken = "rdsecurebroken"
+	icon_off = "rdsecure1"
 
 	New()
 		..()