diff --git a/features/signals_railway_signals.yaml b/features/signals_railway_signals.yaml
index 54a0f699..6ade00f6 100644
--- a/features/signals_railway_signals.yaml
+++ b/features/signals_railway_signals.yaml
@@ -5851,7 +5851,37 @@ features:
       - { tag: 'railway:signal:crossing_hint', value: 'NZ:saltire' }
       - { tag: 'railway:signal:crossing_hint:form', value: 'sign' }
 
+  # crossing_info
+  - description: Alarms Start Here
+    country: NZ
+    icon: [ default: 'nz/alarms_start_here' ]
+    tags:
+      - { tag: 'railway:signal:crossing_info', value: 'NZ:alarms_start_here' }
+      - { tag: 'railway:signal:crossing_info:form', value: 'sign' }
+
+  # crossing
+  - description: Crossing Indicator
+    country: NZ
+    icon: [ default: 'nz/XI' ]
+    tags:
+      - { tag: 'railway:signal:crossing', value: 'NZ:XI' }
+      - { tag: 'railway:signal:crossing:form', value: 'light' }
+
   # stop
+  - description: All Trains Stop
+    country: NZ
+    icon: [ default: 'nz/all_trains_stop' ]
+    tags:
+      - { tag: 'railway:signal:stop', value: 'NZ:all_trains_stop' }
+      - { tag: 'railway:signal:stop:form', value: 'sign' }
+
+  - description: Stop Block Entry
+    country: NZ
+    icon: [ default: 'nz/stop_block_entry' ]
+    tags:
+      - { tag: 'railway:signal:stop', value: 'NZ:stop_block' }
+      - { tag: 'railway:signal:stop:form', value: 'sign' }
+
   - description: Stop Plate
     country: NZ
     icon: [ default: 'nz/stop_plate' ]
@@ -5866,6 +5896,52 @@ features:
       - { tag: 'railway:signal:stop', value: 'NZ:stop_disk' }
       - { tag: 'railway:signal:stop:form', value: 'sign' }
 
+  - description: EMU Stop Position
+    country: NZ
+    exampleIcon: nz/stop_position/6
+    icon:
+      - match: 'railway:signal:stop:states'
+        cases:
+          - { exact: '2', value: 'nz/stop_position/2' }
+        position: bottom
+
+      - match: 'railway:signal:stop:states'
+        cases:
+          - { exact: '3', value: 'nz/stop_position/3' }
+        position: bottom
+
+      - match: 'railway:signal:stop:states'
+        cases:
+          - { exact: '4', value: 'nz/stop_position/4' }
+        position: bottom
+
+      - match: 'railway:signal:stop:states'
+        cases:
+          - { exact: '6', value: 'nz/stop_position/6' }
+        position: bottom
+
+      - match: 'railway:signal:stop:states'
+        cases:
+          - { exact: '8', value: 'nz/stop_position/8' }
+        position: bottom
+    tags:
+      - { tag: 'railway:signal:stop', value: 'NZ:emu_stop' }
+      - { tag: 'railway:signal:stop:form', value: 'sign' }
+
+  # switch
+  - description: Arrow Indicator
+    country: NZ
+    icon:
+      - default: 'nz/AI_unknown'
+      - match: 'railway:signal:switch:states'
+        cases:
+          - { exact: 'left', value: 'nz/AI_L' }
+          - { exact: 'right', value: 'nz/AI_R' }
+          - { all: ['left', 'right'], value: 'nz/AI_LR' }
+    tags:
+      - { tag: 'railway:signal:switch', value: 'NZ:AI' }
+      - { tag: 'railway:signal:switch:form', value: 'light' }
+
   # main_repeated
   - description: Single Banner Indicator
     country: NZ
@@ -5911,6 +5987,78 @@ features:
       - { tag: 'railway:signal:train_protection', value: 'NZ:A' }
       - { tag: 'railway:signal:train_protection:form', value: 'light' }
 
+  - description: Automatic Signaling Begins
+    country: NZ
+    icon: [ default: 'nz/begin_AS' ]
+    tags:
+      - { tag: 'railway:signal:train_protection', value: 'NZ:AS_begins' }
+      - { tag: 'railway:signal:train_protection:form', value: 'sign' }
+
+  - description: Automatic Signaling Ends
+    country: NZ
+    icon: [ default: 'nz/end_AS' ]
+    tags:
+      - { tag: 'railway:signal:train_protection', value: 'NZ:AS_ends' }
+      - { tag: 'railway:signal:train_protection:form', value: 'sign' }
+
+  - description: Centralized Traffic Control Begins
+    country: NZ
+    icon: [ default: 'nz/begin_CTC' ]
+    tags:
+      - { tag: 'railway:signal:train_protection', value: 'NZ:CTC_begins' }
+      - { tag: 'railway:signal:train_protection:form', value: 'sign' }
+
+  - description: Centralized Traffic Control Ends
+    country: NZ
+    icon: [ default: 'nz/end_CTC' ]
+    tags:
+      - { tag: 'railway:signal:train_protection', value: 'NZ:CTC_ends' }
+      - { tag: 'railway:signal:train_protection:form', value: 'sign' }
+
+  - description: Entry to European Train Control System
+    country: NZ
+    icon: [ default: 'nz/begin_ETCS' ]
+    tags:
+      - { tag: 'railway:signal:train_protection', value: 'NZ:ETCS_begins' }
+      - { tag: 'railway:signal:train_protection:form', value: 'sign' }
+
+  - description: Exit from European Train Control System
+    country: NZ
+    icon: [ default: 'nz/end_ETCS' ]
+    tags:
+      - { tag: 'railway:signal:train_protection', value: 'NZ:ETCS_ends' }
+      - { tag: 'railway:signal:train_protection:form', value: 'sign' }
+
+  - description: Track Warrant Control Begins
+    country: NZ
+    icon: [ default: 'nz/begin_TWC' ]
+    tags:
+      - { tag: 'railway:signal:train_protection', value: 'NZ:TWC_begins' }
+      - { tag: 'railway:signal:train_protection:form', value: 'sign' }
+
+  - description: Track Warrant Control Ends
+    country: NZ
+    icon: [ default: 'nz/end_TWC' ]
+    tags:
+      - { tag: 'railway:signal:train_protection', value: 'NZ:TWC_ends' }
+      - { tag: 'railway:signal:train_protection:form', value: 'sign' }
+
+  # electricity
+  - description: Electric Services Limit
+    country: NZ
+    icon: [ default: 'nz/electric_limit' ]
+    tags:
+      - { tag: 'railway:signal:electricity', value: 'NZ:electric_limit' }
+      - { tag: 'railway:signal:electricity:form', value: 'sign' }
+
+  # radio
+  - description: Entering Radio Channel Area
+    country: NZ
+    icon: [ default: 'nz/channel_area' ]
+    tags:
+      - { tag: 'railway:signal:radio', value: 'NZ:channel_area' }
+      - { tag: 'railway:signal:radio:form', value: 'sign' }
+
   # minor
   - description: Restricted-speed Light
     country: NZ
@@ -5926,49 +6074,187 @@ features:
       - { tag: 'railway:signal:minor', value: 'NZ:low_speed' }
       - { tag: 'railway:signal:minor:form', value: 'light' }
 
+  - description: TWC Siding
+    country: NZ
+    icon: [ default: 'nz/TWC_siding' ]
+    tags:
+      - { tag: 'railway:signal:minor', value: 'NZ:TWC_siding' }
+      - { tag: 'railway:signal:minor:form', value: 'sign' }
+
+  - description: TWC Intermediate Board
+    country: NZ
+    icon: [ default: 'nz/TWC_intermediate' ]
+    tags:
+      - { tag: 'railway:signal:minor', value: 'NZ:TWC_intermediate' }
+      - { tag: 'railway:signal:minor:form', value: 'sign' }
+
+  # station_distant
+  - description: TWC (signalled) Station Warning
+    country: NZ
+    icon: [ default: 'nz/TWC_signalled' ]
+    tags:
+      - { tag: 'railway:signal:station_distant', value: 'NZ:TWC_signalled' }
+      - { tag: 'railway:signal:station_distant:form', value: 'sign' }
+
+  - description: TWC (unsignalled) Station Warning
+    country: NZ
+    icon: [ default: 'nz/TWC_unsignalled' ]
+    tags:
+      - { tag: 'railway:signal:station_distant', value: 'NZ:TWC_unsignalled' }
+      - { tag: 'railway:signal:station_distant:form', value: 'sign' }
+
+  # whistle
+  - description: Whistle
+    country: NZ
+    icon: [ default: 'nz/whistle' ]
+    tags:
+      - { tag: 'railway:signal:whistle', value: 'NZ:whistle' }
+      - { tag: 'railway:signal:whistle:form', value: 'sign' }
+
+  # shunting
+  - description: Shunting Limit
+    country: NZ
+    icon: [ default: 'nz/shunting_limit' ]
+    tags:
+      - { tag: 'railway:signal:shunting', value: 'NZ:shunting_limit' }
+      - { tag: 'railway:signal:shunting:form', value: 'sign' }
+
+  - description: Shunt Signal (3-position)
+    country: NZ
+    icon: [ default: 'nz/shunt3' ]
+    tags:
+      - { tag: 'railway:signal:shunting', value: 'NZ:shunt' }
+      - { tag: 'railway:signal:shunting:form', value: 'light' }
+      - { tag: 'railway:signal:shunting:states', value: 'RYG' }
+
+  - description: Shunt Signal (2-position)
+    country: NZ
+    icon: [ default: 'nz/shunt2' ]
+    tags:
+      - { tag: 'railway:signal:shunting', value: 'NZ:shunt' }
+      - { tag: 'railway:signal:shunting:form', value: 'light' }
+      - { tag: 'railway:signal:shunting:states', value: 'RY' }
+
   # main
-  - description: Double multi-unit
+  - description: Double multi-unit (permissive)
+    country: NZ
+    icon: [ default: 'nz/main/MM-staggered' ]
+    tags:
+      - { tag: 'railway:signal:main', value: 'NZ:main_MM' }
+      - { tag: 'railway:signal:main:form', value: 'light' }
+      - { tag: 'railway:signal:main:shape', value: 'staggered' }
+
+  - description: Double multi-unit (absolute)
     country: NZ
-    icon: [ default: 'nz/main_MM' ]
+    icon: [ default: 'nz/main/MM' ]
     tags:
       - { tag: 'railway:signal:main', value: 'NZ:main_MM' }
       - { tag: 'railway:signal:main:form', value: 'light' }
 
-  - description: Multi-unit above Searchlight
+  - description: Multi-unit above Searchlight (permissive)
     country: NZ
-    icon: [ default: 'nz/main_MS' ]
+    icon: [ default: 'nz/main/MS-staggered' ]
     tags:
       - { tag: 'railway:signal:main', value: 'NZ:main_MS' }
       - { tag: 'railway:signal:main:form', value: 'light' }
+      - { tag: 'railway:signal:main:shape', value: 'staggered' }
 
-  - description: Multi-unit with marker disk
+  - description: Multi-unit above Searchlight (absolute)
     country: NZ
-    icon: [ default: 'nz/main_MD' ]
+    icon: [ default: 'nz/main/MS' ]
+    tags:
+      - { tag: 'railway:signal:main', value: 'NZ:main_MS' }
+      - { tag: 'railway:signal:main:form', value: 'light' }
+
+  - description: Multi-unit with marker disk (permissive)
+    country: NZ
+    icon: [ default: 'nz/main/MD-staggered' ]
+    tags:
+      - { tag: 'railway:signal:main', value: 'NZ:main_MD' }
+      - { tag: 'railway:signal:main:form', value: 'light' }
+      - { tag: 'railway:signal:main:shape', value: 'staggered' }
+
+  - description: Multi-unit with marker disk (absolute)
+    country: NZ
+    icon: [ default: 'nz/main/MD' ]
     tags:
       - { tag: 'railway:signal:main', value: 'NZ:main_MD' }
       - { tag: 'railway:signal:main:form', value: 'light' }
 
-  - description: Searchlight above multi-unit
+  - description: Searchlight above multi-unit (permissive)
+    country: NZ
+    icon: [ default: 'nz/main/SM-staggered' ]
+    tags:
+      - { tag: 'railway:signal:main', value: 'NZ:main_SM' }
+      - { tag: 'railway:signal:main:form', value: 'light' }
+      - { tag: 'railway:signal:main:shape', value: 'staggered' }
+
+  - description: Searchlight above multi-unit (absolute)
     country: NZ
-    icon: [ default: 'nz/main_SM' ]
+    icon: [ default: 'nz/main/SM' ]
     tags:
       - { tag: 'railway:signal:main', value: 'NZ:main_SM' }
       - { tag: 'railway:signal:main:form', value: 'light' }
 
-  - description: Double Searchlight
+  - description: Double Searchlight (permissive)
+    country: NZ
+    icon: [ default: 'nz/main/SS-staggered' ]
+    tags:
+      - { tag: 'railway:signal:main', value: 'NZ:main_SS' }
+      - { tag: 'railway:signal:main:form', value: 'light' }
+      - { tag: 'railway:signal:main:shape', value: 'staggered' }
+
+  - description: Double Searchlight (absolute)
     country: NZ
-    icon: [ default: 'nz/main_SS' ]
+    icon: [ default: 'nz/main/SS' ]
     tags:
       - { tag: 'railway:signal:main', value: 'NZ:main_SS' }
       - { tag: 'railway:signal:main:form', value: 'light' }
 
-  - description: Searchlight with marker disk
+  - description: Searchlight with marker disk (permissive)
+    country: NZ
+    icon: [ default: 'nz/main/SD-staggered' ]
+    tags:
+      - { tag: 'railway:signal:main', value: 'NZ:main_SD' }
+      - { tag: 'railway:signal:main:form', value: 'light' }
+      - { tag: 'railway:signal:main:shape', value: 'staggered' }
+
+  - description: Searchlight with marker disk (absolute)
     country: NZ
-    icon: [ default: 'nz/main_SD' ]
+    icon: [ default: 'nz/main/SD' ]
     tags:
       - { tag: 'railway:signal:main', value: 'NZ:main_SD' }
       - { tag: 'railway:signal:main:form', value: 'light' }
 
+  - description: 2-position main signal
+    country: NZ
+    icon: [ default: 'nz/main/M' ]
+    tags:
+      - { tag: 'railway:signal:main', value: 'NZ:M' }
+      - { tag: 'railway:signal:main:form', value: 'light' }
+
+  - description: Semaphore main signal
+    country: NZ
+    icon: [ default: 'nz/main/semaphore' ]
+    tags:
+      - { tag: 'railway:signal:main', value: 'NZ:M' }
+      - { tag: 'railway:signal:main:form', value: 'semaphore' }
+
+  # distant
+  - description: 2-position distant signal
+    country: NZ
+    icon: [ default: 'nz/distant/M' ]
+    tags:
+      - { tag: 'railway:signal:distant', value: 'NZ:M' }
+      - { tag: 'railway:signal:distant:form', value: 'light' }
+
+  - description: Semaphore distant signal
+    country: NZ
+    icon: [ default: 'nz/distant/semaphore' ]
+    tags:
+      - { tag: 'railway:signal:distant', value: 'NZ:M' }
+      - { tag: 'railway:signal:distant:form', value: 'semaphore' }
+
   # speed
   - description: Dynamic Speed Indicator
     country: NZ
diff --git a/symbols/nz/A.svg b/symbols/nz/A.svg
index 0d27f77a..90ef66f5 100644
--- a/symbols/nz/A.svg
+++ b/symbols/nz/A.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 10" width="10" height="10">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 10" width="12" height="12">
   <path d="M 5 1 L 9 9 L 1 9 Z" fill="#ccc" stroke="#999" stroke-width="0.5px"/>
   <circle cx="5" cy="6.5" r="2.4" fill="#111"/>
   <path fill="#fff" d="M 4.4187 4.7102 L 3.275 7.7758 L 3.9734 7.7758 L 4.3297 6.925 L 5.6703 6.925 L 6.0266 7.7758 L 6.725 7.7758 L 5.5813 4.7102 Z M 5 5.3336 L 5.375 6.2289 L 4.625 6.2289 Z M 5 5.3336"/>
diff --git a/symbols/nz/AI_L.svg b/symbols/nz/AI_L.svg
new file mode 100644
index 00000000..e7f1fc33
--- /dev/null
+++ b/symbols/nz/AI_L.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 6 8" width="10" height="13.33">
+  <path fill="#000" stroke="#999" stroke-width=".2"  d="M 0.1 7.9 V 1.1 C 0.1 1.1 0.1 0.1 1.1 0.1 H 5.1 C 4.9 0.1 5.9 0.1 5.9 1.1 V 7.9 Z" />
+  <path fill="#fff" d="M 3.6912 6.7855 L 0.9057 7.2766 L 0.4145 4.4912 L 1.4385 5.2081 L 4.3064 1.1124 L 5.5351 1.9727 L 2.6672 6.0685 Z" />
+</svg>
diff --git a/symbols/nz/AI_LR.svg b/symbols/nz/AI_LR.svg
new file mode 100644
index 00000000..390cf85b
--- /dev/null
+++ b/symbols/nz/AI_LR.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 11 8" width="11" height="8">
+  <path fill="#000" stroke="#999" stroke-width=".2"  d="M 0.1 7.9 V 1.1 C 0.1 1.1 0.1 0.1 1.1 0.1 H 10.1 C 9.9 0.1 10.9 0.1 10.9 1.1 V 7.9 Z" />
+  <path fill="#fff" d="M 3.5912 6.7855 L 0.8057 7.2766 L 0.3145 4.4912 L 1.3385 5.2081 L 4.2064 1.1124 L 5.4351 1.9727 L 2.5672 6.0685 Z" />
+  <path fill="#fff" d="M 10.6854 4.4911 L 10.1943 7.2766 L 7.4089 6.7854 L 8.4328 6.0684 L 5.5649 1.9727 L 6.7936 1.1123 L 9.6615 5.2081 Z" />
+</svg>
diff --git a/symbols/nz/AI_R.svg b/symbols/nz/AI_R.svg
new file mode 100644
index 00000000..97436ad2
--- /dev/null
+++ b/symbols/nz/AI_R.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 6 8" width="10" height="13.33">
+  <path fill="#000" stroke="#999" stroke-width=".2"  d="M 0.1 7.9 V 1.1 C 0.1 1.1 0.1 0.1 1.1 0.1 H 5.1 C 4.9 0.1 5.9 0.1 5.9 1.1 V 7.9 Z" />
+  <path fill="#fff" d="M 5.5854 4.4911 L 5.0943 7.2766 L 2.3089 6.7854 L 3.3328 6.0684 L 0.4649 1.9727 L 1.6936 1.1123 L 4.5615 5.2081 Z" />
+</svg>
diff --git a/symbols/nz/AI_unknown.svg b/symbols/nz/AI_unknown.svg
new file mode 100644
index 00000000..4c09f538
--- /dev/null
+++ b/symbols/nz/AI_unknown.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 6 8" width="6" height="8">
+  <path fill="#000" stroke="#999" stroke-width=".2"  d="M 0.1 7.9 V 1.1 C 0.1 1.1 0.1 0.1 1.1 0.1 H 5.1 C 4.9 0.1 5.9 0.1 5.9 1.1 V 7.9 Z" />
+</svg>
diff --git a/symbols/nz/TWC_intermediate.svg b/symbols/nz/TWC_intermediate.svg
new file mode 100644
index 00000000..2fbc125f
--- /dev/null
+++ b/symbols/nz/TWC_intermediate.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <rect fill="#eee" stroke="#333" stroke-width=".2" width="14.8" height="14.8" ry="1" x=".1" y=".1"/>
+  <path d="M 5.3975 1.0775 L 6.13 6.41 L 7.06 6.41 L 7.5075 3.53 L 7.5475 3.26 L 7.5875 3.53 L 8.0525 6.41 L 8.9825 6.41 L 9.7225 1.0775 L 8.7775 1.0775 L 8.415 4.065 L 8.39 4.2875 L 8.355 4.07 L 7.91 1.0775 L 7.1725 1.0775 L 6.7525 4.0475 L 6.72 4.2675 L 6.6925 4.0575 L 6.3375 1.0775 L 5.3975 1.0775 Z M 13.985 4.74 L 12.955 4.74 Q 12.9425 4.945 12.8925 5.1 A 0.9875 0.9875 90 0 1 12.875 5.1525 A 0.87 0.87 90 0 1 12.7975 5.31 A 0.6875 0.6875 90 0 1 12.695 5.435 A 0.6825 0.6825 90 0 1 12.445 5.5875 A 0.8 0.8 90 0 1 12.42 5.595 A 1.0675 1.0675 90 0 1 12.22 5.6375 A 1.3975 1.3975 90 0 1 12.0575 5.6475 Q 11.9075 5.6475 11.785 5.6125 A 0.68 0.68 90 0 1 11.565 5.505 A 0.7075 0.7075 90 0 1 11.425 5.37 A 0.8125 0.8125 90 0 1 11.4 5.34 A 0.995 0.995 90 0 1 11.3125 5.1925 A 1.205 1.205 90 0 1 11.2775 5.1125 A 1.6125 1.6125 90 0 1 11.215 4.9125 Q 11.1925 4.815 11.175 4.7075 A 2.675 2.675 90 0 1 11.17 4.675 Q 11.135 4.425 11.135 4.105 L 11.135 3.38 A 4.415 4.415 90 0 1 11.145 3.1025 A 3.595 3.595 90 0 1 11.1575 2.9425 A 2.5075 2.5075 90 0 1 11.19 2.725 A 1.985 1.985 90 0 1 11.2275 2.57 A 1.59 1.59 90 0 1 11.31 2.345 A 1.27 1.27 90 0 1 11.395 2.1925 Q 11.4975 2.03 11.6475 1.94 A 0.72 0.72 90 0 1 11.8375 1.865 A 0.83 0.83 90 0 1 11.84 1.865 Q 11.945 1.8375 12.065 1.8375 Q 12.26 1.8375 12.405 1.8825 A 0.805 0.805 90 0 1 12.455 1.9 A 0.7325 0.7325 90 0 1 12.65 2.005 A 0.6625 0.6625 90 0 1 12.7275 2.0775 A 0.7575 0.7575 90 0 1 12.845 2.255 A 0.9775 0.9775 90 0 1 12.8925 2.3775 Q 12.945 2.545 12.96 2.765 A 2.435 2.435 90 0 1 12.9625 2.795 L 13.9875 2.795 A 2.78 2.78 90 0 0 13.915 2.3575 A 2.2225 2.2225 90 0 0 13.8125 2.0425 Q 13.6725 1.71 13.4325 1.48 A 1.6125 1.6125 90 0 0 12.955 1.1675 A 1.905 1.905 90 0 0 12.8475 1.125 A 2.015 2.015 90 0 0 12.4325 1.025 A 2.6925 2.6925 90 0 0 12.065 1 A 2.075 2.075 90 0 0 11.675 1.035 A 1.8025 1.8025 90 0 0 11.51 1.075 Q 11.2525 1.15 11.0375 1.29 Q 10.795 1.455 10.605 1.6925 A 2.01 2.01 90 0 0 10.32 2.1775 A 2.275 2.275 90 0 0 10.2975 2.235 A 2.5075 2.5075 90 0 0 10.1725 2.6325 A 2.905 2.905 90 0 0 10.1425 2.775 A 3.4425 3.4425 90 0 0 10.095 3.2575 A 3.935 3.935 90 0 0 10.0925 3.3875 L 10.0925 4.105 A 3.7375 3.7375 90 0 0 10.12 4.5825 A 3.2475 3.2475 90 0 0 10.1475 4.7575 A 2.995 2.995 90 0 0 10.24 5.1225 A 2.505 2.505 90 0 0 10.3125 5.3225 Q 10.4225 5.5775 10.58 5.79 Q 10.74 6.0025 10.945 6.1525 A 1.7025 1.7025 90 0 0 11.415 6.3875 A 1.925 1.925 90 0 0 11.4475 6.4 A 1.96 1.96 90 0 0 11.8675 6.4775 A 2.365 2.365 90 0 0 12.0575 6.485 A 2.4725 2.4725 90 0 0 12.505 6.4475 A 2.025 2.025 90 0 0 12.82 6.3625 A 1.7975 1.7975 90 0 0 13.2575 6.14 A 1.6175 1.6175 90 0 0 13.4125 6.0125 Q 13.6625 5.7875 13.81 5.465 A 1.9075 1.9075 90 0 0 13.9575 4.9825 A 2.355 2.355 90 0 0 13.985 4.74 Z M 3.555 1.915 L 5.2 1.915 L 5.2 1.0775 L 0.9 1.0775 L 0.9 1.915 L 2.5225 1.915 L 2.5225 6.41 L 3.555 6.41 L 3.555 1.915 Z" />
+  <path d="M 9.522 11.102 L 9.118 9.5 L 8.094 9.5 L 8.094 13.766 L 8.85 13.766 L 8.85 12.502 L 8.816 10.586 L 9.316 12.36 L 9.724 12.36 L 10.284 10.508 L 10.248 12.502 L 10.248 13.766 L 11.004 13.766 L 11.004 9.5 L 9.982 9.5 L 9.522 11.102 Z M 5.326 12.508 L 5.778 12.014 L 6.832 13.766 L 7.81 13.766 L 6.322 11.386 L 7.758 9.5 L 6.75 9.5 L 5.712 10.932 L 5.326 11.454 L 5.326 9.5 L 4.5 9.5 L 4.5 13.766 L 5.326 13.766 L 5.326 12.508 Z" />
+</svg>
diff --git a/symbols/nz/TWC_siding.svg b/symbols/nz/TWC_siding.svg
new file mode 100644
index 00000000..4d26bc75
--- /dev/null
+++ b/symbols/nz/TWC_siding.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 203 203" width="15" height="15">
+  <rect x="1.5" y="1.5" width="200" height="200" fill="#eee" stroke="#333" stroke-width="3px" ry="5px" />
+  <path fill="none" stroke="#000" stroke-width="15px" d="M 57.5 29.5 V 109.5 L 107.5 179.5 M 137.5 179.5 V 29.5" />
+</svg>
diff --git a/symbols/nz/TWC_signalled.svg b/symbols/nz/TWC_signalled.svg
new file mode 100644
index 00000000..ecf01c63
--- /dev/null
+++ b/symbols/nz/TWC_signalled.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 171 129" width="17.1" height="12.9">
+  <path fill="#f90" d="M 0 72 L 47 0 H 120 L 171 72 V 129 H 0 Z" />
+  <path fill="#fc0" d="M 18 113 V 77 L 61 14 H 109 L 152 77 V 113 Z M 18 77" />
+  <path fill="none" stroke="#000" stroke-width="5" d="M 61 105 V 23 H 109 V 105 Z" />
+  <circle cx="85" cy="45" r="17" />
+  <circle cx="85" cy="82" r="17" />
+</svg>
diff --git a/symbols/nz/TWC_unsignalled.svg b/symbols/nz/TWC_unsignalled.svg
new file mode 100644
index 00000000..e4962143
--- /dev/null
+++ b/symbols/nz/TWC_unsignalled.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 171 129" width="17.1" height="12.9">
+  <path fill="#f90" d="M 0 72 L 47 0 H 120 L 171 72 V 129 H 0 Z" />
+  <path fill="#fc0" d="M 18 113 V 77 L 61 14 H 109 L 152 77 V 113 Z M 18 77" />
+  <path fill="none" stroke="#000" stroke-width="15px" d="M 65 27 V 67 L 90 102 M 105 102 V 27" />
+</svg>
diff --git a/symbols/nz/XI.svg b/symbols/nz/XI.svg
new file mode 100644
index 00000000..97afae75
--- /dev/null
+++ b/symbols/nz/XI.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 4 8" width="10" height="20">
+  <rect width="4" height="8" ry="0.5" fill="#000"/>
+  <circle fill="#777" cx="2" cy="2" r="1.5" />
+  <circle fill="#333" cx="2" cy="6" r="1.5" />
+  <path fill="#fff" d="M 1.016 5.096 V 5.52 H 1.76 V 7.12 H 2.24 V 5.52 H 2.96 V 5.096 Z"/>
+</svg>
+
diff --git a/symbols/nz/alarms_start_here.svg b/symbols/nz/alarms_start_here.svg
new file mode 100644
index 00000000..59d450cb
--- /dev/null
+++ b/symbols/nz/alarms_start_here.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 19 6" width="28.5" height="9">
+  <rect fill="#fff" stroke="#000" stroke-width=".2" width="18.8" height="5.8" ry="0.5" x=".1" y=".1"/>
+  <path d="M12.16 1.331 11.957.529 11.446.529 11.446 2.662 11.824 2.662 11.824 2.031 11.807 1.073 12.057 1.959 12.261 1.959 12.54 1.033 12.523 2.031 12.523 2.662 12.901 2.662 12.901.529 12.39.529 12.16 1.331ZM13.595 2 13.191 2A.725.725 0 0013.205 2.146.548.548 0 0013.255 2.289Q13.318 2.412 13.428 2.502 13.544 2.595 13.7 2.642 13.856 2.69 14.016 2.69 14.178 2.69 14.316 2.651A.765.765 0 0014.459 2.596.628.628 0 0014.553 2.536.533.533 0 0014.709 2.352.504.504 0 0014.761 2.183.638.638 0 0014.766 2.103.601.601 0 0014.744 1.941.506.506 0 0014.691 1.815.745.745 0 0014.523 1.623.867.867 0 0014.49 1.597 1.116 1.116 0 0014.335 1.509 1.254 1.254 0 0014.307 1.496Q14.207 1.452 14.098 1.421A2.003 2.003 0 0114 1.392 1.496 1.496 0 0113.914 1.361Q13.832 1.329 13.775 1.29A.339.339 0 0113.728 1.252.253.253 0 0113.688 1.203.201.201 0 0113.658 1.097.243.243 0 0113.658 1.095.252.252 0 0113.675 1.001.242.242 0 0113.681.989.244.244 0 0113.745.905.278.278 0 0113.747.903.292.292 0 0113.807.867.382.382 0 0113.855.848.425.425 0 0113.928.832.583.583 0 0114.001.828.56.56 0 0114.075.833Q14.119.839 14.157.852A.354.354 0 0114.225.885.291.291 0 0114.269.919.29.29 0 0114.336 1.023.399.399 0 0114.358 1.115.479.479 0 0114.361 1.155L14.763 1.155A.645.645 0 0014.737.969.582.582 0 0014.707.891Q14.651.771 14.552.683A.693.693 0 0014.38.575.831.831 0 0014.314.548.865.865 0 0014.112.505 1.066 1.066 0 0014.008.5 1.095 1.095 0 0013.816.516.928.928 0 0013.709.542.8.8 0 0013.559.604.669.669 0 0013.471.661.56.56 0 0013.312.849Q13.255.959 13.255 1.093A.557.557 0 0013.278 1.253.507.507 0 0013.298 1.31.552.552 0 0013.401 1.466.647.647 0 0013.427 1.492Q13.506 1.568 13.628 1.634A1.299 1.299 0 0013.646 1.643 1.398 1.398 0 0013.8 1.71 1.884 1.884 0 0013.957 1.76Q14.071 1.791 14.148 1.826A.675.675 0 0114.206 1.857Q14.235 1.874 14.258 1.892A.369.369 0 0114.273 1.905.307.307 0 0114.311 1.947.231.231 0 0114.34 1.999.285.285 0 0114.36 2.098.326.326 0 0114.36 2.105.243.243 0 0114.349 2.18.222.222 0 0114.336 2.21Q14.313 2.258 14.269 2.292A.295.295 0 0114.212 2.326.392.392 0 0114.161 2.344.439.439 0 0114.089 2.359.604.604 0 0114.016 2.363Q13.923 2.363 13.846 2.343A.383.383 0 0113.769 2.313.314.314 0 0113.715 2.278.291.291 0 0113.633 2.174.341.341 0 0113.629 2.166Q13.6 2.102 13.596 2.014A.633.633 0 0113.595 2ZM10.063 1.865 10.375 1.865 10.777 2.662 11.218 2.662 11.218 2.643 10.759 1.763A.824.824 0 0010.89 1.689.742.742 0 0010.918 1.669Q10.989 1.615 11.04 1.542A.551.551 0 0011.106 1.412.642.642 0 0011.117 1.378Q11.144 1.287 11.144 1.172A.775.775 0 0011.132 1.032.585.585 0 0011.09.894Q11.035.774 10.933.693A.671.671 0 0010.777.603.838.838 0 0010.687.571 1.026 1.026 0 0010.515.537 1.331 1.331 0 0010.367.529L9.652.529 9.652 2.662 10.063 2.662 10.063 1.865ZM4.66 2.217 5.3 2.217 5.424 2.662 5.858 2.662 5.172.529 4.799.529 4.1 2.662 4.534 2.662 4.66 2.217ZM8.26 2.217 8.9 2.217 9.025 2.662 9.458 2.662 8.773.529 8.399.529 7.701 2.662 8.134 2.662 8.26 2.217ZM7.491 2.33 6.492 2.33 6.492.529 6.079.529 6.079 2.662 7.491 2.662 7.491 2.33ZM10.368 1.531 10.063 1.531 10.063.863 10.367.863A.602.602 0 0110.442.868.439.439 0 0110.517.884.357.357 0 0110.581.91.283.283 0 0110.629.942Q10.68.985 10.706 1.05A.36.36 0 0110.726 1.13.485.485 0 0110.731 1.2.432.432 0 0110.725 1.273.344.344 0 0110.712 1.328.283.283 0 0110.674 1.401.257.257 0 0110.654 1.426.275.275 0 0110.571 1.489.344.344 0 0110.536 1.504.413.413 0 0110.452 1.525.568.568 0 0110.368 1.531ZM5.203 1.867 4.761 1.867 4.985 1.082 5.203 1.867ZM8.804 1.867 8.361 1.867 8.585 1.082 8.804 1.867Z" />
+  <path d="M13.7 4.228 14.576 4.228 14.576 3.902 13.7 3.902 13.7 3.365 14.72 3.365 14.72 3.029 13.287 3.029 13.287 5.162 14.724 5.162 14.724 4.83 13.7 4.83 13.7 4.228ZM17.301 4.228 18.177 4.228 18.177 3.902 17.301 3.902 17.301 3.365 18.32 3.365 18.32 3.029 16.888 3.029 16.888 5.162 18.325 5.162 18.325 4.83 17.301 4.83 17.301 4.228ZM12.464 5.162 12.871 5.162 12.871 3.029 12.464 3.029 12.464 3.904 11.86 3.904 11.86 3.029 11.452 3.029 11.452 5.162 11.86 5.162 11.86 4.238 12.464 4.238 12.464 5.162ZM1.004 4.5.6 4.5A.725.725 0 00.614 4.646.548.548 0 00.664 4.789Q.727 4.912.837 5.002.953 5.095 1.109 5.142 1.265 5.19 1.425 5.19 1.587 5.19 1.725 5.151A.765.765 0 001.868 5.096.628.628 0 001.962 5.036.533.533 0 002.118 4.852.504.504 0 002.17 4.683.638.638 0 002.175 4.603.601.601 0 002.154 4.441.506.506 0 002.1 4.315.745.745 0 001.932 4.123.867.867 0 001.899 4.097 1.116 1.116 0 001.744 4.009 1.254 1.254 0 001.716 3.996Q1.617 3.952 1.507 3.921A2.003 2.003 0 011.41 3.892 1.496 1.496 0 011.323 3.861Q1.242 3.829 1.184 3.79A.339.339 0 011.137 3.752.253.253 0 011.097 3.703.201.201 0 011.067 3.597.243.243 0 011.067 3.595.252.252 0 011.085 3.501.242.242 0 011.09 3.489.244.244 0 011.154 3.405.278.278 0 011.157 3.403.292.292 0 011.216 3.367.382.382 0 011.264 3.348.425.425 0 011.337 3.332.583.583 0 011.41 3.328.56.56 0 011.484 3.333Q1.529 3.339 1.566 3.352A.354.354 0 011.634 3.385.291.291 0 011.678 3.419.29.29 0 011.745 3.523.399.399 0 011.767 3.615.479.479 0 011.77 3.655L2.172 3.655A.645.645 0 002.146 3.469.582.582 0 002.116 3.391Q2.06 3.271 1.961 3.183A.693.693 0 001.79 3.075.831.831 0 001.723 3.048.865.865 0 001.521 3.005 1.066 1.066 0 001.417 3 1.095 1.095 0 001.225 3.016.928.928 0 001.119 3.042.8.8 0 00.968 3.104.669.669 0 00.88 3.161.56.56 0 00.722 3.349Q.664 3.459.664 3.593A.557.557 0 00.687 3.753.507.507 0 00.708 3.81.552.552 0 00.81 3.966.647.647 0 00.836 3.992Q.915 4.068 1.038 4.134A1.299 1.299 0 001.055 4.143 1.398 1.398 0 001.209 4.21 1.884 1.884 0 001.366 4.26Q1.48 4.291 1.557 4.326A.675.675 0 011.615 4.357Q1.644 4.374 1.668 4.392A.369.369 0 011.683 4.405.307.307 0 011.721 4.447.231.231 0 011.749 4.499.285.285 0 011.769 4.598.326.326 0 011.769 4.605.243.243 0 011.758 4.68.222.222 0 011.746 4.71Q1.722 4.758 1.678 4.792A.295.295 0 011.621 4.826.392.392 0 011.57 4.844.439.439 0 011.498 4.859.604.604 0 011.425 4.863Q1.332 4.863 1.256 4.843A.383.383 0 011.178 4.813.314.314 0 011.124 4.778.291.291 0 011.042 4.674.341.341 0 011.038 4.666Q1.009 4.602 1.005 4.514A.633.633 0 011.004 4.5ZM6.474 4.365 6.786 4.365 7.187 5.162 7.628 5.162 7.628 5.143 7.17 4.263A.824.824 0 007.301 4.189.742.742 0 007.329 4.169Q7.4 4.115 7.451 4.042A.551.551 0 007.517 3.912.642.642 0 007.528 3.878Q7.555 3.787 7.555 3.672A.775.775 0 007.543 3.532.585.585 0 007.5 3.394Q7.445 3.274 7.344 3.193A.671.671 0 007.188 3.103.838.838 0 007.098 3.071 1.026 1.026 0 006.926 3.037 1.331 1.331 0 006.777 3.029L6.062 3.029 6.062 5.162 6.474 5.162 6.474 4.365ZM15.475 4.365 15.788 4.365 16.189 5.162 16.63 5.162 16.63 5.143 16.171 4.263A.824.824 0 0016.302 4.189.742.742 0 0016.33 4.169Q16.401 4.115 16.453 4.042A.551.551 0 0016.518 3.912.642.642 0 0016.529 3.878Q16.557 3.787 16.557 3.672A.775.775 0 0016.544 3.532.585.585 0 0016.502 3.394Q16.447 3.274 16.346 3.193A.671.671 0 0016.189 3.103.838.838 0 0016.1 3.071 1.026 1.026 0 0015.927 3.037 1.331 1.331 0 0015.779 3.029L15.064 3.029 15.064 5.162 15.475 5.162 15.475 4.365ZM3.371 3.365 4.029 3.365 4.029 3.029 2.309 3.029 2.309 3.365 2.958 3.365 2.958 5.162 3.371 5.162 3.371 3.365ZM8.772 3.365 9.43 3.365 9.43 3.029 7.71 3.029 7.71 3.365 8.359 3.365 8.359 5.162 8.772 5.162 8.772 3.365ZM4.671 4.717 5.311 4.717 5.435 5.162 5.869 5.162 5.184 3.029 4.81 3.029 4.111 5.162 4.545 5.162 4.671 4.717ZM6.779 4.031 6.474 4.031 6.474 3.363 6.777 3.363A.602.602 0 016.853 3.368.439.439 0 016.928 3.384.357.357 0 016.992 3.41.283.283 0 017.039 3.442Q7.091 3.485 7.116 3.55A.36.36 0 017.137 3.63.485.485 0 017.142 3.7.432.432 0 017.136 3.773.344.344 0 017.122 3.828.283.283 0 017.085 3.901.257.257 0 017.064 3.926.275.275 0 016.982 3.989.344.344 0 016.946 4.004.413.413 0 016.863 4.025.568.568 0 016.779 4.031ZM15.78 4.031 15.475 4.031 15.475 3.363 15.779 3.363A.602.602 0 0115.854 3.368.439.439 0 0115.93 3.384.357.357 0 0115.993 3.41.283.283 0 0116.041 3.442Q16.092 3.485 16.118 3.55A.36.36 0 0116.139 3.63.485.485 0 0116.143 3.7.432.432 0 0116.138 3.773.344.344 0 0116.124 3.828.283.283 0 0116.086 3.901.257.257 0 0116.066 3.926.275.275 0 0115.983 3.989.344.344 0 0115.948 4.004.413.413 0 0115.864 4.025.568.568 0 0115.78 4.031ZM5.214 4.367 4.772 4.367 4.996 3.582 5.214 4.367Z" />
+</svg>
diff --git a/symbols/nz/all_trains_stop.svg b/symbols/nz/all_trains_stop.svg
new file mode 100644
index 00000000..f84eb705
--- /dev/null
+++ b/symbols/nz/all_trains_stop.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 500 500" width="17" height="17">
+  <rect x="10" y="10" width="480" height="480" fill="#ddd" stroke="red" stroke-width="15px" rx="60"/>
+  <path d="M 148 109.4 L 180 109.4 L 186.2 131.65 L 207.9 131.65 L 173.6 25 L 154.95 25 L 120 131.65 L 141.7 131.65 L 148 109.4 Z M 289.55 115 L 239.6 115 L 239.6 25 L 218.95 25 L 218.95 131.65 L 289.55 131.65 L 289.55 115 Z M 379.55 115 L 329.6 115 L 329.6 25 L 308.95 25 L 308.95 131.65 L 379.55 131.65 L 379.55 115 Z M 175.15 91.85 L 153.05 91.85 L 164.25 52.6 L 175.15 91.85 Z" />
+  <circle r="90" cx="250" cy="250" fill="red" stroke="#fff" stroke-width="3"/>
+  <path d="M 100.2 440 L 80 440 A 36.25 36.25 90 0 0 80.7 447.3 A 27.4 27.4 90 0 0 83.2 454.45 Q 86.35 460.6 91.85 465.1 Q 97.65 469.75 105.45 472.1 Q 113.25 474.5 121.25 474.5 Q 129.35 474.5 136.25 472.55 A 38.25 38.25 90 0 0 143.4 469.8 A 31.4 31.4 90 0 0 148.1 466.8 A 26.65 26.65 90 0 0 155.9 457.6 A 25.2 25.2 90 0 0 158.5 449.15 A 31.9 31.9 90 0 0 158.75 445.15 A 30.05 30.05 90 0 0 157.7 437.05 A 25.3 25.3 90 0 0 155 430.75 A 37.25 37.25 90 0 0 146.6 421.15 A 43.35 43.35 90 0 0 144.95 419.85 A 55.8 55.8 90 0 0 137.2 415.45 A 62.7 62.7 90 0 0 135.8 414.8 Q 130.85 412.6 125.35 411.05 A 100.15 100.15 90 0 1 120.5 409.6 A 74.8 74.8 90 0 1 116.15 408.05 Q 112.1 406.45 109.2 404.5 A 16.95 16.95 90 0 1 106.85 402.6 A 12.65 12.65 90 0 1 104.85 400.15 A 10.05 10.05 90 0 1 103.35 394.85 A 12.15 12.15 90 0 1 103.35 394.75 A 12.6 12.6 90 0 1 104.25 390.05 A 12.1 12.1 90 0 1 104.5 389.45 A 12.2 12.2 90 0 1 107.7 385.25 A 13.9 13.9 90 0 1 107.85 385.15 A 14.6 14.6 90 0 1 110.8 383.35 A 19.1 19.1 90 0 1 113.2 382.4 A 21.25 21.25 90 0 1 116.85 381.6 A 29.15 29.15 90 0 1 120.5 381.4 A 28 28 90 0 1 124.2 381.65 Q 126.45 381.95 128.3 382.6 A 17.7 17.7 90 0 1 131.7 384.25 A 14.55 14.55 90 0 1 133.9 385.95 A 14.5 14.5 90 0 1 137.25 391.15 A 19.95 19.95 90 0 1 138.35 395.75 A 23.95 23.95 90 0 1 138.5 397.75 L 158.6 397.75 A 32.25 32.25 90 0 0 157.3 388.45 A 29.1 29.1 90 0 0 155.8 384.55 Q 153 378.55 148.05 374.15 A 34.65 34.65 90 0 0 139.5 368.75 A 41.55 41.55 90 0 0 136.15 367.4 A 43.25 43.25 90 0 0 126.05 365.25 A 53.3 53.3 90 0 0 120.85 365 A 54.75 54.75 90 0 0 111.25 365.8 A 46.4 46.4 90 0 0 105.95 367.1 A 40 40 90 0 0 98.4 370.2 A 33.45 33.45 90 0 0 94 373.05 A 28 28 90 0 0 86.1 382.45 Q 83.2 387.95 83.2 394.65 A 27.85 27.85 90 0 0 84.35 402.65 A 25.35 25.35 90 0 0 85.4 405.5 A 27.6 27.6 90 0 0 90.5 413.3 A 32.35 32.35 90 0 0 91.8 414.6 Q 95.75 418.4 101.9 421.7 A 64.95 64.95 90 0 0 102.75 422.15 A 69.9 69.9 90 0 0 110.45 425.5 A 94.2 94.2 90 0 0 118.3 428 Q 124 429.55 127.85 431.3 A 33.75 33.75 90 0 1 130.75 432.85 Q 132.2 433.7 133.4 434.6 A 18.45 18.45 90 0 1 134.15 435.25 A 15.35 15.35 90 0 1 136.05 437.35 A 11.55 11.55 90 0 1 137.45 439.95 A 14.25 14.25 90 0 1 138.45 444.9 A 16.3 16.3 90 0 1 138.45 445.25 A 12.15 12.15 90 0 1 137.9 449 A 11.1 11.1 90 0 1 137.3 450.5 Q 136.1 452.9 133.9 454.6 A 14.75 14.75 90 0 1 131.05 456.3 A 19.6 19.6 90 0 1 128.5 457.2 A 21.95 21.95 90 0 1 124.9 457.95 A 30.2 30.2 90 0 1 121.25 458.15 Q 116.6 458.15 112.8 457.15 A 19.15 19.15 90 0 1 108.9 455.65 A 15.7 15.7 90 0 1 106.2 453.9 A 14.55 14.55 90 0 1 102.1 448.7 A 17.05 17.05 90 0 1 101.9 448.3 Q 100.45 445.1 100.25 440.7 A 31.65 31.65 90 0 1 100.2 440 Z M 218.55 383.25 L 251.45 383.25 L 251.45 366.45 L 165.45 366.45 L 165.45 383.25 L 197.9 383.25 L 197.9 473.1 L 218.55 473.1 L 218.55 383.25 Z M 375 473.1 L 375 434 L 390.9 434 A 52.65 52.65 90 0 0 399.7 433.3 A 41.6 41.6 90 0 0 406.65 431.5 A 38 38 90 0 0 414.45 427.75 A 32.45 32.45 90 0 0 418.65 424.55 A 30.25 30.25 90 0 0 426.25 414.05 Q 428.95 408 428.95 400.8 A 38.3 38.3 90 0 0 428 392.25 A 32.3 32.3 90 0 0 426.25 386.85 A 31.2 31.2 90 0 0 418.65 376 A 34.45 34.45 90 0 0 410.05 370.4 A 41.65 41.65 90 0 0 406.65 369 A 42.45 42.45 90 0 0 397.2 366.8 A 54.1 54.1 90 0 0 390.9 366.45 L 354.45 366.45 L 354.45 473.1 L 375 473.1 Z M 337.5 427.6 L 337.5 412.1 A 69.25 69.25 90 0 0 336.8 402.1 A 60.2 60.2 90 0 0 336.15 398.4 Q 334.8 391.95 332.25 386.55 A 44.65 44.65 90 0 0 326.65 377.8 A 32.7 32.7 90 0 0 319.05 371.1 Q 314.75 368.15 309.35 366.6 A 39.65 39.65 90 0 0 300.5 365.1 A 46.2 46.2 90 0 0 297.8 365 A 42.3 42.3 90 0 0 290.55 365.6 A 35.8 35.8 90 0 0 286.55 366.55 A 33.75 33.75 90 0 0 278.75 369.9 A 30.9 30.9 90 0 0 277.15 370.95 Q 272.9 373.85 269.65 377.95 A 42.75 42.75 90 0 0 264.25 386.8 A 46.7 46.7 90 0 0 264.15 387.1 A 52.6 52.6 90 0 0 261.25 395.7 A 61 61 90 0 0 260.6 398.75 A 68.25 68.25 90 0 0 259.45 408.65 A 78.7 78.7 90 0 0 259.35 412.1 L 259.35 427.6 A 73.45 73.45 90 0 0 259.95 437.15 A 64.4 64.4 90 0 0 260.45 440.15 A 57.5 57.5 90 0 0 262.35 447.9 A 49.65 49.65 90 0 0 263.55 451.15 A 43.7 43.7 90 0 0 267.75 459 A 39.4 39.4 90 0 0 269.2 461 A 37.2 37.2 90 0 0 276.8 468.4 A 35.4 35.4 90 0 0 286.25 472.9 A 39.4 39.4 90 0 0 286.4 472.95 A 37 37 90 0 0 294.1 474.4 A 44.85 44.85 90 0 0 297.9 474.55 A 42.55 42.55 90 0 0 305.4 473.95 A 36.65 36.65 90 0 0 308.85 473.15 A 38.1 38.1 90 0 0 317.1 469.75 A 35.2 35.2 90 0 0 318.2 469.15 Q 322.85 466.2 326.55 461.85 A 45.15 45.15 90 0 0 332.7 452.15 A 53.1 53.1 90 0 0 335.7 443.35 A 61.2 61.2 90 0 0 336.25 440.7 A 64.45 64.45 90 0 0 337.45 430.4 A 73.85 73.85 90 0 0 337.5 427.6 Z M 316.65 411.95 L 316.65 427.6 A 70.7 70.7 90 0 1 316.35 434.2 A 63.55 63.55 90 0 1 316.25 435.25 A 51.65 51.65 90 0 1 315.65 439.15 A 41.4 41.4 90 0 1 315.05 442 A 33.2 33.2 90 0 1 313.65 446.15 A 26.95 26.95 90 0 1 312.3 449.05 A 18.65 18.65 90 0 1 309.7 452.65 A 16.25 16.25 90 0 1 308.1 454.2 Q 306.1 455.9 303.55 456.75 A 16.3 16.3 90 0 1 299.75 457.55 A 19.95 19.95 90 0 1 297.9 457.65 A 18.65 18.65 90 0 1 294.85 457.4 A 14.25 14.25 90 0 1 292.15 456.7 Q 289.6 455.75 287.65 454 A 15.35 15.35 90 0 1 285.5 451.45 A 21 21 90 0 1 283.95 448.85 A 28 28 90 0 1 282.1 443.9 A 33.3 33.3 90 0 1 281.55 441.75 A 41.25 41.25 90 0 1 280.8 437.7 A 50.2 50.2 90 0 1 280.55 435.1 A 90.25 90.25 90 0 1 280.25 428.85 A 101.25 101.25 90 0 1 280.25 427.6 L 280.25 411.95 A 92.3 92.3 90 0 1 280.45 406 A 80.7 80.7 90 0 1 280.55 404.1 A 54.85 54.85 90 0 1 281.05 400.1 A 43.9 43.9 90 0 1 281.65 397.25 A 31.15 31.15 90 0 1 282.8 393.25 A 23.8 23.8 90 0 1 284.3 390.05 Q 286.05 386.95 288.5 384.9 A 13.55 13.55 90 0 1 292.65 382.8 Q 294.95 382.05 297.8 382.05 A 19.4 19.4 90 0 1 300.95 382.3 A 15.45 15.45 90 0 1 303.3 382.85 A 15.5 15.5 90 0 1 307.7 385.15 A 17.1 17.1 90 0 1 310.8 388.4 A 21.05 21.05 90 0 1 312.05 390.25 A 27.5 27.5 90 0 1 314.1 394.7 A 33.55 33.55 90 0 1 314.95 397.3 A 39.7 39.7 90 0 1 315.85 401.45 A 48.25 48.25 90 0 1 316.25 404.15 A 69.45 69.45 90 0 1 316.6 409.85 A 80.4 80.4 90 0 1 316.65 411.95 Z M 390.9 417.3 L 375 417.3 L 375 383.15 L 390.9 383.15 A 23.4 23.4 90 0 1 394.55 383.45 Q 396.7 383.75 398.55 384.55 A 16 16 90 0 1 402.7 387.15 A 14.7 14.7 90 0 1 403.95 388.35 A 16 16 90 0 1 407.1 393.9 A 18.5 18.5 90 0 1 407.15 394 A 21.4 21.4 90 0 1 408.15 399.35 A 25.15 25.15 90 0 1 408.2 400.95 A 18.2 18.2 90 0 1 407.15 407.15 A 14.95 14.95 90 0 1 403.95 412.4 A 15.2 15.2 90 0 1 399.8 415.4 A 18.15 18.15 90 0 1 398.55 416 A 16.95 16.95 90 0 1 394.9 417 Q 393.05 417.3 390.9 417.3 Z" />
+</svg>
diff --git a/symbols/nz/banner_indicator33.svg b/symbols/nz/banner_indicator33.svg
index d6e72289..4363429b 100644
--- a/symbols/nz/banner_indicator33.svg
+++ b/symbols/nz/banner_indicator33.svg
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 18" width="10" height="18">
-  <rect x="4" y="0" width="1" height="18" fill="#777"/>
-
-  <rect x="1" y="1" height="7" width="7" fill="#000" ry="0.4"/>
-  <rect x="2" y="4" height="1" width="5" fill="#fff" ry="0.4"/>
-
-  <rect x="1" y="10" height="7" width="7" fill="#000" ry="0.4"/>
-  <rect x="2" y="13" height="1" width="5" fill="#fff" ry="0.4"/>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 7 18" width="10.5" height="27">
+  <rect x="3" y="0" width="1" height="18" fill="#777"/>
+  <rect x="0" y="1" height="7" width="7" fill="#000" ry="0.4"/>
+  <rect x="1" y="4" height="1" width="5" fill="#fff" ry="0.4"/>
+  <rect x="0" y="10" height="7" width="7" fill="#000" ry="0.4"/>
+  <rect x="1" y="13" height="1" width="5" fill="#fff" ry="0.4"/>
 </svg>
diff --git a/symbols/nz/banner_indicator3D.svg b/symbols/nz/banner_indicator3D.svg
index 3a428fbf..26c75717 100644
--- a/symbols/nz/banner_indicator3D.svg
+++ b/symbols/nz/banner_indicator3D.svg
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 15" width="10" height="15">
-  <rect x="4" y="0" width="1" height="15" fill="#777"/>
-
-  <rect x="1" y="1" height="7" width="7" fill="#000" ry="0.4"/>
-  <rect x="2" y="4" height="1" width="5" fill="#fff" ry="0.4"/>
-
-  <rect x="2.5" y="10" height="4" width="4" fill="#000" ry="0.4"/>
-  <circle cx="4.5" cy="12" r="1" fill="#fff"/>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 7 15" width="10.5" height="22.5">
+  <rect x="3" y="0" width="1" height="15" fill="#777"/>
+  <rect x="0" y="1" height="7" width="7" fill="#000" ry="0.4"/>
+  <rect x="1" y="4" height="1" width="5" fill="#fff" ry="0.4"/>
+  <rect x="1.5" y="10" height="4" width="4" fill="#000" ry="0.4"/>
+  <circle cx="3.5" cy="12" r="1" fill="#fff"/>
 </svg>
diff --git a/symbols/nz/begin_AS.svg b/symbols/nz/begin_AS.svg
new file mode 100644
index 00000000..50680b79
--- /dev/null
+++ b/symbols/nz/begin_AS.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="22.5" height="15" viewBox="0 0 15 10">
+  <rect stroke="#fff" stroke-width=".2" width="14.8" height="9.8" ry="1" x=".1" y=".1"/>
+  <path fill="#fff" d="M9.129 6.35 7.715 6.35A2.5375 2.5375 90 007.764 6.861 1.918 1.918 90 007.9355 7.3615Q8.1595 7.792 8.5445 8.107 8.9505 8.4325 9.4965 8.597 10.0425 8.765 10.599 8.765 11.1695 8.765 11.6525 8.6285A2.6775 2.6775 90 0012.153 8.436 2.198 2.198 90 0012.482 8.226 1.8655 1.8655 90 0013.028 7.582 1.764 1.764 90 0013.2065 6.9905 2.233 2.233 90 0013.224 6.7105 2.1035 2.1035 90 0013.1505 6.1435 1.771 1.771 90 0012.965 5.7025 2.6075 2.6075 90 0012.377 5.0305 3.0345 3.0345 90 0012.2615 4.9395 3.906 3.906 90 0011.719 4.6315 4.389 4.389 90 0011.621 4.586Q11.271 4.432 10.886 4.3235A7.0105 7.0105 90 0110.5465 4.222 5.236 5.236 90 0110.2455 4.1135Q9.9585 4.0015 9.759 3.865A1.1865 1.1865 90 019.5945 3.732.8855.8855 90 019.4545 3.5605.7035.7035 90 019.3495 3.1895.8505.8505 90 019.3495 3.1825.882.882 90 019.409 2.8535.847.847 90 019.43 2.8115.854.854 90 019.654 2.5175.973.973 90 019.661 2.5105 1.022 1.022 90 019.8675 2.3845 1.337 1.337 90 0110.039 2.318 1.4875 1.4875 90 0110.2945 2.262 2.0405 2.0405 90 0110.55 2.248 1.96 1.96 90 0110.809 2.2655Q10.963 2.2865 11.096 2.332A1.239 1.239 90 0111.334 2.4475 1.0185 1.0185 90 0111.488 2.5665 1.015 1.015 90 0111.719 2.9305 1.3965 1.3965 90 0111.7995 3.2525 1.6765 1.6765 90 0111.81 3.3925L13.2135 3.3925A2.2575 2.2575 90 0013.1225 2.7415 2.037 2.037 90 0013.021 2.4685Q12.825 2.0485 12.475 1.7405A2.4255 2.4255 90 0011.8765 1.3625 2.9085 2.9085 90 0011.642 1.268 3.0275 3.0275 90 0010.9385 1.1175 3.731 3.731 90 0010.5745 1.1 3.8325 3.8325 90 009.9025 1.156 3.248 3.248 90 009.528 1.247 2.8 2.8 90 009.003 1.464 2.3415 2.3415 90 008.6915 1.6635 1.96 1.96 90 008.1385 2.3215Q7.939 2.7065 7.939 3.1755A1.9495 1.9495 90 008.016 3.7355 1.7745 1.7745 90 008.0895 3.935 1.932 1.932 90 008.45 4.481 2.2645 2.2645 90 008.5375 4.572Q8.8175 4.838 9.2445 5.069A4.5465 4.5465 90 009.304 5.1005 4.893 4.893 90 009.8465 5.335 6.594 6.594 90 0010.396 5.51Q10.795 5.6185 11.0645 5.741A2.3625 2.3625 90 0111.2675 5.8495Q11.369 5.909 11.4495 5.972A1.2915 1.2915 90 0111.502 6.0175 1.0745 1.0745 90 0111.635 6.1645.8085.8085 90 0111.7365 6.3465.9975.9975 90 0111.8065 6.693 1.141 1.141 90 0111.8065 6.7175.8505.8505 90 0111.768 6.98.777.777 90 0111.7225 7.085Q11.642 7.253 11.488 7.372A1.0325 1.0325 90 0111.285 7.491 1.372 1.372 90 0111.11 7.554 1.5365 1.5365 90 0110.858 7.6065 2.114 2.114 90 0110.599 7.6205Q10.277 7.6205 10.0075 7.5505A1.3405 1.3405 90 019.738 7.4455 1.099 1.099 90 019.549 7.323 1.0185 1.0185 90 019.262 6.959 1.1935 1.1935 90 019.248 6.931Q9.1465 6.707 9.129 6.399A2.2155 2.2155 90 019.129 6.35ZM3.06 7.1095 5.3 7.1095 5.734 8.667 7.253 8.667 4.852 1.2015 3.5465 1.2015 1.1 8.667 2.619 8.667 3.06 7.1095ZM4.9605 5.8845 3.4135 5.8845 4.1975 3.137 4.9605 5.8845Z" />
+</svg>
diff --git a/symbols/nz/begin_CTC.svg b/symbols/nz/begin_CTC.svg
new file mode 100644
index 00000000..5b5d6388
--- /dev/null
+++ b/symbols/nz/begin_CTC.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="22.5" height="15" viewBox="0 0 15 10">
+  <rect stroke="#fff" stroke-width=".2" width="14.8" height="9.8" ry="1" x=".1" y=".1"/>
+  <path fill="#fff" d="M4.7925 5.74 3.765 5.74Q3.7525 5.945 3.7025 6.1A.9875.9875 90 013.6825 6.1525.87.87 90 013.605 6.31.6875.6875 90 013.505 6.435.6825.6825 90 013.255 6.5875.8.8 90 013.23 6.595 1.0675 1.0675 90 013.03 6.6375 1.3975 1.3975 90 012.8675 6.6475Q2.7175 6.6475 2.5925 6.6125A.68.68 90 012.3725 6.505.7075.7075 90 012.2325 6.37.8125.8125 90 012.21 6.34.995.995 90 012.1225 6.1925 1.205 1.205 90 012.0875 6.1125 1.6125 1.6125 90 012.025 5.9125Q2 5.815 1.9825 5.7075A2.675 2.675 90 011.9775 5.675Q1.9425 5.425 1.9425 5.105L1.9425 4.38A4.415 4.415 90 011.9525 4.1025 3.595 3.595 90 011.965 3.9425 2.5075 2.5075 90 011.9975 3.725 1.985 1.985 90 012.035 3.57 1.59 1.59 90 012.1175 3.345 1.27 1.27 90 012.2025 3.1925Q2.3075 3.03 2.4575 2.94A.72.72 90 012.645 2.865.83.83 90 012.6475 2.865Q2.7525 2.8375 2.875 2.8375 3.0675 2.8375 3.215 2.8825A.805.805 90 013.265 2.9.7325.7325 90 013.46 3.005.6625.6625 90 013.5375 3.0775.7575.7575 90 013.6525 3.255.9775.9775 90 013.7 3.3775Q3.7525 3.545 3.77 3.765A2.435 2.435 90 013.77 3.795L4.7975 3.795A2.78 2.78 90 004.725 3.3575 2.2225 2.2225 90 004.62 3.0425Q4.4825 2.71 4.24 2.48A1.6125 1.6125 90 003.7625 2.1675 1.905 1.905 90 003.655 2.125 2.015 2.015 90 003.24 2.025 2.6925 2.6925 90 002.875 2 2.075 2.075 90 002.485 2.035 1.8025 1.8025 90 002.32 2.075Q2.06 2.15 1.845 2.29 1.6025 2.455 1.4125 2.6925A2.01 2.01 90 001.1275 3.1775 2.275 2.275 90 001.105 3.235 2.5075 2.5075 90 00.98 3.6325 2.905 2.905 90 00.9525 3.775 3.4425 3.4425 90 00.9025 4.2575 3.935 3.935 90 00.9 4.3875L.9 5.105A3.7375 3.7375 90 00.93 5.5825 3.2475 3.2475 90 00.9575 5.7575 2.995 2.995 90 001.0475 6.1225 2.505 2.505 90 001.12 6.3225Q1.23 6.5775 1.39 6.79 1.5475 7.0025 1.7525 7.1525A1.7025 1.7025 90 002.2225 7.3875 1.925 1.925 90 002.2575 7.4 1.96 1.96 90 002.675 7.4775 2.365 2.365 90 002.8675 7.485 2.4725 2.4725 90 003.3125 7.4475 2.025 2.025 90 003.6275 7.3625 1.7975 1.7975 90 004.065 7.14 1.6175 1.6175 90 004.2225 7.0125Q4.47 6.7875 4.62 6.465A1.9075 1.9075 90 004.765 5.9825 2.355 2.355 90 004.7925 5.74ZM13.795 5.74 12.765 5.74Q12.7525 5.945 12.7025 6.1A.9875.9875 90 0112.685 6.1525.87.87 90 0112.6075 6.31.6875.6875 90 0112.505 6.435.6825.6825 90 0112.255 6.5875.8.8 90 0112.23 6.595 1.0675 1.0675 90 0112.03 6.6375 1.3975 1.3975 90 0111.8675 6.6475Q11.7175 6.6475 11.595 6.6125A.68.68 90 0111.3725 6.505.7075.7075 90 0111.2325 6.37.8125.8125 90 0111.21 6.34.995.995 90 0111.1225 6.1925 1.205 1.205 90 0111.0875 6.1125 1.6125 1.6125 90 0111.025 5.9125Q11 5.815 10.985 5.7075A2.675 2.675 90 0110.98 5.675Q10.945 5.425 10.945 5.105L10.945 4.38A4.415 4.415 90 0110.9525 4.1025 3.595 3.595 90 0110.9675 3.9425 2.5075 2.5075 90 0111 3.725 1.985 1.985 90 0111.0375 3.57 1.59 1.59 90 0111.12 3.345 1.27 1.27 90 0111.2025 3.1925Q11.3075 3.03 11.4575 2.94A.72.72 90 0111.6475 2.865.83.83 90 0111.65 2.865Q11.755 2.8375 11.875 2.8375 12.0675 2.8375 12.215 2.8825A.805.805 90 0112.265 2.9.7325.7325 90 0112.46 3.005.6625.6625 90 0112.5375 3.0775.7575.7575 90 0112.655 3.255.9775.9775 90 0112.7 3.3775Q12.755 3.545 12.77 3.765A2.435 2.435 90 0112.7725 3.795L13.7975 3.795A2.78 2.78 90 0013.725 3.3575 2.2225 2.2225 90 0013.6225 3.0425Q13.4825 2.71 13.2425 2.48A1.6125 1.6125 90 0012.765 2.1675 1.905 1.905 90 0012.6575 2.125 2.015 2.015 90 0012.2425 2.025 2.6925 2.6925 90 0011.875 2 2.075 2.075 90 0011.485 2.035 1.8025 1.8025 90 0011.32 2.075Q11.0625 2.15 10.8475 2.29 10.605 2.455 10.415 2.6925A2.01 2.01 90 0010.13 3.1775 2.275 2.275 90 0010.1075 3.235 2.5075 2.5075 90 009.9825 3.6325 2.905 2.905 90 009.9525 3.775 3.4425 3.4425 90 009.9025 4.2575 3.935 3.935 90 009.9025 4.3875L9.9025 5.105A3.7375 3.7375 90 009.93 5.5825 3.2475 3.2475 90 009.9575 5.7575 2.995 2.995 90 0010.0475 6.1225 2.505 2.505 90 0010.12 6.3225Q10.23 6.5775 10.39 6.79 10.55 7.0025 10.755 7.1525A1.7025 1.7025 90 0011.2225 7.3875 1.925 1.925 90 0011.2575 7.4 1.96 1.96 90 0011.6775 7.4775 2.365 2.365 90 0011.8675 7.485 2.4725 2.4725 90 0012.315 7.4475 2.025 2.025 90 0012.63 7.3625 1.7975 1.7975 90 0013.0675 7.14 1.6175 1.6175 90 0013.2225 7.0125Q13.4725 6.7875 13.62 6.465A1.9075 1.9075 90 0013.7675 5.9825 2.355 2.355 90 0013.795 5.74ZM7.865 2.915 9.51 2.915 9.51 2.0775 5.21 2.0775 5.21 2.915 6.8325 2.915 6.8325 7.41 7.865 7.41 7.865 2.915Z" />
+</svg>
diff --git a/symbols/nz/begin_ETCS.svg b/symbols/nz/begin_ETCS.svg
new file mode 100644
index 00000000..d4661c2a
--- /dev/null
+++ b/symbols/nz/begin_ETCS.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="22.5" height="15" viewBox="0 0 19 10">
+  <rect fill="#fff" stroke="#000" stroke-width=".2" width="18.8" height="9.8" ry="1" x=".1" y=".1"/>
+  <path d="M1.9325 5.0725 4.1225 5.0725 4.1225 4.26 1.9325 4.26 1.9325 2.915 4.4825 2.915 4.4825 2.0775.9 2.0775.9 7.41 4.4925 7.41 4.4925 6.5775 1.9325 6.5775 1.9325 5.0725ZM15.2 5.7525 14.19 5.7525A1.8125 1.8125 90 0014.225 6.1175 1.37 1.37 90 0014.35 6.475Q14.5075 6.7825 14.7825 7.01 15.0725 7.24 15.4625 7.36 15.8525 7.4775 16.2525 7.4775 16.6575 7.4775 17.0025 7.3825A1.9125 1.9125 90 0017.36 7.2425 1.57 1.57 90 0017.595 7.095 1.3325 1.3325 90 0017.985 6.635 1.26 1.26 90 0018.115 6.2125 1.595 1.595 90 0018.1275 6.01 1.5025 1.5025 90 0018.075 5.605 1.265 1.265 90 0017.94 5.2925 1.8625 1.8625 90 0017.52 4.81 2.1675 2.1675 90 0017.4375 4.7475 2.79 2.79 90 0017.05 4.525 3.135 3.135 90 0016.98 4.495Q16.7325 4.385 16.4575 4.3075A5.0075 5.0075 90 0116.2125 4.235 3.74 3.74 90 0115.9975 4.1575Q15.795 4.0775 15.65 3.9775A.8475.8475 90 0115.5325 3.8825.6325.6325 90 0115.4325 3.7625.5025.5025 90 0115.3575 3.495.6075.6075 90 0115.3575 3.49.63.63 90 0115.4025 3.255.605.605 90 0115.415 3.225.61.61 90 0115.575 3.0175.695.695 90 0115.5825 3.01.73.73 90 0115.73 2.92.955.955 90 0115.85 2.8725 1.0625 1.0625 90 0116.0325 2.835 1.4575 1.4575 90 0116.215 2.825 1.4 1.4 90 0116.4 2.835Q16.51 2.85 16.605 2.885A.885.885 90 0116.775 2.965.7275.7275 90 0116.885 3.05.725.725 90 0117.0525 3.31.9975.9975 90 0117.1075 3.5425 1.1975 1.1975 90 0117.115 3.64L18.12 3.64A1.6125 1.6125 90 0018.055 3.1775 1.455 1.455 90 0017.98 2.9825Q17.84 2.68 17.5925 2.4625A1.7325 1.7325 90 0017.165 2.19 2.0775 2.0775 90 0016.9975 2.125 2.1625 2.1625 90 0016.4925 2.015 2.665 2.665 90 0016.2325 2.0025 2.7375 2.7375 90 0015.7525 2.045 2.32 2.32 90 0015.485 2.1075 2 2 90 0015.11 2.2625 1.6725 1.6725 90 0014.89 2.4075 1.4 1.4 90 0014.495 2.875Q14.35 3.15 14.35 3.4875A1.3925 1.3925 90 0014.4075 3.885 1.2675 1.2675 90 0014.46 4.03 1.38 1.38 90 0014.715 4.4175 1.6175 1.6175 90 0014.78 4.4825Q14.9775 4.675 15.2825 4.8375A3.2475 3.2475 90 0015.3275 4.86 3.495 3.495 90 0015.7125 5.0275 4.71 4.71 90 0016.105 5.1525Q16.39 5.23 16.5825 5.32A1.6875 1.6875 90 0116.7275 5.395Q16.8 5.4375 16.8575 5.485A.9225.9225 90 0116.895 5.515.7675.7675 90 0116.99 5.6225.5775.5775 90 0117.0625 5.75.7125.7125 90 0117.1125 5.9975.815.815 90 0117.1125 6.0175.6075.6075 90 0117.085 6.2025.555.555 90 0117.0525 6.28Q16.995 6.3975 16.885 6.4825A.7375.7375 90 0116.7425 6.5675.98.98 90 0116.615 6.615 1.0975 1.0975 90 0116.435 6.65 1.51 1.51 90 0116.2525 6.6625Q16.02 6.6625 15.8275 6.61A.9575.9575 90 0115.635 6.5375.785.785 90 0115.5 6.45.7275.7275 90 0115.295 6.19.8525.8525 90 0115.285 6.1675Q15.2125 6.0075 15.2025 5.7875A1.5825 1.5825 90 0115.2 5.7525ZM13.545 5.74 12.515 5.74Q12.5025 5.945 12.455 6.1A.9875.9875 90 0112.435 6.1525.87.87 90 0112.3575 6.31.6875.6875 90 0112.255 6.435.6825.6825 90 0112.0075 6.5875.8.8 90 0111.9825 6.595 1.0675 1.0675 90 0111.7825 6.6375 1.3975 1.3975 90 0111.62 6.6475Q11.47 6.6475 11.345 6.6125A.68.68 90 0111.125 6.505.7075.7075 90 0110.985 6.37.8125.8125 90 0110.9625 6.34.995.995 90 0110.875 6.1925 1.205 1.205 90 0110.84 6.1125 1.6125 1.6125 90 0110.775 5.9125Q10.7525 5.815 10.735 5.7075A2.675 2.675 90 0110.73 5.675Q10.695 5.425 10.695 5.105L10.695 4.38A4.415 4.415 90 0110.705 4.1025 3.595 3.595 90 0110.7175 3.9425 2.5075 2.5075 90 0110.75 3.725 1.985 1.985 90 0110.7875 3.57 1.59 1.59 90 0110.87 3.345 1.27 1.27 90 0110.955 3.1925Q11.0575 3.03 11.21 2.94A.72.72 90 0111.3975 2.865.83.83 90 0111.4 2.865Q11.505 2.8375 11.6275 2.8375 11.82 2.8375 11.9675 2.8825A.805.805 90 0112.0175 2.9.7325.7325 90 0112.2125 3.005.6625.6625 90 0112.29 3.0775.7575.7575 90 0112.405 3.255.9775.9775 90 0112.4525 3.3775Q12.505 3.545 12.5225 3.765A2.435 2.435 90 0112.5225 3.795L13.55 3.795A2.78 2.78 90 0013.4775 3.3575 2.2225 2.2225 90 0013.3725 3.0425Q13.235 2.71 12.9925 2.48A1.6125 1.6125 90 0012.515 2.1675 1.905 1.905 90 0012.4075 2.125 2.015 2.015 90 0011.9925 2.025 2.6925 2.6925 90 0011.6275 2 2.075 2.075 90 0011.2375 2.035 1.8025 1.8025 90 0011.0725 2.075Q10.8125 2.15 10.5975 2.29 10.355 2.455 10.165 2.6925A2.01 2.01 90 009.88 3.1775 2.275 2.275 90 009.8575 3.235 2.5075 2.5075 90 009.7325 3.6325 2.905 2.905 90 009.7025 3.775 3.4425 3.4425 90 009.655 4.2575 3.935 3.935 90 009.6525 4.3875L9.6525 5.105A3.7375 3.7375 90 009.6825 5.5825 3.2475 3.2475 90 009.71 5.7575 2.995 2.995 90 009.8 6.1225 2.505 2.505 90 009.8725 6.3225Q9.9825 6.5775 10.1425 6.79 10.3 7.0025 10.505 7.1525A1.7025 1.7025 90 0010.975 7.3875 1.925 1.925 90 0011.01 7.4 1.96 1.96 90 0011.4275 7.4775 2.365 2.365 90 0011.62 7.485 2.4725 2.4725 90 0012.065 7.4475 2.025 2.025 90 0012.38 7.3625 1.7975 1.7975 90 0012.8175 7.14 1.6175 1.6175 90 0012.975 7.0125Q13.2225 6.7875 13.3725 6.465A1.9075 1.9075 90 0013.5175 5.9825 2.355 2.355 90 0013.545 5.74ZM7.6175 2.915 9.26 2.915 9.26 2.0775 4.9625 2.0775 4.9625 2.915 6.5825 2.915 6.5825 7.41 7.6175 7.41 7.6175 2.915Z" />
+</svg>
diff --git a/symbols/nz/begin_TWC.svg b/symbols/nz/begin_TWC.svg
new file mode 100644
index 00000000..b9d8368b
--- /dev/null
+++ b/symbols/nz/begin_TWC.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="22.5" height="15" viewBox="0 0 15 10">
+  <rect stroke="#fff" stroke-width=".2" width="14.8" height="9.8" ry="1" x=".1" y=".1"/>
+  <path fill="#fff" d="M5.3975 2.0775 6.13 7.41 7.06 7.41 7.5075 4.53 7.5475 4.26 7.5875 4.53 8.0525 7.41 8.9825 7.41 9.7225 2.0775 8.7775 2.0775 8.415 5.065 8.39 5.2875 8.355 5.07 7.91 2.0775 7.1725 2.0775 6.7525 5.0475 6.72 5.2675 6.6925 5.0575 6.3375 2.0775 5.3975 2.0775ZM13.985 5.74 12.955 5.74Q12.9425 5.945 12.8925 6.1A.9875.9875 90 0112.875 6.1525.87.87 90 0112.7975 6.31.6875.6875 90 0112.695 6.435.6825.6825 90 0112.445 6.5875.8.8 90 0112.42 6.595 1.0675 1.0675 90 0112.22 6.6375 1.3975 1.3975 90 0112.0575 6.6475Q11.9075 6.6475 11.785 6.6125A.68.68 90 0111.565 6.505.7075.7075 90 0111.425 6.37.8125.8125 90 0111.4 6.34.995.995 90 0111.3125 6.1925 1.205 1.205 90 0111.2775 6.1125 1.6125 1.6125 90 0111.215 5.9125Q11.1925 5.815 11.175 5.7075A2.675 2.675 90 0111.17 5.675Q11.135 5.425 11.135 5.105L11.135 4.38A4.415 4.415 90 0111.145 4.1025 3.595 3.595 90 0111.1575 3.9425 2.5075 2.5075 90 0111.19 3.725 1.985 1.985 90 0111.2275 3.57 1.59 1.59 90 0111.31 3.345 1.27 1.27 90 0111.395 3.1925Q11.4975 3.03 11.6475 2.94A.72.72 90 0111.8375 2.865.83.83 90 0111.84 2.865Q11.945 2.8375 12.065 2.8375 12.26 2.8375 12.405 2.8825A.805.805 90 0112.455 2.9.7325.7325 90 0112.65 3.005.6625.6625 90 0112.7275 3.0775.7575.7575 90 0112.845 3.255.9775.9775 90 0112.8925 3.3775Q12.945 3.545 12.96 3.765A2.435 2.435 90 0112.9625 3.795L13.9875 3.795A2.78 2.78 90 0013.915 3.3575 2.2225 2.2225 90 0013.8125 3.0425Q13.6725 2.71 13.4325 2.48A1.6125 1.6125 90 0012.955 2.1675 1.905 1.905 90 0012.8475 2.125 2.015 2.015 90 0012.4325 2.025 2.6925 2.6925 90 0012.065 2 2.075 2.075 90 0011.675 2.035 1.8025 1.8025 90 0011.51 2.075Q11.2525 2.15 11.0375 2.29 10.795 2.455 10.605 2.6925A2.01 2.01 90 0010.32 3.1775 2.275 2.275 90 0010.2975 3.235 2.5075 2.5075 90 0010.1725 3.6325 2.905 2.905 90 0010.1425 3.775 3.4425 3.4425 90 0010.095 4.2575 3.935 3.935 90 0010.0925 4.3875L10.0925 5.105A3.7375 3.7375 90 0010.12 5.5825 3.2475 3.2475 90 0010.1475 5.7575 2.995 2.995 90 0010.24 6.1225 2.505 2.505 90 0010.3125 6.3225Q10.4225 6.5775 10.58 6.79 10.74 7.0025 10.945 7.1525A1.7025 1.7025 90 0011.415 7.3875 1.925 1.925 90 0011.4475 7.4 1.96 1.96 90 0011.8675 7.4775 2.365 2.365 90 0012.0575 7.485 2.4725 2.4725 90 0012.505 7.4475 2.025 2.025 90 0012.82 7.3625 1.7975 1.7975 90 0013.2575 7.14 1.6175 1.6175 90 0013.4125 7.0125Q13.6625 6.7875 13.81 6.465A1.9075 1.9075 90 0013.9575 5.9825 2.355 2.355 90 0013.985 5.74ZM3.555 2.915 5.2 2.915 5.2 2.0775.9 2.0775.9 2.915 2.5225 2.915 2.5225 7.41 3.555 7.41 3.555 2.915Z" />
+</svg>
diff --git a/symbols/nz/channel_area.svg b/symbols/nz/channel_area.svg
new file mode 100644
index 00000000..c4dd627d
--- /dev/null
+++ b/symbols/nz/channel_area.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 8" width="20" height="8">
+  <rect fill="#07c" width="20" height="8" stroke="#eee" stroke-width="0.5px" />
+  <path fill="#fff" d="M 15.4879 6.4772 L 16.4309 6.4772 L 16.4309 1.5713 L 15.481 1.5713 L 15.4787 4.72 L 14.124 1.5713 L 13.1695 1.5713 L 13.1695 6.4772 L 14.124 6.4772 L 14.124 3.3124 L 15.4879 6.4772 Z M 7.2171 6.4772 L 8.1532 6.4772 L 8.1532 1.5713 L 7.2171 1.5713 L 7.2171 3.5815 L 5.8279 3.5815 L 5.8279 1.5713 L 4.8895 1.5713 L 4.8895 6.4772 L 5.8279 6.4772 L 5.8279 4.3497 L 7.2171 4.3497 L 7.2171 6.4772 Z M 4.1811 4.9408 L 3.2358 4.9408 Q 3.2243 5.1294 3.1783 5.272 A 0.9085 0.9085 90 0 1 3.1599 5.3203 A 0.8004 0.8004 90 0 1 3.0886 5.4652 A 0.6325 0.6325 90 0 1 2.9966 5.5802 A 0.6279 0.6279 90 0 1 2.7666 5.7205 A 0.736 0.736 90 0 1 2.7436 5.7274 A 0.9821 0.9821 90 0 1 2.5596 5.7665 A 1.2857 1.2857 90 0 1 2.4101 5.7757 Q 2.2721 5.7757 2.1571 5.7435 A 0.6256 0.6256 90 0 1 1.9547 5.6446 A 0.6509 0.6509 90 0 1 1.8259 5.5204 A 0.7475 0.7475 90 0 1 1.8052 5.4928 A 0.9154 0.9154 90 0 1 1.7247 5.3571 A 1.1086 1.1086 90 0 1 1.6925 5.2835 A 1.4835 1.4835 90 0 1 1.635 5.0995 Q 1.612 5.0098 1.5959 4.9109 A 2.461 2.461 90 0 1 1.5913 4.881 Q 1.5591 4.651 1.5591 4.3566 L 1.5591 3.6896 A 4.0618 4.0618 90 0 1 1.5683 3.4343 A 3.3074 3.3074 90 0 1 1.5798 3.2871 A 2.3069 2.3069 90 0 1 1.6097 3.087 A 1.8262 1.8262 90 0 1 1.6442 2.9444 A 1.4628 1.4628 90 0 1 1.7201 2.7374 A 1.1684 1.1684 90 0 1 1.7983 2.5971 Q 1.8949 2.4476 2.0329 2.3648 A 0.6624 0.6624 90 0 1 2.2054 2.2958 A 0.7636 0.7636 90 0 1 2.2077 2.2958 Q 2.3043 2.2705 2.417 2.2705 Q 2.5941 2.2705 2.7298 2.3119 A 0.7406 0.7406 90 0 1 2.7758 2.328 A 0.6739 0.6739 90 0 1 2.9552 2.4246 A 0.6095 0.6095 90 0 1 3.0265 2.4913 A 0.6969 0.6969 90 0 1 3.1323 2.6546 A 0.8993 0.8993 90 0 1 3.176 2.7673 Q 3.2243 2.9214 3.2404 3.1238 A 2.2402 2.2402 90 0 1 3.2404 3.1514 L 4.1857 3.1514 A 2.5576 2.5576 90 0 0 4.119 2.7489 A 2.0447 2.0447 90 0 0 4.0224 2.4591 Q 3.8959 2.1532 3.6728 1.9416 A 1.4835 1.4835 90 0 0 3.2335 1.6541 A 1.7526 1.7526 90 0 0 3.1346 1.615 A 1.8538 1.8538 90 0 0 2.7528 1.523 A 2.4771 2.4771 90 0 0 2.417 1.5 A 1.909 1.909 90 0 0 2.0582 1.5322 A 1.6583 1.6583 90 0 0 1.9064 1.569 Q 1.6672 1.638 1.4694 1.7668 Q 1.2463 1.9186 1.0715 2.1371 A 1.8492 1.8492 90 0 0 0.8093 2.5833 A 2.093 2.093 90 0 0 0.7886 2.6362 A 2.3069 2.3069 90 0 0 0.6736 3.0019 A 2.6726 2.6726 90 0 0 0.6483 3.133 A 3.1671 3.1671 90 0 0 0.6023 3.5769 A 3.6202 3.6202 90 0 0 0.6 3.6965 L 0.6 4.3566 A 3.4385 3.4385 90 0 0 0.6276 4.7959 A 2.9877 2.9877 90 0 0 0.6529 4.9569 A 2.7554 2.7554 90 0 0 0.7357 5.2927 A 2.3046 2.3046 90 0 0 0.8024 5.4767 Q 0.9036 5.7113 1.0508 5.9068 Q 1.1957 6.1023 1.3843 6.2403 A 1.5663 1.5663 90 0 0 1.8167 6.4565 A 1.771 1.771 90 0 0 1.8489 6.468 A 1.8032 1.8032 90 0 0 2.233 6.5393 A 2.1758 2.1758 90 0 0 2.4101 6.5462 A 2.2747 2.2747 90 0 0 2.8195 6.5117 A 1.863 1.863 90 0 0 3.1093 6.4335 A 1.6537 1.6537 90 0 0 3.5118 6.2288 A 1.4881 1.4881 90 0 0 3.6567 6.1115 Q 3.8844 5.9045 4.0224 5.6078 A 1.7549 1.7549 90 0 0 4.1558 5.1639 A 2.1666 2.1666 90 0 0 4.1811 4.9408 Z M 9.9955 5.4514 L 11.4698 5.4514 L 11.755 6.4772 L 12.7532 6.4772 L 11.1754 1.5713 L 10.3175 1.5713 L 8.7098 6.4772 L 9.7057 6.4772 L 9.9955 5.4514 Z M 11.2467 4.6464 L 10.2301 4.6464 L 10.7453 2.8409 L 11.2467 4.6464 Z M 18.3192 5.9344 A 0.6325 0.6325 90 0 0 18.3629 6.1713 A 0.5865 0.5865 90 0 0 18.494 6.3691 A 0.5819 0.5819 90 0 0 18.793 6.5255 A 0.8533 0.8533 90 0 0 18.9678 6.5439 A 0.8188 0.8188 90 0 0 19.1748 6.5186 A 0.5842 0.5842 90 0 0 19.4416 6.3691 A 0.5819 0.5819 90 0 0 19.6187 5.9505 A 0.7682 0.7682 90 0 0 19.6187 5.9344 A 0.6555 0.6555 90 0 0 19.575 5.6929 A 0.598 0.598 90 0 0 19.4462 5.4928 A 0.5727 0.5727 90 0 0 19.1472 5.3318 A 0.8487 0.8487 90 0 0 18.9678 5.3134 A 0.8418 0.8418 90 0 0 18.7746 5.3341 A 0.5612 0.5612 90 0 0 18.4894 5.4951 Q 18.3192 5.6745 18.3192 5.9344 Z" />
+</svg>
diff --git a/symbols/nz/distant/M.svg b/symbols/nz/distant/M.svg
new file mode 100644
index 00000000..89a125f6
--- /dev/null
+++ b/symbols/nz/distant/M.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 8 18.5" width="8" height="18.5">
+  <rect x="3.5" y="16" width="1" height="2.5" fill="#777"/>
+  <rect x="0" height="16.5" width="8" ry="4" fill="#000"/>
+  <circle cx="4" cy="5" r="2.1" fill="#777"/>
+  <circle cx="4" cy="11.5" r="2.1" fill="#fc0"/>
+</svg>
diff --git a/symbols/nz/distant/semaphore.svg b/symbols/nz/distant/semaphore.svg
new file mode 100644
index 00000000..fd3a837c
--- /dev/null
+++ b/symbols/nz/distant/semaphore.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="21" height="19.179643" viewBox="0 0 21 19.179643">
+<path fill-rule="nonzero" fill="rgb(100%, 100%, 100%)" fill-opacity="1" d="M 16.449219 0 L 17.691406 0 L 17.691406 19.179688 L 16.449219 19.179688 Z M 16.449219 0 "/>
+<path fill-rule="nonzero" fill="rgb(0%, 0%, 0%)" fill-opacity="1" d="M 17.171875 2.507812 L 19.238281 2.46875 L 20.917969 4.761719 L 20.152344 7.027344 L 16.011719 4.964844 L 17.171875 2.507812 "/>
+<path fill-rule="nonzero" fill="rgb(100%, 83.529412%, 0%)" fill-opacity="1" d="M 0 2.507812 L 2.503906 4.230469 L 0 5.957031 L 17.171875 5.957031 L 17.171875 2.507812 Z M 0 2.507812 "/>
+<path fill-rule="nonzero" fill="rgb(0%, 0%, 0%)" fill-opacity="1" d="M 21 4.230469 C 21 5.207031 20.210938 5.996094 19.238281 5.996094 C 18.265625 5.996094 17.472656 5.207031 17.472656 4.230469 C 17.472656 3.257812 18.265625 2.46875 19.238281 2.46875 C 20.210938 2.46875 21 3.257812 21 4.230469 Z M 21 4.230469 "/>
+<path fill-rule="nonzero" fill="rgb(0%, 0%, 0%)" fill-opacity="1" d="M 20.324219 6.15625 C 20.324219 7.417969 19.300781 8.4375 18.042969 8.4375 C 16.785156 8.4375 15.761719 7.417969 15.761719 6.15625 C 15.761719 4.898438 16.785156 3.878906 18.042969 3.878906 C 19.300781 3.878906 20.324219 4.898438 20.324219 6.15625 Z M 20.324219 6.15625 "/>
+<path fill-rule="nonzero" fill="rgb(0%, 14.509804%, 1.568627%)" fill-opacity="1" d="M 18.914062 7.03125 C 18.433594 7.511719 17.652344 7.511719 17.171875 7.03125 C 16.6875 6.546875 16.6875 5.765625 17.171875 5.285156 C 17.652344 4.804688 18.433594 4.804688 18.914062 5.285156 C 19.398438 5.765625 19.398438 6.546875 18.914062 7.03125 Z M 18.914062 7.03125 "/>
+<path fill-rule="nonzero" fill="rgb(100%, 83.529412%, 0%)" fill-opacity="1" d="M 19.808594 4.804688 C 19.484375 5.132812 18.953125 5.132812 18.625 4.804688 C 18.296875 4.476562 18.296875 3.945312 18.625 3.617188 C 18.953125 3.289062 19.484375 3.289062 19.808594 3.617188 C 20.136719 3.945312 20.136719 4.476562 19.808594 4.804688 Z M 19.808594 4.804688 "/>
+<path fill-rule="nonzero" fill="rgb(100%, 100%, 100%)" fill-opacity="1" d="M 3.140625 2.484375 L 5.675781 4.230469 L 3.140625 5.980469 L 5.675781 5.980469 L 8.210938 4.230469 L 5.675781 2.484375 Z M 3.140625 2.484375 "/>
+</svg>
diff --git a/symbols/nz/electric_limit.svg b/symbols/nz/electric_limit.svg
new file mode 100644
index 00000000..219c21f1
--- /dev/null
+++ b/symbols/nz/electric_limit.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 500 500" width="20" height="20">
+  <rect x="10" y="10" width="480" height="480" fill="#ddd" stroke="#f00" stroke-width="15px" rx="60"/>
+  <circle r="150" cx="250" cy="190" fill="red" stroke="#fff" stroke-width="3"/>
+  <path fill="#fff" d="M 267 66 L 308 68 L 227 187 L 326 170 L 259 279 L 272 278 L 232 317 L 228 265 L 238 275 L 268 205 L 179 224 L 267 66 Z" />
+  <path d="M 247.6 401.045 L 238.51 365 L 215.515 365 L 215.515 460.985 L 232.525 460.985 L 232.525 432.545 L 231.715 389.435 L 243.01 429.35 L 252.145 429.35 L 264.745 387.68 L 263.98 432.545 L 263.98 460.985 L 280.945 460.985 L 280.945 365 L 257.95 365 L 247.6 401.045 Z M 194.365 365 L 138.835 365 L 138.835 379.985 L 157.105 379.985 L 157.105 446.09 L 138.835 446.09 L 138.835 460.985 L 194.365 460.985 L 194.365 446.09 L 175.645 446.09 L 175.645 379.985 L 194.365 379.985 L 194.365 365 Z M 356.365 365 L 300.88 365 L 300.88 379.985 L 319.15 379.985 L 319.15 446.09 L 300.88 446.09 L 300.88 460.985 L 356.365 460.985 L 356.365 446.09 L 337.645 446.09 L 337.645 379.985 L 356.365 379.985 L 356.365 365 Z M 418.735 380.075 L 448.345 380.075 L 448.345 365 L 370.945 365 L 370.945 380.075 L 400.15 380.075 L 400.15 460.985 L 418.735 460.985 L 418.735 380.075 Z M 118.54 446 L 73.585 446 L 73.585 365 L 55 365 L 55 460.985 L 118.54 460.985 L 118.54 446 Z" />
+</svg>
diff --git a/symbols/nz/end_AS.svg b/symbols/nz/end_AS.svg
new file mode 100644
index 00000000..19913f40
--- /dev/null
+++ b/symbols/nz/end_AS.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="22.5" height="15" viewBox="0 0 15 10">
+  <rect stroke="#fff" stroke-width=".2" width="14.8" height="9.8" ry="1" x=".1" y=".1"/>
+  <path fill="#fff" d="M9.129 6.35 7.715 6.35A2.5375 2.5375 90 007.764 6.861 1.918 1.918 90 007.9355 7.3615Q8.1595 7.792 8.5445 8.107 8.9505 8.4325 9.4965 8.597 10.0425 8.765 10.599 8.765 11.1695 8.765 11.6525 8.6285A2.6775 2.6775 90 0012.153 8.436 2.198 2.198 90 0012.482 8.226 1.8655 1.8655 90 0013.028 7.582 1.764 1.764 90 0013.2065 6.9905 2.233 2.233 90 0013.224 6.7105 2.1035 2.1035 90 0013.1505 6.1435 1.771 1.771 90 0012.965 5.7025 2.6075 2.6075 90 0012.377 5.0305 3.0345 3.0345 90 0012.2615 4.9395 3.906 3.906 90 0011.719 4.6315 4.389 4.389 90 0011.621 4.586Q11.271 4.432 10.886 4.3235A7.0105 7.0105 90 0110.5465 4.222 5.236 5.236 90 0110.2455 4.1135Q9.9585 4.0015 9.759 3.865A1.1865 1.1865 90 019.5945 3.732.8855.8855 90 019.4545 3.5605.7035.7035 90 019.3495 3.1895.8505.8505 90 019.3495 3.1825.882.882 90 019.409 2.8535.847.847 90 019.43 2.8115.854.854 90 019.654 2.5175.973.973 90 019.661 2.5105 1.022 1.022 90 019.8675 2.3845 1.337 1.337 90 0110.039 2.318 1.4875 1.4875 90 0110.2945 2.262 2.0405 2.0405 90 0110.55 2.248 1.96 1.96 90 0110.809 2.2655Q10.963 2.2865 11.096 2.332A1.239 1.239 90 0111.334 2.4475 1.0185 1.0185 90 0111.488 2.5665 1.015 1.015 90 0111.719 2.9305 1.3965 1.3965 90 0111.7995 3.2525 1.6765 1.6765 90 0111.81 3.3925L13.2135 3.3925A2.2575 2.2575 90 0013.1225 2.7415 2.037 2.037 90 0013.021 2.4685Q12.825 2.0485 12.475 1.7405A2.4255 2.4255 90 0011.8765 1.3625 2.9085 2.9085 90 0011.642 1.268 3.0275 3.0275 90 0010.9385 1.1175 3.731 3.731 90 0010.5745 1.1 3.8325 3.8325 90 009.9025 1.156 3.248 3.248 90 009.528 1.247 2.8 2.8 90 009.003 1.464 2.3415 2.3415 90 008.6915 1.6635 1.96 1.96 90 008.1385 2.3215Q7.939 2.7065 7.939 3.1755A1.9495 1.9495 90 008.016 3.7355 1.7745 1.7745 90 008.0895 3.935 1.932 1.932 90 008.45 4.481 2.2645 2.2645 90 008.5375 4.572Q8.8175 4.838 9.2445 5.069A4.5465 4.5465 90 009.304 5.1005 4.893 4.893 90 009.8465 5.335 6.594 6.594 90 0010.396 5.51Q10.795 5.6185 11.0645 5.741A2.3625 2.3625 90 0111.2675 5.8495Q11.369 5.909 11.4495 5.972A1.2915 1.2915 90 0111.502 6.0175 1.0745 1.0745 90 0111.635 6.1645.8085.8085 90 0111.7365 6.3465.9975.9975 90 0111.8065 6.693 1.141 1.141 90 0111.8065 6.7175.8505.8505 90 0111.768 6.98.777.777 90 0111.7225 7.085Q11.642 7.253 11.488 7.372A1.0325 1.0325 90 0111.285 7.491 1.372 1.372 90 0111.11 7.554 1.5365 1.5365 90 0110.858 7.6065 2.114 2.114 90 0110.599 7.6205Q10.277 7.6205 10.0075 7.5505A1.3405 1.3405 90 019.738 7.4455 1.099 1.099 90 019.549 7.323 1.0185 1.0185 90 019.262 6.959 1.1935 1.1935 90 019.248 6.931Q9.1465 6.707 9.129 6.399A2.2155 2.2155 90 019.129 6.35ZM3.06 7.1095 5.3 7.1095 5.734 8.667 7.253 8.667 4.852 1.2015 3.5465 1.2015 1.1 8.667 2.619 8.667 3.06 7.1095ZM4.9605 5.8845 3.4135 5.8845 4.1975 3.137 4.9605 5.8845Z" />
+  <path stroke="#f00" stroke-width="1.5" d="M 0.4 9.4 L 14.6 0.6" />
+</svg>
diff --git a/symbols/nz/end_CTC.svg b/symbols/nz/end_CTC.svg
new file mode 100644
index 00000000..38f49109
--- /dev/null
+++ b/symbols/nz/end_CTC.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="22.5" height="15" viewBox="0 0 15 10">
+  <rect stroke="#fff" stroke-width=".2" width="14.8" height="9.8" ry="1" x=".1" y=".1"/>
+  <path fill="#fff" d="M4.7925 5.74 3.765 5.74Q3.7525 5.945 3.7025 6.1A.9875.9875 90 013.6825 6.1525.87.87 90 013.605 6.31.6875.6875 90 013.505 6.435.6825.6825 90 013.255 6.5875.8.8 90 013.23 6.595 1.0675 1.0675 90 013.03 6.6375 1.3975 1.3975 90 012.8675 6.6475Q2.7175 6.6475 2.5925 6.6125A.68.68 90 012.3725 6.505.7075.7075 90 012.2325 6.37.8125.8125 90 012.21 6.34.995.995 90 012.1225 6.1925 1.205 1.205 90 012.0875 6.1125 1.6125 1.6125 90 012.025 5.9125Q2 5.815 1.9825 5.7075A2.675 2.675 90 011.9775 5.675Q1.9425 5.425 1.9425 5.105L1.9425 4.38A4.415 4.415 90 011.9525 4.1025 3.595 3.595 90 011.965 3.9425 2.5075 2.5075 90 011.9975 3.725 1.985 1.985 90 012.035 3.57 1.59 1.59 90 012.1175 3.345 1.27 1.27 90 012.2025 3.1925Q2.3075 3.03 2.4575 2.94A.72.72 90 012.645 2.865.83.83 90 012.6475 2.865Q2.7525 2.8375 2.875 2.8375 3.0675 2.8375 3.215 2.8825A.805.805 90 013.265 2.9.7325.7325 90 013.46 3.005.6625.6625 90 013.5375 3.0775.7575.7575 90 013.6525 3.255.9775.9775 90 013.7 3.3775Q3.7525 3.545 3.77 3.765A2.435 2.435 90 013.77 3.795L4.7975 3.795A2.78 2.78 90 004.725 3.3575 2.2225 2.2225 90 004.62 3.0425Q4.4825 2.71 4.24 2.48A1.6125 1.6125 90 003.7625 2.1675 1.905 1.905 90 003.655 2.125 2.015 2.015 90 003.24 2.025 2.6925 2.6925 90 002.875 2 2.075 2.075 90 002.485 2.035 1.8025 1.8025 90 002.32 2.075Q2.06 2.15 1.845 2.29 1.6025 2.455 1.4125 2.6925A2.01 2.01 90 001.1275 3.1775 2.275 2.275 90 001.105 3.235 2.5075 2.5075 90 00.98 3.6325 2.905 2.905 90 00.9525 3.775 3.4425 3.4425 90 00.9025 4.2575 3.935 3.935 90 00.9 4.3875L.9 5.105A3.7375 3.7375 90 00.93 5.5825 3.2475 3.2475 90 00.9575 5.7575 2.995 2.995 90 001.0475 6.1225 2.505 2.505 90 001.12 6.3225Q1.23 6.5775 1.39 6.79 1.5475 7.0025 1.7525 7.1525A1.7025 1.7025 90 002.2225 7.3875 1.925 1.925 90 002.2575 7.4 1.96 1.96 90 002.675 7.4775 2.365 2.365 90 002.8675 7.485 2.4725 2.4725 90 003.3125 7.4475 2.025 2.025 90 003.6275 7.3625 1.7975 1.7975 90 004.065 7.14 1.6175 1.6175 90 004.2225 7.0125Q4.47 6.7875 4.62 6.465A1.9075 1.9075 90 004.765 5.9825 2.355 2.355 90 004.7925 5.74ZM13.795 5.74 12.765 5.74Q12.7525 5.945 12.7025 6.1A.9875.9875 90 0112.685 6.1525.87.87 90 0112.6075 6.31.6875.6875 90 0112.505 6.435.6825.6825 90 0112.255 6.5875.8.8 90 0112.23 6.595 1.0675 1.0675 90 0112.03 6.6375 1.3975 1.3975 90 0111.8675 6.6475Q11.7175 6.6475 11.595 6.6125A.68.68 90 0111.3725 6.505.7075.7075 90 0111.2325 6.37.8125.8125 90 0111.21 6.34.995.995 90 0111.1225 6.1925 1.205 1.205 90 0111.0875 6.1125 1.6125 1.6125 90 0111.025 5.9125Q11 5.815 10.985 5.7075A2.675 2.675 90 0110.98 5.675Q10.945 5.425 10.945 5.105L10.945 4.38A4.415 4.415 90 0110.9525 4.1025 3.595 3.595 90 0110.9675 3.9425 2.5075 2.5075 90 0111 3.725 1.985 1.985 90 0111.0375 3.57 1.59 1.59 90 0111.12 3.345 1.27 1.27 90 0111.2025 3.1925Q11.3075 3.03 11.4575 2.94A.72.72 90 0111.6475 2.865.83.83 90 0111.65 2.865Q11.755 2.8375 11.875 2.8375 12.0675 2.8375 12.215 2.8825A.805.805 90 0112.265 2.9.7325.7325 90 0112.46 3.005.6625.6625 90 0112.5375 3.0775.7575.7575 90 0112.655 3.255.9775.9775 90 0112.7 3.3775Q12.755 3.545 12.77 3.765A2.435 2.435 90 0112.7725 3.795L13.7975 3.795A2.78 2.78 90 0013.725 3.3575 2.2225 2.2225 90 0013.6225 3.0425Q13.4825 2.71 13.2425 2.48A1.6125 1.6125 90 0012.765 2.1675 1.905 1.905 90 0012.6575 2.125 2.015 2.015 90 0012.2425 2.025 2.6925 2.6925 90 0011.875 2 2.075 2.075 90 0011.485 2.035 1.8025 1.8025 90 0011.32 2.075Q11.0625 2.15 10.8475 2.29 10.605 2.455 10.415 2.6925A2.01 2.01 90 0010.13 3.1775 2.275 2.275 90 0010.1075 3.235 2.5075 2.5075 90 009.9825 3.6325 2.905 2.905 90 009.9525 3.775 3.4425 3.4425 90 009.9025 4.2575 3.935 3.935 90 009.9025 4.3875L9.9025 5.105A3.7375 3.7375 90 009.93 5.5825 3.2475 3.2475 90 009.9575 5.7575 2.995 2.995 90 0010.0475 6.1225 2.505 2.505 90 0010.12 6.3225Q10.23 6.5775 10.39 6.79 10.55 7.0025 10.755 7.1525A1.7025 1.7025 90 0011.2225 7.3875 1.925 1.925 90 0011.2575 7.4 1.96 1.96 90 0011.6775 7.4775 2.365 2.365 90 0011.8675 7.485 2.4725 2.4725 90 0012.315 7.4475 2.025 2.025 90 0012.63 7.3625 1.7975 1.7975 90 0013.0675 7.14 1.6175 1.6175 90 0013.2225 7.0125Q13.4725 6.7875 13.62 6.465A1.9075 1.9075 90 0013.7675 5.9825 2.355 2.355 90 0013.795 5.74ZM7.865 2.915 9.51 2.915 9.51 2.0775 5.21 2.0775 5.21 2.915 6.8325 2.915 6.8325 7.41 7.865 7.41 7.865 2.915Z" />
+  <path stroke="#f00" stroke-width="1.5" d="M 0.4 9.4 L 14.6 0.6" />
+</svg>
diff --git a/symbols/nz/end_ETCS.svg b/symbols/nz/end_ETCS.svg
new file mode 100644
index 00000000..77ee2ccb
--- /dev/null
+++ b/symbols/nz/end_ETCS.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="22.5" height="15" viewBox="0 0 19 10">
+  <rect fill="#fff" stroke="#000" stroke-width=".2" width="18.8" height="9.8" ry="1" x=".1" y=".1"/>
+  <path d="M1.9325 5.0725 4.1225 5.0725 4.1225 4.26 1.9325 4.26 1.9325 2.915 4.4825 2.915 4.4825 2.0775.9 2.0775.9 7.41 4.4925 7.41 4.4925 6.5775 1.9325 6.5775 1.9325 5.0725ZM15.2 5.7525 14.19 5.7525A1.8125 1.8125 90 0014.225 6.1175 1.37 1.37 90 0014.35 6.475Q14.5075 6.7825 14.7825 7.01 15.0725 7.24 15.4625 7.36 15.8525 7.4775 16.2525 7.4775 16.6575 7.4775 17.0025 7.3825A1.9125 1.9125 90 0017.36 7.2425 1.57 1.57 90 0017.595 7.095 1.3325 1.3325 90 0017.985 6.635 1.26 1.26 90 0018.115 6.2125 1.595 1.595 90 0018.1275 6.01 1.5025 1.5025 90 0018.075 5.605 1.265 1.265 90 0017.94 5.2925 1.8625 1.8625 90 0017.52 4.81 2.1675 2.1675 90 0017.4375 4.7475 2.79 2.79 90 0017.05 4.525 3.135 3.135 90 0016.98 4.495Q16.7325 4.385 16.4575 4.3075A5.0075 5.0075 90 0116.2125 4.235 3.74 3.74 90 0115.9975 4.1575Q15.795 4.0775 15.65 3.9775A.8475.8475 90 0115.5325 3.8825.6325.6325 90 0115.4325 3.7625.5025.5025 90 0115.3575 3.495.6075.6075 90 0115.3575 3.49.63.63 90 0115.4025 3.255.605.605 90 0115.415 3.225.61.61 90 0115.575 3.0175.695.695 90 0115.5825 3.01.73.73 90 0115.73 2.92.955.955 90 0115.85 2.8725 1.0625 1.0625 90 0116.0325 2.835 1.4575 1.4575 90 0116.215 2.825 1.4 1.4 90 0116.4 2.835Q16.51 2.85 16.605 2.885A.885.885 90 0116.775 2.965.7275.7275 90 0116.885 3.05.725.725 90 0117.0525 3.31.9975.9975 90 0117.1075 3.5425 1.1975 1.1975 90 0117.115 3.64L18.12 3.64A1.6125 1.6125 90 0018.055 3.1775 1.455 1.455 90 0017.98 2.9825Q17.84 2.68 17.5925 2.4625A1.7325 1.7325 90 0017.165 2.19 2.0775 2.0775 90 0016.9975 2.125 2.1625 2.1625 90 0016.4925 2.015 2.665 2.665 90 0016.2325 2.0025 2.7375 2.7375 90 0015.7525 2.045 2.32 2.32 90 0015.485 2.1075 2 2 90 0015.11 2.2625 1.6725 1.6725 90 0014.89 2.4075 1.4 1.4 90 0014.495 2.875Q14.35 3.15 14.35 3.4875A1.3925 1.3925 90 0014.4075 3.885 1.2675 1.2675 90 0014.46 4.03 1.38 1.38 90 0014.715 4.4175 1.6175 1.6175 90 0014.78 4.4825Q14.9775 4.675 15.2825 4.8375A3.2475 3.2475 90 0015.3275 4.86 3.495 3.495 90 0015.7125 5.0275 4.71 4.71 90 0016.105 5.1525Q16.39 5.23 16.5825 5.32A1.6875 1.6875 90 0116.7275 5.395Q16.8 5.4375 16.8575 5.485A.9225.9225 90 0116.895 5.515.7675.7675 90 0116.99 5.6225.5775.5775 90 0117.0625 5.75.7125.7125 90 0117.1125 5.9975.815.815 90 0117.1125 6.0175.6075.6075 90 0117.085 6.2025.555.555 90 0117.0525 6.28Q16.995 6.3975 16.885 6.4825A.7375.7375 90 0116.7425 6.5675.98.98 90 0116.615 6.615 1.0975 1.0975 90 0116.435 6.65 1.51 1.51 90 0116.2525 6.6625Q16.02 6.6625 15.8275 6.61A.9575.9575 90 0115.635 6.5375.785.785 90 0115.5 6.45.7275.7275 90 0115.295 6.19.8525.8525 90 0115.285 6.1675Q15.2125 6.0075 15.2025 5.7875A1.5825 1.5825 90 0115.2 5.7525ZM13.545 5.74 12.515 5.74Q12.5025 5.945 12.455 6.1A.9875.9875 90 0112.435 6.1525.87.87 90 0112.3575 6.31.6875.6875 90 0112.255 6.435.6825.6825 90 0112.0075 6.5875.8.8 90 0111.9825 6.595 1.0675 1.0675 90 0111.7825 6.6375 1.3975 1.3975 90 0111.62 6.6475Q11.47 6.6475 11.345 6.6125A.68.68 90 0111.125 6.505.7075.7075 90 0110.985 6.37.8125.8125 90 0110.9625 6.34.995.995 90 0110.875 6.1925 1.205 1.205 90 0110.84 6.1125 1.6125 1.6125 90 0110.775 5.9125Q10.7525 5.815 10.735 5.7075A2.675 2.675 90 0110.73 5.675Q10.695 5.425 10.695 5.105L10.695 4.38A4.415 4.415 90 0110.705 4.1025 3.595 3.595 90 0110.7175 3.9425 2.5075 2.5075 90 0110.75 3.725 1.985 1.985 90 0110.7875 3.57 1.59 1.59 90 0110.87 3.345 1.27 1.27 90 0110.955 3.1925Q11.0575 3.03 11.21 2.94A.72.72 90 0111.3975 2.865.83.83 90 0111.4 2.865Q11.505 2.8375 11.6275 2.8375 11.82 2.8375 11.9675 2.8825A.805.805 90 0112.0175 2.9.7325.7325 90 0112.2125 3.005.6625.6625 90 0112.29 3.0775.7575.7575 90 0112.405 3.255.9775.9775 90 0112.4525 3.3775Q12.505 3.545 12.5225 3.765A2.435 2.435 90 0112.5225 3.795L13.55 3.795A2.78 2.78 90 0013.4775 3.3575 2.2225 2.2225 90 0013.3725 3.0425Q13.235 2.71 12.9925 2.48A1.6125 1.6125 90 0012.515 2.1675 1.905 1.905 90 0012.4075 2.125 2.015 2.015 90 0011.9925 2.025 2.6925 2.6925 90 0011.6275 2 2.075 2.075 90 0011.2375 2.035 1.8025 1.8025 90 0011.0725 2.075Q10.8125 2.15 10.5975 2.29 10.355 2.455 10.165 2.6925A2.01 2.01 90 009.88 3.1775 2.275 2.275 90 009.8575 3.235 2.5075 2.5075 90 009.7325 3.6325 2.905 2.905 90 009.7025 3.775 3.4425 3.4425 90 009.655 4.2575 3.935 3.935 90 009.6525 4.3875L9.6525 5.105A3.7375 3.7375 90 009.6825 5.5825 3.2475 3.2475 90 009.71 5.7575 2.995 2.995 90 009.8 6.1225 2.505 2.505 90 009.8725 6.3225Q9.9825 6.5775 10.1425 6.79 10.3 7.0025 10.505 7.1525A1.7025 1.7025 90 0010.975 7.3875 1.925 1.925 90 0011.01 7.4 1.96 1.96 90 0011.4275 7.4775 2.365 2.365 90 0011.62 7.485 2.4725 2.4725 90 0012.065 7.4475 2.025 2.025 90 0012.38 7.3625 1.7975 1.7975 90 0012.8175 7.14 1.6175 1.6175 90 0012.975 7.0125Q13.2225 6.7875 13.3725 6.465A1.9075 1.9075 90 0013.5175 5.9825 2.355 2.355 90 0013.545 5.74ZM7.6175 2.915 9.26 2.915 9.26 2.0775 4.9625 2.0775 4.9625 2.915 6.5825 2.915 6.5825 7.41 7.6175 7.41 7.6175 2.915Z" />
+  <path stroke="#f00" stroke-width="1.5" d="M 0.4 9.4 L 18.6 0.6" />
+</svg>
diff --git a/symbols/nz/end_TWC.svg b/symbols/nz/end_TWC.svg
new file mode 100644
index 00000000..1800b94b
--- /dev/null
+++ b/symbols/nz/end_TWC.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="22.5" height="15" viewBox="0 0 15 10">
+  <rect stroke="#fff" stroke-width=".2" width="14.8" height="9.8" ry="1" x=".1" y=".1"/>
+  <path fill="#fff" d="M5.3975 2.0775 6.13 7.41 7.06 7.41 7.5075 4.53 7.5475 4.26 7.5875 4.53 8.0525 7.41 8.9825 7.41 9.7225 2.0775 8.7775 2.0775 8.415 5.065 8.39 5.2875 8.355 5.07 7.91 2.0775 7.1725 2.0775 6.7525 5.0475 6.72 5.2675 6.6925 5.0575 6.3375 2.0775 5.3975 2.0775ZM13.985 5.74 12.955 5.74Q12.9425 5.945 12.8925 6.1A.9875.9875 90 0112.875 6.1525.87.87 90 0112.7975 6.31.6875.6875 90 0112.695 6.435.6825.6825 90 0112.445 6.5875.8.8 90 0112.42 6.595 1.0675 1.0675 90 0112.22 6.6375 1.3975 1.3975 90 0112.0575 6.6475Q11.9075 6.6475 11.785 6.6125A.68.68 90 0111.565 6.505.7075.7075 90 0111.425 6.37.8125.8125 90 0111.4 6.34.995.995 90 0111.3125 6.1925 1.205 1.205 90 0111.2775 6.1125 1.6125 1.6125 90 0111.215 5.9125Q11.1925 5.815 11.175 5.7075A2.675 2.675 90 0111.17 5.675Q11.135 5.425 11.135 5.105L11.135 4.38A4.415 4.415 90 0111.145 4.1025 3.595 3.595 90 0111.1575 3.9425 2.5075 2.5075 90 0111.19 3.725 1.985 1.985 90 0111.2275 3.57 1.59 1.59 90 0111.31 3.345 1.27 1.27 90 0111.395 3.1925Q11.4975 3.03 11.6475 2.94A.72.72 90 0111.8375 2.865.83.83 90 0111.84 2.865Q11.945 2.8375 12.065 2.8375 12.26 2.8375 12.405 2.8825A.805.805 90 0112.455 2.9.7325.7325 90 0112.65 3.005.6625.6625 90 0112.7275 3.0775.7575.7575 90 0112.845 3.255.9775.9775 90 0112.8925 3.3775Q12.945 3.545 12.96 3.765A2.435 2.435 90 0112.9625 3.795L13.9875 3.795A2.78 2.78 90 0013.915 3.3575 2.2225 2.2225 90 0013.8125 3.0425Q13.6725 2.71 13.4325 2.48A1.6125 1.6125 90 0012.955 2.1675 1.905 1.905 90 0012.8475 2.125 2.015 2.015 90 0012.4325 2.025 2.6925 2.6925 90 0012.065 2 2.075 2.075 90 0011.675 2.035 1.8025 1.8025 90 0011.51 2.075Q11.2525 2.15 11.0375 2.29 10.795 2.455 10.605 2.6925A2.01 2.01 90 0010.32 3.1775 2.275 2.275 90 0010.2975 3.235 2.5075 2.5075 90 0010.1725 3.6325 2.905 2.905 90 0010.1425 3.775 3.4425 3.4425 90 0010.095 4.2575 3.935 3.935 90 0010.0925 4.3875L10.0925 5.105A3.7375 3.7375 90 0010.12 5.5825 3.2475 3.2475 90 0010.1475 5.7575 2.995 2.995 90 0010.24 6.1225 2.505 2.505 90 0010.3125 6.3225Q10.4225 6.5775 10.58 6.79 10.74 7.0025 10.945 7.1525A1.7025 1.7025 90 0011.415 7.3875 1.925 1.925 90 0011.4475 7.4 1.96 1.96 90 0011.8675 7.4775 2.365 2.365 90 0012.0575 7.485 2.4725 2.4725 90 0012.505 7.4475 2.025 2.025 90 0012.82 7.3625 1.7975 1.7975 90 0013.2575 7.14 1.6175 1.6175 90 0013.4125 7.0125Q13.6625 6.7875 13.81 6.465A1.9075 1.9075 90 0013.9575 5.9825 2.355 2.355 90 0013.985 5.74ZM3.555 2.915 5.2 2.915 5.2 2.0775.9 2.0775.9 2.915 2.5225 2.915 2.5225 7.41 3.555 7.41 3.555 2.915Z" />
+  <path stroke="#f00" stroke-width="1.5" d="M 0.4 9.4 L 14.6 0.6" />
+</svg>
diff --git a/symbols/nz/main/M.svg b/symbols/nz/main/M.svg
new file mode 100644
index 00000000..266c5388
--- /dev/null
+++ b/symbols/nz/main/M.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 8 18.5" width="8" height="18.5">
+  <rect x="3.5" y="16" width="1" height="2.5" fill="#777"/>
+  <rect x="0" height="16.5" width="8" ry="4" fill="#000"/>
+  <circle cx="4" cy="5" r="2.1" fill="#777"/>
+  <circle cx="4" cy="11.5" r="2.1" fill="#f00"/>
+</svg>
diff --git a/symbols/nz/main/MD-staggered.svg b/symbols/nz/main/MD-staggered.svg
new file mode 100644
index 00000000..8fbe8a34
--- /dev/null
+++ b/symbols/nz/main/MD-staggered.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 6.5 16" width="13" height="32">
+  <rect x="2" y="0" width="1" height="16" fill="#777"/>
+  <rect x="2" y="13" width="4" height="1" fill="#777"/>
+  <rect x="0" y="0.5" height="11" width="5" ry="2" fill="#000"/>
+  <circle cx="2.5" cy="3" r="1" fill="#777"/>
+  <circle cx="2.5" cy="6" r="1" fill="#777"/>
+  <circle cx="2.5" cy="9" r="1" fill="#f00"/>
+  <rect x="4.5" y="12.5" height="2" width="2" fill="#000" ry="0.2"/>
+  <circle cx="5.5" cy="13.5" r="0.5" fill="#f00"/>
+</svg>
diff --git a/symbols/nz/main_MD.svg b/symbols/nz/main/MD.svg
similarity index 96%
rename from symbols/nz/main_MD.svg
rename to symbols/nz/main/MD.svg
index 183719bb..92536d89 100644
--- a/symbols/nz/main_MD.svg
+++ b/symbols/nz/main/MD.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 5 16" width="5" height="16">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 5 16" width="10" height="32">
   <rect x="2" y="0" width="1" height="16" fill="#777"/>
   <rect x="0" y="0.5" height="11" width="5" ry="2" fill="#000"/>
   <circle cx="2.5" cy="3" r="1" fill="#777"/>
diff --git a/symbols/nz/main/MM-staggered.svg b/symbols/nz/main/MM-staggered.svg
new file mode 100644
index 00000000..cb65132e
--- /dev/null
+++ b/symbols/nz/main/MM-staggered.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 8.5 24.5" width="17" height="49">
+  <rect x="2" y="0" width="1" height="25" fill="#777"/>
+  <rect x="2" y="21" width="4.5" height="1" fill="#777"/>
+  <rect x="0" y="0.5" height="11" width="5" ry="2" fill="#000"/>
+  <circle cx="2.5" cy="3" r="1" fill="#777"/>
+  <circle cx="2.5" cy="6" r="1" fill="#777"/>
+  <circle cx="2.5" cy="9" r="1" fill="#f00"/>
+  <rect x="3.5" y="11" height="11" width="5" ry="2" fill="#000"/>
+  <circle cx="6" cy="13.5" r="1" fill="#777"/>
+  <circle cx="6" cy="16.5" r="1" fill="#777"/>
+  <circle cx="6" cy="19.5" r="1" fill="#f00"/>
+</svg>
diff --git a/symbols/nz/main_MM.svg b/symbols/nz/main/MM.svg
similarity index 96%
rename from symbols/nz/main_MM.svg
rename to symbols/nz/main/MM.svg
index ea4676dc..a3dadd6f 100644
--- a/symbols/nz/main_MM.svg
+++ b/symbols/nz/main/MM.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 5 24.5" width="5" height="24.5">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 5 24.5" width="10" height="49">
   <rect x="2" y="0" width="1" height="25" fill="#777"/>
   <rect x="0" y="0.5" height="11" width="5" ry="2" fill="#000"/>
   <circle cx="2.5" cy="3" r="1" fill="#777"/>
diff --git a/symbols/nz/main/MS-staggered.svg b/symbols/nz/main/MS-staggered.svg
new file mode 100644
index 00000000..a107c942
--- /dev/null
+++ b/symbols/nz/main/MS-staggered.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 7.5 16.5" width="15" height="33">
+  <rect x="2" y="0" width="1" height="16.5" fill="#777"/>
+  <rect x="2" y="13.5" width="2" height="1" fill="#777"/>
+  <rect x="0" y="0.5" height="11" width="5" ry="2" fill="#000"/>
+  <circle cx="2.5" cy="3" r="1" fill="#777"/>
+  <circle cx="2.5" cy="6" r="1" fill="#777"/>
+  <circle cx="2.5" cy="9" r="1" fill="#f00"/>
+  <circle cx="5.5" cy="14" r="2" fill="#000"/>
+  <circle cx="5.5" cy="14" r="1" fill="#f00"/>
+</svg>
diff --git a/symbols/nz/main_MS.svg b/symbols/nz/main/MS.svg
similarity index 95%
rename from symbols/nz/main_MS.svg
rename to symbols/nz/main/MS.svg
index 1738bacf..23f83214 100644
--- a/symbols/nz/main_MS.svg
+++ b/symbols/nz/main/MS.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 5 16.5" width="5" height="16.5">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 5 16.5" width="10" height="33">
   <rect x="2" y="0" width="1" height="16.5" fill="#777"/>
   <rect x="0" y="0.5" height="11" width="5" ry="2" fill="#000"/>
   <circle cx="2.5" cy="3" r="1" fill="#777"/>
diff --git a/symbols/nz/main/SD-staggered.svg b/symbols/nz/main/SD-staggered.svg
new file mode 100644
index 00000000..98bbf477
--- /dev/null
+++ b/symbols/nz/main/SD-staggered.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 6.5 7.5" width="16.25" height="18.75">
+  <rect x="2" y="0" width="1" height="7.5" fill="#777"/>
+  <rect x="2" y="5.5" width="3" height="1" fill="#777"/>
+  <circle cx="2.5" cy="2.5" r="2" fill="#000"/>
+  <circle cx="2.5" cy="2.5" r="1" fill="#f00"/>
+  <rect x="4.5" y="5" height="2" width="2" fill="#000" ry="0.2"/>
+  <circle cx="5.5" cy="6" r="0.5" fill="#f00"/>
+</svg>
diff --git a/symbols/nz/main_SD.svg b/symbols/nz/main/SD.svg
similarity index 93%
rename from symbols/nz/main_SD.svg
rename to symbols/nz/main/SD.svg
index d8528207..1f4a49fd 100644
--- a/symbols/nz/main_SD.svg
+++ b/symbols/nz/main/SD.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 5 7.5" width="5" height="7.5">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 5 7.5" width="12.5" height="18.75">
   <rect x="2" y="0" width="1" height="7.5" fill="#777"/>
   <circle cx="2.5" cy="2.5" r="2" fill="#000"/>
   <circle cx="2.5" cy="2.5" r="1" fill="#f00"/>
diff --git a/symbols/nz/main/SM-staggered.svg b/symbols/nz/main/SM-staggered.svg
new file mode 100644
index 00000000..2f18cfc4
--- /dev/null
+++ b/symbols/nz/main/SM-staggered.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 8.5 16.5" width="17" height="33">
+  <rect x="2" y="0" width="1" height="16.5" fill="#777"/>
+  <rect x="2" y="14" width="4.5" height="1" fill="#777"/>
+  <circle cx="2.5" cy="2.5" r="2" fill="#000"/>
+  <circle cx="2.5" cy="2.5" r="1" fill="#f00"/>
+  <rect x="3.5" y="4" height="11" width="5" ry="2" fill="#000"/>
+  <circle cx="6" cy="6.5" r="1" fill="#777"/>
+  <circle cx="6" cy="9.5" r="1" fill="#777"/>
+  <circle cx="6" cy="12.5" r="1" fill="#f00"/>
+</svg>
diff --git a/symbols/nz/main_SM.svg b/symbols/nz/main/SM.svg
similarity index 95%
rename from symbols/nz/main_SM.svg
rename to symbols/nz/main/SM.svg
index 64079a0c..57606721 100644
--- a/symbols/nz/main_SM.svg
+++ b/symbols/nz/main/SM.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 5 16.5" width="5" height="16.5">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 5 16.5" width="10" height="33">
   <rect x="2" y="0" width="1" height="16.5" fill="#777"/>
   <circle cx="2.5" cy="2.5" r="2" fill="#000"/>
   <circle cx="2.5" cy="2.5" r="1" fill="#f00"/>
diff --git a/symbols/nz/main/SS-staggered.svg b/symbols/nz/main/SS-staggered.svg
new file mode 100644
index 00000000..d4a17831
--- /dev/null
+++ b/symbols/nz/main/SS-staggered.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 7.5 9.5" width="18.75" height="23.75">
+  <rect x="2" y="0" width="1" height="9.5" fill="#777"/>
+  <rect x="2" y="6.5" width="4" height="1" fill="#777"/>
+  <circle cx="2.5" cy="2.5" r="2" fill="#000"/>
+  <circle cx="2.5" cy="2.5" r="1" fill="#f00"/>
+  <circle cx="5.5" cy="7" r="2" fill="#000"/>
+  <circle cx="5.5" cy="7" r="1" fill="#f00"/>
+</svg>
diff --git a/symbols/nz/main_SS.svg b/symbols/nz/main/SS.svg
similarity index 93%
rename from symbols/nz/main_SS.svg
rename to symbols/nz/main/SS.svg
index 8ff175d1..c7b3b3f0 100644
--- a/symbols/nz/main_SS.svg
+++ b/symbols/nz/main/SS.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 5 9.5" width="5" height="9.5">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 5 9.5" width="12.5" height="23.75">
   <rect x="2" y="0" width="1" height="9.5" fill="#777"/>
   <circle cx="2.5" cy="2.5" r="2" fill="#000"/>
   <circle cx="2.5" cy="2.5" r="1" fill="#f00"/>
diff --git a/symbols/nz/main/semaphore.svg b/symbols/nz/main/semaphore.svg
new file mode 100644
index 00000000..ede8825f
--- /dev/null
+++ b/symbols/nz/main/semaphore.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="18" height="19.568293" viewBox="0 0 18 19.568293">
+<path fill-rule="nonzero" fill="rgb(100%, 100%, 100%)" fill-opacity="1" d="M 12.78125 0 L 14.046875 0 L 14.046875 19.566406 L 12.78125 19.566406 Z M 12.78125 0 "/>
+<path fill-rule="nonzero" fill="rgb(0%, 0%, 0%)" fill-opacity="1" d="M 12.410156 3.0625 L 13.875 1.546875 L 16.742188 1.988281 L 17.824219 4.175781 L 13.347656 5.671875 L 12.410156 3.0625 "/>
+<path fill-rule="nonzero" fill="rgb(100%, 7.45098%, 0%)" fill-opacity="1" d="M 0 15.472656 L 12.410156 3.0625 L 14.898438 5.550781 L 2.488281 17.960938 Z M 0 15.472656 "/>
+<path fill-rule="nonzero" fill="rgb(100%, 100%, 100%)" fill-opacity="1" d="M 1.359375 14.113281 L 2.390625 13.085938 L 4.878906 15.574219 L 3.847656 16.601562 Z M 1.359375 14.113281 "/>
+<path fill-rule="nonzero" fill="rgb(0%, 0%, 0%)" fill-opacity="1" d="M 16.417969 1.546875 C 17.121094 2.25 17.121094 3.386719 16.417969 4.089844 C 15.714844 4.792969 14.574219 4.792969 13.875 4.089844 C 13.171875 3.386719 13.171875 2.25 13.875 1.546875 C 14.574219 0.84375 15.714844 0.84375 16.417969 1.546875 Z M 16.417969 1.546875 "/>
+<path fill-rule="nonzero" fill="rgb(0%, 0%, 0%)" fill-opacity="1" d="M 17.320312 3.421875 C 18.226562 4.332031 18.226562 5.804688 17.320312 6.714844 C 16.410156 7.621094 14.9375 7.621094 14.027344 6.714844 C 13.117188 5.804688 13.117188 4.332031 14.027344 3.421875 C 14.9375 2.515625 16.410156 2.515625 17.320312 3.421875 Z M 17.320312 3.421875 "/>
+<path fill-rule="nonzero" fill="rgb(0%, 81.568627%, 9.019608%)" fill-opacity="1" d="M 16.929688 5.070312 C 16.929688 5.761719 16.367188 6.328125 15.671875 6.328125 C 14.976562 6.328125 14.414062 5.761719 14.414062 5.070312 C 14.414062 4.375 14.976562 3.808594 15.671875 3.808594 C 16.367188 3.808594 16.929688 4.375 16.929688 5.070312 Z M 16.929688 5.070312 "/>
+<path fill-rule="nonzero" fill="rgb(22.352941%, 0%, 0%)" fill-opacity="1" d="M 15.972656 2.816406 C 15.972656 3.289062 15.589844 3.671875 15.117188 3.671875 C 14.644531 3.671875 14.261719 3.289062 14.261719 2.816406 C 14.261719 2.34375 14.644531 1.960938 15.117188 1.960938 C 15.589844 1.960938 15.972656 2.34375 15.972656 2.816406 Z M 15.972656 2.816406 "/>
+</svg>
diff --git a/symbols/nz/saltire.svg b/symbols/nz/saltire.svg
index dee0256b..e85e5955 100644
--- a/symbols/nz/saltire.svg
+++ b/symbols/nz/saltire.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 6.8" width="10" height="6.8">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 6.8" width="15" height="10.2">
   <path fill="#111" d="M 0.3125 1.25 L 0.3125 5.625 L 1.25 6.5625 L 8.75 6.5625 L 9.6875 5.625 L 9.6875 1.25 L 8.75 0.3125 L 1.25 0.3125 L 0.3125 1.25 Z"/>
   <path fill="#fff" d="M 0.3125 1.25 L 8.75 6.5625 L 9.6875 5.625 L 1.25 0.3125 Z"/>
   <path fill="#fff" d="M 0.3125 5.625 L 8.75 0.3125 L 9.6875 1.25 L 1.25 6.5625 Z"/>
diff --git a/symbols/nz/shunt2.svg b/symbols/nz/shunt2.svg
new file mode 100644
index 00000000..55e12de4
--- /dev/null
+++ b/symbols/nz/shunt2.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="8" height="12.5" viewBox="0 0 4 6.25">
+  <path d="M 0 6.25 H 4 V 1 C 4 1 4 0 3 0 H 1 C 0 0 0 1 0 1 Z"/>
+  <circle cx="2" cy="1.5" r="1" fill="#777"/>
+  <circle cx="2" cy="4.5" r="1" fill="#fc0"/>
+</svg>
diff --git a/symbols/nz/shunt3.svg b/symbols/nz/shunt3.svg
new file mode 100644
index 00000000..0fa9269e
--- /dev/null
+++ b/symbols/nz/shunt3.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="8" height="18.5" viewBox="0 0 4 9.25">
+  <path d="M 0 9.25 H 4 V 1 C 4 1 4 0 3 0 H 1 C 0 0 0 1 0 1 Z"/>
+  <circle cx="2" cy="1.5" r="1" fill="#777"/>
+  <circle cx="2" cy="4.5" r="1" fill="#fc0"/>
+  <circle cx="2" cy="7.5" r="1" fill="#777"/>
+</svg>
diff --git a/symbols/nz/shunting_limit.svg b/symbols/nz/shunting_limit.svg
new file mode 100644
index 00000000..6e7d58e8
--- /dev/null
+++ b/symbols/nz/shunting_limit.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="10" viewBox="0 0 10 5">
+  <rect width="10" height="5" fill="#000" stroke="#fff" stroke-width="0.2px" />
+  <path fill="#fff" d="M5.7252.8446v1.204H5.4485V.8445H5.0137V.6194H6.1661V.8446H5.7252ZM7.2093.6194V.8425H6.9306v.9842h.2787v.2218H6.3832V1.8268h.272V.8425h-.272V.6194h.8261Zm-3.553.9474a.7564.7564 90 01-.006.0998.5628.5628 90 01-.0268.1132q-.0328.0931-.0945.1568-.063.065-.1528.0985a.5119.5119 90 01-.0965.0248.6754.6754 90 01-.1079.008.6311.6311 90 01-.075-.004.4978.4978 90 01-.1199-.0288.4074.4074 90 01-.1487-.0971q-.0616-.0643-.0958-.1581A.5467.5467 90 012.7069 1.6794a.7236.7236 90 01-.008-.1126L2.6995.6194h.276l.0007.9474a.7973.7973 90 00.0007.0114q.0007.0315.004.0596a.459.459 90 00.0101.0543q.006.0261.0154.0482a.207.207 90 00.0241.0415.1561.1561 90 00.0596.0482.1715.1715 90 00.0395.0127.2238.2238 90 00.0422.0034.258.258 90 00.0362-.002.1976.1976 90 00.0523-.0147q.0389-.0174.0643-.0516a.209.209 90 00.0261-.0435.2861.2861 90 00.0154-.0449q.0074-.0302.0114-.065a.6392.6392 90 00.0033-.0576L3.3816.6194h.274l.0007.9474ZM.5207 1.605a.4241.4241 90 00.0007.0094q.0027.059.0221.1018a.2285.2285 90 00.0027.0054.195.195 90 00.0549.0697.2104.2104 90 00.0362.0234.2566.2566 90 00.0523.0201q.0509.0134.1132.0134a.4047.4047 90 00.0489-.0027.2941.2941 90 00.0482-.01.2626.2626 90 00.0342-.0121.1976.1976 90 00.0382-.0228q.0295-.0228.0456-.0549a.1487.1487 90 00.008-.0201.1628.1628 90 00.0074-.0502.2184.2184 90 000-.0047.191.191 90 00-.0134-.0663.1548.1548 90 00-.0188-.0348A.2057.2057 90 00.9756 1.5413a.2472.2472 90 00-.01-.0087Q.9495 1.5206.93 1.5092A.4523.4523 90 00.8912 1.4884Q.8396 1.465.7632 1.4442A1.2623 1.2623 90 01.658 1.4107.9367.9367 90 01.5549 1.3658.8703.8703 90 01.5435 1.3598Q.4611 1.3156.4081 1.2646A.4335.4335 90 01.3907 1.2472.3698.3698 90 01.3224 1.1427.3397.3397 90 01.3083 1.1045.3732.3732 90 01.2929.9973q0-.0898.0389-.1635A.3752.3752 90 01.4376.7079.4482.4482 90 01.4966.6697.536.536 90 01.5977.6281.6218.6218 90 01.6687.6107.7337.7337 90 01.7974.6.7142.7142 90 01.8671.6033.5796.5796 90 011.0024.6322.5568.5568 90 011.0473.6502.4643.4643 90 011.1619.7226q.0663.059.1038.1394A.3899.3899 90 011.2858.9142a.4322.4322 90 01.0174.1246H1.0339A.3209.3209 90 001.0319 1.012.2673.2673 90 001.0171.9504.1943.1943 90 00.9723.8807.195.195 90 00.9428.8579.2372.2372 90 00.8972.8358Q.8724.8271.8423.8231A.3752.3752 90 00.7927.8198.3906.3906 90 00.7438.8224.2848.2848 90 00.6949.8332.2559.2559 90 00.6627.8459.1956.1956 90 00.6232.87.1863.1863 90 00.6212.8714.1635.1635 90 00.5783.9276.1621.1621 90 00.575.9357.1688.1688 90 00.5629.9987.1628.1628 90 00.5629 1 .1347.1347 90 00.583 1.071.1695.1695 90 00.6098 1.1038a.2271.2271 90 00.0315.0255q.0389.0261.0931.0476a1.0023 1.0023 90 00.0583.0208 1.342 1.342 90 00.065.0194q.0737.0208.14.0502a.8402.8402 90 01.0188.0087.7477.7477 90 01.1038.059.5809.5809 90 01.0221.0174.4991.4991 90 01.1126.1286.339.339 90 01.0362.0844.4027.4027 90 01.0141.1085.4275.4275 90 01-.0033.0536.3377.3377 90 01-.0348.1132.3571.3571 90 01-.1045.1233.4208.4208 90 01-.063.0402.5126.5126 90 01-.0958.0368q-.0925.0261-.201.0261-.1072 0-.2117-.0322Q.4865 2.0037.4088 1.9413.3351 1.881.2929 1.7986A.3672.3672 90 01.2594 1.7028.4858.4858 90 01.25 1.605H.5207Zm1.6469.4435V1.4295h-.404v.6191h-.274V.6194h.274v.5863h.404V.6194h.2734V2.0485H2.1675Zm7.5496-.1668a.266.266 90 01-.0121.0141q-.0127.0134-.0288.0268a.5126.5126 90 01-.0322.0248q-.0456.0335-.1085.0603a.6707.6707 90 01-.059.0214.8335.8335 90 01-.0838.0228.7283.7283 90 01-.0603.0101.8676.8676 90 01-.1079.006q-.0791 0-.1481-.0181a.5481.5481 90 01-.0087-.002.4898.4898 90 01-.1186-.0503q-.057-.0355-.1032-.0864A.469.469 90 018.8374 1.9018.5025.5025 90 018.767 1.7946.5782.5782 90 018.7396 1.7323.7048.7048 90 018.7108 1.6305.8563.8563 90 018.698 1.5541a1.0519 1.0519 90 01-.0067-.1219V1.2378a1.0405 1.0405 90 01.002-.0683.8556.8556 90 01.0168-.1213Q8.7288.9605 8.763.8888A.672.672 90 018.7717.872.5963.5963 90 018.8381.7735.5293.5293 90 018.9319.6851q.0596-.0422.1307-.0636A.477.477 90 019.0779.6174.5126.5126 90 019.2112.6q.061 0 .1139.008A.5474.5474 90 019.4223.6301.4891.4891 90 019.4705.6496.3973.3973 90 019.5737.7179.3926.3926 90 019.5858.73.4094.4094 90 019.6702.8579.5742.5742 90 019.6963.9343a.7156.7156 90 01.0194.1092H9.4471a.5574.5574 90 000-.0007Q9.4404.9913 9.4263.9511A.2358.2358 90 009.4149.9249.1863.1863 90 009.3875.8834Q9.36.8533 9.3178.8378A.209.209 90 009.3051.8338Q9.2675.8231 9.2186.8231A.191.191 90 009.1577.8325.1997.1997 90 009.1027.8613.2358.2358 90 009.0726.8888.3002.3002 90 009.0424.9276q-.0268.0415-.0449.0972a.5065.5065 90 00-.0107.0409.6506.6506 90 00-.01.0556.7357.7357 90 00-.0047.0442.9139.9139 90 00-.0027.0703v.1963a1.0331 1.0331 90 00.002.0677.7859.7859 90 00.008.0737.7263.7263 90 000 .0013q.0107.063.0288.1119a.3806.3806 90 00.0047.0101.3363.3363 90 00.0228.0422.2734.2734 90 00.0047.0074.2419.2419 90 00.0288.0355.2097.2097 90 00.073.0476.2419.2419 90 00.0449.0121.3136.3136 90 00.0502.0047q.0322 0 .0637-.0047a.4335.4335 90 00.0154-.0027A.3745.3745 90 009.36 1.8281.341.341 90 009.3841 1.8187a.2573.2573 90 00.0241-.0114.1655.1655 90 00.0087-.0047q.0074-.0047.0127-.0087a.0784.0784 90 00.0107-.01l.0007-.2593H9.2046V1.3182h.5112l.0013.5635Zm-1.5216.1668-.3973-.9213v.9213H7.5208V.6194h.2774l.3946.9179.0007-.9179h.2774V2.0485H8.1955Zm-3.618 0-.398-.9212v.9212H3.9022V.6194h.2774l.3946.9179.0013-.9179h.2767V2.0485H4.5775Z" />
+  <path fill="#fff" d="M4.8676 3.3367 4.7323 2.8 4.3899 2.8 4.3899 4.2291 4.6432 4.2291 4.6432 3.8057 4.6311 3.1638 4.7993 3.7581 4.9353 3.7581 5.1229 3.1377 5.1115 3.8057 5.1115 4.2291 5.3641 4.2291 5.3641 2.8 5.0217 2.8 4.8676 3.3367ZM4.075 2.8 3.2482 2.8 3.2482 3.0231 3.5202 3.0231 3.5202 4.0073 3.2482 4.0073 3.2482 4.2291 4.075 4.2291 4.075 4.0073 3.7963 4.0073 3.7963 3.0231 4.075 3.0231 4.075 2.8ZM6.487 2.8 5.6609 2.8 5.6609 3.0231 5.9329 3.0231 5.9329 4.0073 5.6609 4.0073 5.6609 4.2291 6.487 4.2291 6.487 4.0073 6.2083 4.0073 6.2083 3.0231 6.487 3.0231 6.487 2.8ZM7.4156 3.0244 7.8565 3.0244 7.8565 2.8 6.7041 2.8 6.7041 3.0244 7.1389 3.0244 7.1389 4.2291 7.4156 4.2291 7.4156 3.0244ZM2.946 4.006 2.2767 4.006 2.2767 2.8 2 2.8 2 4.2291 2.946 4.2291 2.946 4.006Z" />
+</svg>
diff --git a/symbols/nz/stop_block_entry.svg b/symbols/nz/stop_block_entry.svg
new file mode 100644
index 00000000..50810b0a
--- /dev/null
+++ b/symbols/nz/stop_block_entry.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 500 500" width="17" height="17">
+  <rect x="10" y="10" width="480" height="480" fill="#ddd" stroke="red" stroke-width="15px" rx="60"/>
+  <circle r="90" cx="250" cy="250" fill="red" stroke="#fff" stroke-width="3"/>
+  <path d="M 413.7 111.75 L 425 99.4 L 451.35 143.2 L 475.8 143.2 L 438.6 83.7 L 474.5 36.55 L 449.3 36.55 L 423.4 72.35 L 413.7 85.4 L 413.7 36.55 L 393.05 36.55 L 393.05 143.2 L 413.7 143.2 L 413.7 111.75 Z M 377.25 109.8 L 356.65 109.8 Q 356.4 113.9 355.4 117 A 19.75 19.75 90 0 1 355.05 118.05 A 17.4 17.4 90 0 1 353.5 121.2 A 13.75 13.75 90 0 1 351.45 123.7 A 13.65 13.65 90 0 1 346.45 126.75 A 16 16 90 0 1 345.95 126.9 A 21.35 21.35 90 0 1 341.95 127.75 A 27.95 27.95 90 0 1 338.7 127.95 Q 335.7 127.95 333.25 127.25 A 13.6 13.6 90 0 1 328.85 125.1 A 14.15 14.15 90 0 1 326 122.4 A 16.25 16.25 90 0 1 325.55 121.8 A 19.9 19.9 90 0 1 323.8 118.85 A 24.1 24.1 90 0 1 323.1 117.25 A 32.25 32.25 90 0 1 321.85 113.25 Q 321.35 111.3 321.05 109.15 A 53.5 53.5 90 0 1 320.95 108.5 Q 320.25 103.5 320.25 97.1 L 320.25 82.6 A 88.3 88.3 90 0 1 320.4 77.05 A 71.9 71.9 90 0 1 320.7 73.85 A 50.15 50.15 90 0 1 321.35 69.5 A 39.7 39.7 90 0 1 322.1 66.4 A 31.8 31.8 90 0 1 323.75 61.9 A 25.4 25.4 90 0 1 325.4 58.85 Q 327.5 55.6 330.5 53.8 A 14.4 14.4 90 0 1 334.3 52.3 A 16.6 16.6 90 0 1 334.35 52.3 Q 336.45 51.75 338.85 51.75 Q 342.75 51.75 345.65 52.65 A 16.1 16.1 90 0 1 346.65 53 A 14.65 14.65 90 0 1 350.55 55.1 A 13.25 13.25 90 0 1 352.1 56.55 A 15.15 15.15 90 0 1 354.45 60.1 A 19.55 19.55 90 0 1 355.4 62.55 Q 356.45 65.9 356.75 70.3 A 48.7 48.7 90 0 1 356.8 70.9 L 377.3 70.9 A 55.6 55.6 90 0 0 375.85 62.15 A 44.45 44.45 90 0 0 373.8 55.85 Q 371 49.2 366.2 44.6 A 32.25 32.25 90 0 0 356.65 38.35 A 38.1 38.1 90 0 0 354.5 37.5 A 40.3 40.3 90 0 0 346.2 35.5 A 53.85 53.85 90 0 0 338.85 35 A 41.5 41.5 90 0 0 331.05 35.7 A 36.05 36.05 90 0 0 327.75 36.5 Q 322.6 38 318.3 40.8 Q 313.45 44.1 309.65 48.85 A 40.2 40.2 90 0 0 303.95 58.55 A 45.5 45.5 90 0 0 303.5 59.7 A 50.15 50.15 90 0 0 301 67.65 A 58.1 58.1 90 0 0 300.4 70.5 A 68.85 68.85 90 0 0 299.4 80.15 A 78.7 78.7 90 0 0 299.4 82.75 L 299.4 97.1 A 74.75 74.75 90 0 0 299.95 106.65 A 64.95 64.95 90 0 0 300.5 110.15 A 59.9 59.9 90 0 0 302.3 117.45 A 50.1 50.1 90 0 0 303.8 121.45 Q 305.95 126.55 309.15 130.8 Q 312.35 135.05 316.45 138.05 A 34.05 34.05 90 0 0 325.8 142.75 A 38.5 38.5 90 0 0 326.5 143 A 39.2 39.2 90 0 0 334.9 144.55 A 47.3 47.3 90 0 0 338.7 144.7 A 49.45 49.45 90 0 0 347.65 143.95 A 40.5 40.5 90 0 0 353.95 142.25 A 35.95 35.95 90 0 0 362.7 137.8 A 32.35 32.35 90 0 0 365.8 135.25 Q 370.8 130.75 373.75 124.3 A 38.15 38.15 90 0 0 376.7 114.65 A 47.1 47.1 90 0 0 377.25 109.8 Z M 195.15 126.55 L 145.2 126.55 L 145.2 36.55 L 124.55 36.55 L 124.55 143.2 L 195.15 143.2 L 195.15 126.55 Z M 33 36.55 L 33 143.2 L 71.9 143.2 A 67.35 67.35 90 0 0 80.25 142.7 A 50.9 50.9 90 0 0 87.7 141.2 A 36.9 36.9 90 0 0 94.6 138.55 A 29.5 29.5 90 0 0 99.65 135.25 A 26.25 26.25 90 0 0 107.2 125.45 A 29.35 29.35 90 0 0 109.4 117.85 A 39 39 90 0 0 109.85 111.9 A 28.65 28.65 90 0 0 108.75 104.1 A 23.75 23.75 90 0 0 105.5 97.1 A 22.85 22.85 90 0 0 100.25 91.85 A 19 19 90 0 0 97.4 90.1 Q 95.9 89.4 94.15 88.8 A 39.45 39.45 90 0 0 91.9 88.1 L 91.9 88.05 Q 94.6 87 96.85 85.55 A 25.55 25.55 90 0 0 100.15 82.95 A 23.1 23.1 90 0 0 100.8 82.3 Q 104.05 79.1 105.7 74.8 Q 107.35 70.5 107.4 65.7 A 34.2 34.2 90 0 0 106.85 59.3 A 25.15 25.15 90 0 0 104.65 52.7 A 24.35 24.35 90 0 0 96.85 43.65 Q 91.8 40.05 84.65 38.3 A 59.4 59.4 90 0 0 76.15 36.85 A 76.85 76.85 90 0 0 68.8 36.55 L 33 36.55 Z M 287.6 97.7 L 287.6 82.15 A 69.25 69.25 90 0 0 286.9 72.15 A 60.2 60.2 90 0 0 286.25 68.45 Q 284.9 62.05 282.3 56.6 A 44.65 44.65 90 0 0 276.7 47.9 A 32.7 32.7 90 0 0 269.15 41.15 Q 264.8 38.2 259.45 36.65 A 39.65 39.65 90 0 0 250.55 35.15 A 46.2 46.2 90 0 0 247.9 35.05 A 42.3 42.3 90 0 0 240.65 35.65 A 35.8 35.8 90 0 0 236.6 36.6 A 33.75 33.75 90 0 0 228.85 40 A 30.9 30.9 90 0 0 227.25 41 Q 223 43.95 219.75 48.05 A 42.75 42.75 90 0 0 214.35 56.9 A 46.7 46.7 90 0 0 214.2 57.2 A 52.6 52.6 90 0 0 211.3 65.75 A 61 61 90 0 0 210.65 68.85 A 68.25 68.25 90 0 0 209.5 78.7 A 78.7 78.7 90 0 0 209.45 82.15 L 209.45 97.7 A 73.45 73.45 90 0 0 210.05 107.2 A 64.4 64.4 90 0 0 210.5 110.2 A 57.5 57.5 90 0 0 212.45 117.95 A 49.65 49.65 90 0 0 213.6 121.2 A 43.7 43.7 90 0 0 217.85 129.1 A 39.4 39.4 90 0 0 219.25 131.05 A 37.2 37.2 90 0 0 226.85 138.5 A 35.4 35.4 90 0 0 236.3 143 A 39.4 39.4 90 0 0 236.45 143.05 A 37 37 90 0 0 244.15 144.5 A 44.85 44.85 90 0 0 247.95 144.65 A 42.55 42.55 90 0 0 255.5 144 A 36.65 36.65 90 0 0 258.9 143.2 A 38.1 38.1 90 0 0 267.2 139.85 A 35.2 35.2 90 0 0 268.25 139.2 Q 272.95 136.3 276.6 131.9 A 45.15 45.15 90 0 0 282.75 122.25 A 53.1 53.1 90 0 0 285.75 113.45 A 61.2 61.2 90 0 0 286.35 110.75 A 64.45 64.45 90 0 0 287.55 100.45 A 73.85 73.85 90 0 0 287.6 97.7 Z M 266.7 82 L 266.7 97.7 A 70.7 70.7 90 0 1 266.4 104.3 A 63.55 63.55 90 0 1 266.3 105.3 A 51.65 51.65 90 0 1 265.75 109.25 A 41.4 41.4 90 0 1 265.1 112.05 A 33.2 33.2 90 0 1 263.75 116.25 A 26.95 26.95 90 0 1 262.35 119.1 A 18.65 18.65 90 0 1 259.8 122.75 A 16.25 16.25 90 0 1 258.15 124.3 Q 256.15 125.95 253.6 126.85 A 16.3 16.3 90 0 1 249.85 127.65 A 19.95 19.95 90 0 1 247.95 127.7 A 18.65 18.65 90 0 1 244.9 127.5 A 14.25 14.25 90 0 1 242.2 126.75 Q 239.7 125.8 237.7 124.05 A 15.35 15.35 90 0 1 235.55 121.55 A 21 21 90 0 1 234 118.9 A 28 28 90 0 1 232.15 113.95 A 33.3 33.3 90 0 1 231.65 111.85 A 41.25 41.25 90 0 1 230.9 107.8 A 50.2 50.2 90 0 1 230.6 105.15 A 90.25 90.25 90 0 1 230.3 98.9 A 101.25 101.25 90 0 1 230.3 97.7 L 230.3 82 A 92.3 92.3 90 0 1 230.5 76.1 A 80.7 80.7 90 0 1 230.65 74.2 A 54.85 54.85 90 0 1 231.15 70.15 A 43.9 43.9 90 0 1 231.7 67.3 A 31.15 31.15 90 0 1 232.9 63.35 A 23.8 23.8 90 0 1 234.4 60.1 Q 236.1 57.05 238.6 55 A 13.55 13.55 90 0 1 242.75 52.85 Q 245.05 52.15 247.9 52.15 A 19.4 19.4 90 0 1 251 52.4 A 15.45 15.45 90 0 1 253.35 52.95 A 15.5 15.5 90 0 1 257.8 55.2 A 17.1 17.1 90 0 1 260.9 58.45 A 21.05 21.05 90 0 1 262.1 60.3 A 27.5 27.5 90 0 1 264.2 64.75 A 33.55 33.55 90 0 1 265.05 67.35 A 39.7 39.7 90 0 1 265.95 71.5 A 48.25 48.25 90 0 1 266.3 74.2 A 69.45 69.45 90 0 1 266.7 79.95 A 80.4 80.4 90 0 1 266.7 82 Z M 53.65 126.55 L 53.65 96.15 L 72.85 96.15 A 30.1 30.1 90 0 1 76.35 96.4 Q 78.5 96.7 80.3 97.35 A 14.7 14.7 90 0 1 83.15 98.65 A 11.5 11.5 90 0 1 85.45 100.5 A 11.65 11.65 90 0 1 88.15 104.8 A 13.75 13.75 90 0 1 88.35 105.3 Q 89.25 108.15 89.25 111.75 A 16.9 16.9 90 0 1 88.85 115.4 A 14 14 90 0 1 88.05 118 Q 86.85 120.75 84.5 122.75 A 13.95 13.95 90 0 1 81.75 124.5 A 18.85 18.85 90 0 1 79.2 125.55 A 20.8 20.8 90 0 1 75.35 126.35 A 27.65 27.65 90 0 1 71.95 126.55 L 53.65 126.55 Z M 68.95 81.3 L 53.65 81.3 L 53.65 53.3 L 68.9 53.3 A 43.15 43.15 90 0 1 73 53.55 Q 75 53.8 76.75 54.2 A 24.35 24.35 90 0 1 77.55 54.4 A 15.35 15.35 90 0 1 80.5 55.55 A 11.2 11.2 90 0 1 83.45 57.7 A 9.75 9.75 90 0 1 85.65 60.85 A 11.75 11.75 90 0 1 86 61.75 A 14.4 14.4 90 0 1 86.6 64.35 Q 86.85 65.75 86.85 67.35 A 16.45 16.45 90 0 1 86.6 70.3 A 12.8 12.8 90 0 1 85.85 72.85 A 11.3 11.3 90 0 1 83 76.95 A 12.15 12.15 90 0 1 80 79.05 A 16.75 16.75 90 0 1 77.25 80.15 A 26.15 26.15 90 0 1 73.35 80.95 Q 71.55 81.2 69.55 81.3 A 42.8 42.8 90 0 1 68.95 81.3 Z" />
+  <path d="M 171.65 461.65 L 192.15 461.65 L 192.15 355 L 171.5 355 L 171.45 423.5 L 142 355 L 121.25 355 L 121.25 461.65 L 142 461.65 L 142 392.85 L 171.65 461.65 Z M 53.65 414.9 L 97.45 414.9 L 97.45 398.65 L 53.65 398.65 L 53.65 371.75 L 104.65 371.75 L 104.65 355 L 33 355 L 33 461.65 L 104.85 461.65 L 104.85 445 L 53.65 445 L 53.65 414.9 Z M 322.45 421.8 L 338.05 421.8 L 358.1 461.65 L 380.15 461.65 L 380.15 460.7 L 357.25 416.65 A 41.2 41.2 90 0 0 363.8 413 A 37.1 37.1 90 0 0 365.2 412 Q 368.75 409.25 371.3 405.6 A 27.55 27.55 90 0 0 374.6 399.15 A 32.1 32.1 90 0 0 375.15 397.45 Q 376.5 392.85 376.5 387.15 A 38.75 38.75 90 0 0 375.9 380.15 A 29.25 29.25 90 0 0 373.75 373.25 Q 371 367.25 365.95 363.2 A 33.55 33.55 90 0 0 358.15 358.65 A 41.9 41.9 90 0 0 353.65 357.1 A 51.3 51.3 90 0 0 345.05 355.4 A 66.55 66.55 90 0 0 337.6 355 L 301.85 355 L 301.85 461.65 L 322.45 461.65 L 322.45 421.8 Z M 449.3 355 L 428.3 404.15 L 407.25 355 L 384.7 355 L 417.75 423.85 L 417.8 461.65 L 438.3 461.65 L 438.4 424.75 L 471.95 355 L 449.3 355 Z M 257.35 371.75 L 290.25 371.75 L 290.25 355 L 204.25 355 L 204.25 371.75 L 236.7 371.75 L 236.7 461.65 L 257.35 461.65 L 257.35 371.75 Z M 337.7 405.1 L 322.45 405.1 L 322.45 371.7 L 337.6 371.7 A 30.1 30.1 90 0 1 341.4 371.9 A 21.95 21.95 90 0 1 345.15 372.7 A 17.85 17.85 90 0 1 348.35 374.05 A 14.15 14.15 90 0 1 350.7 375.65 Q 353.3 377.8 354.55 381.05 A 18 18 90 0 1 355.6 385 A 24.25 24.25 90 0 1 355.85 388.55 A 21.6 21.6 90 0 1 355.55 392.2 A 17.2 17.2 90 0 1 354.85 394.9 A 14.15 14.15 90 0 1 353 398.55 A 12.85 12.85 90 0 1 351.95 399.8 A 13.75 13.75 90 0 1 347.85 402.95 A 17.2 17.2 90 0 1 346.05 403.75 A 20.65 20.65 90 0 1 341.9 404.8 A 28.4 28.4 90 0 1 337.7 405.1 Z" />
+</svg>
diff --git a/symbols/nz/stop_disk.svg b/symbols/nz/stop_disk.svg
index 01ab77c3..ac4190bf 100644
--- a/symbols/nz/stop_disk.svg
+++ b/symbols/nz/stop_disk.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 10" width="10" height="10">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 10" width="15" height="15">
   <circle r="4.4" cx="5" cy="5" fill="#fff"/>
   <circle r="3.6" cx="5" cy="5" fill="#f00"/>
 </svg>
diff --git a/symbols/nz/stop_plate.svg b/symbols/nz/stop_plate.svg
index 66c149dc..39835db6 100644
--- a/symbols/nz/stop_plate.svg
+++ b/symbols/nz/stop_plate.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 10" width="10" height="10">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 10" width="15" height="15">
   <rect x="0" y="0" width="10" height="10" fill="#333" rx="0.2"/>
   <circle r="4.4" cx="5" cy="5" fill="#fff"/>
   <circle r="3.6" cx="5" cy="5" fill="#f00"/>
diff --git a/symbols/nz/stop_position/2.svg b/symbols/nz/stop_position/2.svg
new file mode 100644
index 00000000..c002cd59
--- /dev/null
+++ b/symbols/nz/stop_position/2.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="10" height="15" viewBox="0 0 10 15">
+  <rect fill="#000" stroke="#fff" stroke-width=".4" width="9.6" height="14.6" ry="1" x=".2" y=".2"/>
+  <path fill="#fff" d="M2.176 11.648V10.536l2.76-2.964a14.48 14.48 90 00.088-.1q.132-.144.244-.276a8.188 8.188 90 00.212-.264 6.956 6.956 90 00.06-.08q.184-.24.304-.448a2.928 2.928 90 00.016-.028q.06-.108.104-.204a1.76 1.76 90 00.076-.208 1.572 1.572 90 00.028-.1A1.332 1.332 90 006.1 5.568a1.74 1.74 90 00-.016-.24A1.296 1.296 90 006.02 5.056a1.296 1.296 90 00-.036-.088 1.092 1.092 90 00-.192-.292 1.044 1.044 90 00-.36-.236 1.128 1.128 90 00-.176-.052A1.344 1.344 90 004.972 4.36a1.44 1.44 90 00-.008 0q-.148 0-.284.02a1.448 1.448 90 00-.288.072 1.224 1.224 90 00-.088.036 1.012 1.012 90 00-.324.228A1.076 1.076 90 003.844 4.9a1.312 1.312 90 00-.12.268 1.716 1.716 90 00-.068.3 2.324 2.324 90 00-.02.316H2a2.704 2.704 90 01.216-1.076 2.668 2.668 90 01.616-.888 2.624 2.624 90 01.292-.244 2.988 2.988 90 01.66-.356 3.044 3.044 90 01.484-.144A3.648 3.648 90 015.024 3a3.996 3.996 90 01.56.036 2.944 2.944 90 01.592.144 2.732 2.732 90 01.268.116 2.22 2.22 90 01.572.396 2.18 2.18 90 01.508.788 2.552 2.552 90 01.116.392 3.06 3.06 90 01.06.624q0 .424-.132.804a3.22 3.22 90 01-.08.216 3.684 3.684 90 01-.292.544 6.24 6.24 90 01-.216.308 7.724 7.724 90 01-.368.456 18.476 18.476 90 01-.36.4 22.904 22.904 90 01-.396.42L4.252 10.34H7.996v1.308H2.176Z" />
+</svg>
diff --git a/symbols/nz/stop_position/3.svg b/symbols/nz/stop_position/3.svg
new file mode 100644
index 00000000..c3af0bf7
--- /dev/null
+++ b/symbols/nz/stop_position/3.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="10" height="15" viewBox="0 0 10 15">
+  <rect fill="#000" stroke="#fff" stroke-width=".4" width="9.6" height="14.6" ry="1" x=".2" y=".2"/>
+  <path fill="#fff" d="M 4.788 6.668 L 3.904 6.668 L 3.904 7.932 L 4.788 7.932 Q 5.124 7.932 5.388 8.008 Q 5.656 8.084 5.848 8.244 A 1 1 90 0 1 6.112 8.588 A 1.192 1.192 90 0 1 6.136 8.648 Q 6.224 8.868 6.236 9.168 A 2.292 2.292 90 0 1 6.236 9.24 A 1.54 1.54 90 0 1 6.212 9.524 A 1.24 1.24 90 0 1 6.152 9.74 A 1 1 90 0 1 5.976 10.04 A 0.94 0.94 90 0 1 5.904 10.112 Q 5.732 10.284 5.48 10.372 A 1.548 1.548 90 0 1 5.16 10.444 A 2.02 2.02 90 0 1 4.912 10.46 Q 4.632 10.46 4.396 10.376 A 1.276 1.276 90 0 1 4.108 10.228 A 1.132 1.132 90 0 1 3.992 10.136 A 0.98 0.98 90 0 1 3.724 9.784 A 1.076 1.076 90 0 1 3.632 9.388 A 1.256 1.256 90 0 1 3.628 9.328 L 2 9.328 A 2.668 2.668 90 0 0 2.052 9.864 A 2 2 90 0 0 2.244 10.408 A 2.228 2.228 90 0 0 2.892 11.164 A 2.788 2.788 90 0 0 3.744 11.596 A 3.188 3.188 90 0 0 3.812 11.616 A 3.82 3.82 90 0 0 4.876 11.764 A 4.232 4.232 90 0 0 5.696 11.688 A 3.672 3.672 90 0 0 6.056 11.6 A 2.968 2.968 90 0 0 6.668 11.336 A 2.528 2.528 90 0 0 7.004 11.108 A 2.244 2.244 90 0 0 7.632 10.324 A 2.252 2.252 90 0 0 7.836 9.62 A 2.84 2.84 90 0 0 7.86 9.256 A 2.524 2.524 90 0 0 7.808 8.732 A 2.284 2.284 90 0 0 7.776 8.612 A 1.924 1.924 90 0 0 7.524 8.052 A 1.884 1.884 90 0 0 7.168 7.656 A 2.164 2.164 90 0 0 7.096 7.6 A 2.108 2.108 90 0 0 6.732 7.38 A 2.648 2.648 90 0 0 6.476 7.272 A 2.524 2.524 90 0 0 6.888 7.028 A 2.228 2.228 90 0 0 7.016 6.924 A 2.18 2.18 90 0 0 7.344 6.572 A 1.98 1.98 90 0 0 7.408 6.48 Q 7.568 6.24 7.648 5.972 A 1.832 1.832 90 0 0 7.732 5.432 A 2.924 2.924 90 0 0 7.684 4.904 A 2.212 2.212 90 0 0 7.524 4.38 A 2.132 2.132 90 0 0 6.94 3.616 A 2.404 2.404 90 0 0 6.352 3.268 A 2.98 2.98 90 0 0 6.036 3.156 A 3.784 3.784 90 0 0 5.336 3.02 A 4.708 4.708 90 0 0 4.876 3 A 3.572 3.572 90 0 0 4.108 3.08 A 3.14 3.14 90 0 0 3.784 3.168 A 2.948 2.948 90 0 0 3.184 3.448 A 2.556 2.556 90 0 0 2.904 3.644 A 2.264 2.264 90 0 0 2.312 4.384 A 2.044 2.044 90 0 0 2.104 5.172 A 2.444 2.444 90 0 0 2.1 5.332 L 3.728 5.332 A 1.008 1.008 90 0 1 3.76 5.084 A 0.856 0.856 90 0 1 3.824 4.912 A 0.98 0.98 90 0 1 4.08 4.588 A 1.112 1.112 90 0 1 4.36 4.424 A 1.32 1.32 90 0 1 4.452 4.388 Q 4.668 4.32 4.912 4.32 A 1.848 1.848 90 0 1 5.168 4.336 Q 5.304 4.356 5.42 4.396 A 1.14 1.14 90 0 1 5.436 4.4 Q 5.664 4.484 5.808 4.628 A 0.984 0.984 90 0 1 6.028 4.988 A 1.288 1.288 90 0 1 6.092 5.288 A 1.596 1.596 90 0 1 6.1 5.448 A 1.596 1.596 90 0 1 6.072 5.764 A 1.364 1.364 90 0 1 6.028 5.928 A 1.028 1.028 90 0 1 5.908 6.176 A 0.904 0.904 90 0 1 5.808 6.3 A 0.972 0.972 90 0 1 5.544 6.504 A 1.24 1.24 90 0 1 5.396 6.572 A 1.404 1.404 90 0 1 5.124 6.644 Q 5 6.664 4.856 6.668 A 2.456 2.456 90 0 1 4.788 6.668 Z" />
+</svg>
diff --git a/symbols/nz/stop_position/4.svg b/symbols/nz/stop_position/4.svg
new file mode 100644
index 00000000..118bf5ad
--- /dev/null
+++ b/symbols/nz/stop_position/4.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="10" height="15" viewBox="0 0 10 15">
+  <rect fill="#000" stroke="#fff" stroke-width=".4" width="9.6" height="14.6" ry="1" x=".2" y=".2"/>
+  <path fill="#fff" d="M7.928 8.36H6.94V3H5.284L1.7 8.66l.064 1.02H5.308v1.852H6.94V9.68h.988V8.36Zm-2.62 0H3.3L5.152 5.472l.156-.28V8.36Z" />
+</svg>
diff --git a/symbols/nz/stop_position/6.svg b/symbols/nz/stop_position/6.svg
new file mode 100644
index 00000000..b4bc9866
--- /dev/null
+++ b/symbols/nz/stop_position/6.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="10" height="15" viewBox="0 0 10 15">
+  <rect fill="#000" stroke="#fff" stroke-width=".4" width="9.6" height="14.6" ry="1" x=".2" y=".2"/>
+  <path fill="#fff" d="M3.636 8.536q0 .252.028.468a2.544 2.544 90 00.068.352q.096.352.272.58a1.344 1.344 90 00.064.08 1.116 1.116 90 00.352.272 1.172 1.172 90 00.52.12 1.316 1.316 90 00.088-.004 1.1 1.1 90 00.436-.116q.232-.12.396-.332a1.38 1.38 90 00.128-.192 1.664 1.664 90 00.124-.308 1.952 1.952 90 00.06-.248A2.372 2.372 90 006.2 8.82a2.536 2.536 90 00-.008-.212 2.088 2.088 90 00-.08-.428 1.844 1.844 90 00-.056-.16A1.516 1.516 90 005.86 7.668a1.176 1.176 90 00-.4-.328 1.072 1.072 90 00-.24-.088 1.32 1.32 90 00-.3-.032 1.584 1.584 90 00-.08 0 1.368 1.368 90 00-.36.068 1.356 1.356 90 00-.376.188 1.584 1.584 90 00-.268.26q-.12.144-.2.32v.48Zm2.9-4.184H6.44a4.164 4.164 90 00-.568.04A3.028 3.028 90 005.3 4.524a2.804 2.804 90 00-.264.108 2.292 2.292 90 00-.576.372 2.248 2.248 90 00-.552.744 2.684 2.684 90 00-.132.34 3.164 3.164 90 00-.124.628 2.648 2.648 90 01.108-.112 3.228 3.228 90 01.204-.18 2.148 2.148 90 01.112-.088 2.5 2.5 90 01.284-.172 2.216 2.216 90 01.12-.056 2.536 2.536 90 01.356-.124 1.908 1.908 90 01.2-.044 2.248 2.248 90 01.356-.028 2.78 2.78 90 01.452.036 2.084 2.084 90 01.612.196 2.228 2.228 90 01.76.624 2.544 2.544 90 01.168.248 2.844 2.844 90 01.284.676 3.756 3.756 90 01.032.112 4.052 4.052 90 01.12.992q0 .62-.2 1.152a3.092 3.092 90 01-.012.036 2.72 2.72 90 01-.556.892 2.52 2.52 90 01-.144.14 2.68 2.68 90 01-.752.476 2.688 2.688 90 01-.508.16 3.292 3.292 90 01-.676.068 3.408 3.408 90 01-.376-.02 2.76 2.76 90 01-.86-.236q-.552-.256-.932-.708a2.94 2.94 90 01-.244-.328 3.348 3.348 90 01-.352-.74A3.808 3.808 90 012.08 9.204 4.508 4.508 90 012 8.336V7.712a7.024 7.024 90 01.02-.56 5.868 5.868 90 01.256-1.32 4.86 4.86 90 01.092-.264 4.144 4.144 90 01.728-1.232 3.624 3.624 90 01.232-.244 3.836 3.836 90 011.12-.736Q5.256 3 6.32 3h.216V4.352Z" />
+</svg>
diff --git a/symbols/nz/stop_position/8.svg b/symbols/nz/stop_position/8.svg
new file mode 100644
index 00000000..8d563ffe
--- /dev/null
+++ b/symbols/nz/stop_position/8.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="10" height="15" viewBox="0 0 10 15">
+  <rect fill="#000" stroke="#fff" stroke-width=".4" width="9.6" height="14.6" ry="1" x=".2" y=".2"/>
+  <path fill="#fff" d="M6.064 9.492a1.62 1.62 90 00.024-.288 1.752 1.752 90 00-.012-.212A1.368 1.368 90 006 8.676q-.084-.232-.244-.404-.164-.164-.388-.252a1.236 1.236 90 00-.224-.06A1.552 1.552 90 004.86 7.932a1.624 1.624 90 00-.196.012 1.28 1.28 90 00-.312.076 1.212 1.212 90 00-.02.008 1.052 1.052 90 00-.364.244 1.136 1.136 90 00-.08.096 1.244 1.244 90 00-.164.308 1.324 1.324 90 00-.064.236 1.68 1.68 90 00-.024.292q0 .304.092.548a1.244 1.244 90 00.044.1 1.024 1.024 90 00.22.296q.16.152.38.232a1.316 1.316 90 00.22.056 1.656 1.656 90 00.28.024 1.588 1.588 90 00.156-.008 1.296 1.296 90 00.336-.076 1.088 1.088 90 00.388-.252 1.104 1.104 90 00.092-.108A1.24 1.24 90 006 9.728a1.26 1.26 90 00.064-.236ZM5.896 5.744A1.58 1.58 90 005.92 5.46q0-.256-.076-.468a1.276 1.276 90 00-.036-.088A1.076 1.076 90 005.632 4.628.992.992 90 005.296 4.4 1.02 1.02 90 005.1 4.34a1.268 1.268 90 00-.248-.02 1.392 1.392 90 00-.2.012 1.04 1.04 90 00-.244.064.984.984 90 00-.036.016.84.84 90 00-.288.212.86.86 90 00-.104.14 1.024 1.024 90 00-.096.22 1.396 1.396 90 00-.048.196 1.72 1.72 90 00-.02.276 1.776 1.776 90 00.012.196 1.388 1.388 90 00.06.28 1.136 1.136 90 00.024.064.964.964 90 00.184.304q.136.152.332.236a.992.992 90 00.196.06 1.228 1.228 90 00.248.024 1.28 1.28 90 00.164-.008.996.996 90 00.276-.076A.932.932 90 005.64 6.3a.976.976 90 00.092-.124 1.136 1.136 90 00.116-.244 1.3 1.3 90 00.048-.188Zm1.648-.36a2.344 2.344 90 01-.004.108 2.032 2.032 90 01-.1.552q-.104.308-.288.564a2.124 2.124 90 01-.028.036 2.304 2.304 90 01-.316.324 2.26 2.26 90 01-.436.292 3.252 3.252 90 01.408.236q.196.132.348.296a2.144 2.144 90 01.44.68 2.048 2.048 90 01.084.264 2.312 2.312 90 01.072.58 2.892 2.892 90 01-.032.448 2.184 2.184 90 01-.188.612 2.156 2.156 90 01-.6.764 2.468 2.468 90 01-.28.196 2.812 2.812 90 01-.628.272 3.508 3.508 90 01-.352.088 4.06 4.06 90 01-.772.068 4.448 4.448 90 01-.32-.008 3.744 3.744 90 01-.816-.148 3.072 3.072 90 01-.22-.076 2.58 2.58 90 01-.688-.392 2.128 2.128 90 01-.608-.764 2.148 2.148 90 01-.172-.524A2.82 2.82 90 012 9.316q0-.352.096-.664a2.208 2.208 90 01.272-.576q.176-.26.424-.468.252-.208.56-.356a2.328 2.328 90 01-.476-.32 1.956 1.956 90 01-.36-.416q-.16-.24-.244-.528A1.996 1.996 90 012.264 5.96a2.124 2.124 90 01-.076-.576q0-.58.2-1.02a2.1 2.1 90 01.556-.748 2.172 2.172 90 01.284-.208 2.496 2.496 90 01.556-.252 3.164 3.164 90 01.396-.1A3.792 3.792 90 014.852 3a4.068 4.068 90 01.328.012 3.372 3.372 90 01.744.144 2.84 2.84 90 01.156.052 2.416 2.416 90 01.7.408 2.132 2.132 90 01.56.748 2.152 2.152 90 01.156.492 2.824 2.824 90 01.048.528Z" />
+</svg>
diff --git a/symbols/nz/whistle.svg b/symbols/nz/whistle.svg
new file mode 100644
index 00000000..d71f5f9c
--- /dev/null
+++ b/symbols/nz/whistle.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 10 10">
+  <rect width="10" height="10" fill="#fff" stroke="#000" stroke-width="0.5px"/>
+  <path fill="#000" d="M 1.5 0.8 L 2.672 9.332 L 4.16 9.332 L 4.94 4.292 L 5.748 9.332 L 7.236 9.332 L 8.42 0.8 L 6.908 0.8 L 6.288 5.94 L 5.52 0.8 L 4.34 0.8 L 3.616 5.904 L 3.004 0.8 L 1.5 0.8 Z" />
+</svg>