diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm
index 16b4171958f..1d9d75871df 100644
--- a/_maps/map_files/Deltastation/DeltaStation2.dmm
+++ b/_maps/map_files/Deltastation/DeltaStation2.dmm
@@ -57168,9 +57168,6 @@
 /obj/machinery/camera{
 	c_tag = "Courtroom - Fore"
 	},
-/obj/structure/sign/poster/official/report_crimes{
-	pixel_y = 32
-	},
 /obj/effect/turf_decal/tile/neutral{
 	dir = 1
 	},
@@ -57274,11 +57271,6 @@
 /obj/structure/extinguisher_cabinet{
 	pixel_x = -26
 	},
-/obj/machinery/button/door{
-	id = "lawyerprivacy";
-	name = "Lawyer's Privacy Control";
-	pixel_y = 24
-	},
 /turf/open/floor/wood,
 /area/lawoffice)
 "cdh" = (
@@ -57298,6 +57290,12 @@
 	pixel_y = 26
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/machinery/button/door{
+	id = "lawyerprivacy";
+	name = "Lawyer's Privacy Control";
+	pixel_x = 38;
+	pixel_y = 25
+	},
 /turf/open/floor/wood,
 /area/lawoffice)
 "cdk" = (
@@ -65210,6 +65208,9 @@
 /obj/effect/turf_decal/tile/neutral{
 	dir = 8
 	},
+/obj/structure/sign/poster/official/work_for_a_future{
+	pixel_x = -32
+	},
 /turf/open/floor/plasteel/dark,
 /area/security/courtroom)
 "csL" = (
@@ -65233,21 +65234,15 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/obj/structure/sign/poster/official/work_for_a_future{
-	pixel_y = -32
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
+/obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 8
+/obj/effect/turf_decal/tile/neutral,
+/obj/structure/sign/departments/court{
+	pixel_y = -32
 	},
-/turf/open/floor/plasteel/dark,
-/area/security/courtroom)
+/turf/open/floor/plasteel,
+/area/hallway/primary/starboard)
 "csN" = (
 /obj/machinery/door/airlock{
 	name = "Jury";
@@ -112588,6 +112583,19 @@
 /obj/structure/cable,
 /turf/open/floor/plasteel,
 /area/hallway/secondary/command)
+"joU" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/neutral,
+/obj/structure/sign/departments/lawyer{
+	pixel_y = -32
+	},
+/turf/open/floor/plasteel,
+/area/hallway/primary/starboard)
 "jpo" = (
 /obj/effect/turf_decal/tile/yellow{
 	dir = 4
@@ -113814,6 +113822,21 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
 /area/security/prison)
+"mPK" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 1
+	},
+/obj/structure/sign/departments/court{
+	pixel_y = 32
+	},
+/turf/open/floor/plasteel,
+/area/hallway/primary/central)
 "mPU" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/structure/disposalpipe/segment{
@@ -114731,6 +114754,15 @@
 	},
 /turf/open/floor/wood,
 /area/bridge/showroom/corporate)
+"pbL" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/structure/disposalpipe/segment,
+/obj/effect/turf_decal/tile/neutral,
+/obj/structure/sign/departments/court{
+	pixel_x = 32
+	},
+/turf/open/floor/plasteel,
+/area/hallway/primary/central)
 "pff" = (
 /obj/effect/spawner/structure/window/reinforced,
 /obj/structure/cable,
@@ -116323,6 +116355,17 @@
 	},
 /turf/open/floor/plating,
 /area/security/prison/safe)
+"uap" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/effect/turf_decal/tile/neutral{
+	dir = 8
+	},
+/obj/machinery/firealarm{
+	dir = 4;
+	pixel_x = -24
+	},
+/turf/open/floor/plasteel,
+/area/hallway/primary/central)
 "ubH" = (
 /obj/structure/closet/crate/hydroponics,
 /obj/item/paper/guides/jobs/hydroponics,
@@ -161158,7 +161201,7 @@ bvL
 bwY
 bvL
 bvL
-bvL
+uap
 bvL
 cle
 cmP
@@ -161672,7 +161715,7 @@ bvH
 ccT
 bvH
 bvH
-cik
+pbL
 cjR
 clf
 cmQ
@@ -163209,7 +163252,7 @@ bRc
 bMQ
 bUT
 bXn
-bZs
+csM
 cbk
 ccY
 ceO
@@ -163221,9 +163264,9 @@ ceO
 ceO
 ceO
 crj
-csM
+cjT
 cbk
-cvM
+mPK
 cxa
 bsE
 cAm
@@ -165522,7 +165565,7 @@ bRk
 bSZ
 bVd
 bXn
-bZs
+joU
 cbp
 cdg
 ceW
diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm
index da1542cf8c9..0c6d02b73b3 100644
--- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm
+++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm
@@ -4071,9 +4071,6 @@
 	},
 /obj/structure/closet/secure_closet/courtroom,
 /obj/effect/decal/cleanable/cobweb,
-/obj/structure/sign/warning/securearea{
-	pixel_x = -32
-	},
 /obj/item/gavelhammer,
 /turf/open/floor/plasteel,
 /area/security/courtroom)
@@ -7832,9 +7829,6 @@
 "arT" = (
 /obj/structure/rack,
 /obj/item/storage/briefcase,
-/obj/machinery/airalarm{
-	pixel_y = 23
-	},
 /turf/open/floor/wood,
 /area/lawoffice)
 "arU" = (
@@ -51052,6 +51046,15 @@
 	},
 /turf/open/floor/plasteel/white,
 /area/science/genetics)
+"daG" = (
+/obj/effect/turf_decal/tile/red{
+	dir = 8
+	},
+/obj/structure/sign/departments/lawyer{
+	pixel_y = -32
+	},
+/turf/open/floor/plasteel,
+/area/hallway/primary/fore)
 "dbw" = (
 /obj/effect/turf_decal/trimline/blue/filled/line{
 	dir = 8
@@ -53168,6 +53171,9 @@
 /obj/machinery/computer/warrant{
 	dir = 8
 	},
+/obj/structure/sign/departments/court{
+	pixel_y = 32
+	},
 /turf/open/floor/plasteel,
 /area/security/courtroom)
 "keQ" = (
@@ -54903,6 +54909,13 @@
 "oRP" = (
 /turf/open/floor/plasteel/dark,
 /area/hallway/primary/central)
+"oSg" = (
+/obj/machinery/airalarm{
+	dir = 8;
+	pixel_x = 24
+	},
+/turf/open/floor/wood,
+/area/lawoffice)
 "oUq" = (
 /obj/machinery/atmospherics/components/trinary/filter{
 	dir = 8
@@ -55834,6 +55847,9 @@
 /obj/effect/turf_decal/tile/red{
 	dir = 1
 	},
+/obj/structure/sign/departments/court{
+	pixel_x = 32
+	},
 /turf/open/floor/plasteel,
 /area/security/brig)
 "rAv" = (
@@ -84160,7 +84176,7 @@ ahr
 aih
 aiX
 anz
-aov
+daG
 aph
 arT
 ata
@@ -84679,7 +84695,7 @@ ard
 gpE
 arX
 asl
-ata
+oSg
 dtc
 aph
 awe
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index b3a2337dcfa..f262a6de349 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -16249,6 +16249,9 @@
 /obj/machinery/light{
 	dir = 8
 	},
+/obj/machinery/light_switch{
+	pixel_x = -28
+	},
 /turf/open/floor/wood,
 /area/lawoffice)
 "aLE" = (
@@ -17415,9 +17418,6 @@
 /turf/open/floor/wood,
 /area/lawoffice)
 "aOr" = (
-/obj/machinery/light_switch{
-	pixel_y = -28
-	},
 /obj/machinery/vending/wardrobe/law_wardrobe,
 /turf/open/floor/wood,
 /area/lawoffice)
@@ -18286,12 +18286,10 @@
 /turf/open/floor/plasteel,
 /area/hallway/primary/fore)
 "aQF" = (
-/obj/structure/grille,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
-/obj/structure/window/reinforced/tinted/fulltile,
-/turf/open/floor/plating,
+/turf/closed/wall,
 /area/security/courtroom)
 "aQG" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -18373,6 +18371,9 @@
 	dir = 1
 	},
 /obj/structure/cable,
+/obj/structure/sign/departments/lawyer{
+	pixel_y = 32
+	},
 /turf/open/floor/plasteel,
 /area/crew_quarters/locker)
 "aQP" = (
@@ -72097,6 +72098,18 @@
 	},
 /turf/open/floor/plasteel,
 /area/hallway/primary/port)
+"lfy" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 4
+	},
+/obj/structure/sign/departments/court{
+	pixel_y = 32
+	},
+/turf/open/floor/plasteel,
+/area/hallway/primary/central)
 "lfR" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
@@ -75875,6 +75888,16 @@
 /obj/structure/cable,
 /turf/open/floor/plasteel/white,
 /area/security/prison)
+"rky" = (
+/obj/structure/chair{
+	dir = 1
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/sign/departments/court{
+	pixel_y = -32
+	},
+/turf/open/floor/plasteel,
+/area/security/brig)
 "rli" = (
 /obj/structure/table/reinforced,
 /obj/machinery/door/window/westleft{
@@ -78525,6 +78548,17 @@
 /obj/structure/cable,
 /turf/open/floor/plating,
 /area/maintenance/starboard/secondary)
+"vKG" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/red,
+/obj/structure/sign/departments/court{
+	pixel_x = 32
+	},
+/turf/open/floor/plasteel,
+/area/hallway/primary/fore)
 "vLs" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/structure/disposalpipe/segment,
@@ -107925,7 +107959,7 @@ aIK
 aHB
 aHB
 aPA
-aJV
+vKG
 aHB
 aHB
 aUE
@@ -110227,7 +110261,7 @@ axq
 aiq
 azP
 aBj
-aCr
+rky
 ajm
 hdb
 avk
@@ -110242,8 +110276,8 @@ aSa
 aSa
 aTp
 tru
-aTk
-aXS
+aHD
+lfy
 dCE
 baV
 bcj
diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm
index ef0d2b9c04a..76564f3fe6a 100644
--- a/_maps/map_files/PubbyStation/PubbyStation.dmm
+++ b/_maps/map_files/PubbyStation/PubbyStation.dmm
@@ -55202,6 +55202,9 @@
 	dir = 4
 	},
 /obj/structure/cable,
+/obj/structure/sign/departments/lawyer{
+	pixel_y = -32
+	},
 /turf/open/floor/plasteel,
 /area/hallway/primary/fore)
 "pGe" = (
diff --git a/code/game/objects/structures/signs/signs_departments.dm b/code/game/objects/structures/signs/signs_departments.dm
index aa74515ae63..0483fd5f579 100644
--- a/code/game/objects/structures/signs/signs_departments.dm
+++ b/code/game/objects/structures/signs/signs_departments.dm
@@ -107,6 +107,13 @@
 	icon_state = "holy"
 	is_editable = TRUE
 
+/obj/structure/sign/departments/lawyer
+	name = "\improper Legal Department sign"
+	sign_change_name = "Department - Legal"
+	desc = "A sign labelling an area where the Lawyers work, apply here for arrivals shuttle whiplash settlement."
+	icon_state = "lawyer"
+	is_editable = TRUE
+
 ///////SUPPLY
 
 /obj/structure/sign/departments/cargo
@@ -161,3 +168,10 @@
 	desc = "A sign labelling an area where drop pod loading procedures take place."
 	icon_state = "drop"
 	is_editable = TRUE
+
+/obj/structure/sign/departments/court
+	name = "\improper Courtroom sign"
+	sign_change_name = "Location - Courtroom"
+	desc = "A sign labelling the courtroom, where the ever sacred Space Law is upheld."
+	icon_state = "court"
+	is_editable = TRUE
diff --git a/icons/obj/decals.dmi b/icons/obj/decals.dmi
index 14fa3595ec4..f555ac909d0 100644
Binary files a/icons/obj/decals.dmi and b/icons/obj/decals.dmi differ