diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index 456f90474a..60db19b2b4 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 4baf998a1e..1444d2894c 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -21061,6 +21061,73 @@ cont {
     }
   }
 }
+cont {
+  name: "highway-rest_area"
+  element {
+    scale: 16
+    symbol {
+      name: "picnic-m"
+      priority: 16623
+      min_distance: 10
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 16623
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "picnic-l"
+      priority: 16623
+      min_distance: 10
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 16623
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "picnic-l"
+      priority: 16623
+      min_distance: 10
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 16623
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "picnic-l"
+      priority: 16623
+      min_distance: 10
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 16623
+    }
+  }
+}
 cont {
   name: "highway-road"
   element {
@@ -57355,7 +57422,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "alcohol-m"
       priority: 16594
       min_distance: 10
     }
@@ -57422,7 +57489,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "bakery-m"
       priority: 16594
       min_distance: 10
     }
@@ -57489,7 +57556,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "beauty-m"
       priority: 16594
       min_distance: 10
     }
@@ -57556,7 +57623,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "alcohol-m"
       priority: 16594
       min_distance: 10
     }
@@ -57623,7 +57690,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "shop-bicycle-m"
       priority: 16594
       min_distance: 10
     }
@@ -57690,7 +57757,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "bookmaker-m"
       priority: 16594
       min_distance: 10
     }
@@ -57757,7 +57824,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "book-shop-m"
       priority: 16594
       min_distance: 10
     }
@@ -57824,7 +57891,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "butcher-m"
       priority: 16594
       min_distance: 10
     }
@@ -57891,7 +57958,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "car_shop-m"
       priority: 16594
       min_distance: 10
     }
@@ -57958,7 +58025,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "car-part-m"
       priority: 16594
       min_distance: 10
     }
@@ -58025,7 +58092,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "car-repair-m"
       priority: 16594
       min_distance: 10
     }
@@ -58108,7 +58175,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "car-repair-m"
       priority: 16653
       min_distance: 10
     }
@@ -58175,7 +58242,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "chemist-m"
       priority: 16594
       min_distance: 10
     }
@@ -58242,7 +58309,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "clothes-m"
       priority: 16594
       min_distance: 10
     }
@@ -58376,7 +58443,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "computer-m"
       priority: 16594
       min_distance: 10
     }
@@ -58443,7 +58510,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "sweets-m"
       priority: 16594
       min_distance: 10
     }
@@ -58510,7 +58577,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "grocery-m"
       priority: 16594
       min_distance: 10
     }
@@ -58577,7 +58644,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "copyshop-m"
       priority: 16594
       min_distance: 10
     }
@@ -58644,7 +58711,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "beauty-m"
       priority: 16594
       min_distance: 10
     }
@@ -58711,7 +58778,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "department_store-m"
       priority: 16594
       min_distance: 10
     }
@@ -58778,7 +58845,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "doityourself-m"
       priority: 16594
       min_distance: 10
     }
@@ -58845,7 +58912,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "laundry-m"
       priority: 16594
       min_distance: 10
     }
@@ -58912,7 +58979,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "electronics-m"
       priority: 16594
       min_distance: 10
     }
@@ -58979,7 +59046,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "florist-m"
       priority: 16594
       min_distance: 10
     }
@@ -59046,7 +59113,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "furniture-m"
       priority: 16594
       min_distance: 10
     }
@@ -59113,7 +59180,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "garden_center-m"
       priority: 16594
       min_distance: 10
     }
@@ -59180,7 +59247,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "gift-m"
       priority: 16594
       min_distance: 10
     }
@@ -59247,7 +59314,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "greengrocer-m"
       priority: 16594
       min_distance: 10
     }
@@ -59314,7 +59381,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "hairdresser-m"
       priority: 16594
       min_distance: 10
     }
@@ -59381,7 +59448,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "doityourself-m"
       priority: 16594
       min_distance: 10
     }
@@ -59448,7 +59515,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "jewelry-m"
       priority: 16594
       min_distance: 10
     }
@@ -59515,7 +59582,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "kiosk-m"
       priority: 16594
       min_distance: 10
     }
@@ -59582,7 +59649,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "laundry-m"
       priority: 16594
       min_distance: 10
     }
@@ -59748,7 +59815,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "mobile_phone-m"
       priority: 16594
       min_distance: 10
     }
@@ -59815,7 +59882,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "optician-m"
       priority: 16594
       min_distance: 10
     }
@@ -59882,7 +59949,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "outdoor-shop-m"
       priority: 16594
       min_distance: 10
     }
@@ -59949,7 +60016,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "petshop-m"
       priority: 16594
       min_distance: 10
     }
@@ -60016,7 +60083,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "photo-shop-m"
       priority: 16594
       min_distance: 10
     }
@@ -60083,7 +60150,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "seafood-shop-m"
       priority: 16594
       min_distance: 10
     }
@@ -60150,7 +60217,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "shoes-m"
       priority: 16594
       min_distance: 10
     }
@@ -60217,7 +60284,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "sports-m"
       priority: 16594
       min_distance: 10
     }
@@ -60450,7 +60517,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "ticket-shop-m"
       priority: 16594
       min_distance: 10
     }
@@ -60517,7 +60584,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "toys-m"
       priority: 16594
       min_distance: 10
     }
@@ -60651,7 +60718,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "car-repair-m"
       priority: 16594
       min_distance: 10
     }
@@ -60718,7 +60785,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "alcohol-m"
       priority: 16594
       min_distance: 10
     }
diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index 8fdb969390..3aae62303c 100644
Binary files a/data/drules_proto_clear.bin and b/data/drules_proto_clear.bin differ
diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt
index c27e11077b..0fa518ecf2 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -21015,6 +21015,73 @@ cont {
     }
   }
 }
+cont {
+  name: "highway-rest_area"
+  element {
+    scale: 16
+    symbol {
+      name: "picnic-m"
+      priority: 16623
+      min_distance: 10
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 16623
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "picnic-l"
+      priority: 16623
+      min_distance: 10
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 16623
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "picnic-l"
+      priority: 16623
+      min_distance: 10
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 16623
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "picnic-l"
+      priority: 16623
+      min_distance: 10
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 16623
+    }
+  }
+}
 cont {
   name: "highway-road"
   element {
@@ -56893,7 +56960,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "alcohol-m"
       priority: 16594
       min_distance: 10
     }
@@ -56960,7 +57027,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "bakery-m"
       priority: 16594
       min_distance: 10
     }
@@ -57027,7 +57094,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "beauty-m"
       priority: 16594
       min_distance: 10
     }
@@ -57094,7 +57161,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "alcohol-m"
       priority: 16594
       min_distance: 10
     }
@@ -57161,7 +57228,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "shop-bicycle-m"
       priority: 16594
       min_distance: 10
     }
@@ -57228,7 +57295,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "bookmaker-m"
       priority: 16594
       min_distance: 10
     }
@@ -57295,7 +57362,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "book-shop-m"
       priority: 16594
       min_distance: 10
     }
@@ -57362,7 +57429,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "butcher-m"
       priority: 16594
       min_distance: 10
     }
@@ -57429,7 +57496,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "car_shop-m"
       priority: 16594
       min_distance: 10
     }
@@ -57496,7 +57563,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "car-part-m"
       priority: 16594
       min_distance: 10
     }
@@ -57563,7 +57630,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "car-repair-m"
       priority: 16594
       min_distance: 10
     }
@@ -57646,7 +57713,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "car-repair-m"
       priority: 16653
       min_distance: 10
     }
@@ -57713,7 +57780,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "chemist-m"
       priority: 16594
       min_distance: 10
     }
@@ -57780,7 +57847,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "clothes-m"
       priority: 16594
       min_distance: 10
     }
@@ -57914,7 +57981,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "computer-m"
       priority: 16594
       min_distance: 10
     }
@@ -57981,7 +58048,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "sweets-m"
       priority: 16594
       min_distance: 10
     }
@@ -58048,7 +58115,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "grocery-m"
       priority: 16594
       min_distance: 10
     }
@@ -58115,7 +58182,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "copyshop-m"
       priority: 16594
       min_distance: 10
     }
@@ -58182,7 +58249,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "beauty-m"
       priority: 16594
       min_distance: 10
     }
@@ -58249,7 +58316,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "department_store-m"
       priority: 16594
       min_distance: 10
     }
@@ -58316,7 +58383,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "doityourself-m"
       priority: 16594
       min_distance: 10
     }
@@ -58383,7 +58450,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "laundry-m"
       priority: 16594
       min_distance: 10
     }
@@ -58450,7 +58517,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "electronics-m"
       priority: 16594
       min_distance: 10
     }
@@ -58517,7 +58584,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "florist-m"
       priority: 16594
       min_distance: 10
     }
@@ -58584,7 +58651,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "furniture-m"
       priority: 16594
       min_distance: 10
     }
@@ -58651,7 +58718,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "garden_center-m"
       priority: 16594
       min_distance: 10
     }
@@ -58718,7 +58785,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "gift-m"
       priority: 16594
       min_distance: 10
     }
@@ -58785,7 +58852,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "greengrocer-m"
       priority: 16594
       min_distance: 10
     }
@@ -58852,7 +58919,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "hairdresser-m"
       priority: 16594
       min_distance: 10
     }
@@ -58919,7 +58986,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "doityourself-m"
       priority: 16594
       min_distance: 10
     }
@@ -58986,7 +59053,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "jewelry-m"
       priority: 16594
       min_distance: 10
     }
@@ -59053,7 +59120,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "kiosk-m"
       priority: 16594
       min_distance: 10
     }
@@ -59120,7 +59187,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "laundry-m"
       priority: 16594
       min_distance: 10
     }
@@ -59286,7 +59353,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "mobile_phone-m"
       priority: 16594
       min_distance: 10
     }
@@ -59353,7 +59420,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "optician-m"
       priority: 16594
       min_distance: 10
     }
@@ -59420,7 +59487,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "outdoor-shop-m"
       priority: 16594
       min_distance: 10
     }
@@ -59487,7 +59554,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "petshop-m"
       priority: 16594
       min_distance: 10
     }
@@ -59554,7 +59621,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "photo-shop-m"
       priority: 16594
       min_distance: 10
     }
@@ -59621,7 +59688,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "seafood-shop-m"
       priority: 16594
       min_distance: 10
     }
@@ -59688,7 +59755,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "shoes-m"
       priority: 16594
       min_distance: 10
     }
@@ -59755,7 +59822,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "sports-m"
       priority: 16594
       min_distance: 10
     }
@@ -59956,7 +60023,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "ticket-shop-m"
       priority: 16594
       min_distance: 10
     }
@@ -60023,7 +60090,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "toys-m"
       priority: 16594
       min_distance: 10
     }
@@ -60157,7 +60224,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "car-repair-m"
       priority: 16594
       min_distance: 10
     }
@@ -60224,7 +60291,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "alcohol-m"
       priority: 16594
       min_distance: 10
     }
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index 5ccd499730..f53099cba7 100644
Binary files a/data/drules_proto_dark.bin and b/data/drules_proto_dark.bin differ
diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt
index 2488715cc1..2d15ed5680 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -21015,6 +21015,73 @@ cont {
     }
   }
 }
+cont {
+  name: "highway-rest_area"
+  element {
+    scale: 16
+    symbol {
+      name: "picnic-m"
+      priority: 16623
+      min_distance: 10
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 16623
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "picnic-l"
+      priority: 16623
+      min_distance: 10
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 16623
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "picnic-l"
+      priority: 16623
+      min_distance: 10
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 16623
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "picnic-l"
+      priority: 16623
+      min_distance: 10
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 16623
+    }
+  }
+}
 cont {
   name: "highway-road"
   element {
@@ -56893,7 +56960,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "alcohol-m"
       priority: 16594
       min_distance: 10
     }
@@ -56960,7 +57027,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "bakery-m"
       priority: 16594
       min_distance: 10
     }
@@ -57027,7 +57094,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "beauty-m"
       priority: 16594
       min_distance: 10
     }
@@ -57094,7 +57161,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "alcohol-m"
       priority: 16594
       min_distance: 10
     }
@@ -57161,7 +57228,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "shop-bicycle-m"
       priority: 16594
       min_distance: 10
     }
@@ -57228,7 +57295,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "bookmaker-m"
       priority: 16594
       min_distance: 10
     }
@@ -57295,7 +57362,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "book-shop-m"
       priority: 16594
       min_distance: 10
     }
@@ -57362,7 +57429,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "butcher-m"
       priority: 16594
       min_distance: 10
     }
@@ -57429,7 +57496,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "car_shop-m"
       priority: 16594
       min_distance: 10
     }
@@ -57496,7 +57563,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "car-part-m"
       priority: 16594
       min_distance: 10
     }
@@ -57563,7 +57630,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "car-repair-m"
       priority: 16594
       min_distance: 10
     }
@@ -57646,7 +57713,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "car-repair-m"
       priority: 16653
       min_distance: 10
     }
@@ -57713,7 +57780,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "chemist-m"
       priority: 16594
       min_distance: 10
     }
@@ -57780,7 +57847,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "clothes-m"
       priority: 16594
       min_distance: 10
     }
@@ -57914,7 +57981,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "computer-m"
       priority: 16594
       min_distance: 10
     }
@@ -57981,7 +58048,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "sweets-m"
       priority: 16594
       min_distance: 10
     }
@@ -58048,7 +58115,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "grocery-m"
       priority: 16594
       min_distance: 10
     }
@@ -58115,7 +58182,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "copyshop-m"
       priority: 16594
       min_distance: 10
     }
@@ -58182,7 +58249,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "beauty-m"
       priority: 16594
       min_distance: 10
     }
@@ -58249,7 +58316,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "department_store-m"
       priority: 16594
       min_distance: 10
     }
@@ -58316,7 +58383,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "doityourself-m"
       priority: 16594
       min_distance: 10
     }
@@ -58383,7 +58450,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "laundry-m"
       priority: 16594
       min_distance: 10
     }
@@ -58450,7 +58517,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "electronics-m"
       priority: 16594
       min_distance: 10
     }
@@ -58517,7 +58584,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "florist-m"
       priority: 16594
       min_distance: 10
     }
@@ -58584,7 +58651,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "furniture-m"
       priority: 16594
       min_distance: 10
     }
@@ -58651,7 +58718,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "garden_center-m"
       priority: 16594
       min_distance: 10
     }
@@ -58718,7 +58785,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "gift-m"
       priority: 16594
       min_distance: 10
     }
@@ -58785,7 +58852,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "greengrocer-m"
       priority: 16594
       min_distance: 10
     }
@@ -58852,7 +58919,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "hairdresser-m"
       priority: 16594
       min_distance: 10
     }
@@ -58919,7 +58986,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "doityourself-m"
       priority: 16594
       min_distance: 10
     }
@@ -58986,7 +59053,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "jewelry-m"
       priority: 16594
       min_distance: 10
     }
@@ -59053,7 +59120,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "kiosk-m"
       priority: 16594
       min_distance: 10
     }
@@ -59120,7 +59187,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "laundry-m"
       priority: 16594
       min_distance: 10
     }
@@ -59286,7 +59353,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "mobile_phone-m"
       priority: 16594
       min_distance: 10
     }
@@ -59353,7 +59420,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "optician-m"
       priority: 16594
       min_distance: 10
     }
@@ -59420,7 +59487,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "outdoor-shop-m"
       priority: 16594
       min_distance: 10
     }
@@ -59487,7 +59554,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "petshop-m"
       priority: 16594
       min_distance: 10
     }
@@ -59554,7 +59621,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "photo-shop-m"
       priority: 16594
       min_distance: 10
     }
@@ -59621,7 +59688,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "seafood-shop-m"
       priority: 16594
       min_distance: 10
     }
@@ -59688,7 +59755,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "shoes-m"
       priority: 16594
       min_distance: 10
     }
@@ -59755,7 +59822,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "sports-m"
       priority: 16594
       min_distance: 10
     }
@@ -59956,7 +60023,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "ticket-shop-m"
       priority: 16594
       min_distance: 10
     }
@@ -60023,7 +60090,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "toys-m"
       priority: 16594
       min_distance: 10
     }
@@ -60157,7 +60224,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "car-repair-m"
       priority: 16594
       min_distance: 10
     }
@@ -60224,7 +60291,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "alcohol-m"
       priority: 16594
       min_distance: 10
     }
diff --git a/data/resources-6plus_clear/symbols-ad.png b/data/resources-6plus_clear/symbols-ad.png
index 291bf1e26d..17c2b35e7a 100644
Binary files a/data/resources-6plus_clear/symbols-ad.png and b/data/resources-6plus_clear/symbols-ad.png differ
diff --git a/data/resources-6plus_clear/symbols.png b/data/resources-6plus_clear/symbols.png
index 0c1ceea5b1..63cfeb8b4b 100644
Binary files a/data/resources-6plus_clear/symbols.png and b/data/resources-6plus_clear/symbols.png differ
diff --git a/data/resources-6plus_clear/symbols.sdf b/data/resources-6plus_clear/symbols.sdf
index d399e294db..71d206e7fa 100644
--- a/data/resources-6plus_clear/symbols.sdf
+++ b/data/resources-6plus_clear/symbols.sdf
@@ -391,255 +391,256 @@
   <symbol minX="406" maxX="464" minY="824" maxY="882" name="parking-meter-l"/>
   <symbol minX="464" maxX="522" minY="824" maxY="882" name="parking-meter-m"/>
   <symbol minX="522" maxX="580" minY="824" maxY="882" name="parking-xl"/>
-  <symbol minX="580" maxX="632" minY="824" maxY="881" name="shield-us-hw-thin"/>
-  <symbol minX="632" maxX="694" minY="824" maxY="881" name="shield-us-hw-wide"/>
+  <symbol minX="580" maxX="642" minY="824" maxY="881" name="shield-us-hw-wide"/>
+  <symbol minX="642" maxX="694" minY="824" maxY="881" name="shield-us-hw-thin"/>
   <symbol minX="694" maxX="750" minY="824" maxY="880" name="atm-tinkoff-gerb-m"/>
-  <symbol minX="750" maxX="806" minY="824" maxY="880" name="volcano-m"/>
-  <symbol minX="806" maxX="862" minY="824" maxY="880" name="cave-m"/>
-  <symbol minX="862" maxX="918" minY="824" maxY="880" name="atm-tinkoff-shield-m"/>
-  <symbol minX="918" maxX="974" minY="824" maxY="880" name="subway-spb-m"/>
+  <symbol minX="750" maxX="806" minY="824" maxY="880" name="atm-tinkoff-shield-m"/>
+  <symbol minX="806" maxX="862" minY="824" maxY="880" name="subway-spb-m"/>
+  <symbol minX="862" maxX="918" minY="824" maxY="880" name="volcano-m"/>
+  <symbol minX="918" maxX="974" minY="824" maxY="880" name="cave-m"/>
   <symbol minX="974" maxX="1032" minY="824" maxY="879" name="lightrail-berlin-l"/>
   <symbol minX="1032" maxX="1090" minY="824" maxY="879" name="speedcam1-xl"/>
   <symbol minX="1090" maxX="1144" minY="824" maxY="878" name="subway-entrance-m"/>
   <symbol minX="1144" maxX="1196" minY="824" maxY="876" name="current-position"/>
-  <symbol minX="1196" maxX="1254" minY="824" maxY="875" name="subway-moscow-l"/>
-  <symbol minX="1254" maxX="1305" minY="824" maxY="875" name="subway-berlin-l"/>
-  <symbol minX="1305" maxX="1356" minY="824" maxY="875" name="subway-rome-l"/>
-  <symbol minX="1356" maxX="1407" minY="824" maxY="875" name="lightrail-berlin-m"/>
-  <symbol minX="1407" maxX="1456" minY="824" maxY="873" name="speedcam-m"/>
-  <symbol minX="1456" maxX="1505" minY="824" maxY="873" name="parking_pay-m"/>
+  <symbol minX="1196" maxX="1247" minY="824" maxY="875" name="subway-berlin-l"/>
+  <symbol minX="1247" maxX="1305" minY="824" maxY="875" name="subway-moscow-l"/>
+  <symbol minX="1305" maxX="1356" minY="824" maxY="875" name="lightrail-berlin-m"/>
+  <symbol minX="1356" maxX="1407" minY="824" maxY="875" name="subway-rome-l"/>
+  <symbol minX="1407" maxX="1456" minY="824" maxY="873" name="parking_pay-m"/>
+  <symbol minX="1456" maxX="1505" minY="824" maxY="873" name="bike-parking-m"/>
   <symbol minX="1505" maxX="1554" minY="824" maxY="873" name="parking-m"/>
-  <symbol minX="1554" maxX="1603" minY="824" maxY="873" name="bike-parking-m"/>
-  <symbol minX="1603" maxX="1650" minY="824" maxY="871" name="subway-berlin-m"/>
+  <symbol minX="1554" maxX="1603" minY="824" maxY="873" name="speedcam-m"/>
+  <symbol minX="1603" maxX="1650" minY="824" maxY="871" name="subway-paris-m"/>
   <symbol minX="1650" maxX="1704" minY="824" maxY="871" name="subway-moscow-m"/>
-  <symbol minX="1704" maxX="1751" minY="824" maxY="871" name="subway-paris-m"/>
-  <symbol minX="1751" maxX="1798" minY="824" maxY="871" name="subway-rome-m"/>
+  <symbol minX="1704" maxX="1751" minY="824" maxY="871" name="subway-rome-m"/>
+  <symbol minX="1751" maxX="1798" minY="824" maxY="871" name="subway-berlin-m"/>
   <symbol minX="1798" maxX="1856" minY="824" maxY="869" name="subway-london-l"/>
   <symbol minX="1856" maxX="1898" minY="824" maxY="866" name="subway-spb-s"/>
-  <symbol minX="1898" maxX="1940" minY="824" maxY="866" name="cave-s"/>
-  <symbol minX="1940" maxX="1982" minY="824" maxY="866" name="atm-tinkoff-gerb-s"/>
-  <symbol minX="1982" maxX="2038" minY="824" maxY="866" name="subway-london-m"/>
-  <symbol minX="0" maxX="58" minY="882" maxY="924" name="subway-madrid-m"/>
-  <symbol minX="58" maxX="100" minY="882" maxY="924" name="atm-tinkoff-shield-s"/>
-  <symbol minX="100" maxX="142" minY="882" maxY="924" name="volcano-s"/>
-  <symbol minX="142" maxX="193" minY="882" maxY="924" name="subway-barcelona-s"/>
-  <symbol minX="193" maxX="251" minY="882" maxY="924" name="subway-barcelona-m"/>
-  <symbol minX="251" maxX="309" minY="882" maxY="923" name="subway-barcelona-l"/>
-  <symbol minX="309" maxX="367" minY="882" maxY="923" name="subway-madrid-l"/>
-  <symbol minX="367" maxX="407" minY="882" maxY="922" name="postbox-s"/>
-  <symbol minX="407" maxX="447" minY="882" maxY="922" name="lift_gate-s"/>
-  <symbol minX="447" maxX="487" minY="882" maxY="922" name="library-s"/>
-  <symbol minX="487" maxX="527" minY="882" maxY="922" name="power-s"/>
-  <symbol minX="527" maxX="567" minY="882" maxY="922" name="lawyer-s"/>
-  <symbol minX="567" maxX="607" minY="882" maxY="922" name="laundry-s"/>
-  <symbol minX="607" maxX="647" minY="882" maxY="922" name="public-building-s"/>
-  <symbol minX="647" maxX="687" minY="882" maxY="922" name="phone-s"/>
-  <symbol minX="687" maxX="727" minY="882" maxY="922" name="lighthouse-s"/>
-  <symbol minX="727" maxX="767" minY="882" maxY="922" name="npark-s"/>
-  <symbol minX="767" maxX="807" minY="882" maxY="922" name="atm-s"/>
-  <symbol minX="807" maxX="847" minY="882" maxY="922" name="kiosk-s"/>
-  <symbol minX="847" maxX="887" minY="882" maxY="922" name="recycling-s"/>
-  <symbol minX="887" maxX="927" minY="882" maxY="922" name="kindergarten-s"/>
-  <symbol minX="927" maxX="967" minY="882" maxY="922" name="jewish-s"/>
-  <symbol minX="967" maxX="1007" minY="882" maxY="922" name="remains-s"/>
-  <symbol minX="1007" maxX="1047" minY="882" maxY="922" name="jewelry-s"/>
-  <symbol minX="1047" maxX="1087" minY="882" maxY="922" name="information-s"/>
-  <symbol minX="1087" maxX="1127" minY="882" maxY="922" name="restaurant-s"/>
-  <symbol minX="1127" maxX="1167" minY="882" maxY="922" name="hunting-tower-s"/>
-  <symbol minX="1167" maxX="1207" minY="882" maxY="922" name="hotel-s"/>
-  <symbol minX="1207" maxX="1247" minY="882" maxY="922" name="hostel-s"/>
-  <symbol minX="1247" maxX="1287" minY="882" maxY="922" name="sauna-s"/>
-  <symbol minX="1287" maxX="1327" minY="882" maxY="922" name="hospital-s"/>
-  <symbol minX="1327" maxX="1367" minY="882" maxY="922" name="historic-ship-s"/>
-  <symbol minX="1367" maxX="1407" minY="882" maxY="922" name="school-s"/>
-  <symbol minX="1407" maxX="1447" minY="882" maxY="922" name="hindu-s"/>
-  <symbol minX="1447" maxX="1487" minY="882" maxY="922" name="heliport-s"/>
-  <symbol minX="1487" maxX="1527" minY="882" maxY="922" name="seafood-shop-s"/>
-  <symbol minX="1527" maxX="1567" minY="882" maxY="922" name="helipad-s"/>
-  <symbol minX="1567" maxX="1607" minY="882" maxY="922" name="hardware-s"/>
-  <symbol minX="1607" maxX="1647" minY="882" maxY="922" name="shinto-s"/>
-  <symbol minX="1647" maxX="1687" minY="882" maxY="922" name="hand-s"/>
-  <symbol minX="1687" maxX="1727" minY="882" maxY="922" name="hairdresser-s"/>
-  <symbol minX="1727" maxX="1767" minY="882" maxY="922" name="ship-s"/>
-  <symbol minX="1767" maxX="1807" minY="882" maxY="922" name="gym-s"/>
-  <symbol minX="1807" maxX="1847" minY="882" maxY="922" name="grocery-s"/>
-  <symbol minX="1847" maxX="1887" minY="882" maxY="922" name="shoes-s"/>
-  <symbol minX="1887" maxX="1927" minY="882" maxY="922" name="greengrocer-s"/>
-  <symbol minX="1927" maxX="1967" minY="882" maxY="922" name="golf-s"/>
-  <symbol minX="1967" maxX="2007" minY="882" maxY="922" name="shop-bicycle-s"/>
-  <symbol minX="2007" maxX="2047" minY="882" maxY="922" name="gift-s"/>
-  <symbol minX="0" maxX="40" minY="924" maxY="964" name="gate-s"/>
-  <symbol minX="40" maxX="80" minY="924" maxY="964" name="shop-s"/>
-  <symbol minX="80" maxX="120" minY="924" maxY="964" name="garden_center-s"/>
-  <symbol minX="120" maxX="160" minY="924" maxY="964" name="garden-s"/>
-  <symbol minX="160" maxX="200" minY="924" maxY="964" name="gallery-s"/>
-  <symbol minX="200" maxX="240" minY="924" maxY="964" name="skiing-s"/>
-  <symbol minX="240" maxX="280" minY="924" maxY="964" name="furniture-s"/>
-  <symbol minX="280" maxX="320" minY="924" maxY="964" name="funicular-s"/>
-  <symbol minX="320" maxX="360" minY="924" maxY="964" name="soccer-s"/>
-  <symbol minX="360" maxX="400" minY="924" maxY="964" name="fuel-s"/>
-  <symbol minX="400" maxX="440" minY="924" maxY="964" name="nparkf-s"/>
-  <symbol minX="440" maxX="480" minY="924" maxY="964" name="alcohol-s"/>
-  <symbol minX="480" maxX="520" minY="924" maxY="964" name="fountain-s"/>
-  <symbol minX="520" maxX="560" minY="924" maxY="964" name="pharmacy-s"/>
-  <symbol minX="560" maxX="600" minY="924" maxY="964" name="florist-s"/>
-  <symbol minX="600" maxX="640" minY="924" maxY="964" name="firehydrant-s"/>
-  <symbol minX="640" maxX="680" minY="924" maxY="964" name="sports-s"/>
-  <symbol minX="680" maxX="720" minY="924" maxY="964" name="fire_station-s"/>
-  <symbol minX="720" maxX="760" minY="924" maxY="964" name="fastfood-s"/>
-  <symbol minX="760" maxX="800" minY="924" maxY="964" name="stadium-s"/>
-  <symbol minX="800" maxX="840" minY="924" maxY="964" name="australian-football-s"/>
-  <symbol minX="840" maxX="880" minY="924" maxY="964" name="search-result"/>
-  <symbol minX="880" maxX="920" minY="924" maxY="964" name="bakery-s"/>
-  <symbol minX="920" maxX="960" minY="924" maxY="964" name="muslim-s"/>
-  <symbol minX="960" maxX="1000" minY="924" maxY="964" name="police-s"/>
-  <symbol minX="1000" maxX="1040" minY="924" maxY="964" name="museum-s"/>
-  <symbol minX="1040" maxX="1080" minY="924" maxY="964" name="office-s"/>
-  <symbol minX="1080" maxX="1120" minY="924" maxY="964" name="photo-shop-s"/>
-  <symbol minX="1120" maxX="1160" minY="924" maxY="964" name="alpine_hut-s"/>
-  <symbol minX="1160" maxX="1200" minY="924" maxY="964" name="equestrian-s"/>
-  <symbol minX="1200" maxX="1240" minY="924" maxY="964" name="optician-s"/>
-  <symbol minX="1240" maxX="1280" minY="924" maxY="964" name="subway-entrance-s"/>
-  <symbol minX="1280" maxX="1320" minY="924" maxY="964" name="waste-basket-s"/>
-  <symbol minX="1320" maxX="1360" minY="924" maxY="964" name="bowls-s"/>
-  <symbol minX="1360" maxX="1400" minY="924" maxY="964" name="bank-s"/>
-  <symbol minX="1400" maxX="1440" minY="924" maxY="964" name="banknote-s"/>
-  <symbol minX="1440" maxX="1480" minY="924" maxY="964" name="buddhist-s"/>
-  <symbol minX="1480" maxX="1520" minY="924" maxY="964" name="motorcycle_shop-s"/>
-  <symbol minX="1520" maxX="1560" minY="924" maxY="964" name="america-football-s"/>
-  <symbol minX="1560" maxX="1600" minY="924" maxY="964" name="bar-s"/>
-  <symbol minX="1600" maxX="1640" minY="924" maxY="964" name="mail-s"/>
-  <symbol minX="1640" maxX="1680" minY="924" maxY="964" name="place-of-worship-s"/>
-  <symbol minX="1680" maxX="1720" minY="924" maxY="964" name="motel-s"/>
-  <symbol minX="1720" maxX="1760" minY="924" maxY="964" name="baseball-s"/>
-  <symbol minX="1760" maxX="1800" minY="924" maxY="964" name="apartment-s"/>
-  <symbol minX="1800" maxX="1840" minY="924" maxY="964" name="basketball-s"/>
-  <symbol minX="1840" maxX="1880" minY="924" maxY="964" name="petshop-s"/>
-  <symbol minX="1880" maxX="1920" minY="924" maxY="964" name="marketplace-s"/>
-  <symbol minX="1920" maxX="1960" minY="924" maxY="964" name="bbq-s"/>
-  <symbol minX="1960" maxX="2000" minY="924" maxY="964" name="embassy-s"/>
-  <symbol minX="2000" maxX="2040" minY="924" maxY="964" name="electronics-s"/>
-  <symbol minX="0" maxX="40" minY="964" maxY="1004" name="subway-newyork-s"/>
-  <symbol minX="40" maxX="80" minY="964" maxY="1004" name="archery-s"/>
-  <symbol minX="80" maxX="120" minY="964" maxY="1004" name="drinking-water-s"/>
-  <symbol minX="120" maxX="160" minY="964" maxY="1004" name="military-s"/>
-  <symbol minX="160" maxX="200" minY="964" maxY="1004" name="parking-meter-s"/>
-  <symbol minX="200" maxX="240" minY="964" maxY="1004" name="outdoor-shop-s"/>
-  <symbol minX="240" maxX="280" minY="964" maxY="1004" name="pitch-s"/>
-  <symbol minX="280" maxX="320" minY="964" maxY="1004" name="park-s"/>
-  <symbol minX="320" maxX="360" minY="964" maxY="1004" name="subway-s"/>
-  <symbol minX="360" maxX="400" minY="964" maxY="1004" name="bcontrol-s"/>
-  <symbol minX="400" maxX="440" minY="964" maxY="1004" name="airport-s"/>
-  <symbol minX="440" maxX="480" minY="964" maxY="1004" name="mobile_phone-s"/>
-  <symbol minX="480" maxX="520" minY="964" maxY="1004" name="beach-s"/>
-  <symbol minX="520" maxX="560" minY="964" maxY="1004" name="bus-s"/>
-  <symbol minX="560" maxX="600" minY="964" maxY="1004" name="zoo-s"/>
-  <symbol minX="600" maxX="640" minY="964" maxY="1004" name="beauty-s"/>
-  <symbol minX="640" maxX="680" minY="964" maxY="1004" name="beer-s"/>
-  <symbol minX="680" maxX="720" minY="964" maxY="1004" name="doityourself-s"/>
-  <symbol minX="720" maxX="760" minY="964" maxY="1004" name="sweets-s"/>
-  <symbol minX="760" maxX="800" minY="964" maxY="1004" name="dog_park-s"/>
-  <symbol minX="800" maxX="840" minY="964" maxY="1004" name="diving-s"/>
-  <symbol minX="840" maxX="880" minY="964" maxY="1004" name="swimming-s"/>
-  <symbol minX="880" maxX="920" minY="964" maxY="1004" name="department_store-s"/>
-  <symbol minX="920" maxX="960" minY="964" maxY="1004" name="dentist-s"/>
-  <symbol minX="960" maxX="1000" minY="964" maxY="1004" name="taoist-s"/>
-  <symbol minX="1000" maxX="1040" minY="964" maxY="1004" name="curling-s"/>
-  <symbol minX="1040" maxX="1080" minY="964" maxY="1004" name="windmill-s"/>
-  <symbol minX="1080" maxX="1120" minY="964" maxY="1004" name="taxi-s"/>
-  <symbol minX="1120" maxX="1160" minY="964" maxY="1004" name="bicycle-s"/>
-  <symbol minX="1160" maxX="1200" minY="964" maxY="1004" name="wayside_shrine-s"/>
-  <symbol minX="1200" maxX="1240" minY="964" maxY="1004" name="tennis-s"/>
-  <symbol minX="1240" maxX="1280" minY="964" maxY="1004" name="cricket-s"/>
-  <symbol minX="1280" maxX="1320" minY="964" maxY="1004" name="copyshop-s"/>
-  <symbol minX="1320" maxX="1360" minY="964" maxY="1004" name="theatre-s"/>
-  <symbol minX="1360" maxX="1400" minY="964" maxY="1004" name="convenience-s"/>
-  <symbol minX="1400" maxX="1440" minY="964" maxY="1004" name="computer-s"/>
-  <symbol minX="1440" maxX="1480" minY="964" maxY="1004" name="ticket-shop-s"/>
-  <symbol minX="1480" maxX="1520" minY="964" maxY="1004" name="college-s"/>
-  <symbol minX="1520" maxX="1560" minY="964" maxY="1004" name="clothes-s"/>
-  <symbol minX="1560" maxX="1600" minY="964" maxY="1004" name="tire-repair-s"/>
-  <symbol minX="1600" maxX="1640" minY="964" maxY="1004" name="climbing-s"/>
-  <symbol minX="1640" maxX="1680" minY="964" maxY="1004" name="viewpoint-s"/>
-  <symbol minX="1680" maxX="1720" minY="964" maxY="1004" name="toilets-s"/>
-  <symbol minX="1720" maxX="1760" minY="964" maxY="1004" name="waterfall-s"/>
-  <symbol minX="1760" maxX="1800" minY="964" maxY="1004" name="book-shop-s"/>
-  <symbol minX="1800" maxX="1840" minY="964" maxY="1004" name="toll_booth-s"/>
-  <symbol minX="1840" maxX="1880" minY="964" maxY="1004" name="cinema-s"/>
-  <symbol minX="1880" maxX="1920" minY="964" maxY="1004" name="christian-s"/>
-  <symbol minX="1920" maxX="1960" minY="964" maxY="1004" name="chimney-s"/>
-  <symbol minX="1960" maxX="2000" minY="964" maxY="1004" name="tomb-s"/>
-  <symbol minX="2000" maxX="2040" minY="964" maxY="1004" name="chemist-s"/>
-  <symbol minX="0" maxX="40" minY="1004" maxY="1044" name="charging-station-s"/>
-  <symbol minX="40" maxX="80" minY="1004" maxY="1044" name="tourism-s"/>
-  <symbol minX="80" maxX="120" minY="1004" maxY="1044" name="cemetery-s"/>
-  <symbol minX="120" maxX="160" minY="1004" maxY="1044" name="monument-s"/>
-  <symbol minX="160" maxX="200" minY="1004" maxY="1044" name="toys-s"/>
-  <symbol minX="200" maxX="240" minY="1004" maxY="1044" name="picnic-s"/>
-  <symbol minX="240" maxX="280" minY="1004" maxY="1044" name="casino-s"/>
-  <symbol minX="280" maxX="320" minY="1004" maxY="1044" name="train-s"/>
-  <symbol minX="320" maxX="360" minY="1004" maxY="1044" name="bookmaker-s"/>
-  <symbol minX="360" maxX="400" minY="1004" maxY="1044" name="caravan_site-s"/>
-  <symbol minX="400" maxX="440" minY="1004" maxY="1044" name="car_shop-s"/>
-  <symbol minX="440" maxX="480" minY="1004" maxY="1044" name="tram-s"/>
-  <symbol minX="480" maxX="520" minY="1004" maxY="1044" name="car_sharing-s"/>
-  <symbol minX="520" maxX="560" minY="1004" maxY="1044" name="car-wash-s"/>
-  <symbol minX="560" maxX="600" minY="1004" maxY="1044" name="travel_agency_shop-s"/>
-  <symbol minX="600" maxX="640" minY="1004" maxY="1044" name="car-repair-s"/>
-  <symbol minX="640" maxX="680" minY="1004" maxY="1044" name="car-part-s"/>
-  <symbol minX="680" maxX="720" minY="1004" maxY="1044" name="vending-s"/>
-  <symbol minX="720" maxX="760" minY="1004" maxY="1044" name="campsite-s"/>
-  <symbol minX="760" maxX="800" minY="1004" maxY="1044" name="cafe-s"/>
-  <symbol minX="800" maxX="840" minY="1004" maxY="1044" name="veterinary-s"/>
-  <symbol minX="840" maxX="880" minY="1004" maxY="1044" name="cable-car-s"/>
-  <symbol minX="880" maxX="920" minY="1004" maxY="1044" name="butcher-s"/>
-  <symbol minX="920" maxX="958" minY="1004" maxY="1042" name="peakt-l"/>
-  <symbol minX="958" maxX="996" minY="1004" maxY="1042" name="api-result"/>
-  <symbol minX="996" maxX="1034" minY="1004" maxY="1042" name="subway-paris-s"/>
-  <symbol minX="1034" maxX="1085" minY="1004" maxY="1042" name="subway-madrid-s"/>
-  <symbol minX="1085" maxX="1123" minY="1004" maxY="1042" name="lightrail-berlin-s"/>
-  <symbol minX="1123" maxX="1179" minY="1004" maxY="1042" name="subway-kiev-m"/>
-  <symbol minX="1179" maxX="1235" minY="1004" maxY="1042" name="subway-kiev-l"/>
-  <symbol minX="1235" maxX="1271" minY="1004" maxY="1040" name="subway-moscow-s"/>
-  <symbol minX="1271" maxX="1329" minY="1004" maxY="1040" name="railway-crossing-xl"/>
-  <symbol minX="1329" maxX="1362" minY="1004" maxY="1037" name="subway-berlin-s"/>
-  <symbol minX="1362" maxX="1404" minY="1004" maxY="1037" name="subway-london-s"/>
-  <symbol minX="1404" maxX="1437" minY="1004" maxY="1037" name="subway-rome-s"/>
-  <symbol minX="1437" maxX="1475" minY="1004" maxY="1037" name="bench"/>
-  <symbol minX="1475" maxX="1506" minY="1004" maxY="1035" name="parking-s"/>
-  <symbol minX="1506" maxX="1562" minY="1004" maxY="1035" name="subway-minsk-l"/>
-  <symbol minX="1562" maxX="1593" minY="1004" maxY="1035" name="parking_pay-s"/>
-  <symbol minX="1593" maxX="1624" minY="1004" maxY="1035" name="bike-parking-s"/>
-  <symbol minX="1624" maxX="1673" minY="1004" maxY="1035" name="railway-crossing-l"/>
-  <symbol minX="1673" maxX="1704" minY="1004" maxY="1035" name="train-xs"/>
-  <symbol minX="1704" maxX="1735" minY="1004" maxY="1035" name="subway-newyork-xs"/>
-  <symbol minX="1735" maxX="1766" minY="1004" maxY="1035" name="survey_point-l"/>
-  <symbol minX="1766" maxX="1797" minY="1004" maxY="1035" name="subway-xs"/>
-  <symbol minX="1797" maxX="1828" minY="1004" maxY="1035" name="star-l"/>
-  <symbol minX="1828" maxX="1859" minY="1004" maxY="1035" name="speedcam-s"/>
-  <symbol minX="1859" maxX="1906" minY="1004" maxY="1033" name="subway-kiev-s"/>
-  <symbol minX="1906" maxX="1935" minY="1004" maxY="1033" name="star-m"/>
-  <symbol minX="1935" maxX="1977" minY="1004" maxY="1031" name="railway-crossing"/>
-  <symbol minX="1977" maxX="2004" minY="1004" maxY="1031" name="survey_point-m"/>
-  <symbol minX="2004" maxX="2033" minY="1004" maxY="1031" name="peakt-m"/>
-  <symbol minX="0" maxX="47" minY="1044" maxY="1071" name="subway-minsk-m"/>
-  <symbol minX="47" maxX="89" minY="1044" maxY="1068" name="subway-minsk-s"/>
-  <symbol minX="89" maxX="113" minY="1044" maxY="1068" name="crossing-l"/>
-  <symbol minX="113" maxX="137" minY="1044" maxY="1068" name="star-s"/>
-  <symbol minX="137" maxX="188" minY="1044" maxY="1066" name="arrow-m"/>
-  <symbol minX="188" maxX="212" minY="1044" maxY="1066" name="peakt-s"/>
-  <symbol minX="212" maxX="234" minY="1044" maxY="1066" name="survey_point-s"/>
-  <symbol minX="234" maxX="254" minY="1044" maxY="1064" name="zero-icon"/>
-  <symbol minX="254" maxX="274" minY="1044" maxY="1064" name="crossing-m"/>
-  <symbol minX="274" maxX="294" minY="1044" maxY="1064" name="entrance-s"/>
-  <symbol minX="294" maxX="309" minY="1044" maxY="1059" name="cities-m"/>
-  <symbol minX="309" maxX="324" minY="1044" maxY="1059" name="crossing-s"/>
-  <symbol minX="324" maxX="362" minY="1044" maxY="1059" name="arrow-s"/>
-  <symbol minX="362" maxX="377" minY="1044" maxY="1059" name="dot-m"/>
-  <symbol minX="377" maxX="390" minY="1044" maxY="1057" name="entrance-xs"/>
-  <symbol minX="390" maxX="401" minY="1044" maxY="1055" name="cities-s"/>
-  <symbol minX="401" maxX="412" minY="1044" maxY="1055" name="dot-s"/>
-  <symbol minX="412" maxX="423" minY="1044" maxY="1055" name="cities-xs"/>
-  <symbol minX="423" maxX="447" minY="1044" maxY="1055" name="arrow-xs"/>
+  <symbol minX="1898" maxX="1949" minY="824" maxY="866" name="subway-barcelona-s"/>
+  <symbol minX="1949" maxX="2007" minY="824" maxY="866" name="subway-barcelona-m"/>
+  <symbol minX="0" maxX="42" minY="882" maxY="924" name="atm-tinkoff-gerb-s"/>
+  <symbol minX="42" maxX="98" minY="882" maxY="924" name="subway-london-m"/>
+  <symbol minX="98" maxX="156" minY="882" maxY="924" name="subway-madrid-m"/>
+  <symbol minX="156" maxX="198" minY="882" maxY="924" name="volcano-s"/>
+  <symbol minX="198" maxX="240" minY="882" maxY="924" name="cave-s"/>
+  <symbol minX="240" maxX="282" minY="882" maxY="924" name="atm-tinkoff-shield-s"/>
+  <symbol minX="282" maxX="340" minY="882" maxY="923" name="subway-barcelona-l"/>
+  <symbol minX="340" maxX="398" minY="882" maxY="923" name="subway-madrid-l"/>
+  <symbol minX="398" maxX="438" minY="882" maxY="922" name="postbox-s"/>
+  <symbol minX="438" maxX="478" minY="882" maxY="922" name="lift_gate-s"/>
+  <symbol minX="478" maxX="518" minY="882" maxY="922" name="library-s"/>
+  <symbol minX="518" maxX="558" minY="882" maxY="922" name="power-s"/>
+  <symbol minX="558" maxX="598" minY="882" maxY="922" name="lawyer-s"/>
+  <symbol minX="598" maxX="638" minY="882" maxY="922" name="laundry-s"/>
+  <symbol minX="638" maxX="678" minY="882" maxY="922" name="public-building-s"/>
+  <symbol minX="678" maxX="718" minY="882" maxY="922" name="lighthouse-s"/>
+  <symbol minX="718" maxX="758" minY="882" maxY="922" name="police-s"/>
+  <symbol minX="758" maxX="798" minY="882" maxY="922" name="bookmaker-s"/>
+  <symbol minX="798" maxX="838" minY="882" maxY="922" name="atm-s"/>
+  <symbol minX="838" maxX="878" minY="882" maxY="922" name="kiosk-s"/>
+  <symbol minX="878" maxX="918" minY="882" maxY="922" name="recycling-s"/>
+  <symbol minX="918" maxX="958" minY="882" maxY="922" name="kindergarten-s"/>
+  <symbol minX="958" maxX="998" minY="882" maxY="922" name="jewish-s"/>
+  <symbol minX="998" maxX="1038" minY="882" maxY="922" name="remains-s"/>
+  <symbol minX="1038" maxX="1078" minY="882" maxY="922" name="jewelry-s"/>
+  <symbol minX="1078" maxX="1118" minY="882" maxY="922" name="information-s"/>
+  <symbol minX="1118" maxX="1158" minY="882" maxY="922" name="restaurant-s"/>
+  <symbol minX="1158" maxX="1198" minY="882" maxY="922" name="hunting-tower-s"/>
+  <symbol minX="1198" maxX="1238" minY="882" maxY="922" name="hotel-s"/>
+  <symbol minX="1238" maxX="1278" minY="882" maxY="922" name="hostel-s"/>
+  <symbol minX="1278" maxX="1318" minY="882" maxY="922" name="sauna-s"/>
+  <symbol minX="1318" maxX="1358" minY="882" maxY="922" name="hospital-s"/>
+  <symbol minX="1358" maxX="1398" minY="882" maxY="922" name="historic-ship-s"/>
+  <symbol minX="1398" maxX="1438" minY="882" maxY="922" name="school-s"/>
+  <symbol minX="1438" maxX="1478" minY="882" maxY="922" name="hindu-s"/>
+  <symbol minX="1478" maxX="1518" minY="882" maxY="922" name="heliport-s"/>
+  <symbol minX="1518" maxX="1558" minY="882" maxY="922" name="seafood-shop-s"/>
+  <symbol minX="1558" maxX="1598" minY="882" maxY="922" name="helipad-s"/>
+  <symbol minX="1598" maxX="1638" minY="882" maxY="922" name="hardware-s"/>
+  <symbol minX="1638" maxX="1678" minY="882" maxY="922" name="shinto-s"/>
+  <symbol minX="1678" maxX="1718" minY="882" maxY="922" name="hand-s"/>
+  <symbol minX="1718" maxX="1758" minY="882" maxY="922" name="hairdresser-s"/>
+  <symbol minX="1758" maxX="1798" minY="882" maxY="922" name="ship-s"/>
+  <symbol minX="1798" maxX="1838" minY="882" maxY="922" name="gym-s"/>
+  <symbol minX="1838" maxX="1878" minY="882" maxY="922" name="grocery-s"/>
+  <symbol minX="1878" maxX="1918" minY="882" maxY="922" name="shoes-s"/>
+  <symbol minX="1918" maxX="1958" minY="882" maxY="922" name="greengrocer-s"/>
+  <symbol minX="1958" maxX="1998" minY="882" maxY="922" name="golf-s"/>
+  <symbol minX="1998" maxX="2038" minY="882" maxY="922" name="shop-bicycle-s"/>
+  <symbol minX="0" maxX="40" minY="924" maxY="964" name="gift-s"/>
+  <symbol minX="40" maxX="80" minY="924" maxY="964" name="gate-s"/>
+  <symbol minX="80" maxX="120" minY="924" maxY="964" name="shop-s"/>
+  <symbol minX="120" maxX="160" minY="924" maxY="964" name="garden_center-s"/>
+  <symbol minX="160" maxX="200" minY="924" maxY="964" name="garden-s"/>
+  <symbol minX="200" maxX="240" minY="924" maxY="964" name="gallery-s"/>
+  <symbol minX="240" maxX="280" minY="924" maxY="964" name="skiing-s"/>
+  <symbol minX="280" maxX="320" minY="924" maxY="964" name="furniture-s"/>
+  <symbol minX="320" maxX="360" minY="924" maxY="964" name="funicular-s"/>
+  <symbol minX="360" maxX="400" minY="924" maxY="964" name="soccer-s"/>
+  <symbol minX="400" maxX="440" minY="924" maxY="964" name="fuel-s"/>
+  <symbol minX="440" maxX="480" minY="924" maxY="964" name="mail-s"/>
+  <symbol minX="480" maxX="520" minY="924" maxY="964" name="alcohol-s"/>
+  <symbol minX="520" maxX="560" minY="924" maxY="964" name="fountain-s"/>
+  <symbol minX="560" maxX="600" minY="924" maxY="964" name="place-of-worship-s"/>
+  <symbol minX="600" maxX="640" minY="924" maxY="964" name="florist-s"/>
+  <symbol minX="640" maxX="680" minY="924" maxY="964" name="firehydrant-s"/>
+  <symbol minX="680" maxX="720" minY="924" maxY="964" name="sports-s"/>
+  <symbol minX="720" maxX="760" minY="924" maxY="964" name="fire_station-s"/>
+  <symbol minX="760" maxX="800" minY="924" maxY="964" name="fastfood-s"/>
+  <symbol minX="800" maxX="840" minY="924" maxY="964" name="stadium-s"/>
+  <symbol minX="840" maxX="880" minY="924" maxY="964" name="australian-football-s"/>
+  <symbol minX="880" maxX="920" minY="924" maxY="964" name="search-result"/>
+  <symbol minX="920" maxX="960" minY="924" maxY="964" name="bakery-s"/>
+  <symbol minX="960" maxX="1000" minY="924" maxY="964" name="marketplace-s"/>
+  <symbol minX="1000" maxX="1040" minY="924" maxY="964" name="military-s"/>
+  <symbol minX="1040" maxX="1080" minY="924" maxY="964" name="pitch-s"/>
+  <symbol minX="1080" maxX="1120" minY="924" maxY="964" name="mobile_phone-s"/>
+  <symbol minX="1120" maxX="1160" minY="924" maxY="964" name="monument-s"/>
+  <symbol minX="1160" maxX="1200" minY="924" maxY="964" name="alpine_hut-s"/>
+  <symbol minX="1200" maxX="1240" minY="924" maxY="964" name="equestrian-s"/>
+  <symbol minX="1240" maxX="1280" minY="924" maxY="964" name="picnic-s"/>
+  <symbol minX="1280" maxX="1320" minY="924" maxY="964" name="subway-entrance-s"/>
+  <symbol minX="1320" maxX="1360" minY="924" maxY="964" name="waste-basket-s"/>
+  <symbol minX="1360" maxX="1400" minY="924" maxY="964" name="bowls-s"/>
+  <symbol minX="1400" maxX="1440" minY="924" maxY="964" name="bank-s"/>
+  <symbol minX="1440" maxX="1480" minY="924" maxY="964" name="banknote-s"/>
+  <symbol minX="1480" maxX="1520" minY="924" maxY="964" name="motel-s"/>
+  <symbol minX="1520" maxX="1560" minY="924" maxY="964" name="motorcycle_shop-s"/>
+  <symbol minX="1560" maxX="1600" minY="924" maxY="964" name="america-football-s"/>
+  <symbol minX="1600" maxX="1640" minY="924" maxY="964" name="bar-s"/>
+  <symbol minX="1640" maxX="1680" minY="924" maxY="964" name="photo-shop-s"/>
+  <symbol minX="1680" maxX="1720" minY="924" maxY="964" name="museum-s"/>
+  <symbol minX="1720" maxX="1760" minY="924" maxY="964" name="buddhist-s"/>
+  <symbol minX="1760" maxX="1800" minY="924" maxY="964" name="baseball-s"/>
+  <symbol minX="1800" maxX="1840" minY="924" maxY="964" name="apartment-s"/>
+  <symbol minX="1840" maxX="1880" minY="924" maxY="964" name="basketball-s"/>
+  <symbol minX="1880" maxX="1920" minY="924" maxY="964" name="muslim-s"/>
+  <symbol minX="1920" maxX="1960" minY="924" maxY="964" name="phone-s"/>
+  <symbol minX="1960" maxX="2000" minY="924" maxY="964" name="bbq-s"/>
+  <symbol minX="2000" maxX="2040" minY="924" maxY="964" name="embassy-s"/>
+  <symbol minX="0" maxX="40" minY="964" maxY="1004" name="electronics-s"/>
+  <symbol minX="40" maxX="80" minY="964" maxY="1004" name="subway-newyork-s"/>
+  <symbol minX="80" maxX="120" minY="964" maxY="1004" name="archery-s"/>
+  <symbol minX="120" maxX="160" minY="964" maxY="1004" name="drinking-water-s"/>
+  <symbol minX="160" maxX="200" minY="964" maxY="1004" name="npark-s"/>
+  <symbol minX="200" maxX="240" minY="964" maxY="1004" name="parking-meter-s"/>
+  <symbol minX="240" maxX="280" minY="964" maxY="1004" name="nparkf-s"/>
+  <symbol minX="280" maxX="320" minY="964" maxY="1004" name="pharmacy-s"/>
+  <symbol minX="320" maxX="360" minY="964" maxY="1004" name="non-found-search-result"/>
+  <symbol minX="360" maxX="400" minY="964" maxY="1004" name="subway-s"/>
+  <symbol minX="400" maxX="440" minY="964" maxY="1004" name="office-s"/>
+  <symbol minX="440" maxX="480" minY="964" maxY="1004" name="optician-s"/>
+  <symbol minX="480" maxX="520" minY="964" maxY="1004" name="petshop-s"/>
+  <symbol minX="520" maxX="560" minY="964" maxY="1004" name="bcontrol-s"/>
+  <symbol minX="560" maxX="600" minY="964" maxY="1004" name="beach-s"/>
+  <symbol minX="600" maxX="640" minY="964" maxY="1004" name="bus-s"/>
+  <symbol minX="640" maxX="680" minY="964" maxY="1004" name="zoo-s"/>
+  <symbol minX="680" maxX="720" minY="964" maxY="1004" name="beauty-s"/>
+  <symbol minX="720" maxX="760" minY="964" maxY="1004" name="doityourself-s"/>
+  <symbol minX="760" maxX="800" minY="964" maxY="1004" name="sweets-s"/>
+  <symbol minX="800" maxX="840" minY="964" maxY="1004" name="dog_park-s"/>
+  <symbol minX="840" maxX="880" minY="964" maxY="1004" name="diving-s"/>
+  <symbol minX="880" maxX="920" minY="964" maxY="1004" name="swimming-s"/>
+  <symbol minX="920" maxX="960" minY="964" maxY="1004" name="department_store-s"/>
+  <symbol minX="960" maxX="1000" minY="964" maxY="1004" name="dentist-s"/>
+  <symbol minX="1000" maxX="1040" minY="964" maxY="1004" name="taoist-s"/>
+  <symbol minX="1040" maxX="1080" minY="964" maxY="1004" name="curling-s"/>
+  <symbol minX="1080" maxX="1120" minY="964" maxY="1004" name="beer-s"/>
+  <symbol minX="1120" maxX="1160" minY="964" maxY="1004" name="taxi-s"/>
+  <symbol minX="1160" maxX="1200" minY="964" maxY="1004" name="windmill-s"/>
+  <symbol minX="1200" maxX="1240" minY="964" maxY="1004" name="bicycle-s"/>
+  <symbol minX="1240" maxX="1280" minY="964" maxY="1004" name="tennis-s"/>
+  <symbol minX="1280" maxX="1320" minY="964" maxY="1004" name="cricket-s"/>
+  <symbol minX="1320" maxX="1360" minY="964" maxY="1004" name="copyshop-s"/>
+  <symbol minX="1360" maxX="1400" minY="964" maxY="1004" name="theatre-s"/>
+  <symbol minX="1400" maxX="1440" minY="964" maxY="1004" name="convenience-s"/>
+  <symbol minX="1440" maxX="1480" minY="964" maxY="1004" name="computer-s"/>
+  <symbol minX="1480" maxX="1520" minY="964" maxY="1004" name="ticket-shop-s"/>
+  <symbol minX="1520" maxX="1560" minY="964" maxY="1004" name="college-s"/>
+  <symbol minX="1560" maxX="1600" minY="964" maxY="1004" name="clothes-s"/>
+  <symbol minX="1600" maxX="1640" minY="964" maxY="1004" name="tire-repair-s"/>
+  <symbol minX="1640" maxX="1680" minY="964" maxY="1004" name="climbing-s"/>
+  <symbol minX="1680" maxX="1720" minY="964" maxY="1004" name="wayside_shrine-s"/>
+  <symbol minX="1720" maxX="1760" minY="964" maxY="1004" name="toilets-s"/>
+  <symbol minX="1760" maxX="1800" minY="964" maxY="1004" name="outdoor-shop-s"/>
+  <symbol minX="1800" maxX="1840" minY="964" maxY="1004" name="waterfall-s"/>
+  <symbol minX="1840" maxX="1880" minY="964" maxY="1004" name="toll_booth-s"/>
+  <symbol minX="1880" maxX="1920" minY="964" maxY="1004" name="cinema-s"/>
+  <symbol minX="1920" maxX="1960" minY="964" maxY="1004" name="christian-s"/>
+  <symbol minX="1960" maxX="2000" minY="964" maxY="1004" name="chimney-s"/>
+  <symbol minX="2000" maxX="2040" minY="964" maxY="1004" name="tomb-s"/>
+  <symbol minX="0" maxX="40" minY="1004" maxY="1044" name="chemist-s"/>
+  <symbol minX="40" maxX="80" minY="1004" maxY="1044" name="charging-station-s"/>
+  <symbol minX="80" maxX="120" minY="1004" maxY="1044" name="tourism-s"/>
+  <symbol minX="120" maxX="160" minY="1004" maxY="1044" name="cemetery-s"/>
+  <symbol minX="160" maxX="200" minY="1004" maxY="1044" name="park-s"/>
+  <symbol minX="200" maxX="240" minY="1004" maxY="1044" name="toys-s"/>
+  <symbol minX="240" maxX="280" minY="1004" maxY="1044" name="airport-s"/>
+  <symbol minX="280" maxX="320" minY="1004" maxY="1044" name="casino-s"/>
+  <symbol minX="320" maxX="360" minY="1004" maxY="1044" name="train-s"/>
+  <symbol minX="360" maxX="400" minY="1004" maxY="1044" name="book-shop-s"/>
+  <symbol minX="400" maxX="440" minY="1004" maxY="1044" name="caravan_site-s"/>
+  <symbol minX="440" maxX="480" minY="1004" maxY="1044" name="car_shop-s"/>
+  <symbol minX="480" maxX="520" minY="1004" maxY="1044" name="tram-s"/>
+  <symbol minX="520" maxX="560" minY="1004" maxY="1044" name="car_sharing-s"/>
+  <symbol minX="560" maxX="600" minY="1004" maxY="1044" name="car-wash-s"/>
+  <symbol minX="600" maxX="640" minY="1004" maxY="1044" name="travel_agency_shop-s"/>
+  <symbol minX="640" maxX="680" minY="1004" maxY="1044" name="car-repair-s"/>
+  <symbol minX="680" maxX="720" minY="1004" maxY="1044" name="car-part-s"/>
+  <symbol minX="720" maxX="760" minY="1004" maxY="1044" name="vending-s"/>
+  <symbol minX="760" maxX="800" minY="1004" maxY="1044" name="campsite-s"/>
+  <symbol minX="800" maxX="840" minY="1004" maxY="1044" name="cafe-s"/>
+  <symbol minX="840" maxX="880" minY="1004" maxY="1044" name="veterinary-s"/>
+  <symbol minX="880" maxX="920" minY="1004" maxY="1044" name="cable-car-s"/>
+  <symbol minX="920" maxX="960" minY="1004" maxY="1044" name="butcher-s"/>
+  <symbol minX="960" maxX="1000" minY="1004" maxY="1044" name="viewpoint-s"/>
+  <symbol minX="1000" maxX="1038" minY="1004" maxY="1042" name="api-result"/>
+  <symbol minX="1038" maxX="1076" minY="1004" maxY="1042" name="peakt-l"/>
+  <symbol minX="1076" maxX="1114" minY="1004" maxY="1042" name="subway-paris-s"/>
+  <symbol minX="1114" maxX="1165" minY="1004" maxY="1042" name="subway-madrid-s"/>
+  <symbol minX="1165" maxX="1221" minY="1004" maxY="1042" name="subway-kiev-m"/>
+  <symbol minX="1221" maxX="1277" minY="1004" maxY="1042" name="subway-kiev-l"/>
+  <symbol minX="1277" maxX="1315" minY="1004" maxY="1042" name="lightrail-berlin-s"/>
+  <symbol minX="1315" maxX="1351" minY="1004" maxY="1040" name="subway-moscow-s"/>
+  <symbol minX="1351" maxX="1409" minY="1004" maxY="1040" name="railway-crossing-xl"/>
+  <symbol minX="1409" maxX="1442" minY="1004" maxY="1037" name="subway-berlin-s"/>
+  <symbol minX="1442" maxX="1484" minY="1004" maxY="1037" name="subway-london-s"/>
+  <symbol minX="1484" maxX="1517" minY="1004" maxY="1037" name="subway-rome-s"/>
+  <symbol minX="1517" maxX="1555" minY="1004" maxY="1037" name="bench"/>
+  <symbol minX="1555" maxX="1586" minY="1004" maxY="1035" name="parking-s"/>
+  <symbol minX="1586" maxX="1642" minY="1004" maxY="1035" name="subway-minsk-l"/>
+  <symbol minX="1642" maxX="1673" minY="1004" maxY="1035" name="parking_pay-s"/>
+  <symbol minX="1673" maxX="1704" minY="1004" maxY="1035" name="bike-parking-s"/>
+  <symbol minX="1704" maxX="1735" minY="1004" maxY="1035" name="star-l"/>
+  <symbol minX="1735" maxX="1766" minY="1004" maxY="1035" name="subway-newyork-xs"/>
+  <symbol minX="1766" maxX="1797" minY="1004" maxY="1035" name="speedcam-s"/>
+  <symbol minX="1797" maxX="1828" minY="1004" maxY="1035" name="survey_point-l"/>
+  <symbol minX="1828" maxX="1859" minY="1004" maxY="1035" name="subway-xs"/>
+  <symbol minX="1859" maxX="1908" minY="1004" maxY="1035" name="railway-crossing-l"/>
+  <symbol minX="1908" maxX="1939" minY="1004" maxY="1035" name="train-xs"/>
+  <symbol minX="1939" maxX="1986" minY="1004" maxY="1033" name="subway-kiev-s"/>
+  <symbol minX="1986" maxX="2015" minY="1004" maxY="1033" name="star-m"/>
+  <symbol minX="0" maxX="42" minY="1044" maxY="1071" name="railway-crossing"/>
+  <symbol minX="42" maxX="89" minY="1044" maxY="1071" name="subway-minsk-m"/>
+  <symbol minX="89" maxX="118" minY="1044" maxY="1071" name="peakt-m"/>
+  <symbol minX="118" maxX="145" minY="1044" maxY="1071" name="survey_point-m"/>
+  <symbol minX="145" maxX="169" minY="1044" maxY="1068" name="crossing-l"/>
+  <symbol minX="169" maxX="211" minY="1044" maxY="1068" name="subway-minsk-s"/>
+  <symbol minX="211" maxX="235" minY="1044" maxY="1068" name="star-s"/>
+  <symbol minX="235" maxX="257" minY="1044" maxY="1066" name="survey_point-s"/>
+  <symbol minX="257" maxX="308" minY="1044" maxY="1066" name="arrow-m"/>
+  <symbol minX="308" maxX="332" minY="1044" maxY="1066" name="peakt-s"/>
+  <symbol minX="332" maxX="352" minY="1044" maxY="1064" name="crossing-m"/>
+  <symbol minX="352" maxX="372" minY="1044" maxY="1064" name="zero-icon"/>
+  <symbol minX="372" maxX="392" minY="1044" maxY="1064" name="entrance-s"/>
+  <symbol minX="392" maxX="430" minY="1044" maxY="1059" name="arrow-s"/>
+  <symbol minX="430" maxX="445" minY="1044" maxY="1059" name="cities-m"/>
+  <symbol minX="445" maxX="460" minY="1044" maxY="1059" name="crossing-s"/>
+  <symbol minX="460" maxX="475" minY="1044" maxY="1059" name="dot-m"/>
+  <symbol minX="475" maxX="488" minY="1044" maxY="1057" name="entrance-xs"/>
+  <symbol minX="488" maxX="499" minY="1044" maxY="1055" name="dot-s"/>
+  <symbol minX="499" maxX="510" minY="1044" maxY="1055" name="cities-s"/>
+  <symbol minX="510" maxX="534" minY="1044" maxY="1055" name="arrow-xs"/>
+  <symbol minX="534" maxX="545" minY="1044" maxY="1055" name="cities-xs"/>
  </file>
 </root>
diff --git a/data/resources-6plus_dark/symbols-ad.png b/data/resources-6plus_dark/symbols-ad.png
index 291bf1e26d..eac73e3cad 100644
Binary files a/data/resources-6plus_dark/symbols-ad.png and b/data/resources-6plus_dark/symbols-ad.png differ
diff --git a/data/resources-6plus_dark/symbols.png b/data/resources-6plus_dark/symbols.png
index 5fe4565ff6..8d24d1163c 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 6a6970328c..7522845bb2 100644
--- a/data/resources-6plus_dark/symbols.sdf
+++ b/data/resources-6plus_dark/symbols.sdf
@@ -26,7 +26,7 @@
   <symbol minX="1554" maxX="1616" minY="0" maxY="62" name="shield-us-i-wide"/>
   <symbol minX="1616" maxX="1674" minY="0" maxY="58" name="airport-l"/>
   <symbol minX="1674" maxX="1732" minY="0" maxY="58" name="atm-tinkoff-gerb-l"/>
-  <symbol minX="1732" maxX="1790" minY="0" maxY="58" name="laundry-l"/>
+  <symbol minX="1732" maxX="1790" minY="0" maxY="58" name="laundry-m"/>
   <symbol minX="1790" maxX="1848" minY="0" maxY="58" name="airport-m"/>
   <symbol minX="1848" maxX="1906" minY="0" maxY="58" name="atm-tinkoff-shield-l"/>
   <symbol minX="1906" maxX="1964" minY="0" maxY="58" name="alcohol-l"/>
@@ -321,8 +321,8 @@
   <symbol minX="406" maxX="464" minY="708" maxY="766" name="kiosk-l"/>
   <symbol minX="464" maxX="522" minY="708" maxY="766" name="kiosk-m"/>
   <symbol minX="522" maxX="580" minY="708" maxY="766" name="recycling-m"/>
-  <symbol minX="580" maxX="638" minY="708" maxY="766" name="recycling-l"/>
-  <symbol minX="638" maxX="696" minY="708" maxY="766" name="laundry-m"/>
+  <symbol minX="580" maxX="638" minY="708" maxY="766" name="laundry-l"/>
+  <symbol minX="638" maxX="696" minY="708" maxY="766" name="recycling-l"/>
   <symbol minX="696" maxX="754" minY="708" maxY="766" name="public-building-m"/>
   <symbol minX="754" maxX="812" minY="708" maxY="766" name="lawyer-l"/>
   <symbol minX="812" maxX="870" minY="708" maxY="766" name="lawyer-m"/>
@@ -393,38 +393,38 @@
   <symbol minX="522" maxX="580" minY="824" maxY="882" name="parking-meter-m"/>
   <symbol minX="580" maxX="638" minY="824" maxY="882" name="parking_pay-l"/>
   <symbol minX="638" maxX="696" minY="824" maxY="882" name="parking-xl"/>
-  <symbol minX="696" maxX="758" minY="824" maxY="881" name="shield-us-hw-wide"/>
-  <symbol minX="758" maxX="810" minY="824" maxY="881" name="shield-us-hw-thin"/>
-  <symbol minX="810" maxX="866" minY="824" maxY="880" name="atm-tinkoff-gerb-m"/>
+  <symbol minX="696" maxX="748" minY="824" maxY="881" name="shield-us-hw-thin"/>
+  <symbol minX="748" maxX="810" minY="824" maxY="881" name="shield-us-hw-wide"/>
+  <symbol minX="810" maxX="866" minY="824" maxY="880" name="subway-spb-m"/>
   <symbol minX="866" maxX="922" minY="824" maxY="880" name="atm-tinkoff-shield-m"/>
   <symbol minX="922" maxX="978" minY="824" maxY="880" name="volcano-m"/>
   <symbol minX="978" maxX="1034" minY="824" maxY="880" name="cave-m"/>
-  <symbol minX="1034" maxX="1090" minY="824" maxY="880" name="subway-spb-m"/>
-  <symbol minX="1090" maxX="1148" minY="824" maxY="878" name="speedcam1-xl"/>
-  <symbol minX="1148" maxX="1202" minY="824" maxY="878" name="subway-entrance-m"/>
+  <symbol minX="1034" maxX="1090" minY="824" maxY="880" name="atm-tinkoff-gerb-m"/>
+  <symbol minX="1090" maxX="1144" minY="824" maxY="878" name="subway-entrance-m"/>
+  <symbol minX="1144" maxX="1202" minY="824" maxY="878" name="speedcam1-xl"/>
   <symbol minX="1202" maxX="1254" minY="824" maxY="876" name="current-position"/>
-  <symbol minX="1254" maxX="1312" minY="824" maxY="875" name="subway-moscow-l"/>
-  <symbol minX="1312" maxX="1363" minY="824" maxY="875" name="subway-berlin-l"/>
-  <symbol minX="1363" maxX="1414" minY="824" maxY="875" name="lightrail-berlin-m"/>
-  <symbol minX="1414" maxX="1465" minY="824" maxY="875" name="subway-rome-l"/>
+  <symbol minX="1254" maxX="1305" minY="824" maxY="875" name="subway-rome-l"/>
+  <symbol minX="1305" maxX="1356" minY="824" maxY="875" name="lightrail-berlin-m"/>
+  <symbol minX="1356" maxX="1407" minY="824" maxY="875" name="subway-berlin-l"/>
+  <symbol minX="1407" maxX="1465" minY="824" maxY="875" name="subway-moscow-l"/>
   <symbol minX="1465" maxX="1514" minY="824" maxY="873" name="speedcam-m"/>
-  <symbol minX="1514" maxX="1563" minY="824" maxY="873" name="bike-parking-m"/>
+  <symbol minX="1514" maxX="1563" minY="824" maxY="873" name="parking_pay-m"/>
   <symbol minX="1563" maxX="1612" minY="824" maxY="873" name="parking-m"/>
-  <symbol minX="1612" maxX="1661" minY="824" maxY="873" name="parking_pay-m"/>
-  <symbol minX="1661" maxX="1715" minY="824" maxY="871" name="subway-moscow-m"/>
-  <symbol minX="1715" maxX="1762" minY="824" maxY="871" name="subway-paris-m"/>
-  <symbol minX="1762" maxX="1809" minY="824" maxY="871" name="subway-berlin-m"/>
-  <symbol minX="1809" maxX="1856" minY="824" maxY="871" name="subway-rome-m"/>
+  <symbol minX="1612" maxX="1661" minY="824" maxY="873" name="bike-parking-m"/>
+  <symbol minX="1661" maxX="1708" minY="824" maxY="871" name="subway-paris-m"/>
+  <symbol minX="1708" maxX="1762" minY="824" maxY="871" name="subway-moscow-m"/>
+  <symbol minX="1762" maxX="1809" minY="824" maxY="871" name="subway-rome-m"/>
+  <symbol minX="1809" maxX="1856" minY="824" maxY="871" name="subway-berlin-m"/>
   <symbol minX="1856" maxX="1914" minY="824" maxY="869" name="subway-london-l"/>
   <symbol minX="1914" maxX="1970" minY="824" maxY="866" name="subway-london-m"/>
-  <symbol minX="1970" maxX="2012" minY="824" maxY="866" name="volcano-s"/>
-  <symbol minX="0" maxX="51" minY="882" maxY="924" name="subway-barcelona-s"/>
-  <symbol minX="51" maxX="109" minY="882" maxY="924" name="subway-barcelona-m"/>
-  <symbol minX="109" maxX="151" minY="882" maxY="924" name="cave-s"/>
-  <symbol minX="151" maxX="193" minY="882" maxY="924" name="atm-tinkoff-gerb-s"/>
-  <symbol minX="193" maxX="251" minY="882" maxY="924" name="subway-madrid-m"/>
-  <symbol minX="251" maxX="293" minY="882" maxY="924" name="subway-spb-s"/>
-  <symbol minX="293" maxX="335" minY="882" maxY="924" name="atm-tinkoff-shield-s"/>
+  <symbol minX="1970" maxX="2012" minY="824" maxY="866" name="atm-tinkoff-shield-s"/>
+  <symbol minX="0" maxX="42" minY="882" maxY="924" name="subway-spb-s"/>
+  <symbol minX="42" maxX="100" minY="882" maxY="924" name="subway-madrid-m"/>
+  <symbol minX="100" maxX="142" minY="882" maxY="924" name="cave-s"/>
+  <symbol minX="142" maxX="193" minY="882" maxY="924" name="subway-barcelona-s"/>
+  <symbol minX="193" maxX="251" minY="882" maxY="924" name="subway-barcelona-m"/>
+  <symbol minX="251" maxX="293" minY="882" maxY="924" name="volcano-s"/>
+  <symbol minX="293" maxX="335" minY="882" maxY="924" name="atm-tinkoff-gerb-s"/>
   <symbol minX="335" maxX="393" minY="882" maxY="923" name="subway-barcelona-l"/>
   <symbol minX="393" maxX="451" minY="882" maxY="923" name="subway-madrid-l"/>
   <symbol minX="451" maxX="491" minY="882" maxY="922" name="postbox-s"/>
@@ -434,9 +434,9 @@
   <symbol minX="611" maxX="651" minY="882" maxY="922" name="lawyer-s"/>
   <symbol minX="651" maxX="691" minY="882" maxY="922" name="laundry-s"/>
   <symbol minX="691" maxX="731" minY="882" maxY="922" name="public-building-s"/>
-  <symbol minX="731" maxX="771" minY="882" maxY="922" name="lighthouse-s"/>
-  <symbol minX="771" maxX="811" minY="882" maxY="922" name="bookmaker-s"/>
-  <symbol minX="811" maxX="851" minY="882" maxY="922" name="police-s"/>
+  <symbol minX="731" maxX="771" minY="882" maxY="922" name="parking-meter-s"/>
+  <symbol minX="771" maxX="811" minY="882" maxY="922" name="bicycle-s"/>
+  <symbol minX="811" maxX="851" minY="882" maxY="922" name="airport-s"/>
   <symbol minX="851" maxX="891" minY="882" maxY="922" name="atm-s"/>
   <symbol minX="891" maxX="931" minY="882" maxY="922" name="kiosk-s"/>
   <symbol minX="931" maxX="971" minY="882" maxY="922" name="recycling-s"/>
@@ -479,10 +479,10 @@
   <symbol minX="400" maxX="440" minY="924" maxY="964" name="funicular-s"/>
   <symbol minX="440" maxX="480" minY="924" maxY="964" name="soccer-s"/>
   <symbol minX="480" maxX="520" minY="924" maxY="964" name="fuel-s"/>
-  <symbol minX="520" maxX="560" minY="924" maxY="964" name="waste-basket-s"/>
-  <symbol minX="560" maxX="600" minY="924" maxY="964" name="mail-s"/>
+  <symbol minX="520" maxX="560" minY="924" maxY="964" name="lighthouse-s"/>
+  <symbol minX="560" maxX="600" minY="924" maxY="964" name="wayside_shrine-s"/>
   <symbol minX="600" maxX="640" minY="924" maxY="964" name="fountain-s"/>
-  <symbol minX="640" maxX="680" minY="924" maxY="964" name="marketplace-s"/>
+  <symbol minX="640" maxX="680" minY="924" maxY="964" name="police-s"/>
   <symbol minX="680" maxX="720" minY="924" maxY="964" name="florist-s"/>
   <symbol minX="720" maxX="760" minY="924" maxY="964" name="firehydrant-s"/>
   <symbol minX="760" maxX="800" minY="924" maxY="964" name="sports-s"/>
@@ -492,51 +492,51 @@
   <symbol minX="920" maxX="960" minY="924" maxY="964" name="alcohol-s"/>
   <symbol minX="960" maxX="1000" minY="924" maxY="964" name="australian-football-s"/>
   <symbol minX="1000" maxX="1040" minY="924" maxY="964" name="search-result"/>
-  <symbol minX="1040" maxX="1080" minY="924" maxY="964" name="place-of-worship-s"/>
-  <symbol minX="1080" maxX="1120" minY="924" maxY="964" name="military-s"/>
-  <symbol minX="1120" maxX="1160" minY="924" maxY="964" name="mobile_phone-s"/>
-  <symbol minX="1160" maxX="1200" minY="924" maxY="964" name="pitch-s"/>
-  <symbol minX="1200" maxX="1240" minY="924" maxY="964" name="monument-s"/>
-  <symbol minX="1240" maxX="1280" minY="924" maxY="964" name="bakery-s"/>
+  <symbol minX="1040" maxX="1080" minY="924" maxY="964" name="petshop-s"/>
+  <symbol minX="1080" maxX="1120" minY="924" maxY="964" name="mail-s"/>
+  <symbol minX="1120" maxX="1160" minY="924" maxY="964" name="marketplace-s"/>
+  <symbol minX="1160" maxX="1200" minY="924" maxY="964" name="place-of-worship-s"/>
+  <symbol minX="1200" maxX="1240" minY="924" maxY="964" name="military-s"/>
+  <symbol minX="1240" maxX="1280" minY="924" maxY="964" name="waterfall-s"/>
   <symbol minX="1280" maxX="1320" minY="924" maxY="964" name="equestrian-s"/>
-  <symbol minX="1320" maxX="1360" minY="924" maxY="964" name="motel-s"/>
+  <symbol minX="1320" maxX="1360" minY="924" maxY="964" name="mobile_phone-s"/>
   <symbol minX="1360" maxX="1400" minY="924" maxY="964" name="subway-entrance-s"/>
-  <symbol minX="1400" maxX="1440" minY="924" maxY="964" name="bowls-s"/>
-  <symbol minX="1440" maxX="1480" minY="924" maxY="964" name="buddhist-s"/>
-  <symbol minX="1480" maxX="1520" minY="924" maxY="964" name="alpine_hut-s"/>
-  <symbol minX="1520" maxX="1560" minY="924" maxY="964" name="bank-s"/>
-  <symbol minX="1560" maxX="1600" minY="924" maxY="964" name="picnic-s"/>
-  <symbol minX="1600" maxX="1640" minY="924" maxY="964" name="motorcycle_shop-s"/>
-  <symbol minX="1640" maxX="1680" minY="924" maxY="964" name="banknote-s"/>
-  <symbol minX="1680" maxX="1720" minY="924" maxY="964" name="america-football-s"/>
-  <symbol minX="1720" maxX="1760" minY="924" maxY="964" name="museum-s"/>
-  <symbol minX="1760" maxX="1800" minY="924" maxY="964" name="photo-shop-s"/>
-  <symbol minX="1800" maxX="1840" minY="924" maxY="964" name="parking-meter-s"/>
-  <symbol minX="1840" maxX="1880" minY="924" maxY="964" name="bar-s"/>
-  <symbol minX="1880" maxX="1920" minY="924" maxY="964" name="baseball-s"/>
-  <symbol minX="1920" maxX="1960" minY="924" maxY="964" name="apartment-s"/>
-  <symbol minX="1960" maxX="2000" minY="924" maxY="964" name="muslim-s"/>
-  <symbol minX="2000" maxX="2040" minY="924" maxY="964" name="npark-s"/>
-  <symbol minX="0" maxX="40" minY="964" maxY="1004" name="basketball-s"/>
+  <symbol minX="1400" maxX="1440" minY="924" maxY="964" name="book-shop-s"/>
+  <symbol minX="1440" maxX="1480" minY="924" maxY="964" name="bookmaker-s"/>
+  <symbol minX="1480" maxX="1520" minY="924" maxY="964" name="bakery-s"/>
+  <symbol minX="1520" maxX="1560" minY="924" maxY="964" name="alpine_hut-s"/>
+  <symbol minX="1560" maxX="1600" minY="924" maxY="964" name="pitch-s"/>
+  <symbol minX="1600" maxX="1640" minY="924" maxY="964" name="monument-s"/>
+  <symbol minX="1640" maxX="1680" minY="924" maxY="964" name="waste-basket-s"/>
+  <symbol minX="1680" maxX="1720" minY="924" maxY="964" name="bank-s"/>
+  <symbol minX="1720" maxX="1760" minY="924" maxY="964" name="motel-s"/>
+  <symbol minX="1760" maxX="1800" minY="924" maxY="964" name="picnic-s"/>
+  <symbol minX="1800" maxX="1840" minY="924" maxY="964" name="bowls-s"/>
+  <symbol minX="1840" maxX="1880" minY="924" maxY="964" name="banknote-s"/>
+  <symbol minX="1880" maxX="1920" minY="924" maxY="964" name="america-football-s"/>
+  <symbol minX="1920" maxX="1960" minY="924" maxY="964" name="bar-s"/>
+  <symbol minX="1960" maxX="2000" minY="924" maxY="964" name="motorcycle_shop-s"/>
+  <symbol minX="2000" maxX="2040" minY="924" maxY="964" name="museum-s"/>
+  <symbol minX="0" maxX="40" minY="964" maxY="1004" name="buddhist-s"/>
   <symbol minX="40" maxX="80" minY="964" maxY="1004" name="embassy-s"/>
   <symbol minX="80" maxX="120" minY="964" maxY="1004" name="electronics-s"/>
   <symbol minX="120" maxX="160" minY="964" maxY="1004" name="subway-newyork-s"/>
-  <symbol minX="160" maxX="200" minY="964" maxY="1004" name="bbq-s"/>
+  <symbol minX="160" maxX="200" minY="964" maxY="1004" name="baseball-s"/>
   <symbol minX="200" maxX="240" minY="964" maxY="1004" name="drinking-water-s"/>
-  <symbol minX="240" maxX="280" minY="964" maxY="1004" name="phone-s"/>
-  <symbol minX="280" maxX="320" minY="964" maxY="1004" name="bus-s"/>
-  <symbol minX="320" maxX="360" minY="964" maxY="1004" name="nparkf-s"/>
-  <symbol minX="360" maxX="400" minY="964" maxY="1004" name="office-s"/>
-  <symbol minX="400" maxX="440" minY="964" maxY="1004" name="archery-s"/>
+  <symbol minX="240" maxX="280" minY="964" maxY="1004" name="photo-shop-s"/>
+  <symbol minX="280" maxX="320" minY="964" maxY="1004" name="outdoor-shop-s"/>
+  <symbol minX="320" maxX="360" minY="964" maxY="1004" name="muslim-s"/>
+  <symbol minX="360" maxX="400" minY="964" maxY="1004" name="npark-s"/>
+  <symbol minX="400" maxX="440" minY="964" maxY="1004" name="optician-s"/>
   <symbol minX="440" maxX="480" minY="964" maxY="1004" name="subway-s"/>
-  <symbol minX="480" maxX="520" minY="964" maxY="1004" name="pharmacy-s"/>
-  <symbol minX="520" maxX="560" minY="964" maxY="1004" name="optician-s"/>
-  <symbol minX="560" maxX="600" minY="964" maxY="1004" name="outdoor-shop-s"/>
-  <symbol minX="600" maxX="640" minY="964" maxY="1004" name="bcontrol-s"/>
-  <symbol minX="640" maxX="680" minY="964" maxY="1004" name="beach-s"/>
-  <symbol minX="680" maxX="720" minY="964" maxY="1004" name="viewpoint-s"/>
-  <symbol minX="720" maxX="760" minY="964" maxY="1004" name="zoo-s"/>
-  <symbol minX="760" maxX="800" minY="964" maxY="1004" name="beauty-s"/>
+  <symbol minX="480" maxX="520" minY="964" maxY="1004" name="apartment-s"/>
+  <symbol minX="520" maxX="560" minY="964" maxY="1004" name="phone-s"/>
+  <symbol minX="560" maxX="600" minY="964" maxY="1004" name="nparkf-s"/>
+  <symbol minX="600" maxX="640" minY="964" maxY="1004" name="basketball-s"/>
+  <symbol minX="640" maxX="680" minY="964" maxY="1004" name="bbq-s"/>
+  <symbol minX="680" maxX="720" minY="964" maxY="1004" name="archery-s"/>
+  <symbol minX="720" maxX="760" minY="964" maxY="1004" name="non-found-search-result"/>
+  <symbol minX="760" maxX="800" minY="964" maxY="1004" name="park-s"/>
   <symbol minX="800" maxX="840" minY="964" maxY="1004" name="doityourself-s"/>
   <symbol minX="840" maxX="880" minY="964" maxY="1004" name="sweets-s"/>
   <symbol minX="880" maxX="920" minY="964" maxY="1004" name="dog_park-s"/>
@@ -546,10 +546,10 @@
   <symbol minX="1040" maxX="1080" minY="964" maxY="1004" name="dentist-s"/>
   <symbol minX="1080" maxX="1120" minY="964" maxY="1004" name="taoist-s"/>
   <symbol minX="1120" maxX="1160" minY="964" maxY="1004" name="curling-s"/>
-  <symbol minX="1160" maxX="1200" minY="964" maxY="1004" name="beer-s"/>
+  <symbol minX="1160" maxX="1200" minY="964" maxY="1004" name="bcontrol-s"/>
   <symbol minX="1200" maxX="1240" minY="964" maxY="1004" name="taxi-s"/>
-  <symbol minX="1240" maxX="1280" minY="964" maxY="1004" name="windmill-s"/>
-  <symbol minX="1280" maxX="1320" minY="964" maxY="1004" name="bicycle-s"/>
+  <symbol minX="1240" maxX="1280" minY="964" maxY="1004" name="beach-s"/>
+  <symbol minX="1280" maxX="1320" minY="964" maxY="1004" name="bus-s"/>
   <symbol minX="1320" maxX="1360" minY="964" maxY="1004" name="tennis-s"/>
   <symbol minX="1360" maxX="1400" minY="964" maxY="1004" name="cricket-s"/>
   <symbol minX="1400" maxX="1440" minY="964" maxY="1004" name="copyshop-s"/>
@@ -561,10 +561,10 @@
   <symbol minX="1640" maxX="1680" minY="964" maxY="1004" name="clothes-s"/>
   <symbol minX="1680" maxX="1720" minY="964" maxY="1004" name="tire-repair-s"/>
   <symbol minX="1720" maxX="1760" minY="964" maxY="1004" name="climbing-s"/>
-  <symbol minX="1760" maxX="1800" minY="964" maxY="1004" name="wayside_shrine-s"/>
+  <symbol minX="1760" maxX="1800" minY="964" maxY="1004" name="zoo-s"/>
   <symbol minX="1800" maxX="1840" minY="964" maxY="1004" name="toilets-s"/>
-  <symbol minX="1840" maxX="1880" minY="964" maxY="1004" name="petshop-s"/>
-  <symbol minX="1880" maxX="1920" minY="964" maxY="1004" name="waterfall-s"/>
+  <symbol minX="1840" maxX="1880" minY="964" maxY="1004" name="beauty-s"/>
+  <symbol minX="1880" maxX="1920" minY="964" maxY="1004" name="beer-s"/>
   <symbol minX="1920" maxX="1960" minY="964" maxY="1004" name="toll_booth-s"/>
   <symbol minX="1960" maxX="2000" minY="964" maxY="1004" name="cinema-s"/>
   <symbol minX="2000" maxX="2040" minY="964" maxY="1004" name="christian-s"/>
@@ -574,12 +574,12 @@
   <symbol minX="120" maxX="160" minY="1004" maxY="1044" name="charging-station-s"/>
   <symbol minX="160" maxX="200" minY="1004" maxY="1044" name="tourism-s"/>
   <symbol minX="200" maxX="240" minY="1004" maxY="1044" name="cemetery-s"/>
-  <symbol minX="240" maxX="280" minY="1004" maxY="1044" name="park-s"/>
+  <symbol minX="240" maxX="280" minY="1004" maxY="1044" name="office-s"/>
   <symbol minX="280" maxX="320" minY="1004" maxY="1044" name="toys-s"/>
-  <symbol minX="320" maxX="360" minY="1004" maxY="1044" name="airport-s"/>
+  <symbol minX="320" maxX="360" minY="1004" maxY="1044" name="pharmacy-s"/>
   <symbol minX="360" maxX="400" minY="1004" maxY="1044" name="casino-s"/>
   <symbol minX="400" maxX="440" minY="1004" maxY="1044" name="train-s"/>
-  <symbol minX="440" maxX="480" minY="1004" maxY="1044" name="book-shop-s"/>
+  <symbol minX="440" maxX="480" minY="1004" maxY="1044" name="windmill-s"/>
   <symbol minX="480" maxX="520" minY="1004" maxY="1044" name="caravan_site-s"/>
   <symbol minX="520" maxX="560" minY="1004" maxY="1044" name="car_shop-s"/>
   <symbol minX="560" maxX="600" minY="1004" maxY="1044" name="tram-s"/>
@@ -594,53 +594,54 @@
   <symbol minX="920" maxX="960" minY="1004" maxY="1044" name="veterinary-s"/>
   <symbol minX="960" maxX="1000" minY="1004" maxY="1044" name="cable-car-s"/>
   <symbol minX="1000" maxX="1040" minY="1004" maxY="1044" name="butcher-s"/>
-  <symbol minX="1040" maxX="1098" minY="1004" maxY="1043" name="railway-crossing-xl"/>
-  <symbol minX="1098" maxX="1136" minY="1004" maxY="1042" name="subway-paris-s"/>
-  <symbol minX="1136" maxX="1174" minY="1004" maxY="1042" name="peakt-l"/>
-  <symbol minX="1174" maxX="1225" minY="1004" maxY="1042" name="subway-madrid-s"/>
-  <symbol minX="1225" maxX="1263" minY="1004" maxY="1042" name="api-result"/>
-  <symbol minX="1263" maxX="1319" minY="1004" maxY="1042" name="subway-kiev-l"/>
-  <symbol minX="1319" maxX="1357" minY="1004" maxY="1042" name="lightrail-berlin-s"/>
-  <symbol minX="1357" maxX="1413" minY="1004" maxY="1042" name="subway-kiev-m"/>
-  <symbol minX="1413" maxX="1449" minY="1004" maxY="1040" name="subway-moscow-s"/>
-  <symbol minX="1449" maxX="1482" minY="1004" maxY="1037" name="subway-berlin-s"/>
-  <symbol minX="1482" maxX="1524" minY="1004" maxY="1037" name="subway-london-s"/>
-  <symbol minX="1524" maxX="1557" minY="1004" maxY="1037" name="subway-rome-s"/>
-  <symbol minX="1557" maxX="1595" minY="1004" maxY="1037" name="bench"/>
-  <symbol minX="1595" maxX="1626" minY="1004" maxY="1035" name="parking-s"/>
-  <symbol minX="1626" maxX="1657" minY="1004" maxY="1035" name="subway-xs"/>
-  <symbol minX="1657" maxX="1688" minY="1004" maxY="1035" name="subway-newyork-xs"/>
-  <symbol minX="1688" maxX="1719" minY="1004" maxY="1035" name="star-l"/>
-  <symbol minX="1719" maxX="1750" minY="1004" maxY="1035" name="parking_pay-s"/>
-  <symbol minX="1750" maxX="1781" minY="1004" maxY="1035" name="speedcam-s"/>
-  <symbol minX="1781" maxX="1837" minY="1004" maxY="1035" name="subway-minsk-l"/>
-  <symbol minX="1837" maxX="1886" minY="1004" maxY="1035" name="railway-crossing-l"/>
-  <symbol minX="1886" maxX="1917" minY="1004" maxY="1035" name="survey_point-l"/>
-  <symbol minX="1917" maxX="1948" minY="1004" maxY="1035" name="train-xs"/>
-  <symbol minX="1948" maxX="1979" minY="1004" maxY="1035" name="bike-parking-s"/>
-  <symbol minX="1979" maxX="2008" minY="1004" maxY="1033" name="star-m"/>
+  <symbol minX="1040" maxX="1080" minY="1004" maxY="1044" name="viewpoint-s"/>
+  <symbol minX="1080" maxX="1138" minY="1004" maxY="1043" name="railway-crossing-xl"/>
+  <symbol minX="1138" maxX="1176" minY="1004" maxY="1042" name="api-result"/>
+  <symbol minX="1176" maxX="1214" minY="1004" maxY="1042" name="subway-paris-s"/>
+  <symbol minX="1214" maxX="1270" minY="1004" maxY="1042" name="subway-kiev-m"/>
+  <symbol minX="1270" maxX="1321" minY="1004" maxY="1042" name="subway-madrid-s"/>
+  <symbol minX="1321" maxX="1359" minY="1004" maxY="1042" name="peakt-l"/>
+  <symbol minX="1359" maxX="1397" minY="1004" maxY="1042" name="lightrail-berlin-s"/>
+  <symbol minX="1397" maxX="1453" minY="1004" maxY="1042" name="subway-kiev-l"/>
+  <symbol minX="1453" maxX="1489" minY="1004" maxY="1040" name="subway-moscow-s"/>
+  <symbol minX="1489" maxX="1522" minY="1004" maxY="1037" name="subway-berlin-s"/>
+  <symbol minX="1522" maxX="1560" minY="1004" maxY="1037" name="bench"/>
+  <symbol minX="1560" maxX="1593" minY="1004" maxY="1037" name="subway-rome-s"/>
+  <symbol minX="1593" maxX="1635" minY="1004" maxY="1037" name="subway-london-s"/>
+  <symbol minX="1635" maxX="1666" minY="1004" maxY="1035" name="bike-parking-s"/>
+  <symbol minX="1666" maxX="1697" minY="1004" maxY="1035" name="train-xs"/>
+  <symbol minX="1697" maxX="1746" minY="1004" maxY="1035" name="railway-crossing-l"/>
+  <symbol minX="1746" maxX="1777" minY="1004" maxY="1035" name="parking_pay-s"/>
+  <symbol minX="1777" maxX="1808" minY="1004" maxY="1035" name="speedcam-s"/>
+  <symbol minX="1808" maxX="1839" minY="1004" maxY="1035" name="star-l"/>
+  <symbol minX="1839" maxX="1895" minY="1004" maxY="1035" name="subway-minsk-l"/>
+  <symbol minX="1895" maxX="1926" minY="1004" maxY="1035" name="subway-newyork-xs"/>
+  <symbol minX="1926" maxX="1957" minY="1004" maxY="1035" name="subway-xs"/>
+  <symbol minX="1957" maxX="1988" minY="1004" maxY="1035" name="survey_point-l"/>
+  <symbol minX="1988" maxX="2019" minY="1004" maxY="1035" name="parking-s"/>
+  <symbol minX="2019" maxX="2048" minY="1004" maxY="1033" name="star-m"/>
   <symbol minX="0" maxX="47" minY="1044" maxY="1073" name="subway-kiev-s"/>
-  <symbol minX="47" maxX="74" minY="1044" maxY="1071" name="survey_point-m"/>
-  <symbol minX="74" maxX="116" minY="1044" maxY="1071" name="railway-crossing"/>
-  <symbol minX="116" maxX="145" minY="1044" maxY="1071" name="peakt-m"/>
-  <symbol minX="145" maxX="192" minY="1044" maxY="1071" name="subway-minsk-m"/>
-  <symbol minX="192" maxX="234" minY="1044" maxY="1068" name="subway-minsk-s"/>
-  <symbol minX="234" maxX="258" minY="1044" maxY="1068" name="crossing-l"/>
-  <symbol minX="258" maxX="282" minY="1044" maxY="1068" name="star-s"/>
-  <symbol minX="282" maxX="304" minY="1044" maxY="1066" name="survey_point-s"/>
-  <symbol minX="304" maxX="328" minY="1044" maxY="1066" name="peakt-s"/>
-  <symbol minX="328" maxX="379" minY="1044" maxY="1066" name="arrow-m"/>
-  <symbol minX="379" maxX="399" minY="1044" maxY="1064" name="entrance-s"/>
-  <symbol minX="399" maxX="419" minY="1044" maxY="1064" name="zero-icon"/>
+  <symbol minX="47" maxX="76" minY="1044" maxY="1071" name="peakt-m"/>
+  <symbol minX="76" maxX="103" minY="1044" maxY="1071" name="survey_point-m"/>
+  <symbol minX="103" maxX="150" minY="1044" maxY="1071" name="subway-minsk-m"/>
+  <symbol minX="150" maxX="192" minY="1044" maxY="1071" name="railway-crossing"/>
+  <symbol minX="192" maxX="216" minY="1044" maxY="1068" name="star-s"/>
+  <symbol minX="216" maxX="240" minY="1044" maxY="1068" name="crossing-l"/>
+  <symbol minX="240" maxX="282" minY="1044" maxY="1068" name="subway-minsk-s"/>
+  <symbol minX="282" maxX="333" minY="1044" maxY="1066" name="arrow-m"/>
+  <symbol minX="333" maxX="357" minY="1044" maxY="1066" name="peakt-s"/>
+  <symbol minX="357" maxX="379" minY="1044" maxY="1066" name="survey_point-s"/>
+  <symbol minX="379" maxX="399" minY="1044" maxY="1064" name="zero-icon"/>
+  <symbol minX="399" maxX="419" minY="1044" maxY="1064" name="entrance-s"/>
   <symbol minX="419" maxX="439" minY="1044" maxY="1064" name="crossing-m"/>
-  <symbol minX="439" maxX="454" minY="1044" maxY="1059" name="cities-m"/>
-  <symbol minX="454" maxX="469" minY="1044" maxY="1059" name="crossing-s"/>
-  <symbol minX="469" maxX="507" minY="1044" maxY="1059" name="arrow-s"/>
-  <symbol minX="507" maxX="522" minY="1044" maxY="1059" name="dot-m"/>
+  <symbol minX="439" maxX="477" minY="1044" maxY="1059" name="arrow-s"/>
+  <symbol minX="477" maxX="492" minY="1044" maxY="1059" name="dot-m"/>
+  <symbol minX="492" maxX="507" minY="1044" maxY="1059" name="cities-m"/>
+  <symbol minX="507" maxX="522" minY="1044" maxY="1059" name="crossing-s"/>
   <symbol minX="522" maxX="535" minY="1044" maxY="1057" name="entrance-xs"/>
-  <symbol minX="535" maxX="546" minY="1044" maxY="1055" name="dot-s"/>
-  <symbol minX="546" maxX="570" minY="1044" maxY="1055" name="arrow-xs"/>
-  <symbol minX="570" maxX="581" minY="1044" maxY="1055" name="cities-s"/>
-  <symbol minX="581" maxX="592" minY="1044" maxY="1055" name="cities-xs"/>
+  <symbol minX="535" maxX="546" minY="1044" maxY="1055" name="cities-xs"/>
+  <symbol minX="546" maxX="557" minY="1044" maxY="1055" name="cities-s"/>
+  <symbol minX="557" maxX="568" minY="1044" maxY="1055" name="dot-s"/>
+  <symbol minX="568" maxX="592" minY="1044" maxY="1055" name="arrow-xs"/>
  </file>
 </root>
diff --git a/data/resources-hdpi_clear/symbols-ad.png b/data/resources-hdpi_clear/symbols-ad.png
index 1a8d8464ad..7e31cd6cea 100644
Binary files a/data/resources-hdpi_clear/symbols-ad.png and b/data/resources-hdpi_clear/symbols-ad.png differ
diff --git a/data/resources-hdpi_clear/symbols.png b/data/resources-hdpi_clear/symbols.png
index 7c6eee0239..a5f0fb2a47 100644
Binary files a/data/resources-hdpi_clear/symbols.png and b/data/resources-hdpi_clear/symbols.png differ
diff --git a/data/resources-hdpi_clear/symbols.sdf b/data/resources-hdpi_clear/symbols.sdf
index ef53843da8..242daf8975 100644
--- a/data/resources-hdpi_clear/symbols.sdf
+++ b/data/resources-hdpi_clear/symbols.sdf
@@ -334,8 +334,8 @@
   <symbol minX="372" maxX="403" minY="442" maxY="473" name="public-building-l"/>
   <symbol minX="403" maxX="434" minY="442" maxY="473" name="lighthouse-l"/>
   <symbol minX="434" maxX="465" minY="442" maxY="473" name="lighthouse-m"/>
-  <symbol minX="465" maxX="496" minY="442" maxY="473" name="laundry-m"/>
-  <symbol minX="496" maxX="527" minY="442" maxY="473" name="power-m"/>
+  <symbol minX="465" maxX="496" minY="442" maxY="473" name="power-m"/>
+  <symbol minX="496" maxX="527" minY="442" maxY="473" name="laundry-m"/>
   <symbol minX="527" maxX="558" minY="442" maxY="473" name="power-l"/>
   <symbol minX="558" maxX="589" minY="442" maxY="473" name="postbox-m"/>
   <symbol minX="589" maxX="620" minY="442" maxY="473" name="mail-l"/>
@@ -396,76 +396,76 @@
   <symbol minX="248" maxX="279" minY="504" maxY="535" name="parking_pay-l"/>
   <symbol minX="279" maxX="310" minY="504" maxY="534" name="lightrail-berlin-l"/>
   <symbol minX="310" maxX="340" minY="504" maxY="534" name="atm-tinkoff-shield-m"/>
-  <symbol minX="340" maxX="370" minY="504" maxY="534" name="volcano-m"/>
-  <symbol minX="370" maxX="400" minY="504" maxY="534" name="cave-m"/>
-  <symbol minX="400" maxX="430" minY="504" maxY="534" name="atm-tinkoff-gerb-m"/>
+  <symbol minX="340" maxX="370" minY="504" maxY="534" name="atm-tinkoff-gerb-m"/>
+  <symbol minX="370" maxX="400" minY="504" maxY="534" name="volcano-m"/>
+  <symbol minX="400" maxX="430" minY="504" maxY="534" name="cave-m"/>
   <symbol minX="430" maxX="460" minY="504" maxY="534" name="subway-spb-m"/>
-  <symbol minX="460" maxX="489" minY="504" maxY="533" name="subway-entrance-m"/>
-  <symbol minX="489" maxX="520" minY="504" maxY="533" name="speedcam1-xl"/>
-  <symbol minX="520" maxX="548" minY="504" maxY="532" name="lightrail-berlin-m"/>
-  <symbol minX="548" maxX="579" minY="504" maxY="532" name="subway-moscow-l"/>
-  <symbol minX="579" maxX="607" minY="504" maxY="532" name="subway-berlin-l"/>
-  <symbol minX="607" maxX="635" minY="504" maxY="532" name="subway-rome-l"/>
-  <symbol minX="635" maxX="662" minY="504" maxY="531" name="speedcam-m"/>
-  <symbol minX="662" maxX="689" minY="504" maxY="531" name="parking_pay-m"/>
-  <symbol minX="689" maxX="716" minY="504" maxY="531" name="bike-parking-m"/>
-  <symbol minX="716" maxX="743" minY="504" maxY="531" name="parking-m"/>
-  <symbol minX="743" maxX="770" minY="504" maxY="531" name="search-result"/>
-  <symbol minX="770" maxX="799" minY="504" maxY="529" name="subway-moscow-m"/>
-  <symbol minX="799" maxX="824" minY="504" maxY="529" name="subway-paris-m"/>
-  <symbol minX="824" maxX="849" minY="504" maxY="529" name="subway-rome-m"/>
-  <symbol minX="849" maxX="880" minY="504" maxY="529" name="subway-london-l"/>
-  <symbol minX="880" maxX="905" minY="504" maxY="529" name="api-result"/>
-  <symbol minX="905" maxX="930" minY="504" maxY="529" name="subway-berlin-m"/>
-  <symbol minX="930" maxX="953" minY="504" maxY="527" name="volcano-s"/>
-  <symbol minX="953" maxX="981" minY="504" maxY="527" name="subway-barcelona-s"/>
-  <symbol minX="981" maxX="1004" minY="504" maxY="527" name="atm-tinkoff-shield-s"/>
+  <symbol minX="460" maxX="491" minY="504" maxY="533" name="speedcam1-xl"/>
+  <symbol minX="491" maxX="520" minY="504" maxY="533" name="subway-entrance-m"/>
+  <symbol minX="520" maxX="551" minY="504" maxY="532" name="subway-moscow-l"/>
+  <symbol minX="551" maxX="579" minY="504" maxY="532" name="subway-berlin-l"/>
+  <symbol minX="579" maxX="607" minY="504" maxY="532" name="subway-rome-l"/>
+  <symbol minX="607" maxX="635" minY="504" maxY="532" name="lightrail-berlin-m"/>
+  <symbol minX="635" maxX="662" minY="504" maxY="531" name="parking_pay-m"/>
+  <symbol minX="662" maxX="689" minY="504" maxY="531" name="speedcam-m"/>
+  <symbol minX="689" maxX="716" minY="504" maxY="531" name="search-result"/>
+  <symbol minX="716" maxX="743" minY="504" maxY="531" name="non-found-search-result"/>
+  <symbol minX="743" maxX="770" minY="504" maxY="531" name="parking-m"/>
+  <symbol minX="770" maxX="797" minY="504" maxY="531" name="bike-parking-m"/>
+  <symbol minX="797" maxX="822" minY="504" maxY="529" name="subway-paris-m"/>
+  <symbol minX="822" maxX="847" minY="504" maxY="529" name="subway-berlin-m"/>
+  <symbol minX="847" maxX="872" minY="504" maxY="529" name="api-result"/>
+  <symbol minX="872" maxX="897" minY="504" maxY="529" name="subway-rome-m"/>
+  <symbol minX="897" maxX="928" minY="504" maxY="529" name="subway-london-l"/>
+  <symbol minX="928" maxX="957" minY="504" maxY="529" name="subway-moscow-m"/>
+  <symbol minX="957" maxX="987" minY="504" maxY="527" name="subway-london-m"/>
+  <symbol minX="987" maxX="1010" minY="504" maxY="527" name="atm-tinkoff-shield-s"/>
   <symbol minX="0" maxX="23" minY="535" maxY="558" name="subway-spb-s"/>
-  <symbol minX="23" maxX="46" minY="535" maxY="558" name="atm-tinkoff-gerb-s"/>
-  <symbol minX="46" maxX="69" minY="535" maxY="558" name="cave-s"/>
-  <symbol minX="69" maxX="99" minY="535" maxY="558" name="subway-london-m"/>
-  <symbol minX="99" maxX="121" minY="535" maxY="557" name="mail-s"/>
-  <symbol minX="121" maxX="143" minY="535" maxY="557" name="photo-shop-s"/>
-  <symbol minX="143" maxX="165" minY="535" maxY="557" name="postbox-s"/>
-  <symbol minX="165" maxX="187" minY="535" maxY="557" name="police-s"/>
-  <symbol minX="187" maxX="209" minY="535" maxY="557" name="marketplace-s"/>
-  <symbol minX="209" maxX="231" minY="535" maxY="557" name="power-s"/>
-  <symbol minX="231" maxX="253" minY="535" maxY="557" name="lift_gate-s"/>
-  <symbol minX="253" maxX="275" minY="535" maxY="557" name="library-s"/>
-  <symbol minX="275" maxX="297" minY="535" maxY="557" name="public-building-s"/>
-  <symbol minX="297" maxX="319" minY="535" maxY="557" name="beauty-s"/>
-  <symbol minX="319" maxX="341" minY="535" maxY="557" name="atm-s"/>
-  <symbol minX="341" maxX="363" minY="535" maxY="557" name="beer-s"/>
-  <symbol minX="363" maxX="385" minY="535" maxY="557" name="lawyer-s"/>
-  <symbol minX="385" maxX="407" minY="535" maxY="557" name="laundry-s"/>
-  <symbol minX="407" maxX="429" minY="535" maxY="557" name="recycling-s"/>
-  <symbol minX="429" maxX="451" minY="535" maxY="557" name="military-s"/>
-  <symbol minX="451" maxX="473" minY="535" maxY="557" name="kiosk-s"/>
-  <symbol minX="473" maxX="495" minY="535" maxY="557" name="remains-s"/>
-  <symbol minX="495" maxX="517" minY="535" maxY="557" name="kindergarten-s"/>
-  <symbol minX="517" maxX="539" minY="535" maxY="557" name="jewish-s"/>
-  <symbol minX="539" maxX="561" minY="535" maxY="557" name="restaurant-s"/>
-  <symbol minX="561" maxX="583" minY="535" maxY="557" name="jewelry-s"/>
-  <symbol minX="583" maxX="605" minY="535" maxY="557" name="information-s"/>
-  <symbol minX="605" maxX="627" minY="535" maxY="557" name="hunting-tower-s"/>
-  <symbol minX="627" maxX="649" minY="535" maxY="557" name="sauna-s"/>
-  <symbol minX="649" maxX="671" minY="535" maxY="557" name="hotel-s"/>
-  <symbol minX="671" maxX="693" minY="535" maxY="557" name="hostel-s"/>
-  <symbol minX="693" maxX="715" minY="535" maxY="557" name="school-s"/>
-  <symbol minX="715" maxX="737" minY="535" maxY="557" name="hospital-s"/>
-  <symbol minX="737" maxX="759" minY="535" maxY="557" name="historic-ship-s"/>
-  <symbol minX="759" maxX="781" minY="535" maxY="557" name="seafood-shop-s"/>
-  <symbol minX="781" maxX="803" minY="535" maxY="557" name="hindu-s"/>
-  <symbol minX="803" maxX="825" minY="535" maxY="557" name="heliport-s"/>
-  <symbol minX="825" maxX="847" minY="535" maxY="557" name="shinto-s"/>
-  <symbol minX="847" maxX="869" minY="535" maxY="557" name="helipad-s"/>
-  <symbol minX="869" maxX="891" minY="535" maxY="557" name="hardware-s"/>
-  <symbol minX="891" maxX="913" minY="535" maxY="557" name="ship-s"/>
-  <symbol minX="913" maxX="935" minY="535" maxY="557" name="hand-s"/>
-  <symbol minX="935" maxX="957" minY="535" maxY="557" name="hairdresser-s"/>
-  <symbol minX="957" maxX="979" minY="535" maxY="557" name="shoes-s"/>
-  <symbol minX="979" maxX="1001" minY="535" maxY="557" name="gym-s"/>
-  <symbol minX="1001" maxX="1023" minY="535" maxY="557" name="grocery-s"/>
+  <symbol minX="23" maxX="46" minY="535" maxY="558" name="cave-s"/>
+  <symbol minX="46" maxX="74" minY="535" maxY="558" name="subway-barcelona-s"/>
+  <symbol minX="74" maxX="97" minY="535" maxY="558" name="volcano-s"/>
+  <symbol minX="97" maxX="120" minY="535" maxY="558" name="atm-tinkoff-gerb-s"/>
+  <symbol minX="120" maxX="142" minY="535" maxY="557" name="parking-meter-s"/>
+  <symbol minX="142" maxX="164" minY="535" maxY="557" name="postbox-s"/>
+  <symbol minX="164" maxX="186" minY="535" maxY="557" name="outdoor-shop-s"/>
+  <symbol minX="186" maxX="208" minY="535" maxY="557" name="lighthouse-s"/>
+  <symbol minX="208" maxX="230" minY="535" maxY="557" name="power-s"/>
+  <symbol minX="230" maxX="252" minY="535" maxY="557" name="lift_gate-s"/>
+  <symbol minX="252" maxX="274" minY="535" maxY="557" name="library-s"/>
+  <symbol minX="274" maxX="296" minY="535" maxY="557" name="public-building-s"/>
+  <symbol minX="296" maxX="318" minY="535" maxY="557" name="bbq-s"/>
+  <symbol minX="318" maxX="340" minY="535" maxY="557" name="bcontrol-s"/>
+  <symbol minX="340" maxX="362" minY="535" maxY="557" name="archery-s"/>
+  <symbol minX="362" maxX="384" minY="535" maxY="557" name="lawyer-s"/>
+  <symbol minX="384" maxX="406" minY="535" maxY="557" name="laundry-s"/>
+  <symbol minX="406" maxX="428" minY="535" maxY="557" name="recycling-s"/>
+  <symbol minX="428" maxX="450" minY="535" maxY="557" name="mail-s"/>
+  <symbol minX="450" maxX="472" minY="535" maxY="557" name="kiosk-s"/>
+  <symbol minX="472" maxX="494" minY="535" maxY="557" name="remains-s"/>
+  <symbol minX="494" maxX="516" minY="535" maxY="557" name="kindergarten-s"/>
+  <symbol minX="516" maxX="538" minY="535" maxY="557" name="jewish-s"/>
+  <symbol minX="538" maxX="560" minY="535" maxY="557" name="restaurant-s"/>
+  <symbol minX="560" maxX="582" minY="535" maxY="557" name="jewelry-s"/>
+  <symbol minX="582" maxX="604" minY="535" maxY="557" name="information-s"/>
+  <symbol minX="604" maxX="626" minY="535" maxY="557" name="hunting-tower-s"/>
+  <symbol minX="626" maxX="648" minY="535" maxY="557" name="sauna-s"/>
+  <symbol minX="648" maxX="670" minY="535" maxY="557" name="hotel-s"/>
+  <symbol minX="670" maxX="692" minY="535" maxY="557" name="hostel-s"/>
+  <symbol minX="692" maxX="714" minY="535" maxY="557" name="school-s"/>
+  <symbol minX="714" maxX="736" minY="535" maxY="557" name="hospital-s"/>
+  <symbol minX="736" maxX="758" minY="535" maxY="557" name="historic-ship-s"/>
+  <symbol minX="758" maxX="780" minY="535" maxY="557" name="seafood-shop-s"/>
+  <symbol minX="780" maxX="802" minY="535" maxY="557" name="hindu-s"/>
+  <symbol minX="802" maxX="824" minY="535" maxY="557" name="heliport-s"/>
+  <symbol minX="824" maxX="846" minY="535" maxY="557" name="shinto-s"/>
+  <symbol minX="846" maxX="868" minY="535" maxY="557" name="helipad-s"/>
+  <symbol minX="868" maxX="890" minY="535" maxY="557" name="hardware-s"/>
+  <symbol minX="890" maxX="912" minY="535" maxY="557" name="ship-s"/>
+  <symbol minX="912" maxX="934" minY="535" maxY="557" name="hand-s"/>
+  <symbol minX="934" maxX="956" minY="535" maxY="557" name="hairdresser-s"/>
+  <symbol minX="956" maxX="978" minY="535" maxY="557" name="shoes-s"/>
+  <symbol minX="978" maxX="1000" minY="535" maxY="557" name="gym-s"/>
+  <symbol minX="1000" maxX="1022" minY="535" maxY="557" name="grocery-s"/>
   <symbol minX="0" maxX="22" minY="558" maxY="580" name="shop-bicycle-s"/>
   <symbol minX="22" maxX="44" minY="558" maxY="580" name="greengrocer-s"/>
   <symbol minX="44" maxX="66" minY="558" maxY="580" name="golf-s"/>
@@ -478,67 +478,67 @@
   <symbol minX="198" maxX="220" minY="558" maxY="580" name="gallery-s"/>
   <symbol minX="220" maxX="242" minY="558" maxY="580" name="soccer-s"/>
   <symbol minX="242" maxX="264" minY="558" maxY="580" name="furniture-s"/>
-  <symbol minX="264" maxX="286" minY="558" maxY="580" name="mobile_phone-s"/>
-  <symbol minX="286" maxX="308" minY="558" maxY="580" name="archery-s"/>
+  <symbol minX="264" maxX="286" minY="558" maxY="580" name="police-s"/>
+  <symbol minX="286" maxX="308" minY="558" maxY="580" name="basketball-s"/>
   <symbol minX="308" maxX="330" minY="558" maxY="580" name="funicular-s"/>
-  <symbol minX="330" maxX="352" minY="558" maxY="580" name="place-of-worship-s"/>
+  <symbol minX="330" maxX="352" minY="558" maxY="580" name="pharmacy-s"/>
   <symbol minX="352" maxX="374" minY="558" maxY="580" name="fuel-s"/>
   <symbol minX="374" maxX="396" minY="558" maxY="580" name="fountain-s"/>
   <symbol minX="396" maxX="418" minY="558" maxY="580" name="sports-s"/>
   <symbol minX="418" maxX="440" minY="558" maxY="580" name="florist-s"/>
   <symbol minX="440" maxX="462" minY="558" maxY="580" name="firehydrant-s"/>
   <symbol minX="462" maxX="484" minY="558" maxY="580" name="stadium-s"/>
-  <symbol minX="484" maxX="506" minY="558" maxY="580" name="zoo-s"/>
-  <symbol minX="506" maxX="528" minY="558" maxY="580" name="bicycle-s"/>
-  <symbol minX="528" maxX="550" minY="558" maxY="580" name="airport-s"/>
+  <symbol minX="484" maxX="506" minY="558" maxY="580" name="baseball-s"/>
+  <symbol minX="506" maxX="528" minY="558" maxY="580" name="america-football-s"/>
+  <symbol minX="528" maxX="550" minY="558" maxY="580" name="beach-s"/>
   <symbol minX="550" maxX="581" minY="558" maxY="580" name="subway-barcelona-l"/>
   <symbol minX="581" maxX="612" minY="558" maxY="580" name="subway-barcelona-m"/>
-  <symbol minX="612" maxX="634" minY="558" maxY="580" name="monument-s"/>
-  <symbol minX="634" maxX="656" minY="558" maxY="580" name="motel-s"/>
-  <symbol minX="656" maxX="678" minY="558" maxY="580" name="pitch-s"/>
-  <symbol minX="678" maxX="700" minY="558" maxY="580" name="bcontrol-s"/>
+  <symbol minX="612" maxX="634" minY="558" maxY="580" name="marketplace-s"/>
+  <symbol minX="634" maxX="656" minY="558" maxY="580" name="park-s"/>
+  <symbol minX="656" maxX="678" minY="558" maxY="580" name="military-s"/>
+  <symbol minX="678" maxX="700" minY="558" maxY="580" name="beauty-s"/>
   <symbol minX="700" maxX="722" minY="558" maxY="580" name="fire_station-s"/>
-  <symbol minX="722" maxX="744" minY="558" maxY="580" name="motorcycle_shop-s"/>
+  <symbol minX="722" maxX="744" minY="558" maxY="580" name="mobile_phone-s"/>
   <symbol minX="744" maxX="766" minY="558" maxY="580" name="subway-entrance-s"/>
-  <symbol minX="766" maxX="788" minY="558" maxY="580" name="windmill-s"/>
-  <symbol minX="788" maxX="810" minY="558" maxY="580" name="parking-meter-s"/>
-  <symbol minX="810" maxX="832" minY="558" maxY="580" name="wayside_shrine-s"/>
+  <symbol minX="766" maxX="788" minY="558" maxY="580" name="nparkf-s"/>
+  <symbol minX="788" maxX="810" minY="558" maxY="580" name="atm-s"/>
+  <symbol minX="810" maxX="832" minY="558" maxY="580" name="beer-s"/>
   <symbol minX="832" maxX="854" minY="558" maxY="580" name="fastfood-s"/>
-  <symbol minX="854" maxX="876" minY="558" maxY="580" name="museum-s"/>
-  <symbol minX="876" maxX="898" minY="558" maxY="580" name="picnic-s"/>
-  <symbol minX="898" maxX="920" minY="558" maxY="580" name="book-shop-s"/>
+  <symbol minX="854" maxX="876" minY="558" maxY="580" name="place-of-worship-s"/>
+  <symbol minX="876" maxX="898" minY="558" maxY="580" name="monument-s"/>
+  <symbol minX="898" maxX="920" minY="558" maxY="580" name="photo-shop-s"/>
   <symbol minX="920" maxX="942" minY="558" maxY="580" name="equestrian-s"/>
   <symbol minX="942" maxX="973" minY="558" maxY="580" name="subway-madrid-l"/>
   <symbol minX="973" maxX="1004" minY="558" maxY="580" name="subway-madrid-m"/>
-  <symbol minX="0" maxX="22" minY="580" maxY="602" name="bookmaker-s"/>
-  <symbol minX="22" maxX="44" minY="580" maxY="602" name="waterfall-s"/>
-  <symbol minX="44" maxX="66" minY="580" maxY="602" name="bowls-s"/>
-  <symbol minX="66" maxX="88" minY="580" maxY="602" name="australian-football-s"/>
-  <symbol minX="88" maxX="110" minY="580" maxY="602" name="muslim-s"/>
-  <symbol minX="110" maxX="132" minY="580" maxY="602" name="npark-s"/>
-  <symbol minX="132" maxX="154" minY="580" maxY="602" name="buddhist-s"/>
-  <symbol minX="154" maxX="176" minY="580" maxY="602" name="lighthouse-s"/>
-  <symbol minX="176" maxX="198" minY="580" maxY="602" name="alcohol-s"/>
+  <symbol minX="0" maxX="22" minY="580" maxY="602" name="zoo-s"/>
+  <symbol minX="22" maxX="44" minY="580" maxY="602" name="bicycle-s"/>
+  <symbol minX="44" maxX="66" minY="580" maxY="602" name="bar-s"/>
+  <symbol minX="66" maxX="88" minY="580" maxY="602" name="windmill-s"/>
+  <symbol minX="88" maxX="110" minY="580" maxY="602" name="petshop-s"/>
+  <symbol minX="110" maxX="132" minY="580" maxY="602" name="motel-s"/>
+  <symbol minX="132" maxX="154" minY="580" maxY="602" name="npark-s"/>
+  <symbol minX="154" maxX="176" minY="580" maxY="602" name="wayside_shrine-s"/>
+  <symbol minX="176" maxX="198" minY="580" maxY="602" name="optician-s"/>
   <symbol minX="198" maxX="220" minY="580" maxY="602" name="subway-newyork-s"/>
-  <symbol minX="220" maxX="242" minY="580" maxY="602" name="waste-basket-s"/>
+  <symbol minX="220" maxX="242" minY="580" maxY="602" name="book-shop-s"/>
   <symbol minX="242" maxX="264" minY="580" maxY="602" name="embassy-s"/>
-  <symbol minX="264" maxX="286" minY="580" maxY="602" name="beach-s"/>
-  <symbol minX="286" maxX="308" minY="580" maxY="602" name="bus-s"/>
-  <symbol minX="308" maxX="330" minY="580" maxY="602" name="nparkf-s"/>
-  <symbol minX="330" maxX="352" minY="580" maxY="602" name="office-s"/>
-  <symbol minX="352" maxX="374" minY="580" maxY="602" name="butcher-s"/>
+  <symbol minX="264" maxX="286" minY="580" maxY="602" name="pitch-s"/>
+  <symbol minX="286" maxX="308" minY="580" maxY="602" name="bookmaker-s"/>
+  <symbol minX="308" maxX="330" minY="580" maxY="602" name="waterfall-s"/>
+  <symbol minX="330" maxX="352" minY="580" maxY="602" name="motorcycle_shop-s"/>
+  <symbol minX="352" maxX="374" minY="580" maxY="602" name="apartment-s"/>
   <symbol minX="374" maxX="396" minY="580" maxY="602" name="subway-s"/>
   <symbol minX="396" maxX="418" minY="580" maxY="602" name="electronics-s"/>
-  <symbol minX="418" maxX="440" minY="580" maxY="602" name="phone-s"/>
-  <symbol minX="440" maxX="462" minY="580" maxY="602" name="optician-s"/>
-  <symbol minX="462" maxX="484" minY="580" maxY="602" name="petshop-s"/>
-  <symbol minX="484" maxX="506" minY="580" maxY="602" name="park-s"/>
-  <symbol minX="506" maxX="528" minY="580" maxY="602" name="bakery-s"/>
-  <symbol minX="528" maxX="550" minY="580" maxY="602" name="bank-s"/>
+  <symbol minX="418" maxX="440" minY="580" maxY="602" name="bowls-s"/>
+  <symbol minX="440" maxX="462" minY="580" maxY="602" name="museum-s"/>
+  <symbol minX="462" maxX="484" minY="580" maxY="602" name="buddhist-s"/>
+  <symbol minX="484" maxX="506" minY="580" maxY="602" name="waste-basket-s"/>
+  <symbol minX="506" maxX="528" minY="580" maxY="602" name="bus-s"/>
+  <symbol minX="528" maxX="550" minY="580" maxY="602" name="airport-s"/>
   <symbol minX="550" maxX="572" minY="580" maxY="602" name="drinking-water-s"/>
-  <symbol minX="572" maxX="594" minY="580" maxY="602" name="alpine_hut-s"/>
+  <symbol minX="572" maxX="594" minY="580" maxY="602" name="phone-s"/>
   <symbol minX="594" maxX="616" minY="580" maxY="602" name="sweets-s"/>
-  <symbol minX="616" maxX="638" minY="580" maxY="602" name="banknote-s"/>
+  <symbol minX="616" maxX="638" minY="580" maxY="602" name="australian-football-s"/>
   <symbol minX="638" maxX="660" minY="580" maxY="602" name="doityourself-s"/>
   <symbol minX="660" maxX="682" minY="580" maxY="602" name="swimming-s"/>
   <symbol minX="682" maxX="704" minY="580" maxY="602" name="dog_park-s"/>
@@ -548,10 +548,10 @@
   <symbol minX="770" maxX="792" minY="580" maxY="602" name="dentist-s"/>
   <symbol minX="792" maxX="814" minY="580" maxY="602" name="taxi-s"/>
   <symbol minX="814" maxX="836" minY="580" maxY="602" name="curling-s"/>
-  <symbol minX="836" maxX="858" minY="580" maxY="602" name="bar-s"/>
+  <symbol minX="836" maxX="858" minY="580" maxY="602" name="alcohol-s"/>
   <symbol minX="858" maxX="880" minY="580" maxY="602" name="tennis-s"/>
-  <symbol minX="880" maxX="902" minY="580" maxY="602" name="america-football-s"/>
-  <symbol minX="902" maxX="924" minY="580" maxY="602" name="baseball-s"/>
+  <symbol minX="880" maxX="902" minY="580" maxY="602" name="bakery-s"/>
+  <symbol minX="902" maxX="924" minY="580" maxY="602" name="butcher-s"/>
   <symbol minX="924" maxX="946" minY="580" maxY="602" name="theatre-s"/>
   <symbol minX="946" maxX="968" minY="580" maxY="602" name="cricket-s"/>
   <symbol minX="968" maxX="990" minY="580" maxY="602" name="copyshop-s"/>
@@ -563,10 +563,10 @@
   <symbol minX="88" maxX="110" minY="602" maxY="624" name="clothes-s"/>
   <symbol minX="110" maxX="132" minY="602" maxY="624" name="toilets-s"/>
   <symbol minX="132" maxX="154" minY="602" maxY="624" name="climbing-s"/>
-  <symbol minX="154" maxX="176" minY="602" maxY="624" name="basketball-s"/>
+  <symbol minX="154" maxX="176" minY="602" maxY="624" name="bank-s"/>
   <symbol minX="176" maxX="198" minY="602" maxY="624" name="toll_booth-s"/>
-  <symbol minX="198" maxX="220" minY="602" maxY="624" name="apartment-s"/>
-  <symbol minX="220" maxX="242" minY="602" maxY="624" name="bbq-s"/>
+  <symbol minX="198" maxX="220" minY="602" maxY="624" name="alpine_hut-s"/>
+  <symbol minX="220" maxX="242" minY="602" maxY="624" name="office-s"/>
   <symbol minX="242" maxX="264" minY="602" maxY="624" name="cinema-s"/>
   <symbol minX="264" maxX="286" minY="602" maxY="624" name="tomb-s"/>
   <symbol minX="286" maxX="308" minY="602" maxY="624" name="christian-s"/>
@@ -576,10 +576,10 @@
   <symbol minX="374" maxX="396" minY="602" maxY="624" name="charging-station-s"/>
   <symbol minX="396" maxX="418" minY="602" maxY="624" name="toys-s"/>
   <symbol minX="418" maxX="440" minY="602" maxY="624" name="cemetery-s"/>
-  <symbol minX="440" maxX="462" minY="602" maxY="624" name="outdoor-shop-s"/>
+  <symbol minX="440" maxX="462" minY="602" maxY="624" name="picnic-s"/>
   <symbol minX="462" maxX="484" minY="602" maxY="624" name="train-s"/>
-  <symbol minX="484" maxX="506" minY="602" maxY="624" name="cable-car-s"/>
-  <symbol minX="506" maxX="528" minY="602" maxY="624" name="pharmacy-s"/>
+  <symbol minX="484" maxX="506" minY="602" maxY="624" name="muslim-s"/>
+  <symbol minX="506" maxX="528" minY="602" maxY="624" name="banknote-s"/>
   <symbol minX="528" maxX="550" minY="602" maxY="624" name="casino-s"/>
   <symbol minX="550" maxX="572" minY="602" maxY="624" name="tram-s"/>
   <symbol minX="572" maxX="594" minY="602" maxY="624" name="caravan_site-s"/>
@@ -594,52 +594,53 @@
   <symbol minX="770" maxX="792" minY="602" maxY="624" name="campsite-s"/>
   <symbol minX="792" maxX="814" minY="602" maxY="624" name="cafe-s"/>
   <symbol minX="814" maxX="836" minY="602" maxY="624" name="viewpoint-s"/>
-  <symbol minX="836" maxX="857" minY="602" maxY="623" name="lightrail-berlin-s"/>
-  <symbol minX="857" maxX="888" minY="602" maxY="623" name="railway-crossing-xl"/>
-  <symbol minX="888" maxX="916" minY="602" maxY="623" name="subway-madrid-s"/>
-  <symbol minX="916" maxX="946" minY="602" maxY="623" name="subway-kiev-l"/>
-  <symbol minX="946" maxX="967" minY="602" maxY="623" name="subway-paris-s"/>
-  <symbol minX="967" maxX="988" minY="602" maxY="623" name="peakt-l"/>
-  <symbol minX="988" maxX="1018" minY="602" maxY="623" name="subway-kiev-m"/>
-  <symbol minX="0" maxX="20" minY="624" maxY="644" name="subway-moscow-s"/>
-  <symbol minX="20" maxX="39" minY="624" maxY="643" name="subway-berlin-s"/>
-  <symbol minX="39" maxX="58" minY="624" maxY="643" name="subway-rome-s"/>
-  <symbol minX="58" maxX="79" minY="624" maxY="643" name="bench"/>
+  <symbol minX="836" maxX="858" minY="602" maxY="624" name="cable-car-s"/>
+  <symbol minX="858" maxX="889" minY="602" maxY="623" name="railway-crossing-xl"/>
+  <symbol minX="889" maxX="919" minY="602" maxY="623" name="subway-kiev-l"/>
+  <symbol minX="919" maxX="949" minY="602" maxY="623" name="subway-kiev-m"/>
+  <symbol minX="949" maxX="970" minY="602" maxY="623" name="peakt-l"/>
+  <symbol minX="970" maxX="998" minY="602" maxY="623" name="subway-madrid-s"/>
+  <symbol minX="998" maxX="1019" minY="602" maxY="623" name="lightrail-berlin-s"/>
+  <symbol minX="0" maxX="21" minY="624" maxY="645" name="subway-paris-s"/>
+  <symbol minX="21" maxX="41" minY="624" maxY="644" name="subway-moscow-s"/>
+  <symbol minX="41" maxX="60" minY="624" maxY="643" name="subway-rome-s"/>
+  <symbol minX="60" maxX="79" minY="624" maxY="643" name="subway-berlin-s"/>
   <symbol minX="79" maxX="102" minY="624" maxY="643" name="subway-london-s"/>
-  <symbol minX="102" maxX="120" minY="624" maxY="642" name="train-xs"/>
-  <symbol minX="120" maxX="138" minY="624" maxY="642" name="parking-s"/>
-  <symbol minX="138" maxX="168" minY="624" maxY="642" name="subway-minsk-l"/>
-  <symbol minX="168" maxX="186" minY="624" maxY="642" name="subway-newyork-xs"/>
-  <symbol minX="186" maxX="213" minY="624" maxY="642" name="railway-crossing-l"/>
-  <symbol minX="213" maxX="231" minY="624" maxY="642" name="subway-xs"/>
-  <symbol minX="231" maxX="249" minY="624" maxY="642" name="star-l"/>
-  <symbol minX="249" maxX="267" minY="624" maxY="642" name="bike-parking-s"/>
-  <symbol minX="267" maxX="285" minY="624" maxY="642" name="speedcam-s"/>
-  <symbol minX="285" maxX="303" minY="624" maxY="642" name="parking_pay-s"/>
-  <symbol minX="303" maxX="321" minY="624" maxY="642" name="survey_point-l"/>
-  <symbol minX="321" maxX="337" minY="624" maxY="640" name="star-m"/>
-  <symbol minX="337" maxX="362" minY="624" maxY="640" name="subway-kiev-s"/>
-  <symbol minX="362" maxX="377" minY="624" maxY="639" name="survey_point-m"/>
-  <symbol minX="377" maxX="400" minY="624" maxY="639" name="railway-crossing"/>
-  <symbol minX="400" maxX="416" minY="624" maxY="639" name="peakt-m"/>
-  <symbol minX="416" maxX="441" minY="624" maxY="639" name="subway-minsk-m"/>
-  <symbol minX="441" maxX="455" minY="624" maxY="638" name="crossing-l"/>
-  <symbol minX="455" maxX="469" minY="624" maxY="638" name="star-s"/>
-  <symbol minX="469" maxX="492" minY="624" maxY="638" name="subway-minsk-s"/>
-  <symbol minX="492" maxX="520" minY="624" maxY="637" name="arrow-m"/>
-  <symbol minX="520" maxX="534" minY="624" maxY="637" name="peakt-s"/>
-  <symbol minX="534" maxX="547" minY="624" maxY="637" name="survey_point-s"/>
-  <symbol minX="547" maxX="559" minY="624" maxY="636" name="crossing-m"/>
-  <symbol minX="559" maxX="571" minY="624" maxY="636" name="entrance-s"/>
-  <symbol minX="571" maxX="583" minY="624" maxY="636" name="zero-icon"/>
-  <symbol minX="583" maxX="593" minY="624" maxY="634" name="dot-m"/>
-  <symbol minX="593" maxX="614" minY="624" maxY="634" name="arrow-s"/>
-  <symbol minX="614" maxX="624" minY="624" maxY="634" name="crossing-s"/>
-  <symbol minX="624" maxX="634" minY="624" maxY="634" name="cities-m"/>
-  <symbol minX="634" maxX="643" minY="624" maxY="633" name="entrance-xs"/>
-  <symbol minX="643" maxX="650" minY="624" maxY="631" name="dot-s"/>
-  <symbol minX="650" maxX="657" minY="624" maxY="631" name="cities-xs"/>
-  <symbol minX="657" maxX="671" minY="624" maxY="631" name="arrow-xs"/>
+  <symbol minX="102" maxX="123" minY="624" maxY="643" name="bench"/>
+  <symbol minX="123" maxX="141" minY="624" maxY="642" name="subway-xs"/>
+  <symbol minX="141" maxX="168" minY="624" maxY="642" name="railway-crossing-l"/>
+  <symbol minX="168" maxX="186" minY="624" maxY="642" name="bike-parking-s"/>
+  <symbol minX="186" maxX="216" minY="624" maxY="642" name="subway-minsk-l"/>
+  <symbol minX="216" maxX="234" minY="624" maxY="642" name="parking-s"/>
+  <symbol minX="234" maxX="252" minY="624" maxY="642" name="survey_point-l"/>
+  <symbol minX="252" maxX="270" minY="624" maxY="642" name="parking_pay-s"/>
+  <symbol minX="270" maxX="288" minY="624" maxY="642" name="speedcam-s"/>
+  <symbol minX="288" maxX="306" minY="624" maxY="642" name="star-l"/>
+  <symbol minX="306" maxX="324" minY="624" maxY="642" name="subway-newyork-xs"/>
+  <symbol minX="324" maxX="342" minY="624" maxY="642" name="train-xs"/>
+  <symbol minX="342" maxX="367" minY="624" maxY="640" name="subway-kiev-s"/>
+  <symbol minX="367" maxX="383" minY="624" maxY="640" name="star-m"/>
+  <symbol minX="383" maxX="406" minY="624" maxY="639" name="railway-crossing"/>
+  <symbol minX="406" maxX="421" minY="624" maxY="639" name="survey_point-m"/>
+  <symbol minX="421" maxX="437" minY="624" maxY="639" name="peakt-m"/>
+  <symbol minX="437" maxX="462" minY="624" maxY="639" name="subway-minsk-m"/>
+  <symbol minX="462" maxX="476" minY="624" maxY="638" name="crossing-l"/>
+  <symbol minX="476" maxX="499" minY="624" maxY="638" name="subway-minsk-s"/>
+  <symbol minX="499" maxX="513" minY="624" maxY="638" name="star-s"/>
+  <symbol minX="513" maxX="541" minY="624" maxY="637" name="arrow-m"/>
+  <symbol minX="541" maxX="554" minY="624" maxY="637" name="survey_point-s"/>
+  <symbol minX="554" maxX="568" minY="624" maxY="637" name="peakt-s"/>
+  <symbol minX="568" maxX="580" minY="624" maxY="636" name="zero-icon"/>
+  <symbol minX="580" maxX="592" minY="624" maxY="636" name="crossing-m"/>
+  <symbol minX="592" maxX="604" minY="624" maxY="636" name="entrance-s"/>
+  <symbol minX="604" maxX="625" minY="624" maxY="634" name="arrow-s"/>
+  <symbol minX="625" maxX="635" minY="624" maxY="634" name="cities-m"/>
+  <symbol minX="635" maxX="645" minY="624" maxY="634" name="crossing-s"/>
+  <symbol minX="645" maxX="655" minY="624" maxY="634" name="dot-m"/>
+  <symbol minX="655" maxX="664" minY="624" maxY="633" name="entrance-xs"/>
+  <symbol minX="664" maxX="671" minY="624" maxY="631" name="dot-s"/>
   <symbol minX="671" maxX="678" minY="624" maxY="631" name="cities-s"/>
+  <symbol minX="678" maxX="685" minY="624" maxY="631" name="cities-xs"/>
+  <symbol minX="685" maxX="699" minY="624" maxY="631" name="arrow-xs"/>
  </file>
 </root>
diff --git a/data/resources-hdpi_dark/symbols-ad.png b/data/resources-hdpi_dark/symbols-ad.png
index 1a8d8464ad..faa11e571c 100644
Binary files a/data/resources-hdpi_dark/symbols-ad.png and b/data/resources-hdpi_dark/symbols-ad.png differ
diff --git a/data/resources-hdpi_dark/symbols.png b/data/resources-hdpi_dark/symbols.png
index 3ce6e6df06..f0e638db88 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 e680092fff..bae8c7004a 100644
--- a/data/resources-hdpi_dark/symbols.sdf
+++ b/data/resources-hdpi_dark/symbols.sdf
@@ -321,8 +321,8 @@
   <symbol minX="992" maxX="1023" minY="411" maxY="442" name="kiosk-l"/>
   <symbol minX="0" maxX="31" minY="442" maxY="473" name="kiosk-m"/>
   <symbol minX="31" maxX="62" minY="442" maxY="473" name="remains-m"/>
-  <symbol minX="62" maxX="93" minY="442" maxY="473" name="remains-l"/>
-  <symbol minX="93" maxX="124" minY="442" maxY="473" name="laundry-m"/>
+  <symbol minX="62" maxX="93" minY="442" maxY="473" name="laundry-l"/>
+  <symbol minX="93" maxX="124" minY="442" maxY="473" name="remains-l"/>
   <symbol minX="124" maxX="155" minY="442" maxY="473" name="recycling-m"/>
   <symbol minX="155" maxX="186" minY="442" maxY="473" name="lawyer-l"/>
   <symbol minX="186" maxX="217" minY="442" maxY="473" name="lawyer-m"/>
@@ -335,7 +335,7 @@
   <symbol minX="403" maxX="434" minY="442" maxY="473" name="public-building-l"/>
   <symbol minX="434" maxX="465" minY="442" maxY="473" name="lighthouse-l"/>
   <symbol minX="465" maxX="496" minY="442" maxY="473" name="lighthouse-m"/>
-  <symbol minX="496" maxX="527" minY="442" maxY="473" name="laundry-l"/>
+  <symbol minX="496" maxX="527" minY="442" maxY="473" name="laundry-m"/>
   <symbol minX="527" maxX="558" minY="442" maxY="473" name="lightrail-berlin-l"/>
   <symbol minX="558" maxX="589" minY="442" maxY="473" name="power-m"/>
   <symbol minX="589" maxX="620" minY="442" maxY="473" name="power-l"/>
@@ -396,10 +396,10 @@
   <symbol minX="248" maxX="279" minY="504" maxY="535" name="parking-xl"/>
   <symbol minX="279" maxX="310" minY="504" maxY="535" name="parking_pay-l"/>
   <symbol minX="310" maxX="341" minY="504" maxY="535" name="petshop-l"/>
-  <symbol minX="341" maxX="371" minY="504" maxY="534" name="cave-m"/>
-  <symbol minX="371" maxX="401" minY="504" maxY="534" name="volcano-m"/>
+  <symbol minX="341" maxX="371" minY="504" maxY="534" name="volcano-m"/>
+  <symbol minX="371" maxX="401" minY="504" maxY="534" name="atm-tinkoff-gerb-m"/>
   <symbol minX="401" maxX="431" minY="504" maxY="534" name="atm-tinkoff-shield-m"/>
-  <symbol minX="431" maxX="461" minY="504" maxY="534" name="atm-tinkoff-gerb-m"/>
+  <symbol minX="431" maxX="461" minY="504" maxY="534" name="cave-m"/>
   <symbol minX="461" maxX="491" minY="504" maxY="534" name="subway-spb-m"/>
   <symbol minX="491" maxX="520" minY="504" maxY="533" name="subway-entrance-m"/>
   <symbol minX="520" maxX="551" minY="504" maxY="533" name="speedcam1-xl"/>
@@ -407,139 +407,139 @@
   <symbol minX="579" maxX="607" minY="504" maxY="532" name="subway-rome-l"/>
   <symbol minX="607" maxX="635" minY="504" maxY="532" name="subway-berlin-l"/>
   <symbol minX="635" maxX="666" minY="504" maxY="532" name="subway-moscow-l"/>
-  <symbol minX="666" maxX="693" minY="504" maxY="531" name="speedcam-m"/>
-  <symbol minX="693" maxX="720" minY="504" maxY="531" name="bike-parking-m"/>
+  <symbol minX="666" maxX="693" minY="504" maxY="531" name="non-found-search-result"/>
+  <symbol minX="693" maxX="720" minY="504" maxY="531" name="speedcam-m"/>
   <symbol minX="720" maxX="747" minY="504" maxY="531" name="parking_pay-m"/>
-  <symbol minX="747" maxX="774" minY="504" maxY="531" name="search-result"/>
+  <symbol minX="747" maxX="774" minY="504" maxY="531" name="bike-parking-m"/>
   <symbol minX="774" maxX="801" minY="504" maxY="531" name="parking-m"/>
-  <symbol minX="801" maxX="830" minY="504" maxY="529" name="subway-moscow-m"/>
-  <symbol minX="830" maxX="855" minY="504" maxY="529" name="subway-paris-m"/>
-  <symbol minX="855" maxX="880" minY="504" maxY="529" name="subway-rome-m"/>
-  <symbol minX="880" maxX="911" minY="504" maxY="529" name="subway-london-l"/>
-  <symbol minX="911" maxX="936" minY="504" maxY="529" name="api-result"/>
-  <symbol minX="936" maxX="961" minY="504" maxY="529" name="subway-berlin-m"/>
-  <symbol minX="961" maxX="991" minY="504" maxY="527" name="subway-london-m"/>
-  <symbol minX="991" maxX="1019" minY="504" maxY="527" name="subway-barcelona-s"/>
-  <symbol minX="0" maxX="23" minY="535" maxY="558" name="cave-s"/>
-  <symbol minX="23" maxX="46" minY="535" maxY="558" name="atm-tinkoff-shield-s"/>
-  <symbol minX="46" maxX="69" minY="535" maxY="558" name="subway-spb-s"/>
-  <symbol minX="69" maxX="92" minY="535" maxY="558" name="atm-tinkoff-gerb-s"/>
-  <symbol minX="92" maxX="115" minY="535" maxY="558" name="volcano-s"/>
-  <symbol minX="115" maxX="137" minY="535" maxY="557" name="marketplace-s"/>
-  <symbol minX="137" maxX="159" minY="535" maxY="557" name="mail-s"/>
-  <symbol minX="159" maxX="181" minY="535" maxY="557" name="postbox-s"/>
-  <symbol minX="181" maxX="203" minY="535" maxY="557" name="book-shop-s"/>
-  <symbol minX="203" maxX="225" minY="535" maxY="557" name="police-s"/>
-  <symbol minX="225" maxX="247" minY="535" maxY="557" name="power-s"/>
-  <symbol minX="247" maxX="269" minY="535" maxY="557" name="lift_gate-s"/>
-  <symbol minX="269" maxX="291" minY="535" maxY="557" name="library-s"/>
-  <symbol minX="291" maxX="313" minY="535" maxY="557" name="public-building-s"/>
-  <symbol minX="313" maxX="335" minY="535" maxY="557" name="australian-football-s"/>
-  <symbol minX="335" maxX="357" minY="535" maxY="557" name="bookmaker-s"/>
-  <symbol minX="357" maxX="379" minY="535" maxY="557" name="alcohol-s"/>
-  <symbol minX="379" maxX="401" minY="535" maxY="557" name="lawyer-s"/>
-  <symbol minX="401" maxX="423" minY="535" maxY="557" name="laundry-s"/>
-  <symbol minX="423" maxX="445" minY="535" maxY="557" name="recycling-s"/>
-  <symbol minX="445" maxX="467" minY="535" maxY="557" name="military-s"/>
-  <symbol minX="467" maxX="489" minY="535" maxY="557" name="kiosk-s"/>
-  <symbol minX="489" maxX="511" minY="535" maxY="557" name="remains-s"/>
-  <symbol minX="511" maxX="533" minY="535" maxY="557" name="kindergarten-s"/>
-  <symbol minX="533" maxX="555" minY="535" maxY="557" name="jewish-s"/>
-  <symbol minX="555" maxX="577" minY="535" maxY="557" name="restaurant-s"/>
-  <symbol minX="577" maxX="599" minY="535" maxY="557" name="jewelry-s"/>
-  <symbol minX="599" maxX="621" minY="535" maxY="557" name="information-s"/>
-  <symbol minX="621" maxX="643" minY="535" maxY="557" name="hunting-tower-s"/>
-  <symbol minX="643" maxX="665" minY="535" maxY="557" name="sauna-s"/>
-  <symbol minX="665" maxX="687" minY="535" maxY="557" name="hotel-s"/>
-  <symbol minX="687" maxX="709" minY="535" maxY="557" name="hostel-s"/>
-  <symbol minX="709" maxX="731" minY="535" maxY="557" name="school-s"/>
-  <symbol minX="731" maxX="753" minY="535" maxY="557" name="hospital-s"/>
-  <symbol minX="753" maxX="775" minY="535" maxY="557" name="historic-ship-s"/>
-  <symbol minX="775" maxX="797" minY="535" maxY="557" name="seafood-shop-s"/>
-  <symbol minX="797" maxX="819" minY="535" maxY="557" name="hindu-s"/>
-  <symbol minX="819" maxX="841" minY="535" maxY="557" name="heliport-s"/>
-  <symbol minX="841" maxX="863" minY="535" maxY="557" name="shinto-s"/>
-  <symbol minX="863" maxX="885" minY="535" maxY="557" name="helipad-s"/>
-  <symbol minX="885" maxX="907" minY="535" maxY="557" name="hardware-s"/>
-  <symbol minX="907" maxX="929" minY="535" maxY="557" name="ship-s"/>
-  <symbol minX="929" maxX="951" minY="535" maxY="557" name="hand-s"/>
-  <symbol minX="951" maxX="973" minY="535" maxY="557" name="hairdresser-s"/>
-  <symbol minX="973" maxX="995" minY="535" maxY="557" name="shoes-s"/>
-  <symbol minX="995" maxX="1017" minY="535" maxY="557" name="gym-s"/>
-  <symbol minX="0" maxX="22" minY="558" maxY="580" name="grocery-s"/>
-  <symbol minX="22" maxX="44" minY="558" maxY="580" name="shop-bicycle-s"/>
-  <symbol minX="44" maxX="66" minY="558" maxY="580" name="greengrocer-s"/>
-  <symbol minX="66" maxX="88" minY="558" maxY="580" name="golf-s"/>
-  <symbol minX="88" maxX="110" minY="558" maxY="580" name="shop-s"/>
-  <symbol minX="110" maxX="132" minY="558" maxY="580" name="gift-s"/>
-  <symbol minX="132" maxX="154" minY="558" maxY="580" name="gate-s"/>
-  <symbol minX="154" maxX="176" minY="558" maxY="580" name="garden_center-s"/>
-  <symbol minX="176" maxX="198" minY="558" maxY="580" name="skiing-s"/>
-  <symbol minX="198" maxX="220" minY="558" maxY="580" name="garden-s"/>
-  <symbol minX="220" maxX="242" minY="558" maxY="580" name="gallery-s"/>
-  <symbol minX="242" maxX="264" minY="558" maxY="580" name="soccer-s"/>
-  <symbol minX="264" maxX="286" minY="558" maxY="580" name="furniture-s"/>
-  <symbol minX="286" maxX="308" minY="558" maxY="580" name="mobile_phone-s"/>
-  <symbol minX="308" maxX="330" minY="558" maxY="580" name="bakery-s"/>
-  <symbol minX="330" maxX="352" minY="558" maxY="580" name="funicular-s"/>
-  <symbol minX="352" maxX="374" minY="558" maxY="580" name="monument-s"/>
-  <symbol minX="374" maxX="396" minY="558" maxY="580" name="fuel-s"/>
-  <symbol minX="396" maxX="418" minY="558" maxY="580" name="fountain-s"/>
-  <symbol minX="418" maxX="440" minY="558" maxY="580" name="sports-s"/>
-  <symbol minX="440" maxX="462" minY="558" maxY="580" name="florist-s"/>
-  <symbol minX="462" maxX="484" minY="558" maxY="580" name="firehydrant-s"/>
-  <symbol minX="484" maxX="506" minY="558" maxY="580" name="stadium-s"/>
-  <symbol minX="506" maxX="528" minY="558" maxY="580" name="bank-s"/>
-  <symbol minX="528" maxX="550" minY="558" maxY="580" name="alpine_hut-s"/>
-  <symbol minX="550" maxX="572" minY="558" maxY="580" name="place-of-worship-s"/>
-  <symbol minX="572" maxX="603" minY="558" maxY="580" name="subway-barcelona-l"/>
-  <symbol minX="603" maxX="634" minY="558" maxY="580" name="subway-barcelona-m"/>
-  <symbol minX="634" maxX="656" minY="558" maxY="580" name="motel-s"/>
-  <symbol minX="656" maxX="678" minY="558" maxY="580" name="motorcycle_shop-s"/>
-  <symbol minX="678" maxX="700" minY="558" maxY="580" name="pitch-s"/>
-  <symbol minX="700" maxX="722" minY="558" maxY="580" name="waterfall-s"/>
-  <symbol minX="722" maxX="744" minY="558" maxY="580" name="fire_station-s"/>
-  <symbol minX="744" maxX="766" minY="558" maxY="580" name="museum-s"/>
-  <symbol minX="766" maxX="788" minY="558" maxY="580" name="subway-entrance-s"/>
-  <symbol minX="788" maxX="810" minY="558" maxY="580" name="wayside_shrine-s"/>
-  <symbol minX="810" maxX="832" minY="558" maxY="580" name="bowls-s"/>
-  <symbol minX="832" maxX="854" minY="558" maxY="580" name="banknote-s"/>
-  <symbol minX="854" maxX="876" minY="558" maxY="580" name="fastfood-s"/>
-  <symbol minX="876" maxX="898" minY="558" maxY="580" name="muslim-s"/>
-  <symbol minX="898" maxX="920" minY="558" maxY="580" name="picnic-s"/>
-  <symbol minX="920" maxX="942" minY="558" maxY="580" name="buddhist-s"/>
-  <symbol minX="942" maxX="964" minY="558" maxY="580" name="equestrian-s"/>
-  <symbol minX="964" maxX="995" minY="558" maxY="580" name="subway-madrid-l"/>
+  <symbol minX="801" maxX="828" minY="504" maxY="531" name="search-result"/>
+  <symbol minX="828" maxX="857" minY="504" maxY="529" name="subway-moscow-m"/>
+  <symbol minX="857" maxX="882" minY="504" maxY="529" name="subway-paris-m"/>
+  <symbol minX="882" maxX="907" minY="504" maxY="529" name="subway-rome-m"/>
+  <symbol minX="907" maxX="938" minY="504" maxY="529" name="subway-london-l"/>
+  <symbol minX="938" maxX="963" minY="504" maxY="529" name="api-result"/>
+  <symbol minX="963" maxX="988" minY="504" maxY="529" name="subway-berlin-m"/>
+  <symbol minX="988" maxX="1011" minY="504" maxY="527" name="volcano-s"/>
+  <symbol minX="0" maxX="28" minY="535" maxY="558" name="subway-barcelona-s"/>
+  <symbol minX="28" maxX="51" minY="535" maxY="558" name="atm-tinkoff-shield-s"/>
+  <symbol minX="51" maxX="74" minY="535" maxY="558" name="cave-s"/>
+  <symbol minX="74" maxX="97" minY="535" maxY="558" name="subway-spb-s"/>
+  <symbol minX="97" maxX="120" minY="535" maxY="558" name="atm-tinkoff-gerb-s"/>
+  <symbol minX="120" maxX="150" minY="535" maxY="558" name="subway-london-m"/>
+  <symbol minX="150" maxX="172" minY="535" maxY="557" name="mail-s"/>
+  <symbol minX="172" maxX="194" minY="535" maxY="557" name="postbox-s"/>
+  <symbol minX="194" maxX="216" minY="535" maxY="557" name="wayside_shrine-s"/>
+  <symbol minX="216" maxX="238" minY="535" maxY="557" name="marketplace-s"/>
+  <symbol minX="238" maxX="260" minY="535" maxY="557" name="power-s"/>
+  <symbol minX="260" maxX="282" minY="535" maxY="557" name="lift_gate-s"/>
+  <symbol minX="282" maxX="304" minY="535" maxY="557" name="library-s"/>
+  <symbol minX="304" maxX="326" minY="535" maxY="557" name="public-building-s"/>
+  <symbol minX="326" maxX="348" minY="535" maxY="557" name="australian-football-s"/>
+  <symbol minX="348" maxX="370" minY="535" maxY="557" name="book-shop-s"/>
+  <symbol minX="370" maxX="392" minY="535" maxY="557" name="alcohol-s"/>
+  <symbol minX="392" maxX="414" minY="535" maxY="557" name="lawyer-s"/>
+  <symbol minX="414" maxX="436" minY="535" maxY="557" name="laundry-s"/>
+  <symbol minX="436" maxX="458" minY="535" maxY="557" name="recycling-s"/>
+  <symbol minX="458" maxX="480" minY="535" maxY="557" name="police-s"/>
+  <symbol minX="480" maxX="502" minY="535" maxY="557" name="kiosk-s"/>
+  <symbol minX="502" maxX="524" minY="535" maxY="557" name="remains-s"/>
+  <symbol minX="524" maxX="546" minY="535" maxY="557" name="kindergarten-s"/>
+  <symbol minX="546" maxX="568" minY="535" maxY="557" name="jewish-s"/>
+  <symbol minX="568" maxX="590" minY="535" maxY="557" name="restaurant-s"/>
+  <symbol minX="590" maxX="612" minY="535" maxY="557" name="jewelry-s"/>
+  <symbol minX="612" maxX="634" minY="535" maxY="557" name="information-s"/>
+  <symbol minX="634" maxX="656" minY="535" maxY="557" name="hunting-tower-s"/>
+  <symbol minX="656" maxX="678" minY="535" maxY="557" name="sauna-s"/>
+  <symbol minX="678" maxX="700" minY="535" maxY="557" name="hotel-s"/>
+  <symbol minX="700" maxX="722" minY="535" maxY="557" name="hostel-s"/>
+  <symbol minX="722" maxX="744" minY="535" maxY="557" name="school-s"/>
+  <symbol minX="744" maxX="766" minY="535" maxY="557" name="hospital-s"/>
+  <symbol minX="766" maxX="788" minY="535" maxY="557" name="historic-ship-s"/>
+  <symbol minX="788" maxX="810" minY="535" maxY="557" name="seafood-shop-s"/>
+  <symbol minX="810" maxX="832" minY="535" maxY="557" name="hindu-s"/>
+  <symbol minX="832" maxX="854" minY="535" maxY="557" name="heliport-s"/>
+  <symbol minX="854" maxX="876" minY="535" maxY="557" name="shinto-s"/>
+  <symbol minX="876" maxX="898" minY="535" maxY="557" name="helipad-s"/>
+  <symbol minX="898" maxX="920" minY="535" maxY="557" name="hardware-s"/>
+  <symbol minX="920" maxX="942" minY="535" maxY="557" name="ship-s"/>
+  <symbol minX="942" maxX="964" minY="535" maxY="557" name="hand-s"/>
+  <symbol minX="964" maxX="986" minY="535" maxY="557" name="hairdresser-s"/>
+  <symbol minX="986" maxX="1008" minY="535" maxY="557" name="shoes-s"/>
+  <symbol minX="0" maxX="22" minY="558" maxY="580" name="gym-s"/>
+  <symbol minX="22" maxX="44" minY="558" maxY="580" name="grocery-s"/>
+  <symbol minX="44" maxX="66" minY="558" maxY="580" name="shop-bicycle-s"/>
+  <symbol minX="66" maxX="88" minY="558" maxY="580" name="greengrocer-s"/>
+  <symbol minX="88" maxX="110" minY="558" maxY="580" name="golf-s"/>
+  <symbol minX="110" maxX="132" minY="558" maxY="580" name="shop-s"/>
+  <symbol minX="132" maxX="154" minY="558" maxY="580" name="gift-s"/>
+  <symbol minX="154" maxX="176" minY="558" maxY="580" name="gate-s"/>
+  <symbol minX="176" maxX="198" minY="558" maxY="580" name="garden_center-s"/>
+  <symbol minX="198" maxX="220" minY="558" maxY="580" name="skiing-s"/>
+  <symbol minX="220" maxX="242" minY="558" maxY="580" name="garden-s"/>
+  <symbol minX="242" maxX="264" minY="558" maxY="580" name="gallery-s"/>
+  <symbol minX="264" maxX="286" minY="558" maxY="580" name="soccer-s"/>
+  <symbol minX="286" maxX="308" minY="558" maxY="580" name="furniture-s"/>
+  <symbol minX="308" maxX="330" minY="558" maxY="580" name="military-s"/>
+  <symbol minX="330" maxX="352" minY="558" maxY="580" name="bakery-s"/>
+  <symbol minX="352" maxX="374" minY="558" maxY="580" name="funicular-s"/>
+  <symbol minX="374" maxX="396" minY="558" maxY="580" name="mobile_phone-s"/>
+  <symbol minX="396" maxX="418" minY="558" maxY="580" name="fuel-s"/>
+  <symbol minX="418" maxX="440" minY="558" maxY="580" name="fountain-s"/>
+  <symbol minX="440" maxX="462" minY="558" maxY="580" name="sports-s"/>
+  <symbol minX="462" maxX="484" minY="558" maxY="580" name="florist-s"/>
+  <symbol minX="484" maxX="506" minY="558" maxY="580" name="firehydrant-s"/>
+  <symbol minX="506" maxX="528" minY="558" maxY="580" name="stadium-s"/>
+  <symbol minX="528" maxX="550" minY="558" maxY="580" name="bank-s"/>
+  <symbol minX="550" maxX="572" minY="558" maxY="580" name="alpine_hut-s"/>
+  <symbol minX="572" maxX="594" minY="558" maxY="580" name="monument-s"/>
+  <symbol minX="594" maxX="625" minY="558" maxY="580" name="subway-barcelona-l"/>
+  <symbol minX="625" maxX="656" minY="558" maxY="580" name="subway-barcelona-m"/>
+  <symbol minX="656" maxX="678" minY="558" maxY="580" name="place-of-worship-s"/>
+  <symbol minX="678" maxX="700" minY="558" maxY="580" name="motel-s"/>
+  <symbol minX="700" maxX="722" minY="558" maxY="580" name="motorcycle_shop-s"/>
+  <symbol minX="722" maxX="744" minY="558" maxY="580" name="bookmaker-s"/>
+  <symbol minX="744" maxX="766" minY="558" maxY="580" name="fire_station-s"/>
+  <symbol minX="766" maxX="788" minY="558" maxY="580" name="pitch-s"/>
+  <symbol minX="788" maxX="810" minY="558" maxY="580" name="subway-entrance-s"/>
+  <symbol minX="810" maxX="832" minY="558" maxY="580" name="waterfall-s"/>
+  <symbol minX="832" maxX="854" minY="558" maxY="580" name="lighthouse-s"/>
+  <symbol minX="854" maxX="876" minY="558" maxY="580" name="banknote-s"/>
+  <symbol minX="876" maxX="898" minY="558" maxY="580" name="fastfood-s"/>
+  <symbol minX="898" maxX="920" minY="558" maxY="580" name="museum-s"/>
+  <symbol minX="920" maxX="942" minY="558" maxY="580" name="muslim-s"/>
+  <symbol minX="942" maxX="964" minY="558" maxY="580" name="bowls-s"/>
+  <symbol minX="964" maxX="986" minY="558" maxY="580" name="equestrian-s"/>
+  <symbol minX="986" maxX="1017" minY="558" maxY="580" name="subway-madrid-l"/>
   <symbol minX="0" maxX="31" minY="580" maxY="602" name="subway-madrid-m"/>
-  <symbol minX="31" maxX="53" minY="580" maxY="602" name="waste-basket-s"/>
+  <symbol minX="31" maxX="53" minY="580" maxY="602" name="buddhist-s"/>
   <symbol minX="53" maxX="75" minY="580" maxY="602" name="bar-s"/>
   <symbol minX="75" maxX="97" minY="580" maxY="602" name="america-football-s"/>
   <symbol minX="97" maxX="119" minY="580" maxY="602" name="baseball-s"/>
-  <symbol minX="119" maxX="141" minY="580" maxY="602" name="npark-s"/>
-  <symbol minX="141" maxX="163" minY="580" maxY="602" name="nparkf-s"/>
-  <symbol minX="163" maxX="185" minY="580" maxY="602" name="bus-s"/>
+  <symbol minX="119" maxX="141" minY="580" maxY="602" name="picnic-s"/>
+  <symbol minX="141" maxX="163" minY="580" maxY="602" name="npark-s"/>
+  <symbol minX="163" maxX="185" minY="580" maxY="602" name="waste-basket-s"/>
   <symbol minX="185" maxX="207" minY="580" maxY="602" name="basketball-s"/>
   <symbol minX="207" maxX="229" minY="580" maxY="602" name="apartment-s"/>
   <symbol minX="229" maxX="251" minY="580" maxY="602" name="subway-newyork-s"/>
   <symbol minX="251" maxX="273" minY="580" maxY="602" name="bbq-s"/>
   <symbol minX="273" maxX="295" minY="580" maxY="602" name="embassy-s"/>
-  <symbol minX="295" maxX="317" minY="580" maxY="602" name="photo-shop-s"/>
-  <symbol minX="317" maxX="339" minY="580" maxY="602" name="butcher-s"/>
-  <symbol minX="339" maxX="361" minY="580" maxY="602" name="office-s"/>
-  <symbol minX="361" maxX="383" minY="580" maxY="602" name="optician-s"/>
-  <symbol minX="383" maxX="405" minY="580" maxY="602" name="lighthouse-s"/>
+  <symbol minX="295" maxX="317" minY="580" maxY="602" name="nparkf-s"/>
+  <symbol minX="317" maxX="339" minY="580" maxY="602" name="bus-s"/>
+  <symbol minX="339" maxX="361" minY="580" maxY="602" name="photo-shop-s"/>
+  <symbol minX="361" maxX="383" minY="580" maxY="602" name="office-s"/>
+  <symbol minX="383" maxX="405" minY="580" maxY="602" name="butcher-s"/>
   <symbol minX="405" maxX="427" minY="580" maxY="602" name="subway-s"/>
   <symbol minX="427" maxX="449" minY="580" maxY="602" name="electronics-s"/>
-  <symbol minX="449" maxX="471" minY="580" maxY="602" name="phone-s"/>
-  <symbol minX="471" maxX="493" minY="580" maxY="602" name="outdoor-shop-s"/>
+  <symbol minX="449" maxX="471" minY="580" maxY="602" name="optician-s"/>
+  <symbol minX="471" maxX="493" minY="580" maxY="602" name="phone-s"/>
   <symbol minX="493" maxX="515" minY="580" maxY="602" name="bcontrol-s"/>
   <symbol minX="515" maxX="537" minY="580" maxY="602" name="archery-s"/>
   <symbol minX="537" maxX="559" minY="580" maxY="602" name="beach-s"/>
   <symbol minX="559" maxX="581" minY="580" maxY="602" name="beauty-s"/>
   <symbol minX="581" maxX="603" minY="580" maxY="602" name="drinking-water-s"/>
-  <symbol minX="603" maxX="625" minY="580" maxY="602" name="atm-s"/>
+  <symbol minX="603" maxX="625" minY="580" maxY="602" name="outdoor-shop-s"/>
   <symbol minX="625" maxX="647" minY="580" maxY="602" name="sweets-s"/>
-  <symbol minX="647" maxX="669" minY="580" maxY="602" name="beer-s"/>
+  <symbol minX="647" maxX="669" minY="580" maxY="602" name="atm-s"/>
   <symbol minX="669" maxX="691" minY="580" maxY="602" name="doityourself-s"/>
   <symbol minX="691" maxX="713" minY="580" maxY="602" name="swimming-s"/>
   <symbol minX="713" maxX="735" minY="580" maxY="602" name="dog_park-s"/>
@@ -549,10 +549,10 @@
   <symbol minX="801" maxX="823" minY="580" maxY="602" name="dentist-s"/>
   <symbol minX="823" maxX="845" minY="580" maxY="602" name="taxi-s"/>
   <symbol minX="845" maxX="867" minY="580" maxY="602" name="curling-s"/>
-  <symbol minX="867" maxX="889" minY="580" maxY="602" name="park-s"/>
+  <symbol minX="867" maxX="889" minY="580" maxY="602" name="beer-s"/>
   <symbol minX="889" maxX="911" minY="580" maxY="602" name="tennis-s"/>
-  <symbol minX="911" maxX="933" minY="580" maxY="602" name="pharmacy-s"/>
-  <symbol minX="933" maxX="955" minY="580" maxY="602" name="zoo-s"/>
+  <symbol minX="911" maxX="933" minY="580" maxY="602" name="park-s"/>
+  <symbol minX="933" maxX="955" minY="580" maxY="602" name="pharmacy-s"/>
   <symbol minX="955" maxX="977" minY="580" maxY="602" name="theatre-s"/>
   <symbol minX="977" maxX="999" minY="580" maxY="602" name="cricket-s"/>
   <symbol minX="999" maxX="1021" minY="580" maxY="602" name="copyshop-s"/>
@@ -564,10 +564,10 @@
   <symbol minX="110" maxX="132" minY="602" maxY="624" name="clothes-s"/>
   <symbol minX="132" maxX="154" minY="602" maxY="624" name="toilets-s"/>
   <symbol minX="154" maxX="176" minY="602" maxY="624" name="climbing-s"/>
-  <symbol minX="176" maxX="198" minY="602" maxY="624" name="cable-car-s"/>
+  <symbol minX="176" maxX="198" minY="602" maxY="624" name="zoo-s"/>
   <symbol minX="198" maxX="220" minY="602" maxY="624" name="toll_booth-s"/>
-  <symbol minX="220" maxX="242" minY="602" maxY="624" name="bicycle-s"/>
-  <symbol minX="242" maxX="264" minY="602" maxY="624" name="windmill-s"/>
+  <symbol minX="220" maxX="242" minY="602" maxY="624" name="airport-s"/>
+  <symbol minX="242" maxX="264" minY="602" maxY="624" name="bicycle-s"/>
   <symbol minX="264" maxX="286" minY="602" maxY="624" name="cinema-s"/>
   <symbol minX="286" maxX="308" minY="602" maxY="624" name="tomb-s"/>
   <symbol minX="308" maxX="330" minY="602" maxY="624" name="christian-s"/>
@@ -579,8 +579,8 @@
   <symbol minX="440" maxX="462" minY="602" maxY="624" name="cemetery-s"/>
   <symbol minX="462" maxX="484" minY="602" maxY="624" name="parking-meter-s"/>
   <symbol minX="484" maxX="506" minY="602" maxY="624" name="train-s"/>
-  <symbol minX="506" maxX="528" minY="602" maxY="624" name="petshop-s"/>
-  <symbol minX="528" maxX="550" minY="602" maxY="624" name="airport-s"/>
+  <symbol minX="506" maxX="528" minY="602" maxY="624" name="windmill-s"/>
+  <symbol minX="528" maxX="550" minY="602" maxY="624" name="petshop-s"/>
   <symbol minX="550" maxX="572" minY="602" maxY="624" name="casino-s"/>
   <symbol minX="572" maxX="594" minY="602" maxY="624" name="tram-s"/>
   <symbol minX="594" maxX="616" minY="602" maxY="624" name="caravan_site-s"/>
@@ -595,52 +595,53 @@
   <symbol minX="792" maxX="814" minY="602" maxY="624" name="campsite-s"/>
   <symbol minX="814" maxX="836" minY="602" maxY="624" name="cafe-s"/>
   <symbol minX="836" maxX="858" minY="602" maxY="624" name="viewpoint-s"/>
-  <symbol minX="858" maxX="888" minY="602" maxY="623" name="subway-kiev-l"/>
-  <symbol minX="888" maxX="909" minY="602" maxY="623" name="peakt-l"/>
-  <symbol minX="909" maxX="930" minY="602" maxY="623" name="lightrail-berlin-s"/>
-  <symbol minX="930" maxX="951" minY="602" maxY="623" name="subway-paris-s"/>
-  <symbol minX="951" maxX="981" minY="602" maxY="623" name="subway-kiev-m"/>
-  <symbol minX="981" maxX="1009" minY="602" maxY="623" name="subway-madrid-s"/>
-  <symbol minX="0" maxX="31" minY="624" maxY="645" name="railway-crossing-xl"/>
-  <symbol minX="31" maxX="51" minY="624" maxY="644" name="subway-moscow-s"/>
-  <symbol minX="51" maxX="70" minY="624" maxY="643" name="subway-berlin-s"/>
-  <symbol minX="70" maxX="91" minY="624" maxY="643" name="bench"/>
-  <symbol minX="91" maxX="110" minY="624" maxY="643" name="subway-rome-s"/>
-  <symbol minX="110" maxX="133" minY="624" maxY="643" name="subway-london-s"/>
-  <symbol minX="133" maxX="151" minY="624" maxY="642" name="bike-parking-s"/>
-  <symbol minX="151" maxX="169" minY="624" maxY="642" name="train-xs"/>
-  <symbol minX="169" maxX="187" minY="624" maxY="642" name="parking-s"/>
-  <symbol minX="187" maxX="214" minY="624" maxY="642" name="railway-crossing-l"/>
-  <symbol minX="214" maxX="232" minY="624" maxY="642" name="speedcam-s"/>
-  <symbol minX="232" maxX="250" minY="624" maxY="642" name="star-l"/>
-  <symbol minX="250" maxX="280" minY="624" maxY="642" name="subway-minsk-l"/>
-  <symbol minX="280" maxX="298" minY="624" maxY="642" name="parking_pay-s"/>
-  <symbol minX="298" maxX="316" minY="624" maxY="642" name="subway-newyork-xs"/>
-  <symbol minX="316" maxX="334" minY="624" maxY="642" name="subway-xs"/>
-  <symbol minX="334" maxX="352" minY="624" maxY="642" name="survey_point-l"/>
-  <symbol minX="352" maxX="368" minY="624" maxY="640" name="star-m"/>
-  <symbol minX="368" maxX="393" minY="624" maxY="640" name="subway-kiev-s"/>
-  <symbol minX="393" maxX="408" minY="624" maxY="639" name="survey_point-m"/>
-  <symbol minX="408" maxX="424" minY="624" maxY="639" name="peakt-m"/>
-  <symbol minX="424" maxX="447" minY="624" maxY="639" name="railway-crossing"/>
-  <symbol minX="447" maxX="472" minY="624" maxY="639" name="subway-minsk-m"/>
-  <symbol minX="472" maxX="486" minY="624" maxY="638" name="star-s"/>
-  <symbol minX="486" maxX="500" minY="624" maxY="638" name="crossing-l"/>
-  <symbol minX="500" maxX="523" minY="624" maxY="638" name="subway-minsk-s"/>
-  <symbol minX="523" maxX="536" minY="624" maxY="637" name="survey_point-s"/>
-  <symbol minX="536" maxX="550" minY="624" maxY="637" name="peakt-s"/>
-  <symbol minX="550" maxX="578" minY="624" maxY="637" name="arrow-m"/>
-  <symbol minX="578" maxX="590" minY="624" maxY="636" name="entrance-s"/>
-  <symbol minX="590" maxX="602" minY="624" maxY="636" name="crossing-m"/>
-  <symbol minX="602" maxX="614" minY="624" maxY="636" name="zero-icon"/>
-  <symbol minX="614" maxX="624" minY="624" maxY="634" name="crossing-s"/>
-  <symbol minX="624" maxX="634" minY="624" maxY="634" name="cities-m"/>
-  <symbol minX="634" maxX="655" minY="624" maxY="634" name="arrow-s"/>
-  <symbol minX="655" maxX="665" minY="624" maxY="634" name="dot-m"/>
-  <symbol minX="665" maxX="674" minY="624" maxY="633" name="entrance-xs"/>
-  <symbol minX="674" maxX="681" minY="624" maxY="631" name="cities-xs"/>
-  <symbol minX="681" maxX="688" minY="624" maxY="631" name="dot-s"/>
-  <symbol minX="688" maxX="702" minY="624" maxY="631" name="arrow-xs"/>
-  <symbol minX="702" maxX="709" minY="624" maxY="631" name="cities-s"/>
+  <symbol minX="858" maxX="880" minY="602" maxY="624" name="cable-car-s"/>
+  <symbol minX="880" maxX="910" minY="602" maxY="623" name="subway-kiev-m"/>
+  <symbol minX="910" maxX="931" minY="602" maxY="623" name="peakt-l"/>
+  <symbol minX="931" maxX="952" minY="602" maxY="623" name="lightrail-berlin-s"/>
+  <symbol minX="952" maxX="973" minY="602" maxY="623" name="subway-paris-s"/>
+  <symbol minX="973" maxX="1004" minY="602" maxY="623" name="railway-crossing-xl"/>
+  <symbol minX="0" maxX="28" minY="624" maxY="645" name="subway-madrid-s"/>
+  <symbol minX="28" maxX="58" minY="624" maxY="645" name="subway-kiev-l"/>
+  <symbol minX="58" maxX="78" minY="624" maxY="644" name="subway-moscow-s"/>
+  <symbol minX="78" maxX="97" minY="624" maxY="643" name="subway-berlin-s"/>
+  <symbol minX="97" maxX="118" minY="624" maxY="643" name="bench"/>
+  <symbol minX="118" maxX="137" minY="624" maxY="643" name="subway-rome-s"/>
+  <symbol minX="137" maxX="160" minY="624" maxY="643" name="subway-london-s"/>
+  <symbol minX="160" maxX="178" minY="624" maxY="642" name="bike-parking-s"/>
+  <symbol minX="178" maxX="196" minY="624" maxY="642" name="train-xs"/>
+  <symbol minX="196" maxX="214" minY="624" maxY="642" name="parking-s"/>
+  <symbol minX="214" maxX="241" minY="624" maxY="642" name="railway-crossing-l"/>
+  <symbol minX="241" maxX="259" minY="624" maxY="642" name="speedcam-s"/>
+  <symbol minX="259" maxX="277" minY="624" maxY="642" name="star-l"/>
+  <symbol minX="277" maxX="307" minY="624" maxY="642" name="subway-minsk-l"/>
+  <symbol minX="307" maxX="325" minY="624" maxY="642" name="parking_pay-s"/>
+  <symbol minX="325" maxX="343" minY="624" maxY="642" name="subway-newyork-xs"/>
+  <symbol minX="343" maxX="361" minY="624" maxY="642" name="subway-xs"/>
+  <symbol minX="361" maxX="379" minY="624" maxY="642" name="survey_point-l"/>
+  <symbol minX="379" maxX="395" minY="624" maxY="640" name="star-m"/>
+  <symbol minX="395" maxX="420" minY="624" maxY="640" name="subway-kiev-s"/>
+  <symbol minX="420" maxX="435" minY="624" maxY="639" name="survey_point-m"/>
+  <symbol minX="435" maxX="451" minY="624" maxY="639" name="peakt-m"/>
+  <symbol minX="451" maxX="474" minY="624" maxY="639" name="railway-crossing"/>
+  <symbol minX="474" maxX="499" minY="624" maxY="639" name="subway-minsk-m"/>
+  <symbol minX="499" maxX="513" minY="624" maxY="638" name="star-s"/>
+  <symbol minX="513" maxX="527" minY="624" maxY="638" name="crossing-l"/>
+  <symbol minX="527" maxX="550" minY="624" maxY="638" name="subway-minsk-s"/>
+  <symbol minX="550" maxX="563" minY="624" maxY="637" name="survey_point-s"/>
+  <symbol minX="563" maxX="577" minY="624" maxY="637" name="peakt-s"/>
+  <symbol minX="577" maxX="605" minY="624" maxY="637" name="arrow-m"/>
+  <symbol minX="605" maxX="617" minY="624" maxY="636" name="entrance-s"/>
+  <symbol minX="617" maxX="629" minY="624" maxY="636" name="crossing-m"/>
+  <symbol minX="629" maxX="641" minY="624" maxY="636" name="zero-icon"/>
+  <symbol minX="641" maxX="651" minY="624" maxY="634" name="crossing-s"/>
+  <symbol minX="651" maxX="661" minY="624" maxY="634" name="dot-m"/>
+  <symbol minX="661" maxX="682" minY="624" maxY="634" name="arrow-s"/>
+  <symbol minX="682" maxX="692" minY="624" maxY="634" name="cities-m"/>
+  <symbol minX="692" maxX="701" minY="624" maxY="633" name="entrance-xs"/>
+  <symbol minX="701" maxX="708" minY="624" maxY="631" name="dot-s"/>
+  <symbol minX="708" maxX="715" minY="624" maxY="631" name="cities-xs"/>
+  <symbol minX="715" maxX="729" minY="624" maxY="631" name="arrow-xs"/>
+  <symbol minX="729" maxX="736" minY="624" maxY="631" name="cities-s"/>
  </file>
 </root>
diff --git a/data/resources-mdpi_clear/symbols-ad.png b/data/resources-mdpi_clear/symbols-ad.png
index 309af610b0..906ea4ce32 100644
Binary files a/data/resources-mdpi_clear/symbols-ad.png and b/data/resources-mdpi_clear/symbols-ad.png differ
diff --git a/data/resources-mdpi_clear/symbols.png b/data/resources-mdpi_clear/symbols.png
index 0e53f99dfa..f360064109 100644
Binary files a/data/resources-mdpi_clear/symbols.png and b/data/resources-mdpi_clear/symbols.png differ
diff --git a/data/resources-mdpi_clear/symbols.sdf b/data/resources-mdpi_clear/symbols.sdf
index 4b934b77be..dcaf9b6a3c 100644
--- a/data/resources-mdpi_clear/symbols.sdf
+++ b/data/resources-mdpi_clear/symbols.sdf
@@ -334,8 +334,8 @@
   <symbol minX="396" maxX="418" minY="236" maxY="258" name="public-building-l"/>
   <symbol minX="418" maxX="440" minY="236" maxY="258" name="lighthouse-l"/>
   <symbol minX="440" maxX="462" minY="236" maxY="258" name="lighthouse-m"/>
-  <symbol minX="462" maxX="484" minY="236" maxY="258" name="laundry-m"/>
-  <symbol minX="484" maxX="506" minY="236" maxY="258" name="power-m"/>
+  <symbol minX="462" maxX="484" minY="236" maxY="258" name="power-m"/>
+  <symbol minX="484" maxX="506" minY="236" maxY="258" name="laundry-m"/>
   <symbol minX="506" maxX="528" minY="236" maxY="258" name="power-l"/>
   <symbol minX="528" maxX="550" minY="236" maxY="258" name="postbox-m"/>
   <symbol minX="550" maxX="572" minY="236" maxY="258" name="mail-l"/>
@@ -396,76 +396,76 @@
   <symbol minX="748" maxX="770" minY="258" maxY="280" name="parking_pay-l"/>
   <symbol minX="770" maxX="792" minY="258" maxY="279" name="lightrail-berlin-l"/>
   <symbol minX="792" maxX="813" minY="258" maxY="279" name="atm-tinkoff-shield-m"/>
-  <symbol minX="813" maxX="834" minY="258" maxY="279" name="subway-entrance-m"/>
-  <symbol minX="834" maxX="855" minY="258" maxY="279" name="subway-spb-m"/>
-  <symbol minX="855" maxX="876" minY="258" maxY="279" name="atm-tinkoff-gerb-m"/>
-  <symbol minX="876" maxX="897" minY="258" maxY="279" name="cave-m"/>
-  <symbol minX="897" maxX="918" minY="258" maxY="279" name="volcano-m"/>
-  <symbol minX="918" maxX="938" minY="258" maxY="278" name="lightrail-berlin-m"/>
-  <symbol minX="938" maxX="958" minY="258" maxY="278" name="subway-rome-l"/>
+  <symbol minX="813" maxX="834" minY="258" maxY="279" name="atm-tinkoff-gerb-m"/>
+  <symbol minX="834" maxX="855" minY="258" maxY="279" name="volcano-m"/>
+  <symbol minX="855" maxX="876" minY="258" maxY="279" name="cave-m"/>
+  <symbol minX="876" maxX="897" minY="258" maxY="279" name="subway-spb-m"/>
+  <symbol minX="897" maxX="918" minY="258" maxY="279" name="subway-entrance-m"/>
+  <symbol minX="918" maxX="938" minY="258" maxY="278" name="subway-rome-l"/>
+  <symbol minX="938" maxX="958" minY="258" maxY="278" name="subway-berlin-l"/>
   <symbol minX="958" maxX="980" minY="258" maxY="278" name="speedcam1-xl"/>
-  <symbol minX="980" maxX="1000" minY="258" maxY="278" name="subway-berlin-l"/>
+  <symbol minX="980" maxX="1000" minY="258" maxY="278" name="lightrail-berlin-m"/>
   <symbol minX="1000" maxX="1019" minY="258" maxY="277" name="parking_pay-m"/>
   <symbol minX="0" maxX="19" minY="280" maxY="299" name="parking-m"/>
   <symbol minX="19" maxX="38" minY="280" maxY="299" name="search-result"/>
-  <symbol minX="38" maxX="57" minY="280" maxY="299" name="bike-parking-m"/>
-  <symbol minX="57" maxX="76" minY="280" maxY="299" name="speedcam-m"/>
-  <symbol minX="76" maxX="98" minY="280" maxY="299" name="subway-moscow-l"/>
-  <symbol minX="98" maxX="119" minY="280" maxY="298" name="subway-moscow-m"/>
-  <symbol minX="119" maxX="137" minY="280" maxY="298" name="subway-paris-m"/>
-  <symbol minX="137" maxX="155" minY="280" maxY="298" name="subway-rome-m"/>
-  <symbol minX="155" maxX="177" minY="280" maxY="298" name="subway-london-l"/>
-  <symbol minX="177" maxX="195" minY="280" maxY="298" name="api-result"/>
-  <symbol minX="195" maxX="213" minY="280" maxY="298" name="subway-berlin-m"/>
-  <symbol minX="213" maxX="230" minY="280" maxY="297" name="atm-tinkoff-shield-s"/>
-  <symbol minX="230" maxX="250" minY="280" maxY="297" name="subway-barcelona-s"/>
-  <symbol minX="250" maxX="267" minY="280" maxY="297" name="cave-s"/>
-  <symbol minX="267" maxX="284" minY="280" maxY="297" name="volcano-s"/>
-  <symbol minX="284" maxX="301" minY="280" maxY="297" name="atm-tinkoff-gerb-s"/>
-  <symbol minX="301" maxX="318" minY="280" maxY="297" name="subway-spb-s"/>
-  <symbol minX="318" maxX="339" minY="280" maxY="297" name="subway-london-m"/>
-  <symbol minX="339" maxX="355" minY="280" maxY="296" name="mail-s"/>
-  <symbol minX="355" maxX="371" minY="280" maxY="296" name="embassy-s"/>
-  <symbol minX="371" maxX="387" minY="280" maxY="296" name="postbox-s"/>
-  <symbol minX="387" maxX="403" minY="280" maxY="296" name="police-s"/>
-  <symbol minX="403" maxX="419" minY="280" maxY="296" name="marketplace-s"/>
-  <symbol minX="419" maxX="435" minY="280" maxY="296" name="power-s"/>
-  <symbol minX="435" maxX="451" minY="280" maxY="296" name="lift_gate-s"/>
-  <symbol minX="451" maxX="467" minY="280" maxY="296" name="library-s"/>
-  <symbol minX="467" maxX="483" minY="280" maxY="296" name="public-building-s"/>
-  <symbol minX="483" maxX="499" minY="280" maxY="296" name="beer-s"/>
-  <symbol minX="499" maxX="515" minY="280" maxY="296" name="beauty-s"/>
-  <symbol minX="515" maxX="531" minY="280" maxY="296" name="zoo-s"/>
-  <symbol minX="531" maxX="547" minY="280" maxY="296" name="lawyer-s"/>
-  <symbol minX="547" maxX="563" minY="280" maxY="296" name="laundry-s"/>
-  <symbol minX="563" maxX="579" minY="280" maxY="296" name="recycling-s"/>
-  <symbol minX="579" maxX="595" minY="280" maxY="296" name="military-s"/>
-  <symbol minX="595" maxX="611" minY="280" maxY="296" name="kiosk-s"/>
-  <symbol minX="611" maxX="627" minY="280" maxY="296" name="remains-s"/>
-  <symbol minX="627" maxX="643" minY="280" maxY="296" name="kindergarten-s"/>
-  <symbol minX="643" maxX="659" minY="280" maxY="296" name="jewish-s"/>
-  <symbol minX="659" maxX="675" minY="280" maxY="296" name="restaurant-s"/>
-  <symbol minX="675" maxX="691" minY="280" maxY="296" name="jewelry-s"/>
-  <symbol minX="691" maxX="707" minY="280" maxY="296" name="information-s"/>
-  <symbol minX="707" maxX="723" minY="280" maxY="296" name="hunting-tower-s"/>
-  <symbol minX="723" maxX="739" minY="280" maxY="296" name="sauna-s"/>
-  <symbol minX="739" maxX="755" minY="280" maxY="296" name="hotel-s"/>
-  <symbol minX="755" maxX="771" minY="280" maxY="296" name="hostel-s"/>
-  <symbol minX="771" maxX="787" minY="280" maxY="296" name="school-s"/>
-  <symbol minX="787" maxX="803" minY="280" maxY="296" name="hospital-s"/>
-  <symbol minX="803" maxX="819" minY="280" maxY="296" name="historic-ship-s"/>
-  <symbol minX="819" maxX="835" minY="280" maxY="296" name="seafood-shop-s"/>
-  <symbol minX="835" maxX="851" minY="280" maxY="296" name="hindu-s"/>
-  <symbol minX="851" maxX="867" minY="280" maxY="296" name="heliport-s"/>
-  <symbol minX="867" maxX="883" minY="280" maxY="296" name="shinto-s"/>
-  <symbol minX="883" maxX="899" minY="280" maxY="296" name="helipad-s"/>
-  <symbol minX="899" maxX="915" minY="280" maxY="296" name="hardware-s"/>
-  <symbol minX="915" maxX="931" minY="280" maxY="296" name="ship-s"/>
-  <symbol minX="931" maxX="947" minY="280" maxY="296" name="hand-s"/>
-  <symbol minX="947" maxX="963" minY="280" maxY="296" name="hairdresser-s"/>
-  <symbol minX="963" maxX="979" minY="280" maxY="296" name="shoes-s"/>
-  <symbol minX="979" maxX="995" minY="280" maxY="296" name="gym-s"/>
-  <symbol minX="995" maxX="1011" minY="280" maxY="296" name="grocery-s"/>
+  <symbol minX="38" maxX="57" minY="280" maxY="299" name="non-found-search-result"/>
+  <symbol minX="57" maxX="79" minY="280" maxY="299" name="subway-moscow-l"/>
+  <symbol minX="79" maxX="98" minY="280" maxY="299" name="bike-parking-m"/>
+  <symbol minX="98" maxX="117" minY="280" maxY="299" name="speedcam-m"/>
+  <symbol minX="117" maxX="135" minY="280" maxY="298" name="api-result"/>
+  <symbol minX="135" maxX="153" minY="280" maxY="298" name="subway-berlin-m"/>
+  <symbol minX="153" maxX="171" minY="280" maxY="298" name="subway-rome-m"/>
+  <symbol minX="171" maxX="193" minY="280" maxY="298" name="subway-london-l"/>
+  <symbol minX="193" maxX="214" minY="280" maxY="298" name="subway-moscow-m"/>
+  <symbol minX="214" maxX="232" minY="280" maxY="298" name="subway-paris-m"/>
+  <symbol minX="232" maxX="253" minY="280" maxY="297" name="subway-london-m"/>
+  <symbol minX="253" maxX="270" minY="280" maxY="297" name="atm-tinkoff-shield-s"/>
+  <symbol minX="270" maxX="287" minY="280" maxY="297" name="subway-spb-s"/>
+  <symbol minX="287" maxX="304" minY="280" maxY="297" name="cave-s"/>
+  <symbol minX="304" maxX="324" minY="280" maxY="297" name="subway-barcelona-s"/>
+  <symbol minX="324" maxX="341" minY="280" maxY="297" name="volcano-s"/>
+  <symbol minX="341" maxX="358" minY="280" maxY="297" name="atm-tinkoff-gerb-s"/>
+  <symbol minX="358" maxX="374" minY="280" maxY="296" name="parking-meter-s"/>
+  <symbol minX="374" maxX="390" minY="280" maxY="296" name="postbox-s"/>
+  <symbol minX="390" maxX="406" minY="280" maxY="296" name="pharmacy-s"/>
+  <symbol minX="406" maxX="422" minY="280" maxY="296" name="lighthouse-s"/>
+  <symbol minX="422" maxX="438" minY="280" maxY="296" name="power-s"/>
+  <symbol minX="438" maxX="454" minY="280" maxY="296" name="lift_gate-s"/>
+  <symbol minX="454" maxX="470" minY="280" maxY="296" name="library-s"/>
+  <symbol minX="470" maxX="486" minY="280" maxY="296" name="public-building-s"/>
+  <symbol minX="486" maxX="502" minY="280" maxY="296" name="bbq-s"/>
+  <symbol minX="502" maxX="518" minY="280" maxY="296" name="bcontrol-s"/>
+  <symbol minX="518" maxX="534" minY="280" maxY="296" name="archery-s"/>
+  <symbol minX="534" maxX="550" minY="280" maxY="296" name="lawyer-s"/>
+  <symbol minX="550" maxX="566" minY="280" maxY="296" name="laundry-s"/>
+  <symbol minX="566" maxX="582" minY="280" maxY="296" name="recycling-s"/>
+  <symbol minX="582" maxX="598" minY="280" maxY="296" name="mail-s"/>
+  <symbol minX="598" maxX="614" minY="280" maxY="296" name="kiosk-s"/>
+  <symbol minX="614" maxX="630" minY="280" maxY="296" name="remains-s"/>
+  <symbol minX="630" maxX="646" minY="280" maxY="296" name="kindergarten-s"/>
+  <symbol minX="646" maxX="662" minY="280" maxY="296" name="jewish-s"/>
+  <symbol minX="662" maxX="678" minY="280" maxY="296" name="restaurant-s"/>
+  <symbol minX="678" maxX="694" minY="280" maxY="296" name="jewelry-s"/>
+  <symbol minX="694" maxX="710" minY="280" maxY="296" name="information-s"/>
+  <symbol minX="710" maxX="726" minY="280" maxY="296" name="hunting-tower-s"/>
+  <symbol minX="726" maxX="742" minY="280" maxY="296" name="sauna-s"/>
+  <symbol minX="742" maxX="758" minY="280" maxY="296" name="hotel-s"/>
+  <symbol minX="758" maxX="774" minY="280" maxY="296" name="hostel-s"/>
+  <symbol minX="774" maxX="790" minY="280" maxY="296" name="school-s"/>
+  <symbol minX="790" maxX="806" minY="280" maxY="296" name="hospital-s"/>
+  <symbol minX="806" maxX="822" minY="280" maxY="296" name="historic-ship-s"/>
+  <symbol minX="822" maxX="838" minY="280" maxY="296" name="seafood-shop-s"/>
+  <symbol minX="838" maxX="854" minY="280" maxY="296" name="hindu-s"/>
+  <symbol minX="854" maxX="870" minY="280" maxY="296" name="heliport-s"/>
+  <symbol minX="870" maxX="886" minY="280" maxY="296" name="shinto-s"/>
+  <symbol minX="886" maxX="902" minY="280" maxY="296" name="helipad-s"/>
+  <symbol minX="902" maxX="918" minY="280" maxY="296" name="hardware-s"/>
+  <symbol minX="918" maxX="934" minY="280" maxY="296" name="ship-s"/>
+  <symbol minX="934" maxX="950" minY="280" maxY="296" name="hand-s"/>
+  <symbol minX="950" maxX="966" minY="280" maxY="296" name="hairdresser-s"/>
+  <symbol minX="966" maxX="982" minY="280" maxY="296" name="shoes-s"/>
+  <symbol minX="982" maxX="998" minY="280" maxY="296" name="gym-s"/>
+  <symbol minX="998" maxX="1014" minY="280" maxY="296" name="grocery-s"/>
   <symbol minX="0" maxX="16" minY="299" maxY="315" name="shop-bicycle-s"/>
   <symbol minX="16" maxX="32" minY="299" maxY="315" name="greengrocer-s"/>
   <symbol minX="32" maxX="48" minY="299" maxY="315" name="golf-s"/>
@@ -478,67 +478,67 @@
   <symbol minX="144" maxX="160" minY="299" maxY="315" name="gallery-s"/>
   <symbol minX="160" maxX="176" minY="299" maxY="315" name="soccer-s"/>
   <symbol minX="176" maxX="192" minY="299" maxY="315" name="furniture-s"/>
-  <symbol minX="192" maxX="208" minY="299" maxY="315" name="mobile_phone-s"/>
-  <symbol minX="208" maxX="224" minY="299" maxY="315" name="bicycle-s"/>
+  <symbol minX="192" maxX="208" minY="299" maxY="315" name="police-s"/>
+  <symbol minX="208" maxX="224" minY="299" maxY="315" name="basketball-s"/>
   <symbol minX="224" maxX="240" minY="299" maxY="315" name="funicular-s"/>
-  <symbol minX="240" maxX="256" minY="299" maxY="315" name="place-of-worship-s"/>
+  <symbol minX="240" maxX="256" minY="299" maxY="315" name="park-s"/>
   <symbol minX="256" maxX="272" minY="299" maxY="315" name="fuel-s"/>
   <symbol minX="272" maxX="288" minY="299" maxY="315" name="fountain-s"/>
   <symbol minX="288" maxX="304" minY="299" maxY="315" name="sports-s"/>
   <symbol minX="304" maxX="320" minY="299" maxY="315" name="florist-s"/>
   <symbol minX="320" maxX="336" minY="299" maxY="315" name="firehydrant-s"/>
   <symbol minX="336" maxX="352" minY="299" maxY="315" name="stadium-s"/>
-  <symbol minX="352" maxX="368" minY="299" maxY="315" name="beach-s"/>
-  <symbol minX="368" maxX="384" minY="299" maxY="315" name="airport-s"/>
-  <symbol minX="384" maxX="400" minY="299" maxY="315" name="windmill-s"/>
+  <symbol minX="352" maxX="368" minY="299" maxY="315" name="baseball-s"/>
+  <symbol minX="368" maxX="384" minY="299" maxY="315" name="america-football-s"/>
+  <symbol minX="384" maxX="400" minY="299" maxY="315" name="beach-s"/>
   <symbol minX="400" maxX="422" minY="299" maxY="315" name="subway-barcelona-l"/>
   <symbol minX="422" maxX="444" minY="299" maxY="315" name="subway-barcelona-m"/>
-  <symbol minX="444" maxX="460" minY="299" maxY="315" name="monument-s"/>
-  <symbol minX="460" maxX="476" minY="299" maxY="315" name="motel-s"/>
-  <symbol minX="476" maxX="492" minY="299" maxY="315" name="pitch-s"/>
-  <symbol minX="492" maxX="508" minY="299" maxY="315" name="parking-meter-s"/>
+  <symbol minX="444" maxX="460" minY="299" maxY="315" name="marketplace-s"/>
+  <symbol minX="460" maxX="476" minY="299" maxY="315" name="military-s"/>
+  <symbol minX="476" maxX="492" minY="299" maxY="315" name="mobile_phone-s"/>
+  <symbol minX="492" maxX="508" minY="299" maxY="315" name="beauty-s"/>
   <symbol minX="508" maxX="524" minY="299" maxY="315" name="fire_station-s"/>
-  <symbol minX="524" maxX="540" minY="299" maxY="315" name="motorcycle_shop-s"/>
+  <symbol minX="524" maxX="540" minY="299" maxY="315" name="petshop-s"/>
   <symbol minX="540" maxX="556" minY="299" maxY="315" name="subway-entrance-s"/>
-  <symbol minX="556" maxX="572" minY="299" maxY="315" name="wayside_shrine-s"/>
-  <symbol minX="572" maxX="588" minY="299" maxY="315" name="book-shop-s"/>
-  <symbol minX="588" maxX="604" minY="299" maxY="315" name="australian-football-s"/>
+  <symbol minX="556" maxX="572" minY="299" maxY="315" name="office-s"/>
+  <symbol minX="572" maxX="588" minY="299" maxY="315" name="atm-s"/>
+  <symbol minX="588" maxX="604" minY="299" maxY="315" name="beer-s"/>
   <symbol minX="604" maxX="620" minY="299" maxY="315" name="fastfood-s"/>
-  <symbol minX="620" maxX="636" minY="299" maxY="315" name="museum-s"/>
-  <symbol minX="636" maxX="652" minY="299" maxY="315" name="picnic-s"/>
-  <symbol minX="652" maxX="668" minY="299" maxY="315" name="bookmaker-s"/>
+  <symbol minX="620" maxX="636" minY="299" maxY="315" name="place-of-worship-s"/>
+  <symbol minX="636" maxX="652" minY="299" maxY="315" name="monument-s"/>
+  <symbol minX="652" maxX="668" minY="299" maxY="315" name="nparkf-s"/>
   <symbol minX="668" maxX="684" minY="299" maxY="315" name="equestrian-s"/>
   <symbol minX="684" maxX="706" minY="299" maxY="315" name="subway-madrid-l"/>
   <symbol minX="706" maxX="728" minY="299" maxY="315" name="subway-madrid-m"/>
-  <symbol minX="728" maxX="744" minY="299" maxY="315" name="waterfall-s"/>
-  <symbol minX="744" maxX="760" minY="299" maxY="315" name="bowls-s"/>
-  <symbol minX="760" maxX="776" minY="299" maxY="315" name="alcohol-s"/>
-  <symbol minX="776" maxX="792" minY="299" maxY="315" name="bakery-s"/>
-  <symbol minX="792" maxX="808" minY="299" maxY="315" name="muslim-s"/>
-  <symbol minX="808" maxX="824" minY="299" maxY="315" name="npark-s"/>
-  <symbol minX="824" maxX="840" minY="299" maxY="315" name="buddhist-s"/>
-  <symbol minX="840" maxX="856" minY="299" maxY="315" name="lighthouse-s"/>
-  <symbol minX="856" maxX="872" minY="299" maxY="315" name="bank-s"/>
+  <symbol minX="728" maxX="744" minY="299" maxY="315" name="zoo-s"/>
+  <symbol minX="744" maxX="760" minY="299" maxY="315" name="bicycle-s"/>
+  <symbol minX="760" maxX="776" minY="299" maxY="315" name="bar-s"/>
+  <symbol minX="776" maxX="792" minY="299" maxY="315" name="windmill-s"/>
+  <symbol minX="792" maxX="808" minY="299" maxY="315" name="motel-s"/>
+  <symbol minX="808" maxX="824" minY="299" maxY="315" name="pitch-s"/>
+  <symbol minX="824" maxX="840" minY="299" maxY="315" name="photo-shop-s"/>
+  <symbol minX="840" maxX="856" minY="299" maxY="315" name="wayside_shrine-s"/>
+  <symbol minX="856" maxX="872" minY="299" maxY="315" name="outdoor-shop-s"/>
   <symbol minX="872" maxX="888" minY="299" maxY="315" name="subway-newyork-s"/>
-  <symbol minX="888" maxX="904" minY="299" maxY="315" name="waste-basket-s"/>
-  <symbol minX="904" maxX="920" minY="299" maxY="315" name="atm-s"/>
-  <symbol minX="920" maxX="936" minY="299" maxY="315" name="photo-shop-s"/>
-  <symbol minX="936" maxX="952" minY="299" maxY="315" name="bus-s"/>
-  <symbol minX="952" maxX="968" minY="299" maxY="315" name="nparkf-s"/>
-  <symbol minX="968" maxX="984" minY="299" maxY="315" name="office-s"/>
-  <symbol minX="984" maxX="1000" minY="299" maxY="315" name="butcher-s"/>
+  <symbol minX="888" maxX="904" minY="299" maxY="315" name="book-shop-s"/>
+  <symbol minX="904" maxX="920" minY="299" maxY="315" name="embassy-s"/>
+  <symbol minX="920" maxX="936" minY="299" maxY="315" name="motorcycle_shop-s"/>
+  <symbol minX="936" maxX="952" minY="299" maxY="315" name="bookmaker-s"/>
+  <symbol minX="952" maxX="968" minY="299" maxY="315" name="waterfall-s"/>
+  <symbol minX="968" maxX="984" minY="299" maxY="315" name="museum-s"/>
+  <symbol minX="984" maxX="1000" minY="299" maxY="315" name="apartment-s"/>
   <symbol minX="1000" maxX="1016" minY="299" maxY="315" name="subway-s"/>
   <symbol minX="0" maxX="16" minY="315" maxY="331" name="electronics-s"/>
-  <symbol minX="16" maxX="32" minY="315" maxY="331" name="phone-s"/>
-  <symbol minX="32" maxX="48" minY="315" maxY="331" name="optician-s"/>
-  <symbol minX="48" maxX="64" minY="315" maxY="331" name="petshop-s"/>
-  <symbol minX="64" maxX="80" minY="315" maxY="331" name="park-s"/>
-  <symbol minX="80" maxX="96" minY="315" maxY="331" name="alpine_hut-s"/>
-  <symbol minX="96" maxX="112" minY="315" maxY="331" name="banknote-s"/>
+  <symbol minX="16" maxX="32" minY="315" maxY="331" name="bowls-s"/>
+  <symbol minX="32" maxX="48" minY="315" maxY="331" name="picnic-s"/>
+  <symbol minX="48" maxX="64" minY="315" maxY="331" name="buddhist-s"/>
+  <symbol minX="64" maxX="80" minY="315" maxY="331" name="waste-basket-s"/>
+  <symbol minX="80" maxX="96" minY="315" maxY="331" name="bus-s"/>
+  <symbol minX="96" maxX="112" minY="315" maxY="331" name="airport-s"/>
   <symbol minX="112" maxX="128" minY="315" maxY="331" name="drinking-water-s"/>
-  <symbol minX="128" maxX="144" minY="315" maxY="331" name="bar-s"/>
+  <symbol minX="128" maxX="144" minY="315" maxY="331" name="optician-s"/>
   <symbol minX="144" maxX="160" minY="315" maxY="331" name="sweets-s"/>
-  <symbol minX="160" maxX="176" minY="315" maxY="331" name="america-football-s"/>
+  <symbol minX="160" maxX="176" minY="315" maxY="331" name="australian-football-s"/>
   <symbol minX="176" maxX="192" minY="315" maxY="331" name="doityourself-s"/>
   <symbol minX="192" maxX="208" minY="315" maxY="331" name="swimming-s"/>
   <symbol minX="208" maxX="224" minY="315" maxY="331" name="dog_park-s"/>
@@ -548,10 +548,10 @@
   <symbol minX="272" maxX="288" minY="315" maxY="331" name="dentist-s"/>
   <symbol minX="288" maxX="304" minY="315" maxY="331" name="taxi-s"/>
   <symbol minX="304" maxX="320" minY="315" maxY="331" name="curling-s"/>
-  <symbol minX="320" maxX="336" minY="315" maxY="331" name="baseball-s"/>
+  <symbol minX="320" maxX="336" minY="315" maxY="331" name="alcohol-s"/>
   <symbol minX="336" maxX="352" minY="315" maxY="331" name="tennis-s"/>
-  <symbol minX="352" maxX="368" minY="315" maxY="331" name="basketball-s"/>
-  <symbol minX="368" maxX="384" minY="315" maxY="331" name="apartment-s"/>
+  <symbol minX="352" maxX="368" minY="315" maxY="331" name="bakery-s"/>
+  <symbol minX="368" maxX="384" minY="315" maxY="331" name="butcher-s"/>
   <symbol minX="384" maxX="400" minY="315" maxY="331" name="theatre-s"/>
   <symbol minX="400" maxX="416" minY="315" maxY="331" name="cricket-s"/>
   <symbol minX="416" maxX="432" minY="315" maxY="331" name="copyshop-s"/>
@@ -563,10 +563,10 @@
   <symbol minX="512" maxX="528" minY="315" maxY="331" name="clothes-s"/>
   <symbol minX="528" maxX="544" minY="315" maxY="331" name="toilets-s"/>
   <symbol minX="544" maxX="560" minY="315" maxY="331" name="climbing-s"/>
-  <symbol minX="560" maxX="576" minY="315" maxY="331" name="bbq-s"/>
+  <symbol minX="560" maxX="576" minY="315" maxY="331" name="bank-s"/>
   <symbol minX="576" maxX="592" minY="315" maxY="331" name="toll_booth-s"/>
-  <symbol minX="592" maxX="608" minY="315" maxY="331" name="bcontrol-s"/>
-  <symbol minX="608" maxX="624" minY="315" maxY="331" name="archery-s"/>
+  <symbol minX="592" maxX="608" minY="315" maxY="331" name="alpine_hut-s"/>
+  <symbol minX="608" maxX="624" minY="315" maxY="331" name="phone-s"/>
   <symbol minX="624" maxX="640" minY="315" maxY="331" name="cinema-s"/>
   <symbol minX="640" maxX="656" minY="315" maxY="331" name="tomb-s"/>
   <symbol minX="656" maxX="672" minY="315" maxY="331" name="christian-s"/>
@@ -576,10 +576,10 @@
   <symbol minX="720" maxX="736" minY="315" maxY="331" name="charging-station-s"/>
   <symbol minX="736" maxX="752" minY="315" maxY="331" name="toys-s"/>
   <symbol minX="752" maxX="768" minY="315" maxY="331" name="cemetery-s"/>
-  <symbol minX="768" maxX="784" minY="315" maxY="331" name="outdoor-shop-s"/>
+  <symbol minX="768" maxX="784" minY="315" maxY="331" name="muslim-s"/>
   <symbol minX="784" maxX="800" minY="315" maxY="331" name="train-s"/>
-  <symbol minX="800" maxX="816" minY="315" maxY="331" name="cable-car-s"/>
-  <symbol minX="816" maxX="832" minY="315" maxY="331" name="pharmacy-s"/>
+  <symbol minX="800" maxX="816" minY="315" maxY="331" name="npark-s"/>
+  <symbol minX="816" maxX="832" minY="315" maxY="331" name="banknote-s"/>
   <symbol minX="832" maxX="848" minY="315" maxY="331" name="casino-s"/>
   <symbol minX="848" maxX="864" minY="315" maxY="331" name="tram-s"/>
   <symbol minX="864" maxX="880" minY="315" maxY="331" name="caravan_site-s"/>
@@ -594,52 +594,53 @@
   <symbol minX="1008" maxX="1024" minY="315" maxY="331" name="campsite-s"/>
   <symbol minX="0" maxX="16" minY="331" maxY="347" name="cafe-s"/>
   <symbol minX="16" maxX="32" minY="331" maxY="347" name="viewpoint-s"/>
-  <symbol minX="32" maxX="53" minY="331" maxY="346" name="subway-kiev-l"/>
-  <symbol minX="53" maxX="75" minY="331" maxY="346" name="railway-crossing-xl"/>
-  <symbol minX="75" maxX="90" minY="331" maxY="346" name="peakt-l"/>
-  <symbol minX="90" maxX="105" minY="331" maxY="346" name="lightrail-berlin-s"/>
-  <symbol minX="105" maxX="120" minY="331" maxY="346" name="subway-paris-s"/>
-  <symbol minX="120" maxX="141" minY="331" maxY="346" name="subway-kiev-m"/>
-  <symbol minX="141" maxX="156" minY="331" maxY="346" name="subway-moscow-s"/>
-  <symbol minX="156" maxX="176" minY="331" maxY="346" name="subway-madrid-s"/>
-  <symbol minX="176" maxX="191" minY="331" maxY="345" name="bench"/>
-  <symbol minX="191" maxX="208" minY="331" maxY="345" name="subway-london-s"/>
-  <symbol minX="208" maxX="222" minY="331" maxY="345" name="subway-berlin-s"/>
-  <symbol minX="222" maxX="236" minY="331" maxY="345" name="subway-rome-s"/>
-  <symbol minX="236" maxX="249" minY="331" maxY="344" name="bike-parking-s"/>
-  <symbol minX="249" maxX="262" minY="331" maxY="344" name="subway-newyork-xs"/>
-  <symbol minX="262" maxX="275" minY="331" maxY="344" name="subway-xs"/>
-  <symbol minX="275" maxX="288" minY="331" maxY="344" name="star-l"/>
-  <symbol minX="288" maxX="301" minY="331" maxY="344" name="speedcam-s"/>
-  <symbol minX="301" maxX="322" minY="331" maxY="344" name="subway-minsk-l"/>
-  <symbol minX="322" maxX="335" minY="331" maxY="344" name="parking_pay-s"/>
-  <symbol minX="335" maxX="348" minY="331" maxY="344" name="parking-s"/>
-  <symbol minX="348" maxX="361" minY="331" maxY="344" name="survey_point-l"/>
-  <symbol minX="361" maxX="380" minY="331" maxY="344" name="railway-crossing-l"/>
-  <symbol minX="380" maxX="393" minY="331" maxY="344" name="train-xs"/>
-  <symbol minX="393" maxX="405" minY="331" maxY="343" name="survey_point-m"/>
-  <symbol minX="405" maxX="423" minY="331" maxY="343" name="subway-minsk-m"/>
-  <symbol minX="423" maxX="440" minY="331" maxY="343" name="railway-crossing"/>
-  <symbol minX="440" maxX="458" minY="331" maxY="343" name="subway-kiev-s"/>
-  <symbol minX="458" maxX="470" minY="331" maxY="343" name="peakt-m"/>
-  <symbol minX="470" maxX="482" minY="331" maxY="343" name="star-m"/>
-  <symbol minX="482" maxX="493" minY="331" maxY="342" name="star-s"/>
-  <symbol minX="493" maxX="504" minY="331" maxY="342" name="crossing-l"/>
-  <symbol minX="504" maxX="521" minY="331" maxY="342" name="subway-minsk-s"/>
-  <symbol minX="521" maxX="532" minY="331" maxY="341" name="peakt-s"/>
-  <symbol minX="532" maxX="552" minY="331" maxY="341" name="arrow-m"/>
-  <symbol minX="552" maxX="562" minY="331" maxY="341" name="survey_point-s"/>
-  <symbol minX="562" maxX="571" minY="331" maxY="340" name="zero-icon"/>
-  <symbol minX="571" maxX="580" minY="331" maxY="340" name="crossing-m"/>
-  <symbol minX="580" maxX="589" minY="331" maxY="340" name="entrance-s"/>
-  <symbol minX="589" maxX="597" minY="331" maxY="339" name="dot-m"/>
-  <symbol minX="597" maxX="605" minY="331" maxY="339" name="cities-m"/>
+  <symbol minX="32" maxX="48" minY="331" maxY="347" name="cable-car-s"/>
+  <symbol minX="48" maxX="70" minY="331" maxY="346" name="railway-crossing-xl"/>
+  <symbol minX="70" maxX="91" minY="331" maxY="346" name="subway-kiev-l"/>
+  <symbol minX="91" maxX="112" minY="331" maxY="346" name="subway-kiev-m"/>
+  <symbol minX="112" maxX="127" minY="331" maxY="346" name="peakt-l"/>
+  <symbol minX="127" maxX="147" minY="331" maxY="346" name="subway-madrid-s"/>
+  <symbol minX="147" maxX="162" minY="331" maxY="346" name="subway-moscow-s"/>
+  <symbol minX="162" maxX="177" minY="331" maxY="346" name="subway-paris-s"/>
+  <symbol minX="177" maxX="192" minY="331" maxY="346" name="lightrail-berlin-s"/>
+  <symbol minX="192" maxX="206" minY="331" maxY="345" name="subway-rome-s"/>
+  <symbol minX="206" maxX="220" minY="331" maxY="345" name="subway-berlin-s"/>
+  <symbol minX="220" maxX="237" minY="331" maxY="345" name="subway-london-s"/>
+  <symbol minX="237" maxX="252" minY="331" maxY="345" name="bench"/>
+  <symbol minX="252" maxX="265" minY="331" maxY="344" name="subway-xs"/>
+  <symbol minX="265" maxX="284" minY="331" maxY="344" name="railway-crossing-l"/>
+  <symbol minX="284" maxX="297" minY="331" maxY="344" name="bike-parking-s"/>
+  <symbol minX="297" maxX="318" minY="331" maxY="344" name="subway-minsk-l"/>
+  <symbol minX="318" maxX="331" minY="331" maxY="344" name="parking-s"/>
+  <symbol minX="331" maxX="344" minY="331" maxY="344" name="survey_point-l"/>
+  <symbol minX="344" maxX="357" minY="331" maxY="344" name="parking_pay-s"/>
+  <symbol minX="357" maxX="370" minY="331" maxY="344" name="speedcam-s"/>
+  <symbol minX="370" maxX="383" minY="331" maxY="344" name="star-l"/>
+  <symbol minX="383" maxX="396" minY="331" maxY="344" name="subway-newyork-xs"/>
+  <symbol minX="396" maxX="409" minY="331" maxY="344" name="train-xs"/>
+  <symbol minX="409" maxX="427" minY="331" maxY="343" name="subway-kiev-s"/>
+  <symbol minX="427" maxX="444" minY="331" maxY="343" name="railway-crossing"/>
+  <symbol minX="444" maxX="456" minY="331" maxY="343" name="star-m"/>
+  <symbol minX="456" maxX="474" minY="331" maxY="343" name="subway-minsk-m"/>
+  <symbol minX="474" maxX="486" minY="331" maxY="343" name="survey_point-m"/>
+  <symbol minX="486" maxX="498" minY="331" maxY="343" name="peakt-m"/>
+  <symbol minX="498" maxX="509" minY="331" maxY="342" name="crossing-l"/>
+  <symbol minX="509" maxX="526" minY="331" maxY="342" name="subway-minsk-s"/>
+  <symbol minX="526" maxX="537" minY="331" maxY="342" name="star-s"/>
+  <symbol minX="537" maxX="557" minY="331" maxY="341" name="arrow-m"/>
+  <symbol minX="557" maxX="567" minY="331" maxY="341" name="survey_point-s"/>
+  <symbol minX="567" maxX="578" minY="331" maxY="341" name="peakt-s"/>
+  <symbol minX="578" maxX="587" minY="331" maxY="340" name="zero-icon"/>
+  <symbol minX="587" maxX="596" minY="331" maxY="340" name="crossing-m"/>
+  <symbol minX="596" maxX="605" minY="331" maxY="340" name="entrance-s"/>
   <symbol minX="605" maxX="620" minY="331" maxY="339" name="arrow-s"/>
-  <symbol minX="620" maxX="628" minY="331" maxY="339" name="crossing-s"/>
-  <symbol minX="628" maxX="635" minY="331" maxY="338" name="entrance-xs"/>
-  <symbol minX="635" maxX="641" minY="331" maxY="337" name="cities-xs"/>
-  <symbol minX="641" maxX="647" minY="331" maxY="337" name="cities-s"/>
-  <symbol minX="647" maxX="658" minY="331" maxY="337" name="arrow-xs"/>
-  <symbol minX="658" maxX="664" minY="331" maxY="337" name="dot-s"/>
+  <symbol minX="620" maxX="628" minY="331" maxY="339" name="cities-m"/>
+  <symbol minX="628" maxX="636" minY="331" maxY="339" name="crossing-s"/>
+  <symbol minX="636" maxX="644" minY="331" maxY="339" name="dot-m"/>
+  <symbol minX="644" maxX="651" minY="331" maxY="338" name="entrance-xs"/>
+  <symbol minX="651" maxX="657" minY="331" maxY="337" name="dot-s"/>
+  <symbol minX="657" maxX="663" minY="331" maxY="337" name="cities-s"/>
+  <symbol minX="663" maxX="669" minY="331" maxY="337" name="cities-xs"/>
+  <symbol minX="669" maxX="680" minY="331" maxY="337" name="arrow-xs"/>
  </file>
 </root>
diff --git a/data/resources-mdpi_dark/symbols-ad.png b/data/resources-mdpi_dark/symbols-ad.png
index 309af610b0..0a9fcc3416 100644
Binary files a/data/resources-mdpi_dark/symbols-ad.png and b/data/resources-mdpi_dark/symbols-ad.png differ
diff --git a/data/resources-mdpi_dark/symbols.png b/data/resources-mdpi_dark/symbols.png
index 13c150d777..544d842be2 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 344b714645..3337fc45dd 100644
--- a/data/resources-mdpi_dark/symbols.sdf
+++ b/data/resources-mdpi_dark/symbols.sdf
@@ -321,8 +321,8 @@
   <symbol minX="110" maxX="132" minY="236" maxY="258" name="kiosk-l"/>
   <symbol minX="132" maxX="154" minY="236" maxY="258" name="kiosk-m"/>
   <symbol minX="154" maxX="176" minY="236" maxY="258" name="remains-m"/>
-  <symbol minX="176" maxX="198" minY="236" maxY="258" name="remains-l"/>
-  <symbol minX="198" maxX="220" minY="236" maxY="258" name="laundry-m"/>
+  <symbol minX="176" maxX="198" minY="236" maxY="258" name="laundry-l"/>
+  <symbol minX="198" maxX="220" minY="236" maxY="258" name="remains-l"/>
   <symbol minX="220" maxX="242" minY="236" maxY="258" name="recycling-m"/>
   <symbol minX="242" maxX="264" minY="236" maxY="258" name="lawyer-l"/>
   <symbol minX="264" maxX="286" minY="236" maxY="258" name="lawyer-m"/>
@@ -335,7 +335,7 @@
   <symbol minX="418" maxX="440" minY="236" maxY="258" name="public-building-l"/>
   <symbol minX="440" maxX="462" minY="236" maxY="258" name="lighthouse-l"/>
   <symbol minX="462" maxX="484" minY="236" maxY="258" name="lighthouse-m"/>
-  <symbol minX="484" maxX="506" minY="236" maxY="258" name="laundry-l"/>
+  <symbol minX="484" maxX="506" minY="236" maxY="258" name="laundry-m"/>
   <symbol minX="506" maxX="528" minY="236" maxY="258" name="lightrail-berlin-l"/>
   <symbol minX="528" maxX="550" minY="236" maxY="258" name="power-m"/>
   <symbol minX="550" maxX="572" minY="236" maxY="258" name="power-l"/>
@@ -397,75 +397,75 @@
   <symbol minX="770" maxX="792" minY="258" maxY="280" name="parking_pay-l"/>
   <symbol minX="792" maxX="814" minY="258" maxY="280" name="petshop-l"/>
   <symbol minX="814" maxX="836" minY="258" maxY="279" name="speedcam1-xl"/>
-  <symbol minX="836" maxX="857" minY="258" maxY="279" name="volcano-m"/>
+  <symbol minX="836" maxX="857" minY="258" maxY="279" name="subway-entrance-m"/>
   <symbol minX="857" maxX="878" minY="258" maxY="279" name="atm-tinkoff-shield-m"/>
-  <symbol minX="878" maxX="899" minY="258" maxY="279" name="cave-m"/>
-  <symbol minX="899" maxX="920" minY="258" maxY="279" name="subway-entrance-m"/>
-  <symbol minX="920" maxX="941" minY="258" maxY="279" name="subway-spb-m"/>
-  <symbol minX="941" maxX="962" minY="258" maxY="279" name="atm-tinkoff-gerb-m"/>
+  <symbol minX="878" maxX="899" minY="258" maxY="279" name="volcano-m"/>
+  <symbol minX="899" maxX="920" minY="258" maxY="279" name="subway-spb-m"/>
+  <symbol minX="920" maxX="941" minY="258" maxY="279" name="atm-tinkoff-gerb-m"/>
+  <symbol minX="941" maxX="962" minY="258" maxY="279" name="cave-m"/>
   <symbol minX="962" maxX="982" minY="258" maxY="278" name="lightrail-berlin-m"/>
   <symbol minX="982" maxX="1002" minY="258" maxY="278" name="subway-rome-l"/>
   <symbol minX="1002" maxX="1022" minY="258" maxY="278" name="subway-berlin-l"/>
   <symbol minX="0" maxX="19" minY="280" maxY="299" name="bike-parking-m"/>
-  <symbol minX="19" maxX="38" minY="280" maxY="299" name="speedcam-m"/>
-  <symbol minX="38" maxX="57" minY="280" maxY="299" name="parking-m"/>
+  <symbol minX="19" maxX="38" minY="280" maxY="299" name="non-found-search-result"/>
+  <symbol minX="38" maxX="57" minY="280" maxY="299" name="speedcam-m"/>
   <symbol minX="57" maxX="76" minY="280" maxY="299" name="parking_pay-m"/>
-  <symbol minX="76" maxX="95" minY="280" maxY="299" name="search-result"/>
-  <symbol minX="95" maxX="117" minY="280" maxY="299" name="subway-moscow-l"/>
-  <symbol minX="117" maxX="138" minY="280" maxY="298" name="subway-moscow-m"/>
-  <symbol minX="138" maxX="156" minY="280" maxY="298" name="subway-paris-m"/>
-  <symbol minX="156" maxX="174" minY="280" maxY="298" name="subway-rome-m"/>
-  <symbol minX="174" maxX="196" minY="280" maxY="298" name="subway-london-l"/>
-  <symbol minX="196" maxX="214" minY="280" maxY="298" name="api-result"/>
-  <symbol minX="214" maxX="232" minY="280" maxY="298" name="subway-berlin-m"/>
-  <symbol minX="232" maxX="253" minY="280" maxY="297" name="subway-london-m"/>
-  <symbol minX="253" maxX="273" minY="280" maxY="297" name="subway-barcelona-s"/>
-  <symbol minX="273" maxX="290" minY="280" maxY="297" name="cave-s"/>
-  <symbol minX="290" maxX="307" minY="280" maxY="297" name="atm-tinkoff-shield-s"/>
-  <symbol minX="307" maxX="324" minY="280" maxY="297" name="subway-spb-s"/>
-  <symbol minX="324" maxX="341" minY="280" maxY="297" name="atm-tinkoff-gerb-s"/>
-  <symbol minX="341" maxX="358" minY="280" maxY="297" name="volcano-s"/>
-  <symbol minX="358" maxX="374" minY="280" maxY="296" name="marketplace-s"/>
-  <symbol minX="374" maxX="390" minY="280" maxY="296" name="mail-s"/>
-  <symbol minX="390" maxX="406" minY="280" maxY="296" name="postbox-s"/>
-  <symbol minX="406" maxX="422" minY="280" maxY="296" name="book-shop-s"/>
-  <symbol minX="422" maxX="438" minY="280" maxY="296" name="police-s"/>
-  <symbol minX="438" maxX="454" minY="280" maxY="296" name="power-s"/>
-  <symbol minX="454" maxX="470" minY="280" maxY="296" name="lift_gate-s"/>
-  <symbol minX="470" maxX="486" minY="280" maxY="296" name="library-s"/>
-  <symbol minX="486" maxX="502" minY="280" maxY="296" name="public-building-s"/>
-  <symbol minX="502" maxX="518" minY="280" maxY="296" name="australian-football-s"/>
-  <symbol minX="518" maxX="534" minY="280" maxY="296" name="bookmaker-s"/>
-  <symbol minX="534" maxX="550" minY="280" maxY="296" name="alcohol-s"/>
-  <symbol minX="550" maxX="566" minY="280" maxY="296" name="lawyer-s"/>
-  <symbol minX="566" maxX="582" minY="280" maxY="296" name="laundry-s"/>
-  <symbol minX="582" maxX="598" minY="280" maxY="296" name="recycling-s"/>
-  <symbol minX="598" maxX="614" minY="280" maxY="296" name="military-s"/>
-  <symbol minX="614" maxX="630" minY="280" maxY="296" name="kiosk-s"/>
-  <symbol minX="630" maxX="646" minY="280" maxY="296" name="remains-s"/>
-  <symbol minX="646" maxX="662" minY="280" maxY="296" name="kindergarten-s"/>
-  <symbol minX="662" maxX="678" minY="280" maxY="296" name="jewish-s"/>
-  <symbol minX="678" maxX="694" minY="280" maxY="296" name="restaurant-s"/>
-  <symbol minX="694" maxX="710" minY="280" maxY="296" name="jewelry-s"/>
-  <symbol minX="710" maxX="726" minY="280" maxY="296" name="information-s"/>
-  <symbol minX="726" maxX="742" minY="280" maxY="296" name="hunting-tower-s"/>
-  <symbol minX="742" maxX="758" minY="280" maxY="296" name="sauna-s"/>
-  <symbol minX="758" maxX="774" minY="280" maxY="296" name="hotel-s"/>
-  <symbol minX="774" maxX="790" minY="280" maxY="296" name="hostel-s"/>
-  <symbol minX="790" maxX="806" minY="280" maxY="296" name="school-s"/>
-  <symbol minX="806" maxX="822" minY="280" maxY="296" name="hospital-s"/>
-  <symbol minX="822" maxX="838" minY="280" maxY="296" name="historic-ship-s"/>
-  <symbol minX="838" maxX="854" minY="280" maxY="296" name="seafood-shop-s"/>
-  <symbol minX="854" maxX="870" minY="280" maxY="296" name="hindu-s"/>
-  <symbol minX="870" maxX="886" minY="280" maxY="296" name="heliport-s"/>
-  <symbol minX="886" maxX="902" minY="280" maxY="296" name="shinto-s"/>
-  <symbol minX="902" maxX="918" minY="280" maxY="296" name="helipad-s"/>
-  <symbol minX="918" maxX="934" minY="280" maxY="296" name="hardware-s"/>
-  <symbol minX="934" maxX="950" minY="280" maxY="296" name="ship-s"/>
-  <symbol minX="950" maxX="966" minY="280" maxY="296" name="hand-s"/>
-  <symbol minX="966" maxX="982" minY="280" maxY="296" name="hairdresser-s"/>
-  <symbol minX="982" maxX="998" minY="280" maxY="296" name="shoes-s"/>
-  <symbol minX="998" maxX="1014" minY="280" maxY="296" name="gym-s"/>
+  <symbol minX="76" maxX="95" minY="280" maxY="299" name="parking-m"/>
+  <symbol minX="95" maxX="114" minY="280" maxY="299" name="search-result"/>
+  <symbol minX="114" maxX="136" minY="280" maxY="299" name="subway-moscow-l"/>
+  <symbol minX="136" maxX="157" minY="280" maxY="298" name="subway-moscow-m"/>
+  <symbol minX="157" maxX="175" minY="280" maxY="298" name="subway-paris-m"/>
+  <symbol minX="175" maxX="193" minY="280" maxY="298" name="subway-rome-m"/>
+  <symbol minX="193" maxX="215" minY="280" maxY="298" name="subway-london-l"/>
+  <symbol minX="215" maxX="233" minY="280" maxY="298" name="api-result"/>
+  <symbol minX="233" maxX="251" minY="280" maxY="298" name="subway-berlin-m"/>
+  <symbol minX="251" maxX="268" minY="280" maxY="297" name="volcano-s"/>
+  <symbol minX="268" maxX="288" minY="280" maxY="297" name="subway-barcelona-s"/>
+  <symbol minX="288" maxX="305" minY="280" maxY="297" name="cave-s"/>
+  <symbol minX="305" maxX="322" minY="280" maxY="297" name="atm-tinkoff-shield-s"/>
+  <symbol minX="322" maxX="339" minY="280" maxY="297" name="subway-spb-s"/>
+  <symbol minX="339" maxX="356" minY="280" maxY="297" name="atm-tinkoff-gerb-s"/>
+  <symbol minX="356" maxX="377" minY="280" maxY="297" name="subway-london-m"/>
+  <symbol minX="377" maxX="393" minY="280" maxY="296" name="mail-s"/>
+  <symbol minX="393" maxX="409" minY="280" maxY="296" name="postbox-s"/>
+  <symbol minX="409" maxX="425" minY="280" maxY="296" name="wayside_shrine-s"/>
+  <symbol minX="425" maxX="441" minY="280" maxY="296" name="marketplace-s"/>
+  <symbol minX="441" maxX="457" minY="280" maxY="296" name="power-s"/>
+  <symbol minX="457" maxX="473" minY="280" maxY="296" name="lift_gate-s"/>
+  <symbol minX="473" maxX="489" minY="280" maxY="296" name="library-s"/>
+  <symbol minX="489" maxX="505" minY="280" maxY="296" name="public-building-s"/>
+  <symbol minX="505" maxX="521" minY="280" maxY="296" name="australian-football-s"/>
+  <symbol minX="521" maxX="537" minY="280" maxY="296" name="book-shop-s"/>
+  <symbol minX="537" maxX="553" minY="280" maxY="296" name="alcohol-s"/>
+  <symbol minX="553" maxX="569" minY="280" maxY="296" name="lawyer-s"/>
+  <symbol minX="569" maxX="585" minY="280" maxY="296" name="laundry-s"/>
+  <symbol minX="585" maxX="601" minY="280" maxY="296" name="recycling-s"/>
+  <symbol minX="601" maxX="617" minY="280" maxY="296" name="police-s"/>
+  <symbol minX="617" maxX="633" minY="280" maxY="296" name="kiosk-s"/>
+  <symbol minX="633" maxX="649" minY="280" maxY="296" name="remains-s"/>
+  <symbol minX="649" maxX="665" minY="280" maxY="296" name="kindergarten-s"/>
+  <symbol minX="665" maxX="681" minY="280" maxY="296" name="jewish-s"/>
+  <symbol minX="681" maxX="697" minY="280" maxY="296" name="restaurant-s"/>
+  <symbol minX="697" maxX="713" minY="280" maxY="296" name="jewelry-s"/>
+  <symbol minX="713" maxX="729" minY="280" maxY="296" name="information-s"/>
+  <symbol minX="729" maxX="745" minY="280" maxY="296" name="hunting-tower-s"/>
+  <symbol minX="745" maxX="761" minY="280" maxY="296" name="sauna-s"/>
+  <symbol minX="761" maxX="777" minY="280" maxY="296" name="hotel-s"/>
+  <symbol minX="777" maxX="793" minY="280" maxY="296" name="hostel-s"/>
+  <symbol minX="793" maxX="809" minY="280" maxY="296" name="school-s"/>
+  <symbol minX="809" maxX="825" minY="280" maxY="296" name="hospital-s"/>
+  <symbol minX="825" maxX="841" minY="280" maxY="296" name="historic-ship-s"/>
+  <symbol minX="841" maxX="857" minY="280" maxY="296" name="seafood-shop-s"/>
+  <symbol minX="857" maxX="873" minY="280" maxY="296" name="hindu-s"/>
+  <symbol minX="873" maxX="889" minY="280" maxY="296" name="heliport-s"/>
+  <symbol minX="889" maxX="905" minY="280" maxY="296" name="shinto-s"/>
+  <symbol minX="905" maxX="921" minY="280" maxY="296" name="helipad-s"/>
+  <symbol minX="921" maxX="937" minY="280" maxY="296" name="hardware-s"/>
+  <symbol minX="937" maxX="953" minY="280" maxY="296" name="ship-s"/>
+  <symbol minX="953" maxX="969" minY="280" maxY="296" name="hand-s"/>
+  <symbol minX="969" maxX="985" minY="280" maxY="296" name="hairdresser-s"/>
+  <symbol minX="985" maxX="1001" minY="280" maxY="296" name="shoes-s"/>
+  <symbol minX="1001" maxX="1017" minY="280" maxY="296" name="gym-s"/>
   <symbol minX="0" maxX="16" minY="299" maxY="315" name="grocery-s"/>
   <symbol minX="16" maxX="32" minY="299" maxY="315" name="shop-bicycle-s"/>
   <symbol minX="32" maxX="48" minY="299" maxY="315" name="greengrocer-s"/>
@@ -479,10 +479,10 @@
   <symbol minX="160" maxX="176" minY="299" maxY="315" name="gallery-s"/>
   <symbol minX="176" maxX="192" minY="299" maxY="315" name="soccer-s"/>
   <symbol minX="192" maxX="208" minY="299" maxY="315" name="furniture-s"/>
-  <symbol minX="208" maxX="224" minY="299" maxY="315" name="mobile_phone-s"/>
+  <symbol minX="208" maxX="224" minY="299" maxY="315" name="military-s"/>
   <symbol minX="224" maxX="240" minY="299" maxY="315" name="bakery-s"/>
   <symbol minX="240" maxX="256" minY="299" maxY="315" name="funicular-s"/>
-  <symbol minX="256" maxX="272" minY="299" maxY="315" name="monument-s"/>
+  <symbol minX="256" maxX="272" minY="299" maxY="315" name="mobile_phone-s"/>
   <symbol minX="272" maxX="288" minY="299" maxY="315" name="fuel-s"/>
   <symbol minX="288" maxX="304" minY="299" maxY="315" name="fountain-s"/>
   <symbol minX="304" maxX="320" minY="299" maxY="315" name="sports-s"/>
@@ -491,55 +491,55 @@
   <symbol minX="352" maxX="368" minY="299" maxY="315" name="stadium-s"/>
   <symbol minX="368" maxX="384" minY="299" maxY="315" name="bank-s"/>
   <symbol minX="384" maxX="400" minY="299" maxY="315" name="alpine_hut-s"/>
-  <symbol minX="400" maxX="416" minY="299" maxY="315" name="place-of-worship-s"/>
+  <symbol minX="400" maxX="416" minY="299" maxY="315" name="monument-s"/>
   <symbol minX="416" maxX="438" minY="299" maxY="315" name="subway-barcelona-l"/>
   <symbol minX="438" maxX="460" minY="299" maxY="315" name="subway-barcelona-m"/>
-  <symbol minX="460" maxX="476" minY="299" maxY="315" name="motel-s"/>
-  <symbol minX="476" maxX="492" minY="299" maxY="315" name="motorcycle_shop-s"/>
-  <symbol minX="492" maxX="508" minY="299" maxY="315" name="pitch-s"/>
-  <symbol minX="508" maxX="524" minY="299" maxY="315" name="waterfall-s"/>
+  <symbol minX="460" maxX="476" minY="299" maxY="315" name="place-of-worship-s"/>
+  <symbol minX="476" maxX="492" minY="299" maxY="315" name="motel-s"/>
+  <symbol minX="492" maxX="508" minY="299" maxY="315" name="motorcycle_shop-s"/>
+  <symbol minX="508" maxX="524" minY="299" maxY="315" name="bookmaker-s"/>
   <symbol minX="524" maxX="540" minY="299" maxY="315" name="fire_station-s"/>
-  <symbol minX="540" maxX="556" minY="299" maxY="315" name="museum-s"/>
+  <symbol minX="540" maxX="556" minY="299" maxY="315" name="pitch-s"/>
   <symbol minX="556" maxX="572" minY="299" maxY="315" name="subway-entrance-s"/>
-  <symbol minX="572" maxX="588" minY="299" maxY="315" name="wayside_shrine-s"/>
-  <symbol minX="588" maxX="604" minY="299" maxY="315" name="bowls-s"/>
+  <symbol minX="572" maxX="588" minY="299" maxY="315" name="waterfall-s"/>
+  <symbol minX="588" maxX="604" minY="299" maxY="315" name="lighthouse-s"/>
   <symbol minX="604" maxX="620" minY="299" maxY="315" name="banknote-s"/>
   <symbol minX="620" maxX="636" minY="299" maxY="315" name="fastfood-s"/>
-  <symbol minX="636" maxX="652" minY="299" maxY="315" name="muslim-s"/>
-  <symbol minX="652" maxX="668" minY="299" maxY="315" name="picnic-s"/>
-  <symbol minX="668" maxX="684" minY="299" maxY="315" name="buddhist-s"/>
+  <symbol minX="636" maxX="652" minY="299" maxY="315" name="museum-s"/>
+  <symbol minX="652" maxX="668" minY="299" maxY="315" name="muslim-s"/>
+  <symbol minX="668" maxX="684" minY="299" maxY="315" name="bowls-s"/>
   <symbol minX="684" maxX="700" minY="299" maxY="315" name="equestrian-s"/>
   <symbol minX="700" maxX="722" minY="299" maxY="315" name="subway-madrid-l"/>
   <symbol minX="722" maxX="744" minY="299" maxY="315" name="subway-madrid-m"/>
-  <symbol minX="744" maxX="760" minY="299" maxY="315" name="waste-basket-s"/>
+  <symbol minX="744" maxX="760" minY="299" maxY="315" name="buddhist-s"/>
   <symbol minX="760" maxX="776" minY="299" maxY="315" name="bar-s"/>
   <symbol minX="776" maxX="792" minY="299" maxY="315" name="america-football-s"/>
   <symbol minX="792" maxX="808" minY="299" maxY="315" name="baseball-s"/>
-  <symbol minX="808" maxX="824" minY="299" maxY="315" name="npark-s"/>
-  <symbol minX="824" maxX="840" minY="299" maxY="315" name="nparkf-s"/>
-  <symbol minX="840" maxX="856" minY="299" maxY="315" name="bus-s"/>
+  <symbol minX="808" maxX="824" minY="299" maxY="315" name="picnic-s"/>
+  <symbol minX="824" maxX="840" minY="299" maxY="315" name="npark-s"/>
+  <symbol minX="840" maxX="856" minY="299" maxY="315" name="waste-basket-s"/>
   <symbol minX="856" maxX="872" minY="299" maxY="315" name="basketball-s"/>
   <symbol minX="872" maxX="888" minY="299" maxY="315" name="apartment-s"/>
   <symbol minX="888" maxX="904" minY="299" maxY="315" name="subway-newyork-s"/>
   <symbol minX="904" maxX="920" minY="299" maxY="315" name="bbq-s"/>
   <symbol minX="920" maxX="936" minY="299" maxY="315" name="embassy-s"/>
-  <symbol minX="936" maxX="952" minY="299" maxY="315" name="photo-shop-s"/>
-  <symbol minX="952" maxX="968" minY="299" maxY="315" name="butcher-s"/>
-  <symbol minX="968" maxX="984" minY="299" maxY="315" name="office-s"/>
-  <symbol minX="984" maxX="1000" minY="299" maxY="315" name="optician-s"/>
-  <symbol minX="1000" maxX="1016" minY="299" maxY="315" name="lighthouse-s"/>
+  <symbol minX="936" maxX="952" minY="299" maxY="315" name="nparkf-s"/>
+  <symbol minX="952" maxX="968" minY="299" maxY="315" name="bus-s"/>
+  <symbol minX="968" maxX="984" minY="299" maxY="315" name="photo-shop-s"/>
+  <symbol minX="984" maxX="1000" minY="299" maxY="315" name="office-s"/>
+  <symbol minX="1000" maxX="1016" minY="299" maxY="315" name="butcher-s"/>
   <symbol minX="0" maxX="16" minY="315" maxY="331" name="subway-s"/>
   <symbol minX="16" maxX="32" minY="315" maxY="331" name="electronics-s"/>
-  <symbol minX="32" maxX="48" minY="315" maxY="331" name="phone-s"/>
-  <symbol minX="48" maxX="64" minY="315" maxY="331" name="outdoor-shop-s"/>
+  <symbol minX="32" maxX="48" minY="315" maxY="331" name="optician-s"/>
+  <symbol minX="48" maxX="64" minY="315" maxY="331" name="phone-s"/>
   <symbol minX="64" maxX="80" minY="315" maxY="331" name="bcontrol-s"/>
   <symbol minX="80" maxX="96" minY="315" maxY="331" name="archery-s"/>
   <symbol minX="96" maxX="112" minY="315" maxY="331" name="beach-s"/>
   <symbol minX="112" maxX="128" minY="315" maxY="331" name="beauty-s"/>
   <symbol minX="128" maxX="144" minY="315" maxY="331" name="drinking-water-s"/>
-  <symbol minX="144" maxX="160" minY="315" maxY="331" name="atm-s"/>
+  <symbol minX="144" maxX="160" minY="315" maxY="331" name="outdoor-shop-s"/>
   <symbol minX="160" maxX="176" minY="315" maxY="331" name="sweets-s"/>
-  <symbol minX="176" maxX="192" minY="315" maxY="331" name="beer-s"/>
+  <symbol minX="176" maxX="192" minY="315" maxY="331" name="atm-s"/>
   <symbol minX="192" maxX="208" minY="315" maxY="331" name="doityourself-s"/>
   <symbol minX="208" maxX="224" minY="315" maxY="331" name="swimming-s"/>
   <symbol minX="224" maxX="240" minY="315" maxY="331" name="dog_park-s"/>
@@ -549,10 +549,10 @@
   <symbol minX="288" maxX="304" minY="315" maxY="331" name="dentist-s"/>
   <symbol minX="304" maxX="320" minY="315" maxY="331" name="taxi-s"/>
   <symbol minX="320" maxX="336" minY="315" maxY="331" name="curling-s"/>
-  <symbol minX="336" maxX="352" minY="315" maxY="331" name="park-s"/>
+  <symbol minX="336" maxX="352" minY="315" maxY="331" name="beer-s"/>
   <symbol minX="352" maxX="368" minY="315" maxY="331" name="tennis-s"/>
-  <symbol minX="368" maxX="384" minY="315" maxY="331" name="pharmacy-s"/>
-  <symbol minX="384" maxX="400" minY="315" maxY="331" name="zoo-s"/>
+  <symbol minX="368" maxX="384" minY="315" maxY="331" name="park-s"/>
+  <symbol minX="384" maxX="400" minY="315" maxY="331" name="pharmacy-s"/>
   <symbol minX="400" maxX="416" minY="315" maxY="331" name="theatre-s"/>
   <symbol minX="416" maxX="432" minY="315" maxY="331" name="cricket-s"/>
   <symbol minX="432" maxX="448" minY="315" maxY="331" name="copyshop-s"/>
@@ -564,10 +564,10 @@
   <symbol minX="528" maxX="544" minY="315" maxY="331" name="clothes-s"/>
   <symbol minX="544" maxX="560" minY="315" maxY="331" name="toilets-s"/>
   <symbol minX="560" maxX="576" minY="315" maxY="331" name="climbing-s"/>
-  <symbol minX="576" maxX="592" minY="315" maxY="331" name="cable-car-s"/>
+  <symbol minX="576" maxX="592" minY="315" maxY="331" name="zoo-s"/>
   <symbol minX="592" maxX="608" minY="315" maxY="331" name="toll_booth-s"/>
-  <symbol minX="608" maxX="624" minY="315" maxY="331" name="bicycle-s"/>
-  <symbol minX="624" maxX="640" minY="315" maxY="331" name="windmill-s"/>
+  <symbol minX="608" maxX="624" minY="315" maxY="331" name="airport-s"/>
+  <symbol minX="624" maxX="640" minY="315" maxY="331" name="bicycle-s"/>
   <symbol minX="640" maxX="656" minY="315" maxY="331" name="cinema-s"/>
   <symbol minX="656" maxX="672" minY="315" maxY="331" name="tomb-s"/>
   <symbol minX="672" maxX="688" minY="315" maxY="331" name="christian-s"/>
@@ -579,8 +579,8 @@
   <symbol minX="768" maxX="784" minY="315" maxY="331" name="cemetery-s"/>
   <symbol minX="784" maxX="800" minY="315" maxY="331" name="parking-meter-s"/>
   <symbol minX="800" maxX="816" minY="315" maxY="331" name="train-s"/>
-  <symbol minX="816" maxX="832" minY="315" maxY="331" name="petshop-s"/>
-  <symbol minX="832" maxX="848" minY="315" maxY="331" name="airport-s"/>
+  <symbol minX="816" maxX="832" minY="315" maxY="331" name="windmill-s"/>
+  <symbol minX="832" maxX="848" minY="315" maxY="331" name="petshop-s"/>
   <symbol minX="848" maxX="864" minY="315" maxY="331" name="casino-s"/>
   <symbol minX="864" maxX="880" minY="315" maxY="331" name="tram-s"/>
   <symbol minX="880" maxX="896" minY="315" maxY="331" name="caravan_site-s"/>
@@ -595,52 +595,53 @@
   <symbol minX="0" maxX="16" minY="331" maxY="347" name="campsite-s"/>
   <symbol minX="16" maxX="32" minY="331" maxY="347" name="cafe-s"/>
   <symbol minX="32" maxX="48" minY="331" maxY="347" name="viewpoint-s"/>
-  <symbol minX="48" maxX="69" minY="331" maxY="346" name="subway-kiev-l"/>
-  <symbol minX="69" maxX="84" minY="331" maxY="346" name="peakt-l"/>
-  <symbol minX="84" maxX="99" minY="331" maxY="346" name="lightrail-berlin-s"/>
-  <symbol minX="99" maxX="114" minY="331" maxY="346" name="subway-paris-s"/>
-  <symbol minX="114" maxX="129" minY="331" maxY="346" name="subway-moscow-s"/>
-  <symbol minX="129" maxX="149" minY="331" maxY="346" name="subway-madrid-s"/>
-  <symbol minX="149" maxX="171" minY="331" maxY="346" name="railway-crossing-xl"/>
-  <symbol minX="171" maxX="192" minY="331" maxY="346" name="subway-kiev-m"/>
-  <symbol minX="192" maxX="206" minY="331" maxY="345" name="subway-berlin-s"/>
-  <symbol minX="206" maxX="221" minY="331" maxY="345" name="bench"/>
-  <symbol minX="221" maxX="235" minY="331" maxY="345" name="subway-rome-s"/>
-  <symbol minX="235" maxX="252" minY="331" maxY="345" name="subway-london-s"/>
-  <symbol minX="252" maxX="265" minY="331" maxY="344" name="bike-parking-s"/>
-  <symbol minX="265" maxX="278" minY="331" maxY="344" name="train-xs"/>
-  <symbol minX="278" maxX="291" minY="331" maxY="344" name="parking-s"/>
-  <symbol minX="291" maxX="310" minY="331" maxY="344" name="railway-crossing-l"/>
-  <symbol minX="310" maxX="323" minY="331" maxY="344" name="speedcam-s"/>
-  <symbol minX="323" maxX="336" minY="331" maxY="344" name="star-l"/>
-  <symbol minX="336" maxX="357" minY="331" maxY="344" name="subway-minsk-l"/>
-  <symbol minX="357" maxX="370" minY="331" maxY="344" name="parking_pay-s"/>
-  <symbol minX="370" maxX="383" minY="331" maxY="344" name="subway-newyork-xs"/>
-  <symbol minX="383" maxX="396" minY="331" maxY="344" name="subway-xs"/>
-  <symbol minX="396" maxX="409" minY="331" maxY="344" name="survey_point-l"/>
-  <symbol minX="409" maxX="421" minY="331" maxY="343" name="star-m"/>
-  <symbol minX="421" maxX="433" minY="331" maxY="343" name="survey_point-m"/>
-  <symbol minX="433" maxX="445" minY="331" maxY="343" name="peakt-m"/>
-  <symbol minX="445" maxX="462" minY="331" maxY="343" name="railway-crossing"/>
-  <symbol minX="462" maxX="480" minY="331" maxY="343" name="subway-minsk-m"/>
-  <symbol minX="480" maxX="498" minY="331" maxY="343" name="subway-kiev-s"/>
-  <symbol minX="498" maxX="509" minY="331" maxY="342" name="star-s"/>
-  <symbol minX="509" maxX="520" minY="331" maxY="342" name="crossing-l"/>
-  <symbol minX="520" maxX="537" minY="331" maxY="342" name="subway-minsk-s"/>
-  <symbol minX="537" maxX="547" minY="331" maxY="341" name="survey_point-s"/>
-  <symbol minX="547" maxX="558" minY="331" maxY="341" name="peakt-s"/>
-  <symbol minX="558" maxX="578" minY="331" maxY="341" name="arrow-m"/>
-  <symbol minX="578" maxX="587" minY="331" maxY="340" name="entrance-s"/>
-  <symbol minX="587" maxX="596" minY="331" maxY="340" name="crossing-m"/>
-  <symbol minX="596" maxX="605" minY="331" maxY="340" name="zero-icon"/>
-  <symbol minX="605" maxX="613" minY="331" maxY="339" name="crossing-s"/>
-  <symbol minX="613" maxX="621" minY="331" maxY="339" name="cities-m"/>
-  <symbol minX="621" maxX="636" minY="331" maxY="339" name="arrow-s"/>
-  <symbol minX="636" maxX="644" minY="331" maxY="339" name="dot-m"/>
-  <symbol minX="644" maxX="651" minY="331" maxY="338" name="entrance-xs"/>
-  <symbol minX="651" maxX="657" minY="331" maxY="337" name="cities-xs"/>
-  <symbol minX="657" maxX="663" minY="331" maxY="337" name="dot-s"/>
-  <symbol minX="663" maxX="674" minY="331" maxY="337" name="arrow-xs"/>
-  <symbol minX="674" maxX="680" minY="331" maxY="337" name="cities-s"/>
+  <symbol minX="48" maxX="64" minY="331" maxY="347" name="cable-car-s"/>
+  <symbol minX="64" maxX="79" minY="331" maxY="346" name="subway-moscow-s"/>
+  <symbol minX="79" maxX="94" minY="331" maxY="346" name="peakt-l"/>
+  <symbol minX="94" maxX="109" minY="331" maxY="346" name="lightrail-berlin-s"/>
+  <symbol minX="109" maxX="124" minY="331" maxY="346" name="subway-paris-s"/>
+  <symbol minX="124" maxX="146" minY="331" maxY="346" name="railway-crossing-xl"/>
+  <symbol minX="146" maxX="166" minY="331" maxY="346" name="subway-madrid-s"/>
+  <symbol minX="166" maxX="187" minY="331" maxY="346" name="subway-kiev-m"/>
+  <symbol minX="187" maxX="208" minY="331" maxY="346" name="subway-kiev-l"/>
+  <symbol minX="208" maxX="222" minY="331" maxY="345" name="subway-berlin-s"/>
+  <symbol minX="222" maxX="237" minY="331" maxY="345" name="bench"/>
+  <symbol minX="237" maxX="251" minY="331" maxY="345" name="subway-rome-s"/>
+  <symbol minX="251" maxX="268" minY="331" maxY="345" name="subway-london-s"/>
+  <symbol minX="268" maxX="281" minY="331" maxY="344" name="bike-parking-s"/>
+  <symbol minX="281" maxX="294" minY="331" maxY="344" name="train-xs"/>
+  <symbol minX="294" maxX="307" minY="331" maxY="344" name="parking-s"/>
+  <symbol minX="307" maxX="326" minY="331" maxY="344" name="railway-crossing-l"/>
+  <symbol minX="326" maxX="339" minY="331" maxY="344" name="speedcam-s"/>
+  <symbol minX="339" maxX="352" minY="331" maxY="344" name="star-l"/>
+  <symbol minX="352" maxX="373" minY="331" maxY="344" name="subway-minsk-l"/>
+  <symbol minX="373" maxX="386" minY="331" maxY="344" name="parking_pay-s"/>
+  <symbol minX="386" maxX="399" minY="331" maxY="344" name="subway-newyork-xs"/>
+  <symbol minX="399" maxX="412" minY="331" maxY="344" name="subway-xs"/>
+  <symbol minX="412" maxX="425" minY="331" maxY="344" name="survey_point-l"/>
+  <symbol minX="425" maxX="437" minY="331" maxY="343" name="star-m"/>
+  <symbol minX="437" maxX="449" minY="331" maxY="343" name="survey_point-m"/>
+  <symbol minX="449" maxX="461" minY="331" maxY="343" name="peakt-m"/>
+  <symbol minX="461" maxX="478" minY="331" maxY="343" name="railway-crossing"/>
+  <symbol minX="478" maxX="496" minY="331" maxY="343" name="subway-minsk-m"/>
+  <symbol minX="496" maxX="514" minY="331" maxY="343" name="subway-kiev-s"/>
+  <symbol minX="514" maxX="525" minY="331" maxY="342" name="star-s"/>
+  <symbol minX="525" maxX="536" minY="331" maxY="342" name="crossing-l"/>
+  <symbol minX="536" maxX="553" minY="331" maxY="342" name="subway-minsk-s"/>
+  <symbol minX="553" maxX="563" minY="331" maxY="341" name="survey_point-s"/>
+  <symbol minX="563" maxX="574" minY="331" maxY="341" name="peakt-s"/>
+  <symbol minX="574" maxX="594" minY="331" maxY="341" name="arrow-m"/>
+  <symbol minX="594" maxX="603" minY="331" maxY="340" name="entrance-s"/>
+  <symbol minX="603" maxX="612" minY="331" maxY="340" name="crossing-m"/>
+  <symbol minX="612" maxX="621" minY="331" maxY="340" name="zero-icon"/>
+  <symbol minX="621" maxX="629" minY="331" maxY="339" name="crossing-s"/>
+  <symbol minX="629" maxX="637" minY="331" maxY="339" name="dot-m"/>
+  <symbol minX="637" maxX="652" minY="331" maxY="339" name="arrow-s"/>
+  <symbol minX="652" maxX="660" minY="331" maxY="339" name="cities-m"/>
+  <symbol minX="660" maxX="667" minY="331" maxY="338" name="entrance-xs"/>
+  <symbol minX="667" maxX="673" minY="331" maxY="337" name="dot-s"/>
+  <symbol minX="673" maxX="679" minY="331" maxY="337" name="cities-xs"/>
+  <symbol minX="679" maxX="690" minY="331" maxY="337" name="arrow-xs"/>
+  <symbol minX="690" maxX="696" minY="331" maxY="337" name="cities-s"/>
  </file>
 </root>
diff --git a/data/resources-xhdpi_clear/symbols-ad.png b/data/resources-xhdpi_clear/symbols-ad.png
index 08f974a1e2..dc701f4fb7 100644
Binary files a/data/resources-xhdpi_clear/symbols-ad.png and b/data/resources-xhdpi_clear/symbols-ad.png differ
diff --git a/data/resources-xhdpi_clear/symbols.png b/data/resources-xhdpi_clear/symbols.png
index ba8d7741d3..2a0aff45dd 100644
Binary files a/data/resources-xhdpi_clear/symbols.png and b/data/resources-xhdpi_clear/symbols.png differ
diff --git a/data/resources-xhdpi_clear/symbols.sdf b/data/resources-xhdpi_clear/symbols.sdf
index 098f78a71e..e7501e516f 100644
--- a/data/resources-xhdpi_clear/symbols.sdf
+++ b/data/resources-xhdpi_clear/symbols.sdf
@@ -334,8 +334,8 @@
   <symbol minX="1440" maxX="1480" minY="404" maxY="444" name="public-building-l"/>
   <symbol minX="1480" maxX="1520" minY="404" maxY="444" name="lighthouse-l"/>
   <symbol minX="1520" maxX="1560" minY="404" maxY="444" name="lighthouse-m"/>
-  <symbol minX="1560" maxX="1600" minY="404" maxY="444" name="laundry-m"/>
-  <symbol minX="1600" maxX="1640" minY="404" maxY="444" name="power-m"/>
+  <symbol minX="1560" maxX="1600" minY="404" maxY="444" name="power-m"/>
+  <symbol minX="1600" maxX="1640" minY="404" maxY="444" name="laundry-m"/>
   <symbol minX="1640" maxX="1680" minY="404" maxY="444" name="power-l"/>
   <symbol minX="1680" maxX="1720" minY="404" maxY="444" name="postbox-m"/>
   <symbol minX="1720" maxX="1760" minY="404" maxY="444" name="mail-l"/>
@@ -394,73 +394,73 @@
   <symbol minX="1800" maxX="1840" minY="444" maxY="484" name="petshop-l"/>
   <symbol minX="1840" maxX="1880" minY="444" maxY="484" name="parking-xl"/>
   <symbol minX="1880" maxX="1920" minY="444" maxY="484" name="parking_pay-l"/>
-  <symbol minX="1920" maxX="1959" minY="444" maxY="483" name="subway-spb-m"/>
-  <symbol minX="1959" maxX="1998" minY="444" maxY="483" name="atm-tinkoff-shield-m"/>
-  <symbol minX="1998" maxX="2038" minY="444" maxY="483" name="lightrail-berlin-l"/>
+  <symbol minX="1920" maxX="1960" minY="444" maxY="483" name="lightrail-berlin-l"/>
+  <symbol minX="1960" maxX="1999" minY="444" maxY="483" name="atm-tinkoff-shield-m"/>
+  <symbol minX="1999" maxX="2038" minY="444" maxY="483" name="atm-tinkoff-gerb-m"/>
   <symbol minX="0" maxX="39" minY="484" maxY="523" name="volcano-m"/>
-  <symbol minX="39" maxX="78" minY="484" maxY="523" name="atm-tinkoff-gerb-m"/>
-  <symbol minX="78" maxX="117" minY="484" maxY="523" name="cave-m"/>
+  <symbol minX="39" maxX="78" minY="484" maxY="523" name="cave-m"/>
+  <symbol minX="78" maxX="117" minY="484" maxY="523" name="subway-spb-m"/>
   <symbol minX="117" maxX="157" minY="484" maxY="522" name="speedcam1-xl"/>
   <symbol minX="157" maxX="194" minY="484" maxY="521" name="subway-entrance-m"/>
-  <symbol minX="194" maxX="230" minY="484" maxY="520" name="subway-rome-l"/>
-  <symbol minX="230" maxX="270" minY="484" maxY="520" name="subway-moscow-l"/>
-  <symbol minX="270" maxX="306" minY="484" maxY="520" name="subway-berlin-l"/>
+  <symbol minX="194" maxX="234" minY="484" maxY="520" name="subway-moscow-l"/>
+  <symbol minX="234" maxX="270" minY="484" maxY="520" name="subway-berlin-l"/>
+  <symbol minX="270" maxX="306" minY="484" maxY="520" name="subway-rome-l"/>
   <symbol minX="306" maxX="342" minY="484" maxY="520" name="lightrail-berlin-m"/>
   <symbol minX="342" maxX="376" minY="484" maxY="518" name="parking_pay-m"/>
-  <symbol minX="376" maxX="410" minY="484" maxY="518" name="bike-parking-m"/>
-  <symbol minX="410" maxX="444" minY="484" maxY="518" name="speedcam-m"/>
-  <symbol minX="444" maxX="478" minY="484" maxY="518" name="parking-m"/>
-  <symbol minX="478" maxX="512" minY="484" maxY="518" name="search-result"/>
-  <symbol minX="512" maxX="549" minY="484" maxY="517" name="subway-moscow-m"/>
-  <symbol minX="549" maxX="582" minY="484" maxY="517" name="subway-rome-m"/>
-  <symbol minX="582" maxX="615" minY="484" maxY="517" name="subway-paris-m"/>
-  <symbol minX="615" maxX="648" minY="484" maxY="517" name="subway-berlin-m"/>
-  <symbol minX="648" maxX="680" minY="484" maxY="516" name="api-result"/>
-  <symbol minX="680" maxX="720" minY="484" maxY="516" name="subway-london-l"/>
-  <symbol minX="720" maxX="750" minY="484" maxY="514" name="subway-spb-s"/>
-  <symbol minX="750" maxX="789" minY="484" maxY="514" name="subway-london-m"/>
-  <symbol minX="789" maxX="819" minY="484" maxY="514" name="atm-tinkoff-shield-s"/>
-  <symbol minX="819" maxX="855" minY="484" maxY="514" name="subway-barcelona-s"/>
-  <symbol minX="855" maxX="885" minY="484" maxY="514" name="atm-tinkoff-gerb-s"/>
-  <symbol minX="885" maxX="915" minY="484" maxY="514" name="volcano-s"/>
-  <symbol minX="915" maxX="945" minY="484" maxY="514" name="cave-s"/>
-  <symbol minX="945" maxX="985" minY="484" maxY="513" name="subway-barcelona-l"/>
-  <symbol minX="985" maxX="1025" minY="484" maxY="513" name="subway-barcelona-m"/>
-  <symbol minX="1025" maxX="1065" minY="484" maxY="513" name="subway-madrid-l"/>
-  <symbol minX="1065" maxX="1105" minY="484" maxY="513" name="subway-madrid-m"/>
-  <symbol minX="1105" maxX="1133" minY="484" maxY="512" name="postbox-s"/>
-  <symbol minX="1133" maxX="1161" minY="484" maxY="512" name="power-s"/>
-  <symbol minX="1161" maxX="1189" minY="484" maxY="512" name="lift_gate-s"/>
-  <symbol minX="1189" maxX="1217" minY="484" maxY="512" name="library-s"/>
-  <symbol minX="1217" maxX="1245" minY="484" maxY="512" name="public-building-s"/>
-  <symbol minX="1245" maxX="1273" minY="484" maxY="512" name="airport-s"/>
-  <symbol minX="1273" maxX="1301" minY="484" maxY="512" name="australian-football-s"/>
-  <symbol minX="1301" maxX="1329" minY="484" maxY="512" name="alcohol-s"/>
-  <symbol minX="1329" maxX="1357" minY="484" maxY="512" name="lawyer-s"/>
-  <symbol minX="1357" maxX="1385" minY="484" maxY="512" name="laundry-s"/>
-  <symbol minX="1385" maxX="1413" minY="484" maxY="512" name="recycling-s"/>
-  <symbol minX="1413" maxX="1441" minY="484" maxY="512" name="bakery-s"/>
-  <symbol minX="1441" maxX="1469" minY="484" maxY="512" name="kiosk-s"/>
-  <symbol minX="1469" maxX="1497" minY="484" maxY="512" name="remains-s"/>
-  <symbol minX="1497" maxX="1525" minY="484" maxY="512" name="kindergarten-s"/>
-  <symbol minX="1525" maxX="1553" minY="484" maxY="512" name="jewish-s"/>
-  <symbol minX="1553" maxX="1581" minY="484" maxY="512" name="restaurant-s"/>
-  <symbol minX="1581" maxX="1609" minY="484" maxY="512" name="jewelry-s"/>
-  <symbol minX="1609" maxX="1637" minY="484" maxY="512" name="information-s"/>
-  <symbol minX="1637" maxX="1665" minY="484" maxY="512" name="hunting-tower-s"/>
-  <symbol minX="1665" maxX="1693" minY="484" maxY="512" name="sauna-s"/>
-  <symbol minX="1693" maxX="1721" minY="484" maxY="512" name="hotel-s"/>
-  <symbol minX="1721" maxX="1749" minY="484" maxY="512" name="hostel-s"/>
-  <symbol minX="1749" maxX="1777" minY="484" maxY="512" name="school-s"/>
-  <symbol minX="1777" maxX="1805" minY="484" maxY="512" name="hospital-s"/>
-  <symbol minX="1805" maxX="1833" minY="484" maxY="512" name="historic-ship-s"/>
-  <symbol minX="1833" maxX="1861" minY="484" maxY="512" name="seafood-shop-s"/>
-  <symbol minX="1861" maxX="1889" minY="484" maxY="512" name="hindu-s"/>
-  <symbol minX="1889" maxX="1917" minY="484" maxY="512" name="heliport-s"/>
-  <symbol minX="1917" maxX="1945" minY="484" maxY="512" name="shinto-s"/>
-  <symbol minX="1945" maxX="1973" minY="484" maxY="512" name="helipad-s"/>
-  <symbol minX="1973" maxX="2001" minY="484" maxY="512" name="hardware-s"/>
-  <symbol minX="2001" maxX="2029" minY="484" maxY="512" name="ship-s"/>
+  <symbol minX="376" maxX="410" minY="484" maxY="518" name="speedcam-m"/>
+  <symbol minX="410" maxX="444" minY="484" maxY="518" name="search-result"/>
+  <symbol minX="444" maxX="478" minY="484" maxY="518" name="non-found-search-result"/>
+  <symbol minX="478" maxX="512" minY="484" maxY="518" name="parking-m"/>
+  <symbol minX="512" maxX="546" minY="484" maxY="518" name="bike-parking-m"/>
+  <symbol minX="546" maxX="579" minY="484" maxY="517" name="subway-berlin-m"/>
+  <symbol minX="579" maxX="612" minY="484" maxY="517" name="subway-rome-m"/>
+  <symbol minX="612" maxX="645" minY="484" maxY="517" name="subway-paris-m"/>
+  <symbol minX="645" maxX="682" minY="484" maxY="517" name="subway-moscow-m"/>
+  <symbol minX="682" maxX="714" minY="484" maxY="516" name="api-result"/>
+  <symbol minX="714" maxX="754" minY="484" maxY="516" name="subway-london-l"/>
+  <symbol minX="754" maxX="784" minY="484" maxY="514" name="atm-tinkoff-gerb-s"/>
+  <symbol minX="784" maxX="820" minY="484" maxY="514" name="subway-barcelona-s"/>
+  <symbol minX="820" maxX="859" minY="484" maxY="514" name="subway-london-m"/>
+  <symbol minX="859" maxX="889" minY="484" maxY="514" name="subway-spb-s"/>
+  <symbol minX="889" maxX="919" minY="484" maxY="514" name="cave-s"/>
+  <symbol minX="919" maxX="949" minY="484" maxY="514" name="volcano-s"/>
+  <symbol minX="949" maxX="979" minY="484" maxY="514" name="atm-tinkoff-shield-s"/>
+  <symbol minX="979" maxX="1019" minY="484" maxY="513" name="subway-barcelona-m"/>
+  <symbol minX="1019" maxX="1059" minY="484" maxY="513" name="subway-barcelona-l"/>
+  <symbol minX="1059" maxX="1099" minY="484" maxY="513" name="subway-madrid-l"/>
+  <symbol minX="1099" maxX="1139" minY="484" maxY="513" name="subway-madrid-m"/>
+  <symbol minX="1139" maxX="1167" minY="484" maxY="512" name="power-s"/>
+  <symbol minX="1167" maxX="1195" minY="484" maxY="512" name="lift_gate-s"/>
+  <symbol minX="1195" maxX="1223" minY="484" maxY="512" name="library-s"/>
+  <symbol minX="1223" maxX="1251" minY="484" maxY="512" name="public-building-s"/>
+  <symbol minX="1251" maxX="1279" minY="484" maxY="512" name="america-football-s"/>
+  <symbol minX="1279" maxX="1307" minY="484" maxY="512" name="baseball-s"/>
+  <symbol minX="1307" maxX="1335" minY="484" maxY="512" name="basketball-s"/>
+  <symbol minX="1335" maxX="1363" minY="484" maxY="512" name="lawyer-s"/>
+  <symbol minX="1363" maxX="1391" minY="484" maxY="512" name="laundry-s"/>
+  <symbol minX="1391" maxX="1419" minY="484" maxY="512" name="recycling-s"/>
+  <symbol minX="1419" maxX="1447" minY="484" maxY="512" name="lighthouse-s"/>
+  <symbol minX="1447" maxX="1475" minY="484" maxY="512" name="kiosk-s"/>
+  <symbol minX="1475" maxX="1503" minY="484" maxY="512" name="remains-s"/>
+  <symbol minX="1503" maxX="1531" minY="484" maxY="512" name="kindergarten-s"/>
+  <symbol minX="1531" maxX="1559" minY="484" maxY="512" name="jewish-s"/>
+  <symbol minX="1559" maxX="1587" minY="484" maxY="512" name="restaurant-s"/>
+  <symbol minX="1587" maxX="1615" minY="484" maxY="512" name="jewelry-s"/>
+  <symbol minX="1615" maxX="1643" minY="484" maxY="512" name="information-s"/>
+  <symbol minX="1643" maxX="1671" minY="484" maxY="512" name="hunting-tower-s"/>
+  <symbol minX="1671" maxX="1699" minY="484" maxY="512" name="sauna-s"/>
+  <symbol minX="1699" maxX="1727" minY="484" maxY="512" name="hotel-s"/>
+  <symbol minX="1727" maxX="1755" minY="484" maxY="512" name="hostel-s"/>
+  <symbol minX="1755" maxX="1783" minY="484" maxY="512" name="school-s"/>
+  <symbol minX="1783" maxX="1811" minY="484" maxY="512" name="hospital-s"/>
+  <symbol minX="1811" maxX="1839" minY="484" maxY="512" name="historic-ship-s"/>
+  <symbol minX="1839" maxX="1867" minY="484" maxY="512" name="seafood-shop-s"/>
+  <symbol minX="1867" maxX="1895" minY="484" maxY="512" name="hindu-s"/>
+  <symbol minX="1895" maxX="1923" minY="484" maxY="512" name="heliport-s"/>
+  <symbol minX="1923" maxX="1951" minY="484" maxY="512" name="shinto-s"/>
+  <symbol minX="1951" maxX="1979" minY="484" maxY="512" name="helipad-s"/>
+  <symbol minX="1979" maxX="2007" minY="484" maxY="512" name="hardware-s"/>
+  <symbol minX="2007" maxX="2035" minY="484" maxY="512" name="ship-s"/>
   <symbol minX="0" maxX="28" minY="523" maxY="551" name="hand-s"/>
   <symbol minX="28" maxX="56" minY="523" maxY="551" name="hairdresser-s"/>
   <symbol minX="56" maxX="84" minY="523" maxY="551" name="shoes-s"/>
@@ -478,67 +478,67 @@
   <symbol minX="392" maxX="420" minY="523" maxY="551" name="gallery-s"/>
   <symbol minX="420" maxX="448" minY="523" maxY="551" name="soccer-s"/>
   <symbol minX="448" maxX="476" minY="523" maxY="551" name="furniture-s"/>
-  <symbol minX="476" maxX="504" minY="523" maxY="551" name="mail-s"/>
-  <symbol minX="504" maxX="532" minY="523" maxY="551" name="bank-s"/>
+  <symbol minX="476" maxX="504" minY="523" maxY="551" name="outdoor-shop-s"/>
+  <symbol minX="504" maxX="532" minY="523" maxY="551" name="apartment-s"/>
   <symbol minX="532" maxX="560" minY="523" maxY="551" name="funicular-s"/>
-  <symbol minX="560" maxX="588" minY="523" maxY="551" name="police-s"/>
+  <symbol minX="560" maxX="588" minY="523" maxY="551" name="pharmacy-s"/>
   <symbol minX="588" maxX="616" minY="523" maxY="551" name="fuel-s"/>
   <symbol minX="616" maxX="644" minY="523" maxY="551" name="fountain-s"/>
   <symbol minX="644" maxX="672" minY="523" maxY="551" name="sports-s"/>
   <symbol minX="672" maxX="700" minY="523" maxY="551" name="florist-s"/>
   <symbol minX="700" maxX="728" minY="523" maxY="551" name="firehydrant-s"/>
   <symbol minX="728" maxX="756" minY="523" maxY="551" name="stadium-s"/>
-  <symbol minX="756" maxX="784" minY="523" maxY="551" name="alpine_hut-s"/>
-  <symbol minX="784" maxX="812" minY="523" maxY="551" name="banknote-s"/>
-  <symbol minX="812" maxX="840" minY="523" maxY="551" name="bar-s"/>
-  <symbol minX="840" maxX="868" minY="523" maxY="551" name="marketplace-s"/>
-  <symbol minX="868" maxX="896" minY="523" maxY="551" name="military-s"/>
-  <symbol minX="896" maxX="924" minY="523" maxY="551" name="mobile_phone-s"/>
-  <symbol minX="924" maxX="952" minY="523" maxY="551" name="place-of-worship-s"/>
-  <symbol minX="952" maxX="980" minY="523" maxY="551" name="monument-s"/>
-  <symbol minX="980" maxX="1008" minY="523" maxY="551" name="america-football-s"/>
+  <symbol minX="756" maxX="784" minY="523" maxY="551" name="bbq-s"/>
+  <symbol minX="784" maxX="812" minY="523" maxY="551" name="bcontrol-s"/>
+  <symbol minX="812" maxX="840" minY="523" maxY="551" name="archery-s"/>
+  <symbol minX="840" maxX="868" minY="523" maxY="551" name="postbox-s"/>
+  <symbol minX="868" maxX="896" minY="523" maxY="551" name="bar-s"/>
+  <symbol minX="896" maxX="924" minY="523" maxY="551" name="mail-s"/>
+  <symbol minX="924" maxX="952" minY="523" maxY="551" name="park-s"/>
+  <symbol minX="952" maxX="980" minY="523" maxY="551" name="police-s"/>
+  <symbol minX="980" maxX="1008" minY="523" maxY="551" name="banknote-s"/>
   <symbol minX="1008" maxX="1036" minY="523" maxY="551" name="fire_station-s"/>
-  <symbol minX="1036" maxX="1064" minY="523" maxY="551" name="motel-s"/>
+  <symbol minX="1036" maxX="1064" minY="523" maxY="551" name="marketplace-s"/>
   <symbol minX="1064" maxX="1092" minY="523" maxY="551" name="subway-entrance-s"/>
-  <symbol minX="1092" maxX="1120" minY="523" maxY="551" name="baseball-s"/>
-  <symbol minX="1120" maxX="1148" minY="523" maxY="551" name="basketball-s"/>
-  <symbol minX="1148" maxX="1176" minY="523" maxY="551" name="apartment-s"/>
+  <symbol minX="1092" maxX="1120" minY="523" maxY="551" name="beach-s"/>
+  <symbol minX="1120" maxX="1148" minY="523" maxY="551" name="beauty-s"/>
+  <symbol minX="1148" maxX="1176" minY="523" maxY="551" name="nparkf-s"/>
   <symbol minX="1176" maxX="1204" minY="523" maxY="551" name="fastfood-s"/>
-  <symbol minX="1204" maxX="1232" minY="523" maxY="551" name="pitch-s"/>
-  <symbol minX="1232" maxX="1260" minY="523" maxY="551" name="motorcycle_shop-s"/>
-  <symbol minX="1260" maxX="1288" minY="523" maxY="551" name="bbq-s"/>
+  <symbol minX="1204" maxX="1232" minY="523" maxY="551" name="military-s"/>
+  <symbol minX="1232" maxX="1260" minY="523" maxY="551" name="mobile_phone-s"/>
+  <symbol minX="1260" maxX="1288" minY="523" maxY="551" name="atm-s"/>
   <symbol minX="1288" maxX="1316" minY="523" maxY="551" name="equestrian-s"/>
-  <symbol minX="1316" maxX="1344" minY="523" maxY="551" name="museum-s"/>
-  <symbol minX="1344" maxX="1372" minY="523" maxY="551" name="picnic-s"/>
-  <symbol minX="1372" maxX="1400" minY="523" maxY="551" name="bcontrol-s"/>
-  <symbol minX="1400" maxX="1428" minY="523" maxY="551" name="archery-s"/>
-  <symbol minX="1428" maxX="1456" minY="523" maxY="551" name="beach-s"/>
-  <symbol minX="1456" maxX="1484" minY="523" maxY="551" name="beauty-s"/>
-  <symbol minX="1484" maxX="1512" minY="523" maxY="551" name="muslim-s"/>
-  <symbol minX="1512" maxX="1540" minY="523" maxY="551" name="npark-s"/>
-  <symbol minX="1540" maxX="1568" minY="523" maxY="551" name="atm-s"/>
-  <symbol minX="1568" maxX="1596" minY="523" maxY="551" name="lighthouse-s"/>
-  <symbol minX="1596" maxX="1624" minY="523" maxY="551" name="beer-s"/>
+  <symbol minX="1316" maxX="1344" minY="523" maxY="551" name="place-of-worship-s"/>
+  <symbol minX="1344" maxX="1372" minY="523" maxY="551" name="monument-s"/>
+  <symbol minX="1372" maxX="1400" minY="523" maxY="551" name="beer-s"/>
+  <symbol minX="1400" maxX="1428" minY="523" maxY="551" name="photo-shop-s"/>
+  <symbol minX="1428" maxX="1456" minY="523" maxY="551" name="zoo-s"/>
+  <symbol minX="1456" maxX="1484" minY="523" maxY="551" name="bicycle-s"/>
+  <symbol minX="1484" maxX="1512" minY="523" maxY="551" name="petshop-s"/>
+  <symbol minX="1512" maxX="1540" minY="523" maxY="551" name="motel-s"/>
+  <symbol minX="1540" maxX="1568" minY="523" maxY="551" name="office-s"/>
+  <symbol minX="1568" maxX="1596" minY="523" maxY="551" name="windmill-s"/>
+  <symbol minX="1596" maxX="1624" minY="523" maxY="551" name="optician-s"/>
   <symbol minX="1624" maxX="1652" minY="523" maxY="551" name="subway-newyork-s"/>
-  <symbol minX="1652" maxX="1680" minY="523" maxY="551" name="zoo-s"/>
+  <symbol minX="1652" maxX="1680" minY="523" maxY="551" name="npark-s"/>
   <symbol minX="1680" maxX="1708" minY="523" maxY="551" name="embassy-s"/>
-  <symbol minX="1708" maxX="1736" minY="523" maxY="551" name="photo-shop-s"/>
-  <symbol minX="1736" maxX="1764" minY="523" maxY="551" name="bicycle-s"/>
-  <symbol minX="1764" maxX="1792" minY="523" maxY="551" name="nparkf-s"/>
-  <symbol minX="1792" maxX="1820" minY="523" maxY="551" name="office-s"/>
-  <symbol minX="1820" maxX="1848" minY="523" maxY="551" name="windmill-s"/>
+  <symbol minX="1708" maxX="1736" minY="523" maxY="551" name="pitch-s"/>
+  <symbol minX="1736" maxX="1764" minY="523" maxY="551" name="wayside_shrine-s"/>
+  <symbol minX="1764" maxX="1792" minY="523" maxY="551" name="parking-meter-s"/>
+  <symbol minX="1792" maxX="1820" minY="523" maxY="551" name="motorcycle_shop-s"/>
+  <symbol minX="1820" maxX="1848" minY="523" maxY="551" name="book-shop-s"/>
   <symbol minX="1848" maxX="1876" minY="523" maxY="551" name="subway-s"/>
   <symbol minX="1876" maxX="1904" minY="523" maxY="551" name="electronics-s"/>
-  <symbol minX="1904" maxX="1932" minY="523" maxY="551" name="phone-s"/>
-  <symbol minX="1932" maxX="1960" minY="523" maxY="551" name="optician-s"/>
-  <symbol minX="1960" maxX="1988" minY="523" maxY="551" name="parking-meter-s"/>
-  <symbol minX="1988" maxX="2016" minY="523" maxY="551" name="wayside_shrine-s"/>
-  <symbol minX="2016" maxX="2044" minY="523" maxY="551" name="book-shop-s"/>
-  <symbol minX="0" maxX="28" minY="551" maxY="579" name="bookmaker-s"/>
+  <symbol minX="1904" maxX="1932" minY="523" maxY="551" name="bookmaker-s"/>
+  <symbol minX="1932" maxX="1960" minY="523" maxY="551" name="museum-s"/>
+  <symbol minX="1960" maxX="1988" minY="523" maxY="551" name="waterfall-s"/>
+  <symbol minX="1988" maxX="2016" minY="523" maxY="551" name="bowls-s"/>
+  <symbol minX="2016" maxX="2044" minY="523" maxY="551" name="buddhist-s"/>
+  <symbol minX="0" maxX="28" minY="551" maxY="579" name="waste-basket-s"/>
   <symbol minX="28" maxX="56" minY="551" maxY="579" name="drinking-water-s"/>
-  <symbol minX="56" maxX="84" minY="551" maxY="579" name="waterfall-s"/>
+  <symbol minX="56" maxX="84" minY="551" maxY="579" name="airport-s"/>
   <symbol minX="84" maxX="112" minY="551" maxY="579" name="sweets-s"/>
-  <symbol minX="112" maxX="140" minY="551" maxY="579" name="bowls-s"/>
+  <symbol minX="112" maxX="140" minY="551" maxY="579" name="phone-s"/>
   <symbol minX="140" maxX="168" minY="551" maxY="579" name="doityourself-s"/>
   <symbol minX="168" maxX="196" minY="551" maxY="579" name="swimming-s"/>
   <symbol minX="196" maxX="224" minY="551" maxY="579" name="dog_park-s"/>
@@ -548,9 +548,9 @@
   <symbol minX="308" maxX="336" minY="551" maxY="579" name="dentist-s"/>
   <symbol minX="336" maxX="364" minY="551" maxY="579" name="taxi-s"/>
   <symbol minX="364" maxX="392" minY="551" maxY="579" name="curling-s"/>
-  <symbol minX="392" maxX="420" minY="551" maxY="579" name="buddhist-s"/>
+  <symbol minX="392" maxX="420" minY="551" maxY="579" name="australian-football-s"/>
   <symbol minX="420" maxX="448" minY="551" maxY="579" name="tennis-s"/>
-  <symbol minX="448" maxX="476" minY="551" maxY="579" name="waste-basket-s"/>
+  <symbol minX="448" maxX="476" minY="551" maxY="579" name="alcohol-s"/>
   <symbol minX="476" maxX="504" minY="551" maxY="579" name="bus-s"/>
   <symbol minX="504" maxX="532" minY="551" maxY="579" name="theatre-s"/>
   <symbol minX="532" maxX="560" minY="551" maxY="579" name="cricket-s"/>
@@ -563,10 +563,10 @@
   <symbol minX="728" maxX="756" minY="551" maxY="579" name="clothes-s"/>
   <symbol minX="756" maxX="784" minY="551" maxY="579" name="toilets-s"/>
   <symbol minX="784" maxX="812" minY="551" maxY="579" name="climbing-s"/>
-  <symbol minX="812" maxX="840" minY="551" maxY="579" name="butcher-s"/>
+  <symbol minX="812" maxX="840" minY="551" maxY="579" name="bakery-s"/>
   <symbol minX="840" maxX="868" minY="551" maxY="579" name="toll_booth-s"/>
-  <symbol minX="868" maxX="896" minY="551" maxY="579" name="petshop-s"/>
-  <symbol minX="896" maxX="924" minY="551" maxY="579" name="park-s"/>
+  <symbol minX="868" maxX="896" minY="551" maxY="579" name="bank-s"/>
+  <symbol minX="896" maxX="924" minY="551" maxY="579" name="alpine_hut-s"/>
   <symbol minX="924" maxX="952" minY="551" maxY="579" name="cinema-s"/>
   <symbol minX="952" maxX="980" minY="551" maxY="579" name="tomb-s"/>
   <symbol minX="980" maxX="1008" minY="551" maxY="579" name="christian-s"/>
@@ -576,10 +576,10 @@
   <symbol minX="1092" maxX="1120" minY="551" maxY="579" name="charging-station-s"/>
   <symbol minX="1120" maxX="1148" minY="551" maxY="579" name="toys-s"/>
   <symbol minX="1148" maxX="1176" minY="551" maxY="579" name="cemetery-s"/>
-  <symbol minX="1176" maxX="1204" minY="551" maxY="579" name="outdoor-shop-s"/>
+  <symbol minX="1176" maxX="1204" minY="551" maxY="579" name="picnic-s"/>
   <symbol minX="1204" maxX="1232" minY="551" maxY="579" name="train-s"/>
-  <symbol minX="1232" maxX="1260" minY="551" maxY="579" name="cable-car-s"/>
-  <symbol minX="1260" maxX="1288" minY="551" maxY="579" name="pharmacy-s"/>
+  <symbol minX="1232" maxX="1260" minY="551" maxY="579" name="butcher-s"/>
+  <symbol minX="1260" maxX="1288" minY="551" maxY="579" name="muslim-s"/>
   <symbol minX="1288" maxX="1316" minY="551" maxY="579" name="casino-s"/>
   <symbol minX="1316" maxX="1344" minY="551" maxY="579" name="tram-s"/>
   <symbol minX="1344" maxX="1372" minY="551" maxY="579" name="caravan_site-s"/>
@@ -594,52 +594,53 @@
   <symbol minX="1596" maxX="1624" minY="551" maxY="579" name="campsite-s"/>
   <symbol minX="1624" maxX="1652" minY="551" maxY="579" name="cafe-s"/>
   <symbol minX="1652" maxX="1680" minY="551" maxY="579" name="viewpoint-s"/>
-  <symbol minX="1680" maxX="1707" minY="551" maxY="578" name="lightrail-berlin-s"/>
-  <symbol minX="1707" maxX="1743" minY="551" maxY="578" name="subway-madrid-s"/>
-  <symbol minX="1743" maxX="1782" minY="551" maxY="578" name="subway-kiev-l"/>
-  <symbol minX="1782" maxX="1809" minY="551" maxY="578" name="peakt-l"/>
-  <symbol minX="1809" maxX="1836" minY="551" maxY="578" name="subway-paris-s"/>
-  <symbol minX="1836" maxX="1875" minY="551" maxY="578" name="subway-kiev-m"/>
-  <symbol minX="1875" maxX="1915" minY="551" maxY="577" name="railway-crossing-xl"/>
-  <symbol minX="1915" maxX="1940" minY="551" maxY="576" name="subway-moscow-s"/>
-  <symbol minX="1940" maxX="1970" minY="551" maxY="575" name="subway-london-s"/>
-  <symbol minX="1970" maxX="1994" minY="551" maxY="575" name="subway-berlin-s"/>
-  <symbol minX="1994" maxX="2021" minY="551" maxY="575" name="bench"/>
-  <symbol minX="2021" maxX="2045" minY="551" maxY="575" name="subway-rome-s"/>
-  <symbol minX="0" maxX="22" minY="579" maxY="601" name="bike-parking-s"/>
-  <symbol minX="22" maxX="44" minY="579" maxY="601" name="subway-xs"/>
-  <symbol minX="44" maxX="66" minY="579" maxY="601" name="train-xs"/>
-  <symbol minX="66" maxX="105" minY="579" maxY="601" name="subway-minsk-l"/>
-  <symbol minX="105" maxX="127" minY="579" maxY="601" name="survey_point-l"/>
-  <symbol minX="127" maxX="149" minY="579" maxY="601" name="parking_pay-s"/>
-  <symbol minX="149" maxX="171" minY="579" maxY="601" name="subway-newyork-xs"/>
-  <symbol minX="171" maxX="193" minY="579" maxY="601" name="parking-s"/>
-  <symbol minX="193" maxX="227" minY="579" maxY="601" name="railway-crossing-l"/>
-  <symbol minX="227" maxX="249" minY="579" maxY="601" name="star-l"/>
-  <symbol minX="249" maxX="271" minY="579" maxY="601" name="speedcam-s"/>
-  <symbol minX="271" maxX="304" minY="579" maxY="600" name="subway-kiev-s"/>
-  <symbol minX="304" maxX="325" minY="579" maxY="600" name="star-m"/>
-  <symbol minX="325" maxX="355" minY="579" maxY="598" name="railway-crossing"/>
-  <symbol minX="355" maxX="388" minY="579" maxY="598" name="subway-minsk-m"/>
-  <symbol minX="388" maxX="409" minY="579" maxY="598" name="peakt-m"/>
-  <symbol minX="409" maxX="428" minY="579" maxY="598" name="survey_point-m"/>
-  <symbol minX="428" maxX="458" minY="579" maxY="597" name="subway-minsk-s"/>
-  <symbol minX="458" maxX="476" minY="579" maxY="597" name="crossing-l"/>
-  <symbol minX="476" maxX="494" minY="579" maxY="597" name="star-s"/>
-  <symbol minX="494" maxX="510" minY="579" maxY="595" name="survey_point-s"/>
-  <symbol minX="510" maxX="546" minY="579" maxY="595" name="arrow-m"/>
-  <symbol minX="546" maxX="564" minY="579" maxY="595" name="peakt-s"/>
-  <symbol minX="564" maxX="579" minY="579" maxY="594" name="entrance-s"/>
-  <symbol minX="579" maxX="594" minY="579" maxY="594" name="crossing-m"/>
-  <symbol minX="594" maxX="609" minY="579" maxY="594" name="zero-icon"/>
-  <symbol minX="609" maxX="621" minY="579" maxY="591" name="cities-m"/>
-  <symbol minX="621" maxX="633" minY="579" maxY="591" name="dot-m"/>
-  <symbol minX="633" maxX="645" minY="579" maxY="591" name="crossing-s"/>
-  <symbol minX="645" maxX="672" minY="579" maxY="591" name="arrow-s"/>
-  <symbol minX="672" maxX="682" minY="579" maxY="589" name="entrance-xs"/>
-  <symbol minX="682" maxX="691" minY="579" maxY="588" name="cities-xs"/>
-  <symbol minX="691" maxX="700" minY="579" maxY="588" name="cities-s"/>
-  <symbol minX="700" maxX="718" minY="579" maxY="588" name="arrow-xs"/>
-  <symbol minX="718" maxX="727" minY="579" maxY="588" name="dot-s"/>
+  <symbol minX="1680" maxX="1708" minY="551" maxY="579" name="cable-car-s"/>
+  <symbol minX="1708" maxX="1747" minY="551" maxY="578" name="subway-kiev-l"/>
+  <symbol minX="1747" maxX="1774" minY="551" maxY="578" name="lightrail-berlin-s"/>
+  <symbol minX="1774" maxX="1813" minY="551" maxY="578" name="subway-kiev-m"/>
+  <symbol minX="1813" maxX="1840" minY="551" maxY="578" name="subway-paris-s"/>
+  <symbol minX="1840" maxX="1876" minY="551" maxY="578" name="subway-madrid-s"/>
+  <symbol minX="1876" maxX="1903" minY="551" maxY="578" name="peakt-l"/>
+  <symbol minX="1903" maxX="1943" minY="551" maxY="577" name="railway-crossing-xl"/>
+  <symbol minX="1943" maxX="1968" minY="551" maxY="576" name="subway-moscow-s"/>
+  <symbol minX="1968" maxX="1995" minY="551" maxY="575" name="bench"/>
+  <symbol minX="1995" maxX="2019" minY="551" maxY="575" name="subway-rome-s"/>
+  <symbol minX="0" maxX="30" minY="579" maxY="603" name="subway-london-s"/>
+  <symbol minX="30" maxX="54" minY="579" maxY="603" name="subway-berlin-s"/>
+  <symbol minX="54" maxX="88" minY="579" maxY="601" name="railway-crossing-l"/>
+  <symbol minX="88" maxX="110" minY="579" maxY="601" name="parking_pay-s"/>
+  <symbol minX="110" maxX="132" minY="579" maxY="601" name="bike-parking-s"/>
+  <symbol minX="132" maxX="154" minY="579" maxY="601" name="parking-s"/>
+  <symbol minX="154" maxX="176" minY="579" maxY="601" name="subway-xs"/>
+  <symbol minX="176" maxX="198" minY="579" maxY="601" name="survey_point-l"/>
+  <symbol minX="198" maxX="237" minY="579" maxY="601" name="subway-minsk-l"/>
+  <symbol minX="237" maxX="259" minY="579" maxY="601" name="subway-newyork-xs"/>
+  <symbol minX="259" maxX="281" minY="579" maxY="601" name="star-l"/>
+  <symbol minX="281" maxX="303" minY="579" maxY="601" name="speedcam-s"/>
+  <symbol minX="303" maxX="325" minY="579" maxY="601" name="train-xs"/>
+  <symbol minX="325" maxX="358" minY="579" maxY="600" name="subway-kiev-s"/>
+  <symbol minX="358" maxX="379" minY="579" maxY="600" name="star-m"/>
+  <symbol minX="379" maxX="400" minY="579" maxY="598" name="peakt-m"/>
+  <symbol minX="400" maxX="433" minY="579" maxY="598" name="subway-minsk-m"/>
+  <symbol minX="433" maxX="463" minY="579" maxY="598" name="railway-crossing"/>
+  <symbol minX="463" maxX="482" minY="579" maxY="598" name="survey_point-m"/>
+  <symbol minX="482" maxX="500" minY="579" maxY="597" name="star-s"/>
+  <symbol minX="500" maxX="530" minY="579" maxY="597" name="subway-minsk-s"/>
+  <symbol minX="530" maxX="548" minY="579" maxY="597" name="crossing-l"/>
+  <symbol minX="548" maxX="584" minY="579" maxY="595" name="arrow-m"/>
+  <symbol minX="584" maxX="602" minY="579" maxY="595" name="peakt-s"/>
+  <symbol minX="602" maxX="618" minY="579" maxY="595" name="survey_point-s"/>
+  <symbol minX="618" maxX="633" minY="579" maxY="594" name="entrance-s"/>
+  <symbol minX="633" maxX="648" minY="579" maxY="594" name="crossing-m"/>
+  <symbol minX="648" maxX="663" minY="579" maxY="594" name="zero-icon"/>
+  <symbol minX="663" maxX="675" minY="579" maxY="591" name="cities-m"/>
+  <symbol minX="675" maxX="687" minY="579" maxY="591" name="crossing-s"/>
+  <symbol minX="687" maxX="714" minY="579" maxY="591" name="arrow-s"/>
+  <symbol minX="714" maxX="726" minY="579" maxY="591" name="dot-m"/>
+  <symbol minX="726" maxX="736" minY="579" maxY="589" name="entrance-xs"/>
+  <symbol minX="736" maxX="754" minY="579" maxY="588" name="arrow-xs"/>
+  <symbol minX="754" maxX="763" minY="579" maxY="588" name="cities-xs"/>
+  <symbol minX="763" maxX="772" minY="579" maxY="588" name="cities-s"/>
+  <symbol minX="772" maxX="781" minY="579" maxY="588" name="dot-s"/>
  </file>
 </root>
diff --git a/data/resources-xhdpi_dark/symbols-ad.png b/data/resources-xhdpi_dark/symbols-ad.png
index 08f974a1e2..01ad02af46 100644
Binary files a/data/resources-xhdpi_dark/symbols-ad.png and b/data/resources-xhdpi_dark/symbols-ad.png differ
diff --git a/data/resources-xhdpi_dark/symbols.png b/data/resources-xhdpi_dark/symbols.png
index 830d85be00..a52330b0b9 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 5e7e4997af..6d48541e4e 100644
--- a/data/resources-xhdpi_dark/symbols.sdf
+++ b/data/resources-xhdpi_dark/symbols.sdf
@@ -321,8 +321,8 @@
   <symbol minX="920" maxX="960" minY="404" maxY="444" name="kiosk-l"/>
   <symbol minX="960" maxX="1000" minY="404" maxY="444" name="kiosk-m"/>
   <symbol minX="1000" maxX="1040" minY="404" maxY="444" name="remains-m"/>
-  <symbol minX="1040" maxX="1080" minY="404" maxY="444" name="remains-l"/>
-  <symbol minX="1080" maxX="1120" minY="404" maxY="444" name="laundry-m"/>
+  <symbol minX="1040" maxX="1080" minY="404" maxY="444" name="laundry-l"/>
+  <symbol minX="1080" maxX="1120" minY="404" maxY="444" name="remains-l"/>
   <symbol minX="1120" maxX="1160" minY="404" maxY="444" name="recycling-m"/>
   <symbol minX="1160" maxX="1200" minY="404" maxY="444" name="lawyer-l"/>
   <symbol minX="1200" maxX="1240" minY="404" maxY="444" name="lawyer-m"/>
@@ -335,7 +335,7 @@
   <symbol minX="1480" maxX="1520" minY="404" maxY="444" name="public-building-l"/>
   <symbol minX="1520" maxX="1560" minY="404" maxY="444" name="lighthouse-l"/>
   <symbol minX="1560" maxX="1600" minY="404" maxY="444" name="lighthouse-m"/>
-  <symbol minX="1600" maxX="1640" minY="404" maxY="444" name="laundry-l"/>
+  <symbol minX="1600" maxX="1640" minY="404" maxY="444" name="laundry-m"/>
   <symbol minX="1640" maxX="1680" minY="404" maxY="444" name="lightrail-berlin-l"/>
   <symbol minX="1680" maxX="1720" minY="404" maxY="444" name="power-m"/>
   <symbol minX="1720" maxX="1760" minY="404" maxY="444" name="power-l"/>
@@ -396,71 +396,71 @@
   <symbol minX="1880" maxX="1920" minY="444" maxY="484" name="parking-xl"/>
   <symbol minX="1920" maxX="1960" minY="444" maxY="484" name="parking_pay-l"/>
   <symbol minX="1960" maxX="2000" minY="444" maxY="484" name="petshop-l"/>
-  <symbol minX="2000" maxX="2039" minY="444" maxY="483" name="cave-m"/>
-  <symbol minX="0" maxX="39" minY="484" maxY="523" name="volcano-m"/>
+  <symbol minX="2000" maxX="2039" minY="444" maxY="483" name="atm-tinkoff-gerb-m"/>
+  <symbol minX="0" maxX="39" minY="484" maxY="523" name="subway-spb-m"/>
   <symbol minX="39" maxX="78" minY="484" maxY="523" name="atm-tinkoff-shield-m"/>
-  <symbol minX="78" maxX="117" minY="484" maxY="523" name="atm-tinkoff-gerb-m"/>
-  <symbol minX="117" maxX="156" minY="484" maxY="523" name="subway-spb-m"/>
+  <symbol minX="78" maxX="117" minY="484" maxY="523" name="volcano-m"/>
+  <symbol minX="117" maxX="156" minY="484" maxY="523" name="cave-m"/>
   <symbol minX="156" maxX="193" minY="484" maxY="521" name="subway-entrance-m"/>
   <symbol minX="193" maxX="233" minY="484" maxY="521" name="speedcam1-xl"/>
-  <symbol minX="233" maxX="273" minY="484" maxY="520" name="subway-moscow-l"/>
-  <symbol minX="273" maxX="309" minY="484" maxY="520" name="subway-rome-l"/>
-  <symbol minX="309" maxX="345" minY="484" maxY="520" name="lightrail-berlin-m"/>
-  <symbol minX="345" maxX="381" minY="484" maxY="520" name="subway-berlin-l"/>
-  <symbol minX="381" maxX="415" minY="484" maxY="518" name="speedcam-m"/>
-  <symbol minX="415" maxX="449" minY="484" maxY="518" name="parking_pay-m"/>
-  <symbol minX="449" maxX="483" minY="484" maxY="518" name="search-result"/>
-  <symbol minX="483" maxX="517" minY="484" maxY="518" name="bike-parking-m"/>
+  <symbol minX="233" maxX="269" minY="484" maxY="520" name="subway-berlin-l"/>
+  <symbol minX="269" maxX="309" minY="484" maxY="520" name="subway-moscow-l"/>
+  <symbol minX="309" maxX="345" minY="484" maxY="520" name="subway-rome-l"/>
+  <symbol minX="345" maxX="381" minY="484" maxY="520" name="lightrail-berlin-m"/>
+  <symbol minX="381" maxX="415" minY="484" maxY="518" name="non-found-search-result"/>
+  <symbol minX="415" maxX="449" minY="484" maxY="518" name="bike-parking-m"/>
+  <symbol minX="449" maxX="483" minY="484" maxY="518" name="parking_pay-m"/>
+  <symbol minX="483" maxX="517" minY="484" maxY="518" name="search-result"/>
   <symbol minX="517" maxX="551" minY="484" maxY="518" name="parking-m"/>
-  <symbol minX="551" maxX="588" minY="484" maxY="517" name="subway-moscow-m"/>
-  <symbol minX="588" maxX="621" minY="484" maxY="517" name="subway-paris-m"/>
-  <symbol minX="621" maxX="654" minY="484" maxY="517" name="subway-berlin-m"/>
-  <symbol minX="654" maxX="687" minY="484" maxY="517" name="subway-rome-m"/>
-  <symbol minX="687" maxX="719" minY="484" maxY="516" name="api-result"/>
-  <symbol minX="719" maxX="759" minY="484" maxY="516" name="subway-london-l"/>
-  <symbol minX="759" maxX="798" minY="484" maxY="514" name="subway-london-m"/>
-  <symbol minX="798" maxX="828" minY="484" maxY="514" name="volcano-s"/>
-  <symbol minX="828" maxX="858" minY="484" maxY="514" name="subway-spb-s"/>
-  <symbol minX="858" maxX="894" minY="484" maxY="514" name="subway-barcelona-s"/>
-  <symbol minX="894" maxX="924" minY="484" maxY="514" name="atm-tinkoff-gerb-s"/>
-  <symbol minX="924" maxX="954" minY="484" maxY="514" name="atm-tinkoff-shield-s"/>
-  <symbol minX="954" maxX="984" minY="484" maxY="514" name="cave-s"/>
-  <symbol minX="984" maxX="1024" minY="484" maxY="513" name="subway-madrid-l"/>
-  <symbol minX="1024" maxX="1064" minY="484" maxY="513" name="subway-barcelona-l"/>
-  <symbol minX="1064" maxX="1104" minY="484" maxY="513" name="subway-barcelona-m"/>
-  <symbol minX="1104" maxX="1144" minY="484" maxY="513" name="subway-madrid-m"/>
-  <symbol minX="1144" maxX="1172" minY="484" maxY="512" name="wayside_shrine-s"/>
-  <symbol minX="1172" maxX="1200" minY="484" maxY="512" name="power-s"/>
-  <symbol minX="1200" maxX="1228" minY="484" maxY="512" name="lift_gate-s"/>
-  <symbol minX="1228" maxX="1256" minY="484" maxY="512" name="library-s"/>
-  <symbol minX="1256" maxX="1284" minY="484" maxY="512" name="public-building-s"/>
-  <symbol minX="1284" maxX="1312" minY="484" maxY="512" name="australian-football-s"/>
-  <symbol minX="1312" maxX="1340" minY="484" maxY="512" name="book-shop-s"/>
-  <symbol minX="1340" maxX="1368" minY="484" maxY="512" name="alcohol-s"/>
-  <symbol minX="1368" maxX="1396" minY="484" maxY="512" name="lawyer-s"/>
-  <symbol minX="1396" maxX="1424" minY="484" maxY="512" name="laundry-s"/>
-  <symbol minX="1424" maxX="1452" minY="484" maxY="512" name="recycling-s"/>
-  <symbol minX="1452" maxX="1480" minY="484" maxY="512" name="postbox-s"/>
-  <symbol minX="1480" maxX="1508" minY="484" maxY="512" name="kiosk-s"/>
-  <symbol minX="1508" maxX="1536" minY="484" maxY="512" name="remains-s"/>
-  <symbol minX="1536" maxX="1564" minY="484" maxY="512" name="kindergarten-s"/>
-  <symbol minX="1564" maxX="1592" minY="484" maxY="512" name="jewish-s"/>
-  <symbol minX="1592" maxX="1620" minY="484" maxY="512" name="restaurant-s"/>
-  <symbol minX="1620" maxX="1648" minY="484" maxY="512" name="jewelry-s"/>
-  <symbol minX="1648" maxX="1676" minY="484" maxY="512" name="information-s"/>
-  <symbol minX="1676" maxX="1704" minY="484" maxY="512" name="hunting-tower-s"/>
-  <symbol minX="1704" maxX="1732" minY="484" maxY="512" name="sauna-s"/>
-  <symbol minX="1732" maxX="1760" minY="484" maxY="512" name="hotel-s"/>
-  <symbol minX="1760" maxX="1788" minY="484" maxY="512" name="hostel-s"/>
-  <symbol minX="1788" maxX="1816" minY="484" maxY="512" name="school-s"/>
-  <symbol minX="1816" maxX="1844" minY="484" maxY="512" name="hospital-s"/>
-  <symbol minX="1844" maxX="1872" minY="484" maxY="512" name="historic-ship-s"/>
-  <symbol minX="1872" maxX="1900" minY="484" maxY="512" name="seafood-shop-s"/>
-  <symbol minX="1900" maxX="1928" minY="484" maxY="512" name="hindu-s"/>
-  <symbol minX="1928" maxX="1956" minY="484" maxY="512" name="heliport-s"/>
-  <symbol minX="1956" maxX="1984" minY="484" maxY="512" name="shinto-s"/>
-  <symbol minX="1984" maxX="2012" minY="484" maxY="512" name="helipad-s"/>
-  <symbol minX="2012" maxX="2040" minY="484" maxY="512" name="hardware-s"/>
+  <symbol minX="551" maxX="585" minY="484" maxY="518" name="speedcam-m"/>
+  <symbol minX="585" maxX="622" minY="484" maxY="517" name="subway-moscow-m"/>
+  <symbol minX="622" maxX="655" minY="484" maxY="517" name="subway-paris-m"/>
+  <symbol minX="655" maxX="688" minY="484" maxY="517" name="subway-rome-m"/>
+  <symbol minX="688" maxX="721" minY="484" maxY="517" name="subway-berlin-m"/>
+  <symbol minX="721" maxX="753" minY="484" maxY="516" name="api-result"/>
+  <symbol minX="753" maxX="793" minY="484" maxY="516" name="subway-london-l"/>
+  <symbol minX="793" maxX="823" minY="484" maxY="514" name="subway-spb-s"/>
+  <symbol minX="823" maxX="862" minY="484" maxY="514" name="subway-london-m"/>
+  <symbol minX="862" maxX="892" minY="484" maxY="514" name="atm-tinkoff-gerb-s"/>
+  <symbol minX="892" maxX="928" minY="484" maxY="514" name="subway-barcelona-s"/>
+  <symbol minX="928" maxX="958" minY="484" maxY="514" name="cave-s"/>
+  <symbol minX="958" maxX="988" minY="484" maxY="514" name="volcano-s"/>
+  <symbol minX="988" maxX="1018" minY="484" maxY="514" name="atm-tinkoff-shield-s"/>
+  <symbol minX="1018" maxX="1058" minY="484" maxY="513" name="subway-barcelona-l"/>
+  <symbol minX="1058" maxX="1098" minY="484" maxY="513" name="subway-barcelona-m"/>
+  <symbol minX="1098" maxX="1138" minY="484" maxY="513" name="subway-madrid-l"/>
+  <symbol minX="1138" maxX="1178" minY="484" maxY="513" name="subway-madrid-m"/>
+  <symbol minX="1178" maxX="1206" minY="484" maxY="512" name="power-s"/>
+  <symbol minX="1206" maxX="1234" minY="484" maxY="512" name="lift_gate-s"/>
+  <symbol minX="1234" maxX="1262" minY="484" maxY="512" name="library-s"/>
+  <symbol minX="1262" maxX="1290" minY="484" maxY="512" name="public-building-s"/>
+  <symbol minX="1290" maxX="1318" minY="484" maxY="512" name="australian-football-s"/>
+  <symbol minX="1318" maxX="1346" minY="484" maxY="512" name="wayside_shrine-s"/>
+  <symbol minX="1346" maxX="1374" minY="484" maxY="512" name="alcohol-s"/>
+  <symbol minX="1374" maxX="1402" minY="484" maxY="512" name="lawyer-s"/>
+  <symbol minX="1402" maxX="1430" minY="484" maxY="512" name="laundry-s"/>
+  <symbol minX="1430" maxX="1458" minY="484" maxY="512" name="recycling-s"/>
+  <symbol minX="1458" maxX="1486" minY="484" maxY="512" name="book-shop-s"/>
+  <symbol minX="1486" maxX="1514" minY="484" maxY="512" name="kiosk-s"/>
+  <symbol minX="1514" maxX="1542" minY="484" maxY="512" name="remains-s"/>
+  <symbol minX="1542" maxX="1570" minY="484" maxY="512" name="kindergarten-s"/>
+  <symbol minX="1570" maxX="1598" minY="484" maxY="512" name="jewish-s"/>
+  <symbol minX="1598" maxX="1626" minY="484" maxY="512" name="restaurant-s"/>
+  <symbol minX="1626" maxX="1654" minY="484" maxY="512" name="jewelry-s"/>
+  <symbol minX="1654" maxX="1682" minY="484" maxY="512" name="information-s"/>
+  <symbol minX="1682" maxX="1710" minY="484" maxY="512" name="hunting-tower-s"/>
+  <symbol minX="1710" maxX="1738" minY="484" maxY="512" name="sauna-s"/>
+  <symbol minX="1738" maxX="1766" minY="484" maxY="512" name="hotel-s"/>
+  <symbol minX="1766" maxX="1794" minY="484" maxY="512" name="hostel-s"/>
+  <symbol minX="1794" maxX="1822" minY="484" maxY="512" name="school-s"/>
+  <symbol minX="1822" maxX="1850" minY="484" maxY="512" name="hospital-s"/>
+  <symbol minX="1850" maxX="1878" minY="484" maxY="512" name="historic-ship-s"/>
+  <symbol minX="1878" maxX="1906" minY="484" maxY="512" name="seafood-shop-s"/>
+  <symbol minX="1906" maxX="1934" minY="484" maxY="512" name="hindu-s"/>
+  <symbol minX="1934" maxX="1962" minY="484" maxY="512" name="heliport-s"/>
+  <symbol minX="1962" maxX="1990" minY="484" maxY="512" name="shinto-s"/>
+  <symbol minX="1990" maxX="2018" minY="484" maxY="512" name="helipad-s"/>
+  <symbol minX="2018" maxX="2046" minY="484" maxY="512" name="hardware-s"/>
   <symbol minX="0" maxX="28" minY="523" maxY="551" name="ship-s"/>
   <symbol minX="28" maxX="56" minY="523" maxY="551" name="hand-s"/>
   <symbol minX="56" maxX="84" minY="523" maxY="551" name="hairdresser-s"/>
@@ -479,10 +479,10 @@
   <symbol minX="420" maxX="448" minY="523" maxY="551" name="gallery-s"/>
   <symbol minX="448" maxX="476" minY="523" maxY="551" name="soccer-s"/>
   <symbol minX="476" maxX="504" minY="523" maxY="551" name="furniture-s"/>
-  <symbol minX="504" maxX="532" minY="523" maxY="551" name="mail-s"/>
+  <symbol minX="504" maxX="532" minY="523" maxY="551" name="postbox-s"/>
   <symbol minX="532" maxX="560" minY="523" maxY="551" name="bakery-s"/>
   <symbol minX="560" maxX="588" minY="523" maxY="551" name="funicular-s"/>
-  <symbol minX="588" maxX="616" minY="523" maxY="551" name="marketplace-s"/>
+  <symbol minX="588" maxX="616" minY="523" maxY="551" name="mail-s"/>
   <symbol minX="616" maxX="644" minY="523" maxY="551" name="fuel-s"/>
   <symbol minX="644" maxX="672" minY="523" maxY="551" name="fountain-s"/>
   <symbol minX="672" maxX="700" minY="523" maxY="551" name="sports-s"/>
@@ -491,55 +491,55 @@
   <symbol minX="756" maxX="784" minY="523" maxY="551" name="stadium-s"/>
   <symbol minX="784" maxX="812" minY="523" maxY="551" name="bank-s"/>
   <symbol minX="812" maxX="840" minY="523" maxY="551" name="alpine_hut-s"/>
-  <symbol minX="840" maxX="868" minY="523" maxY="551" name="police-s"/>
-  <symbol minX="868" maxX="896" minY="523" maxY="551" name="military-s"/>
-  <symbol minX="896" maxX="924" minY="523" maxY="551" name="mobile_phone-s"/>
-  <symbol minX="924" maxX="952" minY="523" maxY="551" name="monument-s"/>
-  <symbol minX="952" maxX="980" minY="523" maxY="551" name="place-of-worship-s"/>
-  <symbol minX="980" maxX="1008" minY="523" maxY="551" name="motel-s"/>
+  <symbol minX="840" maxX="868" minY="523" maxY="551" name="marketplace-s"/>
+  <symbol minX="868" maxX="896" minY="523" maxY="551" name="police-s"/>
+  <symbol minX="896" maxX="924" minY="523" maxY="551" name="military-s"/>
+  <symbol minX="924" maxX="952" minY="523" maxY="551" name="mobile_phone-s"/>
+  <symbol minX="952" maxX="980" minY="523" maxY="551" name="monument-s"/>
+  <symbol minX="980" maxX="1008" minY="523" maxY="551" name="place-of-worship-s"/>
   <symbol minX="1008" maxX="1036" minY="523" maxY="551" name="bookmaker-s"/>
   <symbol minX="1036" maxX="1064" minY="523" maxY="551" name="fire_station-s"/>
-  <symbol minX="1064" maxX="1092" minY="523" maxY="551" name="motorcycle_shop-s"/>
+  <symbol minX="1064" maxX="1092" minY="523" maxY="551" name="motel-s"/>
   <symbol minX="1092" maxX="1120" minY="523" maxY="551" name="subway-entrance-s"/>
   <symbol minX="1120" maxX="1148" minY="523" maxY="551" name="waterfall-s"/>
-  <symbol minX="1148" maxX="1176" minY="523" maxY="551" name="bowls-s"/>
+  <symbol minX="1148" maxX="1176" minY="523" maxY="551" name="lighthouse-s"/>
   <symbol minX="1176" maxX="1204" minY="523" maxY="551" name="banknote-s"/>
   <symbol minX="1204" maxX="1232" minY="523" maxY="551" name="fastfood-s"/>
-  <symbol minX="1232" maxX="1260" minY="523" maxY="551" name="pitch-s"/>
-  <symbol minX="1260" maxX="1288" minY="523" maxY="551" name="museum-s"/>
-  <symbol minX="1288" maxX="1316" minY="523" maxY="551" name="buddhist-s"/>
+  <symbol minX="1232" maxX="1260" minY="523" maxY="551" name="motorcycle_shop-s"/>
+  <symbol minX="1260" maxX="1288" minY="523" maxY="551" name="pitch-s"/>
+  <symbol minX="1288" maxX="1316" minY="523" maxY="551" name="bowls-s"/>
   <symbol minX="1316" maxX="1344" minY="523" maxY="551" name="equestrian-s"/>
-  <symbol minX="1344" maxX="1372" minY="523" maxY="551" name="muslim-s"/>
-  <symbol minX="1372" maxX="1400" minY="523" maxY="551" name="picnic-s"/>
-  <symbol minX="1400" maxX="1428" minY="523" maxY="551" name="waste-basket-s"/>
+  <symbol minX="1344" maxX="1372" minY="523" maxY="551" name="museum-s"/>
+  <symbol minX="1372" maxX="1400" minY="523" maxY="551" name="muslim-s"/>
+  <symbol minX="1400" maxX="1428" minY="523" maxY="551" name="buddhist-s"/>
   <symbol minX="1428" maxX="1456" minY="523" maxY="551" name="bar-s"/>
   <symbol minX="1456" maxX="1484" minY="523" maxY="551" name="america-football-s"/>
   <symbol minX="1484" maxX="1512" minY="523" maxY="551" name="baseball-s"/>
-  <symbol minX="1512" maxX="1540" minY="523" maxY="551" name="npark-s"/>
-  <symbol minX="1540" maxX="1568" minY="523" maxY="551" name="nparkf-s"/>
-  <symbol minX="1568" maxX="1596" minY="523" maxY="551" name="bus-s"/>
+  <symbol minX="1512" maxX="1540" minY="523" maxY="551" name="picnic-s"/>
+  <symbol minX="1540" maxX="1568" minY="523" maxY="551" name="npark-s"/>
+  <symbol minX="1568" maxX="1596" minY="523" maxY="551" name="waste-basket-s"/>
   <symbol minX="1596" maxX="1624" minY="523" maxY="551" name="basketball-s"/>
   <symbol minX="1624" maxX="1652" minY="523" maxY="551" name="apartment-s"/>
   <symbol minX="1652" maxX="1680" minY="523" maxY="551" name="subway-newyork-s"/>
   <symbol minX="1680" maxX="1708" minY="523" maxY="551" name="bbq-s"/>
   <symbol minX="1708" maxX="1736" minY="523" maxY="551" name="embassy-s"/>
-  <symbol minX="1736" maxX="1764" minY="523" maxY="551" name="photo-shop-s"/>
-  <symbol minX="1764" maxX="1792" minY="523" maxY="551" name="butcher-s"/>
-  <symbol minX="1792" maxX="1820" minY="523" maxY="551" name="office-s"/>
-  <symbol minX="1820" maxX="1848" minY="523" maxY="551" name="optician-s"/>
-  <symbol minX="1848" maxX="1876" minY="523" maxY="551" name="lighthouse-s"/>
+  <symbol minX="1736" maxX="1764" minY="523" maxY="551" name="nparkf-s"/>
+  <symbol minX="1764" maxX="1792" minY="523" maxY="551" name="bus-s"/>
+  <symbol minX="1792" maxX="1820" minY="523" maxY="551" name="photo-shop-s"/>
+  <symbol minX="1820" maxX="1848" minY="523" maxY="551" name="office-s"/>
+  <symbol minX="1848" maxX="1876" minY="523" maxY="551" name="butcher-s"/>
   <symbol minX="1876" maxX="1904" minY="523" maxY="551" name="subway-s"/>
   <symbol minX="1904" maxX="1932" minY="523" maxY="551" name="electronics-s"/>
-  <symbol minX="1932" maxX="1960" minY="523" maxY="551" name="phone-s"/>
-  <symbol minX="1960" maxX="1988" minY="523" maxY="551" name="outdoor-shop-s"/>
+  <symbol minX="1932" maxX="1960" minY="523" maxY="551" name="optician-s"/>
+  <symbol minX="1960" maxX="1988" minY="523" maxY="551" name="phone-s"/>
   <symbol minX="1988" maxX="2016" minY="523" maxY="551" name="bcontrol-s"/>
   <symbol minX="2016" maxX="2044" minY="523" maxY="551" name="archery-s"/>
   <symbol minX="0" maxX="28" minY="551" maxY="579" name="beach-s"/>
   <symbol minX="28" maxX="56" minY="551" maxY="579" name="beauty-s"/>
   <symbol minX="56" maxX="84" minY="551" maxY="579" name="drinking-water-s"/>
-  <symbol minX="84" maxX="112" minY="551" maxY="579" name="atm-s"/>
+  <symbol minX="84" maxX="112" minY="551" maxY="579" name="outdoor-shop-s"/>
   <symbol minX="112" maxX="140" minY="551" maxY="579" name="sweets-s"/>
-  <symbol minX="140" maxX="168" minY="551" maxY="579" name="beer-s"/>
+  <symbol minX="140" maxX="168" minY="551" maxY="579" name="atm-s"/>
   <symbol minX="168" maxX="196" minY="551" maxY="579" name="doityourself-s"/>
   <symbol minX="196" maxX="224" minY="551" maxY="579" name="swimming-s"/>
   <symbol minX="224" maxX="252" minY="551" maxY="579" name="dog_park-s"/>
@@ -549,10 +549,10 @@
   <symbol minX="336" maxX="364" minY="551" maxY="579" name="dentist-s"/>
   <symbol minX="364" maxX="392" minY="551" maxY="579" name="taxi-s"/>
   <symbol minX="392" maxX="420" minY="551" maxY="579" name="curling-s"/>
-  <symbol minX="420" maxX="448" minY="551" maxY="579" name="park-s"/>
+  <symbol minX="420" maxX="448" minY="551" maxY="579" name="beer-s"/>
   <symbol minX="448" maxX="476" minY="551" maxY="579" name="tennis-s"/>
-  <symbol minX="476" maxX="504" minY="551" maxY="579" name="pharmacy-s"/>
-  <symbol minX="504" maxX="532" minY="551" maxY="579" name="zoo-s"/>
+  <symbol minX="476" maxX="504" minY="551" maxY="579" name="park-s"/>
+  <symbol minX="504" maxX="532" minY="551" maxY="579" name="pharmacy-s"/>
   <symbol minX="532" maxX="560" minY="551" maxY="579" name="theatre-s"/>
   <symbol minX="560" maxX="588" minY="551" maxY="579" name="cricket-s"/>
   <symbol minX="588" maxX="616" minY="551" maxY="579" name="copyshop-s"/>
@@ -564,10 +564,10 @@
   <symbol minX="756" maxX="784" minY="551" maxY="579" name="clothes-s"/>
   <symbol minX="784" maxX="812" minY="551" maxY="579" name="toilets-s"/>
   <symbol minX="812" maxX="840" minY="551" maxY="579" name="climbing-s"/>
-  <symbol minX="840" maxX="868" minY="551" maxY="579" name="cable-car-s"/>
+  <symbol minX="840" maxX="868" minY="551" maxY="579" name="zoo-s"/>
   <symbol minX="868" maxX="896" minY="551" maxY="579" name="toll_booth-s"/>
-  <symbol minX="896" maxX="924" minY="551" maxY="579" name="bicycle-s"/>
-  <symbol minX="924" maxX="952" minY="551" maxY="579" name="windmill-s"/>
+  <symbol minX="896" maxX="924" minY="551" maxY="579" name="airport-s"/>
+  <symbol minX="924" maxX="952" minY="551" maxY="579" name="bicycle-s"/>
   <symbol minX="952" maxX="980" minY="551" maxY="579" name="cinema-s"/>
   <symbol minX="980" maxX="1008" minY="551" maxY="579" name="tomb-s"/>
   <symbol minX="1008" maxX="1036" minY="551" maxY="579" name="christian-s"/>
@@ -579,8 +579,8 @@
   <symbol minX="1176" maxX="1204" minY="551" maxY="579" name="cemetery-s"/>
   <symbol minX="1204" maxX="1232" minY="551" maxY="579" name="parking-meter-s"/>
   <symbol minX="1232" maxX="1260" minY="551" maxY="579" name="train-s"/>
-  <symbol minX="1260" maxX="1288" minY="551" maxY="579" name="petshop-s"/>
-  <symbol minX="1288" maxX="1316" minY="551" maxY="579" name="airport-s"/>
+  <symbol minX="1260" maxX="1288" minY="551" maxY="579" name="windmill-s"/>
+  <symbol minX="1288" maxX="1316" minY="551" maxY="579" name="petshop-s"/>
   <symbol minX="1316" maxX="1344" minY="551" maxY="579" name="casino-s"/>
   <symbol minX="1344" maxX="1372" minY="551" maxY="579" name="tram-s"/>
   <symbol minX="1372" maxX="1400" minY="551" maxY="579" name="caravan_site-s"/>
@@ -595,52 +595,53 @@
   <symbol minX="1624" maxX="1652" minY="551" maxY="579" name="campsite-s"/>
   <symbol minX="1652" maxX="1680" minY="551" maxY="579" name="cafe-s"/>
   <symbol minX="1680" maxX="1708" minY="551" maxY="579" name="viewpoint-s"/>
-  <symbol minX="1708" maxX="1747" minY="551" maxY="578" name="subway-kiev-l"/>
-  <symbol minX="1747" maxX="1774" minY="551" maxY="578" name="peakt-l"/>
-  <symbol minX="1774" maxX="1814" minY="551" maxY="578" name="railway-crossing-xl"/>
-  <symbol minX="1814" maxX="1841" minY="551" maxY="578" name="subway-paris-s"/>
-  <symbol minX="1841" maxX="1880" minY="551" maxY="578" name="subway-kiev-m"/>
-  <symbol minX="1880" maxX="1916" minY="551" maxY="578" name="subway-madrid-s"/>
-  <symbol minX="1916" maxX="1943" minY="551" maxY="578" name="lightrail-berlin-s"/>
-  <symbol minX="1943" maxX="1968" minY="551" maxY="576" name="subway-moscow-s"/>
-  <symbol minX="1968" maxX="1995" minY="551" maxY="575" name="bench"/>
-  <symbol minX="1995" maxX="2019" minY="551" maxY="575" name="subway-berlin-s"/>
-  <symbol minX="2019" maxX="2043" minY="551" maxY="575" name="subway-rome-s"/>
-  <symbol minX="0" maxX="30" minY="579" maxY="603" name="subway-london-s"/>
-  <symbol minX="30" maxX="52" minY="579" maxY="601" name="bike-parking-s"/>
-  <symbol minX="52" maxX="74" minY="579" maxY="601" name="train-xs"/>
-  <symbol minX="74" maxX="96" minY="579" maxY="601" name="parking-s"/>
-  <symbol minX="96" maxX="130" minY="579" maxY="601" name="railway-crossing-l"/>
-  <symbol minX="130" maxX="152" minY="579" maxY="601" name="speedcam-s"/>
-  <symbol minX="152" maxX="174" minY="579" maxY="601" name="star-l"/>
-  <symbol minX="174" maxX="213" minY="579" maxY="601" name="subway-minsk-l"/>
-  <symbol minX="213" maxX="235" minY="579" maxY="601" name="parking_pay-s"/>
-  <symbol minX="235" maxX="257" minY="579" maxY="601" name="subway-newyork-xs"/>
-  <symbol minX="257" maxX="279" minY="579" maxY="601" name="subway-xs"/>
-  <symbol minX="279" maxX="301" minY="579" maxY="601" name="survey_point-l"/>
-  <symbol minX="301" maxX="322" minY="579" maxY="600" name="star-m"/>
-  <symbol minX="322" maxX="355" minY="579" maxY="600" name="subway-kiev-s"/>
-  <symbol minX="355" maxX="374" minY="579" maxY="598" name="survey_point-m"/>
-  <symbol minX="374" maxX="395" minY="579" maxY="598" name="peakt-m"/>
-  <symbol minX="395" maxX="425" minY="579" maxY="598" name="railway-crossing"/>
-  <symbol minX="425" maxX="458" minY="579" maxY="598" name="subway-minsk-m"/>
-  <symbol minX="458" maxX="476" minY="579" maxY="597" name="star-s"/>
-  <symbol minX="476" maxX="494" minY="579" maxY="597" name="crossing-l"/>
-  <symbol minX="494" maxX="524" minY="579" maxY="597" name="subway-minsk-s"/>
-  <symbol minX="524" maxX="540" minY="579" maxY="595" name="survey_point-s"/>
-  <symbol minX="540" maxX="558" minY="579" maxY="595" name="peakt-s"/>
-  <symbol minX="558" maxX="594" minY="579" maxY="595" name="arrow-m"/>
-  <symbol minX="594" maxX="609" minY="579" maxY="594" name="entrance-s"/>
-  <symbol minX="609" maxX="624" minY="579" maxY="594" name="crossing-m"/>
-  <symbol minX="624" maxX="639" minY="579" maxY="594" name="zero-icon"/>
-  <symbol minX="639" maxX="651" minY="579" maxY="591" name="crossing-s"/>
-  <symbol minX="651" maxX="663" minY="579" maxY="591" name="cities-m"/>
-  <symbol minX="663" maxX="690" minY="579" maxY="591" name="arrow-s"/>
-  <symbol minX="690" maxX="702" minY="579" maxY="591" name="dot-m"/>
-  <symbol minX="702" maxX="712" minY="579" maxY="589" name="entrance-xs"/>
-  <symbol minX="712" maxX="721" minY="579" maxY="588" name="cities-xs"/>
-  <symbol minX="721" maxX="730" minY="579" maxY="588" name="dot-s"/>
-  <symbol minX="730" maxX="748" minY="579" maxY="588" name="arrow-xs"/>
-  <symbol minX="748" maxX="757" minY="579" maxY="588" name="cities-s"/>
+  <symbol minX="1708" maxX="1736" minY="551" maxY="579" name="cable-car-s"/>
+  <symbol minX="1736" maxX="1775" minY="551" maxY="578" name="subway-kiev-m"/>
+  <symbol minX="1775" maxX="1802" minY="551" maxY="578" name="peakt-l"/>
+  <symbol minX="1802" maxX="1842" minY="551" maxY="578" name="railway-crossing-xl"/>
+  <symbol minX="1842" maxX="1869" minY="551" maxY="578" name="subway-paris-s"/>
+  <symbol minX="1869" maxX="1908" minY="551" maxY="578" name="subway-kiev-l"/>
+  <symbol minX="1908" maxX="1944" minY="551" maxY="578" name="subway-madrid-s"/>
+  <symbol minX="1944" maxX="1971" minY="551" maxY="578" name="lightrail-berlin-s"/>
+  <symbol minX="1971" maxX="1996" minY="551" maxY="576" name="subway-moscow-s"/>
+  <symbol minX="1996" maxX="2020" minY="551" maxY="575" name="subway-berlin-s"/>
+  <symbol minX="2020" maxX="2047" minY="551" maxY="575" name="bench"/>
+  <symbol minX="0" maxX="24" minY="579" maxY="603" name="subway-rome-s"/>
+  <symbol minX="24" maxX="54" minY="579" maxY="603" name="subway-london-s"/>
+  <symbol minX="54" maxX="76" minY="579" maxY="601" name="bike-parking-s"/>
+  <symbol minX="76" maxX="98" minY="579" maxY="601" name="train-xs"/>
+  <symbol minX="98" maxX="120" minY="579" maxY="601" name="parking-s"/>
+  <symbol minX="120" maxX="154" minY="579" maxY="601" name="railway-crossing-l"/>
+  <symbol minX="154" maxX="176" minY="579" maxY="601" name="speedcam-s"/>
+  <symbol minX="176" maxX="198" minY="579" maxY="601" name="star-l"/>
+  <symbol minX="198" maxX="237" minY="579" maxY="601" name="subway-minsk-l"/>
+  <symbol minX="237" maxX="259" minY="579" maxY="601" name="parking_pay-s"/>
+  <symbol minX="259" maxX="281" minY="579" maxY="601" name="subway-newyork-xs"/>
+  <symbol minX="281" maxX="303" minY="579" maxY="601" name="subway-xs"/>
+  <symbol minX="303" maxX="325" minY="579" maxY="601" name="survey_point-l"/>
+  <symbol minX="325" maxX="346" minY="579" maxY="600" name="star-m"/>
+  <symbol minX="346" maxX="379" minY="579" maxY="600" name="subway-kiev-s"/>
+  <symbol minX="379" maxX="398" minY="579" maxY="598" name="survey_point-m"/>
+  <symbol minX="398" maxX="419" minY="579" maxY="598" name="peakt-m"/>
+  <symbol minX="419" maxX="449" minY="579" maxY="598" name="railway-crossing"/>
+  <symbol minX="449" maxX="482" minY="579" maxY="598" name="subway-minsk-m"/>
+  <symbol minX="482" maxX="500" minY="579" maxY="597" name="star-s"/>
+  <symbol minX="500" maxX="518" minY="579" maxY="597" name="crossing-l"/>
+  <symbol minX="518" maxX="548" minY="579" maxY="597" name="subway-minsk-s"/>
+  <symbol minX="548" maxX="564" minY="579" maxY="595" name="survey_point-s"/>
+  <symbol minX="564" maxX="582" minY="579" maxY="595" name="peakt-s"/>
+  <symbol minX="582" maxX="618" minY="579" maxY="595" name="arrow-m"/>
+  <symbol minX="618" maxX="633" minY="579" maxY="594" name="entrance-s"/>
+  <symbol minX="633" maxX="648" minY="579" maxY="594" name="crossing-m"/>
+  <symbol minX="648" maxX="663" minY="579" maxY="594" name="zero-icon"/>
+  <symbol minX="663" maxX="675" minY="579" maxY="591" name="crossing-s"/>
+  <symbol minX="675" maxX="687" minY="579" maxY="591" name="dot-m"/>
+  <symbol minX="687" maxX="714" minY="579" maxY="591" name="arrow-s"/>
+  <symbol minX="714" maxX="726" minY="579" maxY="591" name="cities-m"/>
+  <symbol minX="726" maxX="736" minY="579" maxY="589" name="entrance-xs"/>
+  <symbol minX="736" maxX="745" minY="579" maxY="588" name="dot-s"/>
+  <symbol minX="745" maxX="754" minY="579" maxY="588" name="cities-xs"/>
+  <symbol minX="754" maxX="772" minY="579" maxY="588" name="arrow-xs"/>
+  <symbol minX="772" maxX="781" minY="579" maxY="588" name="cities-s"/>
  </file>
 </root>
diff --git a/data/resources-xxhdpi_clear/symbols-ad.png b/data/resources-xxhdpi_clear/symbols-ad.png
index 291bf1e26d..17c2b35e7a 100644
Binary files a/data/resources-xxhdpi_clear/symbols-ad.png and b/data/resources-xxhdpi_clear/symbols-ad.png differ
diff --git a/data/resources-xxhdpi_clear/symbols.png b/data/resources-xxhdpi_clear/symbols.png
index 8f29628bdc..9fcbd8daa3 100644
Binary files a/data/resources-xxhdpi_clear/symbols.png and b/data/resources-xxhdpi_clear/symbols.png differ
diff --git a/data/resources-xxhdpi_clear/symbols.sdf b/data/resources-xxhdpi_clear/symbols.sdf
index c125c00c3b..f813bbe4eb 100644
--- a/data/resources-xxhdpi_clear/symbols.sdf
+++ b/data/resources-xxhdpi_clear/symbols.sdf
@@ -334,8 +334,8 @@
   <symbol minX="1624" maxX="1682" minY="780" maxY="838" name="public-building-l"/>
   <symbol minX="1682" maxX="1740" minY="780" maxY="838" name="lighthouse-l"/>
   <symbol minX="1740" maxX="1798" minY="780" maxY="838" name="lighthouse-m"/>
-  <symbol minX="1798" maxX="1856" minY="780" maxY="838" name="laundry-m"/>
-  <symbol minX="1856" maxX="1914" minY="780" maxY="838" name="power-m"/>
+  <symbol minX="1798" maxX="1856" minY="780" maxY="838" name="power-m"/>
+  <symbol minX="1856" maxX="1914" minY="780" maxY="838" name="laundry-m"/>
   <symbol minX="1914" maxX="1972" minY="780" maxY="838" name="power-l"/>
   <symbol minX="1972" maxX="2030" minY="780" maxY="838" name="postbox-m"/>
   <symbol minX="0" maxX="58" minY="838" maxY="896" name="mail-l"/>
@@ -394,67 +394,67 @@
   <symbol minX="1044" maxX="1102" minY="896" maxY="954" name="petshop-l"/>
   <symbol minX="1102" maxX="1160" minY="896" maxY="954" name="parking-xl"/>
   <symbol minX="1160" maxX="1218" minY="896" maxY="954" name="parking_pay-l"/>
-  <symbol minX="1218" maxX="1274" minY="896" maxY="952" name="subway-spb-m"/>
+  <symbol minX="1218" maxX="1274" minY="896" maxY="952" name="cave-m"/>
   <symbol minX="1274" maxX="1330" minY="896" maxY="952" name="atm-tinkoff-shield-m"/>
-  <symbol minX="1330" maxX="1386" minY="896" maxY="952" name="cave-m"/>
+  <symbol minX="1330" maxX="1386" minY="896" maxY="952" name="atm-tinkoff-gerb-m"/>
   <symbol minX="1386" maxX="1442" minY="896" maxY="952" name="volcano-m"/>
-  <symbol minX="1442" maxX="1498" minY="896" maxY="952" name="atm-tinkoff-gerb-m"/>
+  <symbol minX="1442" maxX="1498" minY="896" maxY="952" name="subway-spb-m"/>
   <symbol minX="1498" maxX="1556" minY="896" maxY="951" name="lightrail-berlin-l"/>
   <symbol minX="1556" maxX="1614" minY="896" maxY="951" name="speedcam1-xl"/>
   <symbol minX="1614" maxX="1668" minY="896" maxY="950" name="subway-entrance-m"/>
-  <symbol minX="1668" maxX="1719" minY="896" maxY="947" name="subway-rome-l"/>
-  <symbol minX="1719" maxX="1777" minY="896" maxY="947" name="subway-moscow-l"/>
-  <symbol minX="1777" maxX="1828" minY="896" maxY="947" name="subway-berlin-l"/>
+  <symbol minX="1668" maxX="1726" minY="896" maxY="947" name="subway-moscow-l"/>
+  <symbol minX="1726" maxX="1777" minY="896" maxY="947" name="subway-berlin-l"/>
+  <symbol minX="1777" maxX="1828" minY="896" maxY="947" name="subway-rome-l"/>
   <symbol minX="1828" maxX="1879" minY="896" maxY="947" name="lightrail-berlin-m"/>
   <symbol minX="1879" maxX="1928" minY="896" maxY="945" name="parking_pay-m"/>
-  <symbol minX="1928" maxX="1977" minY="896" maxY="945" name="bike-parking-m"/>
-  <symbol minX="1977" maxX="2026" minY="896" maxY="945" name="speedcam-m"/>
-  <symbol minX="0" maxX="49" minY="954" maxY="1003" name="parking-m"/>
-  <symbol minX="49" maxX="98" minY="954" maxY="1003" name="search-result"/>
-  <symbol minX="98" maxX="152" minY="954" maxY="1001" name="subway-moscow-m"/>
-  <symbol minX="152" maxX="199" minY="954" maxY="1001" name="subway-rome-m"/>
-  <symbol minX="199" maxX="246" minY="954" maxY="1001" name="subway-paris-m"/>
-  <symbol minX="246" maxX="293" minY="954" maxY="1001" name="subway-berlin-m"/>
-  <symbol minX="293" maxX="339" minY="954" maxY="1000" name="api-result"/>
-  <symbol minX="339" maxX="397" minY="954" maxY="999" name="subway-london-l"/>
-  <symbol minX="397" maxX="439" minY="954" maxY="996" name="subway-spb-s"/>
-  <symbol minX="439" maxX="495" minY="954" maxY="996" name="subway-london-m"/>
-  <symbol minX="495" maxX="537" minY="954" maxY="996" name="cave-s"/>
-  <symbol minX="537" maxX="588" minY="954" maxY="996" name="subway-barcelona-s"/>
-  <symbol minX="588" maxX="646" minY="954" maxY="996" name="subway-barcelona-m"/>
-  <symbol minX="646" maxX="688" minY="954" maxY="996" name="atm-tinkoff-shield-s"/>
-  <symbol minX="688" maxX="746" minY="954" maxY="996" name="subway-madrid-m"/>
-  <symbol minX="746" maxX="788" minY="954" maxY="996" name="volcano-s"/>
-  <symbol minX="788" maxX="830" minY="954" maxY="996" name="atm-tinkoff-gerb-s"/>
-  <symbol minX="830" maxX="888" minY="954" maxY="995" name="subway-barcelona-l"/>
-  <symbol minX="888" maxX="946" minY="954" maxY="995" name="subway-madrid-l"/>
-  <symbol minX="946" maxX="986" minY="954" maxY="994" name="postbox-s"/>
-  <symbol minX="986" maxX="1026" minY="954" maxY="994" name="power-s"/>
-  <symbol minX="1026" maxX="1066" minY="954" maxY="994" name="lift_gate-s"/>
-  <symbol minX="1066" maxX="1106" minY="954" maxY="994" name="library-s"/>
-  <symbol minX="1106" maxX="1146" minY="954" maxY="994" name="public-building-s"/>
-  <symbol minX="1146" maxX="1186" minY="954" maxY="994" name="airport-s"/>
-  <symbol minX="1186" maxX="1226" minY="954" maxY="994" name="australian-football-s"/>
-  <symbol minX="1226" maxX="1266" minY="954" maxY="994" name="alcohol-s"/>
-  <symbol minX="1266" maxX="1306" minY="954" maxY="994" name="lawyer-s"/>
-  <symbol minX="1306" maxX="1346" minY="954" maxY="994" name="laundry-s"/>
-  <symbol minX="1346" maxX="1386" minY="954" maxY="994" name="recycling-s"/>
-  <symbol minX="1386" maxX="1426" minY="954" maxY="994" name="bakery-s"/>
-  <symbol minX="1426" maxX="1466" minY="954" maxY="994" name="kiosk-s"/>
-  <symbol minX="1466" maxX="1506" minY="954" maxY="994" name="remains-s"/>
-  <symbol minX="1506" maxX="1546" minY="954" maxY="994" name="kindergarten-s"/>
-  <symbol minX="1546" maxX="1586" minY="954" maxY="994" name="jewish-s"/>
-  <symbol minX="1586" maxX="1626" minY="954" maxY="994" name="restaurant-s"/>
-  <symbol minX="1626" maxX="1666" minY="954" maxY="994" name="jewelry-s"/>
-  <symbol minX="1666" maxX="1706" minY="954" maxY="994" name="information-s"/>
-  <symbol minX="1706" maxX="1746" minY="954" maxY="994" name="hunting-tower-s"/>
-  <symbol minX="1746" maxX="1786" minY="954" maxY="994" name="sauna-s"/>
-  <symbol minX="1786" maxX="1826" minY="954" maxY="994" name="hotel-s"/>
-  <symbol minX="1826" maxX="1866" minY="954" maxY="994" name="hostel-s"/>
-  <symbol minX="1866" maxX="1906" minY="954" maxY="994" name="school-s"/>
-  <symbol minX="1906" maxX="1946" minY="954" maxY="994" name="hospital-s"/>
-  <symbol minX="1946" maxX="1986" minY="954" maxY="994" name="historic-ship-s"/>
-  <symbol minX="1986" maxX="2026" minY="954" maxY="994" name="seafood-shop-s"/>
+  <symbol minX="1928" maxX="1977" minY="896" maxY="945" name="speedcam-m"/>
+  <symbol minX="1977" maxX="2026" minY="896" maxY="945" name="search-result"/>
+  <symbol minX="0" maxX="49" minY="954" maxY="1003" name="non-found-search-result"/>
+  <symbol minX="49" maxX="98" minY="954" maxY="1003" name="parking-m"/>
+  <symbol minX="98" maxX="147" minY="954" maxY="1003" name="bike-parking-m"/>
+  <symbol minX="147" maxX="194" minY="954" maxY="1001" name="subway-berlin-m"/>
+  <symbol minX="194" maxX="241" minY="954" maxY="1001" name="subway-rome-m"/>
+  <symbol minX="241" maxX="288" minY="954" maxY="1001" name="subway-paris-m"/>
+  <symbol minX="288" maxX="342" minY="954" maxY="1001" name="subway-moscow-m"/>
+  <symbol minX="342" maxX="388" minY="954" maxY="1000" name="api-result"/>
+  <symbol minX="388" maxX="446" minY="954" maxY="999" name="subway-london-l"/>
+  <symbol minX="446" maxX="504" minY="954" maxY="996" name="subway-madrid-m"/>
+  <symbol minX="504" maxX="555" minY="954" maxY="996" name="subway-barcelona-s"/>
+  <symbol minX="555" maxX="611" minY="954" maxY="996" name="subway-london-m"/>
+  <symbol minX="611" maxX="653" minY="954" maxY="996" name="subway-spb-s"/>
+  <symbol minX="653" maxX="695" minY="954" maxY="996" name="cave-s"/>
+  <symbol minX="695" maxX="737" minY="954" maxY="996" name="volcano-s"/>
+  <symbol minX="737" maxX="779" minY="954" maxY="996" name="atm-tinkoff-gerb-s"/>
+  <symbol minX="779" maxX="837" minY="954" maxY="996" name="subway-barcelona-m"/>
+  <symbol minX="837" maxX="879" minY="954" maxY="996" name="atm-tinkoff-shield-s"/>
+  <symbol minX="879" maxX="937" minY="954" maxY="995" name="subway-barcelona-l"/>
+  <symbol minX="937" maxX="995" minY="954" maxY="995" name="subway-madrid-l"/>
+  <symbol minX="995" maxX="1035" minY="954" maxY="994" name="power-s"/>
+  <symbol minX="1035" maxX="1075" minY="954" maxY="994" name="lift_gate-s"/>
+  <symbol minX="1075" maxX="1115" minY="954" maxY="994" name="library-s"/>
+  <symbol minX="1115" maxX="1155" minY="954" maxY="994" name="public-building-s"/>
+  <symbol minX="1155" maxX="1195" minY="954" maxY="994" name="america-football-s"/>
+  <symbol minX="1195" maxX="1235" minY="954" maxY="994" name="baseball-s"/>
+  <symbol minX="1235" maxX="1275" minY="954" maxY="994" name="basketball-s"/>
+  <symbol minX="1275" maxX="1315" minY="954" maxY="994" name="lawyer-s"/>
+  <symbol minX="1315" maxX="1355" minY="954" maxY="994" name="laundry-s"/>
+  <symbol minX="1355" maxX="1395" minY="954" maxY="994" name="recycling-s"/>
+  <symbol minX="1395" maxX="1435" minY="954" maxY="994" name="lighthouse-s"/>
+  <symbol minX="1435" maxX="1475" minY="954" maxY="994" name="kiosk-s"/>
+  <symbol minX="1475" maxX="1515" minY="954" maxY="994" name="remains-s"/>
+  <symbol minX="1515" maxX="1555" minY="954" maxY="994" name="kindergarten-s"/>
+  <symbol minX="1555" maxX="1595" minY="954" maxY="994" name="jewish-s"/>
+  <symbol minX="1595" maxX="1635" minY="954" maxY="994" name="restaurant-s"/>
+  <symbol minX="1635" maxX="1675" minY="954" maxY="994" name="jewelry-s"/>
+  <symbol minX="1675" maxX="1715" minY="954" maxY="994" name="information-s"/>
+  <symbol minX="1715" maxX="1755" minY="954" maxY="994" name="hunting-tower-s"/>
+  <symbol minX="1755" maxX="1795" minY="954" maxY="994" name="sauna-s"/>
+  <symbol minX="1795" maxX="1835" minY="954" maxY="994" name="hotel-s"/>
+  <symbol minX="1835" maxX="1875" minY="954" maxY="994" name="hostel-s"/>
+  <symbol minX="1875" maxX="1915" minY="954" maxY="994" name="school-s"/>
+  <symbol minX="1915" maxX="1955" minY="954" maxY="994" name="hospital-s"/>
+  <symbol minX="1955" maxX="1995" minY="954" maxY="994" name="historic-ship-s"/>
+  <symbol minX="1995" maxX="2035" minY="954" maxY="994" name="seafood-shop-s"/>
   <symbol minX="0" maxX="40" minY="1003" maxY="1043" name="hindu-s"/>
   <symbol minX="40" maxX="80" minY="1003" maxY="1043" name="heliport-s"/>
   <symbol minX="80" maxX="120" minY="1003" maxY="1043" name="shinto-s"/>
@@ -478,67 +478,67 @@
   <symbol minX="800" maxX="840" minY="1003" maxY="1043" name="gallery-s"/>
   <symbol minX="840" maxX="880" minY="1003" maxY="1043" name="soccer-s"/>
   <symbol minX="880" maxX="920" minY="1003" maxY="1043" name="furniture-s"/>
-  <symbol minX="920" maxX="960" minY="1003" maxY="1043" name="mail-s"/>
-  <symbol minX="960" maxX="1000" minY="1003" maxY="1043" name="bank-s"/>
+  <symbol minX="920" maxX="960" minY="1003" maxY="1043" name="outdoor-shop-s"/>
+  <symbol minX="960" maxX="1000" minY="1003" maxY="1043" name="apartment-s"/>
   <symbol minX="1000" maxX="1040" minY="1003" maxY="1043" name="funicular-s"/>
-  <symbol minX="1040" maxX="1080" minY="1003" maxY="1043" name="police-s"/>
+  <symbol minX="1040" maxX="1080" minY="1003" maxY="1043" name="pharmacy-s"/>
   <symbol minX="1080" maxX="1120" minY="1003" maxY="1043" name="fuel-s"/>
   <symbol minX="1120" maxX="1160" minY="1003" maxY="1043" name="fountain-s"/>
   <symbol minX="1160" maxX="1200" minY="1003" maxY="1043" name="sports-s"/>
   <symbol minX="1200" maxX="1240" minY="1003" maxY="1043" name="florist-s"/>
   <symbol minX="1240" maxX="1280" minY="1003" maxY="1043" name="firehydrant-s"/>
   <symbol minX="1280" maxX="1320" minY="1003" maxY="1043" name="stadium-s"/>
-  <symbol minX="1320" maxX="1360" minY="1003" maxY="1043" name="alpine_hut-s"/>
-  <symbol minX="1360" maxX="1400" minY="1003" maxY="1043" name="banknote-s"/>
-  <symbol minX="1400" maxX="1440" minY="1003" maxY="1043" name="bar-s"/>
-  <symbol minX="1440" maxX="1480" minY="1003" maxY="1043" name="marketplace-s"/>
-  <symbol minX="1480" maxX="1520" minY="1003" maxY="1043" name="military-s"/>
-  <symbol minX="1520" maxX="1560" minY="1003" maxY="1043" name="mobile_phone-s"/>
-  <symbol minX="1560" maxX="1600" minY="1003" maxY="1043" name="place-of-worship-s"/>
-  <symbol minX="1600" maxX="1640" minY="1003" maxY="1043" name="monument-s"/>
-  <symbol minX="1640" maxX="1680" minY="1003" maxY="1043" name="america-football-s"/>
+  <symbol minX="1320" maxX="1360" minY="1003" maxY="1043" name="bbq-s"/>
+  <symbol minX="1360" maxX="1400" minY="1003" maxY="1043" name="bcontrol-s"/>
+  <symbol minX="1400" maxX="1440" minY="1003" maxY="1043" name="archery-s"/>
+  <symbol minX="1440" maxX="1480" minY="1003" maxY="1043" name="postbox-s"/>
+  <symbol minX="1480" maxX="1520" minY="1003" maxY="1043" name="bar-s"/>
+  <symbol minX="1520" maxX="1560" minY="1003" maxY="1043" name="mail-s"/>
+  <symbol minX="1560" maxX="1600" minY="1003" maxY="1043" name="park-s"/>
+  <symbol minX="1600" maxX="1640" minY="1003" maxY="1043" name="police-s"/>
+  <symbol minX="1640" maxX="1680" minY="1003" maxY="1043" name="banknote-s"/>
   <symbol minX="1680" maxX="1720" minY="1003" maxY="1043" name="fire_station-s"/>
-  <symbol minX="1720" maxX="1760" minY="1003" maxY="1043" name="motel-s"/>
+  <symbol minX="1720" maxX="1760" minY="1003" maxY="1043" name="marketplace-s"/>
   <symbol minX="1760" maxX="1800" minY="1003" maxY="1043" name="subway-entrance-s"/>
-  <symbol minX="1800" maxX="1840" minY="1003" maxY="1043" name="baseball-s"/>
-  <symbol minX="1840" maxX="1880" minY="1003" maxY="1043" name="basketball-s"/>
-  <symbol minX="1880" maxX="1920" minY="1003" maxY="1043" name="apartment-s"/>
+  <symbol minX="1800" maxX="1840" minY="1003" maxY="1043" name="beach-s"/>
+  <symbol minX="1840" maxX="1880" minY="1003" maxY="1043" name="beauty-s"/>
+  <symbol minX="1880" maxX="1920" minY="1003" maxY="1043" name="nparkf-s"/>
   <symbol minX="1920" maxX="1960" minY="1003" maxY="1043" name="fastfood-s"/>
-  <symbol minX="1960" maxX="2000" minY="1003" maxY="1043" name="pitch-s"/>
-  <symbol minX="2000" maxX="2040" minY="1003" maxY="1043" name="motorcycle_shop-s"/>
-  <symbol minX="0" maxX="40" minY="1043" maxY="1083" name="bbq-s"/>
+  <symbol minX="1960" maxX="2000" minY="1003" maxY="1043" name="military-s"/>
+  <symbol minX="2000" maxX="2040" minY="1003" maxY="1043" name="mobile_phone-s"/>
+  <symbol minX="0" maxX="40" minY="1043" maxY="1083" name="atm-s"/>
   <symbol minX="40" maxX="80" minY="1043" maxY="1083" name="equestrian-s"/>
-  <symbol minX="80" maxX="120" minY="1043" maxY="1083" name="museum-s"/>
-  <symbol minX="120" maxX="160" minY="1043" maxY="1083" name="picnic-s"/>
-  <symbol minX="160" maxX="200" minY="1043" maxY="1083" name="bcontrol-s"/>
-  <symbol minX="200" maxX="240" minY="1043" maxY="1083" name="archery-s"/>
-  <symbol minX="240" maxX="280" minY="1043" maxY="1083" name="beach-s"/>
-  <symbol minX="280" maxX="320" minY="1043" maxY="1083" name="beauty-s"/>
-  <symbol minX="320" maxX="360" minY="1043" maxY="1083" name="muslim-s"/>
-  <symbol minX="360" maxX="400" minY="1043" maxY="1083" name="npark-s"/>
-  <symbol minX="400" maxX="440" minY="1043" maxY="1083" name="atm-s"/>
-  <symbol minX="440" maxX="480" minY="1043" maxY="1083" name="lighthouse-s"/>
-  <symbol minX="480" maxX="520" minY="1043" maxY="1083" name="beer-s"/>
+  <symbol minX="80" maxX="120" minY="1043" maxY="1083" name="place-of-worship-s"/>
+  <symbol minX="120" maxX="160" minY="1043" maxY="1083" name="monument-s"/>
+  <symbol minX="160" maxX="200" minY="1043" maxY="1083" name="beer-s"/>
+  <symbol minX="200" maxX="240" minY="1043" maxY="1083" name="photo-shop-s"/>
+  <symbol minX="240" maxX="280" minY="1043" maxY="1083" name="zoo-s"/>
+  <symbol minX="280" maxX="320" minY="1043" maxY="1083" name="bicycle-s"/>
+  <symbol minX="320" maxX="360" minY="1043" maxY="1083" name="petshop-s"/>
+  <symbol minX="360" maxX="400" minY="1043" maxY="1083" name="motel-s"/>
+  <symbol minX="400" maxX="440" minY="1043" maxY="1083" name="office-s"/>
+  <symbol minX="440" maxX="480" minY="1043" maxY="1083" name="windmill-s"/>
+  <symbol minX="480" maxX="520" minY="1043" maxY="1083" name="optician-s"/>
   <symbol minX="520" maxX="560" minY="1043" maxY="1083" name="subway-newyork-s"/>
-  <symbol minX="560" maxX="600" minY="1043" maxY="1083" name="zoo-s"/>
+  <symbol minX="560" maxX="600" minY="1043" maxY="1083" name="npark-s"/>
   <symbol minX="600" maxX="640" minY="1043" maxY="1083" name="embassy-s"/>
-  <symbol minX="640" maxX="680" minY="1043" maxY="1083" name="photo-shop-s"/>
-  <symbol minX="680" maxX="720" minY="1043" maxY="1083" name="bicycle-s"/>
-  <symbol minX="720" maxX="760" minY="1043" maxY="1083" name="nparkf-s"/>
-  <symbol minX="760" maxX="800" minY="1043" maxY="1083" name="office-s"/>
-  <symbol minX="800" maxX="840" minY="1043" maxY="1083" name="windmill-s"/>
+  <symbol minX="640" maxX="680" minY="1043" maxY="1083" name="pitch-s"/>
+  <symbol minX="680" maxX="720" minY="1043" maxY="1083" name="wayside_shrine-s"/>
+  <symbol minX="720" maxX="760" minY="1043" maxY="1083" name="parking-meter-s"/>
+  <symbol minX="760" maxX="800" minY="1043" maxY="1083" name="motorcycle_shop-s"/>
+  <symbol minX="800" maxX="840" minY="1043" maxY="1083" name="book-shop-s"/>
   <symbol minX="840" maxX="880" minY="1043" maxY="1083" name="subway-s"/>
   <symbol minX="880" maxX="920" minY="1043" maxY="1083" name="electronics-s"/>
-  <symbol minX="920" maxX="960" minY="1043" maxY="1083" name="phone-s"/>
-  <symbol minX="960" maxX="1000" minY="1043" maxY="1083" name="optician-s"/>
-  <symbol minX="1000" maxX="1040" minY="1043" maxY="1083" name="parking-meter-s"/>
-  <symbol minX="1040" maxX="1080" minY="1043" maxY="1083" name="wayside_shrine-s"/>
-  <symbol minX="1080" maxX="1120" minY="1043" maxY="1083" name="book-shop-s"/>
-  <symbol minX="1120" maxX="1160" minY="1043" maxY="1083" name="bookmaker-s"/>
+  <symbol minX="920" maxX="960" minY="1043" maxY="1083" name="bookmaker-s"/>
+  <symbol minX="960" maxX="1000" minY="1043" maxY="1083" name="museum-s"/>
+  <symbol minX="1000" maxX="1040" minY="1043" maxY="1083" name="waterfall-s"/>
+  <symbol minX="1040" maxX="1080" minY="1043" maxY="1083" name="bowls-s"/>
+  <symbol minX="1080" maxX="1120" minY="1043" maxY="1083" name="buddhist-s"/>
+  <symbol minX="1120" maxX="1160" minY="1043" maxY="1083" name="waste-basket-s"/>
   <symbol minX="1160" maxX="1200" minY="1043" maxY="1083" name="drinking-water-s"/>
-  <symbol minX="1200" maxX="1240" minY="1043" maxY="1083" name="waterfall-s"/>
+  <symbol minX="1200" maxX="1240" minY="1043" maxY="1083" name="airport-s"/>
   <symbol minX="1240" maxX="1280" minY="1043" maxY="1083" name="sweets-s"/>
-  <symbol minX="1280" maxX="1320" minY="1043" maxY="1083" name="bowls-s"/>
+  <symbol minX="1280" maxX="1320" minY="1043" maxY="1083" name="phone-s"/>
   <symbol minX="1320" maxX="1360" minY="1043" maxY="1083" name="doityourself-s"/>
   <symbol minX="1360" maxX="1400" minY="1043" maxY="1083" name="swimming-s"/>
   <symbol minX="1400" maxX="1440" minY="1043" maxY="1083" name="dog_park-s"/>
@@ -548,9 +548,9 @@
   <symbol minX="1560" maxX="1600" minY="1043" maxY="1083" name="dentist-s"/>
   <symbol minX="1600" maxX="1640" minY="1043" maxY="1083" name="taxi-s"/>
   <symbol minX="1640" maxX="1680" minY="1043" maxY="1083" name="curling-s"/>
-  <symbol minX="1680" maxX="1720" minY="1043" maxY="1083" name="buddhist-s"/>
+  <symbol minX="1680" maxX="1720" minY="1043" maxY="1083" name="australian-football-s"/>
   <symbol minX="1720" maxX="1760" minY="1043" maxY="1083" name="tennis-s"/>
-  <symbol minX="1760" maxX="1800" minY="1043" maxY="1083" name="waste-basket-s"/>
+  <symbol minX="1760" maxX="1800" minY="1043" maxY="1083" name="alcohol-s"/>
   <symbol minX="1800" maxX="1840" minY="1043" maxY="1083" name="bus-s"/>
   <symbol minX="1840" maxX="1880" minY="1043" maxY="1083" name="theatre-s"/>
   <symbol minX="1880" maxX="1920" minY="1043" maxY="1083" name="cricket-s"/>
@@ -563,10 +563,10 @@
   <symbol minX="120" maxX="160" minY="1083" maxY="1123" name="clothes-s"/>
   <symbol minX="160" maxX="200" minY="1083" maxY="1123" name="toilets-s"/>
   <symbol minX="200" maxX="240" minY="1083" maxY="1123" name="climbing-s"/>
-  <symbol minX="240" maxX="280" minY="1083" maxY="1123" name="butcher-s"/>
+  <symbol minX="240" maxX="280" minY="1083" maxY="1123" name="bakery-s"/>
   <symbol minX="280" maxX="320" minY="1083" maxY="1123" name="toll_booth-s"/>
-  <symbol minX="320" maxX="360" minY="1083" maxY="1123" name="petshop-s"/>
-  <symbol minX="360" maxX="400" minY="1083" maxY="1123" name="park-s"/>
+  <symbol minX="320" maxX="360" minY="1083" maxY="1123" name="bank-s"/>
+  <symbol minX="360" maxX="400" minY="1083" maxY="1123" name="alpine_hut-s"/>
   <symbol minX="400" maxX="440" minY="1083" maxY="1123" name="cinema-s"/>
   <symbol minX="440" maxX="480" minY="1083" maxY="1123" name="tomb-s"/>
   <symbol minX="480" maxX="520" minY="1083" maxY="1123" name="christian-s"/>
@@ -576,10 +576,10 @@
   <symbol minX="640" maxX="680" minY="1083" maxY="1123" name="charging-station-s"/>
   <symbol minX="680" maxX="720" minY="1083" maxY="1123" name="toys-s"/>
   <symbol minX="720" maxX="760" minY="1083" maxY="1123" name="cemetery-s"/>
-  <symbol minX="760" maxX="800" minY="1083" maxY="1123" name="outdoor-shop-s"/>
+  <symbol minX="760" maxX="800" minY="1083" maxY="1123" name="picnic-s"/>
   <symbol minX="800" maxX="840" minY="1083" maxY="1123" name="train-s"/>
-  <symbol minX="840" maxX="880" minY="1083" maxY="1123" name="cable-car-s"/>
-  <symbol minX="880" maxX="920" minY="1083" maxY="1123" name="pharmacy-s"/>
+  <symbol minX="840" maxX="880" minY="1083" maxY="1123" name="butcher-s"/>
+  <symbol minX="880" maxX="920" minY="1083" maxY="1123" name="muslim-s"/>
   <symbol minX="920" maxX="960" minY="1083" maxY="1123" name="casino-s"/>
   <symbol minX="960" maxX="1000" minY="1083" maxY="1123" name="tram-s"/>
   <symbol minX="1000" maxX="1040" minY="1083" maxY="1123" name="caravan_site-s"/>
@@ -594,52 +594,53 @@
   <symbol minX="1360" maxX="1400" minY="1083" maxY="1123" name="campsite-s"/>
   <symbol minX="1400" maxX="1440" minY="1083" maxY="1123" name="cafe-s"/>
   <symbol minX="1440" maxX="1480" minY="1083" maxY="1123" name="viewpoint-s"/>
-  <symbol minX="1480" maxX="1518" minY="1083" maxY="1121" name="lightrail-berlin-s"/>
-  <symbol minX="1518" maxX="1569" minY="1083" maxY="1121" name="subway-madrid-s"/>
-  <symbol minX="1569" maxX="1625" minY="1083" maxY="1121" name="subway-kiev-l"/>
-  <symbol minX="1625" maxX="1663" minY="1083" maxY="1121" name="peakt-l"/>
-  <symbol minX="1663" maxX="1701" minY="1083" maxY="1121" name="subway-paris-s"/>
-  <symbol minX="1701" maxX="1757" minY="1083" maxY="1121" name="subway-kiev-m"/>
-  <symbol minX="1757" maxX="1815" minY="1083" maxY="1119" name="railway-crossing-xl"/>
-  <symbol minX="1815" maxX="1851" minY="1083" maxY="1119" name="subway-moscow-s"/>
-  <symbol minX="1851" maxX="1893" minY="1083" maxY="1116" name="subway-london-s"/>
-  <symbol minX="1893" maxX="1926" minY="1083" maxY="1116" name="subway-berlin-s"/>
-  <symbol minX="1926" maxX="1964" minY="1083" maxY="1116" name="bench"/>
-  <symbol minX="1964" maxX="1997" minY="1083" maxY="1116" name="subway-rome-s"/>
-  <symbol minX="1997" maxX="2028" minY="1083" maxY="1114" name="bike-parking-s"/>
-  <symbol minX="0" maxX="31" minY="1123" maxY="1154" name="subway-xs"/>
-  <symbol minX="31" maxX="62" minY="1123" maxY="1154" name="train-xs"/>
-  <symbol minX="62" maxX="118" minY="1123" maxY="1154" name="subway-minsk-l"/>
-  <symbol minX="118" maxX="149" minY="1123" maxY="1154" name="survey_point-l"/>
-  <symbol minX="149" maxX="180" minY="1123" maxY="1154" name="parking_pay-s"/>
-  <symbol minX="180" maxX="211" minY="1123" maxY="1154" name="subway-newyork-xs"/>
-  <symbol minX="211" maxX="242" minY="1123" maxY="1154" name="parking-s"/>
-  <symbol minX="242" maxX="291" minY="1123" maxY="1154" name="railway-crossing-l"/>
+  <symbol minX="1480" maxX="1520" minY="1083" maxY="1123" name="cable-car-s"/>
+  <symbol minX="1520" maxX="1576" minY="1083" maxY="1121" name="subway-kiev-l"/>
+  <symbol minX="1576" maxX="1614" minY="1083" maxY="1121" name="subway-paris-s"/>
+  <symbol minX="1614" maxX="1670" minY="1083" maxY="1121" name="subway-kiev-m"/>
+  <symbol minX="1670" maxX="1708" minY="1083" maxY="1121" name="lightrail-berlin-s"/>
+  <symbol minX="1708" maxX="1759" minY="1083" maxY="1121" name="subway-madrid-s"/>
+  <symbol minX="1759" maxX="1797" minY="1083" maxY="1121" name="peakt-l"/>
+  <symbol minX="1797" maxX="1833" minY="1083" maxY="1119" name="subway-moscow-s"/>
+  <symbol minX="1833" maxX="1891" minY="1083" maxY="1119" name="railway-crossing-xl"/>
+  <symbol minX="1891" maxX="1929" minY="1083" maxY="1116" name="bench"/>
+  <symbol minX="1929" maxX="1971" minY="1083" maxY="1116" name="subway-london-s"/>
+  <symbol minX="1971" maxX="2004" minY="1083" maxY="1116" name="subway-rome-s"/>
+  <symbol minX="2004" maxX="2037" minY="1083" maxY="1116" name="subway-berlin-s"/>
+  <symbol minX="0" maxX="49" minY="1123" maxY="1154" name="railway-crossing-l"/>
+  <symbol minX="49" maxX="80" minY="1123" maxY="1154" name="parking_pay-s"/>
+  <symbol minX="80" maxX="111" minY="1123" maxY="1154" name="bike-parking-s"/>
+  <symbol minX="111" maxX="142" minY="1123" maxY="1154" name="parking-s"/>
+  <symbol minX="142" maxX="173" minY="1123" maxY="1154" name="subway-xs"/>
+  <symbol minX="173" maxX="204" minY="1123" maxY="1154" name="survey_point-l"/>
+  <symbol minX="204" maxX="260" minY="1123" maxY="1154" name="subway-minsk-l"/>
+  <symbol minX="260" maxX="291" minY="1123" maxY="1154" name="subway-newyork-xs"/>
   <symbol minX="291" maxX="322" minY="1123" maxY="1154" name="star-l"/>
   <symbol minX="322" maxX="353" minY="1123" maxY="1154" name="speedcam-s"/>
-  <symbol minX="353" maxX="400" minY="1123" maxY="1152" name="subway-kiev-s"/>
-  <symbol minX="400" maxX="429" minY="1123" maxY="1152" name="star-m"/>
-  <symbol minX="429" maxX="471" minY="1123" maxY="1150" name="railway-crossing"/>
-  <symbol minX="471" maxX="518" minY="1123" maxY="1150" name="subway-minsk-m"/>
-  <symbol minX="518" maxX="547" minY="1123" maxY="1150" name="peakt-m"/>
-  <symbol minX="547" maxX="574" minY="1123" maxY="1150" name="survey_point-m"/>
-  <symbol minX="574" maxX="616" minY="1123" maxY="1147" name="subway-minsk-s"/>
-  <symbol minX="616" maxX="640" minY="1123" maxY="1147" name="crossing-l"/>
-  <symbol minX="640" maxX="664" minY="1123" maxY="1147" name="star-s"/>
-  <symbol minX="664" maxX="686" minY="1123" maxY="1145" name="survey_point-s"/>
-  <symbol minX="686" maxX="737" minY="1123" maxY="1145" name="arrow-m"/>
-  <symbol minX="737" maxX="761" minY="1123" maxY="1145" name="peakt-s"/>
-  <symbol minX="761" maxX="781" minY="1123" maxY="1143" name="entrance-s"/>
-  <symbol minX="781" maxX="801" minY="1123" maxY="1143" name="crossing-m"/>
-  <symbol minX="801" maxX="821" minY="1123" maxY="1143" name="zero-icon"/>
-  <symbol minX="821" maxX="836" minY="1123" maxY="1138" name="cities-m"/>
-  <symbol minX="836" maxX="851" minY="1123" maxY="1138" name="dot-m"/>
-  <symbol minX="851" maxX="866" minY="1123" maxY="1138" name="crossing-s"/>
-  <symbol minX="866" maxX="904" minY="1123" maxY="1138" name="arrow-s"/>
-  <symbol minX="904" maxX="917" minY="1123" maxY="1136" name="entrance-xs"/>
-  <symbol minX="917" maxX="928" minY="1123" maxY="1134" name="cities-xs"/>
-  <symbol minX="928" maxX="939" minY="1123" maxY="1134" name="cities-s"/>
-  <symbol minX="939" maxX="963" minY="1123" maxY="1134" name="arrow-xs"/>
-  <symbol minX="963" maxX="974" minY="1123" maxY="1134" name="dot-s"/>
+  <symbol minX="353" maxX="384" minY="1123" maxY="1154" name="train-xs"/>
+  <symbol minX="384" maxX="431" minY="1123" maxY="1152" name="subway-kiev-s"/>
+  <symbol minX="431" maxX="460" minY="1123" maxY="1152" name="star-m"/>
+  <symbol minX="460" maxX="489" minY="1123" maxY="1150" name="peakt-m"/>
+  <symbol minX="489" maxX="536" minY="1123" maxY="1150" name="subway-minsk-m"/>
+  <symbol minX="536" maxX="578" minY="1123" maxY="1150" name="railway-crossing"/>
+  <symbol minX="578" maxX="605" minY="1123" maxY="1150" name="survey_point-m"/>
+  <symbol minX="605" maxX="629" minY="1123" maxY="1147" name="star-s"/>
+  <symbol minX="629" maxX="671" minY="1123" maxY="1147" name="subway-minsk-s"/>
+  <symbol minX="671" maxX="695" minY="1123" maxY="1147" name="crossing-l"/>
+  <symbol minX="695" maxX="746" minY="1123" maxY="1145" name="arrow-m"/>
+  <symbol minX="746" maxX="770" minY="1123" maxY="1145" name="peakt-s"/>
+  <symbol minX="770" maxX="792" minY="1123" maxY="1145" name="survey_point-s"/>
+  <symbol minX="792" maxX="812" minY="1123" maxY="1143" name="entrance-s"/>
+  <symbol minX="812" maxX="832" minY="1123" maxY="1143" name="crossing-m"/>
+  <symbol minX="832" maxX="852" minY="1123" maxY="1143" name="zero-icon"/>
+  <symbol minX="852" maxX="867" minY="1123" maxY="1138" name="cities-m"/>
+  <symbol minX="867" maxX="882" minY="1123" maxY="1138" name="crossing-s"/>
+  <symbol minX="882" maxX="920" minY="1123" maxY="1138" name="arrow-s"/>
+  <symbol minX="920" maxX="935" minY="1123" maxY="1138" name="dot-m"/>
+  <symbol minX="935" maxX="948" minY="1123" maxY="1136" name="entrance-xs"/>
+  <symbol minX="948" maxX="972" minY="1123" maxY="1134" name="arrow-xs"/>
+  <symbol minX="972" maxX="983" minY="1123" maxY="1134" name="cities-xs"/>
+  <symbol minX="983" maxX="994" minY="1123" maxY="1134" name="cities-s"/>
+  <symbol minX="994" maxX="1005" minY="1123" maxY="1134" name="dot-s"/>
  </file>
 </root>
diff --git a/data/resources-xxhdpi_dark/symbols-ad.png b/data/resources-xxhdpi_dark/symbols-ad.png
index 291bf1e26d..eac73e3cad 100644
Binary files a/data/resources-xxhdpi_dark/symbols-ad.png and b/data/resources-xxhdpi_dark/symbols-ad.png differ
diff --git a/data/resources-xxhdpi_dark/symbols.png b/data/resources-xxhdpi_dark/symbols.png
index e3150a4ff4..569342fb2f 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 a6052ae037..049dc69542 100644
--- a/data/resources-xxhdpi_dark/symbols.sdf
+++ b/data/resources-xxhdpi_dark/symbols.sdf
@@ -321,8 +321,8 @@
   <symbol minX="870" maxX="928" minY="780" maxY="838" name="kiosk-l"/>
   <symbol minX="928" maxX="986" minY="780" maxY="838" name="kiosk-m"/>
   <symbol minX="986" maxX="1044" minY="780" maxY="838" name="remains-m"/>
-  <symbol minX="1044" maxX="1102" minY="780" maxY="838" name="remains-l"/>
-  <symbol minX="1102" maxX="1160" minY="780" maxY="838" name="laundry-m"/>
+  <symbol minX="1044" maxX="1102" minY="780" maxY="838" name="laundry-l"/>
+  <symbol minX="1102" maxX="1160" minY="780" maxY="838" name="remains-l"/>
   <symbol minX="1160" maxX="1218" minY="780" maxY="838" name="recycling-m"/>
   <symbol minX="1218" maxX="1276" minY="780" maxY="838" name="lawyer-l"/>
   <symbol minX="1276" maxX="1334" minY="780" maxY="838" name="lawyer-m"/>
@@ -335,7 +335,7 @@
   <symbol minX="1682" maxX="1740" minY="780" maxY="838" name="public-building-l"/>
   <symbol minX="1740" maxX="1798" minY="780" maxY="838" name="lighthouse-l"/>
   <symbol minX="1798" maxX="1856" minY="780" maxY="838" name="lighthouse-m"/>
-  <symbol minX="1856" maxX="1914" minY="780" maxY="838" name="laundry-l"/>
+  <symbol minX="1856" maxX="1914" minY="780" maxY="838" name="laundry-m"/>
   <symbol minX="1914" maxX="1972" minY="780" maxY="838" name="lightrail-berlin-l"/>
   <symbol minX="1972" maxX="2030" minY="780" maxY="838" name="power-m"/>
   <symbol minX="0" maxX="58" minY="838" maxY="896" name="power-l"/>
@@ -396,65 +396,65 @@
   <symbol minX="1160" maxX="1218" minY="896" maxY="954" name="parking-xl"/>
   <symbol minX="1218" maxX="1276" minY="896" maxY="954" name="parking_pay-l"/>
   <symbol minX="1276" maxX="1334" minY="896" maxY="954" name="petshop-l"/>
-  <symbol minX="1334" maxX="1390" minY="896" maxY="952" name="cave-m"/>
-  <symbol minX="1390" maxX="1446" minY="896" maxY="952" name="volcano-m"/>
+  <symbol minX="1334" maxX="1390" minY="896" maxY="952" name="atm-tinkoff-gerb-m"/>
+  <symbol minX="1390" maxX="1446" minY="896" maxY="952" name="subway-spb-m"/>
   <symbol minX="1446" maxX="1502" minY="896" maxY="952" name="atm-tinkoff-shield-m"/>
-  <symbol minX="1502" maxX="1558" minY="896" maxY="952" name="atm-tinkoff-gerb-m"/>
-  <symbol minX="1558" maxX="1614" minY="896" maxY="952" name="subway-spb-m"/>
+  <symbol minX="1502" maxX="1558" minY="896" maxY="952" name="volcano-m"/>
+  <symbol minX="1558" maxX="1614" minY="896" maxY="952" name="cave-m"/>
   <symbol minX="1614" maxX="1668" minY="896" maxY="950" name="subway-entrance-m"/>
   <symbol minX="1668" maxX="1726" minY="896" maxY="950" name="speedcam1-xl"/>
-  <symbol minX="1726" maxX="1784" minY="896" maxY="947" name="subway-moscow-l"/>
-  <symbol minX="1784" maxX="1835" minY="896" maxY="947" name="subway-rome-l"/>
-  <symbol minX="1835" maxX="1886" minY="896" maxY="947" name="lightrail-berlin-m"/>
-  <symbol minX="1886" maxX="1937" minY="896" maxY="947" name="subway-berlin-l"/>
-  <symbol minX="1937" maxX="1986" minY="896" maxY="945" name="speedcam-m"/>
-  <symbol minX="1986" maxX="2035" minY="896" maxY="945" name="parking_pay-m"/>
-  <symbol minX="0" maxX="49" minY="954" maxY="1003" name="search-result"/>
-  <symbol minX="49" maxX="98" minY="954" maxY="1003" name="bike-parking-m"/>
+  <symbol minX="1726" maxX="1777" minY="896" maxY="947" name="subway-berlin-l"/>
+  <symbol minX="1777" maxX="1835" minY="896" maxY="947" name="subway-moscow-l"/>
+  <symbol minX="1835" maxX="1886" minY="896" maxY="947" name="subway-rome-l"/>
+  <symbol minX="1886" maxX="1937" minY="896" maxY="947" name="lightrail-berlin-m"/>
+  <symbol minX="1937" maxX="1986" minY="896" maxY="945" name="non-found-search-result"/>
+  <symbol minX="1986" maxX="2035" minY="896" maxY="945" name="bike-parking-m"/>
+  <symbol minX="0" maxX="49" minY="954" maxY="1003" name="parking_pay-m"/>
+  <symbol minX="49" maxX="98" minY="954" maxY="1003" name="search-result"/>
   <symbol minX="98" maxX="147" minY="954" maxY="1003" name="parking-m"/>
-  <symbol minX="147" maxX="201" minY="954" maxY="1001" name="subway-moscow-m"/>
-  <symbol minX="201" maxX="248" minY="954" maxY="1001" name="subway-paris-m"/>
-  <symbol minX="248" maxX="295" minY="954" maxY="1001" name="subway-berlin-m"/>
-  <symbol minX="295" maxX="342" minY="954" maxY="1001" name="subway-rome-m"/>
-  <symbol minX="342" maxX="388" minY="954" maxY="1000" name="api-result"/>
-  <symbol minX="388" maxX="446" minY="954" maxY="999" name="subway-london-l"/>
-  <symbol minX="446" maxX="502" minY="954" maxY="996" name="subway-london-m"/>
-  <symbol minX="502" maxX="560" minY="954" maxY="996" name="subway-madrid-m"/>
-  <symbol minX="560" maxX="602" minY="954" maxY="996" name="subway-spb-s"/>
-  <symbol minX="602" maxX="653" minY="954" maxY="996" name="subway-barcelona-s"/>
-  <symbol minX="653" maxX="711" minY="954" maxY="996" name="subway-barcelona-m"/>
-  <symbol minX="711" maxX="753" minY="954" maxY="996" name="atm-tinkoff-gerb-s"/>
-  <symbol minX="753" maxX="795" minY="954" maxY="996" name="volcano-s"/>
-  <symbol minX="795" maxX="837" minY="954" maxY="996" name="cave-s"/>
-  <symbol minX="837" maxX="879" minY="954" maxY="996" name="atm-tinkoff-shield-s"/>
-  <symbol minX="879" maxX="937" minY="954" maxY="995" name="subway-barcelona-l"/>
-  <symbol minX="937" maxX="995" minY="954" maxY="995" name="subway-madrid-l"/>
-  <symbol minX="995" maxX="1035" minY="954" maxY="994" name="wayside_shrine-s"/>
-  <symbol minX="1035" maxX="1075" minY="954" maxY="994" name="power-s"/>
-  <symbol minX="1075" maxX="1115" minY="954" maxY="994" name="lift_gate-s"/>
-  <symbol minX="1115" maxX="1155" minY="954" maxY="994" name="library-s"/>
-  <symbol minX="1155" maxX="1195" minY="954" maxY="994" name="public-building-s"/>
-  <symbol minX="1195" maxX="1235" minY="954" maxY="994" name="australian-football-s"/>
-  <symbol minX="1235" maxX="1275" minY="954" maxY="994" name="book-shop-s"/>
-  <symbol minX="1275" maxX="1315" minY="954" maxY="994" name="alcohol-s"/>
-  <symbol minX="1315" maxX="1355" minY="954" maxY="994" name="lawyer-s"/>
-  <symbol minX="1355" maxX="1395" minY="954" maxY="994" name="laundry-s"/>
-  <symbol minX="1395" maxX="1435" minY="954" maxY="994" name="recycling-s"/>
-  <symbol minX="1435" maxX="1475" minY="954" maxY="994" name="postbox-s"/>
-  <symbol minX="1475" maxX="1515" minY="954" maxY="994" name="kiosk-s"/>
-  <symbol minX="1515" maxX="1555" minY="954" maxY="994" name="remains-s"/>
-  <symbol minX="1555" maxX="1595" minY="954" maxY="994" name="kindergarten-s"/>
-  <symbol minX="1595" maxX="1635" minY="954" maxY="994" name="jewish-s"/>
-  <symbol minX="1635" maxX="1675" minY="954" maxY="994" name="restaurant-s"/>
-  <symbol minX="1675" maxX="1715" minY="954" maxY="994" name="jewelry-s"/>
-  <symbol minX="1715" maxX="1755" minY="954" maxY="994" name="information-s"/>
-  <symbol minX="1755" maxX="1795" minY="954" maxY="994" name="hunting-tower-s"/>
-  <symbol minX="1795" maxX="1835" minY="954" maxY="994" name="sauna-s"/>
-  <symbol minX="1835" maxX="1875" minY="954" maxY="994" name="hotel-s"/>
-  <symbol minX="1875" maxX="1915" minY="954" maxY="994" name="hostel-s"/>
-  <symbol minX="1915" maxX="1955" minY="954" maxY="994" name="school-s"/>
-  <symbol minX="1955" maxX="1995" minY="954" maxY="994" name="hospital-s"/>
-  <symbol minX="1995" maxX="2035" minY="954" maxY="994" name="historic-ship-s"/>
+  <symbol minX="147" maxX="196" minY="954" maxY="1003" name="speedcam-m"/>
+  <symbol minX="196" maxX="250" minY="954" maxY="1001" name="subway-moscow-m"/>
+  <symbol minX="250" maxX="297" minY="954" maxY="1001" name="subway-paris-m"/>
+  <symbol minX="297" maxX="344" minY="954" maxY="1001" name="subway-rome-m"/>
+  <symbol minX="344" maxX="391" minY="954" maxY="1001" name="subway-berlin-m"/>
+  <symbol minX="391" maxX="437" minY="954" maxY="1000" name="api-result"/>
+  <symbol minX="437" maxX="495" minY="954" maxY="999" name="subway-london-l"/>
+  <symbol minX="495" maxX="537" minY="954" maxY="996" name="subway-spb-s"/>
+  <symbol minX="537" maxX="593" minY="954" maxY="996" name="subway-london-m"/>
+  <symbol minX="593" maxX="635" minY="954" maxY="996" name="atm-tinkoff-shield-s"/>
+  <symbol minX="635" maxX="686" minY="954" maxY="996" name="subway-barcelona-s"/>
+  <symbol minX="686" maxX="744" minY="954" maxY="996" name="subway-barcelona-m"/>
+  <symbol minX="744" maxX="786" minY="954" maxY="996" name="atm-tinkoff-gerb-s"/>
+  <symbol minX="786" maxX="844" minY="954" maxY="996" name="subway-madrid-m"/>
+  <symbol minX="844" maxX="886" minY="954" maxY="996" name="volcano-s"/>
+  <symbol minX="886" maxX="928" minY="954" maxY="996" name="cave-s"/>
+  <symbol minX="928" maxX="986" minY="954" maxY="995" name="subway-barcelona-l"/>
+  <symbol minX="986" maxX="1044" minY="954" maxY="995" name="subway-madrid-l"/>
+  <symbol minX="1044" maxX="1084" minY="954" maxY="994" name="power-s"/>
+  <symbol minX="1084" maxX="1124" minY="954" maxY="994" name="lift_gate-s"/>
+  <symbol minX="1124" maxX="1164" minY="954" maxY="994" name="library-s"/>
+  <symbol minX="1164" maxX="1204" minY="954" maxY="994" name="public-building-s"/>
+  <symbol minX="1204" maxX="1244" minY="954" maxY="994" name="australian-football-s"/>
+  <symbol minX="1244" maxX="1284" minY="954" maxY="994" name="wayside_shrine-s"/>
+  <symbol minX="1284" maxX="1324" minY="954" maxY="994" name="alcohol-s"/>
+  <symbol minX="1324" maxX="1364" minY="954" maxY="994" name="lawyer-s"/>
+  <symbol minX="1364" maxX="1404" minY="954" maxY="994" name="laundry-s"/>
+  <symbol minX="1404" maxX="1444" minY="954" maxY="994" name="recycling-s"/>
+  <symbol minX="1444" maxX="1484" minY="954" maxY="994" name="book-shop-s"/>
+  <symbol minX="1484" maxX="1524" minY="954" maxY="994" name="kiosk-s"/>
+  <symbol minX="1524" maxX="1564" minY="954" maxY="994" name="remains-s"/>
+  <symbol minX="1564" maxX="1604" minY="954" maxY="994" name="kindergarten-s"/>
+  <symbol minX="1604" maxX="1644" minY="954" maxY="994" name="jewish-s"/>
+  <symbol minX="1644" maxX="1684" minY="954" maxY="994" name="restaurant-s"/>
+  <symbol minX="1684" maxX="1724" minY="954" maxY="994" name="jewelry-s"/>
+  <symbol minX="1724" maxX="1764" minY="954" maxY="994" name="information-s"/>
+  <symbol minX="1764" maxX="1804" minY="954" maxY="994" name="hunting-tower-s"/>
+  <symbol minX="1804" maxX="1844" minY="954" maxY="994" name="sauna-s"/>
+  <symbol minX="1844" maxX="1884" minY="954" maxY="994" name="hotel-s"/>
+  <symbol minX="1884" maxX="1924" minY="954" maxY="994" name="hostel-s"/>
+  <symbol minX="1924" maxX="1964" minY="954" maxY="994" name="school-s"/>
+  <symbol minX="1964" maxX="2004" minY="954" maxY="994" name="hospital-s"/>
+  <symbol minX="2004" maxX="2044" minY="954" maxY="994" name="historic-ship-s"/>
   <symbol minX="0" maxX="40" minY="1003" maxY="1043" name="seafood-shop-s"/>
   <symbol minX="40" maxX="80" minY="1003" maxY="1043" name="hindu-s"/>
   <symbol minX="80" maxX="120" minY="1003" maxY="1043" name="heliport-s"/>
@@ -479,10 +479,10 @@
   <symbol minX="840" maxX="880" minY="1003" maxY="1043" name="gallery-s"/>
   <symbol minX="880" maxX="920" minY="1003" maxY="1043" name="soccer-s"/>
   <symbol minX="920" maxX="960" minY="1003" maxY="1043" name="furniture-s"/>
-  <symbol minX="960" maxX="1000" minY="1003" maxY="1043" name="mail-s"/>
+  <symbol minX="960" maxX="1000" minY="1003" maxY="1043" name="postbox-s"/>
   <symbol minX="1000" maxX="1040" minY="1003" maxY="1043" name="bakery-s"/>
   <symbol minX="1040" maxX="1080" minY="1003" maxY="1043" name="funicular-s"/>
-  <symbol minX="1080" maxX="1120" minY="1003" maxY="1043" name="marketplace-s"/>
+  <symbol minX="1080" maxX="1120" minY="1003" maxY="1043" name="mail-s"/>
   <symbol minX="1120" maxX="1160" minY="1003" maxY="1043" name="fuel-s"/>
   <symbol minX="1160" maxX="1200" minY="1003" maxY="1043" name="fountain-s"/>
   <symbol minX="1200" maxX="1240" minY="1003" maxY="1043" name="sports-s"/>
@@ -491,55 +491,55 @@
   <symbol minX="1320" maxX="1360" minY="1003" maxY="1043" name="stadium-s"/>
   <symbol minX="1360" maxX="1400" minY="1003" maxY="1043" name="bank-s"/>
   <symbol minX="1400" maxX="1440" minY="1003" maxY="1043" name="alpine_hut-s"/>
-  <symbol minX="1440" maxX="1480" minY="1003" maxY="1043" name="police-s"/>
-  <symbol minX="1480" maxX="1520" minY="1003" maxY="1043" name="military-s"/>
-  <symbol minX="1520" maxX="1560" minY="1003" maxY="1043" name="mobile_phone-s"/>
-  <symbol minX="1560" maxX="1600" minY="1003" maxY="1043" name="monument-s"/>
-  <symbol minX="1600" maxX="1640" minY="1003" maxY="1043" name="place-of-worship-s"/>
-  <symbol minX="1640" maxX="1680" minY="1003" maxY="1043" name="motel-s"/>
+  <symbol minX="1440" maxX="1480" minY="1003" maxY="1043" name="marketplace-s"/>
+  <symbol minX="1480" maxX="1520" minY="1003" maxY="1043" name="police-s"/>
+  <symbol minX="1520" maxX="1560" minY="1003" maxY="1043" name="military-s"/>
+  <symbol minX="1560" maxX="1600" minY="1003" maxY="1043" name="mobile_phone-s"/>
+  <symbol minX="1600" maxX="1640" minY="1003" maxY="1043" name="monument-s"/>
+  <symbol minX="1640" maxX="1680" minY="1003" maxY="1043" name="place-of-worship-s"/>
   <symbol minX="1680" maxX="1720" minY="1003" maxY="1043" name="bookmaker-s"/>
   <symbol minX="1720" maxX="1760" minY="1003" maxY="1043" name="fire_station-s"/>
-  <symbol minX="1760" maxX="1800" minY="1003" maxY="1043" name="motorcycle_shop-s"/>
+  <symbol minX="1760" maxX="1800" minY="1003" maxY="1043" name="motel-s"/>
   <symbol minX="1800" maxX="1840" minY="1003" maxY="1043" name="subway-entrance-s"/>
   <symbol minX="1840" maxX="1880" minY="1003" maxY="1043" name="waterfall-s"/>
-  <symbol minX="1880" maxX="1920" minY="1003" maxY="1043" name="bowls-s"/>
+  <symbol minX="1880" maxX="1920" minY="1003" maxY="1043" name="lighthouse-s"/>
   <symbol minX="1920" maxX="1960" minY="1003" maxY="1043" name="banknote-s"/>
   <symbol minX="1960" maxX="2000" minY="1003" maxY="1043" name="fastfood-s"/>
-  <symbol minX="2000" maxX="2040" minY="1003" maxY="1043" name="pitch-s"/>
-  <symbol minX="0" maxX="40" minY="1043" maxY="1083" name="museum-s"/>
-  <symbol minX="40" maxX="80" minY="1043" maxY="1083" name="buddhist-s"/>
+  <symbol minX="2000" maxX="2040" minY="1003" maxY="1043" name="motorcycle_shop-s"/>
+  <symbol minX="0" maxX="40" minY="1043" maxY="1083" name="pitch-s"/>
+  <symbol minX="40" maxX="80" minY="1043" maxY="1083" name="bowls-s"/>
   <symbol minX="80" maxX="120" minY="1043" maxY="1083" name="equestrian-s"/>
-  <symbol minX="120" maxX="160" minY="1043" maxY="1083" name="muslim-s"/>
-  <symbol minX="160" maxX="200" minY="1043" maxY="1083" name="picnic-s"/>
-  <symbol minX="200" maxX="240" minY="1043" maxY="1083" name="waste-basket-s"/>
+  <symbol minX="120" maxX="160" minY="1043" maxY="1083" name="museum-s"/>
+  <symbol minX="160" maxX="200" minY="1043" maxY="1083" name="muslim-s"/>
+  <symbol minX="200" maxX="240" minY="1043" maxY="1083" name="buddhist-s"/>
   <symbol minX="240" maxX="280" minY="1043" maxY="1083" name="bar-s"/>
   <symbol minX="280" maxX="320" minY="1043" maxY="1083" name="america-football-s"/>
   <symbol minX="320" maxX="360" minY="1043" maxY="1083" name="baseball-s"/>
-  <symbol minX="360" maxX="400" minY="1043" maxY="1083" name="npark-s"/>
-  <symbol minX="400" maxX="440" minY="1043" maxY="1083" name="nparkf-s"/>
-  <symbol minX="440" maxX="480" minY="1043" maxY="1083" name="bus-s"/>
+  <symbol minX="360" maxX="400" minY="1043" maxY="1083" name="picnic-s"/>
+  <symbol minX="400" maxX="440" minY="1043" maxY="1083" name="npark-s"/>
+  <symbol minX="440" maxX="480" minY="1043" maxY="1083" name="waste-basket-s"/>
   <symbol minX="480" maxX="520" minY="1043" maxY="1083" name="basketball-s"/>
   <symbol minX="520" maxX="560" minY="1043" maxY="1083" name="apartment-s"/>
   <symbol minX="560" maxX="600" minY="1043" maxY="1083" name="subway-newyork-s"/>
   <symbol minX="600" maxX="640" minY="1043" maxY="1083" name="bbq-s"/>
   <symbol minX="640" maxX="680" minY="1043" maxY="1083" name="embassy-s"/>
-  <symbol minX="680" maxX="720" minY="1043" maxY="1083" name="photo-shop-s"/>
-  <symbol minX="720" maxX="760" minY="1043" maxY="1083" name="butcher-s"/>
-  <symbol minX="760" maxX="800" minY="1043" maxY="1083" name="office-s"/>
-  <symbol minX="800" maxX="840" minY="1043" maxY="1083" name="optician-s"/>
-  <symbol minX="840" maxX="880" minY="1043" maxY="1083" name="lighthouse-s"/>
+  <symbol minX="680" maxX="720" minY="1043" maxY="1083" name="nparkf-s"/>
+  <symbol minX="720" maxX="760" minY="1043" maxY="1083" name="bus-s"/>
+  <symbol minX="760" maxX="800" minY="1043" maxY="1083" name="photo-shop-s"/>
+  <symbol minX="800" maxX="840" minY="1043" maxY="1083" name="office-s"/>
+  <symbol minX="840" maxX="880" minY="1043" maxY="1083" name="butcher-s"/>
   <symbol minX="880" maxX="920" minY="1043" maxY="1083" name="subway-s"/>
   <symbol minX="920" maxX="960" minY="1043" maxY="1083" name="electronics-s"/>
-  <symbol minX="960" maxX="1000" minY="1043" maxY="1083" name="phone-s"/>
-  <symbol minX="1000" maxX="1040" minY="1043" maxY="1083" name="outdoor-shop-s"/>
+  <symbol minX="960" maxX="1000" minY="1043" maxY="1083" name="optician-s"/>
+  <symbol minX="1000" maxX="1040" minY="1043" maxY="1083" name="phone-s"/>
   <symbol minX="1040" maxX="1080" minY="1043" maxY="1083" name="bcontrol-s"/>
   <symbol minX="1080" maxX="1120" minY="1043" maxY="1083" name="archery-s"/>
   <symbol minX="1120" maxX="1160" minY="1043" maxY="1083" name="beach-s"/>
   <symbol minX="1160" maxX="1200" minY="1043" maxY="1083" name="beauty-s"/>
   <symbol minX="1200" maxX="1240" minY="1043" maxY="1083" name="drinking-water-s"/>
-  <symbol minX="1240" maxX="1280" minY="1043" maxY="1083" name="atm-s"/>
+  <symbol minX="1240" maxX="1280" minY="1043" maxY="1083" name="outdoor-shop-s"/>
   <symbol minX="1280" maxX="1320" minY="1043" maxY="1083" name="sweets-s"/>
-  <symbol minX="1320" maxX="1360" minY="1043" maxY="1083" name="beer-s"/>
+  <symbol minX="1320" maxX="1360" minY="1043" maxY="1083" name="atm-s"/>
   <symbol minX="1360" maxX="1400" minY="1043" maxY="1083" name="doityourself-s"/>
   <symbol minX="1400" maxX="1440" minY="1043" maxY="1083" name="swimming-s"/>
   <symbol minX="1440" maxX="1480" minY="1043" maxY="1083" name="dog_park-s"/>
@@ -549,10 +549,10 @@
   <symbol minX="1600" maxX="1640" minY="1043" maxY="1083" name="dentist-s"/>
   <symbol minX="1640" maxX="1680" minY="1043" maxY="1083" name="taxi-s"/>
   <symbol minX="1680" maxX="1720" minY="1043" maxY="1083" name="curling-s"/>
-  <symbol minX="1720" maxX="1760" minY="1043" maxY="1083" name="park-s"/>
+  <symbol minX="1720" maxX="1760" minY="1043" maxY="1083" name="beer-s"/>
   <symbol minX="1760" maxX="1800" minY="1043" maxY="1083" name="tennis-s"/>
-  <symbol minX="1800" maxX="1840" minY="1043" maxY="1083" name="pharmacy-s"/>
-  <symbol minX="1840" maxX="1880" minY="1043" maxY="1083" name="zoo-s"/>
+  <symbol minX="1800" maxX="1840" minY="1043" maxY="1083" name="park-s"/>
+  <symbol minX="1840" maxX="1880" minY="1043" maxY="1083" name="pharmacy-s"/>
   <symbol minX="1880" maxX="1920" minY="1043" maxY="1083" name="theatre-s"/>
   <symbol minX="1920" maxX="1960" minY="1043" maxY="1083" name="cricket-s"/>
   <symbol minX="1960" maxX="2000" minY="1043" maxY="1083" name="copyshop-s"/>
@@ -564,10 +564,10 @@
   <symbol minX="160" maxX="200" minY="1083" maxY="1123" name="clothes-s"/>
   <symbol minX="200" maxX="240" minY="1083" maxY="1123" name="toilets-s"/>
   <symbol minX="240" maxX="280" minY="1083" maxY="1123" name="climbing-s"/>
-  <symbol minX="280" maxX="320" minY="1083" maxY="1123" name="cable-car-s"/>
+  <symbol minX="280" maxX="320" minY="1083" maxY="1123" name="zoo-s"/>
   <symbol minX="320" maxX="360" minY="1083" maxY="1123" name="toll_booth-s"/>
-  <symbol minX="360" maxX="400" minY="1083" maxY="1123" name="bicycle-s"/>
-  <symbol minX="400" maxX="440" minY="1083" maxY="1123" name="windmill-s"/>
+  <symbol minX="360" maxX="400" minY="1083" maxY="1123" name="airport-s"/>
+  <symbol minX="400" maxX="440" minY="1083" maxY="1123" name="bicycle-s"/>
   <symbol minX="440" maxX="480" minY="1083" maxY="1123" name="cinema-s"/>
   <symbol minX="480" maxX="520" minY="1083" maxY="1123" name="tomb-s"/>
   <symbol minX="520" maxX="560" minY="1083" maxY="1123" name="christian-s"/>
@@ -579,8 +579,8 @@
   <symbol minX="760" maxX="800" minY="1083" maxY="1123" name="cemetery-s"/>
   <symbol minX="800" maxX="840" minY="1083" maxY="1123" name="parking-meter-s"/>
   <symbol minX="840" maxX="880" minY="1083" maxY="1123" name="train-s"/>
-  <symbol minX="880" maxX="920" minY="1083" maxY="1123" name="petshop-s"/>
-  <symbol minX="920" maxX="960" minY="1083" maxY="1123" name="airport-s"/>
+  <symbol minX="880" maxX="920" minY="1083" maxY="1123" name="windmill-s"/>
+  <symbol minX="920" maxX="960" minY="1083" maxY="1123" name="petshop-s"/>
   <symbol minX="960" maxX="1000" minY="1083" maxY="1123" name="casino-s"/>
   <symbol minX="1000" maxX="1040" minY="1083" maxY="1123" name="tram-s"/>
   <symbol minX="1040" maxX="1080" minY="1083" maxY="1123" name="caravan_site-s"/>
@@ -595,52 +595,53 @@
   <symbol minX="1400" maxX="1440" minY="1083" maxY="1123" name="campsite-s"/>
   <symbol minX="1440" maxX="1480" minY="1083" maxY="1123" name="cafe-s"/>
   <symbol minX="1480" maxX="1520" minY="1083" maxY="1123" name="viewpoint-s"/>
-  <symbol minX="1520" maxX="1578" minY="1083" maxY="1122" name="railway-crossing-xl"/>
-  <symbol minX="1578" maxX="1616" minY="1083" maxY="1121" name="peakt-l"/>
-  <symbol minX="1616" maxX="1672" minY="1083" maxY="1121" name="subway-kiev-l"/>
-  <symbol minX="1672" maxX="1710" minY="1083" maxY="1121" name="subway-paris-s"/>
-  <symbol minX="1710" maxX="1766" minY="1083" maxY="1121" name="subway-kiev-m"/>
-  <symbol minX="1766" maxX="1817" minY="1083" maxY="1121" name="subway-madrid-s"/>
-  <symbol minX="1817" maxX="1855" minY="1083" maxY="1121" name="lightrail-berlin-s"/>
-  <symbol minX="1855" maxX="1891" minY="1083" maxY="1119" name="subway-moscow-s"/>
-  <symbol minX="1891" maxX="1929" minY="1083" maxY="1116" name="bench"/>
-  <symbol minX="1929" maxX="1962" minY="1083" maxY="1116" name="subway-berlin-s"/>
-  <symbol minX="1962" maxX="1995" minY="1083" maxY="1116" name="subway-rome-s"/>
-  <symbol minX="1995" maxX="2037" minY="1083" maxY="1116" name="subway-london-s"/>
-  <symbol minX="0" maxX="31" minY="1123" maxY="1154" name="bike-parking-s"/>
-  <symbol minX="31" maxX="62" minY="1123" maxY="1154" name="train-xs"/>
-  <symbol minX="62" maxX="93" minY="1123" maxY="1154" name="parking-s"/>
-  <symbol minX="93" maxX="142" minY="1123" maxY="1154" name="railway-crossing-l"/>
-  <symbol minX="142" maxX="173" minY="1123" maxY="1154" name="speedcam-s"/>
-  <symbol minX="173" maxX="204" minY="1123" maxY="1154" name="star-l"/>
-  <symbol minX="204" maxX="260" minY="1123" maxY="1154" name="subway-minsk-l"/>
-  <symbol minX="260" maxX="291" minY="1123" maxY="1154" name="parking_pay-s"/>
-  <symbol minX="291" maxX="322" minY="1123" maxY="1154" name="subway-newyork-xs"/>
-  <symbol minX="322" maxX="353" minY="1123" maxY="1154" name="subway-xs"/>
-  <symbol minX="353" maxX="384" minY="1123" maxY="1154" name="survey_point-l"/>
-  <symbol minX="384" maxX="413" minY="1123" maxY="1152" name="star-m"/>
-  <symbol minX="413" maxX="460" minY="1123" maxY="1152" name="subway-kiev-s"/>
-  <symbol minX="460" maxX="487" minY="1123" maxY="1150" name="survey_point-m"/>
-  <symbol minX="487" maxX="516" minY="1123" maxY="1150" name="peakt-m"/>
-  <symbol minX="516" maxX="558" minY="1123" maxY="1150" name="railway-crossing"/>
-  <symbol minX="558" maxX="605" minY="1123" maxY="1150" name="subway-minsk-m"/>
-  <symbol minX="605" maxX="629" minY="1123" maxY="1147" name="star-s"/>
-  <symbol minX="629" maxX="653" minY="1123" maxY="1147" name="crossing-l"/>
-  <symbol minX="653" maxX="695" minY="1123" maxY="1147" name="subway-minsk-s"/>
-  <symbol minX="695" maxX="717" minY="1123" maxY="1145" name="survey_point-s"/>
-  <symbol minX="717" maxX="741" minY="1123" maxY="1145" name="peakt-s"/>
-  <symbol minX="741" maxX="792" minY="1123" maxY="1145" name="arrow-m"/>
-  <symbol minX="792" maxX="812" minY="1123" maxY="1143" name="entrance-s"/>
-  <symbol minX="812" maxX="832" minY="1123" maxY="1143" name="crossing-m"/>
-  <symbol minX="832" maxX="852" minY="1123" maxY="1143" name="zero-icon"/>
-  <symbol minX="852" maxX="867" minY="1123" maxY="1138" name="crossing-s"/>
-  <symbol minX="867" maxX="882" minY="1123" maxY="1138" name="cities-m"/>
-  <symbol minX="882" maxX="920" minY="1123" maxY="1138" name="arrow-s"/>
-  <symbol minX="920" maxX="935" minY="1123" maxY="1138" name="dot-m"/>
-  <symbol minX="935" maxX="948" minY="1123" maxY="1136" name="entrance-xs"/>
-  <symbol minX="948" maxX="959" minY="1123" maxY="1134" name="cities-xs"/>
-  <symbol minX="959" maxX="970" minY="1123" maxY="1134" name="dot-s"/>
-  <symbol minX="970" maxX="994" minY="1123" maxY="1134" name="arrow-xs"/>
-  <symbol minX="994" maxX="1005" minY="1123" maxY="1134" name="cities-s"/>
+  <symbol minX="1520" maxX="1560" minY="1083" maxY="1123" name="cable-car-s"/>
+  <symbol minX="1560" maxX="1618" minY="1083" maxY="1122" name="railway-crossing-xl"/>
+  <symbol minX="1618" maxX="1656" minY="1083" maxY="1121" name="peakt-l"/>
+  <symbol minX="1656" maxX="1712" minY="1083" maxY="1121" name="subway-kiev-m"/>
+  <symbol minX="1712" maxX="1750" minY="1083" maxY="1121" name="subway-paris-s"/>
+  <symbol minX="1750" maxX="1806" minY="1083" maxY="1121" name="subway-kiev-l"/>
+  <symbol minX="1806" maxX="1857" minY="1083" maxY="1121" name="subway-madrid-s"/>
+  <symbol minX="1857" maxX="1895" minY="1083" maxY="1121" name="lightrail-berlin-s"/>
+  <symbol minX="1895" maxX="1931" minY="1083" maxY="1119" name="subway-moscow-s"/>
+  <symbol minX="1931" maxX="1964" minY="1083" maxY="1116" name="subway-berlin-s"/>
+  <symbol minX="1964" maxX="2002" minY="1083" maxY="1116" name="bench"/>
+  <symbol minX="2002" maxX="2035" minY="1083" maxY="1116" name="subway-rome-s"/>
+  <symbol minX="0" maxX="42" minY="1123" maxY="1156" name="subway-london-s"/>
+  <symbol minX="42" maxX="73" minY="1123" maxY="1154" name="bike-parking-s"/>
+  <symbol minX="73" maxX="104" minY="1123" maxY="1154" name="train-xs"/>
+  <symbol minX="104" maxX="135" minY="1123" maxY="1154" name="parking-s"/>
+  <symbol minX="135" maxX="184" minY="1123" maxY="1154" name="railway-crossing-l"/>
+  <symbol minX="184" maxX="215" minY="1123" maxY="1154" name="speedcam-s"/>
+  <symbol minX="215" maxX="246" minY="1123" maxY="1154" name="star-l"/>
+  <symbol minX="246" maxX="302" minY="1123" maxY="1154" name="subway-minsk-l"/>
+  <symbol minX="302" maxX="333" minY="1123" maxY="1154" name="parking_pay-s"/>
+  <symbol minX="333" maxX="364" minY="1123" maxY="1154" name="subway-newyork-xs"/>
+  <symbol minX="364" maxX="395" minY="1123" maxY="1154" name="subway-xs"/>
+  <symbol minX="395" maxX="426" minY="1123" maxY="1154" name="survey_point-l"/>
+  <symbol minX="426" maxX="455" minY="1123" maxY="1152" name="star-m"/>
+  <symbol minX="455" maxX="502" minY="1123" maxY="1152" name="subway-kiev-s"/>
+  <symbol minX="502" maxX="529" minY="1123" maxY="1150" name="survey_point-m"/>
+  <symbol minX="529" maxX="558" minY="1123" maxY="1150" name="peakt-m"/>
+  <symbol minX="558" maxX="600" minY="1123" maxY="1150" name="railway-crossing"/>
+  <symbol minX="600" maxX="647" minY="1123" maxY="1150" name="subway-minsk-m"/>
+  <symbol minX="647" maxX="671" minY="1123" maxY="1147" name="star-s"/>
+  <symbol minX="671" maxX="695" minY="1123" maxY="1147" name="crossing-l"/>
+  <symbol minX="695" maxX="737" minY="1123" maxY="1147" name="subway-minsk-s"/>
+  <symbol minX="737" maxX="759" minY="1123" maxY="1145" name="survey_point-s"/>
+  <symbol minX="759" maxX="783" minY="1123" maxY="1145" name="peakt-s"/>
+  <symbol minX="783" maxX="834" minY="1123" maxY="1145" name="arrow-m"/>
+  <symbol minX="834" maxX="854" minY="1123" maxY="1143" name="entrance-s"/>
+  <symbol minX="854" maxX="874" minY="1123" maxY="1143" name="crossing-m"/>
+  <symbol minX="874" maxX="894" minY="1123" maxY="1143" name="zero-icon"/>
+  <symbol minX="894" maxX="909" minY="1123" maxY="1138" name="crossing-s"/>
+  <symbol minX="909" maxX="924" minY="1123" maxY="1138" name="dot-m"/>
+  <symbol minX="924" maxX="962" minY="1123" maxY="1138" name="arrow-s"/>
+  <symbol minX="962" maxX="977" minY="1123" maxY="1138" name="cities-m"/>
+  <symbol minX="977" maxX="990" minY="1123" maxY="1136" name="entrance-xs"/>
+  <symbol minX="990" maxX="1001" minY="1123" maxY="1134" name="dot-s"/>
+  <symbol minX="1001" maxX="1012" minY="1123" maxY="1134" name="cities-xs"/>
+  <symbol minX="1012" maxX="1036" minY="1123" maxY="1134" name="arrow-xs"/>
+  <symbol minX="1036" maxX="1047" minY="1123" maxY="1134" name="cities-s"/>
  </file>
 </root>