diff --git a/LICENSE.md b/LICENSE.md
index 9b34426..7bd5b23 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -34,9 +34,12 @@ U.S. Highway shields come from [Wikipedia][wikipedia_us_highway] and are in the
 
 Canada Transcanada shields come from [Wikipedia][wikipedia_ca_transcanada] and are in the public domain.
 
+GB motorway shields come from [Wikipedia][wikipedia_gb_motorway] and are in the public domain.
+
 [wikipedia_us_interstate]: https://commons.m.wikimedia.org/wiki/Category:Interstate_Highway_shield_blanks
 [wikipedia_us_highway]: https://commons.m.wikimedia.org/wiki/Category:US_Highway_shield_blanks
 [wikipedia_ca_transcanada]: https://commons.wikimedia.org/wiki/File:TCH_blank.svg
+[wikipedia_gb_motorway]: https://commons.wikimedia.org/wiki/File:Road_marker_UK_A2.svg
 
 ## Fonts
 
diff --git a/sprites/osm-liberty.json b/sprites/osm-liberty.json
index ac6a94d..a53aa3e 100644
--- a/sprites/osm-liberty.json
+++ b/sprites/osm-liberty.json
@@ -3,281 +3,281 @@
     "height": 15,
     "pixelRatio": 1,
     "width": 15,
-    "x": 434,
-    "y": 64
+    "x": 497,
+    "y": 229
   },
   "aerialway_15": {
     "height": 19,
     "pixelRatio": 1,
     "width": 19,
-    "x": 0,
-    "y": 220
+    "x": 60,
+    "y": 229
   },
   "airfield_11": {
     "height": 15,
     "pixelRatio": 1,
     "width": 15,
-    "x": 449,
-    "y": 64
+    "x": 266,
+    "y": 0
   },
   "airfield_15": {
     "height": 19,
     "pixelRatio": 1,
     "width": 19,
-    "x": 19,
-    "y": 220
+    "x": 79,
+    "y": 229
   },
   "airport_11": {
     "height": 15,
     "pixelRatio": 1,
     "width": 15,
-    "x": 464,
-    "y": 64
+    "x": 281,
+    "y": 0
   },
   "airport_15": {
     "height": 19,
     "pixelRatio": 1,
     "width": 19,
-    "x": 38,
-    "y": 220
+    "x": 98,
+    "y": 229
   },
   "alcohol_shop_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 469,
-    "y": 94
+    "x": 347,
+    "y": 145
   },
   "alcohol_shop_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 104,
-    "y": 64
+    "x": 37,
+    "y": 94
   },
   "america_football_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 486,
-    "y": 94
+    "x": 364,
+    "y": 145
   },
   "america_football_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 0,
+    "x": 58,
     "y": 94
   },
   "amusement_park_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 302,
-    "y": 115
+    "x": 381,
+    "y": 145
   },
   "amusement_park_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 21,
+    "x": 79,
     "y": 94
   },
   "aquarium_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 319,
-    "y": 115
+    "x": 398,
+    "y": 145
   },
   "aquarium_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 42,
+    "x": 100,
     "y": 94
   },
   "art_gallery_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 336,
-    "y": 115
+    "x": 415,
+    "y": 145
   },
   "art_gallery_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 63,
-    "y": 94
+    "x": 117,
+    "y": 64
   },
   "attraction_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 353,
-    "y": 115
+    "x": 432,
+    "y": 145
   },
   "attraction_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 84,
-    "y": 94
+    "x": 138,
+    "y": 64
   },
   "bakery_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 370,
-    "y": 115
+    "x": 449,
+    "y": 145
   },
   "bakery_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 105,
-    "y": 94
+    "x": 159,
+    "y": 64
   },
   "bank_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 387,
-    "y": 115
+    "x": 466,
+    "y": 145
   },
   "bank_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 126,
-    "y": 94
+    "x": 180,
+    "y": 64
   },
   "bar_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 404,
-    "y": 115
+    "x": 483,
+    "y": 145
   },
   "bar_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 147,
-    "y": 94
+    "x": 201,
+    "y": 64
   },
   "baseball_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 421,
-    "y": 115
+    "x": 252,
+    "y": 166
   },
   "baseball_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 168,
-    "y": 94
+    "x": 222,
+    "y": 64
   },
   "basketball_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 438,
-    "y": 115
+    "x": 269,
+    "y": 166
   },
   "basketball_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 189,
+    "x": 121,
     "y": 94
   },
   "beer_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 455,
-    "y": 115
+    "x": 286,
+    "y": 166
   },
   "beer_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 210,
+    "x": 142,
     "y": 94
   },
   "bicycle_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 472,
-    "y": 115
+    "x": 303,
+    "y": 166
   },
   "bicycle_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 231,
+    "x": 163,
     "y": 94
   },
   "bicycle_rental_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 489,
-    "y": 115
+    "x": 320,
+    "y": 166
   },
   "bicycle_rental_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 125,
-    "y": 64
+    "x": 184,
+    "y": 94
   },
   "building_11": {
     "height": 15,
     "pixelRatio": 1,
     "width": 15,
-    "x": 479,
-    "y": 64
+    "x": 296,
+    "y": 0
   },
   "building_15": {
     "height": 19,
     "pixelRatio": 1,
     "width": 19,
-    "x": 57,
-    "y": 220
+    "x": 117,
+    "y": 229
   },
   "bus_11": {
     "height": 15,
     "pixelRatio": 1,
     "width": 15,
-    "x": 494,
-    "y": 64
+    "x": 311,
+    "y": 0
   },
   "bus_15": {
     "height": 19,
     "pixelRatio": 1,
     "width": 19,
-    "x": 76,
-    "y": 220
+    "x": 136,
+    "y": 229
   },
   "butcher_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 252,
-    "y": 136
+    "x": 337,
+    "y": 166
   },
   "butcher_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 146,
-    "y": 64
+    "x": 205,
+    "y": 94
   },
   "ca-transcanada_2": {
     "height": 30,
@@ -290,750 +290,757 @@
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 269,
-    "y": 136
+    "x": 354,
+    "y": 166
   },
   "cafe_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 167,
-    "y": 64
+    "x": 226,
+    "y": 94
   },
   "campsite_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 286,
-    "y": 136
+    "x": 371,
+    "y": 166
   },
   "campsite_15": {
-    "height": 21,
-    "pixelRatio": 1,
-    "width": 21,
-    "x": 188,
-    "y": 64
-  },
-  "car_11": {
-    "height": 15,
-    "pixelRatio": 1,
-    "width": 15,
-    "x": 250,
-    "y": 0
-  },
-  "car_15": {
-    "height": 19,
-    "pixelRatio": 1,
-    "width": 19,
-    "x": 95,
-    "y": 220
-  },
-  "castle_11": {
-    "height": 17,
-    "pixelRatio": 1,
-    "width": 17,
-    "x": 303,
-    "y": 136
-  },
-  "castle_15": {
-    "height": 21,
-    "pixelRatio": 1,
-    "width": 21,
-    "x": 209,
-    "y": 64
-  },
-  "cemetery_11": {
-    "height": 17,
-    "pixelRatio": 1,
-    "width": 17,
-    "x": 320,
-    "y": 136
-  },
-  "cemetery_15": {
-    "height": 21,
-    "pixelRatio": 1,
-    "width": 21,
-    "x": 230,
-    "y": 64
-  },
-  "cinema_11": {
-    "height": 17,
-    "pixelRatio": 1,
-    "width": 17,
-    "x": 337,
-    "y": 136
-  },
-  "cinema_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
     "x": 124,
     "y": 0
   },
-  "circle-stroked_11": {
+  "car_11": {
     "height": 15,
     "pixelRatio": 1,
     "width": 15,
-    "x": 265,
+    "x": 326,
     "y": 0
   },
-  "circle-stroked_15": {
+  "car_15": {
     "height": 19,
     "pixelRatio": 1,
     "width": 19,
-    "x": 114,
-    "y": 220
+    "x": 155,
+    "y": 229
   },
-  "circle_11": {
-    "height": 15,
-    "pixelRatio": 1,
-    "width": 15,
-    "x": 280,
-    "y": 0
-  },
-  "circle_15": {
-    "height": 19,
-    "pixelRatio": 1,
-    "width": 19,
-    "x": 133,
-    "y": 220
-  },
-  "clothing_store_11": {
+  "castle_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 354,
-    "y": 136
+    "x": 388,
+    "y": 166
   },
-  "clothing_store_15": {
+  "castle_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
     "x": 145,
     "y": 0
   },
-  "college_11": {
-    "height": 16,
-    "pixelRatio": 1,
-    "width": 16,
-    "x": 370,
-    "y": 64
-  },
-  "college_15": {
-    "height": 20,
-    "pixelRatio": 1,
-    "width": 20,
-    "x": 168,
-    "y": 199
-  },
-  "commercial_11": {
-    "height": 15,
-    "pixelRatio": 1,
-    "width": 15,
-    "x": 295,
-    "y": 0
-  },
-  "commercial_15": {
-    "height": 19,
-    "pixelRatio": 1,
-    "width": 19,
-    "x": 152,
-    "y": 220
-  },
-  "cricket_11": {
+  "cemetery_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 371,
-    "y": 136
+    "x": 405,
+    "y": 166
   },
-  "cricket_15": {
+  "cemetery_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
     "x": 166,
     "y": 0
   },
-  "cross_11": {
-    "height": 15,
-    "pixelRatio": 1,
-    "width": 15,
-    "x": 310,
-    "y": 0
-  },
-  "cross_15": {
-    "height": 19,
-    "pixelRatio": 1,
-    "width": 19,
-    "x": 171,
-    "y": 220
-  },
-  "dam_11": {
-    "height": 15,
-    "pixelRatio": 1,
-    "width": 15,
-    "x": 325,
-    "y": 0
-  },
-  "dam_15": {
-    "height": 19,
-    "pixelRatio": 1,
-    "width": 19,
-    "x": 190,
-    "y": 220
-  },
-  "danger_11": {
+  "cinema_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 388,
-    "y": 136
+    "x": 422,
+    "y": 166
   },
-  "danger_15": {
+  "cinema_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
     "x": 187,
     "y": 0
   },
-  "default_1": {
-    "height": 18,
+  "circle-stroked_11": {
+    "height": 15,
     "pixelRatio": 1,
-    "width": 18,
-    "x": 494,
-    "y": 220
+    "width": 15,
+    "x": 341,
+    "y": 0
   },
-  "default_2": {
-    "height": 18,
+  "circle-stroked_15": {
+    "height": 19,
     "pixelRatio": 1,
-    "width": 25,
-    "x": 328,
-    "y": 94
+    "width": 19,
+    "x": 174,
+    "y": 229
   },
-  "default_3": {
-    "height": 18,
+  "circle_11": {
+    "height": 15,
     "pixelRatio": 1,
-    "width": 32,
-    "x": 353,
-    "y": 94
+    "width": 15,
+    "x": 356,
+    "y": 0
   },
-  "default_4": {
-    "height": 18,
+  "circle_15": {
+    "height": 19,
     "pixelRatio": 1,
-    "width": 39,
-    "x": 385,
-    "y": 94
+    "width": 19,
+    "x": 193,
+    "y": 229
   },
-  "default_5": {
-    "height": 18,
-    "pixelRatio": 1,
-    "width": 45,
-    "x": 424,
-    "y": 94
-  },
-  "default_6": {
-    "height": 18,
-    "pixelRatio": 1,
-    "width": 50,
-    "x": 252,
-    "y": 115
-  },
-  "dentist_11": {
+  "clothing_store_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 405,
-    "y": 136
+    "x": 439,
+    "y": 166
   },
-  "dentist_15": {
+  "clothing_store_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
     "x": 208,
     "y": 0
   },
-  "doctor_11": {
+  "college_11": {
+    "height": 16,
+    "pixelRatio": 1,
+    "width": 16,
+    "x": 451,
+    "y": 94
+  },
+  "college_15": {
+    "height": 20,
+    "pixelRatio": 1,
+    "width": 20,
+    "x": 231,
+    "y": 208
+  },
+  "commercial_11": {
+    "height": 15,
+    "pixelRatio": 1,
+    "width": 15,
+    "x": 371,
+    "y": 0
+  },
+  "commercial_15": {
+    "height": 19,
+    "pixelRatio": 1,
+    "width": 19,
+    "x": 212,
+    "y": 229
+  },
+  "cricket_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 422,
-    "y": 136
+    "x": 456,
+    "y": 166
   },
-  "doctor_15": {
+  "cricket_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
     "x": 229,
     "y": 0
   },
+  "cross_11": {
+    "height": 15,
+    "pixelRatio": 1,
+    "width": 15,
+    "x": 386,
+    "y": 0
+  },
+  "cross_15": {
+    "height": 19,
+    "pixelRatio": 1,
+    "width": 19,
+    "x": 231,
+    "y": 229
+  },
+  "dam_11": {
+    "height": 15,
+    "pixelRatio": 1,
+    "width": 15,
+    "x": 401,
+    "y": 0
+  },
+  "dam_15": {
+    "height": 19,
+    "pixelRatio": 1,
+    "width": 19,
+    "x": 250,
+    "y": 229
+  },
+  "danger_11": {
+    "height": 17,
+    "pixelRatio": 1,
+    "width": 17,
+    "x": 473,
+    "y": 166
+  },
+  "danger_15": {
+    "height": 21,
+    "pixelRatio": 1,
+    "width": 21,
+    "x": 0,
+    "y": 124
+  },
+  "default_1": {
+    "height": 18,
+    "pixelRatio": 1,
+    "width": 18,
+    "x": 385,
+    "y": 124
+  },
+  "default_2": {
+    "height": 18,
+    "pixelRatio": 1,
+    "width": 25,
+    "x": 403,
+    "y": 124
+  },
+  "default_3": {
+    "height": 18,
+    "pixelRatio": 1,
+    "width": 32,
+    "x": 428,
+    "y": 124
+  },
+  "default_4": {
+    "height": 18,
+    "pixelRatio": 1,
+    "width": 39,
+    "x": 460,
+    "y": 124
+  },
+  "default_5": {
+    "height": 18,
+    "pixelRatio": 1,
+    "width": 45,
+    "x": 252,
+    "y": 145
+  },
+  "default_6": {
+    "height": 18,
+    "pixelRatio": 1,
+    "width": 50,
+    "x": 297,
+    "y": 145
+  },
+  "dentist_11": {
+    "height": 17,
+    "pixelRatio": 1,
+    "width": 17,
+    "x": 490,
+    "y": 166
+  },
+  "dentist_15": {
+    "height": 21,
+    "pixelRatio": 1,
+    "width": 21,
+    "x": 21,
+    "y": 124
+  },
+  "doctor_11": {
+    "height": 17,
+    "pixelRatio": 1,
+    "width": 17,
+    "x": 252,
+    "y": 187
+  },
+  "doctor_15": {
+    "height": 21,
+    "pixelRatio": 1,
+    "width": 21,
+    "x": 42,
+    "y": 124
+  },
   "dog_park_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 439,
-    "y": 136
+    "x": 269,
+    "y": 187
   },
   "dog_park_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 0,
-    "y": 115
+    "x": 63,
+    "y": 124
   },
   "dot_10": {
     "height": 10,
     "pixelRatio": 1,
     "width": 10,
-    "x": 131,
-    "y": 239
+    "x": 206,
+    "y": 249
   },
   "dot_11": {
     "height": 11,
     "pixelRatio": 1,
     "width": 11,
-    "x": 120,
-    "y": 239
+    "x": 195,
+    "y": 249
   },
   "dot_9": {
     "height": 9,
     "pixelRatio": 1,
     "width": 9,
-    "x": 141,
-    "y": 239
+    "x": 216,
+    "y": 249
   },
   "drinking-water_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 456,
-    "y": 136
+    "x": 286,
+    "y": 187
   },
   "drinking_water_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 21,
-    "y": 115
+    "x": 84,
+    "y": 124
   },
   "embassy_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 473,
-    "y": 136
+    "x": 303,
+    "y": 187
   },
   "embassy_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 42,
-    "y": 115
+    "x": 105,
+    "y": 124
   },
   "entrance_11": {
     "height": 15,
     "pixelRatio": 1,
     "width": 15,
-    "x": 340,
+    "x": 416,
     "y": 0
   },
   "entrance_15": {
     "height": 19,
     "pixelRatio": 1,
     "width": 19,
-    "x": 209,
-    "y": 220
+    "x": 269,
+    "y": 229
   },
   "fast_food_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 490,
-    "y": 136
+    "x": 320,
+    "y": 187
   },
   "fast_food_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 63,
-    "y": 115
+    "x": 126,
+    "y": 124
   },
   "ferry_11": {
     "height": 15,
     "pixelRatio": 1,
     "width": 15,
-    "x": 355,
+    "x": 431,
     "y": 0
   },
   "ferry_15": {
     "height": 19,
     "pixelRatio": 1,
     "width": 19,
-    "x": 228,
-    "y": 220
+    "x": 288,
+    "y": 229
   },
   "fire-station_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 252,
-    "y": 157
+    "x": 337,
+    "y": 187
   },
   "fire-station_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 84,
-    "y": 115
+    "x": 147,
+    "y": 124
   },
   "fuel_11": {
     "height": 15,
     "pixelRatio": 1,
     "width": 15,
-    "x": 370,
+    "x": 446,
     "y": 0
   },
   "fuel_15": {
     "height": 19,
     "pixelRatio": 1,
     "width": 19,
-    "x": 247,
-    "y": 220
+    "x": 307,
+    "y": 229
   },
   "garden_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 269,
-    "y": 157
+    "x": 354,
+    "y": 187
   },
   "garden_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 105,
-    "y": 115
+    "x": 168,
+    "y": 124
+  },
+  "gb-motorway_3": {
+    "height": 30,
+    "pixelRatio": 1,
+    "width": 50,
+    "x": 0,
+    "y": 64
   },
   "gift_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 286,
-    "y": 157
+    "x": 371,
+    "y": 187
   },
   "gift_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 126,
-    "y": 115
+    "x": 189,
+    "y": 124
   },
   "golf_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 303,
-    "y": 157
+    "x": 388,
+    "y": 187
   },
   "golf_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 147,
-    "y": 115
+    "x": 210,
+    "y": 124
   },
   "grocery_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 320,
-    "y": 157
+    "x": 405,
+    "y": 187
   },
   "grocery_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 168,
-    "y": 115
+    "x": 231,
+    "y": 124
   },
   "hairdresser_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 337,
-    "y": 157
+    "x": 422,
+    "y": 187
   },
   "hairdresser_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 189,
-    "y": 115
+    "x": 0,
+    "y": 145
   },
   "harbor_11": {
     "height": 15,
     "pixelRatio": 1,
     "width": 15,
-    "x": 385,
+    "x": 461,
     "y": 0
   },
   "harbor_15": {
     "height": 19,
     "pixelRatio": 1,
     "width": 19,
-    "x": 266,
-    "y": 220
+    "x": 326,
+    "y": 229
   },
   "heart_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 354,
-    "y": 157
+    "x": 439,
+    "y": 187
   },
   "heart_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 210,
-    "y": 115
+    "x": 21,
+    "y": 145
   },
   "heliport_11": {
     "height": 15,
     "pixelRatio": 1,
     "width": 15,
-    "x": 400,
+    "x": 476,
     "y": 0
   },
   "heliport_15": {
     "height": 19,
     "pixelRatio": 1,
     "width": 19,
-    "x": 285,
-    "y": 220
+    "x": 345,
+    "y": 229
   },
   "hospital_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 371,
-    "y": 157
+    "x": 456,
+    "y": 187
   },
   "hospital_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 231,
-    "y": 115
+    "x": 42,
+    "y": 145
   },
   "ice_cream_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 388,
-    "y": 157
+    "x": 473,
+    "y": 187
   },
   "ice_cream_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 0,
-    "y": 136
+    "x": 63,
+    "y": 145
   },
   "industry_11": {
     "height": 15,
     "pixelRatio": 1,
     "width": 15,
-    "x": 415,
+    "x": 491,
     "y": 0
   },
   "industry_15": {
     "height": 19,
     "pixelRatio": 1,
     "width": 19,
-    "x": 304,
-    "y": 220
+    "x": 364,
+    "y": 229
   },
   "information_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 405,
-    "y": 157
+    "x": 490,
+    "y": 187
   },
   "information_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 21,
-    "y": 136
+    "x": 84,
+    "y": 145
   },
   "laundry_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 422,
-    "y": 157
+    "x": 251,
+    "y": 208
   },
   "laundry_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 42,
-    "y": 136
+    "x": 105,
+    "y": 145
   },
   "library_11": {
     "height": 16,
     "pixelRatio": 1,
     "width": 16,
-    "x": 386,
-    "y": 64
+    "x": 467,
+    "y": 94
   },
   "library_15": {
     "height": 20,
     "pixelRatio": 1,
     "width": 20,
-    "x": 188,
-    "y": 199
+    "x": 0,
+    "y": 229
   },
   "lighthouse_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 439,
-    "y": 157
+    "x": 268,
+    "y": 208
   },
   "lighthouse_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 63,
-    "y": 136
+    "x": 126,
+    "y": 145
   },
   "lodging_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 456,
-    "y": 157
+    "x": 285,
+    "y": 208
   },
   "lodging_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 84,
-    "y": 136
+    "x": 147,
+    "y": 145
   },
   "marker_11": {
     "height": 15,
     "pixelRatio": 1,
     "width": 15,
-    "x": 430,
-    "y": 0
+    "x": 0,
+    "y": 249
   },
   "marker_15": {
     "height": 19,
     "pixelRatio": 1,
     "width": 19,
-    "x": 323,
-    "y": 220
+    "x": 383,
+    "y": 229
   },
   "monument_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 473,
-    "y": 157
+    "x": 302,
+    "y": 208
   },
   "monument_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 105,
-    "y": 136
+    "x": 168,
+    "y": 145
   },
   "mountain_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 490,
-    "y": 157
+    "x": 319,
+    "y": 208
   },
   "mountain_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 126,
-    "y": 136
+    "x": 189,
+    "y": 145
   },
   "museum_11": {
     "height": 16,
     "pixelRatio": 1,
     "width": 16,
-    "x": 402,
-    "y": 64
+    "x": 483,
+    "y": 94
   },
   "museum_15": {
     "height": 20,
     "pixelRatio": 1,
     "width": 20,
-    "x": 208,
-    "y": 199
+    "x": 20,
+    "y": 229
   },
   "music_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 252,
-    "y": 178
+    "x": 336,
+    "y": 208
   },
   "music_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 147,
-    "y": 136
+    "x": 210,
+    "y": 145
   },
   "park_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 269,
-    "y": 178
+    "x": 353,
+    "y": 208
   },
   "park_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 168,
-    "y": 136
+    "x": 231,
+    "y": 145
   },
   "parking_11": {
     "height": 15,
     "pixelRatio": 1,
     "width": 15,
-    "x": 445,
-    "y": 0
+    "x": 15,
+    "y": 249
   },
   "parking_15": {
     "height": 19,
     "pixelRatio": 1,
     "width": 19,
-    "x": 342,
-    "y": 220
+    "x": 402,
+    "y": 229
   },
   "parking_garage_11": {
     "height": 15,
     "pixelRatio": 1,
     "width": 15,
-    "x": 460,
-    "y": 0
+    "x": 30,
+    "y": 249
   },
   "parking_garage_15": {
     "height": 19,
     "pixelRatio": 1,
     "width": 19,
-    "x": 361,
-    "y": 220
+    "x": 421,
+    "y": 229
   },
   "pedestrian_polygon": {
     "height": 64,
@@ -1046,672 +1053,672 @@
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 286,
-    "y": 178
+    "x": 370,
+    "y": 208
   },
   "pharmacy_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 189,
-    "y": 136
+    "x": 0,
+    "y": 166
   },
   "picnic_site_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 303,
-    "y": 178
+    "x": 387,
+    "y": 208
   },
   "picnic_site_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 210,
-    "y": 136
+    "x": 21,
+    "y": 166
   },
   "pitch_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 320,
-    "y": 178
+    "x": 404,
+    "y": 208
   },
   "pitch_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 231,
-    "y": 136
+    "x": 42,
+    "y": 166
   },
   "place_of_worship_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 337,
-    "y": 178
+    "x": 421,
+    "y": 208
   },
   "place_of_worship_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 0,
-    "y": 157
+    "x": 63,
+    "y": 166
   },
   "playground_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 354,
-    "y": 178
+    "x": 438,
+    "y": 208
   },
   "playground_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 21,
-    "y": 157
+    "x": 84,
+    "y": 166
   },
   "police_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 371,
-    "y": 178
+    "x": 455,
+    "y": 208
   },
   "police_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 42,
-    "y": 157
+    "x": 105,
+    "y": 166
   },
   "post_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 388,
-    "y": 178
+    "x": 472,
+    "y": 208
   },
   "post_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 63,
-    "y": 157
+    "x": 126,
+    "y": 166
   },
   "prison_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 405,
-    "y": 178
+    "x": 489,
+    "y": 208
   },
   "prison_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 84,
-    "y": 157
+    "x": 147,
+    "y": 166
   },
   "railway_11": {
     "height": 15,
     "pixelRatio": 1,
     "width": 15,
-    "x": 475,
-    "y": 0
+    "x": 45,
+    "y": 249
   },
   "railway_15": {
     "height": 19,
     "pixelRatio": 1,
     "width": 19,
-    "x": 380,
-    "y": 220
+    "x": 440,
+    "y": 229
   },
   "railway_light_11": {
     "height": 15,
     "pixelRatio": 1,
     "width": 15,
-    "x": 490,
-    "y": 0
+    "x": 60,
+    "y": 249
   },
   "railway_light_15": {
     "height": 19,
     "pixelRatio": 1,
     "width": 19,
-    "x": 399,
-    "y": 220
+    "x": 459,
+    "y": 229
   },
   "railway_metro_11": {
     "height": 15,
     "pixelRatio": 1,
     "width": 15,
-    "x": 0,
-    "y": 239
+    "x": 75,
+    "y": 249
   },
   "railway_metro_15": {
     "height": 19,
     "pixelRatio": 1,
     "width": 19,
-    "x": 418,
-    "y": 220
+    "x": 478,
+    "y": 229
   },
   "ranger_station_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 422,
-    "y": 178
+    "x": 243,
+    "y": 64
   },
   "ranger_station_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 105,
-    "y": 157
+    "x": 168,
+    "y": 166
   },
   "religious_christian_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 439,
-    "y": 178
+    "x": 260,
+    "y": 64
   },
   "religious_christian_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 126,
-    "y": 157
+    "x": 189,
+    "y": 166
   },
   "religious_jewish_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 456,
-    "y": 178
+    "x": 277,
+    "y": 64
   },
   "religious_jewish_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 147,
-    "y": 157
+    "x": 210,
+    "y": 166
   },
   "religious_muslim_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 473,
-    "y": 178
+    "x": 294,
+    "y": 64
   },
   "religious_muslim_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 168,
-    "y": 157
+    "x": 231,
+    "y": 166
   },
   "restaurant_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 490,
-    "y": 178
+    "x": 311,
+    "y": 64
   },
   "restaurant_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 189,
-    "y": 157
+    "x": 0,
+    "y": 187
   },
   "roadblock_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 248,
-    "y": 199
+    "x": 328,
+    "y": 64
   },
   "roadblock_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 210,
-    "y": 157
+    "x": 21,
+    "y": 187
   },
   "rocket_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 265,
-    "y": 199
+    "x": 345,
+    "y": 64
   },
   "rocket_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 231,
-    "y": 157
+    "x": 42,
+    "y": 187
   },
   "school_11": {
     "height": 16,
     "pixelRatio": 1,
     "width": 16,
-    "x": 418,
-    "y": 64
+    "x": 250,
+    "y": 0
   },
   "school_15": {
     "height": 20,
     "pixelRatio": 1,
     "width": 20,
-    "x": 228,
-    "y": 199
+    "x": 40,
+    "y": 229
   },
   "shelter_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 282,
-    "y": 199
+    "x": 362,
+    "y": 64
   },
   "shelter_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 0,
-    "y": 178
+    "x": 63,
+    "y": 187
   },
   "shop_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 299,
-    "y": 199
+    "x": 379,
+    "y": 64
   },
   "shop_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 21,
-    "y": 178
+    "x": 84,
+    "y": 187
   },
   "skiing_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 316,
-    "y": 199
+    "x": 396,
+    "y": 64
   },
   "skiing_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 42,
-    "y": 178
+    "x": 105,
+    "y": 187
   },
   "soccer_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 333,
-    "y": 199
+    "x": 413,
+    "y": 64
   },
   "soccer_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 63,
-    "y": 178
+    "x": 126,
+    "y": 187
   },
   "square-stroke_11": {
     "height": 15,
     "pixelRatio": 1,
     "width": 15,
-    "x": 15,
-    "y": 239
+    "x": 90,
+    "y": 249
   },
   "square-stroke_15": {
     "height": 19,
     "pixelRatio": 1,
     "width": 19,
-    "x": 437,
-    "y": 220
+    "x": 252,
+    "y": 124
   },
   "square_11": {
     "height": 15,
     "pixelRatio": 1,
     "width": 15,
-    "x": 30,
-    "y": 239
+    "x": 105,
+    "y": 249
   },
   "square_15": {
     "height": 19,
     "pixelRatio": 1,
     "width": 19,
-    "x": 456,
-    "y": 220
+    "x": 271,
+    "y": 124
   },
   "stadium_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 350,
-    "y": 199
+    "x": 430,
+    "y": 64
   },
   "stadium_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 84,
-    "y": 178
+    "x": 147,
+    "y": 187
   },
   "star-stroke_11": {
     "height": 15,
     "pixelRatio": 1,
     "width": 15,
-    "x": 45,
-    "y": 239
+    "x": 120,
+    "y": 249
   },
   "star-stroke_15": {
     "height": 19,
     "pixelRatio": 1,
     "width": 19,
-    "x": 475,
-    "y": 220
+    "x": 290,
+    "y": 124
   },
   "star_11": {
     "height": 15,
     "pixelRatio": 1,
     "width": 15,
-    "x": 60,
-    "y": 239
+    "x": 135,
+    "y": 249
   },
   "star_15": {
     "height": 19,
     "pixelRatio": 1,
     "width": 19,
-    "x": 252,
-    "y": 94
+    "x": 309,
+    "y": 124
   },
   "suitcase_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 367,
-    "y": 199
+    "x": 447,
+    "y": 64
   },
   "suitcase_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 105,
-    "y": 178
+    "x": 168,
+    "y": 187
   },
   "sushi_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 384,
-    "y": 199
+    "x": 464,
+    "y": 64
   },
   "sushi_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 126,
-    "y": 178
+    "x": 189,
+    "y": 187
   },
   "swimming_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 401,
-    "y": 199
+    "x": 481,
+    "y": 64
   },
   "swimming_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 147,
-    "y": 178
+    "x": 210,
+    "y": 187
   },
   "telephone_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 418,
-    "y": 199
+    "x": 247,
+    "y": 94
   },
   "telephone_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 168,
-    "y": 178
+    "x": 231,
+    "y": 187
   },
   "tennis_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 435,
-    "y": 199
+    "x": 264,
+    "y": 94
   },
   "tennis_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 189,
-    "y": 178
+    "x": 0,
+    "y": 208
   },
   "theatre_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 452,
-    "y": 199
+    "x": 281,
+    "y": 94
   },
   "theatre_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 210,
-    "y": 178
+    "x": 21,
+    "y": 208
   },
   "toilet_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 469,
-    "y": 199
+    "x": 298,
+    "y": 94
   },
   "toilet_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 231,
-    "y": 178
+    "x": 42,
+    "y": 208
   },
   "town-hall_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 486,
-    "y": 199
+    "x": 315,
+    "y": 94
   },
   "town-hall_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 0,
-    "y": 199
+    "x": 63,
+    "y": 208
   },
   "triangle_11": {
     "height": 15,
     "pixelRatio": 1,
     "width": 15,
-    "x": 75,
-    "y": 239
+    "x": 150,
+    "y": 249
   },
   "triangle_15": {
     "height": 19,
     "pixelRatio": 1,
     "width": 19,
-    "x": 271,
-    "y": 94
+    "x": 328,
+    "y": 124
   },
   "triangle_stroked_11": {
     "height": 15,
     "pixelRatio": 1,
     "width": 15,
-    "x": 90,
-    "y": 239
+    "x": 165,
+    "y": 249
   },
   "triangle_stroked_15": {
     "height": 19,
     "pixelRatio": 1,
     "width": 19,
-    "x": 290,
-    "y": 94
+    "x": 347,
+    "y": 124
   },
   "us-highway_2": {
     "height": 30,
     "pixelRatio": 1,
     "width": 30,
-    "x": 94,
-    "y": 0
+    "x": 50,
+    "y": 64
   },
   "us-highway_3": {
     "height": 30,
     "pixelRatio": 1,
     "width": 37,
-    "x": 0,
+    "x": 80,
     "y": 64
   },
   "us-interstate_2": {
     "height": 30,
     "pixelRatio": 1,
     "width": 30,
-    "x": 37,
-    "y": 64
+    "x": 94,
+    "y": 0
   },
   "us-interstate_3": {
     "height": 30,
     "pixelRatio": 1,
     "width": 37,
-    "x": 67,
-    "y": 64
+    "x": 0,
+    "y": 94
   },
   "veterinary_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 251,
-    "y": 64
+    "x": 332,
+    "y": 94
   },
   "veterinary_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 21,
-    "y": 199
+    "x": 84,
+    "y": 208
   },
   "volcano_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 268,
-    "y": 64
+    "x": 349,
+    "y": 94
   },
   "volcano_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 42,
-    "y": 199
+    "x": 105,
+    "y": 208
   },
   "warehouse_11": {
     "height": 15,
     "pixelRatio": 1,
     "width": 15,
-    "x": 105,
-    "y": 239
+    "x": 180,
+    "y": 249
   },
   "warehouse_15": {
     "height": 19,
     "pixelRatio": 1,
     "width": 19,
-    "x": 309,
-    "y": 94
+    "x": 366,
+    "y": 124
   },
   "waste_basket_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 285,
-    "y": 64
+    "x": 366,
+    "y": 94
   },
   "waste_basket_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 63,
-    "y": 199
+    "x": 126,
+    "y": 208
   },
   "water_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 302,
-    "y": 64
+    "x": 383,
+    "y": 94
   },
   "water_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 84,
-    "y": 199
+    "x": 147,
+    "y": 208
   },
   "wetland_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 319,
-    "y": 64
+    "x": 400,
+    "y": 94
   },
   "wetland_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 105,
-    "y": 199
+    "x": 168,
+    "y": 208
   },
   "wheelchair_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 336,
-    "y": 64
+    "x": 417,
+    "y": 94
   },
   "wheelchair_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 126,
-    "y": 199
+    "x": 189,
+    "y": 208
   },
   "zoo_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
-    "x": 353,
-    "y": 64
+    "x": 434,
+    "y": 94
   },
   "zoo_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
-    "x": 147,
-    "y": 199
+    "x": 210,
+    "y": 208
   }
 }
\ No newline at end of file
diff --git a/sprites/osm-liberty.png b/sprites/osm-liberty.png
index da682a4..9ccc702 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 64fdf56..e18f74b 100644
--- a/sprites/osm-liberty@2x.json
+++ b/sprites/osm-liberty@2x.json
@@ -3,281 +3,281 @@
     "height": 30,
     "pixelRatio": 2,
     "width": 30,
-    "x": 870,
-    "y": 128
+    "x": 994,
+    "y": 458
   },
   "aerialway_15": {
     "height": 38,
     "pixelRatio": 2,
     "width": 38,
-    "x": 0,
-    "y": 440
+    "x": 120,
+    "y": 458
   },
   "airfield_11": {
     "height": 30,
     "pixelRatio": 2,
     "width": 30,
-    "x": 900,
-    "y": 128
+    "x": 532,
+    "y": 0
   },
   "airfield_15": {
     "height": 38,
     "pixelRatio": 2,
     "width": 38,
-    "x": 38,
-    "y": 440
+    "x": 158,
+    "y": 458
   },
   "airport_11": {
     "height": 30,
     "pixelRatio": 2,
     "width": 30,
-    "x": 930,
-    "y": 128
+    "x": 562,
+    "y": 0
   },
   "airport_15": {
     "height": 38,
     "pixelRatio": 2,
     "width": 38,
-    "x": 76,
-    "y": 440
+    "x": 196,
+    "y": 458
   },
   "alcohol_shop_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 938,
-    "y": 188
+    "x": 694,
+    "y": 290
   },
   "alcohol_shop_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 210,
-    "y": 128
+    "x": 75,
+    "y": 188
   },
   "america_football_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 972,
-    "y": 188
+    "x": 728,
+    "y": 290
   },
   "america_football_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 0,
+    "x": 117,
     "y": 188
   },
   "amusement_park_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 604,
-    "y": 230
+    "x": 762,
+    "y": 290
   },
   "amusement_park_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 42,
+    "x": 159,
     "y": 188
   },
   "aquarium_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 638,
-    "y": 230
+    "x": 796,
+    "y": 290
   },
   "aquarium_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 84,
+    "x": 201,
     "y": 188
   },
   "art_gallery_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 672,
-    "y": 230
+    "x": 830,
+    "y": 290
   },
   "art_gallery_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 126,
-    "y": 188
+    "x": 235,
+    "y": 128
   },
   "attraction_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 706,
-    "y": 230
+    "x": 864,
+    "y": 290
   },
   "attraction_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 168,
-    "y": 188
+    "x": 277,
+    "y": 128
   },
   "bakery_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 740,
-    "y": 230
+    "x": 898,
+    "y": 290
   },
   "bakery_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 210,
-    "y": 188
+    "x": 319,
+    "y": 128
   },
   "bank_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 774,
-    "y": 230
+    "x": 932,
+    "y": 290
   },
   "bank_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 252,
-    "y": 188
+    "x": 361,
+    "y": 128
   },
   "bar_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 808,
-    "y": 230
+    "x": 966,
+    "y": 290
   },
   "bar_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 294,
-    "y": 188
+    "x": 403,
+    "y": 128
   },
   "baseball_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 842,
-    "y": 230
+    "x": 504,
+    "y": 332
   },
   "baseball_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 336,
-    "y": 188
+    "x": 445,
+    "y": 128
   },
   "basketball_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 876,
-    "y": 230
+    "x": 538,
+    "y": 332
   },
   "basketball_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 378,
+    "x": 243,
     "y": 188
   },
   "beer_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 910,
-    "y": 230
+    "x": 572,
+    "y": 332
   },
   "beer_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 420,
+    "x": 285,
     "y": 188
   },
   "bicycle_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 944,
-    "y": 230
+    "x": 606,
+    "y": 332
   },
   "bicycle_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 462,
+    "x": 327,
     "y": 188
   },
   "bicycle_rental_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 978,
-    "y": 230
+    "x": 640,
+    "y": 332
   },
   "bicycle_rental_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 252,
-    "y": 128
+    "x": 369,
+    "y": 188
   },
   "building_11": {
     "height": 30,
     "pixelRatio": 2,
     "width": 30,
-    "x": 960,
-    "y": 128
+    "x": 592,
+    "y": 0
   },
   "building_15": {
     "height": 38,
     "pixelRatio": 2,
     "width": 38,
-    "x": 114,
-    "y": 440
+    "x": 234,
+    "y": 458
   },
   "bus_11": {
     "height": 30,
     "pixelRatio": 2,
     "width": 30,
-    "x": 990,
-    "y": 128
+    "x": 622,
+    "y": 0
   },
   "bus_15": {
     "height": 38,
     "pixelRatio": 2,
     "width": 38,
-    "x": 152,
-    "y": 440
+    "x": 272,
+    "y": 458
   },
   "butcher_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 504,
-    "y": 272
+    "x": 674,
+    "y": 332
   },
   "butcher_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 294,
-    "y": 128
+    "x": 411,
+    "y": 188
   },
   "ca-transcanada_2": {
     "height": 60,
@@ -290,750 +290,757 @@
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 538,
-    "y": 272
+    "x": 708,
+    "y": 332
   },
   "cafe_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 336,
-    "y": 128
+    "x": 453,
+    "y": 188
   },
   "campsite_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 572,
-    "y": 272
+    "x": 742,
+    "y": 332
   },
   "campsite_15": {
-    "height": 42,
-    "pixelRatio": 2,
-    "width": 42,
-    "x": 378,
-    "y": 128
-  },
-  "car_11": {
-    "height": 30,
-    "pixelRatio": 2,
-    "width": 30,
-    "x": 500,
-    "y": 0
-  },
-  "car_15": {
-    "height": 38,
-    "pixelRatio": 2,
-    "width": 38,
-    "x": 190,
-    "y": 440
-  },
-  "castle_11": {
-    "height": 34,
-    "pixelRatio": 2,
-    "width": 34,
-    "x": 606,
-    "y": 272
-  },
-  "castle_15": {
-    "height": 42,
-    "pixelRatio": 2,
-    "width": 42,
-    "x": 420,
-    "y": 128
-  },
-  "cemetery_11": {
-    "height": 34,
-    "pixelRatio": 2,
-    "width": 34,
-    "x": 640,
-    "y": 272
-  },
-  "cemetery_15": {
-    "height": 42,
-    "pixelRatio": 2,
-    "width": 42,
-    "x": 462,
-    "y": 128
-  },
-  "cinema_11": {
-    "height": 34,
-    "pixelRatio": 2,
-    "width": 34,
-    "x": 674,
-    "y": 272
-  },
-  "cinema_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
     "x": 248,
     "y": 0
   },
-  "circle-stroked_11": {
+  "car_11": {
     "height": 30,
     "pixelRatio": 2,
     "width": 30,
-    "x": 530,
+    "x": 652,
     "y": 0
   },
-  "circle-stroked_15": {
+  "car_15": {
     "height": 38,
     "pixelRatio": 2,
     "width": 38,
-    "x": 228,
-    "y": 440
+    "x": 310,
+    "y": 458
   },
-  "circle_11": {
-    "height": 30,
-    "pixelRatio": 2,
-    "width": 30,
-    "x": 560,
-    "y": 0
-  },
-  "circle_15": {
-    "height": 38,
-    "pixelRatio": 2,
-    "width": 38,
-    "x": 266,
-    "y": 440
-  },
-  "clothing_store_11": {
+  "castle_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 708,
-    "y": 272
+    "x": 776,
+    "y": 332
   },
-  "clothing_store_15": {
+  "castle_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
     "x": 290,
     "y": 0
   },
-  "college_11": {
-    "height": 32,
-    "pixelRatio": 2,
-    "width": 32,
-    "x": 742,
-    "y": 128
-  },
-  "college_15": {
-    "height": 40,
-    "pixelRatio": 2,
-    "width": 40,
-    "x": 336,
-    "y": 398
-  },
-  "commercial_11": {
-    "height": 30,
-    "pixelRatio": 2,
-    "width": 30,
-    "x": 590,
-    "y": 0
-  },
-  "commercial_15": {
-    "height": 38,
-    "pixelRatio": 2,
-    "width": 38,
-    "x": 304,
-    "y": 440
-  },
-  "cricket_11": {
+  "cemetery_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 742,
-    "y": 272
+    "x": 810,
+    "y": 332
   },
-  "cricket_15": {
+  "cemetery_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
     "x": 332,
     "y": 0
   },
-  "cross_11": {
-    "height": 30,
-    "pixelRatio": 2,
-    "width": 30,
-    "x": 620,
-    "y": 0
-  },
-  "cross_15": {
-    "height": 38,
-    "pixelRatio": 2,
-    "width": 38,
-    "x": 342,
-    "y": 440
-  },
-  "dam_11": {
-    "height": 30,
-    "pixelRatio": 2,
-    "width": 30,
-    "x": 650,
-    "y": 0
-  },
-  "dam_15": {
-    "height": 38,
-    "pixelRatio": 2,
-    "width": 38,
-    "x": 380,
-    "y": 440
-  },
-  "danger_11": {
+  "cinema_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 776,
-    "y": 272
+    "x": 844,
+    "y": 332
   },
-  "danger_15": {
+  "cinema_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
     "x": 374,
     "y": 0
   },
-  "default_1": {
-    "height": 36,
+  "circle-stroked_11": {
+    "height": 30,
     "pixelRatio": 2,
-    "width": 36,
-    "x": 988,
-    "y": 440
+    "width": 30,
+    "x": 682,
+    "y": 0
   },
-  "default_2": {
-    "height": 36,
+  "circle-stroked_15": {
+    "height": 38,
     "pixelRatio": 2,
-    "width": 50,
-    "x": 656,
-    "y": 188
+    "width": 38,
+    "x": 348,
+    "y": 458
   },
-  "default_3": {
-    "height": 36,
+  "circle_11": {
+    "height": 30,
     "pixelRatio": 2,
-    "width": 64,
-    "x": 706,
-    "y": 188
+    "width": 30,
+    "x": 712,
+    "y": 0
   },
-  "default_4": {
-    "height": 36,
+  "circle_15": {
+    "height": 38,
     "pixelRatio": 2,
-    "width": 78,
-    "x": 770,
-    "y": 188
+    "width": 38,
+    "x": 386,
+    "y": 458
   },
-  "default_5": {
-    "height": 36,
-    "pixelRatio": 2,
-    "width": 90,
-    "x": 848,
-    "y": 188
-  },
-  "default_6": {
-    "height": 36,
-    "pixelRatio": 2,
-    "width": 100,
-    "x": 504,
-    "y": 230
-  },
-  "dentist_11": {
+  "clothing_store_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 810,
-    "y": 272
+    "x": 878,
+    "y": 332
   },
-  "dentist_15": {
+  "clothing_store_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
     "x": 416,
     "y": 0
   },
-  "doctor_11": {
+  "college_11": {
+    "height": 32,
+    "pixelRatio": 2,
+    "width": 32,
+    "x": 903,
+    "y": 188
+  },
+  "college_15": {
+    "height": 40,
+    "pixelRatio": 2,
+    "width": 40,
+    "x": 462,
+    "y": 416
+  },
+  "commercial_11": {
+    "height": 30,
+    "pixelRatio": 2,
+    "width": 30,
+    "x": 742,
+    "y": 0
+  },
+  "commercial_15": {
+    "height": 38,
+    "pixelRatio": 2,
+    "width": 38,
+    "x": 424,
+    "y": 458
+  },
+  "cricket_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 844,
-    "y": 272
+    "x": 912,
+    "y": 332
   },
-  "doctor_15": {
+  "cricket_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
     "x": 458,
     "y": 0
   },
+  "cross_11": {
+    "height": 30,
+    "pixelRatio": 2,
+    "width": 30,
+    "x": 772,
+    "y": 0
+  },
+  "cross_15": {
+    "height": 38,
+    "pixelRatio": 2,
+    "width": 38,
+    "x": 462,
+    "y": 458
+  },
+  "dam_11": {
+    "height": 30,
+    "pixelRatio": 2,
+    "width": 30,
+    "x": 802,
+    "y": 0
+  },
+  "dam_15": {
+    "height": 38,
+    "pixelRatio": 2,
+    "width": 38,
+    "x": 500,
+    "y": 458
+  },
+  "danger_11": {
+    "height": 34,
+    "pixelRatio": 2,
+    "width": 34,
+    "x": 946,
+    "y": 332
+  },
+  "danger_15": {
+    "height": 42,
+    "pixelRatio": 2,
+    "width": 42,
+    "x": 0,
+    "y": 248
+  },
+  "default_1": {
+    "height": 36,
+    "pixelRatio": 2,
+    "width": 36,
+    "x": 770,
+    "y": 248
+  },
+  "default_2": {
+    "height": 36,
+    "pixelRatio": 2,
+    "width": 50,
+    "x": 806,
+    "y": 248
+  },
+  "default_3": {
+    "height": 36,
+    "pixelRatio": 2,
+    "width": 64,
+    "x": 856,
+    "y": 248
+  },
+  "default_4": {
+    "height": 36,
+    "pixelRatio": 2,
+    "width": 78,
+    "x": 920,
+    "y": 248
+  },
+  "default_5": {
+    "height": 36,
+    "pixelRatio": 2,
+    "width": 90,
+    "x": 504,
+    "y": 290
+  },
+  "default_6": {
+    "height": 36,
+    "pixelRatio": 2,
+    "width": 100,
+    "x": 594,
+    "y": 290
+  },
+  "dentist_11": {
+    "height": 34,
+    "pixelRatio": 2,
+    "width": 34,
+    "x": 980,
+    "y": 332
+  },
+  "dentist_15": {
+    "height": 42,
+    "pixelRatio": 2,
+    "width": 42,
+    "x": 42,
+    "y": 248
+  },
+  "doctor_11": {
+    "height": 34,
+    "pixelRatio": 2,
+    "width": 34,
+    "x": 504,
+    "y": 374
+  },
+  "doctor_15": {
+    "height": 42,
+    "pixelRatio": 2,
+    "width": 42,
+    "x": 84,
+    "y": 248
+  },
   "dog_park_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 878,
-    "y": 272
+    "x": 538,
+    "y": 374
   },
   "dog_park_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 0,
-    "y": 230
+    "x": 126,
+    "y": 248
   },
   "dot_10": {
     "height": 20,
     "pixelRatio": 2,
     "width": 20,
-    "x": 262,
-    "y": 478
+    "x": 412,
+    "y": 498
   },
   "dot_11": {
     "height": 22,
     "pixelRatio": 2,
     "width": 22,
-    "x": 240,
-    "y": 478
+    "x": 390,
+    "y": 498
   },
   "dot_9": {
     "height": 18,
     "pixelRatio": 2,
     "width": 18,
-    "x": 282,
-    "y": 478
+    "x": 432,
+    "y": 498
   },
   "drinking-water_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 912,
-    "y": 272
+    "x": 572,
+    "y": 374
   },
   "drinking_water_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 42,
-    "y": 230
+    "x": 168,
+    "y": 248
   },
   "embassy_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 946,
-    "y": 272
+    "x": 606,
+    "y": 374
   },
   "embassy_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 84,
-    "y": 230
+    "x": 210,
+    "y": 248
   },
   "entrance_11": {
     "height": 30,
     "pixelRatio": 2,
     "width": 30,
-    "x": 680,
+    "x": 832,
     "y": 0
   },
   "entrance_15": {
     "height": 38,
     "pixelRatio": 2,
     "width": 38,
-    "x": 418,
-    "y": 440
+    "x": 538,
+    "y": 458
   },
   "fast_food_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 980,
-    "y": 272
+    "x": 640,
+    "y": 374
   },
   "fast_food_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 126,
-    "y": 230
+    "x": 252,
+    "y": 248
   },
   "ferry_11": {
     "height": 30,
     "pixelRatio": 2,
     "width": 30,
-    "x": 710,
+    "x": 862,
     "y": 0
   },
   "ferry_15": {
     "height": 38,
     "pixelRatio": 2,
     "width": 38,
-    "x": 456,
-    "y": 440
+    "x": 576,
+    "y": 458
   },
   "fire-station_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 504,
-    "y": 314
+    "x": 674,
+    "y": 374
   },
   "fire-station_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 168,
-    "y": 230
+    "x": 294,
+    "y": 248
   },
   "fuel_11": {
     "height": 30,
     "pixelRatio": 2,
     "width": 30,
-    "x": 740,
+    "x": 892,
     "y": 0
   },
   "fuel_15": {
     "height": 38,
     "pixelRatio": 2,
     "width": 38,
-    "x": 494,
-    "y": 440
+    "x": 614,
+    "y": 458
   },
   "garden_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 538,
-    "y": 314
+    "x": 708,
+    "y": 374
   },
   "garden_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 210,
-    "y": 230
+    "x": 336,
+    "y": 248
+  },
+  "gb-motorway_3": {
+    "height": 60,
+    "pixelRatio": 2,
+    "width": 100,
+    "x": 0,
+    "y": 128
   },
   "gift_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 572,
-    "y": 314
+    "x": 742,
+    "y": 374
   },
   "gift_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 252,
-    "y": 230
+    "x": 378,
+    "y": 248
   },
   "golf_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 606,
-    "y": 314
+    "x": 776,
+    "y": 374
   },
   "golf_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 294,
-    "y": 230
+    "x": 420,
+    "y": 248
   },
   "grocery_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 640,
-    "y": 314
+    "x": 810,
+    "y": 374
   },
   "grocery_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 336,
-    "y": 230
+    "x": 462,
+    "y": 248
   },
   "hairdresser_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 674,
-    "y": 314
+    "x": 844,
+    "y": 374
   },
   "hairdresser_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 378,
-    "y": 230
+    "x": 0,
+    "y": 290
   },
   "harbor_11": {
     "height": 30,
     "pixelRatio": 2,
     "width": 30,
-    "x": 770,
+    "x": 922,
     "y": 0
   },
   "harbor_15": {
     "height": 38,
     "pixelRatio": 2,
     "width": 38,
-    "x": 532,
-    "y": 440
+    "x": 652,
+    "y": 458
   },
   "heart_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 708,
-    "y": 314
+    "x": 878,
+    "y": 374
   },
   "heart_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 420,
-    "y": 230
+    "x": 42,
+    "y": 290
   },
   "heliport_11": {
     "height": 30,
     "pixelRatio": 2,
     "width": 30,
-    "x": 800,
+    "x": 952,
     "y": 0
   },
   "heliport_15": {
     "height": 38,
     "pixelRatio": 2,
     "width": 38,
-    "x": 570,
-    "y": 440
+    "x": 690,
+    "y": 458
   },
   "hospital_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 742,
-    "y": 314
+    "x": 912,
+    "y": 374
   },
   "hospital_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 462,
-    "y": 230
+    "x": 84,
+    "y": 290
   },
   "ice_cream_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 776,
-    "y": 314
+    "x": 946,
+    "y": 374
   },
   "ice_cream_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 0,
-    "y": 272
+    "x": 126,
+    "y": 290
   },
   "industry_11": {
     "height": 30,
     "pixelRatio": 2,
     "width": 30,
-    "x": 830,
+    "x": 982,
     "y": 0
   },
   "industry_15": {
     "height": 38,
     "pixelRatio": 2,
     "width": 38,
-    "x": 608,
-    "y": 440
+    "x": 728,
+    "y": 458
   },
   "information_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 810,
-    "y": 314
+    "x": 980,
+    "y": 374
   },
   "information_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 42,
-    "y": 272
+    "x": 168,
+    "y": 290
   },
   "laundry_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 844,
-    "y": 314
+    "x": 502,
+    "y": 416
   },
   "laundry_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 84,
-    "y": 272
+    "x": 210,
+    "y": 290
   },
   "library_11": {
     "height": 32,
     "pixelRatio": 2,
     "width": 32,
-    "x": 774,
-    "y": 128
+    "x": 935,
+    "y": 188
   },
   "library_15": {
     "height": 40,
     "pixelRatio": 2,
     "width": 40,
-    "x": 376,
-    "y": 398
+    "x": 0,
+    "y": 458
   },
   "lighthouse_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 878,
-    "y": 314
+    "x": 536,
+    "y": 416
   },
   "lighthouse_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 126,
-    "y": 272
+    "x": 252,
+    "y": 290
   },
   "lodging_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 912,
-    "y": 314
+    "x": 570,
+    "y": 416
   },
   "lodging_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 168,
-    "y": 272
+    "x": 294,
+    "y": 290
   },
   "marker_11": {
     "height": 30,
     "pixelRatio": 2,
     "width": 30,
-    "x": 860,
-    "y": 0
+    "x": 0,
+    "y": 498
   },
   "marker_15": {
     "height": 38,
     "pixelRatio": 2,
     "width": 38,
-    "x": 646,
-    "y": 440
+    "x": 766,
+    "y": 458
   },
   "monument_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 946,
-    "y": 314
+    "x": 604,
+    "y": 416
   },
   "monument_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 210,
-    "y": 272
+    "x": 336,
+    "y": 290
   },
   "mountain_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 980,
-    "y": 314
+    "x": 638,
+    "y": 416
   },
   "mountain_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 252,
-    "y": 272
+    "x": 378,
+    "y": 290
   },
   "museum_11": {
     "height": 32,
     "pixelRatio": 2,
     "width": 32,
-    "x": 806,
-    "y": 128
+    "x": 967,
+    "y": 188
   },
   "museum_15": {
     "height": 40,
     "pixelRatio": 2,
     "width": 40,
-    "x": 416,
-    "y": 398
+    "x": 40,
+    "y": 458
   },
   "music_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 504,
-    "y": 356
+    "x": 672,
+    "y": 416
   },
   "music_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 294,
-    "y": 272
+    "x": 420,
+    "y": 290
   },
   "park_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 538,
-    "y": 356
+    "x": 706,
+    "y": 416
   },
   "park_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 336,
-    "y": 272
+    "x": 462,
+    "y": 290
   },
   "parking_11": {
     "height": 30,
     "pixelRatio": 2,
     "width": 30,
-    "x": 890,
-    "y": 0
+    "x": 30,
+    "y": 498
   },
   "parking_15": {
     "height": 38,
     "pixelRatio": 2,
     "width": 38,
-    "x": 684,
-    "y": 440
+    "x": 804,
+    "y": 458
   },
   "parking_garage_11": {
     "height": 30,
     "pixelRatio": 2,
     "width": 30,
-    "x": 920,
-    "y": 0
+    "x": 60,
+    "y": 498
   },
   "parking_garage_15": {
     "height": 38,
     "pixelRatio": 2,
     "width": 38,
-    "x": 722,
-    "y": 440
+    "x": 842,
+    "y": 458
   },
   "pedestrian_polygon": {
     "height": 128,
@@ -1046,672 +1053,672 @@
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 572,
-    "y": 356
+    "x": 740,
+    "y": 416
   },
   "pharmacy_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 378,
-    "y": 272
+    "x": 0,
+    "y": 332
   },
   "picnic_site_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 606,
-    "y": 356
+    "x": 774,
+    "y": 416
   },
   "picnic_site_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 420,
-    "y": 272
+    "x": 42,
+    "y": 332
   },
   "pitch_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 640,
-    "y": 356
+    "x": 808,
+    "y": 416
   },
   "pitch_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 462,
-    "y": 272
+    "x": 84,
+    "y": 332
   },
   "place_of_worship_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 674,
-    "y": 356
+    "x": 842,
+    "y": 416
   },
   "place_of_worship_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 0,
-    "y": 314
+    "x": 126,
+    "y": 332
   },
   "playground_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 708,
-    "y": 356
+    "x": 876,
+    "y": 416
   },
   "playground_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 42,
-    "y": 314
+    "x": 168,
+    "y": 332
   },
   "police_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 742,
-    "y": 356
+    "x": 910,
+    "y": 416
   },
   "police_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 84,
-    "y": 314
+    "x": 210,
+    "y": 332
   },
   "post_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 776,
-    "y": 356
+    "x": 944,
+    "y": 416
   },
   "post_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 126,
-    "y": 314
+    "x": 252,
+    "y": 332
   },
   "prison_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 810,
-    "y": 356
+    "x": 978,
+    "y": 416
   },
   "prison_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 168,
-    "y": 314
+    "x": 294,
+    "y": 332
   },
   "railway_11": {
     "height": 30,
     "pixelRatio": 2,
     "width": 30,
-    "x": 950,
-    "y": 0
+    "x": 90,
+    "y": 498
   },
   "railway_15": {
     "height": 38,
     "pixelRatio": 2,
     "width": 38,
-    "x": 760,
-    "y": 440
+    "x": 880,
+    "y": 458
   },
   "railway_light_11": {
     "height": 30,
     "pixelRatio": 2,
     "width": 30,
-    "x": 980,
-    "y": 0
+    "x": 120,
+    "y": 498
   },
   "railway_light_15": {
     "height": 38,
     "pixelRatio": 2,
     "width": 38,
-    "x": 798,
-    "y": 440
+    "x": 918,
+    "y": 458
   },
   "railway_metro_11": {
     "height": 30,
     "pixelRatio": 2,
     "width": 30,
-    "x": 0,
-    "y": 478
+    "x": 150,
+    "y": 498
   },
   "railway_metro_15": {
     "height": 38,
     "pixelRatio": 2,
     "width": 38,
-    "x": 836,
-    "y": 440
+    "x": 956,
+    "y": 458
   },
   "ranger_station_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 844,
-    "y": 356
+    "x": 487,
+    "y": 128
   },
   "ranger_station_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 210,
-    "y": 314
+    "x": 336,
+    "y": 332
   },
   "religious_christian_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 878,
-    "y": 356
+    "x": 521,
+    "y": 128
   },
   "religious_christian_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 252,
-    "y": 314
+    "x": 378,
+    "y": 332
   },
   "religious_jewish_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 912,
-    "y": 356
+    "x": 555,
+    "y": 128
   },
   "religious_jewish_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 294,
-    "y": 314
+    "x": 420,
+    "y": 332
   },
   "religious_muslim_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 946,
-    "y": 356
+    "x": 589,
+    "y": 128
   },
   "religious_muslim_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 336,
-    "y": 314
+    "x": 462,
+    "y": 332
   },
   "restaurant_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 980,
-    "y": 356
+    "x": 623,
+    "y": 128
   },
   "restaurant_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 378,
-    "y": 314
+    "x": 0,
+    "y": 374
   },
   "roadblock_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 496,
-    "y": 398
+    "x": 657,
+    "y": 128
   },
   "roadblock_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 420,
-    "y": 314
+    "x": 42,
+    "y": 374
   },
   "rocket_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 530,
-    "y": 398
+    "x": 691,
+    "y": 128
   },
   "rocket_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 462,
-    "y": 314
+    "x": 84,
+    "y": 374
   },
   "school_11": {
     "height": 32,
     "pixelRatio": 2,
     "width": 32,
-    "x": 838,
-    "y": 128
+    "x": 500,
+    "y": 0
   },
   "school_15": {
     "height": 40,
     "pixelRatio": 2,
     "width": 40,
-    "x": 456,
-    "y": 398
+    "x": 80,
+    "y": 458
   },
   "shelter_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 564,
-    "y": 398
+    "x": 725,
+    "y": 128
   },
   "shelter_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 0,
-    "y": 356
+    "x": 126,
+    "y": 374
   },
   "shop_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 598,
-    "y": 398
+    "x": 759,
+    "y": 128
   },
   "shop_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 42,
-    "y": 356
+    "x": 168,
+    "y": 374
   },
   "skiing_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 632,
-    "y": 398
+    "x": 793,
+    "y": 128
   },
   "skiing_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 84,
-    "y": 356
+    "x": 210,
+    "y": 374
   },
   "soccer_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 666,
-    "y": 398
+    "x": 827,
+    "y": 128
   },
   "soccer_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 126,
-    "y": 356
+    "x": 252,
+    "y": 374
   },
   "square-stroke_11": {
     "height": 30,
     "pixelRatio": 2,
     "width": 30,
-    "x": 30,
-    "y": 478
+    "x": 180,
+    "y": 498
   },
   "square-stroke_15": {
     "height": 38,
     "pixelRatio": 2,
     "width": 38,
-    "x": 874,
-    "y": 440
+    "x": 504,
+    "y": 248
   },
   "square_11": {
     "height": 30,
     "pixelRatio": 2,
     "width": 30,
-    "x": 60,
-    "y": 478
+    "x": 210,
+    "y": 498
   },
   "square_15": {
     "height": 38,
     "pixelRatio": 2,
     "width": 38,
-    "x": 912,
-    "y": 440
+    "x": 542,
+    "y": 248
   },
   "stadium_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 700,
-    "y": 398
+    "x": 861,
+    "y": 128
   },
   "stadium_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 168,
-    "y": 356
+    "x": 294,
+    "y": 374
   },
   "star-stroke_11": {
     "height": 30,
     "pixelRatio": 2,
     "width": 30,
-    "x": 90,
-    "y": 478
+    "x": 240,
+    "y": 498
   },
   "star-stroke_15": {
     "height": 38,
     "pixelRatio": 2,
     "width": 38,
-    "x": 950,
-    "y": 440
+    "x": 580,
+    "y": 248
   },
   "star_11": {
     "height": 30,
     "pixelRatio": 2,
     "width": 30,
-    "x": 120,
-    "y": 478
+    "x": 270,
+    "y": 498
   },
   "star_15": {
     "height": 38,
     "pixelRatio": 2,
     "width": 38,
-    "x": 504,
-    "y": 188
+    "x": 618,
+    "y": 248
   },
   "suitcase_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 734,
-    "y": 398
+    "x": 895,
+    "y": 128
   },
   "suitcase_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 210,
-    "y": 356
+    "x": 336,
+    "y": 374
   },
   "sushi_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 768,
-    "y": 398
+    "x": 929,
+    "y": 128
   },
   "sushi_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 252,
-    "y": 356
+    "x": 378,
+    "y": 374
   },
   "swimming_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 802,
-    "y": 398
+    "x": 963,
+    "y": 128
   },
   "swimming_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 294,
-    "y": 356
+    "x": 420,
+    "y": 374
   },
   "telephone_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 836,
-    "y": 398
+    "x": 495,
+    "y": 188
   },
   "telephone_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 336,
-    "y": 356
+    "x": 462,
+    "y": 374
   },
   "tennis_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 870,
-    "y": 398
+    "x": 529,
+    "y": 188
   },
   "tennis_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 378,
-    "y": 356
+    "x": 0,
+    "y": 416
   },
   "theatre_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 904,
-    "y": 398
+    "x": 563,
+    "y": 188
   },
   "theatre_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 420,
-    "y": 356
+    "x": 42,
+    "y": 416
   },
   "toilet_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 938,
-    "y": 398
+    "x": 597,
+    "y": 188
   },
   "toilet_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 462,
-    "y": 356
+    "x": 84,
+    "y": 416
   },
   "town-hall_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 972,
-    "y": 398
+    "x": 631,
+    "y": 188
   },
   "town-hall_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 0,
-    "y": 398
+    "x": 126,
+    "y": 416
   },
   "triangle_11": {
     "height": 30,
     "pixelRatio": 2,
     "width": 30,
-    "x": 150,
-    "y": 478
+    "x": 300,
+    "y": 498
   },
   "triangle_15": {
     "height": 38,
     "pixelRatio": 2,
     "width": 38,
-    "x": 542,
-    "y": 188
+    "x": 656,
+    "y": 248
   },
   "triangle_stroked_11": {
     "height": 30,
     "pixelRatio": 2,
     "width": 30,
-    "x": 180,
-    "y": 478
+    "x": 330,
+    "y": 498
   },
   "triangle_stroked_15": {
     "height": 38,
     "pixelRatio": 2,
     "width": 38,
-    "x": 580,
-    "y": 188
+    "x": 694,
+    "y": 248
   },
   "us-highway_2": {
     "height": 60,
     "pixelRatio": 2,
     "width": 60,
-    "x": 188,
-    "y": 0
+    "x": 100,
+    "y": 128
   },
   "us-highway_3": {
     "height": 60,
     "pixelRatio": 2,
     "width": 75,
-    "x": 0,
+    "x": 160,
     "y": 128
   },
   "us-interstate_2": {
     "height": 60,
     "pixelRatio": 2,
     "width": 60,
-    "x": 75,
-    "y": 128
+    "x": 188,
+    "y": 0
   },
   "us-interstate_3": {
     "height": 60,
     "pixelRatio": 2,
     "width": 75,
-    "x": 135,
-    "y": 128
+    "x": 0,
+    "y": 188
   },
   "veterinary_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 504,
-    "y": 128
+    "x": 665,
+    "y": 188
   },
   "veterinary_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 42,
-    "y": 398
+    "x": 168,
+    "y": 416
   },
   "volcano_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 538,
-    "y": 128
+    "x": 699,
+    "y": 188
   },
   "volcano_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 84,
-    "y": 398
+    "x": 210,
+    "y": 416
   },
   "warehouse_11": {
     "height": 30,
     "pixelRatio": 2,
     "width": 30,
-    "x": 210,
-    "y": 478
+    "x": 360,
+    "y": 498
   },
   "warehouse_15": {
     "height": 38,
     "pixelRatio": 2,
     "width": 38,
-    "x": 618,
-    "y": 188
+    "x": 732,
+    "y": 248
   },
   "waste_basket_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 572,
-    "y": 128
+    "x": 733,
+    "y": 188
   },
   "waste_basket_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 126,
-    "y": 398
+    "x": 252,
+    "y": 416
   },
   "water_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 606,
-    "y": 128
+    "x": 767,
+    "y": 188
   },
   "water_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 168,
-    "y": 398
+    "x": 294,
+    "y": 416
   },
   "wetland_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 640,
-    "y": 128
+    "x": 801,
+    "y": 188
   },
   "wetland_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 210,
-    "y": 398
+    "x": 336,
+    "y": 416
   },
   "wheelchair_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 674,
-    "y": 128
+    "x": 835,
+    "y": 188
   },
   "wheelchair_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 252,
-    "y": 398
+    "x": 378,
+    "y": 416
   },
   "zoo_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
-    "x": 708,
-    "y": 128
+    "x": 869,
+    "y": 188
   },
   "zoo_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
-    "x": 294,
-    "y": 398
+    "x": 420,
+    "y": 416
   }
 }
\ No newline at end of file
diff --git a/sprites/osm-liberty@2x.png b/sprites/osm-liberty@2x.png
index 39a2402..e78048f 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/gb-motorway_3.svg b/svgs/svgs_not_in_iconset/gb-motorway_3.svg
new file mode 100644
index 0000000..6f15b96
--- /dev/null
+++ b/svgs/svgs_not_in_iconset/gb-motorway_3.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg"
+   version="1.0" width="50" height="30" viewBox="0 0 1000 600">
+  <g>
+   <path fill="#00693F" stroke="white" stroke-width="40"
+     d="M20,60 A40,40,0,0,1,60,20 L940,20 A40,40,0,0,1,980,60 L980,540 A40,40,0,0,1,940,580 L60,580 A40,40,0,0,1,20,540 z"
+    />
+  </g>
+</svg>