diff --git a/Resources/Prototypes/Entities/Structures/Furniture/sink.yml b/Resources/Prototypes/Entities/Structures/Furniture/sink.yml
index 04ebfaef54..2eefdb725c 100644
--- a/Resources/Prototypes/Entities/Structures/Furniture/sink.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/sink.yml
@@ -10,7 +10,7 @@
   - type: InteractionOutline
   - type: Sprite
     sprite: Structures/Furniture/sink.rsi
-    state: sink
+    state: sink_stem
     netsync: false
   - type: SolutionContainerManager
     solutions:
@@ -42,3 +42,28 @@
     sprite: Structures/Furniture/sink.rsi
     state: sink_wide
     netsync: false
+    
+#Stemless Sink
+
+- type: entity
+  name: sink
+  id: SinkStemless
+  parent: SinkEmpty
+  components:
+  - type: Sprite
+    sprite: Structures/Furniture/sink.rsi
+    state: sink
+    netsync: false    
+
+- type: entity
+  name: sink
+  id: SinkStemlessWater
+  parent: SinkStemless
+  suffix: Water
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      tank:
+        reagents:
+        - ReagentId: Water
+          Quantity: 500
diff --git a/Resources/Textures/Objects/Misc/Lights/lamp.rsi/lamp-on.png b/Resources/Textures/Objects/Misc/Lights/lamp.rsi/lamp-on.png
index 3bb975b37e..262a6d5f42 100644
Binary files a/Resources/Textures/Objects/Misc/Lights/lamp.rsi/lamp-on.png and b/Resources/Textures/Objects/Misc/Lights/lamp.rsi/lamp-on.png differ
diff --git a/Resources/Textures/Objects/Misc/Lights/lamp.rsi/lamp.png b/Resources/Textures/Objects/Misc/Lights/lamp.rsi/lamp.png
index d62d35cfd3..824c488cc5 100644
Binary files a/Resources/Textures/Objects/Misc/Lights/lamp.rsi/lamp.png and b/Resources/Textures/Objects/Misc/Lights/lamp.rsi/lamp.png differ
diff --git a/Resources/Textures/Objects/Misc/Lights/lamp.rsi/meta.json b/Resources/Textures/Objects/Misc/Lights/lamp.rsi/meta.json
index c4e8d0d2be..1cfaa8f91d 100644
--- a/Resources/Textures/Objects/Misc/Lights/lamp.rsi/meta.json
+++ b/Resources/Textures/Objects/Misc/Lights/lamp.rsi/meta.json
@@ -8,10 +8,12 @@
   },
   "states": [
     {
-      "name": "lamp"
+        "name": "lamp",
+        "directions": 4
     },
     {
-      "name": "lamp-on"
+        "name": "lamp-on",
+        "directions": 4
     },
     {
       "name": "off-inhand-left",
diff --git a/Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/lampgreen-on.png b/Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/lampgreen-on.png
index c65cca042e..f93a3357c4 100644
Binary files a/Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/lampgreen-on.png and b/Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/lampgreen-on.png differ
diff --git a/Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/lampgreen.png b/Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/lampgreen.png
index 49aa52bc4c..c502dffb1e 100644
Binary files a/Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/lampgreen.png and b/Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/lampgreen.png differ
diff --git a/Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/meta.json b/Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/meta.json
index f8f6bf246e..74b0fa0da2 100644
--- a/Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/meta.json
+++ b/Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/meta.json
@@ -8,10 +8,12 @@
   },
   "states": [
     {
-      "name": "lampgreen"
+        "name": "lampgreen",
+        "directions": 4
     },
     {
-      "name": "lampgreen-on"
+        "name": "lampgreen-on",
+        "directions": 4
     },
     {
       "name": "off-inhand-left",
diff --git a/Resources/Textures/Objects/Misc/Lights/lights.rsi/bananalamp.png b/Resources/Textures/Objects/Misc/Lights/lights.rsi/bananalamp.png
index c8131b017b..7332694732 100644
Binary files a/Resources/Textures/Objects/Misc/Lights/lights.rsi/bananalamp.png and b/Resources/Textures/Objects/Misc/Lights/lights.rsi/bananalamp.png differ
diff --git a/Resources/Textures/Objects/Misc/Lights/lights.rsi/bananalamp_on.png b/Resources/Textures/Objects/Misc/Lights/lights.rsi/bananalamp_on.png
index 4a8a26dadd..bf2e003a48 100644
Binary files a/Resources/Textures/Objects/Misc/Lights/lights.rsi/bananalamp_on.png and b/Resources/Textures/Objects/Misc/Lights/lights.rsi/bananalamp_on.png differ
diff --git a/Resources/Textures/Objects/Misc/Lights/lights.rsi/meta.json b/Resources/Textures/Objects/Misc/Lights/lights.rsi/meta.json
index 24250c01dd..38b29d5d40 100644
--- a/Resources/Textures/Objects/Misc/Lights/lights.rsi/meta.json
+++ b/Resources/Textures/Objects/Misc/Lights/lights.rsi/meta.json
@@ -8,10 +8,12 @@
   },
   "states": [
     {
-      "name": "bananalamp"
+        "name": "bananalamp",
+        "directions": 4
     },
     {
-      "name": "bananalamp_on"
+        "name": "bananalamp_on",
+        "directions": 4
     },
     {
       "name": "floodlight"
diff --git a/Resources/Textures/Structures/Furniture/sink.rsi/meta.json b/Resources/Textures/Structures/Furniture/sink.rsi/meta.json
index af45b1d4ad..e00dcab8e4 100644
--- a/Resources/Textures/Structures/Furniture/sink.rsi/meta.json
+++ b/Resources/Textures/Structures/Furniture/sink.rsi/meta.json
@@ -14,6 +14,10 @@
         {
             "name": "sink_wide",
             "directions": 4
+        },
+        {
+            "name": "sink_stem",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Structures/Furniture/sink.rsi/sink.png b/Resources/Textures/Structures/Furniture/sink.rsi/sink.png
index 3f29fc996b..8bca5af467 100644
Binary files a/Resources/Textures/Structures/Furniture/sink.rsi/sink.png and b/Resources/Textures/Structures/Furniture/sink.rsi/sink.png differ
diff --git a/Resources/Textures/Structures/Furniture/sink.rsi/sink_stem.png b/Resources/Textures/Structures/Furniture/sink.rsi/sink_stem.png
new file mode 100644
index 0000000000..0862fbd872
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/sink.rsi/sink_stem.png differ
diff --git a/Resources/Textures/Structures/Furniture/sink.rsi/sink_wide.png b/Resources/Textures/Structures/Furniture/sink.rsi/sink_wide.png
index 80ce7e054e..dc0873e870 100644
Binary files a/Resources/Textures/Structures/Furniture/sink.rsi/sink_wide.png and b/Resources/Textures/Structures/Furniture/sink.rsi/sink_wide.png differ
diff --git a/Resources/Textures/Structures/Furniture/toilet.rsi/closed_toilet_seat_down.png b/Resources/Textures/Structures/Furniture/toilet.rsi/closed_toilet_seat_down.png
index af9b04af2b..738c92a6d3 100644
Binary files a/Resources/Textures/Structures/Furniture/toilet.rsi/closed_toilet_seat_down.png and b/Resources/Textures/Structures/Furniture/toilet.rsi/closed_toilet_seat_down.png differ
diff --git a/Resources/Textures/Structures/Furniture/toilet.rsi/closed_toilet_seat_up.png b/Resources/Textures/Structures/Furniture/toilet.rsi/closed_toilet_seat_up.png
index 0a3a4db1b1..522abf550b 100644
Binary files a/Resources/Textures/Structures/Furniture/toilet.rsi/closed_toilet_seat_up.png and b/Resources/Textures/Structures/Furniture/toilet.rsi/closed_toilet_seat_up.png differ
diff --git a/Resources/Textures/Structures/Furniture/toilet.rsi/open_toilet_seat_down.png b/Resources/Textures/Structures/Furniture/toilet.rsi/open_toilet_seat_down.png
index a0844c8793..a487afc0b8 100644
Binary files a/Resources/Textures/Structures/Furniture/toilet.rsi/open_toilet_seat_down.png and b/Resources/Textures/Structures/Furniture/toilet.rsi/open_toilet_seat_down.png differ
diff --git a/Resources/Textures/Structures/Furniture/toilet.rsi/open_toilet_seat_up.png b/Resources/Textures/Structures/Furniture/toilet.rsi/open_toilet_seat_up.png
index bcbe594c2b..77995657cf 100644
Binary files a/Resources/Textures/Structures/Furniture/toilet.rsi/open_toilet_seat_up.png and b/Resources/Textures/Structures/Furniture/toilet.rsi/open_toilet_seat_up.png differ