diff --git a/docker-compose.yml b/docker-compose.yml
index 22494b81..1fc540a4 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -44,7 +44,7 @@ services:
       - OSM2PGSQL_DATAFILE
 
   martin-cp:
-    image: ghcr.io/maplibre/martin
+    image: ghcr.io/maplibre/martin:main
     depends_on:
       db:
         condition: service_healthy
diff --git a/features/signals_railway_signals.yaml b/features/signals_railway_signals.yaml
index cbb42dc5..5bcc2816 100644
--- a/features/signals_railway_signals.yaml
+++ b/features/signals_railway_signals.yaml
@@ -826,9 +826,18 @@ signals_railway_signals:
 
     - description: Blockkennzeichen
       country: DE
-      # TODO match width and height
-      # WHEN ref_width <= 4 AND ref_height <= 2 THEN CONCAT('de/blockkennzeichen-', ref_width, 'x', ref_height)
-      icon: { default: 'de/blockkennzeichen' }
+      icon:
+        match: 'ref_multiline'
+        cases:
+          - { regex: '^([^\n]{4}\n[^\n]{1,4})|([^\n]{1,4}\n[^\n]{4})$', value: 'de/blockkennzeichen-4x2' }
+          - { regex: '^[^\n]{4}$', value: 'de/blockkennzeichen-4x1' }
+          - { regex: '^([^\n]{3}\n[^\n]{1,3})|([^\n]{1,3}\n[^\n]{3})$', value: 'de/blockkennzeichen-3x2' }
+          - { regex: '^[^\n]{3}$', value: 'de/blockkennzeichen-3x1' }
+          - { regex: '^([^\n]{2}\n[^\n]{1,2})|([^\n]{1,2}\n[^\n]{2})$', value: 'de/blockkennzeichen-2x2' }
+          - { regex: '^[^\n]{2}$', value: 'de/blockkennzeichen-2x1' }
+          - { regex: '^[^\n]\n[^\n]$', value: 'de/blockkennzeichen-1x2' }
+          - { regex: '^[^\n]$', value: 'de/blockkennzeichen-1x1' }
+        default: 'de/blockkennzeichen'
       tags:
         - { tag: 'railway:signal:train_protection', value: 'DE-ESO:blockkennzeichen' }
 
diff --git a/import/openrailwaymap.lua b/import/openrailwaymap.lua
index f14b4597..35006e17 100644
--- a/import/openrailwaymap.lua
+++ b/import/openrailwaymap.lua
@@ -169,8 +169,6 @@ local signals = osm2pgsql.define_table({
     { column = 'deactivated', type = 'boolean' },
     { column = 'ref', type = 'text' },
     { column = 'ref_multiline', type = 'text' },
-    { column = 'ref_width', type = 'smallint' },
-    { column = 'ref_height', type = 'smallint' },
     { column = 'signal_direction', type = 'text' },
     {% for tag in signals_railway_signals.tags %}
     { column = '{% tag %}', type = 'text' },
@@ -429,11 +427,6 @@ function osm2pgsql.process_node(object)
       tags['railway:signal:speed_limit:deactivated']
     ) == 'yes'
     local ref_multiline, newline_count = (tags.ref or ''):gsub(' ', '\n')
-    local ref_height = newline_count + 1
-    local ref_width = 0
-    for part in string.gmatch(tags.ref or '', '[^ ]+') do
-      ref_width = math.max(ref_width, part:len())
-    end
 
     signals:insert({
       way = object:as_point(),
@@ -442,8 +435,6 @@ function osm2pgsql.process_node(object)
       deactivated = deactivated,
       ref = tags.ref,
       ref_multiline = ref_multiline ~= '' and ref_multiline or nil,
-      ref_height = ref_multiline ~= '' and ref_height or nil,
-      ref_width = ref_multiline ~= '' and ref_width or nil,
       signal_direction = tags['railway:signal:direction'],
       {% for tag in signals_railway_signals.tags %}
       ["{% tag %}"] = tags['{% tag %}'],
diff --git a/martin-static.Dockerfile b/martin-static.Dockerfile
index 83bb5e76..a7271295 100644
--- a/martin-static.Dockerfile
+++ b/martin-static.Dockerfile
@@ -1,7 +1,7 @@
-FROM ghcr.io/maplibre/martin
+FROM ghcr.io/maplibre/martin:main
 
 COPY martin /config
 COPY symbols /symbols
 COPY tiles /tiles
 
-CMD ["/tiles", "--listen-addresses", "[::]:3000", "--sprite", "/symbols", "--font", "/config/fonts"]
\ No newline at end of file
+CMD ["/tiles", "--listen-addresses", "[::]:3000", "--sprite", "/symbols", "--font", "/config/fonts"]
diff --git a/martin.Dockerfile b/martin.Dockerfile
index 6a1bb999..bc5a074d 100644
--- a/martin.Dockerfile
+++ b/martin.Dockerfile
@@ -1,6 +1,6 @@
-FROM ghcr.io/maplibre/martin
+FROM ghcr.io/maplibre/martin:main
 
 COPY martin /config
 COPY symbols /symbols
 
-CMD ["--config", "/config/configuration.yml", "--sprite", "/symbols", "--font", "/config/fonts"]
\ No newline at end of file
+CMD ["--config", "/config/configuration.yml", "--sprite", "/symbols", "--font", "/config/fonts"]
diff --git a/proxy/js/styles.mjs b/proxy/js/styles.mjs
index 84f9c4a5..f3fda0cb 100644
--- a/proxy/js/styles.mjs
+++ b/proxy/js/styles.mjs
@@ -54,6 +54,9 @@ const colors = {
       },
     },
   },
+  signals: {
+    direction: '#a8d8bcff'
+  }
 };
 
 const turntable_casing_width = 2;
@@ -561,13 +564,14 @@ const trainProtectionLayout = {
   'line-join': 'round',
   'line-cap': 'round',
 };
+const trainProtectionColor = ['case',
+  ['boolean', ['feature-state', 'hover'], false], colors.hover.main,
+  ...signals_railway_line.train_protections.flatMap(train_protection =>
+    [['==', ['get', 'train_protection'], train_protection.train_protection], train_protection.color]),
+  'grey',
+];
 const trainProtectionFillPaint = dashArray => ({
-  'line-color': ['case',
-    ['boolean', ['feature-state', 'hover'], false], colors.hover.main,
-    ...signals_railway_line.train_protections.flatMap(train_protection =>
-      [['==', ['get', 'train_protection'], train_protection.train_protection], train_protection.color]),
-    'grey',
-  ],
+  'line-color': trainProtectionColor,
   'line-width': railwayLineWidth,
   'line-dasharray': dashArray,
 });
@@ -606,39 +610,40 @@ const standardMediumFillPaint = {
   ],
   'line-width': railwayLineWidth,
 };
-const standardFillPaint = dashArray => ({
-  'line-color': ['case',
-    ['boolean', ['feature-state', 'hover'], false], ['case',
-      ['all', ['==', ['get', 'usage'], 'main'], ['get', 'highspeed']], colors.hover.alternative,
-      colors.hover.main,
-    ],
-    ['==', ['get', 'railway'], 'disused'], colors.styles.standard.disused,
-    ['==', ['get', 'railway'], 'abandoned'], colors.styles.standard.abandoned,
-    ['==', ['get', 'railway'], 'razed'], colors.styles.standard.razed,
-    ['==', ['get', 'feature'], 'rail'],
-    ['case',
-      ['all', ['==', ['get', 'usage'], null], ['==', ['get', 'service'], 'spur']], colors.styles.standard.spur,
-      ['all', ['==', ['get', 'usage'], null], ['==', ['get', 'service'], 'yard']], colors.styles.standard.yard,
-      ['all', ['==', ['get', 'usage'], null], ['==', ['get', 'service'], 'crossover']], colors.styles.standard.siding,
-      ['all', ['==', ['get', 'usage'], null], ['==', ['get', 'service'], 'siding']], colors.styles.standard.siding,
-      ['all', ['==', ['get', 'usage'], null], ['==', ['get', 'service'], null]], colors.styles.standard.no_usage,
-      ['==', ['get', 'usage'], 'industrial'], colors.styles.standard.industrial,
-      ['==', ['get', 'usage'], 'tourism'], colors.styles.standard.tourism,
-      ['==', ['get', 'usage'], 'branch'], colors.styles.standard.branch,
-      ['all', ['==', ['get', 'usage'], 'main'], ['get', 'highspeed']], colors.styles.standard.highspeed,
-      ['==', ['get', 'usage'], 'main'], colors.styles.standard.main,
-      'rgba(255, 255, 255, 1.0)',
-    ],
-    ['==', ['get', 'feature'], 'narrow_gauge'],
-    ['case',
-      ['all', ['==', ['get', 'usage'], 'industrial'], ['==', ['get', 'service'], 'spur']], colors.styles.standard.industrial,
-      colors.styles.standard.narrowGauge,
-    ],
-    ['==', ['get', 'feature'], 'subway'], colors.styles.standard.subway,
-    ['==', ['get', 'feature'], 'light_rail'], colors.styles.standard.light_rail,
-    ['==', ['get', 'feature'], 'tram'], colors.styles.standard.tram,
+const standardColor = ['case',
+  ['boolean', ['feature-state', 'hover'], false], ['case',
+    ['all', ['==', ['get', 'usage'], 'main'], ['get', 'highspeed']], colors.hover.alternative,
+    colors.hover.main,
+  ],
+  ['==', ['get', 'railway'], 'disused'], colors.styles.standard.disused,
+  ['==', ['get', 'railway'], 'abandoned'], colors.styles.standard.abandoned,
+  ['==', ['get', 'railway'], 'razed'], colors.styles.standard.razed,
+  ['==', ['get', 'feature'], 'rail'],
+  ['case',
+    ['all', ['==', ['get', 'usage'], null], ['==', ['get', 'service'], 'spur']], colors.styles.standard.spur,
+    ['all', ['==', ['get', 'usage'], null], ['==', ['get', 'service'], 'yard']], colors.styles.standard.yard,
+    ['all', ['==', ['get', 'usage'], null], ['==', ['get', 'service'], 'crossover']], colors.styles.standard.siding,
+    ['all', ['==', ['get', 'usage'], null], ['==', ['get', 'service'], 'siding']], colors.styles.standard.siding,
+    ['all', ['==', ['get', 'usage'], null], ['==', ['get', 'service'], null]], colors.styles.standard.no_usage,
+    ['==', ['get', 'usage'], 'industrial'], colors.styles.standard.industrial,
+    ['==', ['get', 'usage'], 'tourism'], colors.styles.standard.tourism,
+    ['==', ['get', 'usage'], 'branch'], colors.styles.standard.branch,
+    ['all', ['==', ['get', 'usage'], 'main'], ['get', 'highspeed']], colors.styles.standard.highspeed,
+    ['==', ['get', 'usage'], 'main'], colors.styles.standard.main,
     'rgba(255, 255, 255, 1.0)',
   ],
+  ['==', ['get', 'feature'], 'narrow_gauge'],
+  ['case',
+    ['all', ['==', ['get', 'usage'], 'industrial'], ['==', ['get', 'service'], 'spur']], colors.styles.standard.industrial,
+    colors.styles.standard.narrowGauge,
+  ],
+  ['==', ['get', 'feature'], 'subway'], colors.styles.standard.subway,
+  ['==', ['get', 'feature'], 'light_rail'], colors.styles.standard.light_rail,
+  ['==', ['get', 'feature'], 'tram'], colors.styles.standard.tram,
+  'rgba(255, 255, 255, 1.0)',
+]
+const standardFillPaint = dashArray => ({
+  'line-color': standardColor,
   'line-width': railwayLineWidth,
   'line-dasharray': dashArray,
 });
@@ -657,16 +662,18 @@ const maxSpeed = 380
 const startHue = 248
 const endHue = 284;
 
-const speedFillPaint = {
-  'line-color': ['case',
-    ['boolean', ['feature-state', 'hover'], false], ['case',
-      ['all', ['>=', ['get', 'maxspeed'], 260], ['<=', ['get', 'maxspeed'], 300]], colors.hover.alternative,
-      colors.hover.main,
-    ],
-    ['==', ['get', 'maxspeed'], null], 'gray',
-    // Reverse hue order
-    ['concat', 'hsl(', ['%', ['+', ['-', startHue, ['*', startHue + (360 - endHue), ['/', ['-', ['max', minSpeed, ['min', ['get', 'maxspeed'], maxSpeed]], minSpeed], maxSpeed - minSpeed]]], 360], 360], ', 100%, 40%)'],
+const speedColor = ['case',
+  ['boolean', ['feature-state', 'hover'], false], ['case',
+    ['all', ['>=', ['get', 'maxspeed'], 260], ['<=', ['get', 'maxspeed'], 300]], colors.hover.alternative,
+    colors.hover.main,
   ],
+  ['==', ['get', 'maxspeed'], null], 'gray',
+  // Reverse hue order
+  ['concat', 'hsl(', ['%', ['+', ['-', startHue, ['*', startHue + (360 - endHue), ['/', ['-', ['max', minSpeed, ['min', ['get', 'maxspeed'], maxSpeed]], minSpeed], maxSpeed - minSpeed]]], 360], 360], ', 100%, 40%)'],
+]
+
+const speedFillPaint = {
+  'line-color': speedColor,
   'line-width': railwayLineWidth,
 };
 
@@ -701,54 +708,55 @@ const electrificationCasingPaint = {
   'line-width': railwayLineWidth,
   'line-gap-width': 0.75,
 };
-const electrificationFillPaint = (dashArray, voltageProperty, frequencyProperty) => ({
-  'line-color': ['case',
-    ['boolean', ['feature-state', 'hover'], false], ['case',
-      ['==', ['get', voltageProperty], 25000], colors.hover.alternative,
-      colors.hover.main,
-    ],
-    ['all', ['==', ['get', frequencyProperty], 60], ['==', ['get', voltageProperty], 25000]], color_25kv_60hz,
-    ['all', ['==', ['get', frequencyProperty], 50], ['==', ['get', voltageProperty], 25000]], color_25kv_50hz,
-    ['all', ['==', ['get', frequencyProperty], 60], ['==', ['get', voltageProperty], 20000]], color_20kv_60hz,
-    ['all', ['==', ['get', frequencyProperty], 50], ['==', ['get', voltageProperty], 20000]], color_20kv_50hz,
-    ['all', ['<', 16.665, ['get', frequencyProperty]], ['<', ['get', frequencyProperty], 16.675], ['==', ['get', voltageProperty], 15000]], color_15kv_16_67hz,
-    ['all', ['<', 16.65, ['get', frequencyProperty]], ['<', ['get', frequencyProperty], 16.75], ['==', ['get', voltageProperty], 15000]], color_15kv_16_7hz,
-    ['all', ['==', ['get', frequencyProperty], 60], ['==', ['get', voltageProperty], 12500]], color_12_5kv_60hz,
-    ['all', ['==', ['get', frequencyProperty], 25], ['==', ['get', voltageProperty], 12000]], color_12kv_25hz,
-    ['all', ['==', ['get', frequencyProperty], 0], ['!=', ['get', voltageProperty], null], ['>', ['get', voltageProperty], 3000]], color_gt3kv_dc,
-    ['all', ['==', ['get', frequencyProperty], 0], ['==', ['get', voltageProperty], 3000]], color_3kv_dc,
-    ['all', ['==', ['get', frequencyProperty], 0], ['!=', ['get', voltageProperty], null], ['>', 3000, ['get', voltageProperty]], ['>', ['get', voltageProperty], 1500]], color_gt1500v_lt3kv_dc,
-    ['all', ['==', ['get', frequencyProperty], 0], ['==', ['get', voltageProperty], 1500]], color_1500v_dc,
-    ['all', ['==', ['get', frequencyProperty], 0], ['!=', ['get', voltageProperty], null], ['>', 1500, ['get', voltageProperty]], ['>', ['get', voltageProperty], 1000]], color_gt1kv_lt1500v_dc,
-    ['all', ['==', ['get', frequencyProperty], 0], ['==', ['get', voltageProperty], 1000]], color_1kv_dc,
-    ['all', ['==', ['get', frequencyProperty], 0], ['!=', ['get', voltageProperty], null], ['>', 1000, ['get', voltageProperty]], ['>', ['get', voltageProperty], 750]], color_gt750v_lt1kv_dc,
-    ['all', ['==', ['get', frequencyProperty], 0], ['==', ['get', voltageProperty], 750]], color_750v_dc,
-    ['all', ['==', ['get', frequencyProperty], 0], ['!=', ['get', voltageProperty], null], ['<', 750, ['get', voltageProperty]]], color_lt750v_dc,
-    ['all',
-      ['!=', ['get', frequencyProperty], 0],
-      ['!=', ['get', voltageProperty], null],
-      ['any',
-        ['>', ['get', voltageProperty], 25000],
-        ['all', ['!=', ['get', frequencyProperty], 50], ['!=', ['get', frequencyProperty], 60], ['>', ['get', voltageProperty], 25000]],
-      ],
-    ], color_gte25kv_ac,
-    ['all',
-      ['!=', ['get', frequencyProperty], 0],
-      ['!=', ['get', voltageProperty], null],
-      ['all', ['>', 25000, ['get', voltageProperty]], ['>', ['get', voltageProperty], 15000]]
-    ], color_gte15kv_lt25kv_ac,
-    ['all',
-      ['!=', ['get', frequencyProperty], 0],
-      ['!=', ['get', voltageProperty], null],
-      ['>', 15000, ['get', voltageProperty]],
-    ], color_lt15kv_ac,
-    ['any',
-      ['==', ['get', 'electrification_state'], 'deelectrified'],
-      ['==', ['get', 'electrification_state'], 'abandoned'],
-    ], color_delectrified,
-    ['==', ['get', 'electrification_state'], 'no'], color_no,
-    'gray',
+const electrificationColor = (voltageProperty, frequencyProperty) => ['case',
+  ['boolean', ['feature-state', 'hover'], false], ['case',
+    ['==', ['get', voltageProperty], 25000], colors.hover.alternative,
+    colors.hover.main,
   ],
+  ['all', ['==', ['get', frequencyProperty], 60], ['==', ['get', voltageProperty], 25000]], color_25kv_60hz,
+  ['all', ['==', ['get', frequencyProperty], 50], ['==', ['get', voltageProperty], 25000]], color_25kv_50hz,
+  ['all', ['==', ['get', frequencyProperty], 60], ['==', ['get', voltageProperty], 20000]], color_20kv_60hz,
+  ['all', ['==', ['get', frequencyProperty], 50], ['==', ['get', voltageProperty], 20000]], color_20kv_50hz,
+  ['all', ['<', 16.665, ['get', frequencyProperty]], ['<', ['get', frequencyProperty], 16.675], ['==', ['get', voltageProperty], 15000]], color_15kv_16_67hz,
+  ['all', ['<', 16.65, ['get', frequencyProperty]], ['<', ['get', frequencyProperty], 16.75], ['==', ['get', voltageProperty], 15000]], color_15kv_16_7hz,
+  ['all', ['==', ['get', frequencyProperty], 60], ['==', ['get', voltageProperty], 12500]], color_12_5kv_60hz,
+  ['all', ['==', ['get', frequencyProperty], 25], ['==', ['get', voltageProperty], 12000]], color_12kv_25hz,
+  ['all', ['==', ['get', frequencyProperty], 0], ['!=', ['get', voltageProperty], null], ['>', ['get', voltageProperty], 3000]], color_gt3kv_dc,
+  ['all', ['==', ['get', frequencyProperty], 0], ['==', ['get', voltageProperty], 3000]], color_3kv_dc,
+  ['all', ['==', ['get', frequencyProperty], 0], ['!=', ['get', voltageProperty], null], ['>', 3000, ['get', voltageProperty]], ['>', ['get', voltageProperty], 1500]], color_gt1500v_lt3kv_dc,
+  ['all', ['==', ['get', frequencyProperty], 0], ['==', ['get', voltageProperty], 1500]], color_1500v_dc,
+  ['all', ['==', ['get', frequencyProperty], 0], ['!=', ['get', voltageProperty], null], ['>', 1500, ['get', voltageProperty]], ['>', ['get', voltageProperty], 1000]], color_gt1kv_lt1500v_dc,
+  ['all', ['==', ['get', frequencyProperty], 0], ['==', ['get', voltageProperty], 1000]], color_1kv_dc,
+  ['all', ['==', ['get', frequencyProperty], 0], ['!=', ['get', voltageProperty], null], ['>', 1000, ['get', voltageProperty]], ['>', ['get', voltageProperty], 750]], color_gt750v_lt1kv_dc,
+  ['all', ['==', ['get', frequencyProperty], 0], ['==', ['get', voltageProperty], 750]], color_750v_dc,
+  ['all', ['==', ['get', frequencyProperty], 0], ['!=', ['get', voltageProperty], null], ['<', 750, ['get', voltageProperty]]], color_lt750v_dc,
+  ['all',
+    ['!=', ['get', frequencyProperty], 0],
+    ['!=', ['get', voltageProperty], null],
+    ['any',
+      ['>', ['get', voltageProperty], 25000],
+      ['all', ['!=', ['get', frequencyProperty], 50], ['!=', ['get', frequencyProperty], 60], ['>', ['get', voltageProperty], 25000]],
+    ],
+  ], color_gte25kv_ac,
+  ['all',
+    ['!=', ['get', frequencyProperty], 0],
+    ['!=', ['get', voltageProperty], null],
+    ['all', ['>', 25000, ['get', voltageProperty]], ['>', ['get', voltageProperty], 15000]]
+  ], color_gte15kv_lt25kv_ac,
+  ['all',
+    ['!=', ['get', frequencyProperty], 0],
+    ['!=', ['get', voltageProperty], null],
+    ['>', 15000, ['get', voltageProperty]],
+  ], color_lt15kv_ac,
+  ['any',
+    ['==', ['get', 'electrification_state'], 'deelectrified'],
+    ['==', ['get', 'electrification_state'], 'abandoned'],
+  ], color_delectrified,
+  ['==', ['get', 'electrification_state'], 'no'], color_no,
+  'gray',
+];
+const electrificationFillPaint = (dashArray, voltageProperty, frequencyProperty) => ({
+  'line-color': electrificationColor(voltageProperty, frequencyProperty),
   'line-width': railwayLineWidth,
   'line-dasharray': dashArray,
 });
@@ -824,68 +832,55 @@ const gaugeCasingPaint = {
   'line-gap-width': 0.75,
 };
 
-const gaugeFillPaint = (gaugeProperty, gaugeIntProperty, dashArray) => ({
-  'line-color': ['case',
-    ['boolean', ['feature-state', 'hover'], false], ['case',
-      ['all', ['!=', ['get', gaugeIntProperty], null], ['>=', 1450, ['get', gaugeIntProperty]], ['<=', ['get', gaugeIntProperty], 1524]], colors.hover.alternative,
-      colors.hover.main,
-    ],
-    // monorails or tracks with monorail gauge value
-    ['any',
-      ['==', ['get', 'railway'], 'monorail'],
-      ['all',
-        ['==', ['get', gaugeProperty], 'monorail'],
-        ['any',
-          ['==', ['get', 'feature'], 'rail'],
-          ['==', ['get', 'feature'], 'light_rail'],
-          ['==', ['get', 'feature'], 'subway'],
-          ['==', ['get', 'feature'], 'tram'],
-        ],
-      ],
-    ], color_gauge_monorail,
-    // other tracks with inaccurate gauge value
+const gaugeColor = (gaugeProperty, gaugeIntProperty) => ['case',
+  ['boolean', ['feature-state', 'hover'], false], ['case',
+    ['all', ['!=', ['get', gaugeIntProperty], null], ['>=', 1450, ['get', gaugeIntProperty]], ['<=', ['get', gaugeIntProperty], 1524]], colors.hover.alternative,
+    colors.hover.main,
+  ],
+  // monorails or tracks with monorail gauge value
+  ['any',
+    ['==', ['get', 'railway'], 'monorail'],
     ['all',
-      ['==', ['get', gaugeProperty], 'standard'],
+      ['==', ['get', gaugeProperty], 'monorail'],
       ['any',
         ['==', ['get', 'feature'], 'rail'],
         ['==', ['get', 'feature'], 'light_rail'],
         ['==', ['get', 'feature'], 'subway'],
         ['==', ['get', 'feature'], 'tram'],
       ],
-    ], color_gauge_standard,
+    ],
+  ], color_gauge_monorail,
+  // other tracks with inaccurate gauge value
+  ['all',
+    ['==', ['get', gaugeProperty], 'standard'],
+    ['any',
+      ['==', ['get', 'feature'], 'rail'],
+      ['==', ['get', 'feature'], 'light_rail'],
+      ['==', ['get', 'feature'], 'subway'],
+      ['==', ['get', 'feature'], 'tram'],
+    ],
+  ], color_gauge_standard,
+  ['all',
+    ['==', ['get', gaugeProperty], 'broad'],
+    ['any',
+      ['==', ['get', 'feature'], 'rail'],
+      ['==', ['get', 'feature'], 'light_rail'],
+      ['==', ['get', 'feature'], 'subway'],
+      ['==', ['get', 'feature'], 'tram'],
+    ],
+  ], color_gauge_broad,
+  ['any',
     ['all',
-      ['==', ['get', gaugeProperty], 'broad'],
+      ['==', ['get', gaugeProperty], 'narrow'],
       ['any',
         ['==', ['get', 'feature'], 'rail'],
         ['==', ['get', 'feature'], 'light_rail'],
         ['==', ['get', 'feature'], 'subway'],
         ['==', ['get', 'feature'], 'tram'],
       ],
-    ], color_gauge_broad,
-    ['any',
-      ['all',
-        ['==', ['get', gaugeProperty], 'narrow'],
-        ['any',
-          ['==', ['get', 'feature'], 'rail'],
-          ['==', ['get', 'feature'], 'light_rail'],
-          ['==', ['get', 'feature'], 'subway'],
-          ['==', ['get', 'feature'], 'tram'],
-        ],
-      ],
-      ['all',
-        ['==', ['get', 'feature'], 'narrow_gauge'],
-        ['any',
-          ['==', ['get', gaugeProperty], 'narrow'],
-          ['==', ['get', gaugeProperty], 'broad'],
-          ['==', ['get', gaugeProperty], 'standard'],
-          ['==', ['get', gaugeProperty], 'unknown'],
-          ['==', ['get', gaugeProperty], null],
-        ],
-      ],
-    ], color_gauge_narrow,
-    // miniature tracks with inaccurate gauge value
+    ],
     ['all',
-      ['==', ['get', 'feature'], 'miniature'],
+      ['==', ['get', 'feature'], 'narrow_gauge'],
       ['any',
         ['==', ['get', gaugeProperty], 'narrow'],
         ['==', ['get', gaugeProperty], 'broad'],
@@ -893,62 +888,76 @@ const gaugeFillPaint = (gaugeProperty, gaugeIntProperty, dashArray) => ({
         ['==', ['get', gaugeProperty], 'unknown'],
         ['==', ['get', gaugeProperty], null],
       ],
-    ], color_gauge_miniature,
-    // unknown high numeric gauge values
-    ['all', ['!=', ['get', gaugeIntProperty], null], ['>=', ['get', gaugeIntProperty], 3000]], color_gauge_unknown,
-    // colors for numeric gauge values
-    ['all', ['!=', ['get', gaugeIntProperty], null], ['>', 88, ['get', gaugeIntProperty]], ['>=', ['get', gaugeIntProperty], 63]], color_gauge_0064,
-    ['all', ['!=', ['get', gaugeIntProperty], null], ['>', 127, ['get', gaugeIntProperty]], ['>=', ['get', gaugeIntProperty], 88]], color_gauge_0089,
-    ['all', ['!=', ['get', gaugeIntProperty], null], ['>', 184, ['get', gaugeIntProperty]], ['>=', ['get', gaugeIntProperty], 127]], color_gauge_0127,
-    ['all', ['!=', ['get', gaugeIntProperty], null], ['>', 190, ['get', gaugeIntProperty]], ['>=', ['get', gaugeIntProperty], 184]], color_gauge_0184,
-    ['all', ['!=', ['get', gaugeIntProperty], null], ['>', 260, ['get', gaugeIntProperty]], ['>=', ['get', gaugeIntProperty], 190]], color_gauge_0190,
-    ['all', ['!=', ['get', gaugeIntProperty], null], ['>', 380, ['get', gaugeIntProperty]], ['>=', ['get', gaugeIntProperty], 260]], color_gauge_0260,
-    ['all', ['!=', ['get', gaugeIntProperty], null], ['>', 500, ['get', gaugeIntProperty]], ['>=', ['get', gaugeIntProperty], 380]], color_gauge_0381,
-    ['all', ['!=', ['get', gaugeIntProperty], null], ['>', 597, ['get', gaugeIntProperty]], ['>=', ['get', gaugeIntProperty], 500]], color_gauge_0500,
-    ['all', ['!=', ['get', gaugeIntProperty], null], ['>', 600, ['get', gaugeIntProperty]], ['>=', ['get', gaugeIntProperty], 597]], color_gauge_0597,
-    ['all', ['!=', ['get', gaugeIntProperty], null], ['>', 609, ['get', gaugeIntProperty]], ['>=', ['get', gaugeIntProperty], 600]], color_gauge_0600,
-    ['all', ['!=', ['get', gaugeIntProperty], null], ['>', 700, ['get', gaugeIntProperty]], ['>=', ['get', gaugeIntProperty], 609]], color_gauge_0610,
-    ['all', ['!=', ['get', gaugeIntProperty], null], ['>', 750, ['get', gaugeIntProperty]], ['>=', ['get', gaugeIntProperty], 700]], color_gauge_0700,
-    ['all', ['!=', ['get', gaugeIntProperty], null], ['>', 760, ['get', gaugeIntProperty]], ['>=', ['get', gaugeIntProperty], 750]], color_gauge_0750,
-    ['all', ['!=', ['get', gaugeIntProperty], null], ['>', 762, ['get', gaugeIntProperty]], ['>=', ['get', gaugeIntProperty], 760]], color_gauge_0760,
-    ['all', ['!=', ['get', gaugeIntProperty], null], ['>', 785, ['get', gaugeIntProperty]], ['>=', ['get', gaugeIntProperty], 762]], color_gauge_0762,
-    ['all', ['!=', ['get', gaugeIntProperty], null], ['>', 800, ['get', gaugeIntProperty]], ['>=', ['get', gaugeIntProperty], 785]], color_gauge_0785,
-    ['all', ['!=', ['get', gaugeIntProperty], null], ['>', 891, ['get', gaugeIntProperty]], ['>=', ['get', gaugeIntProperty], 800]], color_gauge_0800,
-    ['all', ['!=', ['get', gaugeIntProperty], null], ['>', 900, ['get', gaugeIntProperty]], ['>=', ['get', gaugeIntProperty], 891]], color_gauge_0891,
-    ['all', ['!=', ['get', gaugeIntProperty], null], ['>', 914, ['get', gaugeIntProperty]], ['>=', ['get', gaugeIntProperty], 900]], color_gauge_0900,
-    ['all', ['!=', ['get', gaugeIntProperty], null], ['>', 950, ['get', gaugeIntProperty]], ['>=', ['get', gaugeIntProperty], 914]], color_gauge_0914,
-    ['all', ['!=', ['get', gaugeIntProperty], null], ['>', 1000, ['get', gaugeIntProperty]], ['>=', ['get', gaugeIntProperty], 950]], color_gauge_0950,
-    ['all', ['!=', ['get', gaugeIntProperty], null], ['>', 1009, ['get', gaugeIntProperty]], ['>=', ['get', gaugeIntProperty], 1000]], color_gauge_1000,
-    ['all', ['!=', ['get', gaugeIntProperty], null], ['>', 1050, ['get', gaugeIntProperty]], ['>=', ['get', gaugeIntProperty], 1009]], color_gauge_1009,
-    ['all', ['!=', ['get', gaugeIntProperty], null], ['>', 1066, ['get', gaugeIntProperty]], ['>=', ['get', gaugeIntProperty], 1050]], color_gauge_1050,
-    ['all', ['!=', ['get', gaugeIntProperty], null], ['>', 1100, ['get', gaugeIntProperty]], ['>=', ['get', gaugeIntProperty], 1066]], color_gauge_1067,
-    ['all', ['!=', ['get', gaugeIntProperty], null], ['>', 1200, ['get', gaugeIntProperty]], ['>=', ['get', gaugeIntProperty], 1100]], color_gauge_1100,
-    ['all', ['!=', ['get', gaugeIntProperty], null], ['>', 1372, ['get', gaugeIntProperty]], ['>=', ['get', gaugeIntProperty], 1200]], color_gauge_1200,
-    ['all', ['!=', ['get', gaugeIntProperty], null], ['>', 1422, ['get', gaugeIntProperty]], ['>=', ['get', gaugeIntProperty], 1372]], color_gauge_1372,
-    ['all', ['!=', ['get', gaugeIntProperty], null], ['>', 1432, ['get', gaugeIntProperty]], ['>=', ['get', gaugeIntProperty], 1422]], color_gauge_1422,
-    ['all', ['!=', ['get', gaugeIntProperty], null], ['>', 1435, ['get', gaugeIntProperty]], ['>=', ['get', gaugeIntProperty], 1432]], color_gauge_1432,
-    ['all', ['!=', ['get', gaugeIntProperty], null], ['>', 1440, ['get', gaugeIntProperty]], ['>=', ['get', gaugeIntProperty], 1435]], color_gauge_1435,
-    ['all', ['!=', ['get', gaugeIntProperty], null], ['>', 1445, ['get', gaugeIntProperty]], ['>=', ['get', gaugeIntProperty], 1440]], color_gauge_1440,
-    ['all', ['!=', ['get', gaugeIntProperty], null], ['>', 1450, ['get', gaugeIntProperty]], ['>=', ['get', gaugeIntProperty], 1445]], color_gauge_1445,
-    ['all', ['!=', ['get', gaugeIntProperty], null], ['>', 1458, ['get', gaugeIntProperty]], ['>=', ['get', gaugeIntProperty], 1450]], color_gauge_1450,
-    ['all', ['!=', ['get', gaugeIntProperty], null], ['>', 1495, ['get', gaugeIntProperty]], ['>=', ['get', gaugeIntProperty], 1458]], color_gauge_1458,
-    ['all', ['!=', ['get', gaugeIntProperty], null], ['>', 1520, ['get', gaugeIntProperty]], ['>=', ['get', gaugeIntProperty], 1495]], color_gauge_1495,
-    ['all', ['!=', ['get', gaugeIntProperty], null], ['>', 1522, ['get', gaugeIntProperty]], ['>=', ['get', gaugeIntProperty], 1520]], color_gauge_1520,
-    ['all', ['!=', ['get', gaugeIntProperty], null], ['>', 1524, ['get', gaugeIntProperty]], ['>=', ['get', gaugeIntProperty], 1522]], color_gauge_1522,
-    ['all', ['!=', ['get', gaugeIntProperty], null], ['>', 1581, ['get', gaugeIntProperty]], ['>=', ['get', gaugeIntProperty], 1524]], color_gauge_1524,
-    ['all', ['!=', ['get', gaugeIntProperty], null], ['>', 1588, ['get', gaugeIntProperty]], ['>=', ['get', gaugeIntProperty], 1581]], color_gauge_1581,
-    ['all', ['!=', ['get', gaugeIntProperty], null], ['>', 1600, ['get', gaugeIntProperty]], ['>=', ['get', gaugeIntProperty], 1588]], color_gauge_1588,
-    ['all', ['!=', ['get', gaugeIntProperty], null], ['>', 1668, ['get', gaugeIntProperty]], ['>=', ['get', gaugeIntProperty], 1600]], color_gauge_1600,
-    ['all', ['!=', ['get', gaugeIntProperty], null], ['>', 1672, ['get', gaugeIntProperty]], ['>=', ['get', gaugeIntProperty], 1668]], color_gauge_1668,
-    ['all', ['!=', ['get', gaugeIntProperty], null], ['>', 1700, ['get', gaugeIntProperty]], ['>=', ['get', gaugeIntProperty], 1672]], color_gauge_1676,
-    ['all', ['!=', ['get', gaugeIntProperty], null], ['>', 1800, ['get', gaugeIntProperty]], ['>=', ['get', gaugeIntProperty], 1700]], color_gauge_1700,
-    ['all', ['!=', ['get', gaugeIntProperty], null], ['>', 1880, ['get', gaugeIntProperty]], ['>=', ['get', gaugeIntProperty], 1800]], color_gauge_1800,
-    ['all', ['!=', ['get', gaugeIntProperty], null], ['>', 2000, ['get', gaugeIntProperty]], ['>=', ['get', gaugeIntProperty], 1880]], color_gauge_1880,
-    ['all', ['!=', ['get', gaugeIntProperty], null], ['>', 3000, ['get', gaugeIntProperty]], ['>=', ['get', gaugeIntProperty], 2000]], color_gauge_2000,
-    // color for unknown low numeric gauge values
-    ['all', ['!=', ['get', gaugeIntProperty], null], ['>', 63, ['get', gaugeIntProperty]], ['>', ['get', gaugeIntProperty], 0]], color_gauge_unknown,
-    'gray',
-  ],
+    ],
+  ], color_gauge_narrow,
+  // miniature tracks with inaccurate gauge value
+  ['all',
+    ['==', ['get', 'feature'], 'miniature'],
+    ['any',
+      ['==', ['get', gaugeProperty], 'narrow'],
+      ['==', ['get', gaugeProperty], 'broad'],
+      ['==', ['get', gaugeProperty], 'standard'],
+      ['==', ['get', gaugeProperty], 'unknown'],
+      ['==', ['get', gaugeProperty], null],
+    ],
+  ], color_gauge_miniature,
+  // unknown high numeric gauge values
+  ['all', ['!=', ['get', gaugeIntProperty], null], ['>=', ['get', gaugeIntProperty], 3000]], color_gauge_unknown,
+  // colors for numeric gauge values
+  ['all', ['!=', ['get', gaugeIntProperty], null], ['>', 88, ['get', gaugeIntProperty]], ['>=', ['get', gaugeIntProperty], 63]], color_gauge_0064,
+  ['all', ['!=', ['get', gaugeIntProperty], null], ['>', 127, ['get', gaugeIntProperty]], ['>=', ['get', gaugeIntProperty], 88]], color_gauge_0089,
+  ['all', ['!=', ['get', gaugeIntProperty], null], ['>', 184, ['get', gaugeIntProperty]], ['>=', ['get', gaugeIntProperty], 127]], color_gauge_0127,
+  ['all', ['!=', ['get', gaugeIntProperty], null], ['>', 190, ['get', gaugeIntProperty]], ['>=', ['get', gaugeIntProperty], 184]], color_gauge_0184,
+  ['all', ['!=', ['get', gaugeIntProperty], null], ['>', 260, ['get', gaugeIntProperty]], ['>=', ['get', gaugeIntProperty], 190]], color_gauge_0190,
+  ['all', ['!=', ['get', gaugeIntProperty], null], ['>', 380, ['get', gaugeIntProperty]], ['>=', ['get', gaugeIntProperty], 260]], color_gauge_0260,
+  ['all', ['!=', ['get', gaugeIntProperty], null], ['>', 500, ['get', gaugeIntProperty]], ['>=', ['get', gaugeIntProperty], 380]], color_gauge_0381,
+  ['all', ['!=', ['get', gaugeIntProperty], null], ['>', 597, ['get', gaugeIntProperty]], ['>=', ['get', gaugeIntProperty], 500]], color_gauge_0500,
+  ['all', ['!=', ['get', gaugeIntProperty], null], ['>', 600, ['get', gaugeIntProperty]], ['>=', ['get', gaugeIntProperty], 597]], color_gauge_0597,
+  ['all', ['!=', ['get', gaugeIntProperty], null], ['>', 609, ['get', gaugeIntProperty]], ['>=', ['get', gaugeIntProperty], 600]], color_gauge_0600,
+  ['all', ['!=', ['get', gaugeIntProperty], null], ['>', 700, ['get', gaugeIntProperty]], ['>=', ['get', gaugeIntProperty], 609]], color_gauge_0610,
+  ['all', ['!=', ['get', gaugeIntProperty], null], ['>', 750, ['get', gaugeIntProperty]], ['>=', ['get', gaugeIntProperty], 700]], color_gauge_0700,
+  ['all', ['!=', ['get', gaugeIntProperty], null], ['>', 760, ['get', gaugeIntProperty]], ['>=', ['get', gaugeIntProperty], 750]], color_gauge_0750,
+  ['all', ['!=', ['get', gaugeIntProperty], null], ['>', 762, ['get', gaugeIntProperty]], ['>=', ['get', gaugeIntProperty], 760]], color_gauge_0760,
+  ['all', ['!=', ['get', gaugeIntProperty], null], ['>', 785, ['get', gaugeIntProperty]], ['>=', ['get', gaugeIntProperty], 762]], color_gauge_0762,
+  ['all', ['!=', ['get', gaugeIntProperty], null], ['>', 800, ['get', gaugeIntProperty]], ['>=', ['get', gaugeIntProperty], 785]], color_gauge_0785,
+  ['all', ['!=', ['get', gaugeIntProperty], null], ['>', 891, ['get', gaugeIntProperty]], ['>=', ['get', gaugeIntProperty], 800]], color_gauge_0800,
+  ['all', ['!=', ['get', gaugeIntProperty], null], ['>', 900, ['get', gaugeIntProperty]], ['>=', ['get', gaugeIntProperty], 891]], color_gauge_0891,
+  ['all', ['!=', ['get', gaugeIntProperty], null], ['>', 914, ['get', gaugeIntProperty]], ['>=', ['get', gaugeIntProperty], 900]], color_gauge_0900,
+  ['all', ['!=', ['get', gaugeIntProperty], null], ['>', 950, ['get', gaugeIntProperty]], ['>=', ['get', gaugeIntProperty], 914]], color_gauge_0914,
+  ['all', ['!=', ['get', gaugeIntProperty], null], ['>', 1000, ['get', gaugeIntProperty]], ['>=', ['get', gaugeIntProperty], 950]], color_gauge_0950,
+  ['all', ['!=', ['get', gaugeIntProperty], null], ['>', 1009, ['get', gaugeIntProperty]], ['>=', ['get', gaugeIntProperty], 1000]], color_gauge_1000,
+  ['all', ['!=', ['get', gaugeIntProperty], null], ['>', 1050, ['get', gaugeIntProperty]], ['>=', ['get', gaugeIntProperty], 1009]], color_gauge_1009,
+  ['all', ['!=', ['get', gaugeIntProperty], null], ['>', 1066, ['get', gaugeIntProperty]], ['>=', ['get', gaugeIntProperty], 1050]], color_gauge_1050,
+  ['all', ['!=', ['get', gaugeIntProperty], null], ['>', 1100, ['get', gaugeIntProperty]], ['>=', ['get', gaugeIntProperty], 1066]], color_gauge_1067,
+  ['all', ['!=', ['get', gaugeIntProperty], null], ['>', 1200, ['get', gaugeIntProperty]], ['>=', ['get', gaugeIntProperty], 1100]], color_gauge_1100,
+  ['all', ['!=', ['get', gaugeIntProperty], null], ['>', 1372, ['get', gaugeIntProperty]], ['>=', ['get', gaugeIntProperty], 1200]], color_gauge_1200,
+  ['all', ['!=', ['get', gaugeIntProperty], null], ['>', 1422, ['get', gaugeIntProperty]], ['>=', ['get', gaugeIntProperty], 1372]], color_gauge_1372,
+  ['all', ['!=', ['get', gaugeIntProperty], null], ['>', 1432, ['get', gaugeIntProperty]], ['>=', ['get', gaugeIntProperty], 1422]], color_gauge_1422,
+  ['all', ['!=', ['get', gaugeIntProperty], null], ['>', 1435, ['get', gaugeIntProperty]], ['>=', ['get', gaugeIntProperty], 1432]], color_gauge_1432,
+  ['all', ['!=', ['get', gaugeIntProperty], null], ['>', 1440, ['get', gaugeIntProperty]], ['>=', ['get', gaugeIntProperty], 1435]], color_gauge_1435,
+  ['all', ['!=', ['get', gaugeIntProperty], null], ['>', 1445, ['get', gaugeIntProperty]], ['>=', ['get', gaugeIntProperty], 1440]], color_gauge_1440,
+  ['all', ['!=', ['get', gaugeIntProperty], null], ['>', 1450, ['get', gaugeIntProperty]], ['>=', ['get', gaugeIntProperty], 1445]], color_gauge_1445,
+  ['all', ['!=', ['get', gaugeIntProperty], null], ['>', 1458, ['get', gaugeIntProperty]], ['>=', ['get', gaugeIntProperty], 1450]], color_gauge_1450,
+  ['all', ['!=', ['get', gaugeIntProperty], null], ['>', 1495, ['get', gaugeIntProperty]], ['>=', ['get', gaugeIntProperty], 1458]], color_gauge_1458,
+  ['all', ['!=', ['get', gaugeIntProperty], null], ['>', 1520, ['get', gaugeIntProperty]], ['>=', ['get', gaugeIntProperty], 1495]], color_gauge_1495,
+  ['all', ['!=', ['get', gaugeIntProperty], null], ['>', 1522, ['get', gaugeIntProperty]], ['>=', ['get', gaugeIntProperty], 1520]], color_gauge_1520,
+  ['all', ['!=', ['get', gaugeIntProperty], null], ['>', 1524, ['get', gaugeIntProperty]], ['>=', ['get', gaugeIntProperty], 1522]], color_gauge_1522,
+  ['all', ['!=', ['get', gaugeIntProperty], null], ['>', 1581, ['get', gaugeIntProperty]], ['>=', ['get', gaugeIntProperty], 1524]], color_gauge_1524,
+  ['all', ['!=', ['get', gaugeIntProperty], null], ['>', 1588, ['get', gaugeIntProperty]], ['>=', ['get', gaugeIntProperty], 1581]], color_gauge_1581,
+  ['all', ['!=', ['get', gaugeIntProperty], null], ['>', 1600, ['get', gaugeIntProperty]], ['>=', ['get', gaugeIntProperty], 1588]], color_gauge_1588,
+  ['all', ['!=', ['get', gaugeIntProperty], null], ['>', 1668, ['get', gaugeIntProperty]], ['>=', ['get', gaugeIntProperty], 1600]], color_gauge_1600,
+  ['all', ['!=', ['get', gaugeIntProperty], null], ['>', 1672, ['get', gaugeIntProperty]], ['>=', ['get', gaugeIntProperty], 1668]], color_gauge_1668,
+  ['all', ['!=', ['get', gaugeIntProperty], null], ['>', 1700, ['get', gaugeIntProperty]], ['>=', ['get', gaugeIntProperty], 1672]], color_gauge_1676,
+  ['all', ['!=', ['get', gaugeIntProperty], null], ['>', 1800, ['get', gaugeIntProperty]], ['>=', ['get', gaugeIntProperty], 1700]], color_gauge_1700,
+  ['all', ['!=', ['get', gaugeIntProperty], null], ['>', 1880, ['get', gaugeIntProperty]], ['>=', ['get', gaugeIntProperty], 1800]], color_gauge_1800,
+  ['all', ['!=', ['get', gaugeIntProperty], null], ['>', 2000, ['get', gaugeIntProperty]], ['>=', ['get', gaugeIntProperty], 1880]], color_gauge_1880,
+  ['all', ['!=', ['get', gaugeIntProperty], null], ['>', 3000, ['get', gaugeIntProperty]], ['>=', ['get', gaugeIntProperty], 2000]], color_gauge_2000,
+  // color for unknown low numeric gauge values
+  ['all', ['!=', ['get', gaugeIntProperty], null], ['>', 63, ['get', gaugeIntProperty]], ['>', ['get', gaugeIntProperty], 0]], color_gauge_unknown,
+  'gray',
+];
+const gaugeFillPaint = (gaugeProperty, gaugeIntProperty, dashArray) => ({
+  'line-color': gaugeColor(gaugeProperty, gaugeIntProperty),
   'line-width': railwayLineWidth,
   'line-dasharray': dashArray,
 });
@@ -1062,22 +1071,26 @@ const railwayKmText = {
   },
 };
 
-const preferredDirectionLayer = (id, filter) => ({
+const preferredDirectionLayer = (id, filter, color) => ({
   id,
   type: 'symbol',
   minzoom: 15,
   source: 'high',
   'source-layer': 'railway_line_high',
   filter,
+  paint: {
+    'icon-color': color,
+    'icon-halo-color': 'white',
+    'icon-halo-width': 2.0,
+  },
   layout: {
     'symbol-placement': 'line',
     'symbol-spacing': 750,
     'icon-overlap': 'always',
-    // TODO: replace with SDF image with line coloring
     'icon-image': ['match', ['get', 'preferred_direction'],
-      'forward', 'general/line-direction',
-      'backward', 'general/line-direction',
-      'both', 'general/line-direction-both',
+      'forward', 'sdf:general/line-direction',
+      'backward', 'sdf:general/line-direction',
+      'both', 'sdf:general/line-direction-both',
       '',
     ],
     'icon-rotate': ['match', ['get', 'preferred_direction'],
@@ -1087,6 +1100,39 @@ const preferredDirectionLayer = (id, filter) => ({
   },
 });
 
+const imageLayerWithOutline = (id, spriteExpression, layer) => [
+  {
+    id: `${id}_outline`,
+    ...layer,
+    paint: {
+      'icon-halo-color': ['case',
+        ['boolean', ['feature-state', 'hover'], false], colors.hover.textHalo,
+        'white',
+      ],
+      'icon-halo-blur': ['case',
+        ['boolean', ['feature-state', 'hover'], false], 1.0,
+        0.0,
+      ],
+      'icon-halo-width': ['case',
+        ['boolean', ['feature-state', 'hover'], false], 3.0,
+        2.0,
+      ],
+    },
+    layout: {
+      ...(layer.layout || {}),
+      'icon-image': ['image', ['concat', 'sdf:', spriteExpression]],
+    },
+  },
+  {
+    id: `${id}_image`,
+    ...layer,
+    layout: {
+      ...(layer.layout || {}),
+      'icon-image': ['image', spriteExpression],
+    },
+  },
+]
+
 // TODO remove all [switch, [zoom]] to ensure legend displays only visible features
 const layers = {
   standard: [
@@ -1350,14 +1396,18 @@ const layers = {
         'line-color': 'rgba(255, 255, 255, 50%)',
       }
     },
-    preferredDirectionLayer('railway_tunnel_preferred_direction', ['all',
-      ['get', 'tunnel'],
-      ['any',
-        ['==', ['get', 'preferred_direction'], 'forward'],
-        ['==', ['get', 'preferred_direction'], 'backward'],
-        ['==', ['get', 'preferred_direction'], 'both'],
-      ]
-    ]),
+    preferredDirectionLayer(
+      'railway_tunnel_preferred_direction',
+      ['all',
+        ['get', 'tunnel'],
+        ['any',
+          ['==', ['get', 'preferred_direction'], 'forward'],
+          ['==', ['get', 'preferred_direction'], 'backward'],
+          ['==', ['get', 'preferred_direction'], 'both'],
+        ],
+      ],
+      standardColor,
+    ),
     {
       id: 'railway_construction_fill',
       type: 'line',
@@ -1430,15 +1480,19 @@ const layers = {
       },
       paint: standardFillPaint([1]),
     },
-    preferredDirectionLayer('railway_preferred_direction', ['all',
-      ['!', ['get', 'bridge']],
-      ['!', ['get', 'tunnel']],
-      ['any',
-        ['==', ['get', 'preferred_direction'], 'forward'],
-        ['==', ['get', 'preferred_direction'], 'backward'],
-        ['==', ['get', 'preferred_direction'], 'both'],
-      ]
-    ]),
+    preferredDirectionLayer(
+      'railway_preferred_direction',
+      ['all',
+        ['!', ['get', 'bridge']],
+        ['!', ['get', 'tunnel']],
+        ['any',
+          ['==', ['get', 'preferred_direction'], 'forward'],
+          ['==', ['get', 'preferred_direction'], 'backward'],
+          ['==', ['get', 'preferred_direction'], 'both'],
+        ]
+      ],
+      standardColor,
+    ),
     {
       id: 'railway_bridge_railing',
       type: 'line',
@@ -1541,81 +1595,92 @@ const layers = {
         'icon-image': 'general/tram-stop',
       }
     },
-    {
-      id: 'railway_symbols_low',
-      type: 'symbol',
-      minzoom: 10,
-      source: 'openrailwaymap_standard',
-      'source-layer': 'standard_railway_symbols',
-      filter: ['==', ['get', 'feature'], 'general/border'],
-      layout: {
-        'icon-image': ['image', ['get', 'feature']],
-      }
-    },
-    {
-      id: 'railway_symbols_med_high',
-      type: 'symbol',
-      minzoom: 13,
-      source: 'openrailwaymap_standard',
-      'source-layer': 'standard_railway_symbols',
-      filter: ['any',
-        ['==', ['get', 'feature'], 'general/crossing'],
-        ['==', ['get', 'feature'], 'general/level-crossing'],
-        ['==', ['get', 'feature'], 'general/level-crossing-light'],
-        ['==', ['get', 'feature'], 'general/level-crossing-barrier'],
-        ['==', ['get', 'feature'], 'general/lubricator'],
-        ['==', ['get', 'feature'], 'general/fuel'],
-        ['==', ['get', 'feature'], 'general/sand_store'],
-        ['==', ['get', 'feature'], 'general/aei'],
-        ['==', ['get', 'feature'], 'general/buffer_stop'],
-        ['==', ['get', 'feature'], 'general/derail'],
-        ['==', ['get', 'feature'], 'general/defect_detector'],
-        ['==', ['get', 'feature'], 'general/hump_yard'],
-        ['==', ['get', 'feature'], 'general/loading_gauge'],
-        ['==', ['get', 'feature'], 'general/preheating'],
-        ['==', ['get', 'feature'], 'general/compressed_air_supply'],
-        ['==', ['get', 'feature'], 'general/waste_disposal'],
-        ['==', ['get', 'feature'], 'general/coaling_facility'],
-        ['==', ['get', 'feature'], 'general/wash'],
-        ['==', ['get', 'feature'], 'general/water_tower'],
-        ['==', ['get', 'feature'], 'general/water_crane'],
-        ['==', ['get', 'feature'], 'general/vacancy-detection-insulated-rail-joint'],
-        ['==', ['get', 'feature'], 'general/vacancy-detection-axle-counter'],
-      ],
-      layout: {
-        'symbol-z-order': 'source',
-        'icon-overlap': 'always',
-        'icon-image': ['image', ['get', 'feature']],
-      }
-    },
-    {
-      id: 'railway_symbols_med',
-      type: 'symbol',
-      minzoom: 12,
-      source: 'openrailwaymap_standard',
-      'source-layer': 'standard_railway_symbols',
-      filter: ['any',
-        ['==', ['get', 'feature'], 'general/owner-change'],
-        ['==', ['get', 'feature'], 'general/radio-mast'],
-        ['==', ['get', 'feature'], 'general/radio-antenna'],
-      ],
-      layout: {
-        'symbol-z-order': 'source',
-        'icon-image': ['image', ['get', 'feature']],
+    ...imageLayerWithOutline(
+      'railway_symbols_low',
+      ['get', 'feature'],
+      {
+        type: 'symbol',
+        minzoom: 10,
+        source: 'openrailwaymap_standard',
+        'source-layer': 'standard_railway_symbols',
+        filter: ['==', ['get', 'feature'], 'general/border'],
+        layout: {
+          'icon-overlap': 'cooperative',
+        },
       },
-    },
-    {
-      id: 'railway_symbols_high',
-      type: 'symbol',
-      minzoom: 16,
-      source: 'openrailwaymap_standard',
-      'source-layer': 'standard_railway_symbols',
-      filter: ['==', ['get', 'feature'], 'general/phone'],
-      layout: {
-        'symbol-z-order': 'source',
-        'icon-image': ['image', ['get', 'feature']],
-      }
-    },
+    ),
+    ...imageLayerWithOutline(
+      'railway_symbols_med_high',
+      ['get', 'feature'],
+      {
+        type: 'symbol',
+        minzoom: 13,
+        source: 'openrailwaymap_standard',
+        'source-layer': 'standard_railway_symbols',
+        filter: ['any',
+          ['==', ['get', 'feature'], 'general/crossing'],
+          ['==', ['get', 'feature'], 'general/level-crossing'],
+          ['==', ['get', 'feature'], 'general/level-crossing-light'],
+          ['==', ['get', 'feature'], 'general/level-crossing-barrier'],
+          ['==', ['get', 'feature'], 'general/lubricator'],
+          ['==', ['get', 'feature'], 'general/fuel'],
+          ['==', ['get', 'feature'], 'general/sand_store'],
+          ['==', ['get', 'feature'], 'general/aei'],
+          ['==', ['get', 'feature'], 'general/buffer_stop'],
+          ['==', ['get', 'feature'], 'general/derail'],
+          ['==', ['get', 'feature'], 'general/defect_detector'],
+          ['==', ['get', 'feature'], 'general/hump_yard'],
+          ['==', ['get', 'feature'], 'general/loading_gauge'],
+          ['==', ['get', 'feature'], 'general/preheating'],
+          ['==', ['get', 'feature'], 'general/compressed_air_supply'],
+          ['==', ['get', 'feature'], 'general/waste_disposal'],
+          ['==', ['get', 'feature'], 'general/coaling_facility'],
+          ['==', ['get', 'feature'], 'general/wash'],
+          ['==', ['get', 'feature'], 'general/water_tower'],
+          ['==', ['get', 'feature'], 'general/water_crane'],
+          ['==', ['get', 'feature'], 'general/vacancy-detection-insulated-rail-joint'],
+          ['==', ['get', 'feature'], 'general/vacancy-detection-axle-counter'],
+        ],
+        layout: {
+          'symbol-z-order': 'source',
+          'icon-overlap': 'always',
+        },
+      },
+    ),
+    ...imageLayerWithOutline(
+      'railway_symbols_med',
+      ['get', 'feature'],
+      {
+        type: 'symbol',
+        minzoom: 12,
+        source: 'openrailwaymap_standard',
+        'source-layer': 'standard_railway_symbols',
+        filter: ['any',
+          ['==', ['get', 'feature'], 'general/owner-change'],
+          ['==', ['get', 'feature'], 'general/radio-mast'],
+          ['==', ['get', 'feature'], 'general/radio-antenna'],
+        ],
+        layout: {
+          'symbol-z-order': 'source',
+          'icon-overlap': 'always',
+        },
+      },
+    ),
+    ...imageLayerWithOutline(
+      'railway_symbols_high',
+      ['get', 'feature'],
+      {
+        type: 'symbol',
+        minzoom: 16,
+        source: 'openrailwaymap_standard',
+        'source-layer': 'standard_railway_symbols',
+        filter: ['==', ['get', 'feature'], 'general/phone'],
+        layout: {
+          'symbol-z-order': 'source',
+          'icon-overlap': 'always',
+        },
+      },
+    ),
     railwayKmText,
     {
       id: 'railway_text_track_numbers',
@@ -2061,11 +2126,15 @@ const layers = {
       paint: speedFillPaint,
       layout: speedLayout,
     },
-    preferredDirectionLayer('railway_preferred_direction', ['any',
-      ['==', ['get', 'preferred_direction'], 'forward'],
-      ['==', ['get', 'preferred_direction'], 'backward'],
-      ['==', ['get', 'preferred_direction'], 'both'],
-    ]),
+    preferredDirectionLayer(
+      'railway_preferred_direction',
+      ['any',
+        ['==', ['get', 'preferred_direction'], 'forward'],
+        ['==', ['get', 'preferred_direction'], 'backward'],
+        ['==', ['get', 'preferred_direction'], 'both'],
+      ],
+      speedColor,
+    ),
     {
       id: 'speed_railway_signal_direction',
       type: 'symbol',
@@ -2093,53 +2162,58 @@ const layers = {
           ['!=', ['get', 'azimuth'], null],
         ],
       ],
+      paint: {
+        'icon-color': colors.signals.direction,
+        'icon-halo-color': ['case',
+          ['boolean', ['feature-state', 'hover'], false], colors.hover.textHalo,
+          'white',
+        ],
+        'icon-halo-width': 2.0,
+        'icon-halo-blur': 2.0,
+      },
       layout: {
         'icon-overlap': 'always',
         'icon-image': ['case',
-          ['get', 'direction_both'], 'general/signal-direction-both',
-          'general/signal-direction',
+          ['get', 'direction_both'], 'sdf:general/signal-direction-both',
+          'sdf:general/signal-direction',
         ],
         'icon-anchor': ['case',
           ['get', 'direction_both'], 'center',
           'top',
         ],
         'icon-rotate': ['get', 'azimuth'],
-      }
+      },
     },
-    {
-      id: 'speed_railway_signals',
-      type: 'symbol',
-      source: 'openrailwaymap_speed',
-      minzoom: 13,
-      'source-layer': 'speed_railway_signals',
-      filter: ['step', ['zoom'],
-        ['all',
-          ['!=', ['get', 'feature'], null],
-          ['==', ['get', 'type'], 'line'],
-        ],
-        14,
-        ['all',
-          ['!=', ['get', 'feature'], null],
-          ['any',
+    ...imageLayerWithOutline(
+      'speed_railway_signals',
+      ['get', 'feature'],
+      {
+        type: 'symbol',
+        source: 'openrailwaymap_speed',
+        minzoom: 13,
+        'source-layer': 'speed_railway_signals',
+        filter: ['step', ['zoom'],
+          ['all',
+            ['!=', ['get', 'feature'], null],
             ['==', ['get', 'type'], 'line'],
-            ['==', ['get', 'type'], 'tram'],
-          ]
+          ],
+          14,
+          ['all',
+            ['!=', ['get', 'feature'], null],
+            ['any',
+              ['==', ['get', 'type'], 'line'],
+              ['==', ['get', 'type'], 'tram'],
+            ]
+          ],
+          16,
+          ['!=', ['get', 'feature'], null],
         ],
-        16,
-        ['!=', ['get', 'feature'], null],
-      ],
-      paint: {
-        // TODO https://github.com/maplibre/martin/issues/1075
-        // 'icon-halo-color': 'rgba(255, 255, 255, 1)',
-        // 'icon-halo-blur': 0,
-        // 'icon-halo-width': 2.0,
+        layout: {
+          'symbol-z-order': 'source',
+          'icon-overlap': 'always',
+        },
       },
-      layout: {
-        'symbol-z-order': 'source',
-        'icon-overlap': 'always',
-        'icon-image': ['image', ['get', 'feature']],
-      }
-    },
+    ),
     railwayKmText,
     {
       id: 'speed_railway_line_text',
@@ -2264,11 +2338,15 @@ const layers = {
       paint: trainProtectionFillPaint([1]),
       layout: trainProtectionLayout,
     },
-    preferredDirectionLayer('railway_preferred_direction', ['any',
-      ['==', ['get', 'preferred_direction'], 'forward'],
-      ['==', ['get', 'preferred_direction'], 'backward'],
-      ['==', ['get', 'preferred_direction'], 'both'],
-    ]),
+    preferredDirectionLayer(
+      'railway_preferred_direction',
+      ['any',
+        ['==', ['get', 'preferred_direction'], 'forward'],
+        ['==', ['get', 'preferred_direction'], 'backward'],
+        ['==', ['get', 'preferred_direction'], 'both'],
+      ],
+      trainProtectionColor,
+    ),
     {
       id: 'signal_boxes_point',
       type: 'circle',
@@ -2329,44 +2407,60 @@ const layers = {
         ['!=', ['get', 'azimuth'], null],
         ['!=', ['get', 'feature'], ''],
       ],
+      paint: {
+        'icon-color': colors.signals.direction,
+        'icon-halo-color': ['case',
+          ['boolean', ['feature-state', 'hover'], false], colors.hover.textHalo,
+          'white',
+        ],
+        'icon-halo-width': 2.0,
+        'icon-halo-blur': 2.0,
+      },
       layout: {
         'icon-overlap': 'always',
         'icon-image': ['case',
-          ['get', 'direction_both'], 'general/signal-direction-both',
-          'general/signal-direction',
+          ['get', 'direction_both'], 'sdf:general/signal-direction-both',
+          'sdf:general/signal-direction',
         ],
         'icon-anchor': ['case',
           ['get', 'direction_both'], 'center',
           'top',
         ],
         'icon-rotate': ['get', 'azimuth'],
-      }
-    },
-    {
-      id: 'railway_signals',
-      type: 'symbol',
-      minzoom: 13,
-      source: 'openrailwaymap_signals',
-      'source-layer': 'signals_railway_signals',
-      paint: {
-        // TODO https://github.com/maplibre/martin/issues/1075
-        // 'icon-halo-color': 'rgba(255, 255, 255, 1)',
-        // 'icon-halo-blur': 0,
-        // 'icon-halo-width': 2.0,
       },
-      layout: {
-        'symbol-z-order': 'source',
-        'icon-overlap': 'always',
-        'icon-image': ['step', ['zoom'],
-          ['case',
-            ['==', ['slice', ['get', 'feature'], 0, 20], 'de/blockkennzeichen-'], 'de/blockkennzeichen',
-            ['image', ['get', 'feature']],
-          ],
-          16,
-          ['image', ['get', 'feature']],
-        ],
-      }
     },
+    ...imageLayerWithOutline(
+      'railway_signals_medium',
+      ['case',
+        ['==', ['slice', ['get', 'feature'], 0, 20], 'de/blockkennzeichen-'], 'de/blockkennzeichen',
+        ['get', 'feature'],
+      ],
+      {
+        type: 'symbol',
+        minzoom: 13,
+        maxzoom: 16,
+        source: 'openrailwaymap_signals',
+        'source-layer': 'signals_railway_signals',
+        layout: {
+          'symbol-z-order': 'source',
+          'icon-overlap': 'always',
+        },
+      },
+    ),
+    ...imageLayerWithOutline(
+      'railway_signals_high',
+      ['get', 'feature'],
+      {
+        type: 'symbol',
+        minzoom: 16,
+        source: 'openrailwaymap_signals',
+        'source-layer': 'signals_railway_signals',
+        layout: {
+          'symbol-z-order': 'source',
+          'icon-overlap': 'always',
+        },
+      },
+    ),
     {
       id: 'railway_signals_deactivated',
       type: 'symbol',
@@ -2453,17 +2547,10 @@ const layers = {
       minzoom: 13,
       source: 'openrailwaymap_signals',
       'source-layer': 'signals_railway_signals',
-      filter: ['step', ['zoom'],
-        ['all',
-          ['!=', ['get', 'ref'], null],
-          ['!=', ['get', 'feature'], ''],
-        ],
-        16,
-        ['all',
-          ['!=', ['get', 'ref'], null],
-          ['!=', ['get', 'feature'], ''],
-          ['!=', ['slice', ['get', 'feature'], 0, 20], 'de/blockkennzeichen-'],
-        ],
+      filter: ['all',
+        ['!=', ['get', 'ref'], null],
+        ['!=', ['get', 'feature'], ''],
+        ['!=', ['slice', ['get', 'feature'], 0, 20], 'de/blockkennzeichen-'],
       ],
       paint: {
         'text-halo-color': ['case',
@@ -2574,11 +2661,15 @@ const layers = {
       paint: electrificationFillPaint(electrification_construction_dashes, 'future_voltage', 'future_frequency'),
       layout: electrificationLayout,
     },
-    preferredDirectionLayer('railway_preferred_direction', ['any',
-      ['==', ['get', 'preferred_direction'], 'forward'],
-      ['==', ['get', 'preferred_direction'], 'backward'],
-      ['==', ['get', 'preferred_direction'], 'both'],
-    ]),
+    preferredDirectionLayer(
+      'railway_preferred_direction',
+      ['any',
+        ['==', ['get', 'preferred_direction'], 'forward'],
+        ['==', ['get', 'preferred_direction'], 'backward'],
+        ['==', ['get', 'preferred_direction'], 'both'],
+      ],
+      electrificationColor('voltage', 'frequency'),
+    ),
     {
       id: 'electrification_signals_direction',
       type: 'symbol',
@@ -2589,36 +2680,42 @@ const layers = {
         ['!=', ['get', 'azimuth'], null],
         ['!=', ['get', 'feature'], ''],
       ],
+      paint: {
+        'icon-color': colors.signals.direction,
+        'icon-halo-color': ['case',
+          ['boolean', ['feature-state', 'hover'], false], colors.hover.textHalo,
+          'white',
+        ],
+        'icon-halo-width': 2.0,
+        'icon-halo-blur': 2.0,
+      },
       layout: {
         'icon-overlap': 'always',
         'icon-image': ['case',
-          ['get', 'direction_both'], 'general/signal-direction-both',
-          'general/signal-direction',
+          ['get', 'direction_both'], 'sdf:general/signal-direction-both',
+          'sdf:general/signal-direction',
         ],
         'icon-anchor': ['case',
           ['get', 'direction_both'], 'center',
           'top',
         ],
         'icon-rotate': ['get', 'azimuth'],
-      }
-    },
-    {
-      id: 'electrification_signals',
-      type: 'symbol',
-      minzoom: 16,
-      source: 'openrailwaymap_electrification',
-      'source-layer': 'electrification_signals',
-      paint: {
-        // TODO https://github.com/maplibre/martin/issues/1075
-        // 'icon-halo-color': 'rgba(255, 255, 255, 1)',
-        // 'icon-halo-blur': 0,
-        // 'icon-halo-width': 2.0,
       },
-      layout: {
-        'icon-overlap': 'always',
-        'icon-image': ['image', ['get', 'feature']],
-      }
     },
+    ...imageLayerWithOutline(
+      'electrification_signals',
+      ['get', 'feature'],
+      {
+        type: 'symbol',
+        minzoom: 16,
+        source: 'openrailwaymap_electrification',
+        'source-layer': 'electrification_signals',
+        layout: {
+          'symbol-z-order': 'source',
+          'icon-overlap': 'always',
+        },
+      },
+    ),
     railwayKmText,
     {
       id: 'electrification_railway_text_high',
@@ -2899,11 +2996,15 @@ const layers = {
       paint: gaugeFillPaint('gauge2', 'gaugeint2', multi_construction_dashes),
       layout: gaugeLayout,
     },
-    preferredDirectionLayer('railway_preferred_direction', ['any',
-      ['==', ['get', 'preferred_direction'], 'forward'],
-      ['==', ['get', 'preferred_direction'], 'backward'],
-      ['==', ['get', 'preferred_direction'], 'both'],
-    ]),
+    preferredDirectionLayer(
+      'railway_preferred_direction',
+      ['any',
+        ['==', ['get', 'preferred_direction'], 'forward'],
+        ['==', ['get', 'preferred_direction'], 'backward'],
+        ['==', ['get', 'preferred_direction'], 'both'],
+      ],
+      gaugeColor('gauge0', 'gaugeint0'),
+    ),
     railwayKmText,
     {
       id: 'gauge_railway_text_high',
@@ -3057,7 +3158,16 @@ const makeStyle = selectedStyle => ({
   metadata: {},
   name: `OpenRailwayMap ${selectedStyle}`,
   sources,
-  sprite: `${origin}/sprite/symbols`,
+  sprite: [
+    {
+      id: 'sdf',
+      url: `${origin}/sdf_sprite/symbols`
+    },
+    {
+      id: 'default',
+      url: `${origin}/sprite/symbols`
+    }
+  ],
   version: 8,
   layers: layers[selectedStyle],
 });
diff --git a/symbols/general/aei.svg b/symbols/general/aei.svg
index c2aaf614..47ca2f0a 100644
--- a/symbols/general/aei.svg
+++ b/symbols/general/aei.svg
@@ -1,4 +1,4 @@
 <?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="18" viewBox="0 0 18 18">
-<path fill-rule="evenodd" fill="rgb(1.568627%, 1.568627%, 1.568627%)" fill-opacity="1" d="M 3.835938 1.179688 C 3.148438 1.328125 2.585938 1.628906 2.109375 2.109375 C 1.601562 2.613281 1.265625 3.265625 1.160156 3.945312 C 1.132812 4.128906 1.125 5.566406 1.132812 9.15625 L 1.144531 14.117188 L 1.222656 14.375 C 1.347656 14.777344 1.46875 15.039062 1.671875 15.355469 C 2.109375 16.023438 2.761719 16.503906 3.570312 16.757812 L 3.882812 16.859375 L 14.078125 16.859375 L 14.355469 16.777344 C 14.757812 16.660156 15.027344 16.539062 15.355469 16.328125 C 16.023438 15.890625 16.503906 15.238281 16.757812 14.429688 L 16.859375 14.117188 L 16.859375 9.015625 C 16.859375 3.378906 16.875 3.832031 16.640625 3.234375 C 16.226562 2.1875 15.261719 1.390625 14.136719 1.175781 C 13.757812 1.101562 4.171875 1.105469 3.835938 1.179688 M 5.121094 4.269531 C 4.902344 4.328125 4.714844 4.484375 4.605469 4.695312 L 4.515625 4.867188 L 4.515625 13.132812 L 4.605469 13.308594 C 4.917969 13.910156 5.769531 13.910156 6.082031 13.308594 L 6.171875 13.132812 L 6.179688 9.105469 C 6.1875 6.289062 6.175781 5.023438 6.152344 4.894531 C 6.054688 4.433594 5.578125 4.144531 5.121094 4.269531 M 8.214844 4.265625 C 7.996094 4.328125 7.808594 4.484375 7.699219 4.695312 L 7.609375 4.867188 L 7.601562 8.894531 C 7.59375 11.710938 7.605469 12.976562 7.628906 13.105469 C 7.679688 13.34375 7.84375 13.558594 8.066406 13.675781 C 8.242188 13.761719 8.246094 13.765625 9.140625 13.761719 C 10.15625 13.757812 10.460938 13.71875 11.074219 13.515625 C 12.726562 12.960938 13.957031 11.53125 14.257812 9.808594 C 14.335938 9.371094 14.335938 8.628906 14.257812 8.191406 C 13.914062 6.222656 12.359375 4.660156 10.390625 4.304688 C 9.949219 4.226562 8.453125 4.199219 8.214844 4.265625 M 9.28125 9 L 9.28125 12.09375 L 9.628906 12.09375 C 10.832031 12.09375 11.972656 11.316406 12.429688 10.183594 C 12.808594 9.246094 12.710938 8.132812 12.171875 7.320312 C 11.59375 6.441406 10.628906 5.90625 9.628906 5.90625 L 9.28125 5.90625 L 9.28125 9 "/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16.007826" viewBox="0 0 16 16.007826">
+<path fill-rule="evenodd" fill="rgb(1.568627%, 1.568627%, 1.568627%)" fill-opacity="1" d="M 2.753906 0.0585938 C 2.054688 0.210938 1.480469 0.515625 0.996094 1.003906 C 0.480469 1.515625 0.136719 2.179688 0.03125 2.871094 C 0.00390625 3.058594 -0.00390625 4.519531 0.00390625 8.171875 L 0.015625 13.21875 L 0.09375 13.480469 C 0.222656 13.890625 0.34375 14.15625 0.550781 14.476562 C 0.996094 15.15625 1.660156 15.644531 2.480469 15.90625 L 2.800781 16.007812 L 13.171875 16.007812 L 13.453125 15.925781 C 13.863281 15.804688 14.136719 15.683594 14.46875 15.46875 C 15.148438 15.023438 15.636719 14.359375 15.894531 13.535156 L 16 13.21875 L 16 8.027344 C 16 2.296875 16.015625 2.757812 15.777344 2.148438 C 15.355469 1.082031 14.375 0.273438 13.230469 0.0546875 C 12.84375 -0.0195312 3.09375 -0.015625 2.753906 0.0585938 M 4.058594 3.203125 C 3.835938 3.261719 3.648438 3.421875 3.535156 3.632812 L 3.445312 3.808594 L 3.445312 12.21875 L 3.535156 12.394531 C 3.851562 13.007812 4.71875 13.007812 5.039062 12.394531 L 5.128906 12.21875 L 5.136719 8.121094 C 5.144531 5.253906 5.132812 3.96875 5.109375 3.835938 C 5.007812 3.367188 4.523438 3.074219 4.058594 3.203125 M 7.207031 3.199219 C 6.984375 3.261719 6.792969 3.421875 6.683594 3.632812 L 6.589844 3.808594 L 6.582031 7.90625 C 6.574219 10.769531 6.585938 12.058594 6.609375 12.1875 C 6.664062 12.433594 6.828125 12.648438 7.054688 12.769531 C 7.234375 12.855469 7.238281 12.859375 8.148438 12.855469 C 9.179688 12.851562 9.492188 12.8125 10.113281 12.605469 C 11.796875 12.042969 13.046875 10.589844 13.351562 8.835938 C 13.433594 8.390625 13.433594 7.636719 13.351562 7.191406 C 13.003906 5.1875 11.421875 3.597656 9.417969 3.238281 C 8.972656 3.15625 7.449219 3.128906 7.207031 3.199219 M 8.292969 8.011719 L 8.292969 11.160156 L 8.644531 11.160156 C 9.867188 11.160156 11.027344 10.371094 11.492188 9.21875 C 11.878906 8.265625 11.78125 7.132812 11.230469 6.304688 C 10.644531 5.410156 9.664062 4.867188 8.644531 4.867188 L 8.292969 4.867188 L 8.292969 8.011719 "/>
 </svg>
diff --git a/symbols/general/buffer_stop.svg b/symbols/general/buffer_stop.svg
index 1e0ce0bb..c619b286 100644
--- a/symbols/general/buffer_stop.svg
+++ b/symbols/general/buffer_stop.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="18" height="18" viewBox="0 0 18 18">
-<path fill="none" stroke-width="2" stroke-linecap="butt" stroke-linejoin="miter" stroke="rgb(0%, 0%, 0%)" stroke-opacity="1" stroke-miterlimit="4" d="M 2.000868 0.998264 L 2.000868 7.999132 " transform="matrix(0.9, 0, 0, 0.9, 0, 0)"/>
-<path fill="none" stroke-width="2" stroke-linecap="butt" stroke-linejoin="miter" stroke="rgb(0%, 0%, 0%)" stroke-opacity="1" stroke-miterlimit="4" d="M 0.998264 17.000868 L 19.001736 17.000868 " transform="matrix(0.9, 0, 0, 0.9, 0, 0)"/>
-<path fill="none" stroke-width="2" stroke-linecap="butt" stroke-linejoin="miter" stroke="rgb(0%, 0%, 0%)" stroke-opacity="1" stroke-miterlimit="4" d="M 15.998264 17.000868 L 2.000868 2.999132 " transform="matrix(0.9, 0, 0, 0.9, 0, 0)"/>
-<path fill-rule="nonzero" fill="rgb(100%, 100%, 100%)" fill-opacity="1" stroke-width="2" stroke-linecap="butt" stroke-linejoin="miter" stroke="rgb(0%, 0%, 0%)" stroke-opacity="1" stroke-miterlimit="4" d="M 5.998264 7.000868 L 15.998264 17.000868 L 5.998264 17.000868 L 5.998264 7.000868 " transform="matrix(0.9, 0, 0, 0.9, 0, 0)"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="15.110512" viewBox="0 0 16 15.110512">
+<path fill="none" stroke-width="1.8" stroke-linecap="butt" stroke-linejoin="miter" stroke="rgb(0%, 0%, 0%)" stroke-opacity="1" stroke-miterlimit="4" d="M 0.901932 0 L 0.901932 6.301655 " transform="matrix(0.987464, 0, 0, 0.987464, 0, 0)"/>
+<path fill="none" stroke-width="1.8" stroke-linecap="butt" stroke-linejoin="miter" stroke="rgb(0%, 0%, 0%)" stroke-opacity="1" stroke-miterlimit="4" d="M 0 14.403217 L 16.203125 14.403217 " transform="matrix(0.987464, 0, 0, 0.987464, 0, 0)"/>
+<path fill="none" stroke-width="1.8" stroke-linecap="butt" stroke-linejoin="miter" stroke="rgb(0%, 0%, 0%)" stroke-opacity="1" stroke-miterlimit="4" d="M 13.501286 14.403217 L 0.901932 1.799908 " transform="matrix(0.987464, 0, 0, 0.987464, 0, 0)"/>
+<path fill="none" stroke-width="1.8" stroke-linecap="butt" stroke-linejoin="miter" stroke="rgb(0%, 0%, 0%)" stroke-opacity="1" stroke-miterlimit="4" d="M 4.501747 5.403679 L 13.501286 14.403217 L 4.501747 14.403217 L 4.501747 5.403679 " transform="matrix(0.987464, 0, 0, 0.987464, 0, 0)"/>
 </svg>
diff --git a/symbols/general/coaling_facility.svg b/symbols/general/coaling_facility.svg
index 35b7f93a..ccad46a0 100644
--- a/symbols/general/coaling_facility.svg
+++ b/symbols/general/coaling_facility.svg
@@ -1,4 +1,4 @@
 <?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="18" viewBox="0 0 18 18">
-<path fill-rule="evenodd" fill="rgb(1.568627%, 1.568627%, 1.568627%)" fill-opacity="1" d="M 8.15625 1.375 C 8.15625 1.429688 9.390625 7.855469 9.402344 7.867188 C 9.414062 7.878906 14.304688 4.03125 14.304688 4.007812 C 14.3125 3.988281 8.226562 1.335938 8.183594 1.335938 C 8.167969 1.335938 8.15625 1.355469 8.15625 1.375 M 3.40625 3.625 C 1.757812 4.789062 0.34375 5.792969 0.273438 5.863281 C 0.203125 5.933594 0.109375 6.058594 0.0703125 6.140625 C 0 6.289062 0 6.347656 0 10.046875 L 0 13.804688 L 0.0976562 13.992188 C 0.148438 14.09375 0.25 14.226562 0.320312 14.28125 C 0.484375 14.414062 6.21875 16.570312 6.242188 16.511719 C 6.25 16.484375 6.636719 14.882812 7.101562 12.941406 L 7.949219 9.414062 L 7.191406 5.472656 C 6.773438 3.308594 6.429688 1.53125 6.421875 1.523438 C 6.417969 1.519531 5.0625 2.464844 3.40625 3.625 M 12.5 7.621094 L 9.585938 9.929688 L 8.785156 13.273438 C 8.34375 15.109375 7.984375 16.625 7.988281 16.648438 C 7.996094 16.671875 9.9375 16.164062 12.722656 15.410156 C 16.402344 14.417969 17.484375 14.113281 17.609375 14.035156 C 17.839844 13.894531 17.976562 13.660156 17.992188 13.375 C 18.007812 13.15625 17.960938 13.007812 16.730469 9.230469 C 16.027344 7.074219 15.445312 5.3125 15.4375 5.3125 C 15.425781 5.3125 14.105469 6.351562 12.5 7.621094 "/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="15" height="12.765196" viewBox="0 0 15 12.765196">
+<path fill-rule="evenodd" fill="rgb(1.568627%, 1.568627%, 1.568627%)" fill-opacity="1" d="M 6.800781 0.03125 C 6.800781 0.078125 7.828125 5.433594 7.835938 5.445312 C 7.847656 5.453125 11.925781 2.246094 11.925781 2.226562 C 11.929688 2.210938 6.859375 0 6.820312 0 C 6.808594 0 6.800781 0.015625 6.800781 0.03125 M 2.839844 1.90625 C 1.464844 2.878906 0.285156 3.714844 0.226562 3.773438 C 0.167969 3.832031 0.0898438 3.9375 0.0585938 4.003906 C 0 4.128906 0 4.179688 0 7.261719 L 0 10.394531 L 0.0820312 10.550781 C 0.125 10.636719 0.207031 10.746094 0.265625 10.792969 C 0.402344 10.902344 5.183594 12.699219 5.203125 12.652344 C 5.210938 12.628906 5.53125 11.292969 5.917969 9.675781 L 6.625 6.734375 L 5.996094 3.449219 C 5.644531 1.644531 5.359375 0.164062 5.351562 0.15625 C 5.351562 0.152344 4.21875 0.941406 2.839844 1.90625 M 10.421875 5.238281 L 7.992188 7.164062 L 7.324219 9.949219 C 6.957031 11.480469 6.65625 12.746094 6.660156 12.765625 C 6.664062 12.785156 8.285156 12.359375 10.605469 11.730469 C 13.671875 10.90625 14.574219 10.652344 14.679688 10.585938 C 14.871094 10.46875 14.984375 10.273438 15 10.035156 C 15.011719 9.851562 14.972656 9.730469 13.945312 6.582031 C 13.359375 4.785156 12.875 3.316406 12.867188 3.316406 C 12.859375 3.316406 11.757812 4.179688 10.421875 5.238281 "/>
 </svg>
diff --git a/symbols/general/crossing.svg b/symbols/general/crossing.svg
index 75d030f0..068016e3 100644
--- a/symbols/general/crossing.svg
+++ b/symbols/general/crossing.svg
@@ -1,134 +1,17 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   width="18.331696"
-   height="18.36084"
-   viewBox="0 0 18.331696 18.36084"
-   version="1.1"
-   id="svg32"
-   sodipodi:docname="crossing.svg"
-   inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <defs
-     id="defs36" />
-  <sodipodi:namedview
-     id="namedview34"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:showpageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"
-     showgrid="false"
-     inkscape:zoom="46.277778"
-     inkscape:cx="9.2593037"
-     inkscape:cy="9.1944778"
-     inkscape:window-width="1920"
-     inkscape:window-height="1008"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg32" />
-  <path
-     fill="none"
-     stroke-width="1.058313"
-     stroke-linecap="round"
-     stroke-linejoin="miter"
-     stroke="#ffffff"
-     stroke-opacity="1"
-     stroke-miterlimit="4"
-     d="M 3.8806946,2.1260289 2.1189765,3.8955591 7.4041308,9.1807134 2.1267886,14.458055 3.8885067,16.219773 9.1658489,10.94243 10.931473,12.704149 14.451002,16.235398 16.21272,14.465867 12.689284,10.94243 10.931473,9.1807134 16.21272,3.8955591 14.451002,2.1260289 12.689284,3.8955591 10.931473,5.6572772 9.1658489,7.4189953 5.6424127,3.8955591 Z m 0,0"
-     id="path2"
-     style="stroke-width:3;stroke-dasharray:none" />
-  <path
-     fill="none"
-     stroke-width="0.562503"
-     stroke-linecap="round"
-     stroke-linejoin="miter"
-     stroke="#000000"
-     stroke-opacity="1"
-     stroke-miterlimit="4"
-     d="M 3.8806946,2.1260289 2.1189765,3.8955591 7.4041308,9.1807134 2.1267886,14.458055 3.8885067,16.219773 9.1658489,10.94243 10.931473,12.704149 14.451002,16.235398 16.21272,14.465867 12.689284,10.94243 10.931473,9.1807134 16.21272,3.8955591 14.451002,2.1260289 12.689284,3.8955591 10.931473,5.6572772 9.1658489,7.4189953 5.6424127,3.8955591 Z m 0,0"
-     id="path4" />
-  <path
-     fill-rule="nonzero"
-     fill="#000000"
-     fill-opacity="1"
-     d="m 2.1267901,14.458061 1.761718,-1.761719 1.765626,1.761719 -1.765626,1.761718 z m 0,0"
-     id="path6" />
-  <path
-     fill-rule="nonzero"
-     fill="#ffffff"
-     fill-opacity="1"
-     d="m 3.8806961,12.704155 1.761719,-1.761719 1.761719,1.761719 -1.761719,1.761718 z m 0,0"
-     id="path8" />
-  <path
-     fill-rule="nonzero"
-     fill="#000000"
-     fill-opacity="1"
-     d="m 5.6424151,10.942436 1.761719,-1.761719 1.765624,1.761719 -1.765624,1.761719 z m 0,0"
-     id="path10" />
-  <path
-     fill-rule="nonzero"
-     fill="#ffffff"
-     fill-opacity="1"
-     d="m 7.4041341,9.180717 1.765624,-1.761719 1.7617189,1.761719 -1.7617189,1.761719 z m 0,0"
-     id="path12" />
-  <path
-     fill-rule="nonzero"
-     fill="#000000"
-     fill-opacity="1"
-     d="m 9.1697581,7.418998 1.7617189,-1.761719 1.761719,1.761719 -1.761719,1.761719 z m 0,0"
-     id="path14" />
-  <path
-     fill-rule="nonzero"
-     fill="#ffffff"
-     fill-opacity="1"
-     d="m 10.931477,5.657279 1.761719,-1.761718 1.757812,1.761718 -1.757812,1.761719 z m 0,0"
-     id="path16" />
-  <path
-     fill-rule="nonzero"
-     fill="#000000"
-     fill-opacity="1"
-     d="m 12.693196,3.895561 1.757812,-1.761719 1.761719,1.761719 -1.761719,1.761718 z m 0,0"
-     id="path18" />
-  <path
-     fill-rule="nonzero"
-     fill="#000000"
-     fill-opacity="1"
-     d="m 3.8806961,2.133842 1.761719,1.761719 -1.761719,1.761718 -1.761719,-1.761718 z m 0,0"
-     id="path20" />
-  <path
-     fill-rule="nonzero"
-     fill="#ffffff"
-     fill-opacity="1"
-     d="m 5.6424151,3.895561 1.761719,1.761718 -1.761719,1.761719 -1.761719,-1.761719 z m 0,0"
-     id="path22" />
-  <path
-     fill-rule="nonzero"
-     fill="#000000"
-     fill-opacity="1"
-     d="m 7.4041341,5.657279 1.765624,1.761719 -1.765624,1.761719 -1.761719,-1.761719 z m 0,0"
-     id="path24" />
-  <path
-     fill-rule="nonzero"
-     fill="#000000"
-     fill-opacity="1"
-     d="m 10.931477,9.180717 1.757813,1.761719 -1.757813,1.761719 -1.7617189,-1.761719 z m 0,0"
-     id="path26" />
-  <path
-     fill-rule="nonzero"
-     fill="#ffffff"
-     fill-opacity="1"
-     d="m 12.693196,10.942436 1.757812,1.761719 -1.757812,1.761718 -1.761719,-1.761718 z m 0,0"
-     id="path28" />
-  <path
-     fill-rule="nonzero"
-     fill="#000000"
-     fill-opacity="1"
-     d="m 14.451008,12.704155 1.761719,1.761718 -1.761719,1.761719 -1.761718,-1.761719 z m 0,0"
-     id="path30" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="15" height="15.018296" viewBox="0 0 15 15.018296">
+<path fill="none" stroke-width="0.562503" stroke-linecap="round" stroke-linejoin="miter" stroke="rgb(0%, 0%, 0%)" stroke-opacity="1" stroke-miterlimit="4" d="M 2.159588 0.399349 L 0.395472 2.167343 L 5.683943 7.451936 L 0.403227 12.728776 L 2.167343 14.492892 L 7.444182 9.216052 L 9.208298 10.976291 L 12.728776 14.5084 L 14.492892 12.740407 L 10.968537 9.216052 L 9.208298 7.451936 L 14.492892 2.167343 L 12.728776 0.399349 L 10.968537 2.167343 L 9.208298 3.931459 L 7.444182 5.691697 L 3.919827 2.167343 Z M 2.159588 0.399349 " transform="matrix(1.007498, 0, 0, 1.007498, 0, 0)"/>
+<path fill-rule="nonzero" fill="rgb(0%, 0%, 0%)" fill-opacity="1" d="M 0.40625 12.824219 L 2.183594 11.050781 L 3.960938 12.824219 L 2.183594 14.601562 Z M 0.40625 12.824219 "/>
+<path fill-rule="nonzero" fill="rgb(100%, 100%, 100%)" fill-opacity="1" d="M 2.175781 11.058594 L 3.949219 9.285156 L 5.726562 11.058594 L 3.949219 12.835938 Z M 2.175781 11.058594 "/>
+<path fill-rule="nonzero" fill="rgb(0%, 0%, 0%)" fill-opacity="1" d="M 3.949219 9.285156 L 5.726562 7.507812 L 7.503906 9.285156 L 5.726562 11.058594 Z M 3.949219 9.285156 "/>
+<path fill-rule="nonzero" fill="rgb(100%, 100%, 100%)" fill-opacity="1" d="M 5.726562 7.507812 L 7.503906 5.734375 L 9.277344 7.507812 L 7.503906 9.285156 Z M 5.726562 7.507812 "/>
+<path fill-rule="nonzero" fill="rgb(0%, 0%, 0%)" fill-opacity="1" d="M 7.503906 5.734375 L 9.277344 3.960938 L 11.054688 5.734375 L 9.277344 7.507812 Z M 7.503906 5.734375 "/>
+<path fill-rule="nonzero" fill="rgb(100%, 100%, 100%)" fill-opacity="1" d="M 9.277344 3.960938 L 11.054688 2.183594 L 12.824219 3.960938 L 11.054688 5.734375 Z M 9.277344 3.960938 "/>
+<path fill-rule="nonzero" fill="rgb(0%, 0%, 0%)" fill-opacity="1" d="M 11.054688 2.183594 L 12.824219 0.410156 L 14.601562 2.183594 L 12.824219 3.960938 Z M 11.054688 2.183594 "/>
+<path fill-rule="nonzero" fill="rgb(0%, 0%, 0%)" fill-opacity="1" d="M 2.175781 0.410156 L 3.949219 2.183594 L 2.175781 3.960938 L 0.398438 2.183594 Z M 2.175781 0.410156 "/>
+<path fill-rule="nonzero" fill="rgb(100%, 100%, 100%)" fill-opacity="1" d="M 3.949219 2.183594 L 5.726562 3.960938 L 3.949219 5.734375 L 2.175781 3.960938 Z M 3.949219 2.183594 "/>
+<path fill-rule="nonzero" fill="rgb(0%, 0%, 0%)" fill-opacity="1" d="M 5.726562 3.960938 L 7.503906 5.734375 L 5.726562 7.507812 L 3.949219 5.734375 Z M 5.726562 3.960938 "/>
+<path fill-rule="nonzero" fill="rgb(0%, 0%, 0%)" fill-opacity="1" d="M 9.277344 7.507812 L 11.050781 9.285156 L 9.277344 11.058594 L 7.503906 9.285156 Z M 9.277344 7.507812 "/>
+<path fill-rule="nonzero" fill="rgb(100%, 100%, 100%)" fill-opacity="1" d="M 11.054688 9.285156 L 12.824219 11.058594 L 11.054688 12.835938 L 9.277344 11.058594 Z M 11.054688 9.285156 "/>
+<path fill-rule="nonzero" fill="rgb(0%, 0%, 0%)" fill-opacity="1" d="M 12.824219 11.058594 L 14.601562 12.835938 L 12.824219 14.609375 L 11.050781 12.835938 Z M 12.824219 11.058594 "/>
 </svg>
diff --git a/symbols/general/derail.svg b/symbols/general/derail.svg
index b3372374..45c46df7 100644
--- a/symbols/general/derail.svg
+++ b/symbols/general/derail.svg
@@ -1,6 +1,6 @@
 <?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="18" viewBox="0 0 18 18">
-<path fill-rule="nonzero" fill="rgb(100%, 100%, 100%)" fill-opacity="1" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke="rgb(0%, 0%, 0%)" stroke-opacity="1" stroke-miterlimit="4" d="M 7.4375 3.5 L 13.5 3.5 L 13.5 14.489583 L 7.4375 14.489583 Z M 7.4375 3.5 " transform="matrix(1.125, 0, 0, 1.125, 0, 0)"/>
-<path fill="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke="rgb(0%, 0%, 0%)" stroke-opacity="1" stroke-miterlimit="4" d="M 14.704861 15.291667 L 4.788194 1.5 " transform="matrix(1.125, 0, 0, 1.125, 0, 0)"/>
-<path fill="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke="rgb(0%, 0%, 0%)" stroke-opacity="1" stroke-miterlimit="4" d="M 9 1.5 L 4.5 1.5 L 4.5 6 " transform="matrix(1.125, 0, 0, 1.125, 0, 0)"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="12" height="15.750666" viewBox="0 0 12 15.750666">
+<path fill="none" stroke-width="1.125" stroke-linecap="butt" stroke-linejoin="miter" stroke="rgb(0%, 0%, 0%)" stroke-opacity="1" stroke-miterlimit="4" d="M 3.865458 2.811612 L 10.68901 2.811612 L 10.68901 15.177011 L 3.865458 15.177011 Z M 3.865458 2.811612 " transform="matrix(0.960025, 0, 0, 0.960025, 0, 0)"/>
+<path fill="none" stroke-width="1.125" stroke-linecap="butt" stroke-linejoin="miter" stroke="rgb(0%, 0%, 0%)" stroke-opacity="1" stroke-miterlimit="4" d="M 12.039886 16.080307 L 0.887021 0.561509 " transform="matrix(0.960025, 0, 0, 0.960025, 0, 0)"/>
+<path fill="none" stroke-width="1.125" stroke-linecap="butt" stroke-linejoin="miter" stroke="rgb(0%, 0%, 0%)" stroke-opacity="1" stroke-miterlimit="4" d="M 5.623225 0.561509 L 0.561509 0.561509 L 0.561509 5.623225 " transform="matrix(0.960025, 0, 0, 0.960025, 0, 0)"/>
 </svg>
diff --git a/symbols/general/etcs-stop-marker-arrow-left.svg b/symbols/general/etcs-stop-marker-arrow-left.svg
index 79ea5592..64ed83f9 100644
--- a/symbols/general/etcs-stop-marker-arrow-left.svg
+++ b/symbols/general/etcs-stop-marker-arrow-left.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16" viewBox="0 0 16 16">
-<rect x="-1.6" y="-1.6" width="19.2" height="19.2" fill="rgb(0.392157%, 25.098041%, 69.803923%)" fill-opacity="1"/>
-<path fill-rule="evenodd" fill="rgb(100%, 100%, 100%)" fill-opacity="1" d="M 15.199219 5.371094 L 8 5.371094 L 8 0.800781 L 0 8 L 8 15.199219 L 8 10.628906 L 15.199219 10.628906 Z M 15.199219 5.371094 "/>
-<path fill-rule="evenodd" fill="rgb(98.039216%, 98.039216%, 9.019608%)" fill-opacity="1" d="M 15.199219 6.171875 L 7.199219 6.171875 L 7.199219 2.597656 L 1.195312 8 L 7.199219 13.402344 L 7.199219 9.828125 L 15.199219 9.828125 Z M 15.199219 6.171875 "/>
+<rect x="-1.6" y="-1.6" width="19.2" height="19.2" fill="rgb(0.392157%, 25.098039%, 69.803922%)" fill-opacity="1"/>
+<path fill-rule="evenodd" fill="rgb(100%, 100%, 100%)" fill-opacity="1" d="M 14 5.808594 L 8 5.808594 L 8 2 L 1.332031 8 L 8 14 L 8 10.191406 L 14 10.191406 Z M 14 5.808594 "/>
+<path fill-rule="evenodd" fill="rgb(98.039216%, 98.039216%, 9.019608%)" fill-opacity="1" d="M 14 6.476562 L 7.332031 6.476562 L 7.332031 3.496094 L 2.328125 8 L 7.332031 12.5 L 7.332031 9.523438 L 14 9.523438 Z M 14 6.476562 "/>
 </svg>
diff --git a/symbols/general/etcs-stop-marker-triangle-left.svg b/symbols/general/etcs-stop-marker-triangle-left.svg
index f68b47c7..4f906654 100644
--- a/symbols/general/etcs-stop-marker-triangle-left.svg
+++ b/symbols/general/etcs-stop-marker-triangle-left.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16" viewBox="0 0 16 16">
-<rect x="-1.6" y="-1.6" width="19.2" height="19.2" fill="rgb(0.392157%, 25.098041%, 69.803923%)" fill-opacity="1"/>
-<path fill-rule="evenodd" fill="rgb(100%, 100%, 100%)" fill-opacity="1" d="M 15.199219 16 L 15.199219 0 L 0 8.097656 Z M 15.199219 16 "/>
-<path fill-rule="evenodd" fill="rgb(98.039216%, 98.039216%, 9.019608%)" fill-opacity="1" d="M 15.199219 14.902344 L 15.199219 1.09375 L 2.195312 8.101562 Z M 15.199219 14.902344 "/>
+<rect x="-1.6" y="-1.6" width="19.2" height="19.2" fill="rgb(0.392157%, 25.098039%, 69.803922%)" fill-opacity="1"/>
+<path fill-rule="evenodd" fill="rgb(100%, 100%, 100%)" fill-opacity="1" d="M 14 14.667969 L 14 1.332031 L 1.332031 8.082031 Z M 14 14.667969 "/>
+<path fill-rule="evenodd" fill="rgb(98.039216%, 98.039216%, 9.019608%)" fill-opacity="1" d="M 14 13.75 L 14 2.246094 L 3.164062 8.085938 Z M 14 13.75 "/>
 </svg>
diff --git a/symbols/general/level-crossing-barrier.svg b/symbols/general/level-crossing-barrier.svg
index b60ed10e..b302a04a 100644
--- a/symbols/general/level-crossing-barrier.svg
+++ b/symbols/general/level-crossing-barrier.svg
@@ -1,230 +1,31 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   width="18.429346"
-   height="18.36084"
-   viewBox="0 0 18.429346 18.36084"
-   version="1.1"
-   id="svg2136"
-   sodipodi:docname="level-crossing-barrier.svg"
-   inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <defs
-     id="defs2140" />
-  <sodipodi:namedview
-     id="namedview2138"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:showpageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"
-     showgrid="false"
-     inkscape:zoom="47.722222"
-     inkscape:cx="9.104773"
-     inkscape:cy="9.0209546"
-     inkscape:window-width="1920"
-     inkscape:window-height="1008"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2136" />
-  <path
-     fill="none"
-     stroke-width="0.52916"
-     stroke-linecap="round"
-     stroke-linejoin="miter"
-     stroke="rgb(0%, 0%, 0%)"
-     stroke-opacity="1"
-     stroke-miterlimit="4"
-     d="m 3.978344,2.126029 -1.7617181,1.7695302 5.2851542,5.2851542 -5.2773422,5.2773416 1.7617181,1.761718 5.2773422,-5.277342 1.7656228,1.761718 3.51953,3.531249 1.761718,-1.769531 L 12.786933,10.942431 11.029121,9.1807134 16.310369,3.8955592 14.548651,2.126029 12.786933,3.8955592 11.029121,5.6572773 9.2634982,7.4189953 5.7400621,3.8955592 Z m 0,0"
-     id="path2-6"
-     style="font-variation-settings:normal;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000" />
-  <path
-     fill="none"
-     stroke-width="0.562503"
-     stroke-linecap="round"
-     stroke-linejoin="miter"
-     stroke="#000000"
-     stroke-opacity="1"
-     stroke-miterlimit="4"
-     d="m 17.480454,8.8906209 c 0,1.3984371 -1.132812,2.5351551 -2.531249,2.5351551 -1.398436,0 -2.535155,-1.136718 -2.535155,-2.5351551 0,-1.3984369 1.136719,-2.535155 2.535155,-2.535155 1.398437,0 2.531249,1.1367181 2.531249,2.535155 z m 0,0"
-     id="path2080" />
-  <path
-     fill-rule="nonzero"
-     fill="#000000"
-     fill-opacity="1"
-     d="m 17.480461,8.890625 c 0,1.398437 -1.132812,2.535156 -2.53125,2.535156 -1.398437,0 -2.535156,-1.136719 -2.535156,-2.535156 0,-1.398437 1.136719,-2.535156 2.535156,-2.535156 1.398438,0 2.53125,1.136719 2.53125,2.535156 z m 0,0"
-     id="path2082" />
-  <path
-     fill-rule="nonzero"
-     fill="#dc2929"
-     fill-opacity="1"
-     d="m 16.789055,8.890625 c 0,1.015625 -0.828125,1.835937 -1.839844,1.835937 -1.011718,0 -1.835937,-0.820312 -1.835937,-1.835937 0,-1.015625 0.824219,-1.835937 1.835937,-1.835937 1.011719,0 1.839844,0.820312 1.839844,1.835937 z m 0,0"
-     id="path2084" />
-  <path
-     fill="none"
-     stroke-width="0.562503"
-     stroke-linecap="round"
-     stroke-linejoin="miter"
-     stroke="#000000"
-     stroke-opacity="1"
-     stroke-miterlimit="4"
-     d="m 5.7538969,8.8906209 c 0,1.3984371 -1.1328126,2.5351551 -2.5312485,2.5351551 -1.4023435,0 -2.53515601,-1.136718 -2.53515601,-2.5351551 0,-1.3984369 1.13281251,-2.535155 2.53515601,-2.535155 1.3984359,0 2.5312485,1.1367181 2.5312485,2.535155 z m 0,0"
-     id="path2086" />
-  <path
-     fill-rule="nonzero"
-     fill="#000000"
-     fill-opacity="1"
-     d="m 5.7538994,8.890625 c 0,1.398437 -1.132812,2.535156 -2.53125,2.535156 -1.402344,0 -2.53515604,-1.136719 -2.53515604,-2.535156 0,-1.398437 1.13281204,-2.535156 2.53515604,-2.535156 1.398438,0 2.53125,1.136719 2.53125,2.535156 z m 0,0"
-     id="path2088" />
-  <path
-     fill-rule="nonzero"
-     fill="#dc2929"
-     fill-opacity="1"
-     d="m 5.0585874,8.890625 c 0,1.015625 -0.824219,1.835937 -1.835938,1.835937 -1.015625,0 -1.835938,-0.820312 -1.835938,-1.835937 0,-1.015625 0.820313,-1.835937 1.835938,-1.835937 1.011719,0 1.835938,0.820312 1.835938,1.835937 z m 0,0"
-     id="path2090" />
-  <path
-     fill="none"
-     stroke-width="0.562503"
-     stroke-linecap="round"
-     stroke-linejoin="miter"
-     stroke="#000000"
-     stroke-opacity="1"
-     stroke-miterlimit="4"
-     d="M 3.7226478,1.9453119 1.9609297,3.7148421 7.246084,8.9999964 1.9687418,14.277338 l 1.7617181,1.761718 5.2773422,-5.277343 1.7656239,1.761718 3.519529,3.53125 L 16.054673,14.28515 12.531237,10.761713 10.773426,8.9999964 16.054673,3.7148421 14.292955,1.9453119 12.531237,3.7148421 10.773426,5.4765602 9.0078021,7.2382783 5.4843659,3.7148421 Z m 0,0"
-     id="path2092" />
-  <path
-     fill-rule="nonzero"
-     fill="#cb1414"
-     fill-opacity="1"
-     d="m 1.9687434,14.277344 1.761718,-1.761719 1.765626,1.761719 -1.765626,1.761718 z m 0,0"
-     id="path2094" />
-  <path
-     fill-rule="nonzero"
-     fill="#ffffff"
-     fill-opacity="1"
-     d="m 3.7226494,12.523438 1.761719,-1.761719 1.761719,1.761719 -1.761719,1.761718 z m 0,0"
-     id="path2096" />
-  <path
-     fill-rule="nonzero"
-     fill="#cb1414"
-     fill-opacity="1"
-     d="M 5.4843684,10.761719 7.2460874,9 l 1.765624,1.761719 -1.765624,1.761719 z m 0,0"
-     id="path2098" />
-  <path
-     fill-rule="nonzero"
-     fill="#ffffff"
-     fill-opacity="1"
-     d="M 7.2460874,9 9.0117114,7.238281 10.77343,9 9.0117114,10.761719 Z m 0,0"
-     id="path2100" />
-  <path
-     fill-rule="nonzero"
-     fill="#cb1414"
-     fill-opacity="1"
-     d="M 9.0117114,7.238281 10.77343,5.476562 12.535149,7.238281 10.77343,9 Z m 0,0"
-     id="path2102" />
-  <path
-     fill-rule="nonzero"
-     fill="#ffffff"
-     fill-opacity="1"
-     d="m 10.77343,5.476562 1.761719,-1.761718 1.757812,1.761718 -1.757812,1.761719 z m 0,0"
-     id="path2104" />
-  <path
-     fill-rule="nonzero"
-     fill="#cb1414"
-     fill-opacity="1"
-     d="m 12.535149,3.714844 1.757812,-1.761719 1.761719,1.761719 -1.761719,1.761718 z m 0,0"
-     id="path2106" />
-  <path
-     fill-rule="nonzero"
-     fill="#cb1414"
-     fill-opacity="1"
-     d="m 3.7226494,1.953125 1.761719,1.761719 -1.761719,1.761718 -1.761719,-1.761718 z m 0,0"
-     id="path2108" />
-  <path
-     fill-rule="nonzero"
-     fill="#ffffff"
-     fill-opacity="1"
-     d="m 5.4843684,3.714844 1.761719,1.761718 -1.761719,1.761719 -1.761719,-1.761719 z m 0,0"
-     id="path2110" />
-  <path
-     fill-rule="nonzero"
-     fill="#cb1414"
-     fill-opacity="1"
-     d="M 7.2460874,5.476562 9.0117114,7.238281 7.2460874,9 5.4843684,7.238281 Z m 0,0"
-     id="path2112" />
-  <path
-     fill-rule="nonzero"
-     fill="#cb1414"
-     fill-opacity="1"
-     d="m 10.77343,9 1.757813,1.761719 -1.757813,1.761719 -1.7617186,-1.761719 z m 0,0"
-     id="path2114" />
-  <path
-     fill-rule="nonzero"
-     fill="#ffffff"
-     fill-opacity="1"
-     d="m 12.535149,10.761719 1.757812,1.761719 -1.757812,1.761718 -1.761719,-1.761718 z m 0,0"
-     id="path2116" />
-  <path
-     fill-rule="nonzero"
-     fill="#cb1414"
-     fill-opacity="1"
-     d="m 14.292961,12.523438 1.761719,1.761718 -1.761719,1.761719 -1.761718,-1.761719 z m 0,0"
-     id="path2118" />
-  <path
-     fill="none"
-     stroke-width="1.12499"
-     stroke-linecap="round"
-     stroke-linejoin="miter"
-     stroke="#000000"
-     stroke-opacity="1"
-     stroke-miterlimit="4"
-     d="M 12.761706,13.777337 H 0.56249281 v 0.984375 H 17.648423 v -0.984375 z m 0,0"
-     id="path2120" />
-  <path
-     fill-rule="nonzero"
-     fill="#cb1414"
-     fill-opacity="1"
-     d="M 0.56639936,13.777344 H 3.0078054 v 0.984375 H 0.56249336 Z m 0,0"
-     id="path2122" />
-  <path
-     fill-rule="nonzero"
-     fill="#ffffff"
-     fill-opacity="1"
-     d="m 2.9921804,13.777344 h 2.445313 v 0.984375 h -2.445313 z m 0,0"
-     id="path2124" />
-  <path
-     fill-rule="nonzero"
-     fill="#cb1414"
-     fill-opacity="1"
-     d="m 5.4374934,13.777344 h 2.441406 v 0.984375 h -2.441406 z m 0,0"
-     id="path2126" />
-  <path
-     fill-rule="nonzero"
-     fill="#ffffff"
-     fill-opacity="1"
-     d="m 7.8788994,13.777344 h 2.4453116 v 0.984375 H 7.8788994 Z m 0,0"
-     id="path2128" />
-  <path
-     fill-rule="nonzero"
-     fill="#cb1414"
-     fill-opacity="1"
-     d="m 10.324211,13.777344 h 2.4375 v 0.984375 h -2.4375 z m 0,0"
-     id="path2130" />
-  <path
-     fill-rule="nonzero"
-     fill="#ffffff"
-     fill-opacity="1"
-     d="m 12.765618,13.777344 h 2.441406 v 0.984375 h -2.445313 z m 0,0"
-     id="path2132" />
-  <path
-     fill-rule="nonzero"
-     fill="#cb1414"
-     fill-opacity="1"
-     d="m 15.207024,13.777344 h 2.441406 v 0.984375 h -2.441406 z m 0,0"
-     id="path2134" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="15" height="12.278229" viewBox="0 0 15 12.278229">
+<path fill="none" stroke-width="0.562503" stroke-linecap="round" stroke-linejoin="miter" stroke="rgb(0%, 0%, 0%)" stroke-opacity="1" stroke-miterlimit="4" d="M 17.480587 7.34602 C 17.480587 8.740293 16.347146 9.878476 14.94813 9.878476 C 13.549114 9.878476 12.415674 8.740293 12.415674 7.34602 C 12.415674 5.947004 13.549114 4.808821 14.94813 4.808821 C 16.347146 4.808821 17.480587 5.947004 17.480587 7.34602 Z M 17.480587 7.34602 " transform="matrix(0.823682, 0, 0, 0.823682, 0, 0)"/>
+<path fill-rule="nonzero" fill="rgb(0%, 0%, 0%)" fill-opacity="1" d="M 14.398438 6.050781 C 14.398438 7.199219 13.464844 8.136719 12.3125 8.136719 C 11.160156 8.136719 10.226562 7.199219 10.226562 6.050781 C 10.226562 4.898438 11.160156 3.960938 12.3125 3.960938 C 13.464844 3.960938 14.398438 4.898438 14.398438 6.050781 Z M 14.398438 6.050781 "/>
+<path fill-rule="nonzero" fill="rgb(86.27451%, 16.078431%, 16.078431%)" fill-opacity="1" d="M 13.828125 6.050781 C 13.828125 6.886719 13.148438 7.5625 12.3125 7.5625 C 11.480469 7.5625 10.800781 6.886719 10.800781 6.050781 C 10.800781 5.210938 11.480469 4.535156 12.3125 4.535156 C 13.148438 4.535156 13.828125 5.210938 13.828125 6.050781 Z M 13.828125 6.050781 "/>
+<path fill="none" stroke-width="0.562503" stroke-linecap="round" stroke-linejoin="miter" stroke="rgb(0%, 0%, 0%)" stroke-opacity="1" stroke-miterlimit="4" d="M 5.752564 7.34602 C 5.752564 8.740293 4.619124 9.878476 3.22485 9.878476 C 1.821092 9.878476 0.687652 8.740293 0.687652 7.34602 C 0.687652 5.947004 1.821092 4.808821 3.22485 4.808821 C 4.619124 4.808821 5.752564 5.947004 5.752564 7.34602 Z M 5.752564 7.34602 " transform="matrix(0.823682, 0, 0, 0.823682, 0, 0)"/>
+<path fill-rule="nonzero" fill="rgb(0%, 0%, 0%)" fill-opacity="1" d="M 4.738281 6.050781 C 4.738281 7.199219 3.804688 8.136719 2.65625 8.136719 C 1.5 8.136719 0.566406 7.199219 0.566406 6.050781 C 0.566406 4.898438 1.5 3.960938 2.65625 3.960938 C 3.804688 3.960938 4.738281 4.898438 4.738281 6.050781 Z M 4.738281 6.050781 "/>
+<path fill-rule="nonzero" fill="rgb(86.27451%, 16.078431%, 16.078431%)" fill-opacity="1" d="M 4.167969 6.050781 C 4.167969 6.886719 3.488281 7.5625 2.65625 7.5625 C 1.816406 7.5625 1.140625 6.886719 1.140625 6.050781 C 1.140625 5.210938 1.816406 4.535156 2.65625 4.535156 C 3.488281 4.535156 4.167969 5.210938 4.167969 6.050781 Z M 4.167969 6.050781 "/>
+<path fill="none" stroke-width="0.562503" stroke-linecap="round" stroke-linejoin="miter" stroke="rgb(0%, 0%, 0%)" stroke-opacity="1" stroke-miterlimit="4" d="M 3.722805 0.398364 L 1.958622 2.167289 L 7.246429 7.455096 L 1.968107 12.728675 L 3.73229 14.492857 L 9.005869 9.214536 L 10.774795 10.978719 L 14.293675 14.507085 L 16.053116 12.738159 L 12.529493 9.214536 L 10.774795 7.455096 L 16.053116 2.167289 L 14.293675 0.398364 L 12.529493 2.167289 L 10.774795 3.931472 L 9.005869 5.690913 L 5.482246 2.167289 Z M 3.722805 0.398364 " transform="matrix(0.823682, 0, 0, 0.823682, 0, 0)"/>
+<path fill-rule="nonzero" fill="rgb(79.607843%, 7.843137%, 7.843137%)" fill-opacity="1" d="M 1.621094 10.484375 L 3.074219 9.035156 L 4.527344 10.484375 L 3.074219 11.9375 Z M 1.621094 10.484375 "/>
+<path fill-rule="nonzero" fill="rgb(100%, 100%, 100%)" fill-opacity="1" d="M 3.066406 9.042969 L 4.515625 7.589844 L 5.96875 9.042969 L 4.515625 10.492188 Z M 3.066406 9.042969 "/>
+<path fill-rule="nonzero" fill="rgb(79.607843%, 7.843137%, 7.843137%)" fill-opacity="1" d="M 4.515625 7.589844 L 5.96875 6.140625 L 7.421875 7.589844 L 5.96875 9.042969 Z M 4.515625 7.589844 "/>
+<path fill-rule="nonzero" fill="rgb(100%, 100%, 100%)" fill-opacity="1" d="M 5.96875 6.140625 L 7.421875 4.6875 L 8.875 6.140625 L 7.421875 7.589844 Z M 5.96875 6.140625 "/>
+<path fill-rule="nonzero" fill="rgb(79.607843%, 7.843137%, 7.843137%)" fill-opacity="1" d="M 7.421875 4.6875 L 8.875 3.238281 L 10.324219 4.6875 L 8.875 6.140625 Z M 7.421875 4.6875 "/>
+<path fill-rule="nonzero" fill="rgb(100%, 100%, 100%)" fill-opacity="1" d="M 8.875 3.238281 L 10.324219 1.785156 L 11.773438 3.238281 L 10.324219 4.6875 Z M 8.875 3.238281 "/>
+<path fill-rule="nonzero" fill="rgb(79.607843%, 7.843137%, 7.843137%)" fill-opacity="1" d="M 10.324219 1.785156 L 11.773438 0.335938 L 13.222656 1.785156 L 11.773438 3.238281 Z M 10.324219 1.785156 "/>
+<path fill-rule="nonzero" fill="rgb(79.607843%, 7.843137%, 7.843137%)" fill-opacity="1" d="M 3.066406 0.335938 L 4.515625 1.785156 L 3.066406 3.238281 L 1.613281 1.785156 Z M 3.066406 0.335938 "/>
+<path fill-rule="nonzero" fill="rgb(100%, 100%, 100%)" fill-opacity="1" d="M 4.515625 1.785156 L 5.96875 3.238281 L 4.515625 4.6875 L 3.066406 3.238281 Z M 4.515625 1.785156 "/>
+<path fill-rule="nonzero" fill="rgb(79.607843%, 7.843137%, 7.843137%)" fill-opacity="1" d="M 5.96875 3.238281 L 7.421875 4.6875 L 5.96875 6.140625 L 4.515625 4.6875 Z M 5.96875 3.238281 "/>
+<path fill-rule="nonzero" fill="rgb(79.607843%, 7.843137%, 7.843137%)" fill-opacity="1" d="M 8.875 6.140625 L 10.320312 7.589844 L 8.875 9.042969 L 7.421875 7.589844 Z M 8.875 6.140625 "/>
+<path fill-rule="nonzero" fill="rgb(100%, 100%, 100%)" fill-opacity="1" d="M 10.324219 7.589844 L 11.773438 9.042969 L 10.324219 10.492188 L 8.875 9.042969 Z M 10.324219 7.589844 "/>
+<path fill-rule="nonzero" fill="rgb(79.607843%, 7.843137%, 7.843137%)" fill-opacity="1" d="M 11.773438 9.042969 L 13.222656 10.492188 L 11.773438 11.945312 L 10.320312 10.492188 Z M 11.773438 9.042969 "/>
+<path fill="none" stroke-width="1.12499" stroke-linecap="round" stroke-linejoin="miter" stroke="rgb(0%, 0%, 0%)" stroke-opacity="1" stroke-miterlimit="4" d="M 12.761872 12.23072 L 0.564349 12.23072 L 0.564349 13.217145 L 17.646572 13.217145 L 17.646572 12.23072 Z M 12.761872 12.23072 " transform="matrix(0.823682, 0, 0, 0.823682, 0, 0)"/>
+<path fill-rule="nonzero" fill="rgb(79.607843%, 7.843137%, 7.843137%)" fill-opacity="1" d="M 0.464844 10.074219 L 2.476562 10.074219 L 2.476562 10.886719 L 0.464844 10.886719 Z M 0.464844 10.074219 "/>
+<path fill-rule="nonzero" fill="rgb(100%, 100%, 100%)" fill-opacity="1" d="M 2.464844 10.074219 L 4.480469 10.074219 L 4.480469 10.886719 L 2.464844 10.886719 Z M 2.464844 10.074219 "/>
+<path fill-rule="nonzero" fill="rgb(79.607843%, 7.843137%, 7.843137%)" fill-opacity="1" d="M 4.480469 10.074219 L 6.488281 10.074219 L 6.488281 10.886719 L 4.480469 10.886719 Z M 4.480469 10.074219 "/>
+<path fill-rule="nonzero" fill="rgb(100%, 100%, 100%)" fill-opacity="1" d="M 6.488281 10.074219 L 8.503906 10.074219 L 8.503906 10.886719 L 6.488281 10.886719 Z M 6.488281 10.074219 "/>
+<path fill-rule="nonzero" fill="rgb(79.607843%, 7.843137%, 7.843137%)" fill-opacity="1" d="M 8.503906 10.074219 L 10.511719 10.074219 L 10.511719 10.886719 L 8.503906 10.886719 Z M 8.503906 10.074219 "/>
+<path fill-rule="nonzero" fill="rgb(100%, 100%, 100%)" fill-opacity="1" d="M 10.515625 10.074219 L 12.527344 10.074219 L 12.527344 10.886719 L 10.511719 10.886719 Z M 10.515625 10.074219 "/>
+<path fill-rule="nonzero" fill="rgb(79.607843%, 7.843137%, 7.843137%)" fill-opacity="1" d="M 12.527344 10.074219 L 14.535156 10.074219 L 14.535156 10.886719 L 12.527344 10.886719 Z M 12.527344 10.074219 "/>
 </svg>
diff --git a/symbols/general/level-crossing-light.svg b/symbols/general/level-crossing-light.svg
index ac4f4608..7d3405b7 100644
--- a/symbols/general/level-crossing-light.svg
+++ b/symbols/general/level-crossing-light.svg
@@ -1,178 +1,23 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   width="18.331696"
-   height="18.36084"
-   viewBox="0 0 18.331696 18.36084"
-   version="1.1"
-   id="svg3115"
-   sodipodi:docname="level-crossing-light.svg"
-   inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <defs
-     id="defs3119" />
-  <sodipodi:namedview
-     id="namedview3117"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:showpageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"
-     showgrid="false"
-     inkscape:zoom="47.722222"
-     inkscape:cx="9"
-     inkscape:cy="9.0209546"
-     inkscape:window-width="1920"
-     inkscape:window-height="1008"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg3115" />
-  <path
-     fill="none"
-     stroke-width="0.52916"
-     stroke-linecap="round"
-     stroke-linejoin="miter"
-     stroke="rgb(0%, 0%, 0%)"
-     stroke-opacity="1"
-     stroke-miterlimit="4"
-     d="m 3.8806946,2.126029 -1.7617181,1.7695302 5.2851542,5.2851542 -5.2773422,5.2773416 1.7617181,1.761718 5.2773422,-5.277342 1.7656232,1.761718 3.51953,3.531249 L 16.21272,14.465867 12.689284,10.942431 10.931472,9.1807134 16.21272,3.8955592 14.451002,2.126029 12.689284,3.8955592 10.931472,5.6572773 9.1658488,7.4189953 5.6424127,3.8955592 Z m 0,0"
-     id="path2-6"
-     style="font-variation-settings:normal;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000" />
-  <path
-     fill="none"
-     stroke-width="0.562503"
-     stroke-linecap="round"
-     stroke-linejoin="miter"
-     stroke="#000000"
-     stroke-opacity="1"
-     stroke-miterlimit="4"
-     d="m 17.382805,8.8906209 c 0,1.3984371 -1.132813,2.5351551 -2.53125,2.5351551 -1.398436,0 -2.535155,-1.136718 -2.535155,-2.5351551 0,-1.3984369 1.136719,-2.535155 2.535155,-2.535155 1.398437,0 2.53125,1.1367181 2.53125,2.535155 z m 0,0"
-     id="path3075" />
-  <path
-     fill-rule="nonzero"
-     fill="#000000"
-     fill-opacity="1"
-     d="m 17.382812,8.890625 c 0,1.398437 -1.132812,2.535156 -2.53125,2.535156 -1.398437,0 -2.535156,-1.136719 -2.535156,-2.535156 0,-1.398437 1.136719,-2.535156 2.535156,-2.535156 1.398438,0 2.53125,1.136719 2.53125,2.535156 z m 0,0"
-     id="path3077" />
-  <path
-     fill-rule="nonzero"
-     fill="#dc2929"
-     fill-opacity="1"
-     d="m 16.691406,8.890625 c 0,1.015625 -0.828125,1.835937 -1.839844,1.835937 -1.011718,0 -1.835937,-0.820312 -1.835937,-1.835937 0,-1.015625 0.824219,-1.835937 1.835937,-1.835937 1.011719,0 1.839844,0.820312 1.839844,1.835937 z m 0,0"
-     id="path3079" />
-  <path
-     fill="none"
-     stroke-width="0.562503"
-     stroke-linecap="round"
-     stroke-linejoin="miter"
-     stroke="#000000"
-     stroke-opacity="1"
-     stroke-miterlimit="4"
-     d="m 5.6562475,8.8906209 c 0,1.3984371 -1.1328126,2.5351551 -2.5312484,2.5351551 -1.4023435,0 -2.5351561,-1.136718 -2.5351561,-2.5351551 0,-1.3984369 1.1328126,-2.535155 2.5351561,-2.535155 1.3984358,0 2.5312484,1.1367181 2.5312484,2.535155 z m 0,0"
-     id="path3081" />
-  <path
-     fill-rule="nonzero"
-     fill="#000000"
-     fill-opacity="1"
-     d="m 5.65625,8.890625 c 0,1.398437 -1.132812,2.535156 -2.53125,2.535156 -1.402344,0 -2.53515604,-1.136719 -2.53515604,-2.535156 0,-1.398437 1.13281204,-2.535156 2.53515604,-2.535156 1.398438,0 2.53125,1.136719 2.53125,2.535156 z m 0,0"
-     id="path3083" />
-  <path
-     fill-rule="nonzero"
-     fill="#dc2929"
-     fill-opacity="1"
-     d="m 4.960938,8.890625 c 0,1.015625 -0.824219,1.835937 -1.835938,1.835937 -1.015625,0 -1.835938,-0.820312 -1.835938,-1.835937 0,-1.015625 0.820313,-1.835937 1.835938,-1.835937 1.011719,0 1.835938,0.820312 1.835938,1.835937 z m 0,0"
-     id="path3085" />
-  <path
-     fill="none"
-     stroke-width="0.562503"
-     stroke-linecap="round"
-     stroke-linejoin="miter"
-     stroke="#000000"
-     stroke-opacity="1"
-     stroke-miterlimit="4"
-     d="m 3.6249984,1.9453119 -1.761718,1.7695302 5.2851542,5.2851543 -5.2773422,5.2773416 1.7617181,1.761718 5.2773422,-5.277343 1.7656233,1.761718 3.51953,3.53125 L 15.957024,14.28515 12.433588,10.761713 10.675776,8.9999964 15.957024,3.7148421 14.195306,1.9453119 12.433588,3.7148421 10.675776,5.4765602 8.9101527,7.2382783 5.3867165,3.7148421 Z m 0,0"
-     id="path3087" />
-  <path
-     fill-rule="nonzero"
-     fill="#cb1414"
-     fill-opacity="1"
-     d="m 1.871094,14.277344 1.761718,-1.761719 1.765626,1.761719 -1.765626,1.761718 z m 0,0"
-     id="path3089" />
-  <path
-     fill-rule="nonzero"
-     fill="#ffffff"
-     fill-opacity="1"
-     d="m 3.625,12.523438 1.761719,-1.761719 1.761719,1.761719 -1.761719,1.761718 z m 0,0"
-     id="path3091" />
-  <path
-     fill-rule="nonzero"
-     fill="#cb1414"
-     fill-opacity="1"
-     d="M 5.386719,10.761719 7.148438,9 8.914062,10.761719 7.148438,12.523438 Z m 0,0"
-     id="path3093" />
-  <path
-     fill-rule="nonzero"
-     fill="#ffffff"
-     fill-opacity="1"
-     d="M 7.148438,9 8.914062,7.238281 10.675781,9 8.914062,10.761719 Z m 0,0"
-     id="path3095" />
-  <path
-     fill-rule="nonzero"
-     fill="#cb1414"
-     fill-opacity="1"
-     d="M 8.914062,7.238281 10.675781,5.476562 12.4375,7.238281 10.675781,9 Z m 0,0"
-     id="path3097" />
-  <path
-     fill-rule="nonzero"
-     fill="#ffffff"
-     fill-opacity="1"
-     d="M 10.675781,5.476562 12.4375,3.714844 14.195312,5.476562 12.4375,7.238281 Z m 0,0"
-     id="path3099" />
-  <path
-     fill-rule="nonzero"
-     fill="#cb1414"
-     fill-opacity="1"
-     d="m 12.4375,3.714844 1.757812,-1.761719 1.761719,1.761719 -1.761719,1.761718 z m 0,0"
-     id="path3101" />
-  <path
-     fill-rule="nonzero"
-     fill="#cb1414"
-     fill-opacity="1"
-     d="M 3.625,1.953125 5.386719,3.714844 3.625,5.476562 1.863281,3.714844 Z m 0,0"
-     id="path3103" />
-  <path
-     fill-rule="nonzero"
-     fill="#ffffff"
-     fill-opacity="1"
-     d="M 5.386719,3.714844 7.148438,5.476562 5.386719,7.238281 3.625,5.476562 Z m 0,0"
-     id="path3105" />
-  <path
-     fill-rule="nonzero"
-     fill="#cb1414"
-     fill-opacity="1"
-     d="M 7.148438,5.476562 8.914062,7.238281 7.148438,9 5.386719,7.238281 Z m 0,0"
-     id="path3107" />
-  <path
-     fill-rule="nonzero"
-     fill="#cb1414"
-     fill-opacity="1"
-     d="m 10.675781,9 1.757813,1.761719 -1.757813,1.761719 -1.761719,-1.761719 z m 0,0"
-     id="path3109" />
-  <path
-     fill-rule="nonzero"
-     fill="#ffffff"
-     fill-opacity="1"
-     d="m 12.4375,10.761719 1.757812,1.761719 -1.757812,1.761718 -1.761719,-1.761718 z m 0,0"
-     id="path3111" />
-  <path
-     fill-rule="nonzero"
-     fill="#cb1414"
-     fill-opacity="1"
-     d="m 14.195312,12.523438 1.761719,1.761718 -1.761719,1.761719 -1.761718,-1.761719 z m 0,0"
-     id="path3113" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="15" height="12.883426" viewBox="0 0 15 12.883426">
+<path fill="none" stroke-width="0.562503" stroke-linecap="round" stroke-linejoin="miter" stroke="rgb(0%, 0%, 0%)" stroke-opacity="1" stroke-miterlimit="4" d="M 17.075246 7.344435 C 17.075246 8.741008 15.940814 9.87996 14.544241 9.87996 C 13.143149 9.87996 12.008716 8.741008 12.008716 7.344435 C 12.008716 5.943343 13.143149 4.80891 14.544241 4.80891 C 15.940814 4.80891 17.075246 5.943343 17.075246 7.344435 Z M 17.075246 7.344435 " transform="matrix(0.864281, 0, 0, 0.864281, 0, 0)"/>
+<path fill-rule="nonzero" fill="rgb(0%, 0%, 0%)" fill-opacity="1" d="M 14.757812 6.347656 C 14.757812 7.554688 13.777344 8.539062 12.570312 8.539062 C 11.359375 8.539062 10.378906 7.554688 10.378906 6.347656 C 10.378906 5.136719 11.359375 4.15625 12.570312 4.15625 C 13.777344 4.15625 14.757812 5.136719 14.757812 6.347656 Z M 14.757812 6.347656 "/>
+<path fill-rule="nonzero" fill="rgb(86.27451%, 16.078431%, 16.078431%)" fill-opacity="1" d="M 14.160156 6.347656 C 14.160156 7.226562 13.445312 7.933594 12.570312 7.933594 C 11.695312 7.933594 10.984375 7.226562 10.984375 6.347656 C 10.984375 5.46875 11.695312 4.761719 12.570312 4.761719 C 13.445312 4.761719 14.160156 5.46875 14.160156 6.347656 Z M 14.160156 6.347656 "/>
+<path fill="none" stroke-width="0.562503" stroke-linecap="round" stroke-linejoin="miter" stroke="rgb(0%, 0%, 0%)" stroke-opacity="1" stroke-miterlimit="4" d="M 5.346749 7.344435 C 5.346749 8.741008 4.216836 9.87996 2.815743 9.87996 C 1.414651 9.87996 0.280218 8.741008 0.280218 7.344435 C 0.280218 5.943343 1.414651 4.80891 2.815743 4.80891 C 4.216836 4.80891 5.346749 5.943343 5.346749 7.344435 Z M 5.346749 7.344435 " transform="matrix(0.864281, 0, 0, 0.864281, 0, 0)"/>
+<path fill-rule="nonzero" fill="rgb(0%, 0%, 0%)" fill-opacity="1" d="M 4.621094 6.347656 C 4.621094 7.554688 3.644531 8.539062 2.433594 8.539062 C 1.222656 8.539062 0.242188 7.554688 0.242188 6.347656 C 0.242188 5.136719 1.222656 4.15625 2.433594 4.15625 C 3.644531 4.15625 4.621094 5.136719 4.621094 6.347656 Z M 4.621094 6.347656 "/>
+<path fill-rule="nonzero" fill="rgb(86.27451%, 16.078431%, 16.078431%)" fill-opacity="1" d="M 4.019531 6.347656 C 4.019531 7.226562 3.308594 7.933594 2.433594 7.933594 C 1.554688 7.933594 0.847656 7.226562 0.847656 6.347656 C 0.847656 5.46875 1.554688 4.761719 2.433594 4.761719 C 3.308594 4.761719 4.019531 5.46875 4.019531 6.347656 Z M 4.019531 6.347656 "/>
+<path fill="none" stroke-width="0.562503" stroke-linecap="round" stroke-linejoin="miter" stroke="rgb(0%, 0%, 0%)" stroke-opacity="1" stroke-miterlimit="4" d="M 3.317425 0.397729 L 1.55476 2.169433 L 6.838234 7.452907 L 1.5638 12.731861 L 3.326464 14.494525 L 8.600898 9.215571 L 10.368082 10.978236 L 13.888892 14.508084 L 15.647036 12.73638 L 12.126227 9.215571 L 10.368082 7.452907 L 15.647036 2.169433 L 13.888892 0.397729 L 12.126227 2.169433 L 10.368082 3.932098 L 8.600898 5.690242 L 5.080089 2.169433 Z M 3.317425 0.397729 " transform="matrix(0.864281, 0, 0, 0.864281, 0, 0)"/>
+<path fill-rule="nonzero" fill="rgb(79.607843%, 7.843137%, 7.843137%)" fill-opacity="1" d="M 1.351562 11.003906 L 2.875 9.480469 L 4.398438 11.003906 L 2.875 12.527344 Z M 1.351562 11.003906 "/>
+<path fill-rule="nonzero" fill="rgb(100%, 100%, 100%)" fill-opacity="1" d="M 2.867188 9.488281 L 4.390625 7.964844 L 5.910156 9.488281 L 4.390625 11.007812 Z M 2.867188 9.488281 "/>
+<path fill-rule="nonzero" fill="rgb(79.607843%, 7.843137%, 7.843137%)" fill-opacity="1" d="M 4.390625 7.964844 L 5.910156 6.441406 L 7.4375 7.964844 L 5.910156 9.488281 Z M 4.390625 7.964844 "/>
+<path fill-rule="nonzero" fill="rgb(100%, 100%, 100%)" fill-opacity="1" d="M 5.910156 6.441406 L 7.4375 4.917969 L 8.960938 6.441406 L 7.4375 7.964844 Z M 5.910156 6.441406 "/>
+<path fill-rule="nonzero" fill="rgb(79.607843%, 7.843137%, 7.843137%)" fill-opacity="1" d="M 7.4375 4.917969 L 8.960938 3.398438 L 10.484375 4.917969 L 8.960938 6.441406 Z M 7.4375 4.917969 "/>
+<path fill-rule="nonzero" fill="rgb(100%, 100%, 100%)" fill-opacity="1" d="M 8.960938 3.398438 L 10.484375 1.875 L 12.003906 3.398438 L 10.484375 4.917969 Z M 8.960938 3.398438 "/>
+<path fill-rule="nonzero" fill="rgb(79.607843%, 7.843137%, 7.843137%)" fill-opacity="1" d="M 10.484375 1.875 L 12.003906 0.351562 L 13.523438 1.875 L 12.003906 3.398438 Z M 10.484375 1.875 "/>
+<path fill-rule="nonzero" fill="rgb(79.607843%, 7.843137%, 7.843137%)" fill-opacity="1" d="M 2.867188 0.351562 L 4.390625 1.875 L 2.867188 3.398438 L 1.34375 1.875 Z M 2.867188 0.351562 "/>
+<path fill-rule="nonzero" fill="rgb(100%, 100%, 100%)" fill-opacity="1" d="M 4.390625 1.875 L 5.910156 3.398438 L 4.390625 4.917969 L 2.867188 3.398438 Z M 4.390625 1.875 "/>
+<path fill-rule="nonzero" fill="rgb(79.607843%, 7.843137%, 7.843137%)" fill-opacity="1" d="M 5.910156 3.398438 L 7.4375 4.917969 L 5.910156 6.441406 L 4.390625 4.917969 Z M 5.910156 3.398438 "/>
+<path fill-rule="nonzero" fill="rgb(79.607843%, 7.843137%, 7.843137%)" fill-opacity="1" d="M 8.960938 6.441406 L 10.480469 7.964844 L 8.960938 9.488281 L 7.4375 7.964844 Z M 8.960938 6.441406 "/>
+<path fill-rule="nonzero" fill="rgb(100%, 100%, 100%)" fill-opacity="1" d="M 10.484375 7.964844 L 12.003906 9.488281 L 10.484375 11.007812 L 8.960938 9.488281 Z M 10.484375 7.964844 "/>
+<path fill-rule="nonzero" fill="rgb(79.607843%, 7.843137%, 7.843137%)" fill-opacity="1" d="M 12.003906 9.488281 L 13.523438 11.007812 L 12.003906 12.53125 L 10.480469 11.007812 Z M 12.003906 9.488281 "/>
 </svg>
diff --git a/symbols/general/level-crossing.svg b/symbols/general/level-crossing.svg
index 7728edde..39ba4d0a 100644
--- a/symbols/general/level-crossing.svg
+++ b/symbols/general/level-crossing.svg
@@ -1,135 +1,17 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   width="18.331696"
-   height="18.36084"
-   viewBox="0 0 18.331696 18.36084"
-   version="1.1"
-   id="svg30"
-   sodipodi:docname="level-crossing.svg"
-   inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <defs
-     id="defs34" />
-  <sodipodi:namedview
-     id="namedview32"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:showpageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"
-     showgrid="false"
-     inkscape:zoom="46.277778"
-     inkscape:cx="9.7130852"
-     inkscape:cy="9.6482593"
-     inkscape:window-width="1920"
-     inkscape:window-height="1008"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg30" />
-  <path
-     fill="none"
-     stroke-width="0.52916"
-     stroke-linecap="round"
-     stroke-linejoin="miter"
-     stroke="rgb(0%, 0%, 0%)"
-     stroke-opacity="1"
-     stroke-miterlimit="4"
-     d="m 3.8806946,2.126029 -1.7617181,1.7695302 5.2851542,5.2851542 -5.2773422,5.2773416 1.7617181,1.761718 5.2773422,-5.277342 1.7656232,1.761718 3.51953,3.531249 L 16.21272,14.465867 12.689284,10.942431 10.931472,9.1807134 16.21272,3.8955592 14.451002,2.126029 12.689284,3.8955592 10.931472,5.6572773 9.1658488,7.4189953 5.6424127,3.8955592 Z m 0,0"
-     id="path2-6"
-     style="font-variation-settings:normal;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000" />
-  <path
-     fill="none"
-     stroke-width="0.52916"
-     stroke-linecap="round"
-     stroke-linejoin="miter"
-     stroke="rgb(0%, 0%, 0%)"
-     stroke-opacity="1"
-     stroke-miterlimit="4"
-     d="m 3.8806946,2.126029 -1.7617181,1.7695302 5.2851542,5.2851542 -5.2773422,5.2773416 1.7617181,1.761718 5.2773422,-5.277342 1.7656232,1.761718 3.51953,3.531249 L 16.21272,14.465867 12.689284,10.942431 10.931472,9.1807134 16.21272,3.8955592 14.451002,2.126029 12.689284,3.8955592 10.931472,5.6572773 9.1658488,7.4189953 5.6424127,3.8955592 Z m 0,0"
-     id="path2"
-     style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.562503;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none;stop-color:#000000;stop-opacity:1" />
-  <path
-     fill-rule="nonzero"
-     fill="#cb1414"
-     fill-opacity="1"
-     d="m 2.1267843,14.458059 1.761718,-1.761719 1.765626,1.761719 -1.765626,1.761718 z m 0,0"
-     id="path4" />
-  <path
-     fill-rule="nonzero"
-     fill="#ffffff"
-     fill-opacity="1"
-     d="m 3.8806903,12.704153 1.761719,-1.761719 1.761719,1.761719 -1.761719,1.761718 z m 0,0"
-     id="path6" />
-  <path
-     fill-rule="nonzero"
-     fill="#cb1414"
-     fill-opacity="1"
-     d="m 5.6424093,10.942434 1.761719,-1.7617192 1.765624,1.7617192 -1.765624,1.761719 z m 0,0"
-     id="path8" />
-  <path
-     fill-rule="nonzero"
-     fill="#ffffff"
-     fill-opacity="1"
-     d="m 7.4041283,9.1807148 1.765624,-1.761719 1.7617187,1.761719 -1.7617187,1.7617192 z m 0,0"
-     id="path10" />
-  <path
-     fill-rule="nonzero"
-     fill="#cb1414"
-     fill-opacity="1"
-     d="m 9.1697523,7.4189958 1.7617187,-1.761719 1.761719,1.761719 -1.761719,1.761719 z m 0,0"
-     id="path12" />
-  <path
-     fill-rule="nonzero"
-     fill="#ffffff"
-     fill-opacity="1"
-     d="m 10.931471,5.6572768 1.761719,-1.761718 1.757812,1.761718 -1.757812,1.761719 z m 0,0"
-     id="path14" />
-  <path
-     fill-rule="nonzero"
-     fill="#cb1414"
-     fill-opacity="1"
-     d="m 12.69319,3.8955588 1.757812,-1.761719 1.761719,1.761719 -1.761719,1.761718 z m 0,0"
-     id="path16" />
-  <path
-     fill-rule="nonzero"
-     fill="#cb1414"
-     fill-opacity="1"
-     d="m 3.8806903,2.1338398 1.761719,1.761719 -1.761719,1.761718 -1.761719,-1.761718 z m 0,0"
-     id="path18" />
-  <path
-     fill-rule="nonzero"
-     fill="#ffffff"
-     fill-opacity="1"
-     d="m 5.6424093,3.8955588 1.761719,1.761718 -1.761719,1.761719 -1.761719,-1.761719 z m 0,0"
-     id="path20" />
-  <path
-     fill-rule="nonzero"
-     fill="#cb1414"
-     fill-opacity="1"
-     d="m 7.4041283,5.6572768 1.765624,1.761719 -1.765624,1.761719 -1.761719,-1.761719 z m 0,0"
-     id="path22" />
-  <path
-     fill-rule="nonzero"
-     fill="#cb1414"
-     fill-opacity="1"
-     d="m 10.931471,9.1807148 1.757813,1.7617192 -1.757813,1.761719 -1.7617187,-1.761719 z m 0,0"
-     id="path24" />
-  <path
-     fill-rule="nonzero"
-     fill="#ffffff"
-     fill-opacity="1"
-     d="m 12.69319,10.942434 1.757812,1.761719 -1.757812,1.761718 -1.761719,-1.761718 z m 0,0"
-     id="path26" />
-  <path
-     fill-rule="nonzero"
-     fill="#cb1414"
-     fill-opacity="1"
-     d="m 14.451002,12.704153 1.761719,1.761718 -1.761719,1.761719 -1.761718,-1.761719 z m 0,0"
-     id="path28" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="15" height="15.018296" viewBox="0 0 15 15.018296">
+<path fill="none" stroke-width="0.562503" stroke-linecap="round" stroke-linejoin="miter" stroke="rgb(0%, 0%, 0%)" stroke-opacity="1" stroke-miterlimit="4" d="M 2.159588 0.399349 L 0.395472 2.167343 L 5.683943 7.451936 L 0.403227 12.728776 L 2.167343 14.492892 L 7.444182 9.216052 L 9.208298 10.976291 L 12.728776 14.5084 L 14.492892 12.740407 L 10.968537 9.216052 L 9.208298 7.451936 L 14.492892 2.167343 L 12.728776 0.399349 L 10.968537 2.167343 L 9.208298 3.931459 L 7.444182 5.691697 L 3.919827 2.167343 Z M 2.159588 0.399349 " transform="matrix(1.007498, 0, 0, 1.007498, 0, 0)"/>
+<path fill-rule="nonzero" fill="rgb(79.607843%, 7.843137%, 7.843137%)" fill-opacity="1" d="M 0.40625 12.824219 L 2.183594 11.050781 L 3.960938 12.824219 L 2.183594 14.601562 Z M 0.40625 12.824219 "/>
+<path fill-rule="nonzero" fill="rgb(100%, 100%, 100%)" fill-opacity="1" d="M 2.175781 11.058594 L 3.949219 9.285156 L 5.726562 11.058594 L 3.949219 12.835938 Z M 2.175781 11.058594 "/>
+<path fill-rule="nonzero" fill="rgb(79.607843%, 7.843137%, 7.843137%)" fill-opacity="1" d="M 3.949219 9.285156 L 5.726562 7.507812 L 7.503906 9.285156 L 5.726562 11.058594 Z M 3.949219 9.285156 "/>
+<path fill-rule="nonzero" fill="rgb(100%, 100%, 100%)" fill-opacity="1" d="M 5.726562 7.507812 L 7.503906 5.734375 L 9.277344 7.507812 L 7.503906 9.285156 Z M 5.726562 7.507812 "/>
+<path fill-rule="nonzero" fill="rgb(79.607843%, 7.843137%, 7.843137%)" fill-opacity="1" d="M 7.503906 5.734375 L 9.277344 3.960938 L 11.054688 5.734375 L 9.277344 7.507812 Z M 7.503906 5.734375 "/>
+<path fill-rule="nonzero" fill="rgb(100%, 100%, 100%)" fill-opacity="1" d="M 9.277344 3.960938 L 11.054688 2.183594 L 12.824219 3.960938 L 11.054688 5.734375 Z M 9.277344 3.960938 "/>
+<path fill-rule="nonzero" fill="rgb(79.607843%, 7.843137%, 7.843137%)" fill-opacity="1" d="M 11.054688 2.183594 L 12.824219 0.410156 L 14.601562 2.183594 L 12.824219 3.960938 Z M 11.054688 2.183594 "/>
+<path fill-rule="nonzero" fill="rgb(79.607843%, 7.843137%, 7.843137%)" fill-opacity="1" d="M 2.175781 0.410156 L 3.949219 2.183594 L 2.175781 3.960938 L 0.398438 2.183594 Z M 2.175781 0.410156 "/>
+<path fill-rule="nonzero" fill="rgb(100%, 100%, 100%)" fill-opacity="1" d="M 3.949219 2.183594 L 5.726562 3.960938 L 3.949219 5.734375 L 2.175781 3.960938 Z M 3.949219 2.183594 "/>
+<path fill-rule="nonzero" fill="rgb(79.607843%, 7.843137%, 7.843137%)" fill-opacity="1" d="M 5.726562 3.960938 L 7.503906 5.734375 L 5.726562 7.507812 L 3.949219 5.734375 Z M 5.726562 3.960938 "/>
+<path fill-rule="nonzero" fill="rgb(79.607843%, 7.843137%, 7.843137%)" fill-opacity="1" d="M 9.277344 7.507812 L 11.050781 9.285156 L 9.277344 11.058594 L 7.503906 9.285156 Z M 9.277344 7.507812 "/>
+<path fill-rule="nonzero" fill="rgb(100%, 100%, 100%)" fill-opacity="1" d="M 11.054688 9.285156 L 12.824219 11.058594 L 11.054688 12.835938 L 9.277344 11.058594 Z M 11.054688 9.285156 "/>
+<path fill-rule="nonzero" fill="rgb(79.607843%, 7.843137%, 7.843137%)" fill-opacity="1" d="M 12.824219 11.058594 L 14.601562 12.835938 L 12.824219 14.609375 L 11.050781 12.835938 Z M 12.824219 11.058594 "/>
 </svg>
diff --git a/symbols/general/line-direction-both.svg b/symbols/general/line-direction-both.svg
index 4f8cbae6..55eaafdd 100644
--- a/symbols/general/line-direction-both.svg
+++ b/symbols/general/line-direction-both.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="24" height="13.954828" viewBox="0 0 24 13.954828">
-<path fill-rule="evenodd" fill="rgb(0%, 0%, 0%)" fill-opacity="1" stroke-width="1.61633" stroke-linecap="butt" stroke-linejoin="miter" stroke="rgb(100%, 100%, 100%)" stroke-opacity="1" stroke-miterlimit="4" d="M 12.835477 1.396181 L 12.835477 12.553895 L 22.421022 6.890954 Z M 12.835477 1.396181 " transform="matrix(0.998818, 0, 0, 0.998818, 0.000000819112, 0)"/>
-<path fill-rule="evenodd" fill="rgb(0%, 0%, 0%)" fill-opacity="1" stroke-width="1.61633" stroke-linecap="butt" stroke-linejoin="miter" stroke="rgb(100%, 100%, 100%)" stroke-opacity="1" stroke-miterlimit="4" d="M 11.192912 12.577361 L 11.192912 1.415735 L 1.607367 7.078676 Z M 11.192912 12.577361 " transform="matrix(0.998818, 0, 0, 0.998818, 0.000000819112, 0)"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="8.595265" viewBox="0 0 16 8.595265">
+<path fill-rule="evenodd" fill="rgb(0%, 0%, 0%)" fill-opacity="1" d="M 8.632812 0 L 8.632812 8.578125 L 16 4.222656 Z M 8.632812 0 "/>
+<path fill-rule="evenodd" fill="rgb(0%, 0%, 0%)" fill-opacity="1" d="M 7.367188 8.59375 L 7.367188 0.015625 L 0 4.367188 Z M 7.367188 8.59375 "/>
 </svg>
diff --git a/symbols/general/line-direction.svg b/symbols/general/line-direction.svg
index 1064cc7d..c1deab7a 100644
--- a/symbols/general/line-direction.svg
+++ b/symbols/general/line-direction.svg
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="12" height="13.970755" viewBox="0 0 12 13.970755">
-<path fill-rule="evenodd" fill="rgb(0%, 0%, 0%)" fill-opacity="1" stroke-width="1.6163" stroke-linecap="butt" stroke-linejoin="miter" stroke="rgb(100%, 100%, 100%)" stroke-opacity="1" stroke-miterlimit="4" d="M 0.808581 1.394507 L 0.808581 12.554485 L 10.394365 6.890513 Z M 0.808581 1.394507 " transform="matrix(1.000016, 0, 0, 1.000016, 0, 0.00000150885)"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="8" height="9.313773" viewBox="0 0 8 9.313773">
+<path fill-rule="evenodd" fill="rgb(0%, 0%, 0%)" fill-opacity="1" d="M 0 0 L 0 9.3125 L 8 4.585938 Z M 0 0 "/>
 </svg>
diff --git a/symbols/general/loading_gauge.svg b/symbols/general/loading_gauge.svg
index b2f9fe5f..36e3fd85 100644
--- a/symbols/general/loading_gauge.svg
+++ b/symbols/general/loading_gauge.svg
@@ -1,4 +1,4 @@
 <?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="18" viewBox="0 0 18 18">
-<path fill-rule="evenodd" fill="rgb(1.568627%, 1.568627%, 1.568627%)" fill-opacity="1" d="M 2.867188 4.886719 C 2.828125 4.902344 2.417969 5.292969 1.960938 5.753906 L 1.125 6.59375 L 1.125 6.90625 L 1.972656 7.757812 C 2.453125 8.234375 2.859375 8.617188 2.910156 8.628906 C 3.03125 8.660156 3.21875 8.589844 3.304688 8.484375 C 3.351562 8.421875 3.375 8.339844 3.375 8.234375 C 3.375 8.082031 3.367188 8.070312 2.910156 7.609375 L 2.449219 7.136719 L 15.554688 7.136719 L 15.089844 7.605469 C 14.632812 8.066406 14.625 8.078125 14.625 8.234375 C 14.625 8.339844 14.648438 8.421875 14.695312 8.484375 C 14.78125 8.59375 14.996094 8.667969 15.105469 8.625 C 15.203125 8.585938 16.71875 7.117188 16.808594 6.972656 C 16.894531 6.835938 16.894531 6.664062 16.808594 6.527344 C 16.707031 6.363281 15.230469 4.921875 15.121094 4.882812 C 14.996094 4.832031 14.789062 4.898438 14.695312 5.015625 C 14.648438 5.078125 14.625 5.160156 14.625 5.265625 C 14.625 5.417969 14.632812 5.429688 15.089844 5.890625 L 15.550781 6.363281 L 2.449219 6.363281 L 2.910156 5.890625 C 3.363281 5.433594 3.375 5.417969 3.375 5.265625 C 3.375 5.082031 3.300781 4.96875 3.144531 4.902344 C 3.011719 4.84375 2.964844 4.84375 2.867188 4.886719 M 1.347656 9.402344 C 1.117188 9.503906 1.125 9.441406 1.125 11.25 C 1.125 13.066406 1.117188 13 1.355469 13.097656 C 1.53125 13.171875 16.46875 13.171875 16.644531 13.097656 C 16.882812 13 16.875 13.066406 16.875 11.25 C 16.875 9.433594 16.882812 9.5 16.644531 9.402344 C 16.578125 9.375 16.429688 9.351562 16.3125 9.351562 L 16.101562 9.351562 L 16.101562 9.996094 C 16.101562 10.628906 16.101562 10.644531 16.015625 10.734375 C 15.863281 10.902344 15.636719 10.902344 15.484375 10.734375 C 15.398438 10.644531 15.398438 10.628906 15.398438 9.996094 L 15.398438 9.351562 L 14.625 9.351562 L 14.625 9.933594 C 14.625 10.589844 14.59375 10.71875 14.414062 10.8125 C 14.269531 10.886719 14.101562 10.855469 13.988281 10.738281 C 13.90625 10.648438 13.902344 10.628906 13.894531 10 L 13.882812 9.351562 L 13.117188 9.351562 L 13.105469 10 C 13.097656 10.628906 13.09375 10.648438 13.011719 10.738281 C 12.898438 10.855469 12.730469 10.886719 12.585938 10.8125 C 12.40625 10.71875 12.375 10.589844 12.375 9.933594 L 12.375 9.351562 L 11.601562 9.351562 L 11.601562 9.996094 C 11.601562 10.628906 11.601562 10.644531 11.515625 10.734375 C 11.363281 10.902344 11.136719 10.902344 10.984375 10.734375 C 10.898438 10.644531 10.898438 10.628906 10.898438 9.996094 L 10.898438 9.351562 L 10.125 9.351562 L 10.125 9.933594 C 10.125 10.589844 10.09375 10.71875 9.914062 10.8125 C 9.769531 10.886719 9.601562 10.855469 9.488281 10.738281 C 9.40625 10.648438 9.402344 10.628906 9.394531 10 L 9.382812 9.351562 L 8.617188 9.351562 L 8.605469 10 C 8.597656 10.628906 8.59375 10.648438 8.511719 10.738281 C 8.398438 10.855469 8.230469 10.886719 8.085938 10.8125 C 7.90625 10.71875 7.875 10.589844 7.875 9.933594 L 7.875 9.351562 L 7.101562 9.351562 L 7.101562 9.996094 C 7.101562 10.628906 7.101562 10.644531 7.015625 10.734375 C 6.863281 10.902344 6.636719 10.902344 6.484375 10.734375 C 6.398438 10.644531 6.398438 10.628906 6.398438 9.996094 L 6.398438 9.351562 L 5.625 9.351562 L 5.625 9.933594 C 5.625 10.589844 5.59375 10.71875 5.414062 10.8125 C 5.269531 10.886719 5.101562 10.855469 4.988281 10.738281 C 4.90625 10.648438 4.902344 10.628906 4.894531 10 L 4.882812 9.351562 L 4.117188 9.351562 L 4.105469 10 C 4.097656 10.628906 4.09375 10.648438 4.011719 10.738281 C 3.898438 10.855469 3.730469 10.886719 3.585938 10.8125 C 3.40625 10.71875 3.375 10.589844 3.375 9.933594 L 3.375 9.351562 L 2.601562 9.351562 L 2.601562 9.996094 C 2.601562 10.628906 2.601562 10.644531 2.515625 10.734375 C 2.417969 10.839844 2.289062 10.878906 2.160156 10.847656 C 2.109375 10.835938 2.03125 10.785156 1.984375 10.734375 C 1.898438 10.644531 1.898438 10.628906 1.898438 9.996094 L 1.898438 9.351562 L 1.679688 9.351562 C 1.558594 9.355469 1.410156 9.375 1.347656 9.402344 "/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="8.428768" viewBox="0 0 16 8.428768">
+<path fill-rule="evenodd" fill="rgb(1.568627%, 1.568627%, 1.568627%)" fill-opacity="1" d="M 1.769531 0.03125 C 1.730469 0.046875 1.3125 0.445312 0.847656 0.910156 L 0 1.765625 L 0 2.082031 L 0.859375 2.949219 C 1.347656 3.433594 1.761719 3.820312 1.8125 3.832031 C 1.9375 3.863281 2.128906 3.792969 2.214844 3.6875 C 2.261719 3.621094 2.285156 3.539062 2.285156 3.433594 C 2.285156 3.277344 2.277344 3.265625 1.8125 2.796875 L 1.34375 2.316406 L 14.660156 2.316406 L 14.1875 2.792969 C 13.722656 3.261719 13.714844 3.273438 13.714844 3.433594 C 13.714844 3.539062 13.738281 3.621094 13.785156 3.6875 C 13.871094 3.796875 14.089844 3.871094 14.203125 3.828125 C 14.300781 3.789062 15.839844 2.296875 15.933594 2.148438 C 16.019531 2.011719 16.019531 1.835938 15.933594 1.699219 C 15.828125 1.53125 14.328125 0.0664062 14.21875 0.0273438 C 14.089844 -0.0234375 13.882812 0.0429688 13.785156 0.160156 C 13.738281 0.226562 13.714844 0.308594 13.714844 0.414062 C 13.714844 0.570312 13.722656 0.582031 14.1875 1.050781 L 14.65625 1.53125 L 1.34375 1.53125 L 1.8125 1.050781 C 2.273438 0.585938 2.285156 0.570312 2.285156 0.414062 C 2.285156 0.230469 2.210938 0.113281 2.050781 0.046875 C 1.917969 -0.0117188 1.867188 -0.0117188 1.769531 0.03125 M 0.226562 4.617188 C -0.0078125 4.722656 0 4.65625 0 6.496094 C 0 8.339844 -0.0078125 8.273438 0.234375 8.371094 C 0.414062 8.449219 15.585938 8.449219 15.765625 8.371094 C 16.007812 8.273438 16 8.339844 16 6.496094 C 16 4.648438 16.007812 4.71875 15.765625 4.617188 C 15.699219 4.589844 15.546875 4.566406 15.429688 4.566406 L 15.214844 4.566406 L 15.214844 5.222656 C 15.214844 5.863281 15.214844 5.878906 15.128906 5.972656 C 14.972656 6.140625 14.742188 6.140625 14.585938 5.972656 C 14.5 5.878906 14.5 5.863281 14.5 5.222656 L 14.5 4.566406 L 13.714844 4.566406 L 13.714844 5.15625 C 13.714844 5.824219 13.683594 5.957031 13.5 6.050781 C 13.351562 6.125 13.183594 6.09375 13.066406 5.976562 C 12.984375 5.882812 12.980469 5.863281 12.972656 5.226562 L 12.960938 4.566406 L 12.183594 4.566406 L 12.171875 5.226562 C 12.164062 5.863281 12.160156 5.882812 12.074219 5.976562 C 11.960938 6.09375 11.789062 6.125 11.644531 6.050781 C 11.460938 5.957031 11.429688 5.824219 11.429688 5.15625 L 11.429688 4.566406 L 10.644531 4.566406 L 10.644531 5.222656 C 10.644531 5.863281 10.644531 5.878906 10.554688 5.972656 C 10.402344 6.140625 10.171875 6.140625 10.015625 5.972656 C 9.929688 5.878906 9.929688 5.863281 9.929688 5.222656 L 9.929688 4.566406 L 9.144531 4.566406 L 9.144531 5.15625 C 9.144531 5.824219 9.109375 5.957031 8.929688 6.050781 C 8.78125 6.125 8.609375 6.09375 8.496094 5.976562 C 8.414062 5.882812 8.410156 5.863281 8.402344 5.226562 L 8.390625 4.566406 L 7.609375 4.566406 L 7.597656 5.226562 C 7.589844 5.863281 7.585938 5.882812 7.503906 5.976562 C 7.390625 6.09375 7.21875 6.125 7.070312 6.050781 C 6.890625 5.957031 6.855469 5.824219 6.855469 5.15625 L 6.855469 4.566406 L 6.070312 4.566406 L 6.070312 5.222656 C 6.070312 5.863281 6.070312 5.878906 5.984375 5.972656 C 5.828125 6.140625 5.597656 6.140625 5.445312 5.972656 C 5.355469 5.878906 5.355469 5.863281 5.355469 5.222656 L 5.355469 4.566406 L 4.570312 4.566406 L 4.570312 5.15625 C 4.570312 5.824219 4.539062 5.957031 4.355469 6.050781 C 4.210938 6.125 4.039062 6.09375 3.925781 5.976562 C 3.839844 5.882812 3.835938 5.863281 3.828125 5.226562 L 3.816406 4.566406 L 3.039062 4.566406 L 3.027344 5.226562 C 3.019531 5.863281 3.015625 5.882812 2.933594 5.976562 C 2.816406 6.09375 2.648438 6.125 2.5 6.050781 C 2.316406 5.957031 2.285156 5.824219 2.285156 5.15625 L 2.285156 4.566406 L 1.5 4.566406 L 1.5 5.222656 C 1.5 5.863281 1.5 5.878906 1.414062 5.972656 C 1.3125 6.078125 1.183594 6.117188 1.050781 6.085938 C 1 6.074219 0.921875 6.023438 0.871094 5.972656 C 0.785156 5.878906 0.785156 5.863281 0.785156 5.222656 L 0.785156 4.566406 L 0.5625 4.566406 C 0.441406 4.570312 0.289062 4.589844 0.226562 4.617188 "/>
 </svg>
diff --git a/symbols/general/phone.svg b/symbols/general/phone.svg
index 53b8ebba..65c70f01 100644
--- a/symbols/general/phone.svg
+++ b/symbols/general/phone.svg
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="11.846375" height="16" viewBox="0 0 11.846375 16">
-<path fill-rule="nonzero" fill="rgb(100%, 100%, 100%)" fill-opacity="1" d="M 0 0 L 11.816406 0 L 11.816406 16 L 0 16 Z M 0 0 "/>
-<path fill-rule="nonzero" fill="rgb(0%, 0%, 0%)" fill-opacity="1" d="M 7.746094 15.988281 C 6.527344 15.875 5.234375 15.082031 3.910156 13.636719 C 3.410156 13.09375 2.894531 12.445312 2.34375 11.660156 C 2.105469 11.320312 1.644531 10.632812 1.558594 10.480469 C 0.839844 9.261719 0.324219 7.386719 0.109375 5.210938 C 0.0273438 4.390625 -0.0195312 3.261719 0.0078125 2.894531 C 0.0429688 2.453125 0.125 2.121094 0.289062 1.777344 C 0.632812 1.066406 1.261719 0.554688 2.164062 0.25 C 2.519531 0.132812 2.96875 0.046875 3.355469 0.0195312 L 3.445312 0.015625 L 3.445312 0.0976562 C 3.445312 0.144531 3.464844 0.847656 3.492188 1.664062 C 3.515625 2.476562 3.539062 3.34375 3.546875 3.585938 C 3.554688 3.832031 3.5625 4.109375 3.566406 4.199219 C 3.570312 4.292969 3.574219 4.429688 3.574219 4.507812 L 3.574219 4.644531 L 3.460938 4.707031 C 3.03125 4.941406 2.792969 5.273438 2.734375 5.730469 C 2.707031 5.9375 2.734375 6.226562 2.804688 6.46875 C 2.84375 6.613281 3.34375 7.605469 4.050781 8.949219 C 4.828125 10.429688 5.289062 11.25 5.609375 11.714844 C 5.804688 12.003906 6.015625 12.164062 6.292969 12.242188 C 6.414062 12.273438 6.699219 12.28125 6.839844 12.253906 C 6.980469 12.226562 7.214844 12.144531 7.328125 12.085938 L 7.433594 12.03125 L 7.96875 12.449219 C 8.261719 12.683594 8.773438 13.082031 9.105469 13.34375 C 9.433594 13.601562 10.019531 14.0625 10.402344 14.363281 C 10.785156 14.660156 11.097656 14.910156 11.097656 14.914062 C 11.097656 14.929688 10.761719 15.125 10.5625 15.226562 C 9.996094 15.511719 9.285156 15.769531 8.617188 15.9375 C 8.378906 15.996094 8.054688 16.015625 7.746094 15.988281 Z M 9.820312 13.34375 C 8.898438 12.609375 8.054688 11.9375 7.945312 11.851562 C 7.832031 11.761719 7.753906 11.691406 7.757812 11.683594 C 7.765625 11.679688 7.988281 11.558594 8.253906 11.414062 L 8.742188 11.15625 L 8.828125 11.15625 C 9.003906 11.164062 9.21875 11.253906 9.46875 11.433594 C 9.710938 11.605469 10.332031 12.082031 10.941406 12.558594 C 11.121094 12.699219 11.339844 12.875 11.433594 12.945312 C 11.632812 13.105469 11.714844 13.191406 11.773438 13.304688 C 11.832031 13.414062 11.851562 13.507812 11.84375 13.59375 C 11.835938 13.6875 11.527344 14.675781 11.507812 14.675781 C 11.503906 14.675781 10.742188 14.074219 9.820312 13.339844 Z M 4.015625 4.535156 C 3.988281 4.511719 3.980469 4.488281 3.972656 4.417969 C 3.933594 4.105469 3.898438 3.015625 3.871094 1.320312 C 3.867188 0.859375 3.859375 0.375 3.855469 0.246094 L 3.851562 0.0117188 L 3.90625 0.00390625 C 4.179688 -0.0351562 4.726562 0.199219 4.976562 0.460938 C 5.121094 0.613281 5.113281 0.582031 5.125 1.117188 C 5.136719 1.808594 5.160156 3.398438 5.160156 3.65625 L 5.160156 3.878906 L 5.039062 4.019531 C 4.882812 4.207031 4.773438 4.304688 4.640625 4.382812 C 4.355469 4.542969 4.097656 4.605469 4.015625 4.535156 Z M 4.015625 4.535156 "/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="12" height="16.207489" viewBox="0 0 12 16.207489">
+<path fill-rule="nonzero" fill="rgb(0%, 0%, 0%)" fill-opacity="1" d="M 7.847656 16.195312 C 6.613281 16.082031 5.300781 15.277344 3.960938 13.8125 C 3.453125 13.261719 2.933594 12.605469 2.375 11.8125 C 2.132812 11.46875 1.664062 10.769531 1.578125 10.617188 C 0.851562 9.382812 0.328125 7.484375 0.109375 5.277344 C 0.0273438 4.449219 -0.0195312 3.304688 0.0078125 2.933594 C 0.0429688 2.484375 0.125 2.148438 0.292969 1.800781 C 0.640625 1.082031 1.277344 0.5625 2.191406 0.253906 C 2.550781 0.132812 3.007812 0.046875 3.398438 0.0195312 L 3.488281 0.015625 L 3.488281 0.0976562 C 3.488281 0.144531 3.511719 0.859375 3.539062 1.6875 C 3.5625 2.507812 3.585938 3.386719 3.59375 3.632812 C 3.601562 3.882812 3.609375 4.164062 3.613281 4.253906 C 3.617188 4.347656 3.621094 4.488281 3.621094 4.566406 L 3.621094 4.703125 L 3.503906 4.769531 C 3.070312 5.003906 2.828125 5.34375 2.769531 5.804688 C 2.742188 6.015625 2.769531 6.308594 2.839844 6.550781 C 2.878906 6.699219 3.386719 7.703125 4.101562 9.066406 C 4.890625 10.566406 5.359375 11.394531 5.683594 11.867188 C 5.878906 12.160156 6.09375 12.320312 6.375 12.402344 C 6.496094 12.433594 6.785156 12.441406 6.929688 12.414062 C 7.070312 12.386719 7.308594 12.300781 7.421875 12.242188 L 7.53125 12.1875 L 8.070312 12.609375 C 8.367188 12.847656 8.886719 13.25 9.222656 13.515625 C 9.554688 13.777344 10.148438 14.246094 10.539062 14.550781 C 10.925781 14.851562 11.242188 15.101562 11.242188 15.109375 C 11.242188 15.125 10.902344 15.320312 10.699219 15.425781 C 10.125 15.710938 9.40625 15.972656 8.730469 16.144531 C 8.488281 16.203125 8.160156 16.222656 7.847656 16.195312 Z M 9.949219 13.515625 C 9.015625 12.773438 8.160156 12.09375 8.046875 12.003906 C 7.933594 11.914062 7.855469 11.84375 7.859375 11.835938 C 7.867188 11.832031 8.09375 11.707031 8.359375 11.5625 L 8.855469 11.300781 L 8.941406 11.300781 C 9.121094 11.308594 9.339844 11.398438 9.589844 11.582031 C 9.835938 11.757812 10.464844 12.238281 11.082031 12.722656 C 11.265625 12.863281 11.488281 13.042969 11.582031 13.113281 C 11.785156 13.277344 11.867188 13.363281 11.925781 13.476562 C 11.984375 13.589844 12.003906 13.683594 11.996094 13.769531 C 11.988281 13.863281 11.675781 14.867188 11.65625 14.867188 C 11.652344 14.867188 10.882812 14.257812 9.949219 13.511719 Z M 4.066406 4.59375 C 4.039062 4.570312 4.03125 4.546875 4.023438 4.476562 C 3.984375 4.160156 3.949219 3.054688 3.921875 1.335938 C 3.917969 0.871094 3.910156 0.378906 3.90625 0.25 L 3.902344 0.0117188 L 3.957031 0.00390625 C 4.234375 -0.0351562 4.789062 0.203125 5.042969 0.46875 C 5.1875 0.621094 5.179688 0.589844 5.191406 1.132812 C 5.203125 1.832031 5.226562 3.441406 5.226562 3.703125 L 5.226562 3.929688 L 5.105469 4.070312 C 4.945312 4.261719 4.835938 4.359375 4.699219 4.441406 C 4.410156 4.601562 4.152344 4.664062 4.066406 4.59375 Z M 4.066406 4.59375 "/>
 </svg>
diff --git a/symbols/general/preheating.svg b/symbols/general/preheating.svg
index c6164871..7a336638 100644
--- a/symbols/general/preheating.svg
+++ b/symbols/general/preheating.svg
@@ -1,4 +1,4 @@
 <?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="18" viewBox="0 0 18 18">
-<path fill-rule="evenodd" fill="rgb(1.568627%, 1.568627%, 1.568627%)" fill-opacity="1" d="M 7.964844 2.082031 C 7.875 3.527344 7.546875 4.761719 6.925781 5.992188 C 6.703125 6.4375 6.125 7.367188 6.089844 7.332031 C 6.082031 7.324219 6.019531 7.152344 5.953125 6.953125 C 5.847656 6.632812 5.472656 5.871094 5.332031 5.679688 C 5.269531 5.59375 5.289062 5.53125 5.132812 6.292969 C 4.949219 7.1875 4.78125 7.660156 4.339844 8.542969 C 4.019531 9.191406 3.875 9.582031 3.757812 10.125 C 3.652344 10.617188 3.640625 11.660156 3.738281 12.144531 C 3.960938 13.246094 4.453125 14.160156 5.246094 14.9375 C 5.5625 15.246094 5.957031 15.546875 6.320312 15.753906 C 6.574219 15.898438 7.667969 16.386719 7.691406 16.367188 C 7.699219 16.359375 7.589844 16.167969 7.449219 15.9375 C 6.992188 15.1875 6.820312 14.71875 6.746094 14.03125 C 6.675781 13.371094 6.773438 12.78125 7.082031 12.027344 C 7.433594 11.164062 7.625 10.328125 7.628906 9.660156 C 7.628906 9.519531 7.644531 9.421875 7.664062 9.421875 C 7.710938 9.421875 7.886719 9.695312 8.03125 10 C 8.21875 10.398438 8.324219 10.785156 8.40625 11.398438 C 8.449219 11.710938 8.496094 11.984375 8.511719 12.003906 C 8.546875 12.042969 9.015625 11.078125 9.152344 10.695312 C 9.332031 10.191406 9.398438 9.773438 9.398438 9.140625 C 9.398438 8.53125 9.335938 8.117188 9.179688 7.652344 L 9.109375 7.449219 L 9.3125 7.625 C 9.738281 7.992188 10.265625 8.65625 10.574219 9.203125 C 11.464844 10.785156 11.65625 12.617188 11.109375 14.324219 C 10.949219 14.816406 10.796875 15.15625 10.433594 15.796875 C 10.261719 16.105469 10.128906 16.363281 10.136719 16.371094 C 10.15625 16.390625 11.238281 15.785156 11.539062 15.582031 C 13.109375 14.519531 14.085938 12.871094 14.3125 10.898438 C 14.363281 10.449219 14.335938 9.449219 14.257812 8.945312 C 14.074219 7.785156 13.613281 6.554688 13.007812 5.625 C 12.746094 5.226562 12.15625 4.433594 12.121094 4.429688 C 12.105469 4.429688 12.09375 4.703125 12.09375 5.035156 C 12.09375 5.539062 12.082031 5.6875 12.023438 5.902344 C 11.953125 6.148438 11.8125 6.457031 11.679688 6.652344 L 11.613281 6.75 L 11.535156 6.40625 C 11.15625 4.777344 10.175781 3.253906 8.863281 2.253906 C 8.570312 2.027344 8.058594 1.6875 8.015625 1.6875 C 8 1.6875 7.976562 1.867188 7.964844 2.082031 "/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="10" height="13.766053" viewBox="0 0 10 13.766053">
+<path fill-rule="evenodd" fill="rgb(1.568627%, 1.568627%, 1.568627%)" fill-opacity="1" d="M 4.023438 0.371094 C 3.941406 1.726562 3.632812 2.882812 3.050781 4.035156 C 2.84375 4.453125 2.300781 5.324219 2.265625 5.292969 C 2.261719 5.285156 2.203125 5.125 2.140625 4.9375 C 2.039062 4.636719 1.6875 3.921875 1.558594 3.742188 C 1.5 3.660156 1.515625 3.601562 1.371094 4.316406 C 1.199219 5.15625 1.039062 5.597656 0.625 6.425781 C 0.328125 7.035156 0.191406 7.402344 0.0820312 7.910156 C -0.0195312 8.371094 -0.0273438 9.347656 0.0625 9.804688 C 0.269531 10.835938 0.734375 11.691406 1.476562 12.421875 C 1.773438 12.710938 2.144531 12.992188 2.484375 13.1875 C 2.722656 13.324219 3.746094 13.78125 3.769531 13.761719 C 3.777344 13.753906 3.671875 13.574219 3.542969 13.359375 C 3.113281 12.65625 2.953125 12.214844 2.882812 11.570312 C 2.816406 10.953125 2.90625 10.398438 3.199219 9.695312 C 3.527344 8.882812 3.707031 8.101562 3.710938 7.472656 C 3.710938 7.34375 3.726562 7.25 3.742188 7.25 C 3.785156 7.25 3.953125 7.507812 4.085938 7.792969 C 4.261719 8.167969 4.363281 8.527344 4.4375 9.105469 C 4.480469 9.398438 4.523438 9.652344 4.539062 9.671875 C 4.570312 9.707031 5.011719 8.804688 5.136719 8.445312 C 5.308594 7.972656 5.367188 7.582031 5.367188 6.988281 C 5.367188 6.414062 5.308594 6.027344 5.164062 5.59375 L 5.097656 5.402344 L 5.289062 5.566406 C 5.6875 5.910156 6.183594 6.53125 6.472656 7.046875 C 7.304688 8.527344 7.484375 10.246094 6.972656 11.847656 C 6.824219 12.308594 6.679688 12.625 6.339844 13.226562 C 6.179688 13.515625 6.054688 13.757812 6.0625 13.765625 C 6.078125 13.785156 7.09375 13.214844 7.375 13.027344 C 8.847656 12.03125 9.761719 10.484375 9.976562 8.636719 C 10.023438 8.214844 9.996094 7.277344 9.925781 6.804688 C 9.753906 5.714844 9.320312 4.5625 8.753906 3.691406 C 8.507812 3.316406 7.953125 2.574219 7.921875 2.570312 C 7.90625 2.570312 7.894531 2.828125 7.894531 3.136719 C 7.894531 3.609375 7.886719 3.75 7.828125 3.953125 C 7.765625 4.183594 7.632812 4.472656 7.507812 4.65625 L 7.445312 4.746094 L 7.371094 4.421875 C 7.015625 2.898438 6.097656 1.46875 4.867188 0.53125 C 4.59375 0.320312 4.113281 0 4.074219 0 C 4.058594 0 4.035156 0.167969 4.023438 0.371094 "/>
 </svg>
diff --git a/symbols/general/radio-antenna.svg b/symbols/general/radio-antenna.svg
index 8ba276f3..a2b35720 100644
--- a/symbols/general/radio-antenna.svg
+++ b/symbols/general/radio-antenna.svg
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="9.999906" height="10" viewBox="0 0 9.999906 10">
-<rect x="-0.999991" y="-1" width="11.999887" height="12" fill="rgb(100%, 100%, 100%)" fill-opacity="1"/>
-<path fill-rule="evenodd" fill="rgb(37.254903%, 37.254903%, 37.254903%)" fill-opacity="1" d="M 1.390625 2.46875 L 1.390625 5.164062 C 2.386719 5.164062 6.261719 4.574219 6.261719 3.816406 C 6.261719 3.058594 2.386719 2.46875 1.390625 2.46875 Z M 1.390625 2.46875 "/>
-<path fill-rule="nonzero" fill="rgb(14.117648%, 14.117648%, 14.117648%)" fill-opacity="1" d="M 0 1.886719 L 1.488281 1.886719 L 1.488281 10 L 0 10 Z M 0 1.886719 "/>
-<path fill="none" stroke-width="0.553205" stroke-linecap="round" stroke-linejoin="round" stroke="rgb(0%, 0%, 0%)" stroke-opacity="1" stroke-miterlimit="4" d="M 4.532796 290.638718 C 4.935876 291.405603 4.952413 291.926507 4.532796 292.466014 " transform="matrix(1.889746, 0, 0, 1.889746, -1.58927, -546.979386)"/>
-<path fill="none" stroke-width="0.553205" stroke-linecap="round" stroke-linejoin="round" stroke="rgb(0%, 0%, 0%)" stroke-opacity="1" stroke-miterlimit="4" d="M 5.23767 289.72507 C 6.04383 291.256774 6.07897 292.300648 5.23767 293.379662 " transform="matrix(1.889746, 0, 0, 1.889746, -1.58927, -546.979386)"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="13" height="12.995312" viewBox="0 0 13 12.995312">
+<path fill-rule="evenodd" fill="rgb(37.254902%, 37.254902%, 37.254902%)" fill-opacity="1" d="M 1.808594 3.203125 L 1.808594 6.707031 C 3.101562 6.707031 8.140625 5.941406 8.140625 4.957031 C 8.140625 3.972656 3.101562 3.203125 1.808594 3.203125 Z M 1.808594 3.203125 "/>
+<path fill-rule="nonzero" fill="rgb(14.117647%, 14.117647%, 14.117647%)" fill-opacity="1" d="M 0 2.449219 L 1.933594 2.449219 L 1.933594 12.996094 L 0 12.996094 Z M 0 2.449219 "/>
+<path fill="none" stroke-width="1.04542" stroke-linecap="round" stroke-linejoin="round" stroke="rgb(0%, 0%, 0%)" stroke-opacity="1" stroke-miterlimit="4" d="M 6.976403 2.250356 C 7.736537 3.698515 7.769586 4.683985 6.976403 5.702504 " transform="matrix(1.300142, 0, 0, 1.300142, 0, 0)"/>
+<path fill="none" stroke-width="1.04542" stroke-linecap="round" stroke-linejoin="round" stroke="rgb(0%, 0%, 0%)" stroke-opacity="1" stroke-miterlimit="4" d="M 8.307388 0.52278 C 9.83066 3.419099 9.896758 5.390038 8.307388 7.43008 " transform="matrix(1.300142, 0, 0, 1.300142, 0, 0)"/>
 </svg>
diff --git a/symbols/general/radio-mast.svg b/symbols/general/radio-mast.svg
index 0b0e2ffc..dc1c4941 100644
--- a/symbols/general/radio-mast.svg
+++ b/symbols/general/radio-mast.svg
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="10.000012" height="15" viewBox="0 0 10.000012 15">
-<path fill-rule="nonzero" fill="rgb(100%, 100%, 100%)" fill-opacity="1" d="M 0 0 L 10 0 L 10 15 L 0 15 Z M 0 0 "/>
-<path fill-rule="nonzero" fill="rgb(14.117648%, 14.117648%, 14.117648%)" fill-opacity="1" d="M 4.152344 1.785156 L 6.144531 1.785156 L 6.144531 15 L 4.152344 15 Z M 4.152344 1.785156 "/>
-<path fill="none" stroke-width="0.524307" stroke-linecap="round" stroke-linejoin="round" stroke="rgb(0%, 0%, 0%)" stroke-opacity="1" stroke-miterlimit="4" d="M 4.344425 290.905437 C 4.72683 291.630973 4.743367 292.122932 4.344425 292.633495 " transform="matrix(1.889766, 0, 0, 1.889766, -1.081041, -547.610406)"/>
-<path fill="none" stroke-width="0.524307" stroke-linecap="round" stroke-linejoin="round" stroke="rgb(0%, 0%, 0%)" stroke-opacity="1" stroke-miterlimit="4" d="M 5.014151 290.041408 C 5.781028 291.490413 5.814101 292.478466 5.014151 293.497524 " transform="matrix(1.889766, 0, 0, 1.889766, -1.081041, -547.610406)"/>
-<path fill="none" stroke-width="0.524307" stroke-linecap="round" stroke-linejoin="round" stroke="rgb(0%, 0%, 0%)" stroke-opacity="1" stroke-miterlimit="4" d="M 2.091336 290.905437 C 1.70893 291.630973 1.692394 292.122932 2.091336 292.633495 " transform="matrix(1.889766, 0, 0, 1.889766, -1.081041, -547.610406)"/>
-<path fill="none" stroke-width="0.524307" stroke-linecap="round" stroke-linejoin="round" stroke="rgb(0%, 0%, 0%)" stroke-opacity="1" stroke-miterlimit="4" d="M 1.42161 290.041408 C 0.654732 291.490413 0.62166 292.478466 1.42161 293.497524 " transform="matrix(1.889766, 0, 0, 1.889766, -1.081041, -547.610406)"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="13" height="19.492453" viewBox="0 0 13 19.492453">
+<path fill-rule="nonzero" fill="rgb(14.117647%, 14.117647%, 14.117647%)" fill-opacity="1" d="M 5.398438 2.316406 L 7.988281 2.316406 L 7.988281 19.496094 L 5.398438 19.496094 Z M 5.398438 2.316406 "/>
+<path fill="none" stroke-width="0.990818" stroke-linecap="round" stroke-linejoin="round" stroke="rgb(0%, 0%, 0%)" stroke-opacity="1" stroke-miterlimit="4" d="M 7.127988 2.130583 C 7.852207 3.500888 7.882257 4.42945 7.127988 5.394072 " transform="matrix(1.299893, 0, 0, 1.299893, 0, 0)"/>
+<path fill="none" stroke-width="0.990818" stroke-linecap="round" stroke-linejoin="round" stroke="rgb(0%, 0%, 0%)" stroke-opacity="1" stroke-miterlimit="4" d="M 8.396121 0.495834 C 9.844557 3.233438 9.907664 5.102582 8.396121 7.028822 " transform="matrix(1.299893, 0, 0, 1.299893, 0, 0)"/>
+<path fill="none" stroke-width="0.990818" stroke-linecap="round" stroke-linejoin="round" stroke="rgb(0%, 0%, 0%)" stroke-opacity="1" stroke-miterlimit="4" d="M 2.869827 2.130583 C 2.148614 3.500888 2.118563 4.42945 2.869827 5.394072 " transform="matrix(1.299893, 0, 0, 1.299893, 0, 0)"/>
+<path fill="none" stroke-width="0.990818" stroke-linecap="round" stroke-linejoin="round" stroke="rgb(0%, 0%, 0%)" stroke-opacity="1" stroke-miterlimit="4" d="M 1.604699 0.495834 C 0.156263 3.233438 0.0931567 5.102582 1.604699 7.028822 " transform="matrix(1.299893, 0, 0, 1.299893, 0, 0)"/>
 </svg>
diff --git a/symbols/general/sand_store.svg b/symbols/general/sand_store.svg
index 41c33a8a..b5a18439 100644
--- a/symbols/general/sand_store.svg
+++ b/symbols/general/sand_store.svg
@@ -1,4 +1,4 @@
 <?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="18" viewBox="0 0 18 18">
-<path fill-rule="evenodd" fill="rgb(1.568627%, 1.568627%, 1.568627%)" fill-opacity="1" d="M 8.453125 2.160156 C 6.910156 2.503906 5.375 4.023438 3.71875 6.855469 C 2.644531 8.695312 1.5 11.171875 0.507812 13.816406 C -0.0351562 15.265625 -0.0742188 15.421875 0.078125 15.648438 C 0.125 15.714844 0.214844 15.796875 0.28125 15.828125 C 0.398438 15.886719 0.886719 15.890625 9 15.890625 C 17.113281 15.890625 17.601562 15.886719 17.71875 15.828125 C 17.902344 15.738281 18.03125 15.523438 18.035156 15.316406 C 18.035156 15.222656 18.023438 15.15625 18.007812 15.167969 C 17.988281 15.175781 17.949219 15.09375 17.914062 14.984375 C 17.878906 14.875 17.710938 14.40625 17.539062 13.941406 C 16.519531 11.21875 15.382812 8.738281 14.28125 6.855469 C 12.410156 3.65625 10.667969 2.097656 8.976562 2.113281 C 8.804688 2.113281 8.570312 2.136719 8.453125 2.160156 M 9.859375 5.359375 C 9.800781 5.382812 9.707031 5.457031 9.652344 5.523438 C 9.566406 5.628906 9.554688 5.660156 9.570312 5.84375 C 9.582031 6.023438 9.601562 6.066406 9.710938 6.175781 C 10.027344 6.492188 10.558594 6.277344 10.558594 5.828125 C 10.558594 5.464844 10.191406 5.214844 9.859375 5.359375 M 6.660156 6.433594 C 6.503906 6.511719 6.363281 6.71875 6.363281 6.859375 C 6.367188 7.003906 6.496094 7.238281 6.617188 7.3125 C 6.707031 7.371094 6.773438 7.382812 6.921875 7.371094 C 7.09375 7.359375 7.128906 7.34375 7.246094 7.214844 C 7.367188 7.085938 7.382812 7.046875 7.382812 6.902344 C 7.382812 6.496094 7.007812 6.253906 6.660156 6.433594 M 8.84375 7.453125 C 8.441406 7.582031 8.371094 8.148438 8.730469 8.367188 C 9.058594 8.570312 9.503906 8.335938 9.503906 7.960938 C 9.503906 7.605469 9.171875 7.351562 8.84375 7.453125 M 11.953125 7.660156 C 11.621094 7.835938 11.578125 8.238281 11.863281 8.503906 C 11.988281 8.625 12.277344 8.644531 12.4375 8.546875 C 12.578125 8.457031 12.691406 8.277344 12.691406 8.140625 C 12.691406 7.96875 12.566406 7.753906 12.414062 7.671875 C 12.246094 7.578125 12.113281 7.574219 11.953125 7.660156 M 9.78125 9.636719 C 9.636719 9.730469 9.5625 9.871094 9.5625 10.054688 C 9.5625 10.351562 9.769531 10.558594 10.0625 10.558594 C 10.449219 10.558594 10.679688 10.167969 10.496094 9.816406 C 10.371094 9.570312 10.019531 9.484375 9.78125 9.636719 M 5.59375 9.816406 C 5.238281 10.003906 5.21875 10.453125 5.550781 10.679688 C 5.851562 10.878906 6.277344 10.683594 6.320312 10.324219 C 6.367188 9.902344 5.960938 9.617188 5.59375 9.816406 M 11.933594 10.683594 C 11.761719 10.789062 11.671875 10.925781 11.671875 11.082031 C 11.671875 11.5 12.054688 11.746094 12.40625 11.558594 C 12.667969 11.417969 12.757812 11.152344 12.628906 10.898438 C 12.5 10.640625 12.167969 10.539062 11.933594 10.683594 M 7.707031 11.726562 C 7.382812 11.894531 7.335938 12.304688 7.613281 12.546875 C 7.839844 12.75 8.085938 12.734375 8.308594 12.511719 C 8.441406 12.378906 8.445312 12.371094 8.429688 12.164062 C 8.417969 11.976562 8.398438 11.933594 8.289062 11.824219 C 8.1875 11.722656 8.132812 11.695312 7.992188 11.683594 C 7.878906 11.675781 7.785156 11.6875 7.707031 11.726562 M 4.535156 12.789062 C 4.183594 12.964844 4.164062 13.445312 4.496094 13.667969 C 4.804688 13.871094 5.273438 13.625 5.273438 13.257812 C 5.273438 12.863281 4.878906 12.613281 4.535156 12.789062 M 14.066406 12.789062 C 13.808594 12.917969 13.71875 13.199219 13.847656 13.457031 C 13.9375 13.636719 14.050781 13.714844 14.246094 13.734375 C 14.644531 13.773438 14.917969 13.367188 14.738281 13.007812 C 14.613281 12.753906 14.316406 12.660156 14.066406 12.789062 M 10.878906 12.933594 C 10.699219 13.042969 10.617188 13.171875 10.617188 13.355469 C 10.617188 13.636719 10.792969 13.839844 11.070312 13.875 C 11.335938 13.910156 11.636719 13.648438 11.636719 13.390625 C 11.632812 13.242188 11.503906 13.011719 11.382812 12.9375 C 11.238281 12.847656 11.019531 12.847656 10.878906 12.933594 M 0.0117188 15.363281 C 0.0117188 15.46875 0.015625 15.511719 0.0234375 15.460938 C 0.0351562 15.40625 0.0351562 15.320312 0.0234375 15.265625 C 0.015625 15.214844 0.0117188 15.257812 0.0117188 15.363281 "/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="12.223371" viewBox="0 0 16 12.223371">
+<path fill-rule="evenodd" fill="rgb(1.568627%, 1.568627%, 1.568627%)" fill-opacity="1" d="M 7.5 0.0429688 C 6.128906 0.347656 4.769531 1.695312 3.296875 4.207031 C 2.34375 5.839844 1.328125 8.035156 0.449219 10.382812 C -0.03125 11.667969 -0.0664062 11.808594 0.0703125 12.007812 C 0.109375 12.066406 0.191406 12.140625 0.25 12.167969 C 0.351562 12.21875 0.785156 12.222656 7.984375 12.222656 C 15.183594 12.222656 15.617188 12.21875 15.71875 12.167969 C 15.882812 12.089844 15.996094 11.898438 16 11.714844 C 16 11.628906 15.988281 11.570312 15.976562 11.582031 C 15.957031 11.589844 15.921875 11.515625 15.890625 11.417969 C 15.863281 11.324219 15.710938 10.90625 15.558594 10.492188 C 14.65625 8.078125 13.648438 5.878906 12.667969 4.207031 C 11.007812 1.367188 9.464844 -0.015625 7.964844 0 C 7.8125 0 7.601562 0.0195312 7.5 0.0429688 M 8.746094 2.878906 C 8.695312 2.902344 8.609375 2.964844 8.5625 3.027344 C 8.488281 3.121094 8.476562 3.148438 8.488281 3.308594 C 8.5 3.46875 8.519531 3.507812 8.613281 3.605469 C 8.894531 3.886719 9.367188 3.695312 9.367188 3.296875 C 9.367188 2.972656 9.042969 2.75 8.746094 2.878906 M 5.90625 3.832031 C 5.769531 3.902344 5.644531 4.085938 5.644531 4.210938 C 5.648438 4.339844 5.761719 4.546875 5.871094 4.613281 C 5.949219 4.664062 6.007812 4.675781 6.140625 4.664062 C 6.292969 4.65625 6.324219 4.640625 6.429688 4.527344 C 6.535156 4.410156 6.550781 4.378906 6.550781 4.25 C 6.550781 3.886719 6.214844 3.671875 5.90625 3.832031 M 7.84375 4.738281 C 7.488281 4.851562 7.425781 5.355469 7.746094 5.546875 C 8.035156 5.730469 8.429688 5.519531 8.429688 5.1875 C 8.429688 4.871094 8.136719 4.648438 7.84375 4.738281 M 10.605469 4.921875 C 10.308594 5.078125 10.269531 5.433594 10.523438 5.667969 C 10.636719 5.777344 10.890625 5.792969 11.035156 5.707031 C 11.160156 5.628906 11.257812 5.46875 11.257812 5.347656 C 11.257812 5.195312 11.148438 5.003906 11.011719 4.933594 C 10.863281 4.847656 10.746094 4.84375 10.605469 4.921875 M 8.675781 6.675781 C 8.550781 6.757812 8.484375 6.882812 8.484375 7.046875 C 8.484375 7.308594 8.667969 7.492188 8.925781 7.492188 C 9.269531 7.492188 9.472656 7.144531 9.3125 6.835938 C 9.199219 6.617188 8.886719 6.539062 8.675781 6.675781 M 4.960938 6.835938 C 4.648438 7 4.628906 7.398438 4.925781 7.601562 C 5.191406 7.777344 5.570312 7.605469 5.605469 7.285156 C 5.648438 6.910156 5.289062 6.65625 4.960938 6.835938 M 10.585938 7.605469 C 10.433594 7.695312 10.355469 7.820312 10.355469 7.957031 C 10.355469 8.328125 10.695312 8.546875 11.007812 8.378906 C 11.238281 8.253906 11.316406 8.019531 11.203125 7.792969 C 11.089844 7.566406 10.792969 7.476562 10.585938 7.605469 M 6.835938 8.527344 C 6.550781 8.679688 6.507812 9.042969 6.753906 9.257812 C 6.953125 9.4375 7.171875 9.421875 7.371094 9.226562 C 7.488281 9.109375 7.492188 9.101562 7.476562 8.917969 C 7.46875 8.75 7.449219 8.710938 7.351562 8.617188 C 7.261719 8.527344 7.214844 8.5 7.089844 8.492188 C 6.988281 8.484375 6.90625 8.496094 6.835938 8.527344 M 4.023438 9.472656 C 3.710938 9.628906 3.695312 10.054688 3.988281 10.25 C 4.261719 10.429688 4.679688 10.214844 4.679688 9.886719 C 4.679688 9.539062 4.328125 9.316406 4.023438 9.472656 M 12.480469 9.472656 C 12.25 9.585938 12.171875 9.835938 12.285156 10.0625 C 12.363281 10.222656 12.464844 10.292969 12.636719 10.308594 C 12.992188 10.34375 13.234375 9.984375 13.074219 9.664062 C 12.964844 9.441406 12.699219 9.355469 12.480469 9.472656 M 9.652344 9.601562 C 9.492188 9.695312 9.417969 9.8125 9.417969 9.972656 C 9.417969 10.222656 9.574219 10.402344 9.820312 10.433594 C 10.054688 10.464844 10.324219 10.234375 10.324219 10.003906 C 10.320312 9.875 10.207031 9.667969 10.097656 9.601562 C 9.96875 9.523438 9.777344 9.523438 9.652344 9.601562 M 0.0078125 11.753906 C 0.0078125 11.847656 0.0117188 11.886719 0.0195312 11.84375 C 0.03125 11.792969 0.03125 11.71875 0.0195312 11.667969 C 0.0117188 11.625 0.0078125 11.660156 0.0078125 11.753906 "/>
 </svg>
diff --git a/symbols/general/signal-direction-both.svg b/symbols/general/signal-direction-both.svg
index e8721b8a..6d06567b 100644
--- a/symbols/general/signal-direction-both.svg
+++ b/symbols/general/signal-direction-both.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="15.147413" height="35" viewBox="0 0 15.147413 35">
-<path fill-rule="nonzero" fill="rgb(65.882353%, 84.705882%, 73.72549%)" fill-opacity="1" stroke-width="1.49881" stroke-linecap="butt" stroke-linejoin="miter" stroke="rgb(100%, 100%, 100%)" stroke-opacity="1" stroke-miterlimit="4" d="M 1.140625 32.710938 L 5.210938 26.78125 C 7.070312 28.152344 8.710938 27.957031 10.210938 26.78125 L 14.046875 32.6875 C 9.496094 34.789062 5.195312 34.777344 1.140625 32.710938 Z M 1.140625 32.710938 "/>
-<path fill-rule="nonzero" fill="rgb(65.882353%, 84.705882%, 73.72549%)" fill-opacity="1" stroke-width="1.49881" stroke-linecap="butt" stroke-linejoin="miter" stroke="rgb(100%, 100%, 100%)" stroke-opacity="1" stroke-miterlimit="4" d="M 14.007812 2.289062 L 9.9375 8.21875 C 8.078125 6.847656 6.4375 7.042969 4.933594 8.21875 L 1.101562 2.3125 C 5.652344 0.210938 9.953125 0.222656 14.007812 2.289062 Z M 14.007812 2.289062 "/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="11.96456" height="35" viewBox="0 0 11.96456 35">
+<path fill-rule="nonzero" fill="rgb(65.882353%, 84.705882%, 73.72549%)" fill-opacity="1" d="M 11.964844 1.433594 L 8.191406 6.9375 C 6.464844 5.667969 4.949219 5.84375 3.554688 6.9375 L 0 1.464844 C 4.21875 -0.484375 8.203125 -0.480469 11.964844 1.433594 Z M 11.964844 1.433594 "/>
+<path fill-rule="nonzero" fill="rgb(65.882353%, 84.705882%, 73.72549%)" fill-opacity="1" d="M 0 33.566406 L 3.773438 28.0625 C 5.496094 29.332031 7.019531 29.15625 8.414062 28.0625 L 11.964844 33.535156 C 7.746094 35.484375 3.761719 35.480469 0 33.566406 Z M 0 33.566406 "/>
 </svg>
diff --git a/symbols/general/signal-direction.svg b/symbols/general/signal-direction.svg
index fb15efa3..82e6b275 100644
--- a/symbols/general/signal-direction.svg
+++ b/symbols/general/signal-direction.svg
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="15" height="20" viewBox="0 0 15 20">
-<path fill-rule="nonzero" fill="rgb(65.882353%, 84.705882%, 73.72549%)" fill-opacity="1" stroke-width="1.49606" stroke-linecap="butt" stroke-linejoin="miter" stroke="rgb(100%, 100%, 100%)" stroke-opacity="1" stroke-miterlimit="4" d="M 1.101562 17.714844 L 5.164062 11.796875 C 7.019531 13.164062 8.65625 12.96875 10.15625 11.796875 L 13.984375 17.691406 C 9.441406 19.789062 5.148438 19.777344 1.101562 17.714844 Z M 1.101562 17.714844 "/>
+<path fill-rule="nonzero" fill="rgb(65.882353%, 84.705882%, 73.72549%)" fill-opacity="1" d="M 2.304688 17.128906 L 5.609375 12.316406 C 7.117188 13.429688 8.449219 13.269531 9.667969 12.316406 L 12.78125 17.109375 C 9.085938 18.816406 5.597656 18.804688 2.304688 17.128906 Z M 2.304688 17.128906 "/>
 </svg>
diff --git a/symbols/general/tram-stop.svg b/symbols/general/tram-stop.svg
index 5d931a1d..4222200b 100644
--- a/symbols/general/tram-stop.svg
+++ b/symbols/general/tram-stop.svg
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="8" height="8" viewBox="0 0 8 8">
-<rect x="-0.8" y="-0.8" width="9.6" height="9.6" fill="rgb(84.705883%, 46.666667%, 72.156864%)" fill-opacity="1"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="10" height="10" viewBox="0 0 10 10">
+<rect x="-1" y="-1" width="12" height="12" fill="rgb(84.705882%, 46.666667%, 72.156863%)" fill-opacity="1"/>
 </svg>
diff --git a/symbols/general/vacancy-detection-axle-counter.svg b/symbols/general/vacancy-detection-axle-counter.svg
index d0d3390e..1f161449 100644
--- a/symbols/general/vacancy-detection-axle-counter.svg
+++ b/symbols/general/vacancy-detection-axle-counter.svg
@@ -1,15 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16.371737" height="12" viewBox="0 0 16.371737 12">
-<path fill-rule="nonzero" fill="rgb(29.803922%, 29.803922%, 29.803922%)" fill-opacity="1" stroke-width="1.43966" stroke-linecap="butt" stroke-linejoin="miter" stroke="rgb(100%, 100%, 100%)" stroke-opacity="1" stroke-miterlimit="4" d="M 0.722234 7.594404 L 11.468207 7.594404 L 11.468207 9.219432 L 0.722234 9.219432 Z M 0.722234 7.594404 " transform="matrix(0.71393, 0, 0, 0.71393, 0, 0)"/>
-<path fill-rule="nonzero" fill="rgb(29.803922%, 29.803922%, 29.803922%)" fill-opacity="1" stroke-width="2.1891" stroke-linecap="butt" stroke-linejoin="miter" stroke="rgb(100%, 100%, 100%)" stroke-opacity="1" stroke-miterlimit="4" d="M 3.572872 1.105238 C 3.572872 1.105238 3.239112 1.504655 2.604421 1.646913 C 2.084631 1.767286 1.772757 1.822 1.772757 1.822 L 1.663328 8.404182 L 3.972289 8.404182 L 3.972289 1.110709 Z M 3.572872 1.105238 " transform="matrix(0.71393, 0, 0, 0.71393, 0, 0)"/>
-<path fill-rule="nonzero" fill="rgb(29.803922%, 29.803922%, 29.803922%)" fill-opacity="1" stroke-width="2.1891" stroke-linecap="butt" stroke-linejoin="miter" stroke="rgb(100%, 100%, 100%)" stroke-opacity="1" stroke-miterlimit="4" d="M 3.578343 15.703127 C 3.578343 15.703127 3.244583 15.309181 2.609893 15.166923 C 2.090103 15.046551 1.778229 14.991836 1.778229 14.991836 L 1.668799 8.409654 L 3.977761 8.409654 L 3.977761 15.697656 Z M 3.578343 15.703127 " transform="matrix(0.71393, 0, 0, 0.71393, 0, 0)"/>
-<path fill-rule="nonzero" fill="rgb(29.803922%, 29.803922%, 29.803922%)" fill-opacity="1" stroke-width="1.43966" stroke-linecap="butt" stroke-linejoin="miter" stroke="rgb(100%, 100%, 100%)" stroke-opacity="1" stroke-miterlimit="4" d="M 22.21418 7.594404 L 11.468207 7.594404 L 11.468207 9.219432 L 22.21418 9.219432 Z M 22.21418 7.594404 " transform="matrix(0.71393, 0, 0, 0.71393, 0, 0)"/>
-<path fill-rule="nonzero" fill="rgb(29.803922%, 29.803922%, 29.803922%)" fill-opacity="1" stroke-width="2.1891" stroke-linecap="butt" stroke-linejoin="miter" stroke="rgb(100%, 100%, 100%)" stroke-opacity="1" stroke-miterlimit="4" d="M 19.358071 1.105238 C 19.358071 1.105238 19.691831 1.504655 20.326522 1.646913 C 20.846312 1.767286 21.158186 1.822 21.158186 1.822 L 21.267615 8.404182 L 18.958654 8.404182 L 18.958654 1.110709 Z M 19.358071 1.105238 " transform="matrix(0.71393, 0, 0, 0.71393, 0, 0)"/>
-<path fill-rule="nonzero" fill="rgb(29.803922%, 29.803922%, 29.803922%)" fill-opacity="1" stroke-width="2.1891" stroke-linecap="butt" stroke-linejoin="miter" stroke="rgb(100%, 100%, 100%)" stroke-opacity="1" stroke-miterlimit="4" d="M 19.358071 15.703127 C 19.358071 15.703127 19.68636 15.309181 20.32105 15.166923 C 20.84084 15.046551 21.152714 14.991836 21.152714 14.991836 L 21.267615 8.409654 L 18.953182 8.409654 L 18.953182 15.697656 Z M 19.358071 15.703127 " transform="matrix(0.71393, 0, 0, 0.71393, 0, 0)"/>
-<path fill-rule="nonzero" fill="rgb(29.803922%, 29.803922%, 29.803922%)" fill-opacity="1" d="M 0.515625 5.421875 L 8.1875 5.421875 L 8.1875 6.582031 L 0.515625 6.582031 Z M 0.515625 5.421875 "/>
-<path fill-rule="nonzero" fill="rgb(29.803922%, 29.803922%, 29.803922%)" fill-opacity="1" d="M 2.550781 0.789062 C 2.550781 0.789062 2.3125 1.074219 1.859375 1.175781 C 1.488281 1.261719 1.265625 1.300781 1.265625 1.300781 L 1.1875 6 L 2.835938 6 L 2.835938 0.792969 Z M 2.550781 0.789062 "/>
-<path fill-rule="nonzero" fill="rgb(29.803922%, 29.803922%, 29.803922%)" fill-opacity="1" d="M 2.554688 11.210938 C 2.554688 11.210938 2.316406 10.929688 1.863281 10.828125 C 1.492188 10.742188 1.269531 10.703125 1.269531 10.703125 L 1.191406 6.003906 L 2.839844 6.003906 L 2.839844 11.207031 Z M 2.554688 11.210938 "/>
-<path fill-rule="nonzero" fill="rgb(29.803922%, 29.803922%, 29.803922%)" fill-opacity="1" d="M 15.859375 5.421875 L 8.1875 5.421875 L 8.1875 6.582031 L 15.859375 6.582031 Z M 15.859375 5.421875 "/>
-<path fill-rule="nonzero" fill="rgb(29.803922%, 29.803922%, 29.803922%)" fill-opacity="1" d="M 13.820312 0.789062 C 13.820312 0.789062 14.058594 1.074219 14.511719 1.175781 C 14.882812 1.261719 15.105469 1.300781 15.105469 1.300781 L 15.183594 6 L 13.535156 6 L 13.535156 0.792969 Z M 13.820312 0.789062 "/>
-<path fill-rule="nonzero" fill="rgb(29.803922%, 29.803922%, 29.803922%)" fill-opacity="1" d="M 13.820312 11.210938 C 13.820312 11.210938 14.054688 10.929688 14.507812 10.828125 C 14.878906 10.742188 15.101562 10.703125 15.101562 10.703125 L 15.183594 6.003906 L 13.53125 6.003906 L 13.53125 11.207031 Z M 13.820312 11.210938 "/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="18.551367" height="12.6" viewBox="0 0 18.551367 12.6">
+<path fill-rule="nonzero" fill="rgb(29.803922%, 29.803922%, 29.803922%)" fill-opacity="1" d="M 2.597656 0.0234375 C 2.597656 0.0234375 2.304688 0.367188 1.757812 0.492188 C 1.3125 0.59375 1.042969 0.644531 1.042969 0.644531 L 0.949219 6.324219 L 2.941406 6.324219 L 2.941406 0.0273438 Z M 2.597656 0.0234375 "/>
+<path fill-rule="nonzero" fill="rgb(29.803922%, 29.803922%, 29.803922%)" fill-opacity="1" d="M 2.601562 12.625 C 2.601562 12.625 2.308594 12.285156 1.761719 12.160156 C 1.316406 12.058594 1.046875 12.007812 1.046875 12.007812 L 0.953125 6.328125 L 2.945312 6.328125 L 2.945312 12.621094 Z M 2.601562 12.625 "/>
+<path fill-rule="nonzero" fill="rgb(29.803922%, 29.803922%, 29.803922%)" fill-opacity="1" d="M 16.367188 0.0195312 C 16.367188 0.0195312 16.660156 0.363281 17.203125 0.488281 C 17.652344 0.589844 17.921875 0.636719 17.921875 0.636719 L 18.015625 6.320312 L 16.023438 6.320312 L 16.023438 0.0234375 Z M 16.367188 0.0195312 "/>
+<path fill-rule="nonzero" fill="rgb(29.803922%, 29.803922%, 29.803922%)" fill-opacity="1" d="M 16.363281 12.617188 C 16.363281 12.617188 16.65625 12.277344 17.199219 12.15625 C 17.648438 12.054688 17.917969 12.003906 17.917969 12.003906 L 18.011719 6.324219 L 16.019531 6.324219 L 16.019531 12.613281 Z M 16.363281 12.617188 "/>
+<path fill-rule="nonzero" fill="rgb(29.803922%, 29.803922%, 29.803922%)" fill-opacity="1" d="M 18.550781 5.625 L 0 5.625 L 0 7.027344 L 18.550781 7.027344 Z M 18.550781 5.625 "/>
 </svg>
diff --git a/symbols/general/vacancy-detection-insulated-rail-joint.svg b/symbols/general/vacancy-detection-insulated-rail-joint.svg
index 202eadf2..94bb1841 100644
--- a/symbols/general/vacancy-detection-insulated-rail-joint.svg
+++ b/symbols/general/vacancy-detection-insulated-rail-joint.svg
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="25.172513" height="8" viewBox="0 0 25.172513 8">
-<path fill-rule="nonzero" fill="rgb(5.098039%, 5.098039%, 5.098039%)" fill-opacity="1" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke="rgb(100%, 100%, 100%)" stroke-opacity="1" stroke-miterlimit="4" d="M 0.498539 2.075115 L 13.264544 2.075115 L 13.264544 6.651447 L 0.498539 6.651447 Z M 0.498539 2.075115 " transform="matrix(0.916741, 0, 0, 0.916741, 0, 0)"/>
-<path fill-rule="nonzero" fill="rgb(5.098039%, 5.098039%, 5.098039%)" fill-opacity="1" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke="rgb(100%, 100%, 100%)" stroke-opacity="1" stroke-miterlimit="4" d="M 26.959451 2.075115 L 14.193446 2.075115 L 14.193446 6.651447 L 26.959451 6.651447 Z M 26.959451 2.075115 " transform="matrix(0.916741, 0, 0, 0.916741, 0, 0)"/>
-<path fill-rule="nonzero" fill="rgb(100%, 73.72549%, 0%)" fill-opacity="1" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke="rgb(100%, 100%, 100%)" stroke-opacity="1" stroke-miterlimit="4" d="M 12.591303 0.498539 L 14.866686 0.498539 L 14.866686 8.228023 L 12.591303 8.228023 Z M 12.591303 0.498539 " transform="matrix(0.916741, 0, 0, 0.916741, 0, 0)"/>
-<path fill-rule="nonzero" fill="rgb(5.098039%, 5.098039%, 5.098039%)" fill-opacity="1" d="M 0.457031 1.902344 L 12.160156 1.902344 L 12.160156 6.097656 L 0.457031 6.097656 Z M 0.457031 1.902344 "/>
-<path fill-rule="nonzero" fill="rgb(5.098039%, 5.098039%, 5.098039%)" fill-opacity="1" d="M 24.714844 1.902344 L 13.011719 1.902344 L 13.011719 6.097656 L 24.714844 6.097656 Z M 24.714844 1.902344 "/>
-<path fill-rule="nonzero" fill="rgb(100%, 73.72549%, 0%)" fill-opacity="1" d="M 11.542969 0.457031 L 13.628906 0.457031 L 13.628906 7.542969 L 11.542969 7.542969 Z M 11.542969 0.457031 "/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="27.386988" height="8" viewBox="0 0 27.386988 8">
+<path fill-rule="nonzero" fill="rgb(5.098039%, 5.098039%, 5.098039%)" fill-opacity="1" d="M 0 1.632812 L 13.210938 1.632812 L 13.210938 6.367188 L 0 6.367188 Z M 0 1.632812 "/>
+<path fill-rule="nonzero" fill="rgb(5.098039%, 5.098039%, 5.098039%)" fill-opacity="1" d="M 27.386719 1.632812 L 14.175781 1.632812 L 14.175781 6.367188 L 27.386719 6.367188 Z M 27.386719 1.632812 "/>
+<path fill-rule="nonzero" fill="rgb(100%, 73.72549%, 0%)" fill-opacity="1" d="M 12.515625 0 L 14.871094 0 L 14.871094 8 L 12.515625 8 Z M 12.515625 0 "/>
 </svg>
diff --git a/symbols/general/waste_disposal.svg b/symbols/general/waste_disposal.svg
index 4bf14caa..c364c00d 100644
--- a/symbols/general/waste_disposal.svg
+++ b/symbols/general/waste_disposal.svg
@@ -1,4 +1,4 @@
 <?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="18" viewBox="0 0 18 18">
-<path fill-rule="evenodd" fill="rgb(1.568627%, 1.568627%, 1.568627%)" fill-opacity="1" d="M 8.632812 0.808594 C 7.910156 0.921875 7.277344 1.308594 6.875 1.882812 C 6.667969 2.171875 5.472656 4.253906 5.496094 4.277344 C 5.507812 4.289062 5.917969 4.53125 6.414062 4.816406 C 7.039062 5.179688 7.320312 5.324219 7.339844 5.296875 C 7.359375 5.273438 7.636719 4.789062 7.964844 4.21875 C 8.289062 3.648438 8.585938 3.144531 8.628906 3.097656 C 8.839844 2.859375 9.160156 2.859375 9.371094 3.097656 C 9.457031 3.195312 11.511719 6.746094 11.492188 6.765625 C 11.484375 6.773438 11.28125 6.890625 11.042969 7.03125 C 10.800781 7.167969 10.585938 7.308594 10.558594 7.339844 C 10.496094 7.425781 10.5 7.609375 10.574219 7.691406 C 10.648438 7.777344 13.796875 9.070312 13.929688 9.070312 C 14.039062 9.070312 14.15625 8.96875 14.183594 8.851562 C 14.195312 8.808594 14.304688 8.015625 14.429688 7.089844 C 14.667969 5.332031 14.667969 5.324219 14.523438 5.214844 C 14.410156 5.125 14.269531 5.167969 13.816406 5.429688 C 13.359375 5.691406 13.359375 5.691406 13.308594 5.613281 C 13.28125 5.570312 12.8125 4.761719 12.269531 3.8125 C 11.722656 2.867188 11.214844 2.003906 11.144531 1.898438 C 10.90625 1.546875 10.492188 1.207031 10.078125 1.019531 C 9.648438 0.828125 9.066406 0.742188 8.632812 0.808594 M 3.445312 7.332031 C 2.472656 7.734375 1.859375 8.007812 1.820312 8.054688 C 1.730469 8.160156 1.742188 8.339844 1.835938 8.425781 C 1.878906 8.46875 2.101562 8.605469 2.328125 8.734375 C 2.554688 8.863281 2.742188 8.976562 2.742188 8.980469 C 2.742188 8.988281 2.273438 9.804688 1.699219 10.796875 C 0.574219 12.742188 0.523438 12.839844 0.4375 13.183594 C 0.351562 13.515625 0.382812 14.101562 0.5 14.421875 C 0.753906 15.097656 1.265625 15.601562 1.933594 15.828125 C 2.152344 15.90625 2.21875 15.90625 3.804688 15.917969 L 5.449219 15.929688 L 5.449219 13.78125 L 3.988281 13.78125 C 2.8125 13.78125 2.527344 13.773438 2.511719 13.734375 C 2.5 13.703125 4.496094 10.175781 4.589844 10.058594 C 4.597656 10.054688 4.8125 10.167969 5.070312 10.316406 C 5.328125 10.460938 5.570312 10.582031 5.609375 10.582031 C 5.703125 10.582031 5.832031 10.488281 5.871094 10.390625 C 5.890625 10.339844 5.820312 9.742188 5.675781 8.664062 C 5.554688 7.757812 5.445312 6.960938 5.433594 6.902344 C 5.40625 6.757812 5.296875 6.679688 5.132812 6.683594 C 5.058594 6.683594 4.378906 6.949219 3.445312 7.332031 M 15.171875 10.917969 C 14.691406 11.195312 14.28125 11.4375 14.261719 11.457031 C 14.242188 11.476562 14.453125 11.875 14.808594 12.484375 C 15.488281 13.65625 15.511719 13.703125 15.484375 13.746094 C 15.472656 13.769531 14.621094 13.78125 13.179688 13.78125 L 10.898438 13.78125 L 10.898438 13.273438 C 10.898438 12.96875 10.882812 12.730469 10.859375 12.679688 C 10.8125 12.574219 10.652344 12.5 10.539062 12.527344 C 10.464844 12.546875 7.96875 14.457031 7.761719 14.652344 C 7.664062 14.742188 7.636719 14.867188 7.6875 14.992188 C 7.707031 15.042969 10.082031 16.90625 10.421875 17.136719 C 10.585938 17.246094 10.699219 17.234375 10.820312 17.101562 C 10.894531 17.015625 10.898438 16.980469 10.898438 16.46875 L 10.898438 15.929688 L 13.367188 15.917969 C 15.816406 15.90625 15.839844 15.90625 16.066406 15.828125 C 16.746094 15.597656 17.296875 15.042969 17.515625 14.378906 C 17.605469 14.101562 17.636719 13.527344 17.582031 13.25 C 17.558594 13.144531 17.503906 12.972656 17.460938 12.863281 C 17.375 12.660156 16.097656 10.410156 16.066406 10.410156 C 16.058594 10.410156 15.65625 10.636719 15.171875 10.917969 "/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="15.260341" viewBox="0 0 16 15.260341">
+<path fill-rule="evenodd" fill="rgb(1.568627%, 1.568627%, 1.568627%)" fill-opacity="1" d="M 7.660156 0.0195312 C 6.988281 0.125 6.402344 0.484375 6.027344 1.019531 C 5.835938 1.289062 4.722656 3.222656 4.746094 3.242188 C 4.757812 3.253906 5.136719 3.480469 5.597656 3.746094 C 6.179688 4.082031 6.441406 4.214844 6.457031 4.191406 C 6.476562 4.167969 6.734375 3.71875 7.039062 3.1875 C 7.339844 2.660156 7.617188 2.191406 7.65625 2.148438 C 7.851562 1.925781 8.148438 1.925781 8.347656 2.148438 C 8.425781 2.238281 10.335938 5.539062 10.316406 5.554688 C 10.308594 5.5625 10.121094 5.671875 9.898438 5.800781 C 9.675781 5.929688 9.476562 6.058594 9.449219 6.089844 C 9.390625 6.167969 9.394531 6.339844 9.464844 6.414062 C 9.53125 6.496094 12.457031 7.695312 12.582031 7.695312 C 12.683594 7.695312 12.792969 7.601562 12.816406 7.492188 C 12.828125 7.453125 12.929688 6.71875 13.046875 5.855469 C 13.265625 4.222656 13.265625 4.214844 13.132812 4.113281 C 13.027344 4.03125 12.898438 4.070312 12.476562 4.3125 C 12.050781 4.558594 12.050781 4.558594 12.003906 4.484375 C 11.980469 4.445312 11.542969 3.695312 11.039062 2.8125 C 10.53125 1.933594 10.058594 1.132812 9.992188 1.035156 C 9.773438 0.707031 9.386719 0.390625 9.003906 0.214844 C 8.605469 0.0390625 8.0625 -0.0429688 7.660156 0.0195312 M 2.839844 6.082031 C 1.9375 6.457031 1.367188 6.710938 1.332031 6.753906 C 1.246094 6.851562 1.257812 7.019531 1.34375 7.097656 C 1.382812 7.136719 1.589844 7.265625 1.800781 7.382812 C 2.011719 7.503906 2.1875 7.609375 2.1875 7.613281 C 2.1875 7.621094 1.75 8.378906 1.21875 9.300781 C 0.171875 11.109375 0.125 11.199219 0.046875 11.519531 C -0.0351562 11.828125 -0.00390625 12.371094 0.105469 12.667969 C 0.339844 13.296875 0.816406 13.765625 1.433594 13.976562 C 1.640625 14.046875 1.699219 14.046875 3.175781 14.058594 L 4.703125 14.070312 L 4.703125 12.074219 L 3.34375 12.074219 C 2.253906 12.074219 1.988281 12.066406 1.972656 12.03125 C 1.960938 12 3.816406 8.722656 3.902344 8.613281 C 3.910156 8.613281 4.109375 8.714844 4.351562 8.855469 C 4.589844 8.988281 4.816406 9.101562 4.851562 9.101562 C 4.9375 9.101562 5.058594 9.015625 5.09375 8.921875 C 5.113281 8.875 5.046875 8.320312 4.914062 7.320312 C 4.800781 6.476562 4.699219 5.738281 4.6875 5.683594 C 4.660156 5.546875 4.558594 5.476562 4.40625 5.480469 C 4.339844 5.480469 3.707031 5.726562 2.839844 6.082031 M 13.734375 9.414062 C 13.289062 9.671875 12.90625 9.894531 12.890625 9.914062 C 12.871094 9.933594 13.066406 10.300781 13.398438 10.867188 C 14.03125 11.957031 14.050781 12 14.027344 12.042969 C 14.015625 12.0625 13.222656 12.074219 11.882812 12.074219 L 9.765625 12.074219 L 9.765625 11.601562 C 9.765625 11.320312 9.75 11.097656 9.730469 11.050781 C 9.683594 10.953125 9.535156 10.882812 9.429688 10.910156 C 9.363281 10.925781 7.042969 12.703125 6.851562 12.882812 C 6.761719 12.964844 6.734375 13.082031 6.78125 13.199219 C 6.800781 13.246094 9.007812 14.976562 9.320312 15.191406 C 9.476562 15.292969 9.578125 15.28125 9.691406 15.160156 C 9.761719 15.078125 9.765625 15.046875 9.765625 14.570312 L 9.765625 14.070312 L 12.058594 14.058594 C 14.335938 14.046875 14.355469 14.046875 14.566406 13.976562 C 15.199219 13.761719 15.710938 13.246094 15.914062 12.628906 C 15.996094 12.371094 16.027344 11.839844 15.976562 11.582031 C 15.953125 11.480469 15.902344 11.324219 15.863281 11.222656 C 15.78125 11.03125 14.59375 8.941406 14.566406 8.941406 C 14.558594 8.941406 14.1875 9.152344 13.734375 9.414062 "/>
 </svg>
diff --git a/symbols/general/water_tower.svg b/symbols/general/water_tower.svg
index fe496b13..b223ae71 100644
--- a/symbols/general/water_tower.svg
+++ b/symbols/general/water_tower.svg
@@ -1,4 +1,4 @@
 <?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="18" viewBox="0 0 18 18">
-<path fill-rule="nonzero" fill="rgb(0%, 0%, 0%)" fill-opacity="1" d="M 3.375 1.125 L 3.375 5.0625 C 3.375 6.6875 4.261719 7.851562 5.519531 8.578125 L 4.5 16.875 L 6.1875 16.875 L 6.398438 15.222656 L 9 13.5 L 11.601562 15.257812 L 11.8125 16.875 L 13.5 16.875 L 12.480469 8.613281 C 13.746094 7.886719 14.625 6.707031 14.625 5.0625 L 14.625 1.125 L 12.9375 1.125 L 12.9375 2.8125 L 12.375 2.8125 C 11.105469 3.375 10.125 3.375 9 2.8125 C 7.875 2.25 6.792969 2.25 5.625 2.8125 L 5.0625 2.8125 L 5.0625 1.125 Z M 7.136719 9.210938 C 8.339844 9.507812 9.660156 9.539062 10.863281 9.246094 L 11.074219 11.003906 L 9 12.375 L 6.925781 11.003906 Z M 6.785156 12.023438 L 8.15625 12.9375 L 6.539062 14.027344 Z M 11.214844 12.023438 L 11.460938 14.027344 L 9.84375 12.9375 Z M 11.214844 12.023438 "/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="13" height="18.2" viewBox="0 0 13 18.2">
+<path fill-rule="nonzero" fill="rgb(0%, 0%, 0%)" fill-opacity="1" d="M 0 0 L 0 4.550781 C 0 6.425781 1.023438 7.773438 2.480469 8.613281 L 1.300781 18.199219 L 3.25 18.199219 L 3.496094 16.292969 L 6.5 14.300781 L 9.503906 16.332031 L 9.75 18.199219 L 11.699219 18.199219 L 10.519531 8.652344 C 11.984375 7.8125 13 6.449219 13 4.550781 L 13 0 L 11.050781 0 L 11.050781 1.949219 L 10.402344 1.949219 C 8.933594 2.597656 7.800781 2.597656 6.5 1.949219 C 5.199219 1.300781 3.949219 1.300781 2.597656 1.949219 L 1.949219 1.949219 L 1.949219 0 Z M 4.347656 9.34375 C 5.738281 9.6875 7.261719 9.722656 8.652344 9.386719 L 8.894531 11.417969 L 6.5 13 L 4.105469 11.417969 Z M 3.941406 12.59375 L 5.527344 13.652344 L 3.65625 14.910156 Z M 9.058594 12.59375 L 9.34375 14.910156 L 7.472656 13.652344 Z M 9.058594 12.59375 "/>
 </svg>