diff --git a/data/classificator.txt b/data/classificator.txt
index 248b637da2..f7d8f588fd 100644
--- a/data/classificator.txt
+++ b/data/classificator.txt
@@ -375,6 +375,7 @@ world  +
     emergency  +
         assembly_point  -
         defibrillator  -
+        emergency_ward_entrance  -
         fire_hydrant  -
         phone  -
         {}
diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index 99f4648da5..2481b659ed 100644
Binary files a/data/drules_proto.bin and b/data/drules_proto.bin differ
diff --git a/data/drules_proto.txt b/data/drules_proto.txt
index 59d3d194cf..acc98127d8 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -15492,7 +15492,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "barrier-entrance-s"
+      name: "entrance-barrier-s"
       priority: 220
     }
     caption {
@@ -15508,7 +15508,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "barrier-entrance-s"
+      name: "entrance-barrier-s"
       priority: 220
     }
     caption {
@@ -15524,7 +15524,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "barrier-entrance-s"
+      name: "entrance-barrier-s"
       priority: 220
     }
     caption {
@@ -15540,7 +15540,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "barrier-entrance-s"
+      name: "entrance-barrier-s"
       priority: 220
     }
     caption {
@@ -15556,7 +15556,7 @@ cont {
   element {
     scale: 20
     symbol {
-      name: "barrier-entrance-s"
+      name: "entrance-barrier-s"
       priority: 220
     }
     caption {
@@ -20582,6 +20582,57 @@ cont {
     }
   }
 }
+cont {
+  name: "emergency-emergency_ward_entrance"
+  element {
+    scale: 18
+    symbol {
+      name: "entrance-emergency-s"
+      priority: 250
+    }
+    caption {
+      primary {
+        height: 10
+        color: 6381914
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9750
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "entrance-emergency-s"
+      priority: 250
+    }
+    caption {
+      primary {
+        height: 10
+        color: 6381914
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9750
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "entrance-emergency-s"
+      priority: 250
+    }
+    caption {
+      primary {
+        height: 10
+        color: 6381914
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9750
+    }
+  }
+}
 cont {
   name: "emergency-fire_hydrant"
   element {
@@ -20700,7 +20751,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "exit-s"
+      name: "entrance-exit-s"
       priority: -10000
     }
     caption {
@@ -20722,7 +20773,7 @@ cont {
   element {
     scale: 20
     symbol {
-      name: "exit-s"
+      name: "entrance-exit-s"
       priority: -10000
     }
     caption {
@@ -20747,7 +20798,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "main_entrance-s"
+      name: "entrance-main-s"
       priority: 220
     }
     caption {
@@ -20769,7 +20820,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "main_entrance-s"
+      name: "entrance-main-s"
       priority: 220
     }
     caption {
@@ -20791,7 +20842,7 @@ cont {
   element {
     scale: 20
     symbol {
-      name: "main_entrance-s"
+      name: "entrance-main-s"
       priority: 220
     }
     caption {
diff --git a/data/drules_proto_default_dark.bin b/data/drules_proto_default_dark.bin
index 47684bc010..63c21619c8 100644
Binary files a/data/drules_proto_default_dark.bin and b/data/drules_proto_default_dark.bin differ
diff --git a/data/drules_proto_default_dark.txt b/data/drules_proto_default_dark.txt
index 60cd814859..045e02f6f1 100644
--- a/data/drules_proto_default_dark.txt
+++ b/data/drules_proto_default_dark.txt
@@ -14910,7 +14910,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "barrier-entrance-s"
+      name: "entrance-barrier-s"
       priority: 220
     }
     caption {
@@ -14926,7 +14926,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "barrier-entrance-s"
+      name: "entrance-barrier-s"
       priority: 220
     }
     caption {
@@ -14942,7 +14942,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "barrier-entrance-s"
+      name: "entrance-barrier-s"
       priority: 220
     }
     caption {
@@ -14958,7 +14958,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "barrier-entrance-s"
+      name: "entrance-barrier-s"
       priority: 220
     }
     caption {
@@ -14974,7 +14974,7 @@ cont {
   element {
     scale: 20
     symbol {
-      name: "barrier-entrance-s"
+      name: "entrance-barrier-s"
       priority: 220
     }
     caption {
@@ -19504,6 +19504,57 @@ cont {
     }
   }
 }
+cont {
+  name: "emergency-emergency_ward_entrance"
+  element {
+    scale: 18
+    symbol {
+      name: "entrance-emergency-s"
+      priority: 250
+    }
+    caption {
+      primary {
+        height: 10
+        color: 7763574
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9750
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "entrance-emergency-s"
+      priority: 250
+    }
+    caption {
+      primary {
+        height: 10
+        color: 7763574
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9750
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "entrance-emergency-s"
+      priority: 250
+    }
+    caption {
+      primary {
+        height: 10
+        color: 7763574
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9750
+    }
+  }
+}
 cont {
   name: "emergency-fire_hydrant"
   element {
@@ -19622,7 +19673,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "exit-s"
+      name: "entrance-exit-s"
       priority: -10000
     }
     caption {
@@ -19644,7 +19695,7 @@ cont {
   element {
     scale: 20
     symbol {
-      name: "exit-s"
+      name: "entrance-exit-s"
       priority: -10000
     }
     caption {
@@ -19669,7 +19720,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "main_entrance-s"
+      name: "entrance-main-s"
       priority: 220
     }
     caption {
@@ -19691,7 +19742,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "main_entrance-s"
+      name: "entrance-main-s"
       priority: 220
     }
     caption {
@@ -19713,7 +19764,7 @@ cont {
   element {
     scale: 20
     symbol {
-      name: "main_entrance-s"
+      name: "entrance-main-s"
       priority: 220
     }
     caption {
diff --git a/data/drules_proto_default_light.bin b/data/drules_proto_default_light.bin
index 6967adee3c..eecff19403 100644
Binary files a/data/drules_proto_default_light.bin and b/data/drules_proto_default_light.bin differ
diff --git a/data/drules_proto_default_light.txt b/data/drules_proto_default_light.txt
index 64a3a1c0f6..ae522881fc 100644
--- a/data/drules_proto_default_light.txt
+++ b/data/drules_proto_default_light.txt
@@ -14910,7 +14910,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "barrier-entrance-s"
+      name: "entrance-barrier-s"
       priority: 220
     }
     caption {
@@ -14926,7 +14926,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "barrier-entrance-s"
+      name: "entrance-barrier-s"
       priority: 220
     }
     caption {
@@ -14942,7 +14942,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "barrier-entrance-s"
+      name: "entrance-barrier-s"
       priority: 220
     }
     caption {
@@ -14958,7 +14958,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "barrier-entrance-s"
+      name: "entrance-barrier-s"
       priority: 220
     }
     caption {
@@ -14974,7 +14974,7 @@ cont {
   element {
     scale: 20
     symbol {
-      name: "barrier-entrance-s"
+      name: "entrance-barrier-s"
       priority: 220
     }
     caption {
@@ -19504,6 +19504,57 @@ cont {
     }
   }
 }
+cont {
+  name: "emergency-emergency_ward_entrance"
+  element {
+    scale: 18
+    symbol {
+      name: "entrance-emergency-s"
+      priority: 250
+    }
+    caption {
+      primary {
+        height: 10
+        color: 6381914
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9750
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "entrance-emergency-s"
+      priority: 250
+    }
+    caption {
+      primary {
+        height: 10
+        color: 6381914
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9750
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "entrance-emergency-s"
+      priority: 250
+    }
+    caption {
+      primary {
+        height: 10
+        color: 6381914
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9750
+    }
+  }
+}
 cont {
   name: "emergency-fire_hydrant"
   element {
@@ -19622,7 +19673,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "exit-s"
+      name: "entrance-exit-s"
       priority: -10000
     }
     caption {
@@ -19644,7 +19695,7 @@ cont {
   element {
     scale: 20
     symbol {
-      name: "exit-s"
+      name: "entrance-exit-s"
       priority: -10000
     }
     caption {
@@ -19669,7 +19720,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "main_entrance-s"
+      name: "entrance-main-s"
       priority: 220
     }
     caption {
@@ -19691,7 +19742,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "main_entrance-s"
+      name: "entrance-main-s"
       priority: 220
     }
     caption {
@@ -19713,7 +19764,7 @@ cont {
   element {
     scale: 20
     symbol {
-      name: "main_entrance-s"
+      name: "entrance-main-s"
       priority: 220
     }
     caption {
diff --git a/data/drules_proto_outdoors_dark.bin b/data/drules_proto_outdoors_dark.bin
index 220167a7f1..f341c0befb 100644
Binary files a/data/drules_proto_outdoors_dark.bin and b/data/drules_proto_outdoors_dark.bin differ
diff --git a/data/drules_proto_outdoors_dark.txt b/data/drules_proto_outdoors_dark.txt
index 7885f5b97d..db1258bc54 100644
--- a/data/drules_proto_outdoors_dark.txt
+++ b/data/drules_proto_outdoors_dark.txt
@@ -15337,7 +15337,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "barrier-entrance-s"
+      name: "entrance-barrier-s"
       priority: 220
     }
     caption {
@@ -15353,7 +15353,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "barrier-entrance-s"
+      name: "entrance-barrier-s"
       priority: 220
     }
     caption {
@@ -15369,7 +15369,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "barrier-entrance-s"
+      name: "entrance-barrier-s"
       priority: 220
     }
     caption {
@@ -15385,7 +15385,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "barrier-entrance-s"
+      name: "entrance-barrier-s"
       priority: 220
     }
     caption {
@@ -15401,7 +15401,7 @@ cont {
   element {
     scale: 20
     symbol {
-      name: "barrier-entrance-s"
+      name: "entrance-barrier-s"
       priority: 220
     }
     caption {
@@ -20079,6 +20079,57 @@ cont {
     }
   }
 }
+cont {
+  name: "emergency-emergency_ward_entrance"
+  element {
+    scale: 18
+    symbol {
+      name: "entrance-emergency-s"
+      priority: 250
+    }
+    caption {
+      primary {
+        height: 10
+        color: 7763574
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9750
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "entrance-emergency-s"
+      priority: 250
+    }
+    caption {
+      primary {
+        height: 10
+        color: 7763574
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9750
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "entrance-emergency-s"
+      priority: 250
+    }
+    caption {
+      primary {
+        height: 10
+        color: 7763574
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9750
+    }
+  }
+}
 cont {
   name: "emergency-fire_hydrant"
   element {
@@ -20197,7 +20248,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "exit-s"
+      name: "entrance-exit-s"
       priority: -10000
     }
     caption {
@@ -20219,7 +20270,7 @@ cont {
   element {
     scale: 20
     symbol {
-      name: "exit-s"
+      name: "entrance-exit-s"
       priority: -10000
     }
     caption {
@@ -20244,7 +20295,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "main_entrance-s"
+      name: "entrance-main-s"
       priority: 220
     }
     caption {
@@ -20266,7 +20317,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "main_entrance-s"
+      name: "entrance-main-s"
       priority: 220
     }
     caption {
@@ -20288,7 +20339,7 @@ cont {
   element {
     scale: 20
     symbol {
-      name: "main_entrance-s"
+      name: "entrance-main-s"
       priority: 220
     }
     caption {
diff --git a/data/drules_proto_outdoors_light.bin b/data/drules_proto_outdoors_light.bin
index fc75f3ed4d..d6eb05562e 100644
Binary files a/data/drules_proto_outdoors_light.bin and b/data/drules_proto_outdoors_light.bin differ
diff --git a/data/drules_proto_outdoors_light.txt b/data/drules_proto_outdoors_light.txt
index 0c7d43766e..27bc51baaa 100644
--- a/data/drules_proto_outdoors_light.txt
+++ b/data/drules_proto_outdoors_light.txt
@@ -15337,7 +15337,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "barrier-entrance-s"
+      name: "entrance-barrier-s"
       priority: 220
     }
     caption {
@@ -15353,7 +15353,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "barrier-entrance-s"
+      name: "entrance-barrier-s"
       priority: 220
     }
     caption {
@@ -15369,7 +15369,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "barrier-entrance-s"
+      name: "entrance-barrier-s"
       priority: 220
     }
     caption {
@@ -15385,7 +15385,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "barrier-entrance-s"
+      name: "entrance-barrier-s"
       priority: 220
     }
     caption {
@@ -15401,7 +15401,7 @@ cont {
   element {
     scale: 20
     symbol {
-      name: "barrier-entrance-s"
+      name: "entrance-barrier-s"
       priority: 220
     }
     caption {
@@ -20079,6 +20079,57 @@ cont {
     }
   }
 }
+cont {
+  name: "emergency-emergency_ward_entrance"
+  element {
+    scale: 18
+    symbol {
+      name: "entrance-emergency-s"
+      priority: 250
+    }
+    caption {
+      primary {
+        height: 10
+        color: 6381914
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9750
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "entrance-emergency-s"
+      priority: 250
+    }
+    caption {
+      primary {
+        height: 10
+        color: 6381914
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9750
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "entrance-emergency-s"
+      priority: 250
+    }
+    caption {
+      primary {
+        height: 10
+        color: 6381914
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9750
+    }
+  }
+}
 cont {
   name: "emergency-fire_hydrant"
   element {
@@ -20197,7 +20248,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "exit-s"
+      name: "entrance-exit-s"
       priority: -10000
     }
     caption {
@@ -20219,7 +20270,7 @@ cont {
   element {
     scale: 20
     symbol {
-      name: "exit-s"
+      name: "entrance-exit-s"
       priority: -10000
     }
     caption {
@@ -20244,7 +20295,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "main_entrance-s"
+      name: "entrance-main-s"
       priority: 220
     }
     caption {
@@ -20266,7 +20317,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "main_entrance-s"
+      name: "entrance-main-s"
       priority: 220
     }
     caption {
@@ -20288,7 +20339,7 @@ cont {
   element {
     scale: 20
     symbol {
-      name: "main_entrance-s"
+      name: "entrance-main-s"
       priority: 220
     }
     caption {
diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin
index d320cfa317..dbe6db0eaf 100644
Binary files a/data/drules_proto_vehicle_dark.bin and b/data/drules_proto_vehicle_dark.bin differ
diff --git a/data/drules_proto_vehicle_dark.txt b/data/drules_proto_vehicle_dark.txt
index 133d6dcd16..88e93acb78 100644
--- a/data/drules_proto_vehicle_dark.txt
+++ b/data/drules_proto_vehicle_dark.txt
@@ -8567,6 +8567,57 @@ cont {
     }
   }
 }
+cont {
+  name: "emergency-emergency_ward_entrance"
+  element {
+    scale: 18
+    symbol {
+      name: "entrance-emergency-s"
+      priority: 500
+    }
+    caption {
+      primary {
+        height: 13
+        color: 7566195
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9500
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "entrance-emergency-s"
+      priority: 500
+    }
+    caption {
+      primary {
+        height: 13
+        color: 7566195
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9500
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "entrance-emergency-s"
+      priority: 500
+    }
+    caption {
+      primary {
+        height: 13
+        color: 7566195
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9500
+    }
+  }
+}
 cont {
   name: "entrance"
   element {
@@ -8619,7 +8670,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "exit-s"
+      name: "entrance-exit-s"
       priority: -10000
     }
     caption {
@@ -8641,7 +8692,7 @@ cont {
   element {
     scale: 20
     symbol {
-      name: "exit-s"
+      name: "entrance-exit-s"
       priority: -10000
     }
     caption {
@@ -8666,7 +8717,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "main_entrance-s"
+      name: "entrance-main-s"
       priority: 20
     }
     caption {
@@ -8688,7 +8739,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "main_entrance-s"
+      name: "entrance-main-s"
       priority: 20
     }
     caption {
@@ -8710,7 +8761,7 @@ cont {
   element {
     scale: 20
     symbol {
-      name: "main_entrance-s"
+      name: "entrance-main-s"
       priority: 20
     }
     caption {
diff --git a/data/drules_proto_vehicle_light.bin b/data/drules_proto_vehicle_light.bin
index efacfc10b6..2e05657bc5 100644
Binary files a/data/drules_proto_vehicle_light.bin and b/data/drules_proto_vehicle_light.bin differ
diff --git a/data/drules_proto_vehicle_light.txt b/data/drules_proto_vehicle_light.txt
index 9420910052..9ee6e3fb46 100644
--- a/data/drules_proto_vehicle_light.txt
+++ b/data/drules_proto_vehicle_light.txt
@@ -8567,6 +8567,57 @@ cont {
     }
   }
 }
+cont {
+  name: "emergency-emergency_ward_entrance"
+  element {
+    scale: 18
+    symbol {
+      name: "entrance-emergency-s"
+      priority: 500
+    }
+    caption {
+      primary {
+        height: 13
+        color: 6381914
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9500
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "entrance-emergency-s"
+      priority: 500
+    }
+    caption {
+      primary {
+        height: 13
+        color: 6381914
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9500
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "entrance-emergency-s"
+      priority: 500
+    }
+    caption {
+      primary {
+        height: 13
+        color: 6381914
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9500
+    }
+  }
+}
 cont {
   name: "entrance"
   element {
@@ -8619,7 +8670,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "exit-s"
+      name: "entrance-exit-s"
       priority: -10000
     }
     caption {
@@ -8641,7 +8692,7 @@ cont {
   element {
     scale: 20
     symbol {
-      name: "exit-s"
+      name: "entrance-exit-s"
       priority: -10000
     }
     caption {
@@ -8666,7 +8717,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "main_entrance-s"
+      name: "entrance-main-s"
       priority: 20
     }
     caption {
@@ -8688,7 +8739,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "main_entrance-s"
+      name: "entrance-main-s"
       priority: 20
     }
     caption {
@@ -8710,7 +8761,7 @@ cont {
   element {
     scale: 20
     symbol {
-      name: "main_entrance-s"
+      name: "entrance-main-s"
       priority: 20
     }
     caption {
diff --git a/data/resources-6plus_dark/symbols.png b/data/resources-6plus_dark/symbols.png
index 1a8daa6500..3c8010d527 100644
Binary files a/data/resources-6plus_dark/symbols.png and b/data/resources-6plus_dark/symbols.png differ
diff --git a/data/resources-6plus_dark/symbols.sdf b/data/resources-6plus_dark/symbols.sdf
index edb24c92ef..2f42b2a967 100644
--- a/data/resources-6plus_dark/symbols.sdf
+++ b/data/resources-6plus_dark/symbols.sdf
@@ -733,44 +733,45 @@
   <symbol maxX="562" maxY="1238" minX="531" minY="1207" name="star-l"/>
   <symbol maxX="593" maxY="1238" minX="562" minY="1207" name="speedcam-s"/>
   <symbol maxX="642" maxY="1238" minX="593" minY="1207" name="railway-crossing-l"/>
-  <symbol maxX="676" maxY="1238" minX="642" minY="1207" name="main_entrance-s"/>
-  <symbol maxX="707" maxY="1238" minX="676" minY="1207" name="gate-s"/>
-  <symbol maxX="753" maxY="1238" minX="707" minY="1207" name="ford-m"/>
-  <symbol maxX="781" maxY="1238" minX="753" minY="1207" name="exit-s"/>
-  <symbol maxX="800" maxY="1238" minX="781" minY="1207" name="entrance-s"/>
-  <symbol maxX="831" maxY="1238" minX="800" minY="1207" name="cycle_barrier-s"/>
-  <symbol maxX="871" maxY="1238" minX="831" minY="1207" name="cave-m"/>
-  <symbol maxX="908" maxY="1238" minX="871" minY="1207" name="bench"/>
-  <symbol maxX="927" maxY="1238" minX="908" minY="1207" name="barrier-entrance-s"/>
-  <symbol maxX="961" maxY="1235" minX="927" minY="1207" name="volcano-m"/>
-  <symbol maxX="1007" maxY="1235" minX="961" minY="1207" name="subway-minsk-m"/>
-  <symbol maxX="1062" maxY="1235" minX="1007" minY="1207" name="subway-malaga-s"/>
-  <symbol maxX="1120" maxY="1235" minX="1062" minY="1207" name="subway-malaga-m"/>
-  <symbol maxX="1163" maxY="1235" minX="1120" minY="1207" name="subway-kolkata-s"/>
-  <symbol maxX="1209" maxY="1235" minX="1163" minY="1207" name="subway-kiev-s"/>
-  <symbol maxX="1267" maxY="1235" minX="1209" minY="1207" name="subway-edmonton-m"/>
-  <symbol maxX="1322" maxY="1235" minX="1267" minY="1207" name="subway-baku-s"/>
-  <symbol maxX="1350" maxY="1235" minX="1322" minY="1207" name="star-m"/>
-  <symbol maxX="1393" maxY="1235" minX="1350" minY="1207" name="railway-crossing-m"/>
-  <symbol maxX="1424" maxY="1235" minX="1393" minY="1207" name="plaque"/>
-  <symbol maxX="1470" maxY="1232" minX="1424" minY="1207" name="subway-taipei-s"/>
-  <symbol maxX="1513" maxY="1232" minX="1470" minY="1207" name="subway-minsk-s"/>
-  <symbol maxX="1571" maxY="1232" minX="1513" minY="1207" name="subway-chongqing-s"/>
-  <symbol maxX="1629" maxY="1232" minX="1571" minY="1207" name="subway-baku-m"/>
-  <symbol maxX="1654" maxY="1232" minX="1629" minY="1207" name="star-s"/>
-  <symbol maxX="1679" maxY="1229" minX="1654" minY="1207" name="volcano-s"/>
-  <symbol maxX="1737" maxY="1229" minX="1679" minY="1207" name="subway-chongqing-m"/>
-  <symbol maxX="1759" maxY="1229" minX="1737" minY="1207" name="power-tower-m"/>
-  <symbol maxX="1784" maxY="1229" minX="1759" minY="1207" name="peakt-m"/>
-  <symbol maxX="1815" maxY="1229" minX="1784" minY="1207" name="cave-s"/>
-  <symbol maxX="1867" maxY="1229" minX="1815" minY="1207" name="arrow-m"/>
-  <symbol maxX="1886" maxY="1226" minX="1867" minY="1207" name="zero-icon"/>
-  <symbol maxX="1905" maxY="1226" minX="1886" minY="1207" name="peakt-s"/>
-  <symbol maxX="1933" maxY="1223" minX="1905" minY="1207" name="mountain-pass-m"/>
-  <symbol maxX="1949" maxY="1223" minX="1933" minY="1207" name="mast-m"/>
-  <symbol maxX="1965" maxY="1223" minX="1949" minY="1207" name="dot-m"/>
-  <symbol maxX="2002" maxY="1223" minX="1965" minY="1207" name="arrow-s"/>
-  <symbol maxX="2021" maxY="1220" minX="2002" minY="1207" name="mountain-pass-s"/>
-  <symbol maxX="2046" maxY="1217" minX="2021" minY="1207" name="arrow-xs"/>
+  <symbol maxX="673" maxY="1238" minX="642" minY="1207" name="gate-s"/>
+  <symbol maxX="719" maxY="1238" minX="673" minY="1207" name="ford-m"/>
+  <symbol maxX="741" maxY="1238" minX="719" minY="1207" name="entrance-s"/>
+  <symbol maxX="778" maxY="1238" minX="741" minY="1207" name="entrance-main-s"/>
+  <symbol maxX="809" maxY="1238" minX="778" minY="1207" name="entrance-exit-s"/>
+  <symbol maxX="846" maxY="1238" minX="809" minY="1207" name="entrance-emergency-s"/>
+  <symbol maxX="868" maxY="1238" minX="846" minY="1207" name="entrance-barrier-s"/>
+  <symbol maxX="899" maxY="1238" minX="868" minY="1207" name="cycle_barrier-s"/>
+  <symbol maxX="939" maxY="1238" minX="899" minY="1207" name="cave-m"/>
+  <symbol maxX="976" maxY="1238" minX="939" minY="1207" name="bench"/>
+  <symbol maxX="1010" maxY="1235" minX="976" minY="1207" name="volcano-m"/>
+  <symbol maxX="1056" maxY="1235" minX="1010" minY="1207" name="subway-minsk-m"/>
+  <symbol maxX="1111" maxY="1235" minX="1056" minY="1207" name="subway-malaga-s"/>
+  <symbol maxX="1169" maxY="1235" minX="1111" minY="1207" name="subway-malaga-m"/>
+  <symbol maxX="1212" maxY="1235" minX="1169" minY="1207" name="subway-kolkata-s"/>
+  <symbol maxX="1258" maxY="1235" minX="1212" minY="1207" name="subway-kiev-s"/>
+  <symbol maxX="1316" maxY="1235" minX="1258" minY="1207" name="subway-edmonton-m"/>
+  <symbol maxX="1371" maxY="1235" minX="1316" minY="1207" name="subway-baku-s"/>
+  <symbol maxX="1399" maxY="1235" minX="1371" minY="1207" name="star-m"/>
+  <symbol maxX="1442" maxY="1235" minX="1399" minY="1207" name="railway-crossing-m"/>
+  <symbol maxX="1473" maxY="1235" minX="1442" minY="1207" name="plaque"/>
+  <symbol maxX="1519" maxY="1232" minX="1473" minY="1207" name="subway-taipei-s"/>
+  <symbol maxX="1562" maxY="1232" minX="1519" minY="1207" name="subway-minsk-s"/>
+  <symbol maxX="1620" maxY="1232" minX="1562" minY="1207" name="subway-chongqing-s"/>
+  <symbol maxX="1678" maxY="1232" minX="1620" minY="1207" name="subway-baku-m"/>
+  <symbol maxX="1703" maxY="1232" minX="1678" minY="1207" name="star-s"/>
+  <symbol maxX="1728" maxY="1229" minX="1703" minY="1207" name="volcano-s"/>
+  <symbol maxX="1786" maxY="1229" minX="1728" minY="1207" name="subway-chongqing-m"/>
+  <symbol maxX="1808" maxY="1229" minX="1786" minY="1207" name="power-tower-m"/>
+  <symbol maxX="1833" maxY="1229" minX="1808" minY="1207" name="peakt-m"/>
+  <symbol maxX="1864" maxY="1229" minX="1833" minY="1207" name="cave-s"/>
+  <symbol maxX="1916" maxY="1229" minX="1864" minY="1207" name="arrow-m"/>
+  <symbol maxX="1935" maxY="1226" minX="1916" minY="1207" name="zero-icon"/>
+  <symbol maxX="1954" maxY="1226" minX="1935" minY="1207" name="peakt-s"/>
+  <symbol maxX="1982" maxY="1223" minX="1954" minY="1207" name="mountain-pass-m"/>
+  <symbol maxX="1998" maxY="1223" minX="1982" minY="1207" name="mast-m"/>
+  <symbol maxX="2014" maxY="1223" minX="1998" minY="1207" name="dot-m"/>
+  <symbol maxX="37" maxY="1257" minX="0" minY="1241" name="arrow-s"/>
+  <symbol maxX="56" maxY="1254" minX="37" minY="1241" name="mountain-pass-s"/>
+  <symbol maxX="81" maxY="1251" minX="56" minY="1241" name="arrow-xs"/>
  </file>
 </root>
diff --git a/data/resources-6plus_light/symbols.png b/data/resources-6plus_light/symbols.png
index f65bc96f15..48be2e0bdb 100644
Binary files a/data/resources-6plus_light/symbols.png and b/data/resources-6plus_light/symbols.png differ
diff --git a/data/resources-6plus_light/symbols.sdf b/data/resources-6plus_light/symbols.sdf
index 49cfd07c43..978c6ea221 100644
--- a/data/resources-6plus_light/symbols.sdf
+++ b/data/resources-6plus_light/symbols.sdf
@@ -733,44 +733,45 @@
   <symbol maxX="562" maxY="1238" minX="531" minY="1207" name="star-l"/>
   <symbol maxX="593" maxY="1238" minX="562" minY="1207" name="speedcam-s"/>
   <symbol maxX="642" maxY="1238" minX="593" minY="1207" name="railway-crossing-l"/>
-  <symbol maxX="676" maxY="1238" minX="642" minY="1207" name="main_entrance-s"/>
-  <symbol maxX="707" maxY="1238" minX="676" minY="1207" name="gate-s"/>
-  <symbol maxX="753" maxY="1238" minX="707" minY="1207" name="ford-m"/>
-  <symbol maxX="781" maxY="1238" minX="753" minY="1207" name="exit-s"/>
-  <symbol maxX="800" maxY="1238" minX="781" minY="1207" name="entrance-s"/>
-  <symbol maxX="831" maxY="1238" minX="800" minY="1207" name="cycle_barrier-s"/>
-  <symbol maxX="871" maxY="1238" minX="831" minY="1207" name="cave-m"/>
-  <symbol maxX="908" maxY="1238" minX="871" minY="1207" name="bench"/>
-  <symbol maxX="927" maxY="1238" minX="908" minY="1207" name="barrier-entrance-s"/>
-  <symbol maxX="961" maxY="1235" minX="927" minY="1207" name="volcano-m"/>
-  <symbol maxX="1007" maxY="1235" minX="961" minY="1207" name="subway-minsk-m"/>
-  <symbol maxX="1062" maxY="1235" minX="1007" minY="1207" name="subway-malaga-s"/>
-  <symbol maxX="1120" maxY="1235" minX="1062" minY="1207" name="subway-malaga-m"/>
-  <symbol maxX="1163" maxY="1235" minX="1120" minY="1207" name="subway-kolkata-s"/>
-  <symbol maxX="1209" maxY="1235" minX="1163" minY="1207" name="subway-kiev-s"/>
-  <symbol maxX="1267" maxY="1235" minX="1209" minY="1207" name="subway-edmonton-m"/>
-  <symbol maxX="1322" maxY="1235" minX="1267" minY="1207" name="subway-baku-s"/>
-  <symbol maxX="1350" maxY="1235" minX="1322" minY="1207" name="star-m"/>
-  <symbol maxX="1393" maxY="1235" minX="1350" minY="1207" name="railway-crossing-m"/>
-  <symbol maxX="1424" maxY="1235" minX="1393" minY="1207" name="plaque"/>
-  <symbol maxX="1470" maxY="1232" minX="1424" minY="1207" name="subway-taipei-s"/>
-  <symbol maxX="1513" maxY="1232" minX="1470" minY="1207" name="subway-minsk-s"/>
-  <symbol maxX="1571" maxY="1232" minX="1513" minY="1207" name="subway-chongqing-s"/>
-  <symbol maxX="1629" maxY="1232" minX="1571" minY="1207" name="subway-baku-m"/>
-  <symbol maxX="1654" maxY="1232" minX="1629" minY="1207" name="star-s"/>
-  <symbol maxX="1679" maxY="1229" minX="1654" minY="1207" name="volcano-s"/>
-  <symbol maxX="1737" maxY="1229" minX="1679" minY="1207" name="subway-chongqing-m"/>
-  <symbol maxX="1759" maxY="1229" minX="1737" minY="1207" name="power-tower-m"/>
-  <symbol maxX="1784" maxY="1229" minX="1759" minY="1207" name="peakt-m"/>
-  <symbol maxX="1815" maxY="1229" minX="1784" minY="1207" name="cave-s"/>
-  <symbol maxX="1867" maxY="1229" minX="1815" minY="1207" name="arrow-m"/>
-  <symbol maxX="1886" maxY="1226" minX="1867" minY="1207" name="zero-icon"/>
-  <symbol maxX="1905" maxY="1226" minX="1886" minY="1207" name="peakt-s"/>
-  <symbol maxX="1933" maxY="1223" minX="1905" minY="1207" name="mountain-pass-m"/>
-  <symbol maxX="1949" maxY="1223" minX="1933" minY="1207" name="mast-m"/>
-  <symbol maxX="1965" maxY="1223" minX="1949" minY="1207" name="dot-m"/>
-  <symbol maxX="2002" maxY="1223" minX="1965" minY="1207" name="arrow-s"/>
-  <symbol maxX="2021" maxY="1220" minX="2002" minY="1207" name="mountain-pass-s"/>
-  <symbol maxX="2046" maxY="1217" minX="2021" minY="1207" name="arrow-xs"/>
+  <symbol maxX="673" maxY="1238" minX="642" minY="1207" name="gate-s"/>
+  <symbol maxX="719" maxY="1238" minX="673" minY="1207" name="ford-m"/>
+  <symbol maxX="741" maxY="1238" minX="719" minY="1207" name="entrance-s"/>
+  <symbol maxX="778" maxY="1238" minX="741" minY="1207" name="entrance-main-s"/>
+  <symbol maxX="809" maxY="1238" minX="778" minY="1207" name="entrance-exit-s"/>
+  <symbol maxX="846" maxY="1238" minX="809" minY="1207" name="entrance-emergency-s"/>
+  <symbol maxX="868" maxY="1238" minX="846" minY="1207" name="entrance-barrier-s"/>
+  <symbol maxX="899" maxY="1238" minX="868" minY="1207" name="cycle_barrier-s"/>
+  <symbol maxX="939" maxY="1238" minX="899" minY="1207" name="cave-m"/>
+  <symbol maxX="976" maxY="1238" minX="939" minY="1207" name="bench"/>
+  <symbol maxX="1010" maxY="1235" minX="976" minY="1207" name="volcano-m"/>
+  <symbol maxX="1056" maxY="1235" minX="1010" minY="1207" name="subway-minsk-m"/>
+  <symbol maxX="1111" maxY="1235" minX="1056" minY="1207" name="subway-malaga-s"/>
+  <symbol maxX="1169" maxY="1235" minX="1111" minY="1207" name="subway-malaga-m"/>
+  <symbol maxX="1212" maxY="1235" minX="1169" minY="1207" name="subway-kolkata-s"/>
+  <symbol maxX="1258" maxY="1235" minX="1212" minY="1207" name="subway-kiev-s"/>
+  <symbol maxX="1316" maxY="1235" minX="1258" minY="1207" name="subway-edmonton-m"/>
+  <symbol maxX="1371" maxY="1235" minX="1316" minY="1207" name="subway-baku-s"/>
+  <symbol maxX="1399" maxY="1235" minX="1371" minY="1207" name="star-m"/>
+  <symbol maxX="1442" maxY="1235" minX="1399" minY="1207" name="railway-crossing-m"/>
+  <symbol maxX="1473" maxY="1235" minX="1442" minY="1207" name="plaque"/>
+  <symbol maxX="1519" maxY="1232" minX="1473" minY="1207" name="subway-taipei-s"/>
+  <symbol maxX="1562" maxY="1232" minX="1519" minY="1207" name="subway-minsk-s"/>
+  <symbol maxX="1620" maxY="1232" minX="1562" minY="1207" name="subway-chongqing-s"/>
+  <symbol maxX="1678" maxY="1232" minX="1620" minY="1207" name="subway-baku-m"/>
+  <symbol maxX="1703" maxY="1232" minX="1678" minY="1207" name="star-s"/>
+  <symbol maxX="1728" maxY="1229" minX="1703" minY="1207" name="volcano-s"/>
+  <symbol maxX="1786" maxY="1229" minX="1728" minY="1207" name="subway-chongqing-m"/>
+  <symbol maxX="1808" maxY="1229" minX="1786" minY="1207" name="power-tower-m"/>
+  <symbol maxX="1833" maxY="1229" minX="1808" minY="1207" name="peakt-m"/>
+  <symbol maxX="1864" maxY="1229" minX="1833" minY="1207" name="cave-s"/>
+  <symbol maxX="1916" maxY="1229" minX="1864" minY="1207" name="arrow-m"/>
+  <symbol maxX="1935" maxY="1226" minX="1916" minY="1207" name="zero-icon"/>
+  <symbol maxX="1954" maxY="1226" minX="1935" minY="1207" name="peakt-s"/>
+  <symbol maxX="1982" maxY="1223" minX="1954" minY="1207" name="mountain-pass-m"/>
+  <symbol maxX="1998" maxY="1223" minX="1982" minY="1207" name="mast-m"/>
+  <symbol maxX="2014" maxY="1223" minX="1998" minY="1207" name="dot-m"/>
+  <symbol maxX="37" maxY="1257" minX="0" minY="1241" name="arrow-s"/>
+  <symbol maxX="56" maxY="1254" minX="37" minY="1241" name="mountain-pass-s"/>
+  <symbol maxX="81" maxY="1251" minX="56" minY="1241" name="arrow-xs"/>
  </file>
 </root>
diff --git a/data/resources-hdpi_dark/symbols.png b/data/resources-hdpi_dark/symbols.png
index 78bab5021b..4437cb57ee 100644
Binary files a/data/resources-hdpi_dark/symbols.png and b/data/resources-hdpi_dark/symbols.png differ
diff --git a/data/resources-hdpi_dark/symbols.sdf b/data/resources-hdpi_dark/symbols.sdf
index 53ae759f58..6a3252bb15 100644
--- a/data/resources-hdpi_dark/symbols.sdf
+++ b/data/resources-hdpi_dark/symbols.sdf
@@ -733,44 +733,45 @@
   <symbol maxX="740" maxY="796" minX="722" minY="778" name="star-l"/>
   <symbol maxX="758" maxY="796" minX="740" minY="778" name="speedcam-s"/>
   <symbol maxX="785" maxY="796" minX="758" minY="778" name="railway-crossing-l"/>
-  <symbol maxX="804" maxY="796" minX="785" minY="778" name="main_entrance-s"/>
-  <symbol maxX="822" maxY="796" minX="804" minY="778" name="gate-s"/>
-  <symbol maxX="847" maxY="796" minX="822" minY="778" name="ford-m"/>
-  <symbol maxX="863" maxY="796" minX="847" minY="778" name="exit-s"/>
-  <symbol maxX="875" maxY="796" minX="863" minY="778" name="entrance-s"/>
-  <symbol maxX="893" maxY="796" minX="875" minY="778" name="cycle_barrier-s"/>
-  <symbol maxX="915" maxY="796" minX="893" minY="778" name="cave-m"/>
-  <symbol maxX="936" maxY="796" minX="915" minY="778" name="bench"/>
-  <symbol maxX="948" maxY="796" minX="936" minY="778" name="barrier-entrance-s"/>
-  <symbol maxX="967" maxY="794" minX="948" minY="778" name="volcano-m"/>
-  <symbol maxX="992" maxY="794" minX="967" minY="778" name="subway-minsk-m"/>
-  <symbol maxX="1022" maxY="794" minX="992" minY="778" name="subway-malaga-s"/>
-  <symbol maxX="31" maxY="815" minX="0" minY="799" name="subway-malaga-m"/>
-  <symbol maxX="55" maxY="815" minX="31" minY="799" name="subway-kolkata-s"/>
-  <symbol maxX="80" maxY="815" minX="55" minY="799" name="subway-kiev-s"/>
-  <symbol maxX="111" maxY="815" minX="80" minY="799" name="subway-edmonton-m"/>
-  <symbol maxX="141" maxY="815" minX="111" minY="799" name="subway-baku-s"/>
-  <symbol maxX="157" maxY="815" minX="141" minY="799" name="star-m"/>
-  <symbol maxX="181" maxY="815" minX="157" minY="799" name="railway-crossing-m"/>
-  <symbol maxX="199" maxY="815" minX="181" minY="799" name="plaque"/>
-  <symbol maxX="224" maxY="814" minX="199" minY="799" name="subway-taipei-s"/>
-  <symbol maxX="248" maxY="814" minX="224" minY="799" name="subway-minsk-s"/>
-  <symbol maxX="279" maxY="814" minX="248" minY="799" name="subway-chongqing-s"/>
-  <symbol maxX="310" maxY="814" minX="279" minY="799" name="subway-baku-m"/>
-  <symbol maxX="325" maxY="814" minX="310" minY="799" name="star-s"/>
-  <symbol maxX="340" maxY="812" minX="325" minY="799" name="volcano-s"/>
-  <symbol maxX="371" maxY="812" minX="340" minY="799" name="subway-chongqing-m"/>
-  <symbol maxX="384" maxY="812" minX="371" minY="799" name="power-tower-m"/>
-  <symbol maxX="399" maxY="812" minX="384" minY="799" name="peakt-m"/>
-  <symbol maxX="417" maxY="812" minX="399" minY="799" name="cave-s"/>
-  <symbol maxX="445" maxY="812" minX="417" minY="799" name="arrow-m"/>
-  <symbol maxX="457" maxY="811" minX="445" minY="799" name="zero-icon"/>
-  <symbol maxX="469" maxY="811" minX="457" minY="799" name="peakt-s"/>
-  <symbol maxX="485" maxY="809" minX="469" minY="799" name="mountain-pass-m"/>
-  <symbol maxX="495" maxY="809" minX="485" minY="799" name="mast-m"/>
-  <symbol maxX="505" maxY="809" minX="495" minY="799" name="dot-m"/>
-  <symbol maxX="526" maxY="809" minX="505" minY="799" name="arrow-s"/>
-  <symbol maxX="538" maxY="808" minX="526" minY="799" name="mountain-pass-s"/>
-  <symbol maxX="553" maxY="806" minX="538" minY="799" name="arrow-xs"/>
+  <symbol maxX="803" maxY="796" minX="785" minY="778" name="gate-s"/>
+  <symbol maxX="828" maxY="796" minX="803" minY="778" name="ford-m"/>
+  <symbol maxX="841" maxY="796" minX="828" minY="778" name="entrance-s"/>
+  <symbol maxX="862" maxY="796" minX="841" minY="778" name="entrance-main-s"/>
+  <symbol maxX="880" maxY="796" minX="862" minY="778" name="entrance-exit-s"/>
+  <symbol maxX="901" maxY="796" minX="880" minY="778" name="entrance-emergency-s"/>
+  <symbol maxX="914" maxY="796" minX="901" minY="778" name="entrance-barrier-s"/>
+  <symbol maxX="932" maxY="796" minX="914" minY="778" name="cycle_barrier-s"/>
+  <symbol maxX="954" maxY="796" minX="932" minY="778" name="cave-m"/>
+  <symbol maxX="975" maxY="796" minX="954" minY="778" name="bench"/>
+  <symbol maxX="994" maxY="794" minX="975" minY="778" name="volcano-m"/>
+  <symbol maxX="1019" maxY="794" minX="994" minY="778" name="subway-minsk-m"/>
+  <symbol maxX="30" maxY="815" minX="0" minY="799" name="subway-malaga-s"/>
+  <symbol maxX="61" maxY="815" minX="30" minY="799" name="subway-malaga-m"/>
+  <symbol maxX="85" maxY="815" minX="61" minY="799" name="subway-kolkata-s"/>
+  <symbol maxX="110" maxY="815" minX="85" minY="799" name="subway-kiev-s"/>
+  <symbol maxX="141" maxY="815" minX="110" minY="799" name="subway-edmonton-m"/>
+  <symbol maxX="171" maxY="815" minX="141" minY="799" name="subway-baku-s"/>
+  <symbol maxX="187" maxY="815" minX="171" minY="799" name="star-m"/>
+  <symbol maxX="211" maxY="815" minX="187" minY="799" name="railway-crossing-m"/>
+  <symbol maxX="229" maxY="815" minX="211" minY="799" name="plaque"/>
+  <symbol maxX="254" maxY="814" minX="229" minY="799" name="subway-taipei-s"/>
+  <symbol maxX="278" maxY="814" minX="254" minY="799" name="subway-minsk-s"/>
+  <symbol maxX="309" maxY="814" minX="278" minY="799" name="subway-chongqing-s"/>
+  <symbol maxX="340" maxY="814" minX="309" minY="799" name="subway-baku-m"/>
+  <symbol maxX="355" maxY="814" minX="340" minY="799" name="star-s"/>
+  <symbol maxX="370" maxY="812" minX="355" minY="799" name="volcano-s"/>
+  <symbol maxX="401" maxY="812" minX="370" minY="799" name="subway-chongqing-m"/>
+  <symbol maxX="414" maxY="812" minX="401" minY="799" name="power-tower-m"/>
+  <symbol maxX="429" maxY="812" minX="414" minY="799" name="peakt-m"/>
+  <symbol maxX="447" maxY="812" minX="429" minY="799" name="cave-s"/>
+  <symbol maxX="475" maxY="812" minX="447" minY="799" name="arrow-m"/>
+  <symbol maxX="487" maxY="811" minX="475" minY="799" name="zero-icon"/>
+  <symbol maxX="499" maxY="811" minX="487" minY="799" name="peakt-s"/>
+  <symbol maxX="515" maxY="809" minX="499" minY="799" name="mountain-pass-m"/>
+  <symbol maxX="525" maxY="809" minX="515" minY="799" name="mast-m"/>
+  <symbol maxX="535" maxY="809" minX="525" minY="799" name="dot-m"/>
+  <symbol maxX="556" maxY="809" minX="535" minY="799" name="arrow-s"/>
+  <symbol maxX="568" maxY="808" minX="556" minY="799" name="mountain-pass-s"/>
+  <symbol maxX="583" maxY="806" minX="568" minY="799" name="arrow-xs"/>
  </file>
 </root>
diff --git a/data/resources-hdpi_light/symbols.png b/data/resources-hdpi_light/symbols.png
index 41bfad413a..486f2454d8 100644
Binary files a/data/resources-hdpi_light/symbols.png and b/data/resources-hdpi_light/symbols.png differ
diff --git a/data/resources-hdpi_light/symbols.sdf b/data/resources-hdpi_light/symbols.sdf
index 53ae759f58..6a3252bb15 100644
--- a/data/resources-hdpi_light/symbols.sdf
+++ b/data/resources-hdpi_light/symbols.sdf
@@ -733,44 +733,45 @@
   <symbol maxX="740" maxY="796" minX="722" minY="778" name="star-l"/>
   <symbol maxX="758" maxY="796" minX="740" minY="778" name="speedcam-s"/>
   <symbol maxX="785" maxY="796" minX="758" minY="778" name="railway-crossing-l"/>
-  <symbol maxX="804" maxY="796" minX="785" minY="778" name="main_entrance-s"/>
-  <symbol maxX="822" maxY="796" minX="804" minY="778" name="gate-s"/>
-  <symbol maxX="847" maxY="796" minX="822" minY="778" name="ford-m"/>
-  <symbol maxX="863" maxY="796" minX="847" minY="778" name="exit-s"/>
-  <symbol maxX="875" maxY="796" minX="863" minY="778" name="entrance-s"/>
-  <symbol maxX="893" maxY="796" minX="875" minY="778" name="cycle_barrier-s"/>
-  <symbol maxX="915" maxY="796" minX="893" minY="778" name="cave-m"/>
-  <symbol maxX="936" maxY="796" minX="915" minY="778" name="bench"/>
-  <symbol maxX="948" maxY="796" minX="936" minY="778" name="barrier-entrance-s"/>
-  <symbol maxX="967" maxY="794" minX="948" minY="778" name="volcano-m"/>
-  <symbol maxX="992" maxY="794" minX="967" minY="778" name="subway-minsk-m"/>
-  <symbol maxX="1022" maxY="794" minX="992" minY="778" name="subway-malaga-s"/>
-  <symbol maxX="31" maxY="815" minX="0" minY="799" name="subway-malaga-m"/>
-  <symbol maxX="55" maxY="815" minX="31" minY="799" name="subway-kolkata-s"/>
-  <symbol maxX="80" maxY="815" minX="55" minY="799" name="subway-kiev-s"/>
-  <symbol maxX="111" maxY="815" minX="80" minY="799" name="subway-edmonton-m"/>
-  <symbol maxX="141" maxY="815" minX="111" minY="799" name="subway-baku-s"/>
-  <symbol maxX="157" maxY="815" minX="141" minY="799" name="star-m"/>
-  <symbol maxX="181" maxY="815" minX="157" minY="799" name="railway-crossing-m"/>
-  <symbol maxX="199" maxY="815" minX="181" minY="799" name="plaque"/>
-  <symbol maxX="224" maxY="814" minX="199" minY="799" name="subway-taipei-s"/>
-  <symbol maxX="248" maxY="814" minX="224" minY="799" name="subway-minsk-s"/>
-  <symbol maxX="279" maxY="814" minX="248" minY="799" name="subway-chongqing-s"/>
-  <symbol maxX="310" maxY="814" minX="279" minY="799" name="subway-baku-m"/>
-  <symbol maxX="325" maxY="814" minX="310" minY="799" name="star-s"/>
-  <symbol maxX="340" maxY="812" minX="325" minY="799" name="volcano-s"/>
-  <symbol maxX="371" maxY="812" minX="340" minY="799" name="subway-chongqing-m"/>
-  <symbol maxX="384" maxY="812" minX="371" minY="799" name="power-tower-m"/>
-  <symbol maxX="399" maxY="812" minX="384" minY="799" name="peakt-m"/>
-  <symbol maxX="417" maxY="812" minX="399" minY="799" name="cave-s"/>
-  <symbol maxX="445" maxY="812" minX="417" minY="799" name="arrow-m"/>
-  <symbol maxX="457" maxY="811" minX="445" minY="799" name="zero-icon"/>
-  <symbol maxX="469" maxY="811" minX="457" minY="799" name="peakt-s"/>
-  <symbol maxX="485" maxY="809" minX="469" minY="799" name="mountain-pass-m"/>
-  <symbol maxX="495" maxY="809" minX="485" minY="799" name="mast-m"/>
-  <symbol maxX="505" maxY="809" minX="495" minY="799" name="dot-m"/>
-  <symbol maxX="526" maxY="809" minX="505" minY="799" name="arrow-s"/>
-  <symbol maxX="538" maxY="808" minX="526" minY="799" name="mountain-pass-s"/>
-  <symbol maxX="553" maxY="806" minX="538" minY="799" name="arrow-xs"/>
+  <symbol maxX="803" maxY="796" minX="785" minY="778" name="gate-s"/>
+  <symbol maxX="828" maxY="796" minX="803" minY="778" name="ford-m"/>
+  <symbol maxX="841" maxY="796" minX="828" minY="778" name="entrance-s"/>
+  <symbol maxX="862" maxY="796" minX="841" minY="778" name="entrance-main-s"/>
+  <symbol maxX="880" maxY="796" minX="862" minY="778" name="entrance-exit-s"/>
+  <symbol maxX="901" maxY="796" minX="880" minY="778" name="entrance-emergency-s"/>
+  <symbol maxX="914" maxY="796" minX="901" minY="778" name="entrance-barrier-s"/>
+  <symbol maxX="932" maxY="796" minX="914" minY="778" name="cycle_barrier-s"/>
+  <symbol maxX="954" maxY="796" minX="932" minY="778" name="cave-m"/>
+  <symbol maxX="975" maxY="796" minX="954" minY="778" name="bench"/>
+  <symbol maxX="994" maxY="794" minX="975" minY="778" name="volcano-m"/>
+  <symbol maxX="1019" maxY="794" minX="994" minY="778" name="subway-minsk-m"/>
+  <symbol maxX="30" maxY="815" minX="0" minY="799" name="subway-malaga-s"/>
+  <symbol maxX="61" maxY="815" minX="30" minY="799" name="subway-malaga-m"/>
+  <symbol maxX="85" maxY="815" minX="61" minY="799" name="subway-kolkata-s"/>
+  <symbol maxX="110" maxY="815" minX="85" minY="799" name="subway-kiev-s"/>
+  <symbol maxX="141" maxY="815" minX="110" minY="799" name="subway-edmonton-m"/>
+  <symbol maxX="171" maxY="815" minX="141" minY="799" name="subway-baku-s"/>
+  <symbol maxX="187" maxY="815" minX="171" minY="799" name="star-m"/>
+  <symbol maxX="211" maxY="815" minX="187" minY="799" name="railway-crossing-m"/>
+  <symbol maxX="229" maxY="815" minX="211" minY="799" name="plaque"/>
+  <symbol maxX="254" maxY="814" minX="229" minY="799" name="subway-taipei-s"/>
+  <symbol maxX="278" maxY="814" minX="254" minY="799" name="subway-minsk-s"/>
+  <symbol maxX="309" maxY="814" minX="278" minY="799" name="subway-chongqing-s"/>
+  <symbol maxX="340" maxY="814" minX="309" minY="799" name="subway-baku-m"/>
+  <symbol maxX="355" maxY="814" minX="340" minY="799" name="star-s"/>
+  <symbol maxX="370" maxY="812" minX="355" minY="799" name="volcano-s"/>
+  <symbol maxX="401" maxY="812" minX="370" minY="799" name="subway-chongqing-m"/>
+  <symbol maxX="414" maxY="812" minX="401" minY="799" name="power-tower-m"/>
+  <symbol maxX="429" maxY="812" minX="414" minY="799" name="peakt-m"/>
+  <symbol maxX="447" maxY="812" minX="429" minY="799" name="cave-s"/>
+  <symbol maxX="475" maxY="812" minX="447" minY="799" name="arrow-m"/>
+  <symbol maxX="487" maxY="811" minX="475" minY="799" name="zero-icon"/>
+  <symbol maxX="499" maxY="811" minX="487" minY="799" name="peakt-s"/>
+  <symbol maxX="515" maxY="809" minX="499" minY="799" name="mountain-pass-m"/>
+  <symbol maxX="525" maxY="809" minX="515" minY="799" name="mast-m"/>
+  <symbol maxX="535" maxY="809" minX="525" minY="799" name="dot-m"/>
+  <symbol maxX="556" maxY="809" minX="535" minY="799" name="arrow-s"/>
+  <symbol maxX="568" maxY="808" minX="556" minY="799" name="mountain-pass-s"/>
+  <symbol maxX="583" maxY="806" minX="568" minY="799" name="arrow-xs"/>
  </file>
 </root>
diff --git a/data/resources-mdpi_dark/symbols.png b/data/resources-mdpi_dark/symbols.png
index e084dcd767..0901eeb5db 100644
Binary files a/data/resources-mdpi_dark/symbols.png and b/data/resources-mdpi_dark/symbols.png differ
diff --git a/data/resources-mdpi_dark/symbols.sdf b/data/resources-mdpi_dark/symbols.sdf
index 060a713c04..be2ba6f689 100644
--- a/data/resources-mdpi_dark/symbols.sdf
+++ b/data/resources-mdpi_dark/symbols.sdf
@@ -733,44 +733,45 @@
   <symbol maxX="73" maxY="413" minX="60" minY="400" name="star-l"/>
   <symbol maxX="86" maxY="413" minX="73" minY="400" name="speedcam-s"/>
   <symbol maxX="105" maxY="413" minX="86" minY="400" name="railway-crossing-l"/>
-  <symbol maxX="119" maxY="413" minX="105" minY="400" name="main_entrance-s"/>
-  <symbol maxX="132" maxY="413" minX="119" minY="400" name="gate-s"/>
-  <symbol maxX="150" maxY="413" minX="132" minY="400" name="ford-m"/>
-  <symbol maxX="162" maxY="413" minX="150" minY="400" name="exit-s"/>
-  <symbol maxX="171" maxY="413" minX="162" minY="400" name="entrance-s"/>
-  <symbol maxX="184" maxY="413" minX="171" minY="400" name="cycle_barrier-s"/>
-  <symbol maxX="200" maxY="413" minX="184" minY="400" name="cave-m"/>
-  <symbol maxX="215" maxY="413" minX="200" minY="400" name="bench"/>
-  <symbol maxX="224" maxY="413" minX="215" minY="400" name="barrier-entrance-s"/>
-  <symbol maxX="238" maxY="412" minX="224" minY="400" name="volcano-m"/>
-  <symbol maxX="256" maxY="412" minX="238" minY="400" name="subway-minsk-m"/>
-  <symbol maxX="277" maxY="412" minX="256" minY="400" name="subway-malaga-s"/>
-  <symbol maxX="299" maxY="412" minX="277" minY="400" name="subway-malaga-m"/>
-  <symbol maxX="316" maxY="412" minX="299" minY="400" name="subway-kolkata-s"/>
-  <symbol maxX="334" maxY="412" minX="316" minY="400" name="subway-kiev-s"/>
-  <symbol maxX="356" maxY="412" minX="334" minY="400" name="subway-edmonton-m"/>
-  <symbol maxX="377" maxY="412" minX="356" minY="400" name="subway-baku-s"/>
-  <symbol maxX="389" maxY="412" minX="377" minY="400" name="star-m"/>
-  <symbol maxX="406" maxY="412" minX="389" minY="400" name="railway-crossing-m"/>
-  <symbol maxX="419" maxY="412" minX="406" minY="400" name="plaque"/>
-  <symbol maxX="437" maxY="411" minX="419" minY="400" name="subway-taipei-s"/>
-  <symbol maxX="454" maxY="411" minX="437" minY="400" name="subway-minsk-s"/>
-  <symbol maxX="476" maxY="411" minX="454" minY="400" name="subway-chongqing-s"/>
-  <symbol maxX="498" maxY="411" minX="476" minY="400" name="subway-baku-m"/>
-  <symbol maxX="509" maxY="411" minX="498" minY="400" name="star-s"/>
-  <symbol maxX="520" maxY="410" minX="509" minY="400" name="volcano-s"/>
-  <symbol maxX="542" maxY="410" minX="520" minY="400" name="subway-chongqing-m"/>
-  <symbol maxX="552" maxY="410" minX="542" minY="400" name="power-tower-m"/>
-  <symbol maxX="563" maxY="410" minX="552" minY="400" name="peakt-m"/>
-  <symbol maxX="576" maxY="410" minX="563" minY="400" name="cave-s"/>
-  <symbol maxX="596" maxY="410" minX="576" minY="400" name="arrow-m"/>
-  <symbol maxX="605" maxY="409" minX="596" minY="400" name="zero-icon"/>
-  <symbol maxX="614" maxY="409" minX="605" minY="400" name="peakt-s"/>
-  <symbol maxX="626" maxY="408" minX="614" minY="400" name="mountain-pass-m"/>
-  <symbol maxX="634" maxY="408" minX="626" minY="400" name="mast-m"/>
-  <symbol maxX="642" maxY="408" minX="634" minY="400" name="dot-m"/>
-  <symbol maxX="657" maxY="408" minX="642" minY="400" name="arrow-s"/>
-  <symbol maxX="666" maxY="407" minX="657" minY="400" name="mountain-pass-s"/>
-  <symbol maxX="677" maxY="406" minX="666" minY="400" name="arrow-xs"/>
+  <symbol maxX="118" maxY="413" minX="105" minY="400" name="gate-s"/>
+  <symbol maxX="136" maxY="413" minX="118" minY="400" name="ford-m"/>
+  <symbol maxX="146" maxY="413" minX="136" minY="400" name="entrance-s"/>
+  <symbol maxX="161" maxY="413" minX="146" minY="400" name="entrance-main-s"/>
+  <symbol maxX="174" maxY="413" minX="161" minY="400" name="entrance-exit-s"/>
+  <symbol maxX="189" maxY="413" minX="174" minY="400" name="entrance-emergency-s"/>
+  <symbol maxX="199" maxY="413" minX="189" minY="400" name="entrance-barrier-s"/>
+  <symbol maxX="212" maxY="413" minX="199" minY="400" name="cycle_barrier-s"/>
+  <symbol maxX="228" maxY="413" minX="212" minY="400" name="cave-m"/>
+  <symbol maxX="243" maxY="413" minX="228" minY="400" name="bench"/>
+  <symbol maxX="257" maxY="412" minX="243" minY="400" name="volcano-m"/>
+  <symbol maxX="275" maxY="412" minX="257" minY="400" name="subway-minsk-m"/>
+  <symbol maxX="296" maxY="412" minX="275" minY="400" name="subway-malaga-s"/>
+  <symbol maxX="318" maxY="412" minX="296" minY="400" name="subway-malaga-m"/>
+  <symbol maxX="335" maxY="412" minX="318" minY="400" name="subway-kolkata-s"/>
+  <symbol maxX="353" maxY="412" minX="335" minY="400" name="subway-kiev-s"/>
+  <symbol maxX="375" maxY="412" minX="353" minY="400" name="subway-edmonton-m"/>
+  <symbol maxX="396" maxY="412" minX="375" minY="400" name="subway-baku-s"/>
+  <symbol maxX="408" maxY="412" minX="396" minY="400" name="star-m"/>
+  <symbol maxX="425" maxY="412" minX="408" minY="400" name="railway-crossing-m"/>
+  <symbol maxX="438" maxY="412" minX="425" minY="400" name="plaque"/>
+  <symbol maxX="456" maxY="411" minX="438" minY="400" name="subway-taipei-s"/>
+  <symbol maxX="473" maxY="411" minX="456" minY="400" name="subway-minsk-s"/>
+  <symbol maxX="495" maxY="411" minX="473" minY="400" name="subway-chongqing-s"/>
+  <symbol maxX="517" maxY="411" minX="495" minY="400" name="subway-baku-m"/>
+  <symbol maxX="528" maxY="411" minX="517" minY="400" name="star-s"/>
+  <symbol maxX="539" maxY="410" minX="528" minY="400" name="volcano-s"/>
+  <symbol maxX="561" maxY="410" minX="539" minY="400" name="subway-chongqing-m"/>
+  <symbol maxX="571" maxY="410" minX="561" minY="400" name="power-tower-m"/>
+  <symbol maxX="582" maxY="410" minX="571" minY="400" name="peakt-m"/>
+  <symbol maxX="595" maxY="410" minX="582" minY="400" name="cave-s"/>
+  <symbol maxX="615" maxY="410" minX="595" minY="400" name="arrow-m"/>
+  <symbol maxX="624" maxY="409" minX="615" minY="400" name="zero-icon"/>
+  <symbol maxX="633" maxY="409" minX="624" minY="400" name="peakt-s"/>
+  <symbol maxX="645" maxY="408" minX="633" minY="400" name="mountain-pass-m"/>
+  <symbol maxX="653" maxY="408" minX="645" minY="400" name="mast-m"/>
+  <symbol maxX="661" maxY="408" minX="653" minY="400" name="dot-m"/>
+  <symbol maxX="676" maxY="408" minX="661" minY="400" name="arrow-s"/>
+  <symbol maxX="685" maxY="407" minX="676" minY="400" name="mountain-pass-s"/>
+  <symbol maxX="696" maxY="406" minX="685" minY="400" name="arrow-xs"/>
  </file>
 </root>
diff --git a/data/resources-mdpi_light/symbols.png b/data/resources-mdpi_light/symbols.png
index dd9704d162..77119e5e6a 100644
Binary files a/data/resources-mdpi_light/symbols.png and b/data/resources-mdpi_light/symbols.png differ
diff --git a/data/resources-mdpi_light/symbols.sdf b/data/resources-mdpi_light/symbols.sdf
index 060a713c04..be2ba6f689 100644
--- a/data/resources-mdpi_light/symbols.sdf
+++ b/data/resources-mdpi_light/symbols.sdf
@@ -733,44 +733,45 @@
   <symbol maxX="73" maxY="413" minX="60" minY="400" name="star-l"/>
   <symbol maxX="86" maxY="413" minX="73" minY="400" name="speedcam-s"/>
   <symbol maxX="105" maxY="413" minX="86" minY="400" name="railway-crossing-l"/>
-  <symbol maxX="119" maxY="413" minX="105" minY="400" name="main_entrance-s"/>
-  <symbol maxX="132" maxY="413" minX="119" minY="400" name="gate-s"/>
-  <symbol maxX="150" maxY="413" minX="132" minY="400" name="ford-m"/>
-  <symbol maxX="162" maxY="413" minX="150" minY="400" name="exit-s"/>
-  <symbol maxX="171" maxY="413" minX="162" minY="400" name="entrance-s"/>
-  <symbol maxX="184" maxY="413" minX="171" minY="400" name="cycle_barrier-s"/>
-  <symbol maxX="200" maxY="413" minX="184" minY="400" name="cave-m"/>
-  <symbol maxX="215" maxY="413" minX="200" minY="400" name="bench"/>
-  <symbol maxX="224" maxY="413" minX="215" minY="400" name="barrier-entrance-s"/>
-  <symbol maxX="238" maxY="412" minX="224" minY="400" name="volcano-m"/>
-  <symbol maxX="256" maxY="412" minX="238" minY="400" name="subway-minsk-m"/>
-  <symbol maxX="277" maxY="412" minX="256" minY="400" name="subway-malaga-s"/>
-  <symbol maxX="299" maxY="412" minX="277" minY="400" name="subway-malaga-m"/>
-  <symbol maxX="316" maxY="412" minX="299" minY="400" name="subway-kolkata-s"/>
-  <symbol maxX="334" maxY="412" minX="316" minY="400" name="subway-kiev-s"/>
-  <symbol maxX="356" maxY="412" minX="334" minY="400" name="subway-edmonton-m"/>
-  <symbol maxX="377" maxY="412" minX="356" minY="400" name="subway-baku-s"/>
-  <symbol maxX="389" maxY="412" minX="377" minY="400" name="star-m"/>
-  <symbol maxX="406" maxY="412" minX="389" minY="400" name="railway-crossing-m"/>
-  <symbol maxX="419" maxY="412" minX="406" minY="400" name="plaque"/>
-  <symbol maxX="437" maxY="411" minX="419" minY="400" name="subway-taipei-s"/>
-  <symbol maxX="454" maxY="411" minX="437" minY="400" name="subway-minsk-s"/>
-  <symbol maxX="476" maxY="411" minX="454" minY="400" name="subway-chongqing-s"/>
-  <symbol maxX="498" maxY="411" minX="476" minY="400" name="subway-baku-m"/>
-  <symbol maxX="509" maxY="411" minX="498" minY="400" name="star-s"/>
-  <symbol maxX="520" maxY="410" minX="509" minY="400" name="volcano-s"/>
-  <symbol maxX="542" maxY="410" minX="520" minY="400" name="subway-chongqing-m"/>
-  <symbol maxX="552" maxY="410" minX="542" minY="400" name="power-tower-m"/>
-  <symbol maxX="563" maxY="410" minX="552" minY="400" name="peakt-m"/>
-  <symbol maxX="576" maxY="410" minX="563" minY="400" name="cave-s"/>
-  <symbol maxX="596" maxY="410" minX="576" minY="400" name="arrow-m"/>
-  <symbol maxX="605" maxY="409" minX="596" minY="400" name="zero-icon"/>
-  <symbol maxX="614" maxY="409" minX="605" minY="400" name="peakt-s"/>
-  <symbol maxX="626" maxY="408" minX="614" minY="400" name="mountain-pass-m"/>
-  <symbol maxX="634" maxY="408" minX="626" minY="400" name="mast-m"/>
-  <symbol maxX="642" maxY="408" minX="634" minY="400" name="dot-m"/>
-  <symbol maxX="657" maxY="408" minX="642" minY="400" name="arrow-s"/>
-  <symbol maxX="666" maxY="407" minX="657" minY="400" name="mountain-pass-s"/>
-  <symbol maxX="677" maxY="406" minX="666" minY="400" name="arrow-xs"/>
+  <symbol maxX="118" maxY="413" minX="105" minY="400" name="gate-s"/>
+  <symbol maxX="136" maxY="413" minX="118" minY="400" name="ford-m"/>
+  <symbol maxX="146" maxY="413" minX="136" minY="400" name="entrance-s"/>
+  <symbol maxX="161" maxY="413" minX="146" minY="400" name="entrance-main-s"/>
+  <symbol maxX="174" maxY="413" minX="161" minY="400" name="entrance-exit-s"/>
+  <symbol maxX="189" maxY="413" minX="174" minY="400" name="entrance-emergency-s"/>
+  <symbol maxX="199" maxY="413" minX="189" minY="400" name="entrance-barrier-s"/>
+  <symbol maxX="212" maxY="413" minX="199" minY="400" name="cycle_barrier-s"/>
+  <symbol maxX="228" maxY="413" minX="212" minY="400" name="cave-m"/>
+  <symbol maxX="243" maxY="413" minX="228" minY="400" name="bench"/>
+  <symbol maxX="257" maxY="412" minX="243" minY="400" name="volcano-m"/>
+  <symbol maxX="275" maxY="412" minX="257" minY="400" name="subway-minsk-m"/>
+  <symbol maxX="296" maxY="412" minX="275" minY="400" name="subway-malaga-s"/>
+  <symbol maxX="318" maxY="412" minX="296" minY="400" name="subway-malaga-m"/>
+  <symbol maxX="335" maxY="412" minX="318" minY="400" name="subway-kolkata-s"/>
+  <symbol maxX="353" maxY="412" minX="335" minY="400" name="subway-kiev-s"/>
+  <symbol maxX="375" maxY="412" minX="353" minY="400" name="subway-edmonton-m"/>
+  <symbol maxX="396" maxY="412" minX="375" minY="400" name="subway-baku-s"/>
+  <symbol maxX="408" maxY="412" minX="396" minY="400" name="star-m"/>
+  <symbol maxX="425" maxY="412" minX="408" minY="400" name="railway-crossing-m"/>
+  <symbol maxX="438" maxY="412" minX="425" minY="400" name="plaque"/>
+  <symbol maxX="456" maxY="411" minX="438" minY="400" name="subway-taipei-s"/>
+  <symbol maxX="473" maxY="411" minX="456" minY="400" name="subway-minsk-s"/>
+  <symbol maxX="495" maxY="411" minX="473" minY="400" name="subway-chongqing-s"/>
+  <symbol maxX="517" maxY="411" minX="495" minY="400" name="subway-baku-m"/>
+  <symbol maxX="528" maxY="411" minX="517" minY="400" name="star-s"/>
+  <symbol maxX="539" maxY="410" minX="528" minY="400" name="volcano-s"/>
+  <symbol maxX="561" maxY="410" minX="539" minY="400" name="subway-chongqing-m"/>
+  <symbol maxX="571" maxY="410" minX="561" minY="400" name="power-tower-m"/>
+  <symbol maxX="582" maxY="410" minX="571" minY="400" name="peakt-m"/>
+  <symbol maxX="595" maxY="410" minX="582" minY="400" name="cave-s"/>
+  <symbol maxX="615" maxY="410" minX="595" minY="400" name="arrow-m"/>
+  <symbol maxX="624" maxY="409" minX="615" minY="400" name="zero-icon"/>
+  <symbol maxX="633" maxY="409" minX="624" minY="400" name="peakt-s"/>
+  <symbol maxX="645" maxY="408" minX="633" minY="400" name="mountain-pass-m"/>
+  <symbol maxX="653" maxY="408" minX="645" minY="400" name="mast-m"/>
+  <symbol maxX="661" maxY="408" minX="653" minY="400" name="dot-m"/>
+  <symbol maxX="676" maxY="408" minX="661" minY="400" name="arrow-s"/>
+  <symbol maxX="685" maxY="407" minX="676" minY="400" name="mountain-pass-s"/>
+  <symbol maxX="696" maxY="406" minX="685" minY="400" name="arrow-xs"/>
  </file>
 </root>
diff --git a/data/resources-xhdpi_dark/symbols.png b/data/resources-xhdpi_dark/symbols.png
index bc01ac1caf..882b6ac053 100644
Binary files a/data/resources-xhdpi_dark/symbols.png and b/data/resources-xhdpi_dark/symbols.png differ
diff --git a/data/resources-xhdpi_dark/symbols.sdf b/data/resources-xhdpi_dark/symbols.sdf
index ab298902ae..c496331527 100644
--- a/data/resources-xhdpi_dark/symbols.sdf
+++ b/data/resources-xhdpi_dark/symbols.sdf
@@ -733,44 +733,45 @@
   <symbol maxX="1336" maxY="689" minX="1314" minY="667" name="star-l"/>
   <symbol maxX="1358" maxY="689" minX="1336" minY="667" name="speedcam-s"/>
   <symbol maxX="1392" maxY="689" minX="1358" minY="667" name="railway-crossing-l"/>
-  <symbol maxX="1416" maxY="689" minX="1392" minY="667" name="main_entrance-s"/>
-  <symbol maxX="1438" maxY="689" minX="1416" minY="667" name="gate-s"/>
-  <symbol maxX="1470" maxY="689" minX="1438" minY="667" name="ford-m"/>
-  <symbol maxX="1490" maxY="689" minX="1470" minY="667" name="exit-s"/>
-  <symbol maxX="1504" maxY="689" minX="1490" minY="667" name="entrance-s"/>
-  <symbol maxX="1526" maxY="689" minX="1504" minY="667" name="cycle_barrier-s"/>
-  <symbol maxX="1554" maxY="689" minX="1526" minY="667" name="cave-m"/>
-  <symbol maxX="1580" maxY="689" minX="1554" minY="667" name="bench"/>
-  <symbol maxX="1594" maxY="689" minX="1580" minY="667" name="barrier-entrance-s"/>
-  <symbol maxX="1618" maxY="687" minX="1594" minY="667" name="volcano-m"/>
-  <symbol maxX="1650" maxY="687" minX="1618" minY="667" name="subway-minsk-m"/>
-  <symbol maxX="1688" maxY="687" minX="1650" minY="667" name="subway-malaga-s"/>
-  <symbol maxX="1728" maxY="687" minX="1688" minY="667" name="subway-malaga-m"/>
-  <symbol maxX="1758" maxY="687" minX="1728" minY="667" name="subway-kolkata-s"/>
-  <symbol maxX="1790" maxY="687" minX="1758" minY="667" name="subway-kiev-s"/>
-  <symbol maxX="1830" maxY="687" minX="1790" minY="667" name="subway-edmonton-m"/>
-  <symbol maxX="1868" maxY="687" minX="1830" minY="667" name="subway-baku-s"/>
-  <symbol maxX="1888" maxY="687" minX="1868" minY="667" name="star-m"/>
-  <symbol maxX="1918" maxY="687" minX="1888" minY="667" name="railway-crossing-m"/>
-  <symbol maxX="1940" maxY="687" minX="1918" minY="667" name="plaque"/>
-  <symbol maxX="1972" maxY="685" minX="1940" minY="667" name="subway-taipei-s"/>
-  <symbol maxX="2002" maxY="685" minX="1972" minY="667" name="subway-minsk-s"/>
-  <symbol maxX="2042" maxY="685" minX="2002" minY="667" name="subway-chongqing-s"/>
-  <symbol maxX="40" maxY="711" minX="0" minY="693" name="subway-baku-m"/>
-  <symbol maxX="58" maxY="711" minX="40" minY="693" name="star-s"/>
-  <symbol maxX="76" maxY="709" minX="58" minY="693" name="volcano-s"/>
-  <symbol maxX="116" maxY="709" minX="76" minY="693" name="subway-chongqing-m"/>
-  <symbol maxX="132" maxY="709" minX="116" minY="693" name="power-tower-m"/>
-  <symbol maxX="150" maxY="709" minX="132" minY="693" name="peakt-m"/>
-  <symbol maxX="172" maxY="709" minX="150" minY="693" name="cave-s"/>
-  <symbol maxX="208" maxY="709" minX="172" minY="693" name="arrow-m"/>
-  <symbol maxX="222" maxY="707" minX="208" minY="693" name="zero-icon"/>
-  <symbol maxX="236" maxY="707" minX="222" minY="693" name="peakt-s"/>
-  <symbol maxX="256" maxY="705" minX="236" minY="693" name="mountain-pass-m"/>
-  <symbol maxX="268" maxY="705" minX="256" minY="693" name="mast-m"/>
-  <symbol maxX="280" maxY="705" minX="268" minY="693" name="dot-m"/>
-  <symbol maxX="306" maxY="705" minX="280" minY="693" name="arrow-s"/>
-  <symbol maxX="320" maxY="703" minX="306" minY="693" name="mountain-pass-s"/>
-  <symbol maxX="338" maxY="701" minX="320" minY="693" name="arrow-xs"/>
+  <symbol maxX="1414" maxY="689" minX="1392" minY="667" name="gate-s"/>
+  <symbol maxX="1446" maxY="689" minX="1414" minY="667" name="ford-m"/>
+  <symbol maxX="1462" maxY="689" minX="1446" minY="667" name="entrance-s"/>
+  <symbol maxX="1488" maxY="689" minX="1462" minY="667" name="entrance-main-s"/>
+  <symbol maxX="1510" maxY="689" minX="1488" minY="667" name="entrance-exit-s"/>
+  <symbol maxX="1536" maxY="689" minX="1510" minY="667" name="entrance-emergency-s"/>
+  <symbol maxX="1552" maxY="689" minX="1536" minY="667" name="entrance-barrier-s"/>
+  <symbol maxX="1574" maxY="689" minX="1552" minY="667" name="cycle_barrier-s"/>
+  <symbol maxX="1602" maxY="689" minX="1574" minY="667" name="cave-m"/>
+  <symbol maxX="1628" maxY="689" minX="1602" minY="667" name="bench"/>
+  <symbol maxX="1652" maxY="687" minX="1628" minY="667" name="volcano-m"/>
+  <symbol maxX="1684" maxY="687" minX="1652" minY="667" name="subway-minsk-m"/>
+  <symbol maxX="1722" maxY="687" minX="1684" minY="667" name="subway-malaga-s"/>
+  <symbol maxX="1762" maxY="687" minX="1722" minY="667" name="subway-malaga-m"/>
+  <symbol maxX="1792" maxY="687" minX="1762" minY="667" name="subway-kolkata-s"/>
+  <symbol maxX="1824" maxY="687" minX="1792" minY="667" name="subway-kiev-s"/>
+  <symbol maxX="1864" maxY="687" minX="1824" minY="667" name="subway-edmonton-m"/>
+  <symbol maxX="1902" maxY="687" minX="1864" minY="667" name="subway-baku-s"/>
+  <symbol maxX="1922" maxY="687" minX="1902" minY="667" name="star-m"/>
+  <symbol maxX="1952" maxY="687" minX="1922" minY="667" name="railway-crossing-m"/>
+  <symbol maxX="1974" maxY="687" minX="1952" minY="667" name="plaque"/>
+  <symbol maxX="2006" maxY="685" minX="1974" minY="667" name="subway-taipei-s"/>
+  <symbol maxX="2036" maxY="685" minX="2006" minY="667" name="subway-minsk-s"/>
+  <symbol maxX="40" maxY="711" minX="0" minY="693" name="subway-chongqing-s"/>
+  <symbol maxX="80" maxY="711" minX="40" minY="693" name="subway-baku-m"/>
+  <symbol maxX="98" maxY="711" minX="80" minY="693" name="star-s"/>
+  <symbol maxX="116" maxY="709" minX="98" minY="693" name="volcano-s"/>
+  <symbol maxX="156" maxY="709" minX="116" minY="693" name="subway-chongqing-m"/>
+  <symbol maxX="172" maxY="709" minX="156" minY="693" name="power-tower-m"/>
+  <symbol maxX="190" maxY="709" minX="172" minY="693" name="peakt-m"/>
+  <symbol maxX="212" maxY="709" minX="190" minY="693" name="cave-s"/>
+  <symbol maxX="248" maxY="709" minX="212" minY="693" name="arrow-m"/>
+  <symbol maxX="262" maxY="707" minX="248" minY="693" name="zero-icon"/>
+  <symbol maxX="276" maxY="707" minX="262" minY="693" name="peakt-s"/>
+  <symbol maxX="296" maxY="705" minX="276" minY="693" name="mountain-pass-m"/>
+  <symbol maxX="308" maxY="705" minX="296" minY="693" name="mast-m"/>
+  <symbol maxX="320" maxY="705" minX="308" minY="693" name="dot-m"/>
+  <symbol maxX="346" maxY="705" minX="320" minY="693" name="arrow-s"/>
+  <symbol maxX="360" maxY="703" minX="346" minY="693" name="mountain-pass-s"/>
+  <symbol maxX="378" maxY="701" minX="360" minY="693" name="arrow-xs"/>
  </file>
 </root>
diff --git a/data/resources-xhdpi_light/symbols.png b/data/resources-xhdpi_light/symbols.png
index e0160437f3..fcad118bea 100644
Binary files a/data/resources-xhdpi_light/symbols.png and b/data/resources-xhdpi_light/symbols.png differ
diff --git a/data/resources-xhdpi_light/symbols.sdf b/data/resources-xhdpi_light/symbols.sdf
index ab298902ae..c496331527 100644
--- a/data/resources-xhdpi_light/symbols.sdf
+++ b/data/resources-xhdpi_light/symbols.sdf
@@ -733,44 +733,45 @@
   <symbol maxX="1336" maxY="689" minX="1314" minY="667" name="star-l"/>
   <symbol maxX="1358" maxY="689" minX="1336" minY="667" name="speedcam-s"/>
   <symbol maxX="1392" maxY="689" minX="1358" minY="667" name="railway-crossing-l"/>
-  <symbol maxX="1416" maxY="689" minX="1392" minY="667" name="main_entrance-s"/>
-  <symbol maxX="1438" maxY="689" minX="1416" minY="667" name="gate-s"/>
-  <symbol maxX="1470" maxY="689" minX="1438" minY="667" name="ford-m"/>
-  <symbol maxX="1490" maxY="689" minX="1470" minY="667" name="exit-s"/>
-  <symbol maxX="1504" maxY="689" minX="1490" minY="667" name="entrance-s"/>
-  <symbol maxX="1526" maxY="689" minX="1504" minY="667" name="cycle_barrier-s"/>
-  <symbol maxX="1554" maxY="689" minX="1526" minY="667" name="cave-m"/>
-  <symbol maxX="1580" maxY="689" minX="1554" minY="667" name="bench"/>
-  <symbol maxX="1594" maxY="689" minX="1580" minY="667" name="barrier-entrance-s"/>
-  <symbol maxX="1618" maxY="687" minX="1594" minY="667" name="volcano-m"/>
-  <symbol maxX="1650" maxY="687" minX="1618" minY="667" name="subway-minsk-m"/>
-  <symbol maxX="1688" maxY="687" minX="1650" minY="667" name="subway-malaga-s"/>
-  <symbol maxX="1728" maxY="687" minX="1688" minY="667" name="subway-malaga-m"/>
-  <symbol maxX="1758" maxY="687" minX="1728" minY="667" name="subway-kolkata-s"/>
-  <symbol maxX="1790" maxY="687" minX="1758" minY="667" name="subway-kiev-s"/>
-  <symbol maxX="1830" maxY="687" minX="1790" minY="667" name="subway-edmonton-m"/>
-  <symbol maxX="1868" maxY="687" minX="1830" minY="667" name="subway-baku-s"/>
-  <symbol maxX="1888" maxY="687" minX="1868" minY="667" name="star-m"/>
-  <symbol maxX="1918" maxY="687" minX="1888" minY="667" name="railway-crossing-m"/>
-  <symbol maxX="1940" maxY="687" minX="1918" minY="667" name="plaque"/>
-  <symbol maxX="1972" maxY="685" minX="1940" minY="667" name="subway-taipei-s"/>
-  <symbol maxX="2002" maxY="685" minX="1972" minY="667" name="subway-minsk-s"/>
-  <symbol maxX="2042" maxY="685" minX="2002" minY="667" name="subway-chongqing-s"/>
-  <symbol maxX="40" maxY="711" minX="0" minY="693" name="subway-baku-m"/>
-  <symbol maxX="58" maxY="711" minX="40" minY="693" name="star-s"/>
-  <symbol maxX="76" maxY="709" minX="58" minY="693" name="volcano-s"/>
-  <symbol maxX="116" maxY="709" minX="76" minY="693" name="subway-chongqing-m"/>
-  <symbol maxX="132" maxY="709" minX="116" minY="693" name="power-tower-m"/>
-  <symbol maxX="150" maxY="709" minX="132" minY="693" name="peakt-m"/>
-  <symbol maxX="172" maxY="709" minX="150" minY="693" name="cave-s"/>
-  <symbol maxX="208" maxY="709" minX="172" minY="693" name="arrow-m"/>
-  <symbol maxX="222" maxY="707" minX="208" minY="693" name="zero-icon"/>
-  <symbol maxX="236" maxY="707" minX="222" minY="693" name="peakt-s"/>
-  <symbol maxX="256" maxY="705" minX="236" minY="693" name="mountain-pass-m"/>
-  <symbol maxX="268" maxY="705" minX="256" minY="693" name="mast-m"/>
-  <symbol maxX="280" maxY="705" minX="268" minY="693" name="dot-m"/>
-  <symbol maxX="306" maxY="705" minX="280" minY="693" name="arrow-s"/>
-  <symbol maxX="320" maxY="703" minX="306" minY="693" name="mountain-pass-s"/>
-  <symbol maxX="338" maxY="701" minX="320" minY="693" name="arrow-xs"/>
+  <symbol maxX="1414" maxY="689" minX="1392" minY="667" name="gate-s"/>
+  <symbol maxX="1446" maxY="689" minX="1414" minY="667" name="ford-m"/>
+  <symbol maxX="1462" maxY="689" minX="1446" minY="667" name="entrance-s"/>
+  <symbol maxX="1488" maxY="689" minX="1462" minY="667" name="entrance-main-s"/>
+  <symbol maxX="1510" maxY="689" minX="1488" minY="667" name="entrance-exit-s"/>
+  <symbol maxX="1536" maxY="689" minX="1510" minY="667" name="entrance-emergency-s"/>
+  <symbol maxX="1552" maxY="689" minX="1536" minY="667" name="entrance-barrier-s"/>
+  <symbol maxX="1574" maxY="689" minX="1552" minY="667" name="cycle_barrier-s"/>
+  <symbol maxX="1602" maxY="689" minX="1574" minY="667" name="cave-m"/>
+  <symbol maxX="1628" maxY="689" minX="1602" minY="667" name="bench"/>
+  <symbol maxX="1652" maxY="687" minX="1628" minY="667" name="volcano-m"/>
+  <symbol maxX="1684" maxY="687" minX="1652" minY="667" name="subway-minsk-m"/>
+  <symbol maxX="1722" maxY="687" minX="1684" minY="667" name="subway-malaga-s"/>
+  <symbol maxX="1762" maxY="687" minX="1722" minY="667" name="subway-malaga-m"/>
+  <symbol maxX="1792" maxY="687" minX="1762" minY="667" name="subway-kolkata-s"/>
+  <symbol maxX="1824" maxY="687" minX="1792" minY="667" name="subway-kiev-s"/>
+  <symbol maxX="1864" maxY="687" minX="1824" minY="667" name="subway-edmonton-m"/>
+  <symbol maxX="1902" maxY="687" minX="1864" minY="667" name="subway-baku-s"/>
+  <symbol maxX="1922" maxY="687" minX="1902" minY="667" name="star-m"/>
+  <symbol maxX="1952" maxY="687" minX="1922" minY="667" name="railway-crossing-m"/>
+  <symbol maxX="1974" maxY="687" minX="1952" minY="667" name="plaque"/>
+  <symbol maxX="2006" maxY="685" minX="1974" minY="667" name="subway-taipei-s"/>
+  <symbol maxX="2036" maxY="685" minX="2006" minY="667" name="subway-minsk-s"/>
+  <symbol maxX="40" maxY="711" minX="0" minY="693" name="subway-chongqing-s"/>
+  <symbol maxX="80" maxY="711" minX="40" minY="693" name="subway-baku-m"/>
+  <symbol maxX="98" maxY="711" minX="80" minY="693" name="star-s"/>
+  <symbol maxX="116" maxY="709" minX="98" minY="693" name="volcano-s"/>
+  <symbol maxX="156" maxY="709" minX="116" minY="693" name="subway-chongqing-m"/>
+  <symbol maxX="172" maxY="709" minX="156" minY="693" name="power-tower-m"/>
+  <symbol maxX="190" maxY="709" minX="172" minY="693" name="peakt-m"/>
+  <symbol maxX="212" maxY="709" minX="190" minY="693" name="cave-s"/>
+  <symbol maxX="248" maxY="709" minX="212" minY="693" name="arrow-m"/>
+  <symbol maxX="262" maxY="707" minX="248" minY="693" name="zero-icon"/>
+  <symbol maxX="276" maxY="707" minX="262" minY="693" name="peakt-s"/>
+  <symbol maxX="296" maxY="705" minX="276" minY="693" name="mountain-pass-m"/>
+  <symbol maxX="308" maxY="705" minX="296" minY="693" name="mast-m"/>
+  <symbol maxX="320" maxY="705" minX="308" minY="693" name="dot-m"/>
+  <symbol maxX="346" maxY="705" minX="320" minY="693" name="arrow-s"/>
+  <symbol maxX="360" maxY="703" minX="346" minY="693" name="mountain-pass-s"/>
+  <symbol maxX="378" maxY="701" minX="360" minY="693" name="arrow-xs"/>
  </file>
 </root>
diff --git a/data/resources-xxhdpi_dark/symbols.png b/data/resources-xxhdpi_dark/symbols.png
index a68f27a2d6..3a4be5cd55 100644
Binary files a/data/resources-xxhdpi_dark/symbols.png and b/data/resources-xxhdpi_dark/symbols.png differ
diff --git a/data/resources-xxhdpi_dark/symbols.sdf b/data/resources-xxhdpi_dark/symbols.sdf
index 6b75082d94..e31117a178 100644
--- a/data/resources-xxhdpi_dark/symbols.sdf
+++ b/data/resources-xxhdpi_dark/symbols.sdf
@@ -733,44 +733,45 @@
   <symbol maxX="504" maxY="1433" minX="473" minY="1402" name="star-l"/>
   <symbol maxX="535" maxY="1433" minX="504" minY="1402" name="speedcam-s"/>
   <symbol maxX="584" maxY="1433" minX="535" minY="1402" name="railway-crossing-l"/>
-  <symbol maxX="618" maxY="1433" minX="584" minY="1402" name="main_entrance-s"/>
-  <symbol maxX="649" maxY="1433" minX="618" minY="1402" name="gate-s"/>
-  <symbol maxX="695" maxY="1433" minX="649" minY="1402" name="ford-m"/>
-  <symbol maxX="723" maxY="1433" minX="695" minY="1402" name="exit-s"/>
-  <symbol maxX="742" maxY="1433" minX="723" minY="1402" name="entrance-s"/>
-  <symbol maxX="773" maxY="1433" minX="742" minY="1402" name="cycle_barrier-s"/>
-  <symbol maxX="813" maxY="1433" minX="773" minY="1402" name="cave-m"/>
-  <symbol maxX="850" maxY="1433" minX="813" minY="1402" name="bench"/>
-  <symbol maxX="869" maxY="1433" minX="850" minY="1402" name="barrier-entrance-s"/>
-  <symbol maxX="903" maxY="1430" minX="869" minY="1402" name="volcano-m"/>
-  <symbol maxX="949" maxY="1430" minX="903" minY="1402" name="subway-minsk-m"/>
-  <symbol maxX="1004" maxY="1430" minX="949" minY="1402" name="subway-malaga-s"/>
-  <symbol maxX="1062" maxY="1430" minX="1004" minY="1402" name="subway-malaga-m"/>
-  <symbol maxX="1105" maxY="1430" minX="1062" minY="1402" name="subway-kolkata-s"/>
-  <symbol maxX="1151" maxY="1430" minX="1105" minY="1402" name="subway-kiev-s"/>
-  <symbol maxX="1209" maxY="1430" minX="1151" minY="1402" name="subway-edmonton-m"/>
-  <symbol maxX="1264" maxY="1430" minX="1209" minY="1402" name="subway-baku-s"/>
-  <symbol maxX="1292" maxY="1430" minX="1264" minY="1402" name="star-m"/>
-  <symbol maxX="1335" maxY="1430" minX="1292" minY="1402" name="railway-crossing-m"/>
-  <symbol maxX="1366" maxY="1430" minX="1335" minY="1402" name="plaque"/>
-  <symbol maxX="1412" maxY="1427" minX="1366" minY="1402" name="subway-taipei-s"/>
-  <symbol maxX="1455" maxY="1427" minX="1412" minY="1402" name="subway-minsk-s"/>
-  <symbol maxX="1513" maxY="1427" minX="1455" minY="1402" name="subway-chongqing-s"/>
-  <symbol maxX="1571" maxY="1427" minX="1513" minY="1402" name="subway-baku-m"/>
-  <symbol maxX="1596" maxY="1427" minX="1571" minY="1402" name="star-s"/>
-  <symbol maxX="1621" maxY="1424" minX="1596" minY="1402" name="volcano-s"/>
-  <symbol maxX="1679" maxY="1424" minX="1621" minY="1402" name="subway-chongqing-m"/>
-  <symbol maxX="1701" maxY="1424" minX="1679" minY="1402" name="power-tower-m"/>
-  <symbol maxX="1726" maxY="1424" minX="1701" minY="1402" name="peakt-m"/>
-  <symbol maxX="1757" maxY="1424" minX="1726" minY="1402" name="cave-s"/>
-  <symbol maxX="1809" maxY="1424" minX="1757" minY="1402" name="arrow-m"/>
-  <symbol maxX="1828" maxY="1421" minX="1809" minY="1402" name="zero-icon"/>
-  <symbol maxX="1847" maxY="1421" minX="1828" minY="1402" name="peakt-s"/>
-  <symbol maxX="1875" maxY="1418" minX="1847" minY="1402" name="mountain-pass-m"/>
-  <symbol maxX="1891" maxY="1418" minX="1875" minY="1402" name="mast-m"/>
-  <symbol maxX="1907" maxY="1418" minX="1891" minY="1402" name="dot-m"/>
-  <symbol maxX="1944" maxY="1418" minX="1907" minY="1402" name="arrow-s"/>
-  <symbol maxX="1963" maxY="1415" minX="1944" minY="1402" name="mountain-pass-s"/>
-  <symbol maxX="1988" maxY="1412" minX="1963" minY="1402" name="arrow-xs"/>
+  <symbol maxX="615" maxY="1433" minX="584" minY="1402" name="gate-s"/>
+  <symbol maxX="661" maxY="1433" minX="615" minY="1402" name="ford-m"/>
+  <symbol maxX="683" maxY="1433" minX="661" minY="1402" name="entrance-s"/>
+  <symbol maxX="720" maxY="1433" minX="683" minY="1402" name="entrance-main-s"/>
+  <symbol maxX="751" maxY="1433" minX="720" minY="1402" name="entrance-exit-s"/>
+  <symbol maxX="788" maxY="1433" minX="751" minY="1402" name="entrance-emergency-s"/>
+  <symbol maxX="810" maxY="1433" minX="788" minY="1402" name="entrance-barrier-s"/>
+  <symbol maxX="841" maxY="1433" minX="810" minY="1402" name="cycle_barrier-s"/>
+  <symbol maxX="881" maxY="1433" minX="841" minY="1402" name="cave-m"/>
+  <symbol maxX="918" maxY="1433" minX="881" minY="1402" name="bench"/>
+  <symbol maxX="952" maxY="1430" minX="918" minY="1402" name="volcano-m"/>
+  <symbol maxX="998" maxY="1430" minX="952" minY="1402" name="subway-minsk-m"/>
+  <symbol maxX="1053" maxY="1430" minX="998" minY="1402" name="subway-malaga-s"/>
+  <symbol maxX="1111" maxY="1430" minX="1053" minY="1402" name="subway-malaga-m"/>
+  <symbol maxX="1154" maxY="1430" minX="1111" minY="1402" name="subway-kolkata-s"/>
+  <symbol maxX="1200" maxY="1430" minX="1154" minY="1402" name="subway-kiev-s"/>
+  <symbol maxX="1258" maxY="1430" minX="1200" minY="1402" name="subway-edmonton-m"/>
+  <symbol maxX="1313" maxY="1430" minX="1258" minY="1402" name="subway-baku-s"/>
+  <symbol maxX="1341" maxY="1430" minX="1313" minY="1402" name="star-m"/>
+  <symbol maxX="1384" maxY="1430" minX="1341" minY="1402" name="railway-crossing-m"/>
+  <symbol maxX="1415" maxY="1430" minX="1384" minY="1402" name="plaque"/>
+  <symbol maxX="1461" maxY="1427" minX="1415" minY="1402" name="subway-taipei-s"/>
+  <symbol maxX="1504" maxY="1427" minX="1461" minY="1402" name="subway-minsk-s"/>
+  <symbol maxX="1562" maxY="1427" minX="1504" minY="1402" name="subway-chongqing-s"/>
+  <symbol maxX="1620" maxY="1427" minX="1562" minY="1402" name="subway-baku-m"/>
+  <symbol maxX="1645" maxY="1427" minX="1620" minY="1402" name="star-s"/>
+  <symbol maxX="1670" maxY="1424" minX="1645" minY="1402" name="volcano-s"/>
+  <symbol maxX="1728" maxY="1424" minX="1670" minY="1402" name="subway-chongqing-m"/>
+  <symbol maxX="1750" maxY="1424" minX="1728" minY="1402" name="power-tower-m"/>
+  <symbol maxX="1775" maxY="1424" minX="1750" minY="1402" name="peakt-m"/>
+  <symbol maxX="1806" maxY="1424" minX="1775" minY="1402" name="cave-s"/>
+  <symbol maxX="1858" maxY="1424" minX="1806" minY="1402" name="arrow-m"/>
+  <symbol maxX="1877" maxY="1421" minX="1858" minY="1402" name="zero-icon"/>
+  <symbol maxX="1896" maxY="1421" minX="1877" minY="1402" name="peakt-s"/>
+  <symbol maxX="1924" maxY="1418" minX="1896" minY="1402" name="mountain-pass-m"/>
+  <symbol maxX="1940" maxY="1418" minX="1924" minY="1402" name="mast-m"/>
+  <symbol maxX="1956" maxY="1418" minX="1940" minY="1402" name="dot-m"/>
+  <symbol maxX="1993" maxY="1418" minX="1956" minY="1402" name="arrow-s"/>
+  <symbol maxX="2012" maxY="1415" minX="1993" minY="1402" name="mountain-pass-s"/>
+  <symbol maxX="2037" maxY="1412" minX="2012" minY="1402" name="arrow-xs"/>
  </file>
 </root>
diff --git a/data/resources-xxhdpi_light/symbols.png b/data/resources-xxhdpi_light/symbols.png
index 9aade0ef93..6ef3ed6820 100644
Binary files a/data/resources-xxhdpi_light/symbols.png and b/data/resources-xxhdpi_light/symbols.png differ
diff --git a/data/resources-xxhdpi_light/symbols.sdf b/data/resources-xxhdpi_light/symbols.sdf
index 6b75082d94..e31117a178 100644
--- a/data/resources-xxhdpi_light/symbols.sdf
+++ b/data/resources-xxhdpi_light/symbols.sdf
@@ -733,44 +733,45 @@
   <symbol maxX="504" maxY="1433" minX="473" minY="1402" name="star-l"/>
   <symbol maxX="535" maxY="1433" minX="504" minY="1402" name="speedcam-s"/>
   <symbol maxX="584" maxY="1433" minX="535" minY="1402" name="railway-crossing-l"/>
-  <symbol maxX="618" maxY="1433" minX="584" minY="1402" name="main_entrance-s"/>
-  <symbol maxX="649" maxY="1433" minX="618" minY="1402" name="gate-s"/>
-  <symbol maxX="695" maxY="1433" minX="649" minY="1402" name="ford-m"/>
-  <symbol maxX="723" maxY="1433" minX="695" minY="1402" name="exit-s"/>
-  <symbol maxX="742" maxY="1433" minX="723" minY="1402" name="entrance-s"/>
-  <symbol maxX="773" maxY="1433" minX="742" minY="1402" name="cycle_barrier-s"/>
-  <symbol maxX="813" maxY="1433" minX="773" minY="1402" name="cave-m"/>
-  <symbol maxX="850" maxY="1433" minX="813" minY="1402" name="bench"/>
-  <symbol maxX="869" maxY="1433" minX="850" minY="1402" name="barrier-entrance-s"/>
-  <symbol maxX="903" maxY="1430" minX="869" minY="1402" name="volcano-m"/>
-  <symbol maxX="949" maxY="1430" minX="903" minY="1402" name="subway-minsk-m"/>
-  <symbol maxX="1004" maxY="1430" minX="949" minY="1402" name="subway-malaga-s"/>
-  <symbol maxX="1062" maxY="1430" minX="1004" minY="1402" name="subway-malaga-m"/>
-  <symbol maxX="1105" maxY="1430" minX="1062" minY="1402" name="subway-kolkata-s"/>
-  <symbol maxX="1151" maxY="1430" minX="1105" minY="1402" name="subway-kiev-s"/>
-  <symbol maxX="1209" maxY="1430" minX="1151" minY="1402" name="subway-edmonton-m"/>
-  <symbol maxX="1264" maxY="1430" minX="1209" minY="1402" name="subway-baku-s"/>
-  <symbol maxX="1292" maxY="1430" minX="1264" minY="1402" name="star-m"/>
-  <symbol maxX="1335" maxY="1430" minX="1292" minY="1402" name="railway-crossing-m"/>
-  <symbol maxX="1366" maxY="1430" minX="1335" minY="1402" name="plaque"/>
-  <symbol maxX="1412" maxY="1427" minX="1366" minY="1402" name="subway-taipei-s"/>
-  <symbol maxX="1455" maxY="1427" minX="1412" minY="1402" name="subway-minsk-s"/>
-  <symbol maxX="1513" maxY="1427" minX="1455" minY="1402" name="subway-chongqing-s"/>
-  <symbol maxX="1571" maxY="1427" minX="1513" minY="1402" name="subway-baku-m"/>
-  <symbol maxX="1596" maxY="1427" minX="1571" minY="1402" name="star-s"/>
-  <symbol maxX="1621" maxY="1424" minX="1596" minY="1402" name="volcano-s"/>
-  <symbol maxX="1679" maxY="1424" minX="1621" minY="1402" name="subway-chongqing-m"/>
-  <symbol maxX="1701" maxY="1424" minX="1679" minY="1402" name="power-tower-m"/>
-  <symbol maxX="1726" maxY="1424" minX="1701" minY="1402" name="peakt-m"/>
-  <symbol maxX="1757" maxY="1424" minX="1726" minY="1402" name="cave-s"/>
-  <symbol maxX="1809" maxY="1424" minX="1757" minY="1402" name="arrow-m"/>
-  <symbol maxX="1828" maxY="1421" minX="1809" minY="1402" name="zero-icon"/>
-  <symbol maxX="1847" maxY="1421" minX="1828" minY="1402" name="peakt-s"/>
-  <symbol maxX="1875" maxY="1418" minX="1847" minY="1402" name="mountain-pass-m"/>
-  <symbol maxX="1891" maxY="1418" minX="1875" minY="1402" name="mast-m"/>
-  <symbol maxX="1907" maxY="1418" minX="1891" minY="1402" name="dot-m"/>
-  <symbol maxX="1944" maxY="1418" minX="1907" minY="1402" name="arrow-s"/>
-  <symbol maxX="1963" maxY="1415" minX="1944" minY="1402" name="mountain-pass-s"/>
-  <symbol maxX="1988" maxY="1412" minX="1963" minY="1402" name="arrow-xs"/>
+  <symbol maxX="615" maxY="1433" minX="584" minY="1402" name="gate-s"/>
+  <symbol maxX="661" maxY="1433" minX="615" minY="1402" name="ford-m"/>
+  <symbol maxX="683" maxY="1433" minX="661" minY="1402" name="entrance-s"/>
+  <symbol maxX="720" maxY="1433" minX="683" minY="1402" name="entrance-main-s"/>
+  <symbol maxX="751" maxY="1433" minX="720" minY="1402" name="entrance-exit-s"/>
+  <symbol maxX="788" maxY="1433" minX="751" minY="1402" name="entrance-emergency-s"/>
+  <symbol maxX="810" maxY="1433" minX="788" minY="1402" name="entrance-barrier-s"/>
+  <symbol maxX="841" maxY="1433" minX="810" minY="1402" name="cycle_barrier-s"/>
+  <symbol maxX="881" maxY="1433" minX="841" minY="1402" name="cave-m"/>
+  <symbol maxX="918" maxY="1433" minX="881" minY="1402" name="bench"/>
+  <symbol maxX="952" maxY="1430" minX="918" minY="1402" name="volcano-m"/>
+  <symbol maxX="998" maxY="1430" minX="952" minY="1402" name="subway-minsk-m"/>
+  <symbol maxX="1053" maxY="1430" minX="998" minY="1402" name="subway-malaga-s"/>
+  <symbol maxX="1111" maxY="1430" minX="1053" minY="1402" name="subway-malaga-m"/>
+  <symbol maxX="1154" maxY="1430" minX="1111" minY="1402" name="subway-kolkata-s"/>
+  <symbol maxX="1200" maxY="1430" minX="1154" minY="1402" name="subway-kiev-s"/>
+  <symbol maxX="1258" maxY="1430" minX="1200" minY="1402" name="subway-edmonton-m"/>
+  <symbol maxX="1313" maxY="1430" minX="1258" minY="1402" name="subway-baku-s"/>
+  <symbol maxX="1341" maxY="1430" minX="1313" minY="1402" name="star-m"/>
+  <symbol maxX="1384" maxY="1430" minX="1341" minY="1402" name="railway-crossing-m"/>
+  <symbol maxX="1415" maxY="1430" minX="1384" minY="1402" name="plaque"/>
+  <symbol maxX="1461" maxY="1427" minX="1415" minY="1402" name="subway-taipei-s"/>
+  <symbol maxX="1504" maxY="1427" minX="1461" minY="1402" name="subway-minsk-s"/>
+  <symbol maxX="1562" maxY="1427" minX="1504" minY="1402" name="subway-chongqing-s"/>
+  <symbol maxX="1620" maxY="1427" minX="1562" minY="1402" name="subway-baku-m"/>
+  <symbol maxX="1645" maxY="1427" minX="1620" minY="1402" name="star-s"/>
+  <symbol maxX="1670" maxY="1424" minX="1645" minY="1402" name="volcano-s"/>
+  <symbol maxX="1728" maxY="1424" minX="1670" minY="1402" name="subway-chongqing-m"/>
+  <symbol maxX="1750" maxY="1424" minX="1728" minY="1402" name="power-tower-m"/>
+  <symbol maxX="1775" maxY="1424" minX="1750" minY="1402" name="peakt-m"/>
+  <symbol maxX="1806" maxY="1424" minX="1775" minY="1402" name="cave-s"/>
+  <symbol maxX="1858" maxY="1424" minX="1806" minY="1402" name="arrow-m"/>
+  <symbol maxX="1877" maxY="1421" minX="1858" minY="1402" name="zero-icon"/>
+  <symbol maxX="1896" maxY="1421" minX="1877" minY="1402" name="peakt-s"/>
+  <symbol maxX="1924" maxY="1418" minX="1896" minY="1402" name="mountain-pass-m"/>
+  <symbol maxX="1940" maxY="1418" minX="1924" minY="1402" name="mast-m"/>
+  <symbol maxX="1956" maxY="1418" minX="1940" minY="1402" name="dot-m"/>
+  <symbol maxX="1993" maxY="1418" minX="1956" minY="1402" name="arrow-s"/>
+  <symbol maxX="2012" maxY="1415" minX="1993" minY="1402" name="mountain-pass-s"/>
+  <symbol maxX="2037" maxY="1412" minX="2012" minY="1402" name="arrow-xs"/>
  </file>
 </root>
diff --git a/data/resources-xxxhdpi_dark/symbols.png b/data/resources-xxxhdpi_dark/symbols.png
index 0ab3d92d68..39a6def448 100644
Binary files a/data/resources-xxxhdpi_dark/symbols.png and b/data/resources-xxxhdpi_dark/symbols.png differ
diff --git a/data/resources-xxxhdpi_dark/symbols.sdf b/data/resources-xxxhdpi_dark/symbols.sdf
index e1a6577459..e0e25b9883 100644
--- a/data/resources-xxxhdpi_dark/symbols.sdf
+++ b/data/resources-xxxhdpi_dark/symbols.sdf
@@ -733,44 +733,45 @@
   <symbol maxX="1830" maxY="1893" minX="1794" minY="1857" name="star-l"/>
   <symbol maxX="1866" maxY="1893" minX="1830" minY="1857" name="speedcam-s"/>
   <symbol maxX="1923" maxY="1893" minX="1866" minY="1857" name="railway-crossing-l"/>
-  <symbol maxX="1963" maxY="1893" minX="1923" minY="1857" name="main_entrance-s"/>
-  <symbol maxX="1999" maxY="1893" minX="1963" minY="1857" name="gate-s"/>
-  <symbol maxX="54" maxY="1936" minX="0" minY="1900" name="ford-m"/>
-  <symbol maxX="86" maxY="1936" minX="54" minY="1900" name="exit-s"/>
-  <symbol maxX="108" maxY="1936" minX="86" minY="1900" name="entrance-s"/>
-  <symbol maxX="144" maxY="1936" minX="108" minY="1900" name="cycle_barrier-s"/>
-  <symbol maxX="191" maxY="1936" minX="144" minY="1900" name="cave-m"/>
-  <symbol maxX="234" maxY="1936" minX="191" minY="1900" name="bench"/>
-  <symbol maxX="256" maxY="1936" minX="234" minY="1900" name="barrier-entrance-s"/>
-  <symbol maxX="296" maxY="1932" minX="256" minY="1900" name="volcano-m"/>
-  <symbol maxX="350" maxY="1932" minX="296" minY="1900" name="subway-minsk-m"/>
-  <symbol maxX="414" maxY="1932" minX="350" minY="1900" name="subway-malaga-s"/>
-  <symbol maxX="482" maxY="1932" minX="414" minY="1900" name="subway-malaga-m"/>
-  <symbol maxX="532" maxY="1932" minX="482" minY="1900" name="subway-kolkata-s"/>
-  <symbol maxX="586" maxY="1932" minX="532" minY="1900" name="subway-kiev-s"/>
-  <symbol maxX="654" maxY="1932" minX="586" minY="1900" name="subway-edmonton-m"/>
-  <symbol maxX="718" maxY="1932" minX="654" minY="1900" name="subway-baku-s"/>
-  <symbol maxX="750" maxY="1932" minX="718" minY="1900" name="star-m"/>
-  <symbol maxX="800" maxY="1932" minX="750" minY="1900" name="railway-crossing-m"/>
-  <symbol maxX="836" maxY="1932" minX="800" minY="1900" name="plaque"/>
-  <symbol maxX="890" maxY="1929" minX="836" minY="1900" name="subway-taipei-s"/>
-  <symbol maxX="940" maxY="1929" minX="890" minY="1900" name="subway-minsk-s"/>
-  <symbol maxX="1008" maxY="1929" minX="940" minY="1900" name="subway-chongqing-s"/>
-  <symbol maxX="1076" maxY="1929" minX="1008" minY="1900" name="subway-baku-m"/>
-  <symbol maxX="1105" maxY="1929" minX="1076" minY="1900" name="star-s"/>
-  <symbol maxX="1134" maxY="1925" minX="1105" minY="1900" name="volcano-s"/>
-  <symbol maxX="1202" maxY="1925" minX="1134" minY="1900" name="subway-chongqing-m"/>
-  <symbol maxX="1227" maxY="1925" minX="1202" minY="1900" name="power-tower-m"/>
-  <symbol maxX="1256" maxY="1925" minX="1227" minY="1900" name="peakt-m"/>
-  <symbol maxX="1292" maxY="1925" minX="1256" minY="1900" name="cave-s"/>
-  <symbol maxX="1353" maxY="1925" minX="1292" minY="1900" name="arrow-m"/>
-  <symbol maxX="1375" maxY="1922" minX="1353" minY="1900" name="zero-icon"/>
-  <symbol maxX="1397" maxY="1922" minX="1375" minY="1900" name="peakt-s"/>
-  <symbol maxX="1429" maxY="1918" minX="1397" minY="1900" name="mountain-pass-m"/>
-  <symbol maxX="1447" maxY="1918" minX="1429" minY="1900" name="mast-m"/>
-  <symbol maxX="1465" maxY="1918" minX="1447" minY="1900" name="dot-m"/>
-  <symbol maxX="1508" maxY="1918" minX="1465" minY="1900" name="arrow-s"/>
-  <symbol maxX="1530" maxY="1915" minX="1508" minY="1900" name="mountain-pass-s"/>
-  <symbol maxX="1559" maxY="1911" minX="1530" minY="1900" name="arrow-xs"/>
+  <symbol maxX="1959" maxY="1893" minX="1923" minY="1857" name="gate-s"/>
+  <symbol maxX="2013" maxY="1893" minX="1959" minY="1857" name="ford-m"/>
+  <symbol maxX="2038" maxY="1893" minX="2013" minY="1857" name="entrance-s"/>
+  <symbol maxX="43" maxY="1936" minX="0" minY="1900" name="entrance-main-s"/>
+  <symbol maxX="79" maxY="1936" minX="43" minY="1900" name="entrance-exit-s"/>
+  <symbol maxX="122" maxY="1936" minX="79" minY="1900" name="entrance-emergency-s"/>
+  <symbol maxX="147" maxY="1936" minX="122" minY="1900" name="entrance-barrier-s"/>
+  <symbol maxX="183" maxY="1936" minX="147" minY="1900" name="cycle_barrier-s"/>
+  <symbol maxX="230" maxY="1936" minX="183" minY="1900" name="cave-m"/>
+  <symbol maxX="273" maxY="1936" minX="230" minY="1900" name="bench"/>
+  <symbol maxX="313" maxY="1932" minX="273" minY="1900" name="volcano-m"/>
+  <symbol maxX="367" maxY="1932" minX="313" minY="1900" name="subway-minsk-m"/>
+  <symbol maxX="431" maxY="1932" minX="367" minY="1900" name="subway-malaga-s"/>
+  <symbol maxX="499" maxY="1932" minX="431" minY="1900" name="subway-malaga-m"/>
+  <symbol maxX="549" maxY="1932" minX="499" minY="1900" name="subway-kolkata-s"/>
+  <symbol maxX="603" maxY="1932" minX="549" minY="1900" name="subway-kiev-s"/>
+  <symbol maxX="671" maxY="1932" minX="603" minY="1900" name="subway-edmonton-m"/>
+  <symbol maxX="735" maxY="1932" minX="671" minY="1900" name="subway-baku-s"/>
+  <symbol maxX="767" maxY="1932" minX="735" minY="1900" name="star-m"/>
+  <symbol maxX="817" maxY="1932" minX="767" minY="1900" name="railway-crossing-m"/>
+  <symbol maxX="853" maxY="1932" minX="817" minY="1900" name="plaque"/>
+  <symbol maxX="907" maxY="1929" minX="853" minY="1900" name="subway-taipei-s"/>
+  <symbol maxX="957" maxY="1929" minX="907" minY="1900" name="subway-minsk-s"/>
+  <symbol maxX="1025" maxY="1929" minX="957" minY="1900" name="subway-chongqing-s"/>
+  <symbol maxX="1093" maxY="1929" minX="1025" minY="1900" name="subway-baku-m"/>
+  <symbol maxX="1122" maxY="1929" minX="1093" minY="1900" name="star-s"/>
+  <symbol maxX="1151" maxY="1925" minX="1122" minY="1900" name="volcano-s"/>
+  <symbol maxX="1219" maxY="1925" minX="1151" minY="1900" name="subway-chongqing-m"/>
+  <symbol maxX="1244" maxY="1925" minX="1219" minY="1900" name="power-tower-m"/>
+  <symbol maxX="1273" maxY="1925" minX="1244" minY="1900" name="peakt-m"/>
+  <symbol maxX="1309" maxY="1925" minX="1273" minY="1900" name="cave-s"/>
+  <symbol maxX="1370" maxY="1925" minX="1309" minY="1900" name="arrow-m"/>
+  <symbol maxX="1392" maxY="1922" minX="1370" minY="1900" name="zero-icon"/>
+  <symbol maxX="1414" maxY="1922" minX="1392" minY="1900" name="peakt-s"/>
+  <symbol maxX="1446" maxY="1918" minX="1414" minY="1900" name="mountain-pass-m"/>
+  <symbol maxX="1464" maxY="1918" minX="1446" minY="1900" name="mast-m"/>
+  <symbol maxX="1482" maxY="1918" minX="1464" minY="1900" name="dot-m"/>
+  <symbol maxX="1525" maxY="1918" minX="1482" minY="1900" name="arrow-s"/>
+  <symbol maxX="1547" maxY="1915" minX="1525" minY="1900" name="mountain-pass-s"/>
+  <symbol maxX="1576" maxY="1911" minX="1547" minY="1900" name="arrow-xs"/>
  </file>
 </root>
diff --git a/data/resources-xxxhdpi_light/symbols.png b/data/resources-xxxhdpi_light/symbols.png
index de5df3475a..4454a9f1ec 100644
Binary files a/data/resources-xxxhdpi_light/symbols.png and b/data/resources-xxxhdpi_light/symbols.png differ
diff --git a/data/resources-xxxhdpi_light/symbols.sdf b/data/resources-xxxhdpi_light/symbols.sdf
index e1a6577459..e0e25b9883 100644
--- a/data/resources-xxxhdpi_light/symbols.sdf
+++ b/data/resources-xxxhdpi_light/symbols.sdf
@@ -733,44 +733,45 @@
   <symbol maxX="1830" maxY="1893" minX="1794" minY="1857" name="star-l"/>
   <symbol maxX="1866" maxY="1893" minX="1830" minY="1857" name="speedcam-s"/>
   <symbol maxX="1923" maxY="1893" minX="1866" minY="1857" name="railway-crossing-l"/>
-  <symbol maxX="1963" maxY="1893" minX="1923" minY="1857" name="main_entrance-s"/>
-  <symbol maxX="1999" maxY="1893" minX="1963" minY="1857" name="gate-s"/>
-  <symbol maxX="54" maxY="1936" minX="0" minY="1900" name="ford-m"/>
-  <symbol maxX="86" maxY="1936" minX="54" minY="1900" name="exit-s"/>
-  <symbol maxX="108" maxY="1936" minX="86" minY="1900" name="entrance-s"/>
-  <symbol maxX="144" maxY="1936" minX="108" minY="1900" name="cycle_barrier-s"/>
-  <symbol maxX="191" maxY="1936" minX="144" minY="1900" name="cave-m"/>
-  <symbol maxX="234" maxY="1936" minX="191" minY="1900" name="bench"/>
-  <symbol maxX="256" maxY="1936" minX="234" minY="1900" name="barrier-entrance-s"/>
-  <symbol maxX="296" maxY="1932" minX="256" minY="1900" name="volcano-m"/>
-  <symbol maxX="350" maxY="1932" minX="296" minY="1900" name="subway-minsk-m"/>
-  <symbol maxX="414" maxY="1932" minX="350" minY="1900" name="subway-malaga-s"/>
-  <symbol maxX="482" maxY="1932" minX="414" minY="1900" name="subway-malaga-m"/>
-  <symbol maxX="532" maxY="1932" minX="482" minY="1900" name="subway-kolkata-s"/>
-  <symbol maxX="586" maxY="1932" minX="532" minY="1900" name="subway-kiev-s"/>
-  <symbol maxX="654" maxY="1932" minX="586" minY="1900" name="subway-edmonton-m"/>
-  <symbol maxX="718" maxY="1932" minX="654" minY="1900" name="subway-baku-s"/>
-  <symbol maxX="750" maxY="1932" minX="718" minY="1900" name="star-m"/>
-  <symbol maxX="800" maxY="1932" minX="750" minY="1900" name="railway-crossing-m"/>
-  <symbol maxX="836" maxY="1932" minX="800" minY="1900" name="plaque"/>
-  <symbol maxX="890" maxY="1929" minX="836" minY="1900" name="subway-taipei-s"/>
-  <symbol maxX="940" maxY="1929" minX="890" minY="1900" name="subway-minsk-s"/>
-  <symbol maxX="1008" maxY="1929" minX="940" minY="1900" name="subway-chongqing-s"/>
-  <symbol maxX="1076" maxY="1929" minX="1008" minY="1900" name="subway-baku-m"/>
-  <symbol maxX="1105" maxY="1929" minX="1076" minY="1900" name="star-s"/>
-  <symbol maxX="1134" maxY="1925" minX="1105" minY="1900" name="volcano-s"/>
-  <symbol maxX="1202" maxY="1925" minX="1134" minY="1900" name="subway-chongqing-m"/>
-  <symbol maxX="1227" maxY="1925" minX="1202" minY="1900" name="power-tower-m"/>
-  <symbol maxX="1256" maxY="1925" minX="1227" minY="1900" name="peakt-m"/>
-  <symbol maxX="1292" maxY="1925" minX="1256" minY="1900" name="cave-s"/>
-  <symbol maxX="1353" maxY="1925" minX="1292" minY="1900" name="arrow-m"/>
-  <symbol maxX="1375" maxY="1922" minX="1353" minY="1900" name="zero-icon"/>
-  <symbol maxX="1397" maxY="1922" minX="1375" minY="1900" name="peakt-s"/>
-  <symbol maxX="1429" maxY="1918" minX="1397" minY="1900" name="mountain-pass-m"/>
-  <symbol maxX="1447" maxY="1918" minX="1429" minY="1900" name="mast-m"/>
-  <symbol maxX="1465" maxY="1918" minX="1447" minY="1900" name="dot-m"/>
-  <symbol maxX="1508" maxY="1918" minX="1465" minY="1900" name="arrow-s"/>
-  <symbol maxX="1530" maxY="1915" minX="1508" minY="1900" name="mountain-pass-s"/>
-  <symbol maxX="1559" maxY="1911" minX="1530" minY="1900" name="arrow-xs"/>
+  <symbol maxX="1959" maxY="1893" minX="1923" minY="1857" name="gate-s"/>
+  <symbol maxX="2013" maxY="1893" minX="1959" minY="1857" name="ford-m"/>
+  <symbol maxX="2038" maxY="1893" minX="2013" minY="1857" name="entrance-s"/>
+  <symbol maxX="43" maxY="1936" minX="0" minY="1900" name="entrance-main-s"/>
+  <symbol maxX="79" maxY="1936" minX="43" minY="1900" name="entrance-exit-s"/>
+  <symbol maxX="122" maxY="1936" minX="79" minY="1900" name="entrance-emergency-s"/>
+  <symbol maxX="147" maxY="1936" minX="122" minY="1900" name="entrance-barrier-s"/>
+  <symbol maxX="183" maxY="1936" minX="147" minY="1900" name="cycle_barrier-s"/>
+  <symbol maxX="230" maxY="1936" minX="183" minY="1900" name="cave-m"/>
+  <symbol maxX="273" maxY="1936" minX="230" minY="1900" name="bench"/>
+  <symbol maxX="313" maxY="1932" minX="273" minY="1900" name="volcano-m"/>
+  <symbol maxX="367" maxY="1932" minX="313" minY="1900" name="subway-minsk-m"/>
+  <symbol maxX="431" maxY="1932" minX="367" minY="1900" name="subway-malaga-s"/>
+  <symbol maxX="499" maxY="1932" minX="431" minY="1900" name="subway-malaga-m"/>
+  <symbol maxX="549" maxY="1932" minX="499" minY="1900" name="subway-kolkata-s"/>
+  <symbol maxX="603" maxY="1932" minX="549" minY="1900" name="subway-kiev-s"/>
+  <symbol maxX="671" maxY="1932" minX="603" minY="1900" name="subway-edmonton-m"/>
+  <symbol maxX="735" maxY="1932" minX="671" minY="1900" name="subway-baku-s"/>
+  <symbol maxX="767" maxY="1932" minX="735" minY="1900" name="star-m"/>
+  <symbol maxX="817" maxY="1932" minX="767" minY="1900" name="railway-crossing-m"/>
+  <symbol maxX="853" maxY="1932" minX="817" minY="1900" name="plaque"/>
+  <symbol maxX="907" maxY="1929" minX="853" minY="1900" name="subway-taipei-s"/>
+  <symbol maxX="957" maxY="1929" minX="907" minY="1900" name="subway-minsk-s"/>
+  <symbol maxX="1025" maxY="1929" minX="957" minY="1900" name="subway-chongqing-s"/>
+  <symbol maxX="1093" maxY="1929" minX="1025" minY="1900" name="subway-baku-m"/>
+  <symbol maxX="1122" maxY="1929" minX="1093" minY="1900" name="star-s"/>
+  <symbol maxX="1151" maxY="1925" minX="1122" minY="1900" name="volcano-s"/>
+  <symbol maxX="1219" maxY="1925" minX="1151" minY="1900" name="subway-chongqing-m"/>
+  <symbol maxX="1244" maxY="1925" minX="1219" minY="1900" name="power-tower-m"/>
+  <symbol maxX="1273" maxY="1925" minX="1244" minY="1900" name="peakt-m"/>
+  <symbol maxX="1309" maxY="1925" minX="1273" minY="1900" name="cave-s"/>
+  <symbol maxX="1370" maxY="1925" minX="1309" minY="1900" name="arrow-m"/>
+  <symbol maxX="1392" maxY="1922" minX="1370" minY="1900" name="zero-icon"/>
+  <symbol maxX="1414" maxY="1922" minX="1392" minY="1900" name="peakt-s"/>
+  <symbol maxX="1446" maxY="1918" minX="1414" minY="1900" name="mountain-pass-m"/>
+  <symbol maxX="1464" maxY="1918" minX="1446" minY="1900" name="mast-m"/>
+  <symbol maxX="1482" maxY="1918" minX="1464" minY="1900" name="dot-m"/>
+  <symbol maxX="1525" maxY="1918" minX="1482" minY="1900" name="arrow-s"/>
+  <symbol maxX="1547" maxY="1915" minX="1525" minY="1900" name="mountain-pass-s"/>
+  <symbol maxX="1576" maxY="1911" minX="1547" minY="1900" name="arrow-xs"/>
  </file>
 </root>
diff --git a/data/types.txt b/data/types.txt
index e1706e252a..7c75783741 100644
--- a/data/types.txt
+++ b/data/types.txt
@@ -1598,3 +1598,4 @@ amenity|recycling|container
 *leisure|miniature_golf
 *amenity|social_facility
 *craft
+*emergency|emergency_ward_entrance
diff --git a/data/visibility.txt b/data/visibility.txt
index 85e66635e1..cb5efe7e73 100644
--- a/data/visibility.txt
+++ b/data/visibility.txt
@@ -375,6 +375,7 @@ world  000000000000000000000  +
     emergency  000000000000000000000  +
         assembly_point  000000000000000000000  -
         defibrillator  000000000000000000000  -
+        emergency_ward_entrance  000000000000000000111  -
         fire_hydrant  000000000000000000000  -
         phone  000000000000000000000  -
         {}