diff --git a/_maps/map_files/stations/boxstation.dmm b/_maps/map_files/stations/boxstation.dmm
index ec953bd67ce..2f212e06665 100644
--- a/_maps/map_files/stations/boxstation.dmm
+++ b/_maps/map_files/stations/boxstation.dmm
@@ -67678,6 +67678,7 @@
 	name = "south bump";
 	pixel_y = -24
 	},
+/obj/structure/closet/secure_closet/librarian,
 /turf/simulated/floor/plasteel{
 	icon_state = "cult"
 	},
diff --git a/_maps/map_files/stations/cerestation.dmm b/_maps/map_files/stations/cerestation.dmm
index 635afbbf642..779b29bed62 100644
--- a/_maps/map_files/stations/cerestation.dmm
+++ b/_maps/map_files/stations/cerestation.dmm
@@ -1121,6 +1121,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 10
 	},
+/obj/structure/closet/secure_closet/librarian,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
diff --git a/_maps/map_files/stations/deltastation.dmm b/_maps/map_files/stations/deltastation.dmm
index 11edbf0a4d4..084ab2487be 100644
--- a/_maps/map_files/stations/deltastation.dmm
+++ b/_maps/map_files/stations/deltastation.dmm
@@ -32344,7 +32344,7 @@
 /turf/simulated/floor/plasteel/dark,
 /area/station/service/library)
 "ctM" = (
-/obj/structure/dresser,
+/obj/structure/closet/secure_closet/librarian,
 /turf/simulated/floor/plasteel/dark,
 /area/station/service/library)
 "ctN" = (
diff --git a/_maps/map_files/stations/emeraldstation.dmm b/_maps/map_files/stations/emeraldstation.dmm
index 01409297116..8f58eafc3f1 100644
--- a/_maps/map_files/stations/emeraldstation.dmm
+++ b/_maps/map_files/stations/emeraldstation.dmm
@@ -33461,16 +33461,7 @@
 /turf/simulated/floor/plating/airless,
 /area/station/aisat/breakroom)
 "gFg" = (
-/obj/structure/table/wood,
-/obj/item/paper_bin{
-	pixel_x = -3;
-	pixel_y = 7
-	},
-/obj/item/pen/multi,
-/obj/item/stack/tape_roll{
-	pixel_x = 4;
-	pixel_y = 3
-	},
+/obj/structure/closet/secure_closet/librarian,
 /turf/simulated/floor/plasteel{
 	icon_state = "cult"
 	},
@@ -63885,8 +63876,16 @@
 /area/station/medical/chemistry)
 "mNF" = (
 /obj/structure/table/wood,
-/obj/item/camera,
 /obj/effect/spawner/random/cobweb/right/frequent,
+/obj/item/paper_bin{
+	pixel_x = -3;
+	pixel_y = 7
+	},
+/obj/item/stack/tape_roll{
+	pixel_x = 4;
+	pixel_y = 3
+	},
+/obj/item/pen/multi,
 /turf/simulated/floor/plasteel{
 	icon_state = "cult"
 	},
@@ -87658,10 +87657,11 @@
 /area/station/engineering/atmos)
 "rtX" = (
 /obj/structure/table/wood,
-/obj/item/book/codex_gigas,
 /obj/machinery/light/small{
 	dir = 1
 	},
+/obj/item/camera,
+/obj/item/book/codex_gigas,
 /turf/simulated/floor/plasteel{
 	icon_state = "cult"
 	},
diff --git a/_maps/map_files/stations/metastation.dmm b/_maps/map_files/stations/metastation.dmm
index b6fffbb05d2..d6e8be969da 100644
--- a/_maps/map_files/stations/metastation.dmm
+++ b/_maps/map_files/stations/metastation.dmm
@@ -75597,6 +75597,7 @@
 	name = "south bump";
 	pixel_y = -24
 	},
+/obj/structure/closet/secure_closet/librarian,
 /turf/simulated/floor/wood,
 /area/station/service/library)
 "sEt" = (
diff --git a/code/game/jobs/job/support.dm b/code/game/jobs/job/support.dm
index edf66753b8e..0b447347062 100644
--- a/code/game/jobs/job/support.dm
+++ b/code/game/jobs/job/support.dm
@@ -600,16 +600,10 @@
 	jobtype = /datum/job/librarian
 
 	uniform = /obj/item/clothing/under/rank/civilian/librarian
+	suit = /obj/item/clothing/suit/librarian
 	l_ear = /obj/item/radio/headset/headset_service
-	l_pocket = /obj/item/laser_pointer
-	r_pocket = /obj/item/barcodescanner
-	l_hand = /obj/item/storage/bag/books
 	id = /obj/item/card/id/librarian
 	pda = /obj/item/pda/librarian
-	backpack_contents = list(
-		/obj/item/videocam/advanced = 1,
-		/obj/item/clothing/suit/armor/vest/press = 1
-)
 
 /datum/outfit/job/librarian/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
 	..()
diff --git a/code/game/objects/items/storage/garment.dm b/code/game/objects/items/storage/garment.dm
index c5ccfffd4a4..3be6c2bcfb4 100644
--- a/code/game/objects/items/storage/garment.dm
+++ b/code/game/objects/items/storage/garment.dm
@@ -313,6 +313,19 @@
 	new /obj/item/clothing/head/helmet/space/plasmaman/chaplain(src)
 	new /obj/item/clothing/under/plasmaman/chaplain(src)
 
+/obj/item/storage/bag/garment/librarian
+	name = "librarian's garment bag"
+	desc = "A bag for storing extra clothes and shoes. This one belongs to the librarian."
+
+/obj/item/storage/bag/garment/librarian/populate_contents()
+	new /obj/item/clothing/under/rank/civilian/librarian(src)
+	new /obj/item/clothing/shoes/black(src)
+	new /obj/item/clothing/suit/librarian(src)
+	new /obj/item/clothing/suit/librarian/argyle(src)
+	new /obj/item/clothing/suit/armor/vest/press(src)
+	new /obj/item/clothing/head/helmet/space/plasmaman/librarian(src)
+	new /obj/item/clothing/under/plasmaman/librarian(src)
+
 /obj/item/storage/bag/garment/psychologist
 	name = "psychologist's garment bag"
 	desc = "A bag for storing extra clothes and shoes. This one belongs to the psychologist."
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/librarian.dm b/code/game/objects/structures/crates_lockers/closets/secure/librarian.dm
new file mode 100644
index 00000000000..520548bf2d5
--- /dev/null
+++ b/code/game/objects/structures/crates_lockers/closets/secure/librarian.dm
@@ -0,0 +1,15 @@
+/obj/structure/closet/secure_closet/librarian
+	name = "librarian's locker"
+	req_access = list(ACCESS_LIBRARY)
+	icon_state = "librarian"
+	opened_door_sprite = "clown"
+	closed_door_sprite = "librarian"
+
+
+/obj/structure/closet/secure_closet/librarian/populate_contents()
+	new /obj/item/storage/bag/garment/librarian(src)
+	new /obj/item/videocam/advanced(src)
+	new /obj/item/barcodescanner(src)
+	new /obj/item/laser_pointer(src)
+	new /obj/item/radio/headset/headset_service(src)
+	new /obj/item/storage/bag/books(src)
diff --git a/code/modules/clothing/suits/job_suits.dm b/code/modules/clothing/suits/job_suits.dm
index fb566679e2e..158ef05cb51 100644
--- a/code/modules/clothing/suits/job_suits.dm
+++ b/code/modules/clothing/suits/job_suits.dm
@@ -95,6 +95,34 @@
 	blood_overlay_type = "armor"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO
 
+// Librarian
+/obj/item/clothing/suit/librarian/argyle
+	name = "argyle sweater vest"
+	desc = "A not-so-warm sweater vest for old-fashioned librarians. A tag sticks out, 'DOES NOT PROVIDE INSULATION.'"
+	icon_state = "argyle"
+	body_parts_covered = UPPER_TORSO | LOWER_TORSO
+
+	sprite_sheets = list(
+		"Drask" = 'icons/mob/clothing/species/drask/suit.dmi',
+		"Grey" = 'icons/mob/clothing/species/grey/suit.dmi',
+		"Kidan" = 'icons/mob/clothing/species/kidan/suit.dmi',
+		"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
+		)
+
+// Librarian
+/obj/item/clothing/suit/librarian
+	name = "librarian's tailcoat"
+	desc = "A dull red tailcoat, a common choice between historians and vampires."
+	icon_state = "tailcoat_red"
+	body_parts_covered = UPPER_TORSO | LOWER_TORSO | ARMS
+
+	sprite_sheets = list(
+		"Drask" = 'icons/mob/clothing/species/drask/suit.dmi',
+		"Grey" = 'icons/mob/clothing/species/grey/suit.dmi',
+		"Kidan" = 'icons/mob/clothing/species/kidan/suit.dmi',
+		"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
+		)
+
 //Detective
 /obj/item/clothing/suit/storage/det_suit
 	name = "coat"
diff --git a/code/modules/clothing/under/jobs/civilian.dm b/code/modules/clothing/under/jobs/civilian.dm
index 03ff6373edc..5d4bab9b37b 100644
--- a/code/modules/clothing/under/jobs/civilian.dm
+++ b/code/modules/clothing/under/jobs/civilian.dm
@@ -161,10 +161,9 @@
 	item_color = "janitor_overalls"
 
 /obj/item/clothing/under/rank/civilian/librarian
-	name = "sensible suit"
-	desc = "It's very... sensible."
+	name = "librarian's uniform"
+	desc = "A collared shirt with dapper pinstripe pants guaranteed to make you stand out at any Halloween party."
 	icon_state = "red_suit"
-	inhand_icon_state = "r_suit"
 	item_color = "red_suit"
 
 /obj/item/clothing/under/rank/civilian/mime/nodrop
diff --git a/icons/mob/clothing/species/drask/suit.dmi b/icons/mob/clothing/species/drask/suit.dmi
index 48855af72a0..be999295b8a 100644
Binary files a/icons/mob/clothing/species/drask/suit.dmi and b/icons/mob/clothing/species/drask/suit.dmi differ
diff --git a/icons/mob/clothing/species/drask/under/civilian.dmi b/icons/mob/clothing/species/drask/under/civilian.dmi
index 244108f9f57..fc002f5c23f 100644
Binary files a/icons/mob/clothing/species/drask/under/civilian.dmi and b/icons/mob/clothing/species/drask/under/civilian.dmi differ
diff --git a/icons/mob/clothing/species/grey/suit.dmi b/icons/mob/clothing/species/grey/suit.dmi
index 2cfa8044fff..37e01e4a87f 100644
Binary files a/icons/mob/clothing/species/grey/suit.dmi and b/icons/mob/clothing/species/grey/suit.dmi differ
diff --git a/icons/mob/clothing/species/grey/under/civilian.dmi b/icons/mob/clothing/species/grey/under/civilian.dmi
index 21e122b8c69..7d6ef1015a9 100644
Binary files a/icons/mob/clothing/species/grey/under/civilian.dmi and b/icons/mob/clothing/species/grey/under/civilian.dmi differ
diff --git a/icons/mob/clothing/species/kidan/suit.dmi b/icons/mob/clothing/species/kidan/suit.dmi
index d8a8cf5da3c..989b95cd38e 100644
Binary files a/icons/mob/clothing/species/kidan/suit.dmi and b/icons/mob/clothing/species/kidan/suit.dmi differ
diff --git a/icons/mob/clothing/species/kidan/under/civilian.dmi b/icons/mob/clothing/species/kidan/under/civilian.dmi
index dd9ad46ae7d..2a185eacc5f 100644
Binary files a/icons/mob/clothing/species/kidan/under/civilian.dmi and b/icons/mob/clothing/species/kidan/under/civilian.dmi differ
diff --git a/icons/mob/clothing/species/vox/suit.dmi b/icons/mob/clothing/species/vox/suit.dmi
index 13be0a65ea3..a151154ecb0 100644
Binary files a/icons/mob/clothing/species/vox/suit.dmi and b/icons/mob/clothing/species/vox/suit.dmi differ
diff --git a/icons/mob/clothing/species/vox/under/civilian.dmi b/icons/mob/clothing/species/vox/under/civilian.dmi
index b008bdda825..82a1aa69bbf 100644
Binary files a/icons/mob/clothing/species/vox/under/civilian.dmi and b/icons/mob/clothing/species/vox/under/civilian.dmi differ
diff --git a/icons/mob/clothing/suit.dmi b/icons/mob/clothing/suit.dmi
index b19cb6bb75d..addc85e3d29 100644
Binary files a/icons/mob/clothing/suit.dmi and b/icons/mob/clothing/suit.dmi differ
diff --git a/icons/mob/clothing/under/civilian.dmi b/icons/mob/clothing/under/civilian.dmi
index 80e1b8a3ae3..120c55a024e 100644
Binary files a/icons/mob/clothing/under/civilian.dmi and b/icons/mob/clothing/under/civilian.dmi differ
diff --git a/icons/mob/inhands/clothing_lefthand.dmi b/icons/mob/inhands/clothing_lefthand.dmi
index 1d77edb0f41..f402453bef2 100644
Binary files a/icons/mob/inhands/clothing_lefthand.dmi and b/icons/mob/inhands/clothing_lefthand.dmi differ
diff --git a/icons/mob/inhands/clothing_righthand.dmi b/icons/mob/inhands/clothing_righthand.dmi
index 66a0573d37d..3c1e3ce79cd 100644
Binary files a/icons/mob/inhands/clothing_righthand.dmi and b/icons/mob/inhands/clothing_righthand.dmi differ
diff --git a/icons/obj/closet.dmi b/icons/obj/closet.dmi
index f63da411168..6a6817d8b25 100644
Binary files a/icons/obj/closet.dmi and b/icons/obj/closet.dmi differ
diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi
index 30669bb3a6e..a1a8e29982b 100644
Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ
diff --git a/icons/obj/clothing/under/civilian.dmi b/icons/obj/clothing/under/civilian.dmi
index 2fe864121ad..dc90a9528b7 100644
Binary files a/icons/obj/clothing/under/civilian.dmi and b/icons/obj/clothing/under/civilian.dmi differ
diff --git a/paradise.dme b/paradise.dme
index 7588e5f8317..20f9563a54c 100644
--- a/paradise.dme
+++ b/paradise.dme
@@ -1539,6 +1539,7 @@
 #include "code\game\objects\structures\crates_lockers\closets\secure\freezer.dm"
 #include "code\game\objects\structures\crates_lockers\closets\secure\guncabinet.dm"
 #include "code\game\objects\structures\crates_lockers\closets\secure\hydroponics_closets.dm"
+#include "code\game\objects\structures\crates_lockers\closets\secure\librarian.dm"
 #include "code\game\objects\structures\crates_lockers\closets\secure\medical_lockers.dm"
 #include "code\game\objects\structures\crates_lockers\closets\secure\miscjobs.dm"
 #include "code\game\objects\structures\crates_lockers\closets\secure\personal.dm"