diff --git a/LICENSE.md b/LICENSE.md
index a631f2a..b862282 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -28,6 +28,10 @@ For printed and static maps a similar attribution should be made in a textual de
 
 OSM Liberty is using the [Maki POI icon set](https://github.com/mapbox/maki/blob/master/LICENSE.txt) which is licensed under CC0 1.0 Universal.
 
+The right arrow was derived from [Wikipedia][wiki_arrow] which is in the public domain.
+
+[wiki_arrow]: https://commons.wikimedia.org/wiki/File:Arrowright.svg
+
 ## Fonts
 
 OSM Liberty is using the Roboto font family (Copyright 2011 Google).
diff --git a/sprites/osm-liberty.json b/sprites/osm-liberty.json
index ffe03b5..8d01fc4 100644
--- a/sprites/osm-liberty.json
+++ b/sprites/osm-liberty.json
@@ -3,1030 +3,1051 @@
     "height": 15,
     "pixelRatio": 1,
     "width": 15,
-    "x": 284,
-    "y": 127
+    "x": 314,
+    "y": 0
   },
   "aerialway_15": {
     "height": 19,
     "pixelRatio": 1,
     "width": 19,
-    "x": 80,
-    "y": 190
+    "x": 122,
+    "y": 229
   },
   "airfield_11": {
     "height": 15,
     "pixelRatio": 1,
     "width": 15,
-    "x": 299,
-    "y": 127
+    "x": 329,
+    "y": 0
   },
   "airfield_15": {
     "height": 19,
     "pixelRatio": 1,
     "width": 19,
-    "x": 99,
-    "y": 190
+    "x": 141,
+    "y": 229
   },
   "airport_11": {
     "height": 15,
     "pixelRatio": 1,
     "width": 15,
-    "x": 314,
-    "y": 127
+    "x": 344,
+    "y": 0
   },
   "airport_15": {
     "height": 19,
     "pixelRatio": 1,
     "width": 19,
-    "x": 118,
-    "y": 190
+    "x": 160,
+    "y": 229
   },
   "alcohol_shop_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 381,
-    "y": 210
+    "x": 485,
+    "y": 145
   },
   "alcohol_shop_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 64,
-    "y": 0
+    "x": 104,
+    "y": 94
   },
   "america_football_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 398,
-    "y": 210
+    "x": 418,
+    "y": 166
   },
   "america_football_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 85,
-    "y": 0
+    "x": 117,
+    "y": 64
   },
   "amusement_park_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 415,
-    "y": 210
+    "x": 435,
+    "y": 166
   },
   "amusement_park_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 106,
-    "y": 0
+    "x": 138,
+    "y": 64
   },
   "aquarium_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 432,
-    "y": 210
+    "x": 452,
+    "y": 166
   },
   "aquarium_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 0,
+    "x": 159,
     "y": 64
   },
+  "arrow": {
+    "height": 7,
+    "pixelRatio": 1,
+    "width": 20,
+    "x": 285,
+    "y": 250
+  },
   "art_gallery_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 449,
-    "y": 210
+    "x": 469,
+    "y": 166
   },
   "art_gallery_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 21,
+    "x": 180,
     "y": 64
   },
   "attraction_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 466,
-    "y": 210
+    "x": 486,
+    "y": 166
   },
   "attraction_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 42,
+    "x": 201,
     "y": 64
   },
   "bakery_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 483,
-    "y": 210
+    "x": 252,
+    "y": 187
   },
   "bakery_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 63,
+    "x": 222,
     "y": 64
   },
   "bank_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 227,
-    "y": 229
+    "x": 269,
+    "y": 187
   },
   "bank_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 84,
-    "y": 64
+    "x": 125,
+    "y": 94
   },
   "bar_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 244,
-    "y": 229
+    "x": 286,
+    "y": 187
   },
   "bar_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 105,
-    "y": 64
+    "x": 146,
+    "y": 94
   },
   "baseball_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 261,
-    "y": 229
+    "x": 303,
+    "y": 187
   },
   "baseball_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 0,
-    "y": 85
+    "x": 167,
+    "y": 94
   },
   "basketball_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 278,
-    "y": 229
+    "x": 320,
+    "y": 187
   },
   "basketball_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 21,
-    "y": 85
+    "x": 188,
+    "y": 94
   },
   "beer_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 295,
-    "y": 229
+    "x": 337,
+    "y": 187
   },
   "beer_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 42,
-    "y": 85
+    "x": 209,
+    "y": 94
   },
   "bicycle_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 312,
-    "y": 229
+    "x": 354,
+    "y": 187
   },
   "bicycle_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 63,
-    "y": 85
+    "x": 230,
+    "y": 94
   },
   "bicycle_rental_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 329,
-    "y": 229
+    "x": 371,
+    "y": 187
   },
   "bicycle_rental_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 84,
-    "y": 85
+    "x": 124,
+    "y": 0
   },
   "building_11": {
     "height": 15,
     "pixelRatio": 1,
     "width": 15,
-    "x": 329,
-    "y": 127
+    "x": 359,
+    "y": 0
   },
   "building_15": {
     "height": 19,
     "pixelRatio": 1,
     "width": 19,
-    "x": 137,
-    "y": 190
+    "x": 179,
+    "y": 229
   },
   "bus_11": {
     "height": 15,
     "pixelRatio": 1,
     "width": 15,
-    "x": 344,
-    "y": 127
+    "x": 374,
+    "y": 0
   },
   "bus_15": {
     "height": 19,
     "pixelRatio": 1,
     "width": 19,
-    "x": 156,
-    "y": 190
+    "x": 198,
+    "y": 229
   },
   "butcher_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 346,
-    "y": 229
+    "x": 388,
+    "y": 187
   },
   "butcher_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 105,
-    "y": 85
+    "x": 145,
+    "y": 0
+  },
+  "ca-transcanada_2": {
+    "height": 30,
+    "pixelRatio": 1,
+    "width": 30,
+    "x": 64,
+    "y": 0
   },
   "cafe_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 363,
-    "y": 229
+    "x": 405,
+    "y": 187
   },
   "cafe_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 0,
-    "y": 106
+    "x": 166,
+    "y": 0
   },
   "campsite_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 380,
-    "y": 229
+    "x": 422,
+    "y": 187
   },
   "campsite_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 21,
-    "y": 106
+    "x": 187,
+    "y": 0
   },
   "car_11": {
     "height": 15,
     "pixelRatio": 1,
     "width": 15,
-    "x": 359,
-    "y": 127
+    "x": 389,
+    "y": 0
   },
   "car_15": {
     "height": 19,
     "pixelRatio": 1,
     "width": 19,
-    "x": 175,
-    "y": 190
+    "x": 217,
+    "y": 229
   },
   "castle_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 397,
-    "y": 229
+    "x": 439,
+    "y": 187
   },
   "castle_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 42,
-    "y": 106
+    "x": 208,
+    "y": 0
   },
   "cemetery_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 414,
-    "y": 229
+    "x": 456,
+    "y": 187
   },
   "cemetery_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 63,
-    "y": 106
+    "x": 229,
+    "y": 0
   },
   "cinema_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 431,
-    "y": 229
+    "x": 473,
+    "y": 187
   },
   "cinema_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 84,
-    "y": 106
+    "x": 0,
+    "y": 124
   },
   "circle-stroked_11": {
     "height": 15,
     "pixelRatio": 1,
     "width": 15,
-    "x": 374,
-    "y": 127
+    "x": 404,
+    "y": 0
   },
   "circle-stroked_15": {
     "height": 19,
     "pixelRatio": 1,
     "width": 19,
-    "x": 194,
-    "y": 190
+    "x": 236,
+    "y": 229
   },
   "circle_11": {
     "height": 15,
     "pixelRatio": 1,
     "width": 15,
-    "x": 389,
-    "y": 127
+    "x": 419,
+    "y": 0
   },
   "circle_15": {
     "height": 19,
     "pixelRatio": 1,
     "width": 19,
-    "x": 213,
-    "y": 190
+    "x": 252,
+    "y": 124
   },
   "clothing_store_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 448,
-    "y": 229
+    "x": 490,
+    "y": 187
   },
   "clothing_store_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 105,
-    "y": 106
+    "x": 21,
+    "y": 124
   },
   "college_11": {
     "height": 16,
     "pixelRatio": 1,
     "width": 16,
-    "x": 473,
-    "y": 106
+    "x": 250,
+    "y": 0
   },
   "college_15": {
     "height": 20,
     "pixelRatio": 1,
     "width": 20,
-    "x": 0,
-    "y": 190
+    "x": 42,
+    "y": 229
   },
   "commercial_11": {
     "height": 15,
     "pixelRatio": 1,
     "width": 15,
-    "x": 404,
-    "y": 127
+    "x": 434,
+    "y": 0
   },
   "commercial_15": {
     "height": 19,
     "pixelRatio": 1,
     "width": 19,
-    "x": 232,
-    "y": 190
+    "x": 271,
+    "y": 124
   },
   "cricket_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 465,
-    "y": 229
+    "x": 252,
+    "y": 208
   },
   "cricket_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 126,
-    "y": 64
+    "x": 42,
+    "y": 124
   },
   "cross_11": {
     "height": 15,
     "pixelRatio": 1,
     "width": 15,
-    "x": 419,
-    "y": 127
+    "x": 449,
+    "y": 0
   },
   "cross_15": {
     "height": 19,
     "pixelRatio": 1,
     "width": 19,
-    "x": 0,
-    "y": 210
+    "x": 290,
+    "y": 124
   },
   "dam_11": {
     "height": 15,
     "pixelRatio": 1,
     "width": 15,
-    "x": 434,
-    "y": 127
+    "x": 464,
+    "y": 0
   },
   "dam_15": {
     "height": 19,
     "pixelRatio": 1,
     "width": 19,
-    "x": 19,
-    "y": 210
+    "x": 309,
+    "y": 124
   },
   "danger_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 482,
-    "y": 229
+    "x": 269,
+    "y": 208
   },
   "danger_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 147,
-    "y": 64
+    "x": 63,
+    "y": 124
   },
   "default_1": {
     "height": 18,
     "pixelRatio": 1,
     "width": 18,
-    "x": 152,
-    "y": 229
+    "x": 442,
+    "y": 145
   },
   "default_2": {
     "height": 18,
     "pixelRatio": 1,
     "width": 25,
-    "x": 170,
-    "y": 229
+    "x": 460,
+    "y": 145
   },
   "default_3": {
     "height": 18,
     "pixelRatio": 1,
     "width": 32,
-    "x": 195,
-    "y": 229
+    "x": 252,
+    "y": 166
   },
   "default_4": {
     "height": 18,
     "pixelRatio": 1,
     "width": 39,
-    "x": 247,
-    "y": 210
+    "x": 284,
+    "y": 166
   },
   "default_5": {
     "height": 18,
     "pixelRatio": 1,
     "width": 45,
-    "x": 286,
-    "y": 210
+    "x": 323,
+    "y": 166
   },
   "default_6": {
     "height": 18,
     "pixelRatio": 1,
     "width": 50,
-    "x": 331,
-    "y": 210
+    "x": 368,
+    "y": 166
   },
   "dentist_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 251,
-    "y": 190
+    "x": 286,
+    "y": 208
   },
   "dentist_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 168,
-    "y": 64
+    "x": 84,
+    "y": 124
   },
   "doctor_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 268,
-    "y": 190
+    "x": 303,
+    "y": 208
   },
   "doctor_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 189,
-    "y": 64
+    "x": 105,
+    "y": 124
   },
   "dog_park_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 285,
-    "y": 190
+    "x": 320,
+    "y": 208
   },
   "dog_park_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 210,
-    "y": 64
+    "x": 126,
+    "y": 124
   },
   "dot_10": {
     "height": 10,
     "pixelRatio": 1,
     "width": 10,
-    "x": 499,
-    "y": 229
+    "x": 266,
+    "y": 250
   },
   "dot_11": {
     "height": 11,
     "pixelRatio": 1,
     "width": 11,
-    "x": 500,
-    "y": 210
+    "x": 255,
+    "y": 250
   },
   "dot_9": {
     "height": 9,
     "pixelRatio": 1,
     "width": 9,
-    "x": 477,
-    "y": 148
+    "x": 276,
+    "y": 250
   },
   "drinking-water_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 302,
-    "y": 190
+    "x": 337,
+    "y": 208
   },
   "drinking_water_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 231,
-    "y": 64
+    "x": 147,
+    "y": 124
   },
   "embassy_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 319,
-    "y": 190
+    "x": 354,
+    "y": 208
   },
   "embassy_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 126,
-    "y": 85
+    "x": 168,
+    "y": 124
   },
   "entrance_11": {
     "height": 15,
     "pixelRatio": 1,
     "width": 15,
-    "x": 449,
-    "y": 127
+    "x": 479,
+    "y": 0
   },
   "entrance_15": {
     "height": 19,
     "pixelRatio": 1,
     "width": 19,
-    "x": 38,
-    "y": 210
+    "x": 328,
+    "y": 124
   },
   "fast_food_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 336,
-    "y": 190
+    "x": 371,
+    "y": 208
   },
   "fast_food_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 147,
-    "y": 85
+    "x": 189,
+    "y": 124
   },
   "ferry_11": {
     "height": 15,
     "pixelRatio": 1,
     "width": 15,
-    "x": 464,
-    "y": 127
+    "x": 494,
+    "y": 0
   },
   "ferry_15": {
     "height": 19,
     "pixelRatio": 1,
     "width": 19,
-    "x": 57,
-    "y": 210
+    "x": 347,
+    "y": 124
   },
   "fire-station_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 353,
-    "y": 190
+    "x": 388,
+    "y": 208
   },
   "fire-station_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 168,
-    "y": 85
+    "x": 210,
+    "y": 124
   },
   "fuel_11": {
     "height": 15,
     "pixelRatio": 1,
     "width": 15,
-    "x": 479,
-    "y": 127
+    "x": 0,
+    "y": 250
   },
   "fuel_15": {
     "height": 19,
     "pixelRatio": 1,
     "width": 19,
-    "x": 76,
-    "y": 210
+    "x": 366,
+    "y": 124
   },
   "garden_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 370,
-    "y": 190
+    "x": 405,
+    "y": 208
   },
   "garden_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 189,
-    "y": 85
+    "x": 231,
+    "y": 124
+  },
+  "gb-motorway_3": {
+    "height": 30,
+    "pixelRatio": 1,
+    "width": 50,
+    "x": 0,
+    "y": 64
   },
   "gift_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 387,
-    "y": 190
+    "x": 422,
+    "y": 208
   },
   "gift_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 210,
-    "y": 85
+    "x": 0,
+    "y": 145
   },
   "golf_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 404,
-    "y": 190
+    "x": 439,
+    "y": 208
   },
   "golf_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 231,
-    "y": 85
+    "x": 21,
+    "y": 145
   },
   "grocery_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 421,
-    "y": 190
+    "x": 456,
+    "y": 208
   },
   "grocery_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 126,
-    "y": 106
+    "x": 42,
+    "y": 145
   },
   "hairdresser_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 438,
-    "y": 190
+    "x": 473,
+    "y": 208
   },
   "hairdresser_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 147,
-    "y": 106
+    "x": 63,
+    "y": 145
   },
   "harbor_11": {
     "height": 15,
     "pixelRatio": 1,
     "width": 15,
-    "x": 494,
-    "y": 127
+    "x": 15,
+    "y": 250
   },
   "harbor_15": {
     "height": 19,
     "pixelRatio": 1,
     "width": 19,
-    "x": 95,
-    "y": 210
+    "x": 385,
+    "y": 124
   },
   "heart_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 455,
-    "y": 190
+    "x": 490,
+    "y": 208
   },
   "heart_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 168,
-    "y": 106
+    "x": 84,
+    "y": 145
   },
   "heliport_11": {
     "height": 15,
     "pixelRatio": 1,
     "width": 15,
-    "x": 252,
-    "y": 148
+    "x": 30,
+    "y": 250
   },
   "heliport_15": {
     "height": 19,
     "pixelRatio": 1,
     "width": 19,
-    "x": 114,
-    "y": 210
+    "x": 404,
+    "y": 124
   },
   "hospital_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 472,
-    "y": 190
+    "x": 255,
+    "y": 229
   },
   "hospital_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 189,
-    "y": 106
+    "x": 105,
+    "y": 145
   },
   "ice_cream_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 489,
-    "y": 190
+    "x": 272,
+    "y": 229
   },
   "ice_cream_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 210,
-    "y": 106
+    "x": 126,
+    "y": 145
   },
   "industry_11": {
     "height": 15,
     "pixelRatio": 1,
     "width": 15,
-    "x": 267,
-    "y": 148
+    "x": 45,
+    "y": 250
   },
   "industry_15": {
     "height": 19,
     "pixelRatio": 1,
     "width": 19,
-    "x": 133,
-    "y": 210
+    "x": 423,
+    "y": 124
   },
   "information_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 252,
-    "y": 64
+    "x": 289,
+    "y": 229
   },
   "information_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 231,
-    "y": 106
+    "x": 147,
+    "y": 145
   },
   "laundry_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 269,
-    "y": 64
+    "x": 306,
+    "y": 229
   },
   "laundry_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 127,
-    "y": 0
+    "x": 168,
+    "y": 145
   },
   "library_11": {
     "height": 16,
     "pixelRatio": 1,
     "width": 16,
-    "x": 489,
-    "y": 106
+    "x": 266,
+    "y": 0
   },
   "library_15": {
     "height": 20,
     "pixelRatio": 1,
     "width": 20,
-    "x": 20,
-    "y": 190
+    "x": 62,
+    "y": 229
   },
   "lighthouse_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 286,
-    "y": 64
+    "x": 323,
+    "y": 229
   },
   "lighthouse_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 148,
-    "y": 0
+    "x": 189,
+    "y": 145
   },
   "lodging_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 303,
-    "y": 64
+    "x": 340,
+    "y": 229
   },
   "lodging_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 169,
-    "y": 0
+    "x": 210,
+    "y": 145
   },
   "marker_11": {
     "height": 15,
     "pixelRatio": 1,
     "width": 15,
-    "x": 282,
-    "y": 148
+    "x": 60,
+    "y": 250
   },
   "marker_15": {
     "height": 19,
     "pixelRatio": 1,
     "width": 19,
-    "x": 152,
-    "y": 210
+    "x": 442,
+    "y": 124
   },
   "monument_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 320,
-    "y": 64
+    "x": 357,
+    "y": 229
   },
   "monument_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 190,
-    "y": 0
+    "x": 231,
+    "y": 145
   },
   "mountain_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 337,
-    "y": 64
+    "x": 374,
+    "y": 229
   },
   "mountain_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 211,
-    "y": 0
+    "x": 0,
+    "y": 166
   },
   "museum_11": {
     "height": 16,
     "pixelRatio": 1,
     "width": 16,
-    "x": 252,
-    "y": 127
+    "x": 282,
+    "y": 0
   },
   "museum_15": {
     "height": 20,
     "pixelRatio": 1,
     "width": 20,
-    "x": 40,
-    "y": 190
+    "x": 82,
+    "y": 229
   },
   "music_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 354,
-    "y": 64
+    "x": 391,
+    "y": 229
   },
   "music_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 232,
-    "y": 0
+    "x": 21,
+    "y": 166
   },
   "park_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 371,
-    "y": 64
+    "x": 408,
+    "y": 229
   },
   "park_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 0,
-    "y": 127
+    "x": 42,
+    "y": 166
   },
   "parking_11": {
     "height": 15,
     "pixelRatio": 1,
     "width": 15,
-    "x": 297,
-    "y": 148
+    "x": 75,
+    "y": 250
   },
   "parking_15": {
     "height": 19,
     "pixelRatio": 1,
     "width": 19,
-    "x": 171,
-    "y": 210
+    "x": 461,
+    "y": 124
   },
   "parking_garage_11": {
     "height": 15,
     "pixelRatio": 1,
     "width": 15,
-    "x": 312,
-    "y": 148
+    "x": 90,
+    "y": 250
   },
   "parking_garage_15": {
     "height": 19,
     "pixelRatio": 1,
     "width": 19,
-    "x": 190,
-    "y": 210
+    "x": 480,
+    "y": 124
   },
   "pedestrian_polygon": {
     "height": 64,
@@ -1039,644 +1060,686 @@
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 388,
-    "y": 64
+    "x": 425,
+    "y": 229
   },
   "pharmacy_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 21,
-    "y": 127
+    "x": 63,
+    "y": 166
   },
   "picnic_site_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 405,
-    "y": 64
+    "x": 442,
+    "y": 229
   },
   "picnic_site_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 42,
-    "y": 127
+    "x": 84,
+    "y": 166
   },
   "pitch_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 422,
-    "y": 64
+    "x": 459,
+    "y": 229
   },
   "pitch_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 63,
-    "y": 127
+    "x": 105,
+    "y": 166
   },
   "place_of_worship_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 439,
-    "y": 64
+    "x": 476,
+    "y": 229
   },
   "place_of_worship_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 84,
-    "y": 127
+    "x": 126,
+    "y": 166
   },
   "playground_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 456,
-    "y": 64
+    "x": 493,
+    "y": 229
   },
   "playground_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 105,
-    "y": 127
+    "x": 147,
+    "y": 166
   },
   "police_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 473,
+    "x": 243,
     "y": 64
   },
   "police_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 126,
-    "y": 127
+    "x": 168,
+    "y": 166
   },
   "post_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 490,
+    "x": 260,
     "y": 64
   },
   "post_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 147,
-    "y": 127
+    "x": 189,
+    "y": 166
   },
   "prison_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 252,
-    "y": 85
+    "x": 277,
+    "y": 64
   },
   "prison_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 168,
-    "y": 127
+    "x": 210,
+    "y": 166
   },
   "railway_11": {
     "height": 15,
     "pixelRatio": 1,
     "width": 15,
-    "x": 327,
-    "y": 148
+    "x": 105,
+    "y": 250
   },
   "railway_15": {
     "height": 19,
     "pixelRatio": 1,
     "width": 19,
-    "x": 209,
-    "y": 210
+    "x": 252,
+    "y": 145
   },
   "railway_light_11": {
     "height": 15,
     "pixelRatio": 1,
     "width": 15,
-    "x": 342,
-    "y": 148
+    "x": 120,
+    "y": 250
   },
   "railway_light_15": {
     "height": 19,
     "pixelRatio": 1,
     "width": 19,
-    "x": 228,
-    "y": 210
+    "x": 271,
+    "y": 145
   },
   "railway_metro_11": {
     "height": 15,
     "pixelRatio": 1,
     "width": 15,
-    "x": 357,
-    "y": 148
+    "x": 135,
+    "y": 250
   },
   "railway_metro_15": {
     "height": 19,
     "pixelRatio": 1,
     "width": 19,
-    "x": 0,
-    "y": 229
+    "x": 290,
+    "y": 145
   },
   "ranger_station_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 269,
-    "y": 85
+    "x": 294,
+    "y": 64
   },
   "ranger_station_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 189,
-    "y": 127
+    "x": 231,
+    "y": 166
   },
   "religious_christian_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 286,
-    "y": 85
+    "x": 311,
+    "y": 64
   },
   "religious_christian_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 210,
-    "y": 127
+    "x": 0,
+    "y": 187
   },
   "religious_jewish_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 303,
-    "y": 85
+    "x": 328,
+    "y": 64
   },
   "religious_jewish_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 231,
-    "y": 127
+    "x": 21,
+    "y": 187
   },
   "religious_muslim_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 320,
-    "y": 85
+    "x": 345,
+    "y": 64
   },
   "religious_muslim_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 0,
-    "y": 148
+    "x": 42,
+    "y": 187
   },
   "restaurant_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 337,
-    "y": 85
+    "x": 362,
+    "y": 64
   },
   "restaurant_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 21,
-    "y": 148
+    "x": 63,
+    "y": 187
   },
   "roadblock_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 354,
-    "y": 85
+    "x": 379,
+    "y": 64
   },
   "roadblock_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 42,
-    "y": 148
+    "x": 84,
+    "y": 187
   },
   "rocket_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 371,
-    "y": 85
+    "x": 396,
+    "y": 64
   },
   "rocket_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 63,
-    "y": 148
+    "x": 105,
+    "y": 187
   },
   "school_11": {
     "height": 16,
     "pixelRatio": 1,
     "width": 16,
-    "x": 268,
-    "y": 127
+    "x": 298,
+    "y": 0
   },
   "school_15": {
     "height": 20,
     "pixelRatio": 1,
     "width": 20,
-    "x": 60,
-    "y": 190
+    "x": 102,
+    "y": 229
   },
   "shelter_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 388,
-    "y": 85
+    "x": 413,
+    "y": 64
   },
   "shelter_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 84,
-    "y": 148
+    "x": 126,
+    "y": 187
   },
   "shop_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 405,
-    "y": 85
+    "x": 430,
+    "y": 64
   },
   "shop_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 105,
-    "y": 148
+    "x": 147,
+    "y": 187
   },
   "skiing_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 422,
-    "y": 85
+    "x": 447,
+    "y": 64
   },
   "skiing_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 126,
-    "y": 148
+    "x": 168,
+    "y": 187
   },
   "soccer_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 439,
-    "y": 85
+    "x": 464,
+    "y": 64
   },
   "soccer_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 147,
-    "y": 148
+    "x": 189,
+    "y": 187
   },
   "square-stroke_11": {
     "height": 15,
     "pixelRatio": 1,
     "width": 15,
-    "x": 372,
-    "y": 148
+    "x": 150,
+    "y": 250
   },
   "square-stroke_15": {
     "height": 19,
     "pixelRatio": 1,
     "width": 19,
-    "x": 19,
-    "y": 229
+    "x": 309,
+    "y": 145
   },
   "square_11": {
     "height": 15,
     "pixelRatio": 1,
     "width": 15,
-    "x": 387,
-    "y": 148
+    "x": 165,
+    "y": 250
   },
   "square_15": {
     "height": 19,
     "pixelRatio": 1,
     "width": 19,
-    "x": 38,
-    "y": 229
+    "x": 328,
+    "y": 145
   },
   "stadium_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 456,
-    "y": 85
+    "x": 481,
+    "y": 64
   },
   "stadium_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 168,
-    "y": 148
+    "x": 210,
+    "y": 187
   },
   "star-stroke_11": {
     "height": 15,
     "pixelRatio": 1,
     "width": 15,
-    "x": 402,
-    "y": 148
+    "x": 180,
+    "y": 250
   },
   "star-stroke_15": {
     "height": 19,
     "pixelRatio": 1,
     "width": 19,
-    "x": 57,
-    "y": 229
+    "x": 347,
+    "y": 145
   },
   "star_11": {
     "height": 15,
     "pixelRatio": 1,
     "width": 15,
-    "x": 417,
-    "y": 148
+    "x": 195,
+    "y": 250
   },
   "star_15": {
     "height": 19,
     "pixelRatio": 1,
     "width": 19,
-    "x": 76,
-    "y": 229
+    "x": 366,
+    "y": 145
   },
   "suitcase_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 473,
-    "y": 85
+    "x": 251,
+    "y": 94
   },
   "suitcase_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 189,
-    "y": 148
+    "x": 231,
+    "y": 187
   },
   "sushi_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 490,
-    "y": 85
+    "x": 268,
+    "y": 94
   },
   "sushi_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 210,
-    "y": 148
+    "x": 0,
+    "y": 208
   },
   "swimming_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 252,
-    "y": 106
+    "x": 285,
+    "y": 94
   },
   "swimming_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 231,
-    "y": 148
+    "x": 21,
+    "y": 208
   },
   "telephone_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 269,
-    "y": 106
+    "x": 302,
+    "y": 94
   },
   "telephone_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 0,
-    "y": 169
+    "x": 42,
+    "y": 208
   },
   "tennis_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 286,
-    "y": 106
+    "x": 319,
+    "y": 94
   },
   "tennis_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 21,
-    "y": 169
+    "x": 63,
+    "y": 208
   },
   "theatre_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 303,
-    "y": 106
+    "x": 336,
+    "y": 94
   },
   "theatre_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 42,
-    "y": 169
+    "x": 84,
+    "y": 208
   },
   "toilet_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 320,
-    "y": 106
+    "x": 353,
+    "y": 94
   },
   "toilet_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 63,
-    "y": 169
+    "x": 105,
+    "y": 208
   },
   "town-hall_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 337,
-    "y": 106
+    "x": 370,
+    "y": 94
   },
   "town-hall_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 84,
-    "y": 169
+    "x": 126,
+    "y": 208
   },
   "triangle_11": {
     "height": 15,
     "pixelRatio": 1,
     "width": 15,
-    "x": 432,
-    "y": 148
+    "x": 210,
+    "y": 250
   },
   "triangle_15": {
     "height": 19,
     "pixelRatio": 1,
     "width": 19,
-    "x": 95,
-    "y": 229
+    "x": 385,
+    "y": 145
   },
   "triangle_stroked_11": {
     "height": 15,
     "pixelRatio": 1,
     "width": 15,
-    "x": 447,
-    "y": 148
+    "x": 225,
+    "y": 250
   },
   "triangle_stroked_15": {
     "height": 19,
     "pixelRatio": 1,
     "width": 19,
-    "x": 114,
-    "y": 229
+    "x": 404,
+    "y": 145
+  },
+  "us-highway_2": {
+    "height": 30,
+    "pixelRatio": 1,
+    "width": 30,
+    "x": 50,
+    "y": 64
+  },
+  "us-highway_3": {
+    "height": 30,
+    "pixelRatio": 1,
+    "width": 37,
+    "x": 80,
+    "y": 64
+  },
+  "us-interstate_2": {
+    "height": 30,
+    "pixelRatio": 1,
+    "width": 30,
+    "x": 94,
+    "y": 0
+  },
+  "us-interstate_3": {
+    "height": 30,
+    "pixelRatio": 1,
+    "width": 37,
+    "x": 0,
+    "y": 94
+  },
+  "us-state_2": {
+    "height": 30,
+    "pixelRatio": 1,
+    "width": 30,
+    "x": 37,
+    "y": 94
+  },
+  "us-state_3": {
+    "height": 30,
+    "pixelRatio": 1,
+    "width": 37,
+    "x": 67,
+    "y": 94
   },
   "veterinary_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 354,
-    "y": 106
+    "x": 387,
+    "y": 94
   },
   "veterinary_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 105,
-    "y": 169
+    "x": 147,
+    "y": 208
   },
   "volcano_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 371,
-    "y": 106
+    "x": 404,
+    "y": 94
   },
   "volcano_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 126,
-    "y": 169
+    "x": 168,
+    "y": 208
   },
   "warehouse_11": {
     "height": 15,
     "pixelRatio": 1,
     "width": 15,
-    "x": 462,
-    "y": 148
+    "x": 240,
+    "y": 250
   },
   "warehouse_15": {
     "height": 19,
     "pixelRatio": 1,
     "width": 19,
-    "x": 133,
-    "y": 229
+    "x": 423,
+    "y": 145
   },
   "waste_basket_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 388,
-    "y": 106
+    "x": 421,
+    "y": 94
   },
   "waste_basket_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 147,
-    "y": 169
+    "x": 189,
+    "y": 208
   },
   "water_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 405,
-    "y": 106
+    "x": 438,
+    "y": 94
   },
   "water_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 168,
-    "y": 169
+    "x": 210,
+    "y": 208
   },
   "wetland_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 422,
-    "y": 106
+    "x": 455,
+    "y": 94
   },
   "wetland_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 189,
-    "y": 169
+    "x": 231,
+    "y": 208
   },
   "wheelchair_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 439,
-    "y": 106
+    "x": 472,
+    "y": 94
   },
   "wheelchair_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 210,
-    "y": 169
+    "x": 0,
+    "y": 229
   },
   "zoo_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 456,
-    "y": 106
+    "x": 489,
+    "y": 94
   },
   "zoo_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 231,
-    "y": 169
+    "x": 21,
+    "y": 229
   }
 }
\ No newline at end of file
diff --git a/sprites/osm-liberty.png b/sprites/osm-liberty.png
index 762589d..0a2673c 100644
Binary files a/sprites/osm-liberty.png and b/sprites/osm-liberty.png differ
diff --git a/sprites/osm-liberty@2x.json b/sprites/osm-liberty@2x.json
index 630c4b1..984f108 100644
--- a/sprites/osm-liberty@2x.json
+++ b/sprites/osm-liberty@2x.json
@@ -3,1030 +3,1051 @@
     "height": 30,
     "pixelRatio": 2,
     "width": 30,
-    "x": 568,
-    "y": 254
+    "x": 628,
+    "y": 0
   },
   "aerialway_15": {
     "height": 38,
     "pixelRatio": 2,
     "width": 38,
-    "x": 160,
-    "y": 380
+    "x": 244,
+    "y": 458
   },
   "airfield_11": {
     "height": 30,
     "pixelRatio": 2,
     "width": 30,
-    "x": 598,
-    "y": 254
+    "x": 658,
+    "y": 0
   },
   "airfield_15": {
     "height": 38,
     "pixelRatio": 2,
     "width": 38,
-    "x": 198,
-    "y": 380
+    "x": 282,
+    "y": 458
   },
   "airport_11": {
     "height": 30,
     "pixelRatio": 2,
     "width": 30,
-    "x": 628,
-    "y": 254
+    "x": 688,
+    "y": 0
   },
   "airport_15": {
     "height": 38,
     "pixelRatio": 2,
     "width": 38,
-    "x": 236,
-    "y": 380
+    "x": 320,
+    "y": 458
   },
   "alcohol_shop_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 762,
-    "y": 420
+    "x": 970,
+    "y": 290
   },
   "alcohol_shop_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 128,
-    "y": 0
+    "x": 210,
+    "y": 188
   },
   "america_football_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 796,
-    "y": 420
+    "x": 836,
+    "y": 332
   },
   "america_football_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 170,
-    "y": 0
+    "x": 235,
+    "y": 128
   },
   "amusement_park_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 830,
-    "y": 420
+    "x": 870,
+    "y": 332
   },
   "amusement_park_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 212,
-    "y": 0
+    "x": 277,
+    "y": 128
   },
   "aquarium_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 864,
-    "y": 420
+    "x": 904,
+    "y": 332
   },
   "aquarium_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 0,
+    "x": 319,
     "y": 128
   },
+  "arrow": {
+    "height": 14,
+    "pixelRatio": 2,
+    "width": 40,
+    "x": 570,
+    "y": 500
+  },
   "art_gallery_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 898,
-    "y": 420
+    "x": 938,
+    "y": 332
   },
   "art_gallery_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 42,
+    "x": 361,
     "y": 128
   },
   "attraction_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 932,
-    "y": 420
+    "x": 972,
+    "y": 332
   },
   "attraction_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 84,
+    "x": 403,
     "y": 128
   },
   "bakery_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 966,
-    "y": 420
+    "x": 504,
+    "y": 374
   },
   "bakery_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 126,
+    "x": 445,
     "y": 128
   },
   "bank_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 454,
-    "y": 458
+    "x": 538,
+    "y": 374
   },
   "bank_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 168,
-    "y": 128
+    "x": 252,
+    "y": 188
   },
   "bar_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 488,
-    "y": 458
+    "x": 572,
+    "y": 374
   },
   "bar_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 210,
-    "y": 128
+    "x": 294,
+    "y": 188
   },
   "baseball_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 522,
-    "y": 458
+    "x": 606,
+    "y": 374
   },
   "baseball_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 0,
-    "y": 170
+    "x": 336,
+    "y": 188
   },
   "basketball_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 556,
-    "y": 458
+    "x": 640,
+    "y": 374
   },
   "basketball_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 42,
-    "y": 170
+    "x": 378,
+    "y": 188
   },
   "beer_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 590,
-    "y": 458
+    "x": 674,
+    "y": 374
   },
   "beer_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 84,
-    "y": 170
+    "x": 420,
+    "y": 188
   },
   "bicycle_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 624,
-    "y": 458
+    "x": 708,
+    "y": 374
   },
   "bicycle_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 126,
-    "y": 170
+    "x": 462,
+    "y": 188
   },
   "bicycle_rental_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 658,
-    "y": 458
+    "x": 742,
+    "y": 374
   },
   "bicycle_rental_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 168,
-    "y": 170
+    "x": 248,
+    "y": 0
   },
   "building_11": {
     "height": 30,
     "pixelRatio": 2,
     "width": 30,
-    "x": 658,
-    "y": 254
+    "x": 718,
+    "y": 0
   },
   "building_15": {
     "height": 38,
     "pixelRatio": 2,
     "width": 38,
-    "x": 274,
-    "y": 380
+    "x": 358,
+    "y": 458
   },
   "bus_11": {
     "height": 30,
     "pixelRatio": 2,
     "width": 30,
-    "x": 688,
-    "y": 254
+    "x": 748,
+    "y": 0
   },
   "bus_15": {
     "height": 38,
     "pixelRatio": 2,
     "width": 38,
-    "x": 312,
-    "y": 380
+    "x": 396,
+    "y": 458
   },
   "butcher_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 692,
-    "y": 458
+    "x": 776,
+    "y": 374
   },
   "butcher_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 210,
-    "y": 170
+    "x": 290,
+    "y": 0
+  },
+  "ca-transcanada_2": {
+    "height": 60,
+    "pixelRatio": 2,
+    "width": 60,
+    "x": 128,
+    "y": 0
   },
   "cafe_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 726,
-    "y": 458
+    "x": 810,
+    "y": 374
   },
   "cafe_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 0,
-    "y": 212
+    "x": 332,
+    "y": 0
   },
   "campsite_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 760,
-    "y": 458
+    "x": 844,
+    "y": 374
   },
   "campsite_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 42,
-    "y": 212
+    "x": 374,
+    "y": 0
   },
   "car_11": {
     "height": 30,
     "pixelRatio": 2,
     "width": 30,
-    "x": 718,
-    "y": 254
+    "x": 778,
+    "y": 0
   },
   "car_15": {
     "height": 38,
     "pixelRatio": 2,
     "width": 38,
-    "x": 350,
-    "y": 380
+    "x": 434,
+    "y": 458
   },
   "castle_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 794,
-    "y": 458
+    "x": 878,
+    "y": 374
   },
   "castle_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 84,
-    "y": 212
+    "x": 416,
+    "y": 0
   },
   "cemetery_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 828,
-    "y": 458
+    "x": 912,
+    "y": 374
   },
   "cemetery_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 126,
-    "y": 212
+    "x": 458,
+    "y": 0
   },
   "cinema_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 862,
-    "y": 458
+    "x": 946,
+    "y": 374
   },
   "cinema_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 168,
-    "y": 212
+    "x": 0,
+    "y": 248
   },
   "circle-stroked_11": {
     "height": 30,
     "pixelRatio": 2,
     "width": 30,
-    "x": 748,
-    "y": 254
+    "x": 808,
+    "y": 0
   },
   "circle-stroked_15": {
     "height": 38,
     "pixelRatio": 2,
     "width": 38,
-    "x": 388,
-    "y": 380
+    "x": 472,
+    "y": 458
   },
   "circle_11": {
     "height": 30,
     "pixelRatio": 2,
     "width": 30,
-    "x": 778,
-    "y": 254
+    "x": 838,
+    "y": 0
   },
   "circle_15": {
     "height": 38,
     "pixelRatio": 2,
     "width": 38,
-    "x": 426,
-    "y": 380
+    "x": 504,
+    "y": 248
   },
   "clothing_store_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 896,
-    "y": 458
+    "x": 980,
+    "y": 374
   },
   "clothing_store_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 210,
-    "y": 212
+    "x": 42,
+    "y": 248
   },
   "college_11": {
     "height": 32,
     "pixelRatio": 2,
     "width": 32,
-    "x": 946,
-    "y": 212
+    "x": 500,
+    "y": 0
   },
   "college_15": {
     "height": 40,
     "pixelRatio": 2,
     "width": 40,
-    "x": 0,
-    "y": 380
+    "x": 84,
+    "y": 458
   },
   "commercial_11": {
     "height": 30,
     "pixelRatio": 2,
     "width": 30,
-    "x": 808,
-    "y": 254
+    "x": 868,
+    "y": 0
   },
   "commercial_15": {
     "height": 38,
     "pixelRatio": 2,
     "width": 38,
-    "x": 464,
-    "y": 380
+    "x": 542,
+    "y": 248
   },
   "cricket_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 930,
-    "y": 458
+    "x": 504,
+    "y": 416
   },
   "cricket_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 252,
-    "y": 128
+    "x": 84,
+    "y": 248
   },
   "cross_11": {
     "height": 30,
     "pixelRatio": 2,
     "width": 30,
-    "x": 838,
-    "y": 254
+    "x": 898,
+    "y": 0
   },
   "cross_15": {
     "height": 38,
     "pixelRatio": 2,
     "width": 38,
-    "x": 0,
-    "y": 420
+    "x": 580,
+    "y": 248
   },
   "dam_11": {
     "height": 30,
     "pixelRatio": 2,
     "width": 30,
-    "x": 868,
-    "y": 254
+    "x": 928,
+    "y": 0
   },
   "dam_15": {
     "height": 38,
     "pixelRatio": 2,
     "width": 38,
-    "x": 38,
-    "y": 420
+    "x": 618,
+    "y": 248
   },
   "danger_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 964,
-    "y": 458
+    "x": 538,
+    "y": 416
   },
   "danger_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 294,
-    "y": 128
+    "x": 126,
+    "y": 248
   },
   "default_1": {
     "height": 36,
     "pixelRatio": 2,
     "width": 36,
-    "x": 304,
-    "y": 458
+    "x": 884,
+    "y": 290
   },
   "default_2": {
     "height": 36,
     "pixelRatio": 2,
     "width": 50,
-    "x": 340,
-    "y": 458
+    "x": 920,
+    "y": 290
   },
   "default_3": {
     "height": 36,
     "pixelRatio": 2,
     "width": 64,
-    "x": 390,
-    "y": 458
+    "x": 504,
+    "y": 332
   },
   "default_4": {
     "height": 36,
     "pixelRatio": 2,
     "width": 78,
-    "x": 494,
-    "y": 420
+    "x": 568,
+    "y": 332
   },
   "default_5": {
     "height": 36,
     "pixelRatio": 2,
     "width": 90,
-    "x": 572,
-    "y": 420
+    "x": 646,
+    "y": 332
   },
   "default_6": {
     "height": 36,
     "pixelRatio": 2,
     "width": 100,
-    "x": 662,
-    "y": 420
+    "x": 736,
+    "y": 332
   },
   "dentist_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 502,
-    "y": 380
+    "x": 572,
+    "y": 416
   },
   "dentist_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 336,
-    "y": 128
+    "x": 168,
+    "y": 248
   },
   "doctor_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 536,
-    "y": 380
+    "x": 606,
+    "y": 416
   },
   "doctor_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 378,
-    "y": 128
+    "x": 210,
+    "y": 248
   },
   "dog_park_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 570,
-    "y": 380
+    "x": 640,
+    "y": 416
   },
   "dog_park_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 420,
-    "y": 128
+    "x": 252,
+    "y": 248
   },
   "dot_10": {
     "height": 20,
     "pixelRatio": 2,
     "width": 20,
-    "x": 998,
-    "y": 458
+    "x": 532,
+    "y": 500
   },
   "dot_11": {
     "height": 22,
     "pixelRatio": 2,
     "width": 22,
-    "x": 1000,
-    "y": 420
+    "x": 510,
+    "y": 500
   },
   "dot_9": {
     "height": 18,
     "pixelRatio": 2,
     "width": 18,
-    "x": 954,
-    "y": 296
+    "x": 552,
+    "y": 500
   },
   "drinking-water_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 604,
-    "y": 380
+    "x": 674,
+    "y": 416
   },
   "drinking_water_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 462,
-    "y": 128
+    "x": 294,
+    "y": 248
   },
   "embassy_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 638,
-    "y": 380
+    "x": 708,
+    "y": 416
   },
   "embassy_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 252,
-    "y": 170
+    "x": 336,
+    "y": 248
   },
   "entrance_11": {
     "height": 30,
     "pixelRatio": 2,
     "width": 30,
-    "x": 898,
-    "y": 254
+    "x": 958,
+    "y": 0
   },
   "entrance_15": {
     "height": 38,
     "pixelRatio": 2,
     "width": 38,
-    "x": 76,
-    "y": 420
+    "x": 656,
+    "y": 248
   },
   "fast_food_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 672,
-    "y": 380
+    "x": 742,
+    "y": 416
   },
   "fast_food_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 294,
-    "y": 170
+    "x": 378,
+    "y": 248
   },
   "ferry_11": {
     "height": 30,
     "pixelRatio": 2,
     "width": 30,
-    "x": 928,
-    "y": 254
+    "x": 988,
+    "y": 0
   },
   "ferry_15": {
     "height": 38,
     "pixelRatio": 2,
     "width": 38,
-    "x": 114,
-    "y": 420
+    "x": 694,
+    "y": 248
   },
   "fire-station_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 706,
-    "y": 380
+    "x": 776,
+    "y": 416
   },
   "fire-station_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 336,
-    "y": 170
+    "x": 420,
+    "y": 248
   },
   "fuel_11": {
     "height": 30,
     "pixelRatio": 2,
     "width": 30,
-    "x": 958,
-    "y": 254
+    "x": 0,
+    "y": 500
   },
   "fuel_15": {
     "height": 38,
     "pixelRatio": 2,
     "width": 38,
-    "x": 152,
-    "y": 420
+    "x": 732,
+    "y": 248
   },
   "garden_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 740,
-    "y": 380
+    "x": 810,
+    "y": 416
   },
   "garden_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 378,
-    "y": 170
+    "x": 462,
+    "y": 248
+  },
+  "gb-motorway_3": {
+    "height": 60,
+    "pixelRatio": 2,
+    "width": 100,
+    "x": 0,
+    "y": 128
   },
   "gift_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 774,
-    "y": 380
+    "x": 844,
+    "y": 416
   },
   "gift_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 420,
-    "y": 170
+    "x": 0,
+    "y": 290
   },
   "golf_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 808,
-    "y": 380
+    "x": 878,
+    "y": 416
   },
   "golf_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 462,
-    "y": 170
+    "x": 42,
+    "y": 290
   },
   "grocery_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 842,
-    "y": 380
+    "x": 912,
+    "y": 416
   },
   "grocery_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 252,
-    "y": 212
+    "x": 84,
+    "y": 290
   },
   "hairdresser_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 876,
-    "y": 380
+    "x": 946,
+    "y": 416
   },
   "hairdresser_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 294,
-    "y": 212
+    "x": 126,
+    "y": 290
   },
   "harbor_11": {
     "height": 30,
     "pixelRatio": 2,
     "width": 30,
-    "x": 988,
-    "y": 254
+    "x": 30,
+    "y": 500
   },
   "harbor_15": {
     "height": 38,
     "pixelRatio": 2,
     "width": 38,
-    "x": 190,
-    "y": 420
+    "x": 770,
+    "y": 248
   },
   "heart_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 910,
-    "y": 380
+    "x": 980,
+    "y": 416
   },
   "heart_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 336,
-    "y": 212
+    "x": 168,
+    "y": 290
   },
   "heliport_11": {
     "height": 30,
     "pixelRatio": 2,
     "width": 30,
-    "x": 504,
-    "y": 296
+    "x": 60,
+    "y": 500
   },
   "heliport_15": {
     "height": 38,
     "pixelRatio": 2,
     "width": 38,
-    "x": 228,
-    "y": 420
+    "x": 808,
+    "y": 248
   },
   "hospital_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 944,
-    "y": 380
+    "x": 510,
+    "y": 458
   },
   "hospital_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 378,
-    "y": 212
+    "x": 210,
+    "y": 290
   },
   "ice_cream_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 978,
-    "y": 380
+    "x": 544,
+    "y": 458
   },
   "ice_cream_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 420,
-    "y": 212
+    "x": 252,
+    "y": 290
   },
   "industry_11": {
     "height": 30,
     "pixelRatio": 2,
     "width": 30,
-    "x": 534,
-    "y": 296
+    "x": 90,
+    "y": 500
   },
   "industry_15": {
     "height": 38,
     "pixelRatio": 2,
     "width": 38,
-    "x": 266,
-    "y": 420
+    "x": 846,
+    "y": 248
   },
   "information_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 504,
-    "y": 128
+    "x": 578,
+    "y": 458
   },
   "information_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 462,
-    "y": 212
+    "x": 294,
+    "y": 290
   },
   "laundry_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 538,
-    "y": 128
+    "x": 612,
+    "y": 458
   },
   "laundry_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 254,
-    "y": 0
+    "x": 336,
+    "y": 290
   },
   "library_11": {
     "height": 32,
     "pixelRatio": 2,
     "width": 32,
-    "x": 978,
-    "y": 212
+    "x": 532,
+    "y": 0
   },
   "library_15": {
     "height": 40,
     "pixelRatio": 2,
     "width": 40,
-    "x": 40,
-    "y": 380
+    "x": 124,
+    "y": 458
   },
   "lighthouse_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 572,
-    "y": 128
+    "x": 646,
+    "y": 458
   },
   "lighthouse_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 296,
-    "y": 0
+    "x": 378,
+    "y": 290
   },
   "lodging_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 606,
-    "y": 128
+    "x": 680,
+    "y": 458
   },
   "lodging_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 338,
-    "y": 0
+    "x": 420,
+    "y": 290
   },
   "marker_11": {
     "height": 30,
     "pixelRatio": 2,
     "width": 30,
-    "x": 564,
-    "y": 296
+    "x": 120,
+    "y": 500
   },
   "marker_15": {
     "height": 38,
     "pixelRatio": 2,
     "width": 38,
-    "x": 304,
-    "y": 420
+    "x": 884,
+    "y": 248
   },
   "monument_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 640,
-    "y": 128
+    "x": 714,
+    "y": 458
   },
   "monument_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 380,
-    "y": 0
+    "x": 462,
+    "y": 290
   },
   "mountain_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 674,
-    "y": 128
+    "x": 748,
+    "y": 458
   },
   "mountain_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 422,
-    "y": 0
+    "x": 0,
+    "y": 332
   },
   "museum_11": {
     "height": 32,
     "pixelRatio": 2,
     "width": 32,
-    "x": 504,
-    "y": 254
+    "x": 564,
+    "y": 0
   },
   "museum_15": {
     "height": 40,
     "pixelRatio": 2,
     "width": 40,
-    "x": 80,
-    "y": 380
+    "x": 164,
+    "y": 458
   },
   "music_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 708,
-    "y": 128
+    "x": 782,
+    "y": 458
   },
   "music_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 464,
-    "y": 0
+    "x": 42,
+    "y": 332
   },
   "park_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 742,
-    "y": 128
+    "x": 816,
+    "y": 458
   },
   "park_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 0,
-    "y": 254
+    "x": 84,
+    "y": 332
   },
   "parking_11": {
     "height": 30,
     "pixelRatio": 2,
     "width": 30,
-    "x": 594,
-    "y": 296
+    "x": 150,
+    "y": 500
   },
   "parking_15": {
     "height": 38,
     "pixelRatio": 2,
     "width": 38,
-    "x": 342,
-    "y": 420
+    "x": 922,
+    "y": 248
   },
   "parking_garage_11": {
     "height": 30,
     "pixelRatio": 2,
     "width": 30,
-    "x": 624,
-    "y": 296
+    "x": 180,
+    "y": 500
   },
   "parking_garage_15": {
     "height": 38,
     "pixelRatio": 2,
     "width": 38,
-    "x": 380,
-    "y": 420
+    "x": 960,
+    "y": 248
   },
   "pedestrian_polygon": {
     "height": 128,
@@ -1039,644 +1060,686 @@
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 776,
-    "y": 128
+    "x": 850,
+    "y": 458
   },
   "pharmacy_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 42,
-    "y": 254
+    "x": 126,
+    "y": 332
   },
   "picnic_site_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 810,
-    "y": 128
+    "x": 884,
+    "y": 458
   },
   "picnic_site_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 84,
-    "y": 254
+    "x": 168,
+    "y": 332
   },
   "pitch_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 844,
-    "y": 128
+    "x": 918,
+    "y": 458
   },
   "pitch_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 126,
-    "y": 254
+    "x": 210,
+    "y": 332
   },
   "place_of_worship_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 878,
-    "y": 128
+    "x": 952,
+    "y": 458
   },
   "place_of_worship_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 168,
-    "y": 254
+    "x": 252,
+    "y": 332
   },
   "playground_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 912,
-    "y": 128
+    "x": 986,
+    "y": 458
   },
   "playground_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 210,
-    "y": 254
+    "x": 294,
+    "y": 332
   },
   "police_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 946,
+    "x": 487,
     "y": 128
   },
   "police_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 252,
-    "y": 254
+    "x": 336,
+    "y": 332
   },
   "post_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 980,
+    "x": 521,
     "y": 128
   },
   "post_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 294,
-    "y": 254
+    "x": 378,
+    "y": 332
   },
   "prison_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 504,
-    "y": 170
+    "x": 555,
+    "y": 128
   },
   "prison_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 336,
-    "y": 254
+    "x": 420,
+    "y": 332
   },
   "railway_11": {
     "height": 30,
     "pixelRatio": 2,
     "width": 30,
-    "x": 654,
-    "y": 296
+    "x": 210,
+    "y": 500
   },
   "railway_15": {
     "height": 38,
     "pixelRatio": 2,
     "width": 38,
-    "x": 418,
-    "y": 420
+    "x": 504,
+    "y": 290
   },
   "railway_light_11": {
     "height": 30,
     "pixelRatio": 2,
     "width": 30,
-    "x": 684,
-    "y": 296
+    "x": 240,
+    "y": 500
   },
   "railway_light_15": {
     "height": 38,
     "pixelRatio": 2,
     "width": 38,
-    "x": 456,
-    "y": 420
+    "x": 542,
+    "y": 290
   },
   "railway_metro_11": {
     "height": 30,
     "pixelRatio": 2,
     "width": 30,
-    "x": 714,
-    "y": 296
+    "x": 270,
+    "y": 500
   },
   "railway_metro_15": {
     "height": 38,
     "pixelRatio": 2,
     "width": 38,
-    "x": 0,
-    "y": 458
+    "x": 580,
+    "y": 290
   },
   "ranger_station_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 538,
-    "y": 170
+    "x": 589,
+    "y": 128
   },
   "ranger_station_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 378,
-    "y": 254
+    "x": 462,
+    "y": 332
   },
   "religious_christian_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 572,
-    "y": 170
+    "x": 623,
+    "y": 128
   },
   "religious_christian_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 420,
-    "y": 254
+    "x": 0,
+    "y": 374
   },
   "religious_jewish_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 606,
-    "y": 170
+    "x": 657,
+    "y": 128
   },
   "religious_jewish_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 462,
-    "y": 254
+    "x": 42,
+    "y": 374
   },
   "religious_muslim_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 640,
-    "y": 170
+    "x": 691,
+    "y": 128
   },
   "religious_muslim_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 0,
-    "y": 296
+    "x": 84,
+    "y": 374
   },
   "restaurant_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 674,
-    "y": 170
+    "x": 725,
+    "y": 128
   },
   "restaurant_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 42,
-    "y": 296
+    "x": 126,
+    "y": 374
   },
   "roadblock_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 708,
-    "y": 170
+    "x": 759,
+    "y": 128
   },
   "roadblock_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 84,
-    "y": 296
+    "x": 168,
+    "y": 374
   },
   "rocket_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 742,
-    "y": 170
+    "x": 793,
+    "y": 128
   },
   "rocket_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 126,
-    "y": 296
+    "x": 210,
+    "y": 374
   },
   "school_11": {
     "height": 32,
     "pixelRatio": 2,
     "width": 32,
-    "x": 536,
-    "y": 254
+    "x": 596,
+    "y": 0
   },
   "school_15": {
     "height": 40,
     "pixelRatio": 2,
     "width": 40,
-    "x": 120,
-    "y": 380
+    "x": 204,
+    "y": 458
   },
   "shelter_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 776,
-    "y": 170
+    "x": 827,
+    "y": 128
   },
   "shelter_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 168,
-    "y": 296
+    "x": 252,
+    "y": 374
   },
   "shop_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 810,
-    "y": 170
+    "x": 861,
+    "y": 128
   },
   "shop_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 210,
-    "y": 296
+    "x": 294,
+    "y": 374
   },
   "skiing_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 844,
-    "y": 170
+    "x": 895,
+    "y": 128
   },
   "skiing_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 252,
-    "y": 296
+    "x": 336,
+    "y": 374
   },
   "soccer_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 878,
-    "y": 170
+    "x": 929,
+    "y": 128
   },
   "soccer_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 294,
-    "y": 296
+    "x": 378,
+    "y": 374
   },
   "square-stroke_11": {
     "height": 30,
     "pixelRatio": 2,
     "width": 30,
-    "x": 744,
-    "y": 296
+    "x": 300,
+    "y": 500
   },
   "square-stroke_15": {
     "height": 38,
     "pixelRatio": 2,
     "width": 38,
-    "x": 38,
-    "y": 458
+    "x": 618,
+    "y": 290
   },
   "square_11": {
     "height": 30,
     "pixelRatio": 2,
     "width": 30,
-    "x": 774,
-    "y": 296
+    "x": 330,
+    "y": 500
   },
   "square_15": {
     "height": 38,
     "pixelRatio": 2,
     "width": 38,
-    "x": 76,
-    "y": 458
+    "x": 656,
+    "y": 290
   },
   "stadium_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 912,
-    "y": 170
+    "x": 963,
+    "y": 128
   },
   "stadium_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 336,
-    "y": 296
+    "x": 420,
+    "y": 374
   },
   "star-stroke_11": {
     "height": 30,
     "pixelRatio": 2,
     "width": 30,
-    "x": 804,
-    "y": 296
+    "x": 360,
+    "y": 500
   },
   "star-stroke_15": {
     "height": 38,
     "pixelRatio": 2,
     "width": 38,
-    "x": 114,
-    "y": 458
+    "x": 694,
+    "y": 290
   },
   "star_11": {
     "height": 30,
     "pixelRatio": 2,
     "width": 30,
-    "x": 834,
-    "y": 296
+    "x": 390,
+    "y": 500
   },
   "star_15": {
     "height": 38,
     "pixelRatio": 2,
     "width": 38,
-    "x": 152,
-    "y": 458
+    "x": 732,
+    "y": 290
   },
   "suitcase_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 946,
-    "y": 170
+    "x": 504,
+    "y": 188
   },
   "suitcase_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 378,
-    "y": 296
+    "x": 462,
+    "y": 374
   },
   "sushi_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 980,
-    "y": 170
+    "x": 538,
+    "y": 188
   },
   "sushi_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 420,
-    "y": 296
+    "x": 0,
+    "y": 416
   },
   "swimming_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 504,
-    "y": 212
+    "x": 572,
+    "y": 188
   },
   "swimming_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 462,
-    "y": 296
+    "x": 42,
+    "y": 416
   },
   "telephone_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 538,
-    "y": 212
+    "x": 606,
+    "y": 188
   },
   "telephone_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 0,
-    "y": 338
+    "x": 84,
+    "y": 416
   },
   "tennis_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 572,
-    "y": 212
+    "x": 640,
+    "y": 188
   },
   "tennis_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 42,
-    "y": 338
+    "x": 126,
+    "y": 416
   },
   "theatre_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 606,
-    "y": 212
+    "x": 674,
+    "y": 188
   },
   "theatre_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 84,
-    "y": 338
+    "x": 168,
+    "y": 416
   },
   "toilet_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 640,
-    "y": 212
+    "x": 708,
+    "y": 188
   },
   "toilet_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 126,
-    "y": 338
+    "x": 210,
+    "y": 416
   },
   "town-hall_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 674,
-    "y": 212
+    "x": 742,
+    "y": 188
   },
   "town-hall_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 168,
-    "y": 338
+    "x": 252,
+    "y": 416
   },
   "triangle_11": {
     "height": 30,
     "pixelRatio": 2,
     "width": 30,
-    "x": 864,
-    "y": 296
+    "x": 420,
+    "y": 500
   },
   "triangle_15": {
     "height": 38,
     "pixelRatio": 2,
     "width": 38,
-    "x": 190,
-    "y": 458
+    "x": 770,
+    "y": 290
   },
   "triangle_stroked_11": {
     "height": 30,
     "pixelRatio": 2,
     "width": 30,
-    "x": 894,
-    "y": 296
+    "x": 450,
+    "y": 500
   },
   "triangle_stroked_15": {
     "height": 38,
     "pixelRatio": 2,
     "width": 38,
-    "x": 228,
-    "y": 458
+    "x": 808,
+    "y": 290
+  },
+  "us-highway_2": {
+    "height": 60,
+    "pixelRatio": 2,
+    "width": 60,
+    "x": 100,
+    "y": 128
+  },
+  "us-highway_3": {
+    "height": 60,
+    "pixelRatio": 2,
+    "width": 75,
+    "x": 160,
+    "y": 128
+  },
+  "us-interstate_2": {
+    "height": 60,
+    "pixelRatio": 2,
+    "width": 60,
+    "x": 188,
+    "y": 0
+  },
+  "us-interstate_3": {
+    "height": 60,
+    "pixelRatio": 2,
+    "width": 75,
+    "x": 0,
+    "y": 188
+  },
+  "us-state_2": {
+    "height": 60,
+    "pixelRatio": 2,
+    "width": 60,
+    "x": 75,
+    "y": 188
+  },
+  "us-state_3": {
+    "height": 60,
+    "pixelRatio": 2,
+    "width": 75,
+    "x": 135,
+    "y": 188
   },
   "veterinary_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 708,
-    "y": 212
+    "x": 776,
+    "y": 188
   },
   "veterinary_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 210,
-    "y": 338
+    "x": 294,
+    "y": 416
   },
   "volcano_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 742,
-    "y": 212
+    "x": 810,
+    "y": 188
   },
   "volcano_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 252,
-    "y": 338
+    "x": 336,
+    "y": 416
   },
   "warehouse_11": {
     "height": 30,
     "pixelRatio": 2,
     "width": 30,
-    "x": 924,
-    "y": 296
+    "x": 480,
+    "y": 500
   },
   "warehouse_15": {
     "height": 38,
     "pixelRatio": 2,
     "width": 38,
-    "x": 266,
-    "y": 458
+    "x": 846,
+    "y": 290
   },
   "waste_basket_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 776,
-    "y": 212
+    "x": 844,
+    "y": 188
   },
   "waste_basket_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 294,
-    "y": 338
+    "x": 378,
+    "y": 416
   },
   "water_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 810,
-    "y": 212
+    "x": 878,
+    "y": 188
   },
   "water_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 336,
-    "y": 338
+    "x": 420,
+    "y": 416
   },
   "wetland_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 844,
-    "y": 212
+    "x": 912,
+    "y": 188
   },
   "wetland_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 378,
-    "y": 338
+    "x": 462,
+    "y": 416
   },
   "wheelchair_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 878,
-    "y": 212
+    "x": 946,
+    "y": 188
   },
   "wheelchair_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 420,
-    "y": 338
+    "x": 0,
+    "y": 458
   },
   "zoo_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 912,
-    "y": 212
+    "x": 980,
+    "y": 188
   },
   "zoo_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 462,
-    "y": 338
+    "x": 42,
+    "y": 458
   }
 }
\ No newline at end of file
diff --git a/sprites/osm-liberty@2x.png b/sprites/osm-liberty@2x.png
index 9458527..4507e72 100644
Binary files a/sprites/osm-liberty@2x.png and b/sprites/osm-liberty@2x.png differ
diff --git a/svgs/svgs_not_in_iconset/arrow.svg b/svgs/svgs_not_in_iconset/arrow.svg
new file mode 100644
index 0000000..b701046
--- /dev/null
+++ b/svgs/svgs_not_in_iconset/arrow.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="7" viewBox="0 0 80 29">
+    <path d="m61,15H11v-1h49m0-2 9,2.5-9,2.5"/>
+</svg>
\ No newline at end of file