diff --git a/public/assets/signal_signs/w21.svg b/public/assets/signal_signs/w21.svg
new file mode 100644
index 0000000..773fa8c
--- /dev/null
+++ b/public/assets/signal_signs/w21.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="100mm" height="100mm" version="1.1" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
+ <path d="m42.559 38.094c-2.4478 0-4.4648 2.0171-4.4648 4.4648v14.883c0 2.4478 2.0171 4.4648 4.4648 4.4648h14.883c2.4478 0 4.4648-2.0171 4.4648-4.4648v-14.883c0-2.4478-2.0171-4.4648-4.4648-4.4648z" class="background"/>
+ <path d="m41.732 36.771c-2.7197 0-4.9609 2.2412-4.9609 4.9609v16.536c0 2.7197 2.2412 4.9609 4.9609 4.9609h16.536c2.7197 0 4.9609-2.2412 4.9609-4.9609v-16.536c0-2.7197-2.2412-4.9609-4.9609-4.9609zm0 3.3073h16.536c0.94472 0 1.6536 0.70891 1.6536 1.6536v16.536c0 0.94472-0.70891 1.6536-1.6536 1.6536h-16.536c-0.94472 0-1.6536-0.70891-1.6536-1.6536v-16.536c0-0.94472 0.70891-1.6536 1.6536-1.6536z"/>
+</svg>
diff --git a/public/assets/signal_signs/w21x.svg b/public/assets/signal_signs/w21x.svg
new file mode 100644
index 0000000..c6f51cd
--- /dev/null
+++ b/public/assets/signal_signs/w21x.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="100mm" height="100mm" version="1.1" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
+ <path d="m42.559 38.094c-2.4478 0-4.4648 2.0171-4.4648 4.4648v14.883c0 2.4478 2.0171 4.4648 4.4648 4.4648h14.883c2.4478 0 4.4648-2.0171 4.4648-4.4648v-14.883c0-2.4478-2.0171-4.4648-4.4648-4.4648z" class="background" />
+ <path d="m41.732 36.771c-2.7197 0-4.9609 2.2412-4.9609 4.9609v16.536c0 2.7197 2.2412 4.9609 4.9609 4.9609h16.536c2.7197 0 4.9609-2.2412 4.9609-4.9609v-16.536c0-2.7197-2.2412-4.9609-4.9609-4.9609zm0 3.3073h16.536c0.94472 0 1.6536 0.70891 1.6536 1.6536v16.536c0 0.94472-0.70891 1.6536-1.6536 1.6536h-16.536c-0.94472 0-1.6536-0.70891-1.6536-1.6536v-16.536c0-0.94472 0.70891-1.6536 1.6536-1.6536z" />
+ <path d="m53.361 54.052h-1.3952l-1.972-3.2742-1.9782 3.2742h-1.3766l2.6975-4.1424-2.4804-3.9626h1.3084l1.8541 3.051 1.8665-3.051h1.2712l-2.4866 3.913z" />
+</svg>
diff --git a/src/model/defs/defined-signal-signs.js b/src/model/defs/defined-signal-signs.js
index 74c153c..63eb289 100644
--- a/src/model/defs/defined-signal-signs.js
+++ b/src/model/defs/defined-signal-signs.js
@@ -29,6 +29,17 @@ const DefinedSignalSigns = {
         "name": "W24",
         "icon": "w24.svg",
     },
+    "w21x": {
+        "regex": /^(?:wsk_)?w21_led_\d$/,
+        "name": "W21",
+        "icon": "w21x.svg",
+    },
+    "w21": {
+        "regex": /^(?:wsk_)?w21(?!_led_)(?:\D)?.*$/,
+        "name": "W21",
+        "icon": "w21.svg",
+        "textRegex": /w21_(\d+)(?:v2)?/
+    },
 };
 
 export default DefinedSignalSigns;