diff --git a/baystation12.dme b/baystation12.dme
index f0cba7d213a..38dba4e0065 100644
--- a/baystation12.dme
+++ b/baystation12.dme
@@ -670,6 +670,7 @@
 #include "code\game\objects\closets\secure\cargo.dm"
 #include "code\game\objects\closets\secure\civilian.dm"
 #include "code\game\objects\closets\secure\engineering.dm"
+#include "code\game\objects\closets\secure\hydroponics.dm"
 #include "code\game\objects\closets\secure\medical.dm"
 #include "code\game\objects\closets\secure\personal.dm"
 #include "code\game\objects\closets\secure\research.dm"
diff --git a/code/game/objects/closets/secure/hydroponics.dm b/code/game/objects/closets/secure/hydroponics.dm
new file mode 100644
index 00000000000..3831aa5dac2
--- /dev/null
+++ b/code/game/objects/closets/secure/hydroponics.dm
@@ -0,0 +1,22 @@
+/obj/structure/closet/secure_closet/hydroponics
+	name = "Botanist's locker"
+	req_access = list(access_hydroponics)
+	icon_state = "hydrosecure1"
+	icon_closed = "hydrosecure"
+	icon_locked = "hydrosecure1"
+	icon_opened = "hydrosecureopen"
+	icon_broken = "hydrosecurebroken"
+	icon_off = "hydrosecureoff"
+
+
+	New()
+		..()
+		sleep(2)
+		new /obj/item/weapon/plantbag(src)
+		new /obj/item/clothing/under/rank/hydroponics(src)
+		new /obj/item/clothing/suit/storage/apron(src)
+		new /obj/item/clothing/under/rank/hydroponics(src)
+		new /obj/item/clothing/head/helmet/greenbandana(src)
+		new /obj/item/device/analyzer/plant_analyzer(src)
+		new /obj/item/weapon/hatchet(src)
+		return
\ No newline at end of file
diff --git a/code/game/objects/closets/secure/medical.dm b/code/game/objects/closets/secure/medical.dm
index 383296c9636..87695f114da 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 = "securemed1"
-	icon_closed = "securemed"
-	icon_locked = "securemed1"
-	icon_opened = "securemedopen"
-	icon_broken = "securemedbroken"
-	icon_off = "securemed1"
+	icon_state = "medical1"
+	icon_closed = "medical"
+	icon_locked = "medical1"
+	icon_opened = "medicalopen"
+	icon_broken = "medicalbroken"
+	icon_off = "medicaloff"
 	req_access = list(access_medical)
 
 
@@ -29,12 +29,12 @@
 /obj/structure/closet/secure_closet/anaesthetic
 	name = "Anesthetic"
 	desc = "Used to knock people out."
-	icon_state = "securemed1"
-	icon_closed = "securemed"
-	icon_locked = "securemed1"
-	icon_opened = "securemedopen"
-	icon_broken = "securemedbroken"
-	icon_off = "securemed1"
+	icon_state = "medical1"
+	icon_closed = "medical"
+	icon_locked = "medical1"
+	icon_opened = "medicalopen"
+	icon_broken = "medicalbroken"
+	icon_off = "medicaloff"
 	req_access = list(access_medical)
 
 
@@ -59,7 +59,7 @@
 	icon_locked = "securemed1"
 	icon_opened = "securemedopen"
 	icon_broken = "securemedbroken"
-	icon_off = "securemed1"
+	icon_off = "securemedoff"
 
 	New()
 		..()
@@ -133,7 +133,7 @@
 	icon_locked = "cmosecure1"
 	icon_opened = "cmosecureopen"
 	icon_broken = "cmosecurebroken"
-	icon_off = "cmosecure1"
+	icon_off = "cmosecureoff"
 
 	New()
 		..()
@@ -176,7 +176,7 @@
 	icon_locked = "securemed1"
 	icon_opened = "securemedopen"
 	icon_broken = "securemedbroken"
-	icon_off = "securemed1"
+	icon_off = "securemedoff"
 	req_access = list(access_medical)
 
 
diff --git a/code/game/objects/closets/secure/research.dm b/code/game/objects/closets/secure/research.dm
index 77caa212bd4..d7ac9b0a2d7 100755
--- a/code/game/objects/closets/secure/research.dm
+++ b/code/game/objects/closets/secure/research.dm
@@ -6,7 +6,7 @@
 	icon_locked = "secureres1"
 	icon_opened = "secureresopen"
 	icon_broken = "secureresbroken"
-	icon_off = "secureres1"
+	icon_off = "secureresoff"
 
 	New()
 		..()
@@ -31,7 +31,7 @@
 	icon_locked = "rdsecure1"
 	icon_opened = "rdsecureopen"
 	icon_broken = "rdsecurebroken"
-	icon_off = "rdsecure1"
+	icon_off = "rdsecureoff"
 
 	New()
 		..()
diff --git a/code/game/objects/closets/secure/scientist.dm b/code/game/objects/closets/secure/scientist.dm
index e28b2212f49..258eb57e979 100644
--- a/code/game/objects/closets/secure/scientist.dm
+++ b/code/game/objects/closets/secure/scientist.dm
@@ -6,7 +6,7 @@
 	icon_locked = "rdsecure1"
 	icon_opened = "rdsecureopen"
 	icon_broken = "rdsecurebroken"
-	icon_off = "rdsecure1"
+	icon_off = "rdsecureoff"
 
 	New()
 		..()
diff --git a/icons/obj/closet.dmi b/icons/obj/closet.dmi
index ff77f715acb..cf8e30dcdf3 100644
Binary files a/icons/obj/closet.dmi and b/icons/obj/closet.dmi differ