diff --git a/iconset.json b/iconset.json
index 2fea4c45..262c076c 100644
--- a/iconset.json
+++ b/iconset.json
@@ -48,7 +48,7 @@
           ],
           "width": 15
         },
-        "circle-stroked_11.svg": {
+        "circle_stroked_11.svg": {
           "height": 11,
           "pathData": [
             {
@@ -63,7 +63,7 @@
           ],
           "width": 11
         },
-        "circle-stroked_15.svg": {
+        "circle_stroked_15.svg": {
           "height": 15,
           "pathData": [
             {
@@ -258,7 +258,7 @@
           ],
           "width": 15
         },
-        "square-stroke_11.svg": {
+        "square_stroked_11.svg": {
           "height": 11,
           "pathData": [
             {
@@ -273,7 +273,7 @@
           ],
           "width": 11
         },
-        "square-stroke_15.svg": {
+        "square_stroked_15.svg": {
           "height": 15,
           "pathData": [
             {
@@ -318,7 +318,7 @@
           ],
           "width": 15
         },
-        "star-stroke_11.svg": {
+        "star_stroked_11.svg": {
           "height": 11,
           "pathData": [
             {
@@ -333,7 +333,7 @@
           ],
           "width": 11
         },
-        "star-stroke_15.svg": {
+        "star_stroked_15.svg": {
           "height": 15,
           "pathData": [
             {
@@ -1131,7 +1131,7 @@
         "strokeWidth": 0
       },
       "svgs": {
-        "america_football_11.svg": {
+        "american_football_11.svg": {
           "height": 11,
           "pathData": [
             {
@@ -1146,7 +1146,7 @@
           ],
           "width": 11
         },
-        "america_football_15.svg": {
+        "american_football_15.svg": {
           "height": 15,
           "pathData": [
             {
@@ -2607,7 +2607,7 @@
           ],
           "width": 15
         },
-        "drinking-water_11.svg": {
+        "drinking_water_11.svg": {
           "height": 11,
           "pathData": [
             {
@@ -2877,7 +2877,7 @@
           ],
           "width": 15
         },
-        "toilet_11.svg": {
+        "toilets_11.svg": {
           "height": 11,
           "pathData": [
             {
@@ -2892,7 +2892,7 @@
           ],
           "width": 11
         },
-        "toilet_15.svg": {
+        "toilets_15.svg": {
           "height": 15,
           "pathData": [
             {
@@ -3303,7 +3303,7 @@
           ],
           "width": 15
         },
-        "doctor_11.svg": {
+        "doctors_11.svg": {
           "height": 11,
           "pathData": [
             {
@@ -3318,7 +3318,7 @@
           ],
           "width": 11
         },
-        "doctor_15.svg": {
+        "doctors_15.svg": {
           "height": 15,
           "pathData": [
             {
@@ -3333,7 +3333,7 @@
           ],
           "width": 15
         },
-        "fire-station_11.svg": {
+        "fire_station_11.svg": {
           "height": 11,
           "pathData": [
             {
@@ -3348,7 +3348,7 @@
           ],
           "width": 11
         },
-        "fire-station_15.svg": {
+        "fire_station_15.svg": {
           "height": 15,
           "pathData": [
             {
diff --git a/sprites/osm-liberty.json b/sprites/osm-liberty.json
index 524f4df5..05531a40 100644
--- a/sprites/osm-liberty.json
+++ b/sprites/osm-liberty.json
@@ -55,14 +55,14 @@
     "x": 64,
     "y": 0
   },
-  "america_football_11": {
+  "american_football_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
     "x": 398,
     "y": 211
   },
-  "america_football_15": {
+  "american_football_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
@@ -370,28 +370,28 @@
     "x": 84,
     "y": 106
   },
-  "circle-stroked_11": {
+  "circle_11": {
     "height": 15,
     "pixelRatio": 1,
     "width": 15,
     "x": 376,
     "y": 148
   },
-  "circle-stroked_15": {
+  "circle_15": {
     "height": 19,
     "pixelRatio": 1,
     "width": 19,
     "x": 198,
     "y": 190
   },
-  "circle_11": {
+  "circle_stroked_11": {
     "height": 15,
     "pixelRatio": 1,
     "width": 15,
     "x": 391,
     "y": 148
   },
-  "circle_15": {
+  "circle_stroked_15": {
     "height": 19,
     "pixelRatio": 1,
     "width": 19,
@@ -552,14 +552,14 @@
     "x": 189,
     "y": 64
   },
-  "doctor_11": {
+  "doctors_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
     "x": 286,
     "y": 64
   },
-  "doctor_15": {
+  "doctors_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
@@ -601,7 +601,7 @@
     "x": 477,
     "y": 169
   },
-  "drinking-water_11": {
+  "drinking_water_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
@@ -671,14 +671,14 @@
     "x": 57,
     "y": 211
   },
-  "fire-station_11": {
+  "fire_station_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
     "x": 371,
     "y": 64
   },
-  "fire-station_15": {
+  "fire_station_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
@@ -1364,28 +1364,28 @@
     "x": 231,
     "y": 148
   },
-  "square-stroke_11": {
+  "square_11": {
     "height": 15,
     "pixelRatio": 1,
     "width": 15,
     "x": 372,
     "y": 169
   },
-  "square-stroke_15": {
+  "square_15": {
     "height": 19,
     "pixelRatio": 1,
     "width": 19,
     "x": 19,
     "y": 230
   },
-  "square_11": {
+  "square_stroked_11": {
     "height": 15,
     "pixelRatio": 1,
     "width": 15,
     "x": 387,
     "y": 169
   },
-  "square_15": {
+  "square_stroked_15": {
     "height": 19,
     "pixelRatio": 1,
     "width": 19,
@@ -1406,28 +1406,28 @@
     "x": 0,
     "y": 169
   },
-  "star-stroke_11": {
+  "star_11": {
     "height": 15,
     "pixelRatio": 1,
     "width": 15,
     "x": 402,
     "y": 169
   },
-  "star-stroke_15": {
+  "star_15": {
     "height": 19,
     "pixelRatio": 1,
     "width": 19,
     "x": 57,
     "y": 230
   },
-  "star_11": {
+  "star_stroked_11": {
     "height": 15,
     "pixelRatio": 1,
     "width": 15,
     "x": 417,
     "y": 169
   },
-  "star_15": {
+  "star_stroked_15": {
     "height": 19,
     "pixelRatio": 1,
     "width": 19,
@@ -1518,14 +1518,14 @@
     "x": 126,
     "y": 169
   },
-  "toilet_11": {
+  "toilets_11": {
     "height": 17,
     "pixelRatio": 1,
     "width": 17,
     "x": 388,
     "y": 127
   },
-  "toilet_15": {
+  "toilets_15": {
     "height": 21,
     "pixelRatio": 1,
     "width": 21,
diff --git a/sprites/osm-liberty.png b/sprites/osm-liberty.png
index e0106fe4..a537ee3f 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 4c3349fc..1f142230 100644
--- a/sprites/osm-liberty@2x.json
+++ b/sprites/osm-liberty@2x.json
@@ -55,14 +55,14 @@
     "x": 128,
     "y": 0
   },
-  "america_football_11": {
+  "american_football_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
     "x": 796,
     "y": 422
   },
-  "america_football_15": {
+  "american_football_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
@@ -370,28 +370,28 @@
     "x": 168,
     "y": 212
   },
-  "circle-stroked_11": {
+  "circle_11": {
     "height": 30,
     "pixelRatio": 2,
     "width": 30,
     "x": 752,
     "y": 296
   },
-  "circle-stroked_15": {
+  "circle_15": {
     "height": 38,
     "pixelRatio": 2,
     "width": 38,
     "x": 396,
     "y": 380
   },
-  "circle_11": {
+  "circle_stroked_11": {
     "height": 30,
     "pixelRatio": 2,
     "width": 30,
     "x": 782,
     "y": 296
   },
-  "circle_15": {
+  "circle_stroked_15": {
     "height": 38,
     "pixelRatio": 2,
     "width": 38,
@@ -552,14 +552,14 @@
     "x": 378,
     "y": 128
   },
-  "doctor_11": {
+  "doctors_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
     "x": 572,
     "y": 128
   },
-  "doctor_15": {
+  "doctors_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
@@ -601,7 +601,7 @@
     "x": 954,
     "y": 338
   },
-  "drinking-water_11": {
+  "drinking_water_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
@@ -671,14 +671,14 @@
     "x": 114,
     "y": 422
   },
-  "fire-station_11": {
+  "fire_station_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
     "x": 742,
     "y": 128
   },
-  "fire-station_15": {
+  "fire_station_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
@@ -1364,28 +1364,28 @@
     "x": 462,
     "y": 296
   },
-  "square-stroke_11": {
+  "square_11": {
     "height": 30,
     "pixelRatio": 2,
     "width": 30,
     "x": 744,
     "y": 338
   },
-  "square-stroke_15": {
+  "square_15": {
     "height": 38,
     "pixelRatio": 2,
     "width": 38,
     "x": 38,
     "y": 460
   },
-  "square_11": {
+  "square_stroked_11": {
     "height": 30,
     "pixelRatio": 2,
     "width": 30,
     "x": 774,
     "y": 338
   },
-  "square_15": {
+  "square_stroked_15": {
     "height": 38,
     "pixelRatio": 2,
     "width": 38,
@@ -1406,28 +1406,28 @@
     "x": 0,
     "y": 338
   },
-  "star-stroke_11": {
+  "star_11": {
     "height": 30,
     "pixelRatio": 2,
     "width": 30,
     "x": 804,
     "y": 338
   },
-  "star-stroke_15": {
+  "star_15": {
     "height": 38,
     "pixelRatio": 2,
     "width": 38,
     "x": 114,
     "y": 460
   },
-  "star_11": {
+  "star_stroked_11": {
     "height": 30,
     "pixelRatio": 2,
     "width": 30,
     "x": 834,
     "y": 338
   },
-  "star_15": {
+  "star_stroked_15": {
     "height": 38,
     "pixelRatio": 2,
     "width": 38,
@@ -1518,14 +1518,14 @@
     "x": 252,
     "y": 338
   },
-  "toilet_11": {
+  "toilets_11": {
     "height": 34,
     "pixelRatio": 2,
     "width": 34,
     "x": 776,
     "y": 254
   },
-  "toilet_15": {
+  "toilets_15": {
     "height": 42,
     "pixelRatio": 2,
     "width": 42,
diff --git a/sprites/osm-liberty@2x.png b/sprites/osm-liberty@2x.png
index ca7c7302..0a9ff58a 100644
Binary files a/sprites/osm-liberty@2x.png and b/sprites/osm-liberty@2x.png differ
diff --git a/svgs/svgs_iconset/america_football_11.svg b/svgs/svgs_iconset/american_football_11.svg
similarity index 100%
rename from svgs/svgs_iconset/america_football_11.svg
rename to svgs/svgs_iconset/american_football_11.svg
diff --git a/svgs/svgs_iconset/america_football_15.svg b/svgs/svgs_iconset/american_football_15.svg
similarity index 100%
rename from svgs/svgs_iconset/america_football_15.svg
rename to svgs/svgs_iconset/american_football_15.svg
diff --git a/svgs/svgs_iconset/circle-stroked_11.svg b/svgs/svgs_iconset/circle_stroked_11.svg
similarity index 100%
rename from svgs/svgs_iconset/circle-stroked_11.svg
rename to svgs/svgs_iconset/circle_stroked_11.svg
diff --git a/svgs/svgs_iconset/circle-stroked_15.svg b/svgs/svgs_iconset/circle_stroked_15.svg
similarity index 100%
rename from svgs/svgs_iconset/circle-stroked_15.svg
rename to svgs/svgs_iconset/circle_stroked_15.svg
diff --git a/svgs/svgs_iconset/doctor_11.svg b/svgs/svgs_iconset/doctors_11.svg
similarity index 100%
rename from svgs/svgs_iconset/doctor_11.svg
rename to svgs/svgs_iconset/doctors_11.svg
diff --git a/svgs/svgs_iconset/doctor_15.svg b/svgs/svgs_iconset/doctors_15.svg
similarity index 100%
rename from svgs/svgs_iconset/doctor_15.svg
rename to svgs/svgs_iconset/doctors_15.svg
diff --git a/svgs/svgs_iconset/drinking-water_11.svg b/svgs/svgs_iconset/drinking_water_11.svg
similarity index 100%
rename from svgs/svgs_iconset/drinking-water_11.svg
rename to svgs/svgs_iconset/drinking_water_11.svg
diff --git a/svgs/svgs_iconset/fire-station_11.svg b/svgs/svgs_iconset/fire_station_11.svg
similarity index 100%
rename from svgs/svgs_iconset/fire-station_11.svg
rename to svgs/svgs_iconset/fire_station_11.svg
diff --git a/svgs/svgs_iconset/fire-station_15.svg b/svgs/svgs_iconset/fire_station_15.svg
similarity index 100%
rename from svgs/svgs_iconset/fire-station_15.svg
rename to svgs/svgs_iconset/fire_station_15.svg
diff --git a/svgs/svgs_iconset/square-stroke_11.svg b/svgs/svgs_iconset/square_stroked_11.svg
similarity index 100%
rename from svgs/svgs_iconset/square-stroke_11.svg
rename to svgs/svgs_iconset/square_stroked_11.svg
diff --git a/svgs/svgs_iconset/square-stroke_15.svg b/svgs/svgs_iconset/square_stroked_15.svg
similarity index 100%
rename from svgs/svgs_iconset/square-stroke_15.svg
rename to svgs/svgs_iconset/square_stroked_15.svg
diff --git a/svgs/svgs_iconset/star-stroke_11.svg b/svgs/svgs_iconset/star_stroked_11.svg
similarity index 100%
rename from svgs/svgs_iconset/star-stroke_11.svg
rename to svgs/svgs_iconset/star_stroked_11.svg
diff --git a/svgs/svgs_iconset/star-stroke_15.svg b/svgs/svgs_iconset/star_stroked_15.svg
similarity index 100%
rename from svgs/svgs_iconset/star-stroke_15.svg
rename to svgs/svgs_iconset/star_stroked_15.svg
diff --git a/svgs/svgs_iconset/toilet_11.svg b/svgs/svgs_iconset/toilets_11.svg
similarity index 100%
rename from svgs/svgs_iconset/toilet_11.svg
rename to svgs/svgs_iconset/toilets_11.svg
diff --git a/svgs/svgs_iconset/toilet_15.svg b/svgs/svgs_iconset/toilets_15.svg
similarity index 100%
rename from svgs/svgs_iconset/toilet_15.svg
rename to svgs/svgs_iconset/toilets_15.svg