diff --git a/Resources/Prototypes/Decals/markings.yml b/Resources/Prototypes/Decals/markings.yml
index 63915c1dbc..c1914275c1 100644
--- a/Resources/Prototypes/Decals/markings.yml
+++ b/Resources/Prototypes/Decals/markings.yml
@@ -138,6 +138,8 @@
     sprite: Decals/markings.rsi
     state: warn_box_greyscale
 
+# TODO: Remove from here to...
+
 - type: decal
   id: WarnEnd
   tags: ["station", "markings"]
@@ -152,6 +154,8 @@
     sprite: Decals/markings.rsi
     state: warn_end_greyscale
 
+# TODO: Down here
+
 - type: decal
   id: WarnFull
   tags: ["station", "markings"]
@@ -166,6 +170,8 @@
     sprite: Decals/markings.rsi
     state: warn_full_greyscale
 
+# TODO: remove from here down to...
+
 - type: decal
   id: WarningLine
   tags: ["station", "markings"]
@@ -235,3 +241,229 @@
   sprite:
     sprite: Decals/markings.rsi
     state: warn_corner_flipped_greyscale
+
+# TODO: here
+
+- type: decal
+  id: WarnCornerGreyscaleNE
+  tags: ["station", "markings"]
+  sprite:
+    sprite: Decals/markings.rsi
+    state: warn_corner_greyscale_ne
+
+- type: decal
+  id: WarnCornerGreyscaleNW
+  tags: ["station", "markings"]
+  sprite:
+    sprite: Decals/markings.rsi
+    state: warn_corner_greyscale_nw
+
+- type: decal
+  id: WarnCornerGreyscaleSE
+  tags: ["station", "markings"]
+  sprite:
+    sprite: Decals/markings.rsi
+    state: warn_corner_greyscale_se
+
+- type: decal
+  id: WarnCornerGreyscaleSW
+  tags: ["station", "markings"]
+  sprite:
+    sprite: Decals/markings.rsi
+    state: warn_corner_greyscale_sw
+
+- type: decal
+  id: WarnCornerNE
+  tags: ["station", "markings"]
+  sprite:
+    sprite: Decals/markings.rsi
+    state: warn_corner_ne
+
+- type: decal
+  id: WarnCornerNW
+  tags: ["station", "markings"]
+  sprite:
+    sprite: Decals/markings.rsi
+    state: warn_corner_nw
+
+- type: decal
+  id: WarnCornerSE
+  tags: ["station", "markings"]
+  sprite:
+    sprite: Decals/markings.rsi
+    state: warn_corner_se
+
+- type: decal
+  id: WarnCornerSW
+  tags: ["station", "markings"]
+  sprite:
+    sprite: Decals/markings.rsi
+    state: warn_corner_sw
+
+- type: decal
+  id: WarnCornerSmallGreyscaleNE
+  tags: ["station", "markings"]
+  sprite:
+    sprite: Decals/markings.rsi
+    state: warn_corner_small_greyscale_ne
+
+- type: decal
+  id: WarnCornerSmallGreyscaleNW
+  tags: ["station", "markings"]
+  sprite:
+    sprite: Decals/markings.rsi
+    state: warn_corner_small_greyscale_nw
+
+- type: decal
+  id: WarnCornerSmallGreyscaleSE
+  tags: ["station", "markings"]
+  sprite:
+    sprite: Decals/markings.rsi
+    state: warn_corner_small_greyscale_se
+
+- type: decal
+  id: WarnCornerSmallGreyscaleSW
+  tags: ["station", "markings"]
+  sprite:
+    sprite: Decals/markings.rsi
+    state: warn_corner_small_greyscale_sw
+
+- type: decal
+  id: WarnCornerSmallNE
+  tags: ["station", "markings"]
+  sprite:
+    sprite: Decals/markings.rsi
+    state: warn_corner_small_ne
+
+- type: decal
+  id: WarnCornerSmallNW
+  tags: ["station", "markings"]
+  sprite:
+    sprite: Decals/markings.rsi
+    state: warn_corner_small_nw
+
+- type: decal
+  id: WarnCornerSmallSE
+  tags: ["station", "markings"]
+  sprite:
+    sprite: Decals/markings.rsi
+    state: warn_corner_small_se
+
+- type: decal
+  id: WarnCornerSmallSW
+  tags: ["station", "markings"]
+  sprite:
+    sprite: Decals/markings.rsi
+    state: warn_corner_small_sw
+
+- type: decal
+  id: WarnEndE
+  tags: ["station", "markings"]
+  sprite:
+    sprite: Decals/markings.rsi
+    state: warn_end_e
+
+- type: decal
+  id: WarnEndN
+  tags: ["station", "markings"]
+  sprite:
+    sprite: Decals/markings.rsi
+    state: warn_end_n
+
+- type: decal
+  id: WarnEndS
+  tags: ["station", "markings"]
+  sprite:
+    sprite: Decals/markings.rsi
+    state: warn_end_s
+
+- type: decal
+  id: WarnEndW
+  tags: ["station", "markings"]
+  sprite:
+    sprite: Decals/markings.rsi
+    state: warn_end_w
+
+- type: decal
+  id: WarnEndGreyscaleE
+  tags: ["station", "markings"]
+  sprite:
+    sprite: Decals/markings.rsi
+    state: warn_end_greyscale_e
+
+- type: decal
+  id: WarnEndGreyscaleN
+  tags: ["station", "markings"]
+  sprite:
+    sprite: Decals/markings.rsi
+    state: warn_end_greyscale_n
+
+- type: decal
+  id: WarnEndGreyscaleS
+  tags: ["station", "markings"]
+  sprite:
+    sprite: Decals/markings.rsi
+    state: warn_end_greyscale_s
+
+- type: decal
+  id: WarnEndGreyscaleW
+  tags: ["station", "markings"]
+  sprite:
+    sprite: Decals/markings.rsi
+    state: warn_end_greyscale_w
+
+- type: decal
+  id: WarnLineE
+  tags: ["station", "markings"]
+  sprite:
+    sprite: Decals/markings.rsi
+    state: warn_line_e
+
+- type: decal
+  id: WarnLineW
+  tags: ["station", "markings"]
+  sprite:
+    sprite: Decals/markings.rsi
+    state: warn_line_n
+
+- type: decal
+  id: WarnLineN
+  tags: ["station", "markings"]
+  sprite:
+    sprite: Decals/markings.rsi
+    state: warn_line_s
+
+- type: decal
+  id: WarnLineS
+  tags: ["station", "markings"]
+  sprite:
+    sprite: Decals/markings.rsi
+    state: warn_line_w
+
+- type: decal
+  id: WarnLineGreyscaleE
+  tags: ["station", "markings"]
+  sprite:
+    sprite: Decals/markings.rsi
+    state: warn_line_greyscale_e
+
+- type: decal
+  id: WarnLineGreyscaleN
+  tags: ["station", "markings"]
+  sprite:
+    sprite: Decals/markings.rsi
+    state: warn_line_greyscale_n
+
+- type: decal
+  id: WarnLineGreyscaleS
+  tags: ["station", "markings"]
+  sprite:
+    sprite: Decals/markings.rsi
+    state: warn_line_greyscale_s
+
+- type: decal
+  id: WarnLineGreyscaleW
+  tags: ["station", "markings"]
+  sprite:
+    sprite: Decals/markings.rsi
+    state: warn_line_greyscale_w
diff --git a/Resources/Textures/Decals/markings.rsi/meta.json b/Resources/Textures/Decals/markings.rsi/meta.json
index a76a69d2eb..10e40c77a9 100644
--- a/Resources/Textures/Decals/markings.rsi/meta.json
+++ b/Resources/Textures/Decals/markings.rsi/meta.json
@@ -14,16 +14,16 @@
       "name": "arrows_greyscale"
     },
     {
-      "name": "bot",
+      "name": "bot"
     },
     {
-      "name": "bot_greyscale",
+      "name": "bot_greyscale"
     },
     {
-      "name": "bot_left",
+      "name": "bot_left"
     },
     {
-      "name": "bot_left_greyscale",
+      "name": "bot_left_greyscale"
     },
     {
       "name": "bot_right"
@@ -41,16 +41,16 @@
       "name": "caution"
     },
     {
-      "name": "caution_greyscale",
+      "name": "caution_greyscale"
     },
     {
-      "name": "delivery",
+      "name": "delivery"
     },
     {
-      "name": "delivery_greyscale",
+      "name": "delivery_greyscale"
     },
     {
-      "name": "loading_area",
+      "name": "loading_area"
     },
     {
       "name": "loading_area_greyscale"
@@ -71,16 +71,16 @@
       "name": "warn_end"
     },
     {
-      "name": "warn_end_greyscale",
+      "name": "warn_end_greyscale"
     },
     {
-      "name": "warn_full",
+      "name": "warn_full"
     },
     {
-      "name": "warn_full_greyscale",
+      "name": "warn_full_greyscale"
     },
     {
-      "name": "warningline",
+      "name": "warningline"
     },
     {
       "name": "warningline_greyscale"
@@ -108,6 +108,102 @@
     },
     {
       "name": "warn_corner_flipped_greyscale"
+    },
+    {
+      "name": "warn_corner_greyscale_ne"
+    },
+    {
+      "name": "warn_corner_greyscale_nw"
+    },
+    {
+      "name": "warn_corner_greyscale_se"
+    },
+    {
+      "name": "warn_corner_greyscale_sw"
+    },
+    {
+      "name": "warn_corner_ne"
+    },
+    {
+      "name": "warn_corner_nw"
+    },
+    {
+      "name": "warn_corner_se"
+    },
+    {
+      "name": "warn_corner_sw"
+    },
+    {
+      "name": "warn_corner_small_greyscale_ne"
+    },
+    {
+      "name": "warn_corner_small_greyscale_nw"
+    },
+    {
+      "name": "warn_corner_small_greyscale_se"
+    },
+    {
+      "name": "warn_corner_small_greyscale_sw"
+    },
+    {
+      "name": "warn_corner_small_ne"
+    },
+    {
+      "name": "warn_corner_small_nw"
+    },
+    {
+      "name": "warn_corner_small_se"
+    },
+    {
+      "name": "warn_corner_small_sw"
+    },
+    {
+      "name": "warn_end_e"
+    },
+    {
+      "name": "warn_end_n"
+    },
+    {
+      "name": "warn_end_s"
+    },
+    {
+      "name": "warn_end_w"
+    },
+    {
+      "name": "warn_end_greyscale_e"
+    },
+    {
+      "name": "warn_end_greyscale_n"
+    },
+    {
+      "name": "warn_end_greyscale_s"
+    },
+    {
+      "name": "warn_end_greyscale_w"
+    },
+    {
+      "name": "warn_line_e"
+    },
+    {
+      "name": "warn_line_n"
+    },
+    {
+      "name": "warn_line_s"
+    },
+    {
+      "name": "warn_line_w"
+    },
+    {
+      "name": "warn_line_greyscale_e"
+    },
+    {
+      "name": "warn_line_greyscale_n"
+    },
+    {
+      "name": "warn_line_greyscale_s"
+    },
+    {
+      "name": "warn_line_greyscale_w"
     }
   ]
 }
diff --git a/Resources/Textures/Decals/markings.rsi/warn_corner_greyscale_ne.png b/Resources/Textures/Decals/markings.rsi/warn_corner_greyscale_ne.png
new file mode 100644
index 0000000000..4fb0ab4c50
Binary files /dev/null and b/Resources/Textures/Decals/markings.rsi/warn_corner_greyscale_ne.png differ
diff --git a/Resources/Textures/Decals/markings.rsi/warn_corner_greyscale_nw.png b/Resources/Textures/Decals/markings.rsi/warn_corner_greyscale_nw.png
new file mode 100644
index 0000000000..4c7b1beab8
Binary files /dev/null and b/Resources/Textures/Decals/markings.rsi/warn_corner_greyscale_nw.png differ
diff --git a/Resources/Textures/Decals/markings.rsi/warn_corner_greyscale_se.png b/Resources/Textures/Decals/markings.rsi/warn_corner_greyscale_se.png
new file mode 100644
index 0000000000..7a91a5e402
Binary files /dev/null and b/Resources/Textures/Decals/markings.rsi/warn_corner_greyscale_se.png differ
diff --git a/Resources/Textures/Decals/markings.rsi/warn_corner_greyscale_sw.png b/Resources/Textures/Decals/markings.rsi/warn_corner_greyscale_sw.png
new file mode 100644
index 0000000000..80533dfd52
Binary files /dev/null and b/Resources/Textures/Decals/markings.rsi/warn_corner_greyscale_sw.png differ
diff --git a/Resources/Textures/Decals/markings.rsi/warn_corner_ne.png b/Resources/Textures/Decals/markings.rsi/warn_corner_ne.png
new file mode 100644
index 0000000000..822b14445f
Binary files /dev/null and b/Resources/Textures/Decals/markings.rsi/warn_corner_ne.png differ
diff --git a/Resources/Textures/Decals/markings.rsi/warn_corner_nw.png b/Resources/Textures/Decals/markings.rsi/warn_corner_nw.png
new file mode 100644
index 0000000000..85048ba7f9
Binary files /dev/null and b/Resources/Textures/Decals/markings.rsi/warn_corner_nw.png differ
diff --git a/Resources/Textures/Decals/markings.rsi/warn_corner_se.png b/Resources/Textures/Decals/markings.rsi/warn_corner_se.png
new file mode 100644
index 0000000000..83638b9a77
Binary files /dev/null and b/Resources/Textures/Decals/markings.rsi/warn_corner_se.png differ
diff --git a/Resources/Textures/Decals/markings.rsi/warn_corner_small_greyscale_ne.png b/Resources/Textures/Decals/markings.rsi/warn_corner_small_greyscale_ne.png
new file mode 100644
index 0000000000..021a0a6157
Binary files /dev/null and b/Resources/Textures/Decals/markings.rsi/warn_corner_small_greyscale_ne.png differ
diff --git a/Resources/Textures/Decals/markings.rsi/warn_corner_small_greyscale_nw.png b/Resources/Textures/Decals/markings.rsi/warn_corner_small_greyscale_nw.png
new file mode 100644
index 0000000000..bdaff07a19
Binary files /dev/null and b/Resources/Textures/Decals/markings.rsi/warn_corner_small_greyscale_nw.png differ
diff --git a/Resources/Textures/Decals/markings.rsi/warn_corner_small_greyscale_se.png b/Resources/Textures/Decals/markings.rsi/warn_corner_small_greyscale_se.png
new file mode 100644
index 0000000000..45eb26df70
Binary files /dev/null and b/Resources/Textures/Decals/markings.rsi/warn_corner_small_greyscale_se.png differ
diff --git a/Resources/Textures/Decals/markings.rsi/warn_corner_small_greyscale_sw.png b/Resources/Textures/Decals/markings.rsi/warn_corner_small_greyscale_sw.png
new file mode 100644
index 0000000000..0ef46e331c
Binary files /dev/null and b/Resources/Textures/Decals/markings.rsi/warn_corner_small_greyscale_sw.png differ
diff --git a/Resources/Textures/Decals/markings.rsi/warn_corner_small_ne.png b/Resources/Textures/Decals/markings.rsi/warn_corner_small_ne.png
new file mode 100644
index 0000000000..04e6ab26f1
Binary files /dev/null and b/Resources/Textures/Decals/markings.rsi/warn_corner_small_ne.png differ
diff --git a/Resources/Textures/Decals/markings.rsi/warn_corner_small_nw.png b/Resources/Textures/Decals/markings.rsi/warn_corner_small_nw.png
new file mode 100644
index 0000000000..f6ae326eed
Binary files /dev/null and b/Resources/Textures/Decals/markings.rsi/warn_corner_small_nw.png differ
diff --git a/Resources/Textures/Decals/markings.rsi/warn_corner_small_se.png b/Resources/Textures/Decals/markings.rsi/warn_corner_small_se.png
new file mode 100644
index 0000000000..a739097ee2
Binary files /dev/null and b/Resources/Textures/Decals/markings.rsi/warn_corner_small_se.png differ
diff --git a/Resources/Textures/Decals/markings.rsi/warn_corner_small_sw.png b/Resources/Textures/Decals/markings.rsi/warn_corner_small_sw.png
new file mode 100644
index 0000000000..de7707c07f
Binary files /dev/null and b/Resources/Textures/Decals/markings.rsi/warn_corner_small_sw.png differ
diff --git a/Resources/Textures/Decals/markings.rsi/warn_corner_sw.png b/Resources/Textures/Decals/markings.rsi/warn_corner_sw.png
new file mode 100644
index 0000000000..7de2b46ae8
Binary files /dev/null and b/Resources/Textures/Decals/markings.rsi/warn_corner_sw.png differ
diff --git a/Resources/Textures/Decals/markings.rsi/warn_end_e.png b/Resources/Textures/Decals/markings.rsi/warn_end_e.png
new file mode 100644
index 0000000000..3607f5c6b2
Binary files /dev/null and b/Resources/Textures/Decals/markings.rsi/warn_end_e.png differ
diff --git a/Resources/Textures/Decals/markings.rsi/warn_end_greyscale_e.png b/Resources/Textures/Decals/markings.rsi/warn_end_greyscale_e.png
new file mode 100644
index 0000000000..71bdaad4f7
Binary files /dev/null and b/Resources/Textures/Decals/markings.rsi/warn_end_greyscale_e.png differ
diff --git a/Resources/Textures/Decals/markings.rsi/warn_end_greyscale_n.png b/Resources/Textures/Decals/markings.rsi/warn_end_greyscale_n.png
new file mode 100644
index 0000000000..1283d4e1a7
Binary files /dev/null and b/Resources/Textures/Decals/markings.rsi/warn_end_greyscale_n.png differ
diff --git a/Resources/Textures/Decals/markings.rsi/warn_end_greyscale_s.png b/Resources/Textures/Decals/markings.rsi/warn_end_greyscale_s.png
new file mode 100644
index 0000000000..40d563517e
Binary files /dev/null and b/Resources/Textures/Decals/markings.rsi/warn_end_greyscale_s.png differ
diff --git a/Resources/Textures/Decals/markings.rsi/warn_end_greyscale_w.png b/Resources/Textures/Decals/markings.rsi/warn_end_greyscale_w.png
new file mode 100644
index 0000000000..07b3062943
Binary files /dev/null and b/Resources/Textures/Decals/markings.rsi/warn_end_greyscale_w.png differ
diff --git a/Resources/Textures/Decals/markings.rsi/warn_end_n.png b/Resources/Textures/Decals/markings.rsi/warn_end_n.png
new file mode 100644
index 0000000000..a614e90661
Binary files /dev/null and b/Resources/Textures/Decals/markings.rsi/warn_end_n.png differ
diff --git a/Resources/Textures/Decals/markings.rsi/warn_end_s.png b/Resources/Textures/Decals/markings.rsi/warn_end_s.png
new file mode 100644
index 0000000000..4881a4d9d1
Binary files /dev/null and b/Resources/Textures/Decals/markings.rsi/warn_end_s.png differ
diff --git a/Resources/Textures/Decals/markings.rsi/warn_end_w.png b/Resources/Textures/Decals/markings.rsi/warn_end_w.png
new file mode 100644
index 0000000000..a46fb50a3c
Binary files /dev/null and b/Resources/Textures/Decals/markings.rsi/warn_end_w.png differ
diff --git a/Resources/Textures/Decals/markings.rsi/warn_line_e.png b/Resources/Textures/Decals/markings.rsi/warn_line_e.png
new file mode 100644
index 0000000000..a4cc34236d
Binary files /dev/null and b/Resources/Textures/Decals/markings.rsi/warn_line_e.png differ
diff --git a/Resources/Textures/Decals/markings.rsi/warn_line_greyscale_e.png b/Resources/Textures/Decals/markings.rsi/warn_line_greyscale_e.png
new file mode 100644
index 0000000000..4a51a3cda2
Binary files /dev/null and b/Resources/Textures/Decals/markings.rsi/warn_line_greyscale_e.png differ
diff --git a/Resources/Textures/Decals/markings.rsi/warn_line_greyscale_n.png b/Resources/Textures/Decals/markings.rsi/warn_line_greyscale_n.png
new file mode 100644
index 0000000000..20656441b0
Binary files /dev/null and b/Resources/Textures/Decals/markings.rsi/warn_line_greyscale_n.png differ
diff --git a/Resources/Textures/Decals/markings.rsi/warn_line_greyscale_s.png b/Resources/Textures/Decals/markings.rsi/warn_line_greyscale_s.png
new file mode 100644
index 0000000000..a8595a25fa
Binary files /dev/null and b/Resources/Textures/Decals/markings.rsi/warn_line_greyscale_s.png differ
diff --git a/Resources/Textures/Decals/markings.rsi/warn_line_greyscale_w.png b/Resources/Textures/Decals/markings.rsi/warn_line_greyscale_w.png
new file mode 100644
index 0000000000..86869ec3c8
Binary files /dev/null and b/Resources/Textures/Decals/markings.rsi/warn_line_greyscale_w.png differ
diff --git a/Resources/Textures/Decals/markings.rsi/warn_line_n.png b/Resources/Textures/Decals/markings.rsi/warn_line_n.png
new file mode 100644
index 0000000000..9e879a2617
Binary files /dev/null and b/Resources/Textures/Decals/markings.rsi/warn_line_n.png differ
diff --git a/Resources/Textures/Decals/markings.rsi/warn_line_s.png b/Resources/Textures/Decals/markings.rsi/warn_line_s.png
new file mode 100644
index 0000000000..3a516b258c
Binary files /dev/null and b/Resources/Textures/Decals/markings.rsi/warn_line_s.png differ
diff --git a/Resources/Textures/Decals/markings.rsi/warn_line_w.png b/Resources/Textures/Decals/markings.rsi/warn_line_w.png
new file mode 100644
index 0000000000..5056f1dd08
Binary files /dev/null and b/Resources/Textures/Decals/markings.rsi/warn_line_w.png differ