diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml
index c14d4fbd7d..4523c7c85b 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml
@@ -11,13 +11,58 @@
 
 - type: entity
   parent: BaseSign
-  id: SignDirectionalSec
-  name: sec sign
-  description: A direction sign, pointing out which way Security is.
+  id: SignDirectionalBridge
+  name: bridge sign
+  description: A direction sign, pointing out which way the Bridge is.
   components:
   - type: Sprite
-    state: direction_sec
+    state: direction_bridge
 
+- type: entity
+  parent: BaseSign
+  id: SignDirectionalBrig
+  name: brig sign
+  description: A direction sign, pointing out which way the Brig is.
+  components:
+  - type: Sprite
+    state: direction_brig
+
+- type: entity
+  parent: BaseSign
+  id: SignDirectionalChapel
+  name: chapel sign
+  description: A direction sign, pointing out which way the Chapel is.
+  components:
+  - type: Sprite
+    state: direction_chapel
+    
+- type: entity
+  parent: BaseSign
+  id: SignDirectionalCryo
+  name: cryo sign
+  description: A direction sign, pointing out the way to cryogenics.
+  components:
+  - type: Sprite
+    state: direction_cryo
+
+- type: entity
+  parent: BaseSign
+  id: SignDirectionalDorms
+  name: dorms sign
+  description: A direction sign, pointing out which way the Dorms are.
+  components:
+  - type: Sprite
+    state: direction_dorms
+
+- type: entity
+  parent: BaseSign
+  id: SignDirectionalEng
+  name: engineering sign
+  description: A direction sign, pointing out which way the Engineering department is.
+  components:
+  - type: Sprite
+    state: direction_eng
+    
 - type: entity
   parent: BaseSign
   id: SignDirectionalEvac
@@ -29,12 +74,21 @@
 
 - type: entity
   parent: BaseSign
-  id: SignDirectionalBridge
-  name: bridge sign
-  description: A direction sign, pointing out which way the Bridge is.
+  id: SignDirectionalGravity
+  name: gravity sign
+  description: A direction sign, pointing out which way the gravity generator is.
   components:
   - type: Sprite
-    state: direction_bridge
+    state: direction_gravity
+
+- type: entity
+  parent: BaseSign
+  id: SignDirectionalHydro
+  name: hydro sign
+  description: A direction sign, pointing out which way hydroponics is.
+  components:
+  - type: Sprite
+    state: direction_hydro
 
 - type: entity
   parent: BaseSign
@@ -47,12 +101,13 @@
 
 - type: entity
   parent: BaseSign
-  id: SignDirectionalEng
-  name: engineering sign
-  description: A direction sign, pointing out which way the Engineering department is.
+  id: SignDirectionalSalvage
+  name: salvage sign
+  description: A direction sign, pointing out which way the Salvage department is.
   components:
   - type: Sprite
-    state: direction_eng
+    state: direction_salvage
+
 
 - type: entity
   parent: BaseSign
@@ -63,6 +118,24 @@
   - type: Sprite
     state: direction_sci
 
+- type: entity
+  parent: BaseSign
+  id: SignDirectionalSec
+  name: sec sign
+  description: A direction sign, pointing out which way Security is.
+  components:
+  - type: Sprite
+    state: direction_sec
+
+- type: entity
+  parent: BaseSign
+  id: SignDirectionalSolar
+  name: solars sign
+  description: A direction sign, pointing out which way solars are.
+  components:
+  - type: Sprite
+    state: direction_solar
+
 - type: entity
   parent: BaseSign
   id: SignDirectionalSupply
@@ -71,6 +144,15 @@
   components:
   - type: Sprite
     state: direction_supply
+    
+- type: entity
+  parent: BaseSign
+  id: SignDirectionalWash
+  name: washroom sign
+  description: A direction sign, pointing to the way to a washroom.
+  components:
+  - type: Sprite
+    state: direction_wash
 
 # Regular Signs
 # Descriptions intentionally left empty.
@@ -125,107 +207,35 @@
 
 - type: entity
   parent: BaseSign
-  id: SignHydro1
-  name: hydro sign
+  id: SignBio
+  name: bio sign
   components:
   - type: Sprite
-    state: hydro1
+    state: bio
 
 - type: entity
   parent: BaseSign
-  id: SignHydro2
-  name: hydro sign
+  id: SignBiohazard
+  name: biohazard sign
   components:
   - type: Sprite
-    state: hydro2
+    state: biohazard
+    
+- type: entity
+  parent: BaseSign
+  id: SignBridge
+  name: bridge sign
+  components:
+  - type: Sprite
+    state: bridge
 
 - type: entity
   parent: BaseSign
-  id: SignHydro3
-  name: hydro sign
+  id: SignCanisters
+  name: canisters sign
   components:
   - type: Sprite
-    state: hydro3
-
-- type: entity
-  parent: BaseSign
-  id: SignLibrary
-  name: library sign
-  components:
-  - type: Sprite
-    state: biblio
-
-- type: entity
-  parent: BaseSign
-  id: SignChapel
-  name: chapel sign
-  components:
-  - type: Sprite
-    state: chapel
-
-- type: entity
-  parent: BaseSign
-  id: SignHead
-  name: head sign
-  components:
-  - type: Sprite
-    state: commander
-
-- type: entity
-  parent: BaseSign
-  id: SignConference
-  name: conference room sign
-  components:
-  - type: Sprite
-    state: conference_room
-
-- type: entity
-  parent: BaseSign
-  id: SignDrones
-  name: drones sign
-  components:
-  - type: Sprite
-    state: drones
-
-- type: entity
-  parent: BaseSign
-  id: SignEngine
-  name: engine sign
-  components:
-  - type: Sprite
-    state: engine
-
-- type: entity
-  parent: BaseSign
-  id: SignCloning
-  name: cloning sign
-  components:
-  - type: Sprite
-    state: cloning
-
-- type: entity
-  parent: BaseSign
-  id: SignInterrogation
-  name: interrogation sign
-  components:
-  - type: Sprite
-    state: interrogation
-
-- type: entity
-  parent: BaseSign
-  id: SignSurgery
-  name: surgery sign
-  components:
-  - type: Sprite
-    state: surgery
-
-- type: entity
-  parent: BaseSign
-  id: SignTelecomms
-  name: telecomms sign
-  components:
-  - type: Sprite
-    state: telecoms
+    state: canisters
 
 - type: entity
   parent: BaseSign
@@ -242,6 +252,14 @@
   components:
   - type: Sprite
     state: cargo_dock
+  
+- type: entity
+  parent: BaseSign
+  id: SignChapel
+  name: chapel sign
+  components:
+  - type: Sprite
+    state: chapel
 
 - type: entity
   parent: BaseSign
@@ -269,11 +287,52 @@
 
 - type: entity
   parent: BaseSign
-  id: SignShipDock
-  name: docking sign
+  id: SignCloning
+  name: cloning sign
   components:
   - type: Sprite
-    state: dock
+    state: cloning
+
+- type: entity
+  parent: BaseSign
+  id: SignConference
+  name: conference room sign
+  components:
+  - type: Sprite
+    state: conference_room
+
+- type: entity
+  parent: BaseSign
+  id: SignDisposalSpace
+  name: disposal sign
+  description: "Disposal: Leads to space"
+  components:
+  - type: Sprite
+    state: deathsposal
+
+- type: entity
+  parent: BaseSign
+  id: SignDoors
+  name: doors sign
+  components:
+  - type: Sprite
+    state: doors
+ 
+- type: entity
+  parent: BaseSign
+  id: SignDrones
+  name: drones sign
+  components:
+  - type: Sprite
+    state: drones
+
+- type: entity
+  parent: BaseSign
+  id: SignEngine
+  name: engine sign
+  components:
+  - type: Sprite
+    state: engine
 
 - type: entity
   parent: BaseSign
@@ -283,6 +342,14 @@
   - type: Sprite
     state: eng
 
+- type: entity
+  parent: BaseSign
+  id: SignEscapePods
+  name: escape pods sign
+  components:
+  - type: Sprite
+    state: pods
+
 - type: entity
   parent: BaseSign
   id: SignEVA
@@ -291,6 +358,30 @@
   - type: Sprite
     state: eva
 
+- type: entity
+  parent: BaseSign
+  id: SignElectrical
+  name: electrical sign
+  components:
+  - type: Sprite
+    state: electrical
+
+- type: entity
+  parent: BaseSign
+  id: SignExamroom
+  name: examination room sign
+  components:
+  - type: Sprite
+    state: examroom
+
+- type: entity
+  parent: BaseSign
+  id: SignFire
+  name: fire sign
+  components:
+  - type: Sprite
+    state: fire
+
 - type: entity
   parent: BaseSign
   id: SignGravity
@@ -299,6 +390,62 @@
   - type: Sprite
     state: gravi
 
+- type: entity
+  parent: BaseSign
+  id: SignHead
+  name: head sign
+  components:
+  - type: Sprite
+    state: commander
+
+- type: entity
+  parent: BaseSign
+  id: SignHydro1
+  name: hydro sign
+  components:
+  - type: Sprite
+    state: hydro1
+
+- type: entity
+  parent: BaseSign
+  id: SignHydro2
+  name: hydro sign
+  components:
+  - type: Sprite
+    state: hydro2
+
+- type: entity
+  parent: BaseSign
+  id: SignHydro3
+  name: hydro sign
+  components:
+  - type: Sprite
+    state: hydro3
+
+- type: entity
+  parent: BaseSign
+  id: SignInterrogation
+  name: interrogation sign
+  components:
+  - type: Sprite
+    state: interrogation
+
+- type: entity
+  parent: BaseSign
+  id: SignLibrary
+  name: library sign
+  components:
+  - type: Sprite
+    state: biblio
+
+- type: entity
+  parent: BaseSign
+  id: SignMail
+  name: mail sign
+  components:
+  - type: Sprite
+    state: mail
+
 - type: entity
   parent: BaseSign
   id: SignMedical
@@ -306,6 +453,14 @@
   components:
   - type: Sprite
     state: medbay
+    
+- type: entity
+  parent: BaseSign
+  id: SignMinerDock
+  name: miner dock sign
+  components:
+  - type: Sprite
+    state: miner_dock
 
 - type: entity
   parent: BaseSign
@@ -315,6 +470,14 @@
   - type: Sprite
     state: morgue
 
+- type: entity
+  parent: BaseSign
+  id: SignNosmoking
+  name: nosmoking sign
+  components:
+  - type: Sprite
+    state: nosmoking
+
 - type: entity
   parent: BaseSign
   id: SignPrison
@@ -330,6 +493,14 @@
   components:
   - type: Sprite
     state: rnd
+    
+- type: entity
+  parent: BaseSign
+  id: SignRobo
+  name: robo sign
+  components:
+  - type: Sprite
+    state: robo
 
 - type: entity
   parent: BaseSign
@@ -355,6 +526,46 @@
   - type: Sprite
     state: science2
 
+- type: entity
+  parent: BaseSign
+  id: SignShield
+  name: shield sign
+  components:
+  - type: Sprite
+    state: shield
+
+- type: entity
+  parent: BaseSign
+  id: SignShipDock
+  name: docking sign
+  components:
+  - type: Sprite
+    state: dock
+
+- type: entity
+  parent: BaseSign
+  id: SignSpace
+  name: space sign
+  components:
+  - type: Sprite
+    state: space
+
+- type: entity
+  parent: BaseSign
+  id: SignSurgery
+  name: surgery sign
+  components:
+  - type: Sprite
+    state: surgery
+
+- type: entity
+  parent: BaseSign
+  id: SignTelecomms
+  name: telecomms sign
+  components:
+  - type: Sprite
+    state: telecoms
+
 - type: entity
   parent: BaseSign
   id: SignToxins
@@ -373,40 +584,16 @@
 
 - type: entity
   parent: BaseSign
-  id: SignBridge
-  name: bridge sign
+  id: SignVirology
+  name: virology sign
   components:
   - type: Sprite
-    state: bridge
-
-- type: entity
-  parent: BaseSign
-  id: SignBio
-  name: bio sign
-  components:
-  - type: Sprite
-    state: bio
-
-- type: entity
-  parent: BaseSign
-  id: SignBiohazard
-  name: biohazard sign
-  components:
-  - type: Sprite
-    state: biohazard
-
-- type: entity
-  parent: BaseSign
-  id: SignCanisters
-  name: canisters sign
-  components:
-  - type: Sprite
-    state: canisters
+    state: virology
 
 - type: entity
   parent: BaseSign
   id: SignCorrosives
-  name: corrosives sign
+  name: corrosives warning sign
   components:
   - type: Sprite
     state: corrosives
@@ -414,7 +601,7 @@
 - type: entity
   parent: BaseSign
   id: SignCryogenics
-  name: cryogenics sign
+  name: cryogenics warning sign
   components:
   - type: Sprite
     state: cryogenics
@@ -422,64 +609,23 @@
 - type: entity
   parent: BaseSign
   id: SignDanger
-  name: danger sign
+  name: danger warning sign
   components:
   - type: Sprite
     state: danger
 
-- type: entity
-  parent: BaseSign
-  id: SignDisposalSpace
-  name: disposal sign
-  description: "Disposal: Leads to space"
-  components:
-  - type: Sprite
-    state: deathsposal
-
-- type: entity
-  parent: BaseSign
-  id: SignDoors
-  name: doors sign
-  components:
-  - type: Sprite
-    state: doors
-
-- type: entity
-  parent: BaseSign
-  id: SignElectrical
-  name: electrical sign
-  components:
-  - type: Sprite
-    state: electrical
-
-- type: entity
-  parent: BaseSign
-  id: SignExamroom
-  name: examination room sign
-  components:
-  - type: Sprite
-    state: examroom
-
 - type: entity
   parent: BaseSign
   id: SignExplosives
-  name: explosives sign
+  name: explosives warning sign
   components:
   - type: Sprite
     state: explosives
 
-- type: entity
-  parent: BaseSign
-  id: SignFire
-  name: fire sign
-  components:
-  - type: Sprite
-    state: fire
-
 - type: entity
   parent: BaseSign
   id: SignFlammable
-  name: flammable sign
+  name: flammable warning sign
   components:
   - type: Sprite
     state: flammable
@@ -487,91 +633,27 @@
 - type: entity
   parent: BaseSign
   id: SignLaser
-  name: laser sign
+  name: laser warning sign
   components:
   - type: Sprite
     state: laser
-
+    
 - type: entity
   parent: BaseSign
   id: SignMagnetics
-  name: magnetics sign
+  name: magnetics warning sign
   components:
   - type: Sprite
     state: magnetics
 
-- type: entity
-  parent: BaseSign
-  id: SignMail
-  name: mail sign
-  components:
-  - type: Sprite
-    state: mail
-
 - type: entity
   parent: BaseSign
   id: SignMemetic
-  name: memetic sign
+  name: memetic warning sign
   components:
   - type: Sprite
     state: memetic
 
-- type: entity
-  parent: BaseSign
-  id: SignMinerDock
-  name: miner dock sign
-  components:
-  - type: Sprite
-    state: miner_dock
-
-- type: entity
-  parent: BaseSign
-  id: SignNosmoking
-  name: nosmoking sign
-  components:
-  - type: Sprite
-    state: nosmoking
-
-- type: entity
-  parent: BaseSign
-  id: SignOptical
-  name: optical sign
-  components:
-  - type: Sprite
-    state: optical
-
-- type: entity
-  parent: BaseSign
-  id: SigN
-  name: oxidants signoxidants
-  components:
-  - type: Sprite
-    state: oxidants
-
-- type: entity
-  parent: BaseSign
-  id: SignPods
-  name: pods sign
-  components:
-  - type: Sprite
-    state: pods
-
-- type: entity
-  parent: BaseSign
-  id: SignRadiation
-  name: radiation sign
-  components:
-  - type: Sprite
-    state: radiation
-
-- type: entity
-  parent: BaseSign
-  id: SignRobo
-  name: robo sign
-  components:
-  - type: Sprite
-    state: robo
-
 - type: entity
   parent: BaseSign
   id: SignSecure
@@ -583,19 +665,11 @@
 - type: entity
   parent: BaseSign
   id: SignSecurearea
-  name: securearea sign
+  name: secure area sign
   components:
   - type: Sprite
     state: securearea
-
-- type: entity
-  parent: BaseSign
-  id: SignShield
-  name: shield sign
-  components:
-  - type: Sprite
-    state: shield
-
+    
 - type: entity
   parent: BaseSign
   id: SignShock
@@ -606,19 +680,27 @@
 
 - type: entity
   parent: BaseSign
-  id: SignSpace
-  name: space sign
+  id: SignOptical
+  name: optical warning sign
   components:
   - type: Sprite
-    state: space
+    state: optical
 
 - type: entity
   parent: BaseSign
-  id: SignVirology
-  name: virology sign
+  id: SignOxidants
+  name: oxidants warning sign
   components:
   - type: Sprite
-    state: virology
+    state: oxidants
+
+- type: entity
+  parent: BaseSign
+  id: SignRadiation
+  name: radiation warning sign
+  components:
+  - type: Sprite
+    state: radiation
 
 - type: entity
   parent: BaseSign
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_brig.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_brig.png
new file mode 100644
index 0000000000..34f12710ae
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_brig.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_chapel.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_chapel.png
new file mode 100644
index 0000000000..1c1d333e8d
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_chapel.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_cryo.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_cryo.png
new file mode 100644
index 0000000000..dc342dce67
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_cryo.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_dorms.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_dorms.png
new file mode 100644
index 0000000000..3ee8b449d3
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_dorms.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_evac.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_evac.png
index 7705338326..7807607b0f 100644
Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_evac.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_evac.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_gravity.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_gravity.png
new file mode 100644
index 0000000000..d4095e9a27
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_gravity.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_hydro.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_hydro.png
new file mode 100644
index 0000000000..c81effa226
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_hydro.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_salvage.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_salvage.png
new file mode 100644
index 0000000000..3f0d3dbf42
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_salvage.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_solar.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_solar.png
new file mode 100644
index 0000000000..9af0616816
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_solar.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_supply.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_supply.png
index a912f8b346..0f4df4caa5 100644
Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_supply.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_supply.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_wash.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_wash.png
new file mode 100644
index 0000000000..af31c3057d
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_wash.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json
index 0f8d3e56fb..39e8bab3b3 100644
--- a/Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json
+++ b/Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json
@@ -397,6 +397,168 @@
         ]
       ]
     },
+    {
+      "name": "direction_brig",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "direction_chapel",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "direction_hydro",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "direction_dorms",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "direction_cryo",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "direction_gravity",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "direction_salvage",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "direction_solar",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "direction_wash",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
     {
       "name": "dock",
       "delays": [