diff --git a/features/signals_railway_signals.yaml b/features/signals_railway_signals.yaml
index 4c0cc5767..4f5b25212 100644
--- a/features/signals_railway_signals.yaml
+++ b/features/signals_railway_signals.yaml
@@ -6824,30 +6824,19 @@ features:
       - { tag: 'railway:signal:train_protection:form', value: 'sign' }
       - { tag: 'railway:signal:train_protection:type', value: 'block_marker' }
 
-  - description: Main (light)
-    country: GB
-    icon:
-      - match: 'railway:signal:main:design'
-        cases:
-          - { exact: 'combined', value: 'gb/main-combined-light' }
-        default: 'gb/main-individual-light'
-    tags:
-      - { tag: 'railway:signal:main', value: 'GB-NR:main' }
-      - { tag: 'railway:signal:main:form', value: 'light' }
-
-  - description: Main (semaphore)
+  - description: Shunting
     country: GB
-    icon: [ default: 'gb/main-semaphore' ]
+    icon: [ default: 'gb/shunting' ]
     tags:
-      - { tag: 'railway:signal:main', value: 'GB-NR:main' }
-      - { tag: 'railway:signal:main:form', value: 'semaphore' }
+      - { tag: 'railway:signal:shunting', value: 'GB-NR:shunting' }
+      - { tag: 'railway:signal:shunting:form', value: 'light' }
 
-  - description: SPAD
+  - description: Shunting limit
     country: GB
-    icon: [ default: 'gb/SPAD' ]
+    icon: [ default: 'gb/limit-shunt' ]
     tags:
-      - { tag: 'railway:signal:main', value: 'GB-NR:SPAD' }
-      - { tag: 'railway:signal:main:form', value: 'light' }
+      - { tag: 'railway:signal:shunting', value: 'GB-NR:limit' }
+      - { tag: 'railway:signal:shunting:form', value: 'light' }
 
   - description: Distant
     country: GB
@@ -6870,6 +6859,31 @@ features:
       - { tag: 'railway:signal:distant', value: 'GB-NR:distant' }
       - { tag: 'railway:signal:distant:form', value: 'sign' }
 
+  - description: Main (light)
+    country: GB
+    icon:
+      - match: 'railway:signal:main:design'
+        cases:
+          - { exact: 'combined', value: 'gb/main-combined-light' }
+        default: 'gb/main-individual-light'
+    tags:
+      - { tag: 'railway:signal:main', value: 'GB-NR:main' }
+      - { tag: 'railway:signal:main:form', value: 'light' }
+
+  - description: Main (semaphore)
+    country: GB
+    icon: [ default: 'gb/main-semaphore' ]
+    tags:
+      - { tag: 'railway:signal:main', value: 'GB-NR:main' }
+      - { tag: 'railway:signal:main:form', value: 'semaphore' }
+
+  - description: SPAD
+    country: GB
+    icon: [ default: 'gb/SPAD' ]
+    tags:
+      - { tag: 'railway:signal:main', value: 'GB-NR:SPAD' }
+      - { tag: 'railway:signal:main:form', value: 'light' }
+
   - description: Repeated (banner)
     country: GB
     icon: [ default: 'gb/repeated-banner' ]
@@ -6891,20 +6905,6 @@ features:
       - { tag: 'railway:signal:route_distant', value: 'GB-NR:PRI' }
       - { tag: 'railway:signal:route_distant:form', value: 'light' }
 
-  - description: Shunting
-    country: GB
-    icon: [ default: 'gb/shunting' ]
-    tags:
-      - { tag: 'railway:signal:shunting', value: 'GB-NR:shunting' }
-      - { tag: 'railway:signal:shunting:form', value: 'light' }
-
-  - description: Shunting limit
-    country: GB
-    icon: [ default: 'gb/limit-shunt' ]
-    tags:
-      - { tag: 'railway:signal:shunting', value: 'GB-NR:limit' }
-      - { tag: 'railway:signal:shunting:form', value: 'light' }
-
   - description: Junction signals (feather & theatre)
     country: GB
     icon: