From ab3e56111fdb56aea0e18908ccc9769679db31e6 Mon Sep 17 00:00:00 2001
From: Detective Fiasco <detective.fiasco@gmail.com>
Date: Sun, 10 May 2026 23:56:46 +0200
Subject: [PATCH 1/5] Differentiate main US dwarf signals

---
 features/signals_railway_signals.yaml | 6 +++++-
 symbols/us/main_dwarf.svg             | 9 +++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 symbols/us/main_dwarf.svg

diff --git a/features/signals_railway_signals.yaml b/features/signals_railway_signals.yaml
index ece94fb05..dbf5761e4 100644
--- a/features/signals_railway_signals.yaml
+++ b/features/signals_railway_signals.yaml
@@ -9388,7 +9388,11 @@ features:
 
   - description: Main signal
     country: US
-    icon: [ default: 'us/main' ]
+    icon:
+      - match: 'railway:signal:main:height'
+        cases:
+          - { exact: 'dwarf', value: 'us/main_dwarf' }
+        default: 'us/main'
     tags:
       - { tag: 'railway:signal:main', any: ['US:main', 'US-ABS:main', 'US:GCOR:main'] }
       - { tag: 'railway:signal:main:form', value: 'light' }
diff --git a/symbols/us/main_dwarf.svg b/symbols/us/main_dwarf.svg
new file mode 100644
index 000000000..30c8c2c19
--- /dev/null
+++ b/symbols/us/main_dwarf.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16.469559" height="22.328831" viewBox="0 0 16.469559 22.328831">
+<path fill-rule="nonzero" fill="rgb(5.882353%, 5.882353%, 5.882353%)" fill-opacity="1" d="M 3.234375 4.945312 L 13.234375 4.945312 L 13.234375 20.570312 L 3.234375 20.570312 Z M 3.234375 4.945312 "/>
+<path fill-rule="nonzero" fill="rgb(5.882353%, 5.882353%, 5.882353%)" fill-opacity="1" d="M 13.234375 4.945312 C 13.234375 7.679688 10.992188 9.898438 8.238281 9.898438 C 5.476562 9.898438 3.234375 7.679688 3.234375 4.945312 C 3.234375 2.210938 5.476562 0 8.238281 0 C 10.992188 0 13.234375 2.210938 13.234375 4.945312 Z M 13.234375 4.945312 "/>
+<path fill-rule="nonzero" fill="rgb(0%, 69.019608%, 31.372549%)" fill-opacity="1" d="M 10.199219 4.804688 C 10.199219 5.902344 9.320312 6.789062 8.238281 6.789062 C 7.148438 6.789062 6.273438 5.902344 6.273438 4.804688 C 6.273438 3.707031 7.148438 2.820312 8.238281 2.820312 C 9.320312 2.820312 10.199219 3.707031 10.199219 4.804688 Z M 10.199219 4.804688 "/>
+<path fill-rule="nonzero" fill="rgb(20.784314%, 20.784314%, 20.784314%)" fill-opacity="1" d="M 10.199219 10.546875 C 10.199219 11.644531 9.320312 12.527344 8.238281 12.527344 C 7.148438 12.527344 6.273438 11.644531 6.273438 10.546875 C 6.273438 9.449219 7.148438 8.558594 8.238281 8.558594 C 9.320312 8.558594 10.199219 9.449219 10.199219 10.546875 Z M 10.199219 10.546875 "/>
+<path fill-rule="nonzero" fill="rgb(20.784314%, 20.784314%, 20.784314%)" fill-opacity="1" d="M 10.171875 16.289062 C 10.171875 17.378906 9.292969 18.273438 8.207031 18.273438 C 7.125 18.273438 6.246094 17.378906 6.246094 16.289062 C 6.246094 15.191406 7.125 14.304688 8.207031 14.304688 C 9.292969 14.304688 10.171875 15.191406 10.171875 16.289062 Z M 10.171875 16.289062 "/>
+<path fill-rule="nonzero" fill="rgb(5.882353%, 5.882353%, 5.882353%)" fill-opacity="1" d="M 0 19.210938 L 16.46875 19.210938 L 16.46875 22.328125 L 0 22.328125 Z M 0 19.210938 "/>
+</svg>

From 49e03e9aea61d948eb9dd5b24644d043dd8b7287 Mon Sep 17 00:00:00 2001
From: Thomas Ray <the3dvehicleguy@gmail.com>
Date: Mon, 11 May 2026 19:20:57 -0400
Subject: [PATCH 2/5] added new US signal icons for dwarf signals and new US
 crossing icon

---
 symbols/us/dwarf-left.svg     | 23 +++++++++++++++++++++++
 symbols/us/dwarf-right.svg    | 23 +++++++++++++++++++++++
 symbols/us/level-crossing.svg | 13 +++++++++++++
 3 files changed, 59 insertions(+)
 create mode 100644 symbols/us/dwarf-left.svg
 create mode 100644 symbols/us/dwarf-right.svg
 create mode 100644 symbols/us/level-crossing.svg

diff --git a/symbols/us/dwarf-left.svg b/symbols/us/dwarf-left.svg
new file mode 100644
index 000000000..1d980af75
--- /dev/null
+++ b/symbols/us/dwarf-left.svg
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: #111;
+      }
+
+      .cls-2 {
+        fill: #353635;
+      }
+
+      .cls-3 {
+        fill: #04b04f;
+      }
+    </style>
+  </defs>
+  <path class="cls-1" d="M0,12.06v2.3c0,.91.73,1.64,1.64,1.64h12.72c.91,0,1.64-.73,1.64-1.64V4.4c0-2.64-2.54-5.56-8-3.04C3.63,3.37,0,7.67,0,12.06Z"/>
+  <path class="cls-3" d="M14.43,4.35c0,1.23-.99,2.23-2.2,2.23s-2.21-1-2.21-2.23c0-1.23.98-2.23,2.21-2.23s2.2,1,2.2,2.23Z"/>
+  <path class="cls-2" d="M14.43,12.58c0,1.23-.99,2.23-2.2,2.23s-2.21-1-2.21-2.23.98-2.23,2.21-2.23,2.2,1,2.2,2.23Z"/>
+  <path class="cls-2" d="M8.69,7c0,1.23-.99,2.23-2.2,2.23s-2.21-1-2.21-2.23.98-2.23,2.21-2.23,2.2,1,2.2,2.23Z"/>
+  <path class="cls-2" d="M5.98,12.58c0,1.23-.99,2.23-2.2,2.23s-2.21-1-2.21-2.23c0-1.23.98-2.23,2.21-2.23s2.2,1,2.2,2.23Z"/>
+</svg>
\ No newline at end of file
diff --git a/symbols/us/dwarf-right.svg b/symbols/us/dwarf-right.svg
new file mode 100644
index 000000000..bea2e3677
--- /dev/null
+++ b/symbols/us/dwarf-right.svg
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: #111;
+      }
+
+      .cls-2 {
+        fill: #353635;
+      }
+
+      .cls-3 {
+        fill: #04b04f;
+      }
+    </style>
+  </defs>
+  <path class="cls-1" d="M16,12.06v2.3c0,.91-.73,1.64-1.64,1.64H1.64c-.91,0-1.64-.73-1.64-1.64V4.4C0,1.76,2.54-1.16,8,1.36c4.37,2.01,8,6.31,8,10.7Z"/>
+  <path class="cls-3" d="M3.78,2.12c1.22,0,2.21,1,2.21,2.23s-.98,2.23-2.21,2.23-2.2-1-2.2-2.23.99-2.23,2.2-2.23Z"/>
+  <path class="cls-2" d="M3.78,10.35c1.22,0,2.21,1,2.21,2.23s-.98,2.23-2.21,2.23-2.2-1-2.2-2.23.99-2.23,2.2-2.23Z"/>
+  <path class="cls-2" d="M9.52,4.77c1.22,0,2.21,1,2.21,2.23s-.98,2.23-2.21,2.23-2.2-1-2.2-2.23.99-2.23,2.2-2.23Z"/>
+  <path class="cls-2" d="M12.22,10.35c1.22,0,2.21,1,2.21,2.23,0,1.23-.98,2.23-2.21,2.23s-2.2-1-2.2-2.23.99-2.23,2.2-2.23Z"/>
+</svg>
\ No newline at end of file
diff --git a/symbols/us/level-crossing.svg b/symbols/us/level-crossing.svg
new file mode 100644
index 000000000..201a14861
--- /dev/null
+++ b/symbols/us/level-crossing.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="16px" height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+  <circle fill="#FFCE04" cx="8" cy="8" r="7.7"/>
+  <g>
+    <circle fill="none" stroke="#010101" stroke-width="0.25" stroke-miterlimit="10" cx="8" cy="8" r="7.35"/>
+    <path fill="none" stroke="#010101" stroke-width="1.5" stroke-miterlimit="10" d="M13.13,2.87L2.87,13.13 M2.87,2.87l10.27,10.27" />
+  </g>
+  <path id="a" fill="#010101" d="M1.65,6.2V9.8h0.62v-1.4h1.09c0.6,0,1.09-0.49,1.09-1.09S3.96,6.2,3.36,6.2 M2.26,6.82h1.09
+	c0.26,0,0.48,0.21,0.48,0.48c0,0.26-0.21,0.48-0.48,0.48H2.26 M3.22,8.39l0.62,1.4h0.67L3.76,8.08"/>
+  <g>
+    <path id="a_00000069363097131115234860000016297879665379996810_" fill="#010101" d="M11.66,6.2V9.8h0.62v-1.4h1.09 c0.6,0,1.09-0.49,1.09-1.09S13.97,6.2,13.37,6.2 M12.28,6.82h1.09c0.26,0,0.48,0.21,0.48,0.48c0,0.26-0.21,0.48-0.48,0.48h-1.09 M13.23,8.39l0.62,1.4h0.67l-0.75-1.71"/>
+  </g>
+</svg>

From 25d0a654ce6d5408d63ca45247e4896718e07e70 Mon Sep 17 00:00:00 2001
From: Detective Fiasco <detective.fiasco@gmail.com>
Date: Tue, 12 May 2026 01:32:12 +0200
Subject: [PATCH 3/5] Compress svg & unify svg colors

---
 symbols/us/distant.svg          | 16 +++++++---------
 symbols/us/dwarf-left.svg       | 23 -----------------------
 symbols/us/dwarf-right.svg      | 23 -----------------------
 symbols/us/level-crossing.svg   | 13 -------------
 symbols/us/level_crossing.svg   |  8 ++++++++
 symbols/us/main.svg             |  9 ---------
 symbols/us/main_dwarf.svg       |  9 ---------
 symbols/us/main_dwarf_left.svg  |  8 ++++++++
 symbols/us/main_dwarf_right.svg |  8 ++++++++
 symbols/us/main_normal.svg      |  7 +++++++
 10 files changed, 38 insertions(+), 86 deletions(-)
 delete mode 100644 symbols/us/dwarf-left.svg
 delete mode 100644 symbols/us/dwarf-right.svg
 delete mode 100644 symbols/us/level-crossing.svg
 create mode 100644 symbols/us/level_crossing.svg
 delete mode 100644 symbols/us/main.svg
 delete mode 100644 symbols/us/main_dwarf.svg
 create mode 100644 symbols/us/main_dwarf_left.svg
 create mode 100644 symbols/us/main_dwarf_right.svg
 create mode 100644 symbols/us/main_normal.svg

diff --git a/symbols/us/distant.svg b/symbols/us/distant.svg
index 2d0f3231d..11d35a5b5 100644
--- a/symbols/us/distant.svg
+++ b/symbols/us/distant.svg
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="10" height="30.245594" viewBox="0 0 10 30.245594">
-<path fill-rule="nonzero" fill="rgb(5.882353%, 5.882353%, 5.882353%)" fill-opacity="1" d="M 0 4.945312 L 10 4.945312 L 10 16.574219 L 0 16.574219 Z M 0 4.945312 "/>
-<path fill-rule="nonzero" fill="rgb(5.882353%, 5.882353%, 5.882353%)" fill-opacity="1" d="M 10 16.289062 C 10 19.023438 7.757812 21.234375 5.003906 21.234375 C 2.242188 21.234375 0 19.023438 0 16.289062 C 0 13.554688 2.242188 11.339844 5.003906 11.339844 C 7.757812 11.339844 10 13.554688 10 16.289062 Z M 10 16.289062 "/>
-<path fill-rule="nonzero" fill="rgb(5.882353%, 5.882353%, 5.882353%)" fill-opacity="1" d="M 10 4.945312 C 10 7.679688 7.757812 9.898438 5.003906 9.898438 C 2.242188 9.898438 0 7.679688 0 4.945312 C 0 2.210938 2.242188 0 5.003906 0 C 7.757812 0 10 2.210938 10 4.945312 Z M 10 4.945312 "/>
-<path fill-rule="nonzero" fill="rgb(0%, 69.019608%, 31.372549%)" fill-opacity="1" d="M 6.964844 4.804688 C 6.964844 5.902344 6.085938 6.789062 5.003906 6.789062 C 3.914062 6.789062 3.039062 5.902344 3.039062 4.804688 C 3.039062 3.707031 3.914062 2.820312 5.003906 2.820312 C 6.085938 2.820312 6.964844 3.707031 6.964844 4.804688 Z M 6.964844 4.804688 "/>
-<path fill-rule="nonzero" fill="rgb(20.784314%, 20.784314%, 20.784314%)" fill-opacity="1" d="M 6.964844 10.546875 C 6.964844 11.644531 6.085938 12.527344 5.003906 12.527344 C 3.914062 12.527344 3.039062 11.644531 3.039062 10.546875 C 3.039062 9.449219 3.914062 8.558594 5.003906 8.558594 C 6.085938 8.558594 6.964844 9.449219 6.964844 10.546875 Z M 6.964844 10.546875 "/>
-<path fill-rule="nonzero" fill="rgb(20.784314%, 20.784314%, 20.784314%)" fill-opacity="1" d="M 6.9375 16.289062 C 6.9375 17.382812 6.058594 18.277344 4.976562 18.277344 C 3.890625 18.277344 3.011719 17.382812 3.011719 16.289062 C 3.011719 15.191406 3.890625 14.308594 4.976562 14.308594 C 6.058594 14.308594 6.9375 15.191406 6.9375 16.289062 Z M 6.9375 16.289062 "/>
-<path fill-rule="nonzero" fill="rgb(100%, 95.686275%, 5.882353%)" fill-opacity="1" stroke-width="0.292573" stroke-linecap="butt" stroke-linejoin="miter" stroke="rgb(0%, 0%, 0%)" stroke-opacity="1" stroke-miterlimit="4" d="M 9.440792 26.861541 C 9.440792 29.249053 7.506502 31.183343 5.118989 31.183343 C 2.731476 31.183343 0.789093 29.249053 0.789093 26.861541 C 0.789093 24.474028 2.731476 22.535691 5.118989 22.535691 C 7.506502 22.535691 9.440792 24.474028 9.440792 26.861541 Z M 9.440792 26.861541 " transform="matrix(0.965309, 0, 0, 0.965309, 0, 0)"/>
-<path fill-rule="nonzero" fill="rgb(0%, 0%, 0%)" fill-opacity="1" stroke-width="0.17513" stroke-linecap="butt" stroke-linejoin="miter" stroke="rgb(0%, 0%, 0%)" stroke-opacity="1" stroke-miterlimit="4" d="M 7.425781 25.941406 C 7.425781 26.839844 7.179688 27.515625 6.691406 27.96875 C 6.207031 28.421875 5.527344 28.644531 4.65625 28.644531 L 3.179688 28.644531 L 3.179688 23.34375 L 4.8125 23.34375 C 5.347656 23.34375 5.808594 23.441406 6.199219 23.640625 C 6.59375 23.839844 6.894531 24.132812 7.105469 24.515625 C 7.320312 24.898438 7.425781 25.375 7.425781 25.941406 Z M 6.722656 25.964844 C 6.722656 25.257812 6.546875 24.738281 6.195312 24.414062 C 5.847656 24.082031 5.355469 23.914062 4.714844 23.914062 L 3.847656 23.914062 L 3.847656 28.074219 L 4.566406 28.074219 C 6.003906 28.074219 6.722656 27.371094 6.722656 25.964844 Z M 6.722656 25.964844 "/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="48.39295" viewBox="0 0 16 48.39295">
+<path fill-rule="nonzero" fill="rgb(6.666667%, 6.666667%, 6.666667%)" fill-opacity="1" d="M 8.007812 0 C 3.585938 0 0 3.539062 0 7.914062 L 0 26.519531 L 0.0117188 26.519531 C 0.25 30.679688 3.742188 33.976562 8.007812 33.976562 C 12.257812 33.976562 15.75 30.679688 15.988281 26.519531 L 16 26.519531 L 16 7.914062 C 16 3.539062 12.414062 0 8.007812 0 Z M 8.007812 0 "/>
+<path fill-rule="nonzero" fill="rgb(1.568627%, 69.019608%, 30.980392%)" fill-opacity="1" d="M 11.144531 7.6875 C 11.144531 9.445312 9.738281 10.863281 8.007812 10.863281 C 6.261719 10.863281 4.863281 9.445312 4.863281 7.6875 C 4.863281 5.929688 6.261719 4.511719 8.007812 4.511719 C 9.738281 4.511719 11.144531 5.929688 11.144531 7.6875 Z M 11.144531 7.6875 "/>
+<path fill-rule="nonzero" fill="rgb(20.784314%, 21.176471%, 20.784314%)" fill-opacity="1" d="M 11.144531 16.875 C 11.144531 18.632812 9.738281 20.042969 8.007812 20.042969 C 6.261719 20.042969 4.863281 18.632812 4.863281 16.875 C 4.863281 15.117188 6.261719 13.695312 8.007812 13.695312 C 9.738281 13.695312 11.144531 15.117188 11.144531 16.875 Z M 11.144531 16.875 "/>
+<path fill-rule="nonzero" fill="rgb(20.784314%, 21.176471%, 20.784314%)" fill-opacity="1" d="M 11.101562 26.0625 C 11.101562 27.8125 9.695312 29.242188 7.960938 29.242188 C 6.226562 29.242188 4.820312 27.8125 4.820312 26.0625 C 4.820312 24.304688 6.226562 22.894531 7.960938 22.894531 C 9.695312 22.894531 11.101562 24.304688 11.101562 26.0625 Z M 11.101562 26.0625 "/>
+<path fill-rule="nonzero" fill="rgb(100%, 95.686275%, 5.882353%)" fill-opacity="1" stroke-width="0.292573" stroke-linecap="butt" stroke-linejoin="miter" stroke="rgb(0%, 0%, 0%)" stroke-opacity="1" stroke-miterlimit="4" d="M 9.441297 26.862046 C 9.441297 29.249559 7.506502 31.184355 5.118989 31.184355 C 2.731476 31.184355 0.789093 29.249559 0.789093 26.862046 C 0.789093 24.474534 2.731476 22.53468 5.118989 22.53468 C 7.506502 22.53468 9.441297 24.474534 9.441297 26.862046 Z M 9.441297 26.862046 " transform="matrix(1.544494, 0, 0, 1.544494, 0, 0)"/>
+<path fill-rule="nonzero" fill="rgb(0%, 0%, 0%)" fill-opacity="1" stroke-width="0.17513" stroke-linecap="butt" stroke-linejoin="miter" stroke="rgb(0%, 0%, 0%)" stroke-opacity="1" stroke-miterlimit="4" d="M 7.426758 25.942383 C 7.426758 26.84082 7.180176 27.514648 6.691895 27.96875 C 6.206055 28.422852 5.527344 28.64502 4.655762 28.64502 L 3.178711 28.64502 L 3.178711 23.344727 L 4.812012 23.344727 C 5.34668 23.344727 5.808105 23.442383 6.19873 23.640137 C 6.594238 23.840332 6.894531 24.133301 7.104492 24.516602 C 7.319336 24.897461 7.426758 25.375977 7.426758 25.942383 Z M 6.723633 25.964355 C 6.723633 25.258789 6.547852 24.73877 6.196289 24.414062 C 5.847168 24.082031 5.356445 23.913574 4.714355 23.913574 L 3.847656 23.913574 L 3.847656 28.07373 L 4.56543 28.07373 C 6.003418 28.07373 6.723633 27.370605 6.723633 25.964355 Z M 6.723633 25.964355 " transform="matrix(1.6, 0, 0, 1.6, 0, 0)"/>
 </svg>
diff --git a/symbols/us/dwarf-left.svg b/symbols/us/dwarf-left.svg
deleted file mode 100644
index 1d980af75..000000000
--- a/symbols/us/dwarf-left.svg
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
-  <defs>
-    <style>
-      .cls-1 {
-        fill: #111;
-      }
-
-      .cls-2 {
-        fill: #353635;
-      }
-
-      .cls-3 {
-        fill: #04b04f;
-      }
-    </style>
-  </defs>
-  <path class="cls-1" d="M0,12.06v2.3c0,.91.73,1.64,1.64,1.64h12.72c.91,0,1.64-.73,1.64-1.64V4.4c0-2.64-2.54-5.56-8-3.04C3.63,3.37,0,7.67,0,12.06Z"/>
-  <path class="cls-3" d="M14.43,4.35c0,1.23-.99,2.23-2.2,2.23s-2.21-1-2.21-2.23c0-1.23.98-2.23,2.21-2.23s2.2,1,2.2,2.23Z"/>
-  <path class="cls-2" d="M14.43,12.58c0,1.23-.99,2.23-2.2,2.23s-2.21-1-2.21-2.23.98-2.23,2.21-2.23,2.2,1,2.2,2.23Z"/>
-  <path class="cls-2" d="M8.69,7c0,1.23-.99,2.23-2.2,2.23s-2.21-1-2.21-2.23.98-2.23,2.21-2.23,2.2,1,2.2,2.23Z"/>
-  <path class="cls-2" d="M5.98,12.58c0,1.23-.99,2.23-2.2,2.23s-2.21-1-2.21-2.23c0-1.23.98-2.23,2.21-2.23s2.2,1,2.2,2.23Z"/>
-</svg>
\ No newline at end of file
diff --git a/symbols/us/dwarf-right.svg b/symbols/us/dwarf-right.svg
deleted file mode 100644
index bea2e3677..000000000
--- a/symbols/us/dwarf-right.svg
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
-  <defs>
-    <style>
-      .cls-1 {
-        fill: #111;
-      }
-
-      .cls-2 {
-        fill: #353635;
-      }
-
-      .cls-3 {
-        fill: #04b04f;
-      }
-    </style>
-  </defs>
-  <path class="cls-1" d="M16,12.06v2.3c0,.91-.73,1.64-1.64,1.64H1.64c-.91,0-1.64-.73-1.64-1.64V4.4C0,1.76,2.54-1.16,8,1.36c4.37,2.01,8,6.31,8,10.7Z"/>
-  <path class="cls-3" d="M3.78,2.12c1.22,0,2.21,1,2.21,2.23s-.98,2.23-2.21,2.23-2.2-1-2.2-2.23.99-2.23,2.2-2.23Z"/>
-  <path class="cls-2" d="M3.78,10.35c1.22,0,2.21,1,2.21,2.23s-.98,2.23-2.21,2.23-2.2-1-2.2-2.23.99-2.23,2.2-2.23Z"/>
-  <path class="cls-2" d="M9.52,4.77c1.22,0,2.21,1,2.21,2.23s-.98,2.23-2.21,2.23-2.2-1-2.2-2.23.99-2.23,2.2-2.23Z"/>
-  <path class="cls-2" d="M12.22,10.35c1.22,0,2.21,1,2.21,2.23,0,1.23-.98,2.23-2.21,2.23s-2.2-1-2.2-2.23.99-2.23,2.2-2.23Z"/>
-</svg>
\ No newline at end of file
diff --git a/symbols/us/level-crossing.svg b/symbols/us/level-crossing.svg
deleted file mode 100644
index 201a14861..000000000
--- a/symbols/us/level-crossing.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="16px" height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
-  <circle fill="#FFCE04" cx="8" cy="8" r="7.7"/>
-  <g>
-    <circle fill="none" stroke="#010101" stroke-width="0.25" stroke-miterlimit="10" cx="8" cy="8" r="7.35"/>
-    <path fill="none" stroke="#010101" stroke-width="1.5" stroke-miterlimit="10" d="M13.13,2.87L2.87,13.13 M2.87,2.87l10.27,10.27" />
-  </g>
-  <path id="a" fill="#010101" d="M1.65,6.2V9.8h0.62v-1.4h1.09c0.6,0,1.09-0.49,1.09-1.09S3.96,6.2,3.36,6.2 M2.26,6.82h1.09
-	c0.26,0,0.48,0.21,0.48,0.48c0,0.26-0.21,0.48-0.48,0.48H2.26 M3.22,8.39l0.62,1.4h0.67L3.76,8.08"/>
-  <g>
-    <path id="a_00000069363097131115234860000016297879665379996810_" fill="#010101" d="M11.66,6.2V9.8h0.62v-1.4h1.09 c0.6,0,1.09-0.49,1.09-1.09S13.97,6.2,13.37,6.2 M12.28,6.82h1.09c0.26,0,0.48,0.21,0.48,0.48c0,0.26-0.21,0.48-0.48,0.48h-1.09 M13.23,8.39l0.62,1.4h0.67l-0.75-1.71"/>
-  </g>
-</svg>
diff --git a/symbols/us/level_crossing.svg b/symbols/us/level_crossing.svg
new file mode 100644
index 000000000..fc7c93093
--- /dev/null
+++ b/symbols/us/level_crossing.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16" viewBox="0 0 16 16">
+<path fill-rule="nonzero" fill="rgb(100%, 80.784314%, 1.568627%)" fill-opacity="1" d="M 15.699219 8 C 15.699219 12.253906 12.253906 15.699219 8 15.699219 C 3.746094 15.699219 0.300781 12.253906 0.300781 8 C 0.300781 3.746094 3.746094 0.300781 8 0.300781 C 12.253906 0.300781 15.699219 3.746094 15.699219 8 Z M 15.699219 8 "/>
+<path fill="none" stroke-width="0.25" stroke-linecap="butt" stroke-linejoin="miter" stroke="rgb(0.392157%, 0.392157%, 0.392157%)" stroke-opacity="1" stroke-miterlimit="10" d="M 15.351562 8 C 15.351562 12.058594 12.058594 15.351562 8 15.351562 C 3.941406 15.351562 0.648438 12.058594 0.648438 8 C 0.648438 3.941406 3.941406 0.648438 8 0.648438 C 12.058594 0.648438 15.351562 3.941406 15.351562 8 Z M 15.351562 8 "/>
+<path fill="none" stroke-width="1.5" stroke-linecap="butt" stroke-linejoin="miter" stroke="rgb(0.392157%, 0.392157%, 0.392157%)" stroke-opacity="1" stroke-miterlimit="10" d="M 13.128906 2.871094 L 2.871094 13.128906 M 2.871094 2.871094 L 13.140625 13.140625 "/>
+<path fill-rule="nonzero" fill="rgb(0.392157%, 0.392157%, 0.392157%)" fill-opacity="1" d="M 1.648438 6.199219 L 1.648438 9.800781 L 2.269531 9.800781 L 2.269531 8.398438 L 3.359375 8.398438 C 3.960938 8.398438 4.449219 7.910156 4.449219 7.308594 C 4.449219 6.710938 3.960938 6.199219 3.359375 6.199219 M 2.261719 6.820312 L 3.351562 6.820312 C 3.609375 6.820312 3.828125 7.03125 3.828125 7.300781 C 3.828125 7.558594 3.621094 7.78125 3.351562 7.78125 L 2.261719 7.78125 M 3.21875 8.390625 L 3.839844 9.789062 L 4.511719 9.789062 L 3.761719 8.078125 "/>
+<path fill-rule="nonzero" fill="rgb(0.392157%, 0.392157%, 0.392157%)" fill-opacity="1" d="M 11.660156 6.199219 L 11.660156 9.800781 L 12.28125 9.800781 L 12.28125 8.398438 L 13.371094 8.398438 C 13.96875 8.398438 14.460938 7.910156 14.460938 7.308594 C 14.460938 6.710938 13.96875 6.199219 13.371094 6.199219 M 12.28125 6.820312 L 13.371094 6.820312 C 13.628906 6.820312 13.851562 7.03125 13.851562 7.300781 C 13.851562 7.558594 13.640625 7.78125 13.371094 7.78125 L 12.28125 7.78125 M 13.230469 8.390625 L 13.851562 9.789062 L 14.519531 9.789062 L 13.769531 8.078125 "/>
+</svg>
diff --git a/symbols/us/main.svg b/symbols/us/main.svg
deleted file mode 100644
index 339ab753c..000000000
--- a/symbols/us/main.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="10" height="21.234009" viewBox="0 0 10 21.234009">
-<path fill-rule="nonzero" fill="rgb(5.882353%, 5.882353%, 5.882353%)" fill-opacity="1" d="M 0 4.945312 L 10 4.945312 L 10 16.570312 L 0 16.570312 Z M 0 4.945312 "/>
-<path fill-rule="nonzero" fill="rgb(5.882353%, 5.882353%, 5.882353%)" fill-opacity="1" d="M 10 16.289062 C 10 19.019531 7.757812 21.230469 5.003906 21.230469 C 2.242188 21.230469 0 19.019531 0 16.289062 C 0 13.554688 2.242188 11.339844 5.003906 11.339844 C 7.757812 11.339844 10 13.554688 10 16.289062 Z M 10 16.289062 "/>
-<path fill-rule="nonzero" fill="rgb(5.882353%, 5.882353%, 5.882353%)" fill-opacity="1" d="M 10 4.945312 C 10 7.679688 7.757812 9.898438 5.003906 9.898438 C 2.242188 9.898438 0 7.679688 0 4.945312 C 0 2.210938 2.242188 0 5.003906 0 C 7.757812 0 10 2.210938 10 4.945312 Z M 10 4.945312 "/>
-<path fill-rule="nonzero" fill="rgb(0%, 69.019608%, 31.372549%)" fill-opacity="1" d="M 6.964844 4.804688 C 6.964844 5.902344 6.085938 6.789062 5.003906 6.789062 C 3.914062 6.789062 3.039062 5.902344 3.039062 4.804688 C 3.039062 3.707031 3.914062 2.820312 5.003906 2.820312 C 6.085938 2.820312 6.964844 3.707031 6.964844 4.804688 Z M 6.964844 4.804688 "/>
-<path fill-rule="nonzero" fill="rgb(20.784314%, 20.784314%, 20.784314%)" fill-opacity="1" d="M 6.964844 10.546875 C 6.964844 11.644531 6.085938 12.527344 5.003906 12.527344 C 3.914062 12.527344 3.039062 11.644531 3.039062 10.546875 C 3.039062 9.449219 3.914062 8.558594 5.003906 8.558594 C 6.085938 8.558594 6.964844 9.449219 6.964844 10.546875 Z M 6.964844 10.546875 "/>
-<path fill-rule="nonzero" fill="rgb(20.784314%, 20.784314%, 20.784314%)" fill-opacity="1" d="M 6.9375 16.289062 C 6.9375 17.378906 6.058594 18.273438 4.972656 18.273438 C 3.890625 18.273438 3.011719 17.378906 3.011719 16.289062 C 3.011719 15.191406 3.890625 14.304688 4.972656 14.304688 C 6.058594 14.304688 6.9375 15.191406 6.9375 16.289062 Z M 6.9375 16.289062 "/>
-</svg>
diff --git a/symbols/us/main_dwarf.svg b/symbols/us/main_dwarf.svg
deleted file mode 100644
index 30c8c2c19..000000000
--- a/symbols/us/main_dwarf.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16.469559" height="22.328831" viewBox="0 0 16.469559 22.328831">
-<path fill-rule="nonzero" fill="rgb(5.882353%, 5.882353%, 5.882353%)" fill-opacity="1" d="M 3.234375 4.945312 L 13.234375 4.945312 L 13.234375 20.570312 L 3.234375 20.570312 Z M 3.234375 4.945312 "/>
-<path fill-rule="nonzero" fill="rgb(5.882353%, 5.882353%, 5.882353%)" fill-opacity="1" d="M 13.234375 4.945312 C 13.234375 7.679688 10.992188 9.898438 8.238281 9.898438 C 5.476562 9.898438 3.234375 7.679688 3.234375 4.945312 C 3.234375 2.210938 5.476562 0 8.238281 0 C 10.992188 0 13.234375 2.210938 13.234375 4.945312 Z M 13.234375 4.945312 "/>
-<path fill-rule="nonzero" fill="rgb(0%, 69.019608%, 31.372549%)" fill-opacity="1" d="M 10.199219 4.804688 C 10.199219 5.902344 9.320312 6.789062 8.238281 6.789062 C 7.148438 6.789062 6.273438 5.902344 6.273438 4.804688 C 6.273438 3.707031 7.148438 2.820312 8.238281 2.820312 C 9.320312 2.820312 10.199219 3.707031 10.199219 4.804688 Z M 10.199219 4.804688 "/>
-<path fill-rule="nonzero" fill="rgb(20.784314%, 20.784314%, 20.784314%)" fill-opacity="1" d="M 10.199219 10.546875 C 10.199219 11.644531 9.320312 12.527344 8.238281 12.527344 C 7.148438 12.527344 6.273438 11.644531 6.273438 10.546875 C 6.273438 9.449219 7.148438 8.558594 8.238281 8.558594 C 9.320312 8.558594 10.199219 9.449219 10.199219 10.546875 Z M 10.199219 10.546875 "/>
-<path fill-rule="nonzero" fill="rgb(20.784314%, 20.784314%, 20.784314%)" fill-opacity="1" d="M 10.171875 16.289062 C 10.171875 17.378906 9.292969 18.273438 8.207031 18.273438 C 7.125 18.273438 6.246094 17.378906 6.246094 16.289062 C 6.246094 15.191406 7.125 14.304688 8.207031 14.304688 C 9.292969 14.304688 10.171875 15.191406 10.171875 16.289062 Z M 10.171875 16.289062 "/>
-<path fill-rule="nonzero" fill="rgb(5.882353%, 5.882353%, 5.882353%)" fill-opacity="1" d="M 0 19.210938 L 16.46875 19.210938 L 16.46875 22.328125 L 0 22.328125 Z M 0 19.210938 "/>
-</svg>
diff --git a/symbols/us/main_dwarf_left.svg b/symbols/us/main_dwarf_left.svg
new file mode 100644
index 000000000..485529cad
--- /dev/null
+++ b/symbols/us/main_dwarf_left.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16" viewBox="0 0 16 16">
+<path fill-rule="nonzero" fill="rgb(6.666667%, 6.666667%, 6.666667%)" fill-opacity="1" d="M 0 12.058594 L 0 14.359375 C 0 15.269531 0.730469 16 1.640625 16 L 14.359375 16 C 15.269531 16 16 15.269531 16 14.359375 L 16 4.398438 C 16 1.761719 13.460938 -1.160156 8 1.359375 C 3.628906 3.371094 0 7.671875 0 12.058594 Z M 0 12.058594 "/>
+<path fill-rule="nonzero" fill="rgb(1.568627%, 69.019608%, 30.980392%)" fill-opacity="1" d="M 14.429688 4.351562 C 14.429688 5.578125 13.441406 6.578125 12.230469 6.578125 C 11.019531 6.578125 10.019531 5.578125 10.019531 4.351562 C 10.019531 3.121094 11 2.121094 12.230469 2.121094 C 13.460938 2.121094 14.429688 3.121094 14.429688 4.351562 Z M 14.429688 4.351562 "/>
+<path fill-rule="nonzero" fill="rgb(20.784314%, 21.176471%, 20.784314%)" fill-opacity="1" d="M 14.429688 12.578125 C 14.429688 13.808594 13.441406 14.808594 12.230469 14.808594 C 11.019531 14.808594 10.019531 13.808594 10.019531 12.578125 C 10.019531 11.351562 11 10.351562 12.230469 10.351562 C 13.460938 10.351562 14.429688 11.351562 14.429688 12.578125 Z M 14.429688 12.578125 "/>
+<path fill-rule="nonzero" fill="rgb(20.784314%, 21.176471%, 20.784314%)" fill-opacity="1" d="M 8.691406 7 C 8.691406 8.230469 7.699219 9.230469 6.488281 9.230469 C 5.28125 9.230469 4.28125 8.230469 4.28125 7 C 4.28125 5.769531 5.261719 4.769531 6.488281 4.769531 C 7.71875 4.769531 8.691406 5.769531 8.691406 7 Z M 8.691406 7 "/>
+<path fill-rule="nonzero" fill="rgb(20.784314%, 21.176471%, 20.784314%)" fill-opacity="1" d="M 5.980469 12.578125 C 5.980469 13.808594 4.988281 14.808594 3.78125 14.808594 C 2.570312 14.808594 1.570312 13.808594 1.570312 12.578125 C 1.570312 11.351562 2.550781 10.351562 3.78125 10.351562 C 5.011719 10.351562 5.980469 11.351562 5.980469 12.578125 Z M 5.980469 12.578125 "/>
+</svg>
diff --git a/symbols/us/main_dwarf_right.svg b/symbols/us/main_dwarf_right.svg
new file mode 100644
index 000000000..39f5487b4
--- /dev/null
+++ b/symbols/us/main_dwarf_right.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16" viewBox="0 0 16 16">
+<path fill-rule="nonzero" fill="rgb(6.666667%, 6.666667%, 6.666667%)" fill-opacity="1" d="M 16 12.058594 L 16 14.359375 C 16 15.269531 15.269531 16 14.359375 16 L 1.640625 16 C 0.730469 16 0 15.269531 0 14.359375 L 0 4.398438 C 0 1.761719 2.539062 -1.160156 8 1.359375 C 12.371094 3.371094 16 7.671875 16 12.058594 Z M 16 12.058594 "/>
+<path fill-rule="nonzero" fill="rgb(1.568627%, 69.019608%, 30.980392%)" fill-opacity="1" d="M 3.78125 2.121094 C 5 2.121094 5.988281 3.121094 5.988281 4.351562 C 5.988281 5.578125 5.011719 6.578125 3.78125 6.578125 C 2.550781 6.578125 1.578125 5.578125 1.578125 4.351562 C 1.578125 3.121094 2.570312 2.121094 3.78125 2.121094 Z M 3.78125 2.121094 "/>
+<path fill-rule="nonzero" fill="rgb(20.784314%, 21.176471%, 20.784314%)" fill-opacity="1" d="M 3.78125 10.351562 C 5 10.351562 5.988281 11.351562 5.988281 12.578125 C 5.988281 13.808594 5.011719 14.808594 3.78125 14.808594 C 2.550781 14.808594 1.578125 13.808594 1.578125 12.578125 C 1.578125 11.351562 2.570312 10.351562 3.78125 10.351562 Z M 3.78125 10.351562 "/>
+<path fill-rule="nonzero" fill="rgb(20.784314%, 21.176471%, 20.784314%)" fill-opacity="1" d="M 9.519531 4.769531 C 10.738281 4.769531 11.730469 5.769531 11.730469 7 C 11.730469 8.230469 10.75 9.230469 9.519531 9.230469 C 8.289062 9.230469 7.320312 8.230469 7.320312 7 C 7.320312 5.769531 8.308594 4.769531 9.519531 4.769531 Z M 9.519531 4.769531 "/>
+<path fill-rule="nonzero" fill="rgb(20.784314%, 21.176471%, 20.784314%)" fill-opacity="1" d="M 12.21875 10.351562 C 13.441406 10.351562 14.429688 11.351562 14.429688 12.578125 C 14.429688 13.808594 13.449219 14.808594 12.21875 14.808594 C 10.988281 14.808594 10.019531 13.808594 10.019531 12.578125 C 10.019531 11.351562 11.011719 10.351562 12.21875 10.351562 Z M 12.21875 10.351562 "/>
+</svg>
diff --git a/symbols/us/main_normal.svg b/symbols/us/main_normal.svg
new file mode 100644
index 000000000..c8bb61328
--- /dev/null
+++ b/symbols/us/main_normal.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="33.974414" viewBox="0 0 16 33.974414">
+<path fill-rule="nonzero" fill="rgb(6.666667%, 6.666667%, 6.666667%)" fill-opacity="1" d="M 8.007812 0 C 3.585938 0 0 3.539062 0 7.914062 L 0 26.511719 L 0.0117188 26.511719 C 0.25 30.671875 3.742188 33.96875 8.007812 33.96875 C 12.261719 33.96875 15.75 30.671875 15.988281 26.511719 L 16 26.511719 L 16 7.914062 C 16 3.539062 12.414062 0 8.007812 0 Z M 8.007812 0 "/>
+<path fill-rule="nonzero" fill="rgb(1.568627%, 69.019608%, 30.980392%)" fill-opacity="1" d="M 11.144531 7.6875 C 11.144531 9.445312 9.738281 10.863281 8.007812 10.863281 C 6.261719 10.863281 4.863281 9.445312 4.863281 7.6875 C 4.863281 5.929688 6.261719 4.511719 8.007812 4.511719 C 9.738281 4.511719 11.144531 5.929688 11.144531 7.6875 Z M 11.144531 7.6875 "/>
+<path fill-rule="nonzero" fill="rgb(20.784314%, 21.176471%, 20.784314%)" fill-opacity="1" d="M 11.144531 16.875 C 11.144531 18.632812 9.738281 20.042969 8.007812 20.042969 C 6.261719 20.042969 4.863281 18.632812 4.863281 16.875 C 4.863281 15.117188 6.261719 13.695312 8.007812 13.695312 C 9.738281 13.695312 11.144531 15.117188 11.144531 16.875 Z M 11.144531 16.875 "/>
+<path fill-rule="nonzero" fill="rgb(20.784314%, 21.176471%, 20.784314%)" fill-opacity="1" d="M 11.101562 26.0625 C 11.101562 27.804688 9.695312 29.238281 7.957031 29.238281 C 6.226562 29.238281 4.820312 27.804688 4.820312 26.0625 C 4.820312 24.304688 6.226562 22.886719 7.957031 22.886719 C 9.695312 22.886719 11.101562 24.304688 11.101562 26.0625 Z M 11.101562 26.0625 "/>
+</svg>

From 722c17e112bcb97a5c491f24441c02723b046eb6 Mon Sep 17 00:00:00 2001
From: Detective Fiasco <detective.fiasco@gmail.com>
Date: Tue, 12 May 2026 01:35:37 +0200
Subject: [PATCH 4/5] Differentiate main dwarf signals by position left/right

---
 features/signals_railway_signals.yaml | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/features/signals_railway_signals.yaml b/features/signals_railway_signals.yaml
index dbf5761e4..70f9a009a 100644
--- a/features/signals_railway_signals.yaml
+++ b/features/signals_railway_signals.yaml
@@ -9389,10 +9389,18 @@ features:
   - description: Main signal
     country: US
     icon:
-      - match: 'railway:signal:main:height'
+      - match: 'railway:signal:position'
         cases:
-          - { exact: 'dwarf', value: 'us/main_dwarf' }
-        default: 'us/main'
+          - { exact: 'left', value: 'us/main_dwarf_left' }
+        default: 'us/main_dwarf_right'
+    tags:
+      - { tag: 'railway:signal:main', any: ['US:main', 'US-ABS:main', 'US:GCOR:main'] }
+      - { tag: 'railway:signal:main:form', value: 'light' }
+      - { tag: 'railway:signal:main:height', value: 'dwarf' }
+
+  - description: Main signal
+    country: US
+    icon: [ default: 'us/main_normal' ]
     tags:
       - { tag: 'railway:signal:main', any: ['US:main', 'US-ABS:main', 'US:GCOR:main'] }
       - { tag: 'railway:signal:main:form', value: 'light' }

From 9d98cf55a103661ae56992399af94d592b200582 Mon Sep 17 00:00:00 2001
From: Detective Fiasco <detective.fiasco@gmail.com>
Date: Mon, 1 Jun 2026 13:39:32 +0200
Subject: [PATCH 5/5] Fix oversized icons

---
 symbols/us/distant.svg     | 14 +++++++-------
 symbols/us/main_normal.svg | 10 +++++-----
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/symbols/us/distant.svg b/symbols/us/distant.svg
index 11d35a5b5..6b13b1703 100644
--- a/symbols/us/distant.svg
+++ b/symbols/us/distant.svg
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="48.39295" viewBox="0 0 16 48.39295">
-<path fill-rule="nonzero" fill="rgb(6.666667%, 6.666667%, 6.666667%)" fill-opacity="1" d="M 8.007812 0 C 3.585938 0 0 3.539062 0 7.914062 L 0 26.519531 L 0.0117188 26.519531 C 0.25 30.679688 3.742188 33.976562 8.007812 33.976562 C 12.257812 33.976562 15.75 30.679688 15.988281 26.519531 L 16 26.519531 L 16 7.914062 C 16 3.539062 12.414062 0 8.007812 0 Z M 8.007812 0 "/>
-<path fill-rule="nonzero" fill="rgb(1.568627%, 69.019608%, 30.980392%)" fill-opacity="1" d="M 11.144531 7.6875 C 11.144531 9.445312 9.738281 10.863281 8.007812 10.863281 C 6.261719 10.863281 4.863281 9.445312 4.863281 7.6875 C 4.863281 5.929688 6.261719 4.511719 8.007812 4.511719 C 9.738281 4.511719 11.144531 5.929688 11.144531 7.6875 Z M 11.144531 7.6875 "/>
-<path fill-rule="nonzero" fill="rgb(20.784314%, 21.176471%, 20.784314%)" fill-opacity="1" d="M 11.144531 16.875 C 11.144531 18.632812 9.738281 20.042969 8.007812 20.042969 C 6.261719 20.042969 4.863281 18.632812 4.863281 16.875 C 4.863281 15.117188 6.261719 13.695312 8.007812 13.695312 C 9.738281 13.695312 11.144531 15.117188 11.144531 16.875 Z M 11.144531 16.875 "/>
-<path fill-rule="nonzero" fill="rgb(20.784314%, 21.176471%, 20.784314%)" fill-opacity="1" d="M 11.101562 26.0625 C 11.101562 27.8125 9.695312 29.242188 7.960938 29.242188 C 6.226562 29.242188 4.820312 27.8125 4.820312 26.0625 C 4.820312 24.304688 6.226562 22.894531 7.960938 22.894531 C 9.695312 22.894531 11.101562 24.304688 11.101562 26.0625 Z M 11.101562 26.0625 "/>
-<path fill-rule="nonzero" fill="rgb(100%, 95.686275%, 5.882353%)" fill-opacity="1" stroke-width="0.292573" stroke-linecap="butt" stroke-linejoin="miter" stroke="rgb(0%, 0%, 0%)" stroke-opacity="1" stroke-miterlimit="4" d="M 9.441297 26.862046 C 9.441297 29.249559 7.506502 31.184355 5.118989 31.184355 C 2.731476 31.184355 0.789093 29.249559 0.789093 26.862046 C 0.789093 24.474534 2.731476 22.53468 5.118989 22.53468 C 7.506502 22.53468 9.441297 24.474534 9.441297 26.862046 Z M 9.441297 26.862046 " transform="matrix(1.544494, 0, 0, 1.544494, 0, 0)"/>
-<path fill-rule="nonzero" fill="rgb(0%, 0%, 0%)" fill-opacity="1" stroke-width="0.17513" stroke-linecap="butt" stroke-linejoin="miter" stroke="rgb(0%, 0%, 0%)" stroke-opacity="1" stroke-miterlimit="4" d="M 7.426758 25.942383 C 7.426758 26.84082 7.180176 27.514648 6.691895 27.96875 C 6.206055 28.422852 5.527344 28.64502 4.655762 28.64502 L 3.178711 28.64502 L 3.178711 23.344727 L 4.812012 23.344727 C 5.34668 23.344727 5.808105 23.442383 6.19873 23.640137 C 6.594238 23.840332 6.894531 24.133301 7.104492 24.516602 C 7.319336 24.897461 7.426758 25.375977 7.426758 25.942383 Z M 6.723633 25.964355 C 6.723633 25.258789 6.547852 24.73877 6.196289 24.414062 C 5.847168 24.082031 5.356445 23.913574 4.714355 23.913574 L 3.847656 23.913574 L 3.847656 28.07373 L 4.56543 28.07373 C 6.003418 28.07373 6.723633 27.370605 6.723633 25.964355 Z M 6.723633 25.964355 " transform="matrix(1.6, 0, 0, 1.6, 0, 0)"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="12" height="36.294711" viewBox="0 0 12 36.294711">
+<path fill-rule="nonzero" fill="rgb(6.666667%, 6.666667%, 6.666667%)" fill-opacity="1" d="M 6.003906 0 C 2.691406 0 0 2.652344 0 5.933594 L 0 19.890625 L 0.0078125 19.890625 C 0.1875 23.011719 2.808594 25.480469 6.003906 25.480469 C 9.191406 25.480469 11.8125 23.011719 11.992188 19.890625 L 12 19.890625 L 12 5.933594 C 12 2.652344 9.308594 0 6.003906 0 Z M 6.003906 0 "/>
+<path fill-rule="nonzero" fill="rgb(1.568627%, 69.019608%, 30.980392%)" fill-opacity="1" d="M 8.359375 5.765625 C 8.359375 7.082031 7.304688 8.148438 6.003906 8.148438 C 4.695312 8.148438 3.648438 7.082031 3.648438 5.765625 C 3.648438 4.449219 4.695312 3.382812 6.003906 3.382812 C 7.304688 3.382812 8.359375 4.449219 8.359375 5.765625 Z M 8.359375 5.765625 "/>
+<path fill-rule="nonzero" fill="rgb(20.784314%, 21.176471%, 20.784314%)" fill-opacity="1" d="M 8.359375 12.65625 C 8.359375 13.972656 7.304688 15.03125 6.003906 15.03125 C 4.695312 15.03125 3.648438 13.972656 3.648438 12.65625 C 3.648438 11.339844 4.695312 10.269531 6.003906 10.269531 C 7.304688 10.269531 8.359375 11.339844 8.359375 12.65625 Z M 8.359375 12.65625 "/>
+<path fill-rule="nonzero" fill="rgb(20.784314%, 21.176471%, 20.784314%)" fill-opacity="1" d="M 8.324219 19.546875 C 8.324219 20.859375 7.269531 21.933594 5.972656 21.933594 C 4.667969 21.933594 3.613281 20.859375 3.613281 19.546875 C 3.613281 18.230469 4.667969 17.171875 5.972656 17.171875 C 7.269531 17.171875 8.324219 18.230469 8.324219 19.546875 Z M 8.324219 19.546875 "/>
+<path fill-rule="nonzero" fill="rgb(100%, 95.686275%, 5.882353%)" fill-opacity="1" stroke-width="0.292573" stroke-linecap="butt" stroke-linejoin="miter" stroke="rgb(0%, 0%, 0%)" stroke-opacity="1" stroke-miterlimit="4" d="M 9.442143 26.862896 C 9.442143 29.25041 7.506504 31.182677 5.11899 31.182677 C 2.731477 31.182677 0.789093 29.25041 0.789093 26.862896 C 0.789093 24.475383 2.731477 22.533 5.11899 22.533 C 7.506504 22.533 9.442143 24.475383 9.442143 26.862896 Z M 9.442143 26.862896 " transform="matrix(1.158371, 0, 0, 1.158371, 0, 0)"/>
+<path fill-rule="nonzero" fill="rgb(0%, 0%, 0%)" fill-opacity="1" stroke-width="0.17513" stroke-linecap="butt" stroke-linejoin="miter" stroke="rgb(0%, 0%, 0%)" stroke-opacity="1" stroke-miterlimit="4" d="M 7.428385 25.94401 C 7.428385 26.842448 7.180989 27.51302 6.692708 27.96875 C 6.207682 28.424479 5.527344 28.645833 4.654948 28.645833 L 3.180338 28.645833 L 3.180338 23.346354 L 4.811198 23.346354 C 5.348307 23.346354 5.807292 23.44401 6.197917 23.639323 C 6.595052 23.841145 6.894531 24.134114 7.102864 24.518229 C 7.320963 24.899088 7.428385 25.377604 7.428385 25.94401 Z M 6.72526 25.963541 C 6.72526 25.260416 6.549479 24.739583 6.197917 24.414062 C 5.846354 24.082031 5.354818 23.91276 4.713542 23.91276 L 3.847656 23.91276 L 3.847656 28.072916 L 4.567057 28.072916 C 6.002604 28.072916 6.72526 27.369791 6.72526 25.963541 Z M 6.72526 25.963541 " transform="matrix(1.2, 0, 0, 1.2, 0, 0)"/>
 </svg>
diff --git a/symbols/us/main_normal.svg b/symbols/us/main_normal.svg
index c8bb61328..0b4dd6cdc 100644
--- a/symbols/us/main_normal.svg
+++ b/symbols/us/main_normal.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="33.974414" viewBox="0 0 16 33.974414">
-<path fill-rule="nonzero" fill="rgb(6.666667%, 6.666667%, 6.666667%)" fill-opacity="1" d="M 8.007812 0 C 3.585938 0 0 3.539062 0 7.914062 L 0 26.511719 L 0.0117188 26.511719 C 0.25 30.671875 3.742188 33.96875 8.007812 33.96875 C 12.261719 33.96875 15.75 30.671875 15.988281 26.511719 L 16 26.511719 L 16 7.914062 C 16 3.539062 12.414062 0 8.007812 0 Z M 8.007812 0 "/>
-<path fill-rule="nonzero" fill="rgb(1.568627%, 69.019608%, 30.980392%)" fill-opacity="1" d="M 11.144531 7.6875 C 11.144531 9.445312 9.738281 10.863281 8.007812 10.863281 C 6.261719 10.863281 4.863281 9.445312 4.863281 7.6875 C 4.863281 5.929688 6.261719 4.511719 8.007812 4.511719 C 9.738281 4.511719 11.144531 5.929688 11.144531 7.6875 Z M 11.144531 7.6875 "/>
-<path fill-rule="nonzero" fill="rgb(20.784314%, 21.176471%, 20.784314%)" fill-opacity="1" d="M 11.144531 16.875 C 11.144531 18.632812 9.738281 20.042969 8.007812 20.042969 C 6.261719 20.042969 4.863281 18.632812 4.863281 16.875 C 4.863281 15.117188 6.261719 13.695312 8.007812 13.695312 C 9.738281 13.695312 11.144531 15.117188 11.144531 16.875 Z M 11.144531 16.875 "/>
-<path fill-rule="nonzero" fill="rgb(20.784314%, 21.176471%, 20.784314%)" fill-opacity="1" d="M 11.101562 26.0625 C 11.101562 27.804688 9.695312 29.238281 7.957031 29.238281 C 6.226562 29.238281 4.820312 27.804688 4.820312 26.0625 C 4.820312 24.304688 6.226562 22.886719 7.957031 22.886719 C 9.695312 22.886719 11.101562 24.304688 11.101562 26.0625 Z M 11.101562 26.0625 "/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="12" height="25.480811" viewBox="0 0 12 25.480811">
+<path fill-rule="nonzero" fill="rgb(6.666667%, 6.666667%, 6.666667%)" fill-opacity="1" d="M 6.003906 0 C 2.691406 0 0 2.652344 0 5.933594 L 0 19.882812 L 0.0078125 19.882812 C 0.1875 23.003906 2.808594 25.476562 6.003906 25.476562 C 9.195312 25.476562 11.8125 23.003906 11.992188 19.882812 L 12 19.882812 L 12 5.933594 C 12 2.652344 9.308594 0 6.003906 0 Z M 6.003906 0 "/>
+<path fill-rule="nonzero" fill="rgb(1.568627%, 69.019608%, 30.980392%)" fill-opacity="1" d="M 8.359375 5.765625 C 8.359375 7.082031 7.304688 8.148438 6.003906 8.148438 C 4.695312 8.148438 3.648438 7.082031 3.648438 5.765625 C 3.648438 4.449219 4.695312 3.382812 6.003906 3.382812 C 7.304688 3.382812 8.359375 4.449219 8.359375 5.765625 Z M 8.359375 5.765625 "/>
+<path fill-rule="nonzero" fill="rgb(20.784314%, 21.176471%, 20.784314%)" fill-opacity="1" d="M 8.359375 12.65625 C 8.359375 13.972656 7.304688 15.03125 6.003906 15.03125 C 4.695312 15.03125 3.648438 13.972656 3.648438 12.65625 C 3.648438 11.339844 4.695312 10.269531 6.003906 10.269531 C 7.304688 10.269531 8.359375 11.339844 8.359375 12.65625 Z M 8.359375 12.65625 "/>
+<path fill-rule="nonzero" fill="rgb(20.784314%, 21.176471%, 20.784314%)" fill-opacity="1" d="M 8.324219 19.546875 C 8.324219 20.855469 7.269531 21.929688 5.96875 21.929688 C 4.667969 21.929688 3.613281 20.855469 3.613281 19.546875 C 3.613281 18.230469 4.667969 17.164062 5.96875 17.164062 C 7.269531 17.164062 8.324219 18.230469 8.324219 19.546875 Z M 8.324219 19.546875 "/>
 </svg>