From d483278f5a1d03221f3780014b0b33466e1052ca Mon Sep 17 00:00:00 2001
From: pathmapper <pathmapper@posteo.de>
Date: Sun, 15 Oct 2023 10:54:29 +0200
Subject: [PATCH 1/2] Use Maki size 15 only

keep size 11 for backward compatibility
---
 iconset.json                                  | 230 +++++++++---------
 style.json                                    |   8 +-
 .../{aerialway_15.svg => aerialway.svg}       |   2 +-
 .../{airfield_15.svg => airfield.svg}         |   2 +-
 svgs/svgs_iconset/airport.svg                 |   3 +
 svgs/svgs_iconset/airport_15.svg              |   3 -
 .../{alcohol_shop_15.svg => alcohol_shop.svg} |   2 +-
 svgs/svgs_iconset/american_football.svg       |   4 +
 svgs/svgs_iconset/american_football_11.svg    |   2 +-
 svgs/svgs_iconset/american_football_15.svg    |   4 -
 ...usement_park_15.svg => amusement_park.svg} |   2 +-
 svgs/svgs_iconset/aquarium.svg                |   4 +
 svgs/svgs_iconset/aquarium_15.svg             |   4 -
 svgs/svgs_iconset/art_gallery.svg             |   4 +
 svgs/svgs_iconset/art_gallery_15.svg          |   4 -
 svgs/svgs_iconset/attraction.svg              |   5 +
 svgs/svgs_iconset/attraction_15.svg           |   5 -
 .../{bakery_15.svg => bakery.svg}             |   2 +-
 svgs/svgs_iconset/{bank_15.svg => bank.svg}   |   2 +-
 svgs/svgs_iconset/bar.svg                     |   3 +
 svgs/svgs_iconset/bar_15.svg                  |   3 -
 .../{baseball_15.svg => baseball.svg}         |   2 +-
 .../{basketball_15.svg => basketball.svg}     |   2 +-
 svgs/svgs_iconset/beer.svg                    |   5 +
 svgs/svgs_iconset/beer_15.svg                 |   5 -
 .../{bicycle_15.svg => bicycle.svg}           |   2 +-
 ...cycle_rental_15.svg => bicycle_rental.svg} |   2 +-
 svgs/svgs_iconset/building.svg                |   1 +
 svgs/svgs_iconset/building_15.svg             |   1 -
 svgs/svgs_iconset/{bus_15.svg => bus.svg}     |   2 +-
 svgs/svgs_iconset/butcher.svg                 |   1 +
 svgs/svgs_iconset/butcher_15.svg              |   1 -
 svgs/svgs_iconset/cafe.svg                    |   3 +
 svgs/svgs_iconset/cafe_15.svg                 |   3 -
 svgs/svgs_iconset/campsite.svg                |   2 +
 svgs/svgs_iconset/{car_15.svg => car.svg}     |   2 +-
 svgs/svgs_iconset/castle.svg                  |   5 +
 svgs/svgs_iconset/castle_15.svg               |   5 -
 svgs/svgs_iconset/cemetery.svg                |   3 +
 svgs/svgs_iconset/cemetery_15.svg             |   3 -
 .../{cinema_15.svg => cinema.svg}             |   2 +-
 svgs/svgs_iconset/circle.svg                  |   1 +
 svgs/svgs_iconset/circle_15.svg               |   1 -
 ...rcle_stroked_15.svg => circle_stroked.svg} |   2 +-
 svgs/svgs_iconset/circle_stroked_11.svg       |   2 +-
 svgs/svgs_iconset/clothing_store.svg          |   2 +
 svgs/svgs_iconset/clothing_store_15.svg       |   2 -
 svgs/svgs_iconset/college.svg                 |   3 +
 svgs/svgs_iconset/college_15.svg              |   3 -
 svgs/svgs_iconset/commercial.svg              |   1 +
 svgs/svgs_iconset/commercial_15.svg           |   1 -
 .../{cricket_15.svg => cricket.svg}           |   2 +-
 svgs/svgs_iconset/{cross_15.svg => cross.svg} |   2 +-
 svgs/svgs_iconset/{dam_15.svg => dam.svg}     |   2 +-
 .../{danger_15.svg => danger.svg}             |   2 +-
 svgs/svgs_iconset/dentist.svg                 |   3 +
 svgs/svgs_iconset/dentist_15.svg              |   3 -
 .../{doctors_15.svg => doctors.svg}           |   2 +-
 svgs/svgs_iconset/doctors_11.svg              |   2 +-
 svgs/svgs_iconset/dog_park.svg                |   1 +
 svgs/svgs_iconset/dog_park_15.svg             |   1 -
 svgs/svgs_iconset/drinking_water.svg          |   3 +
 svgs/svgs_iconset/drinking_water_11.svg       |   2 +-
 svgs/svgs_iconset/drinking_water_15.svg       |   3 -
 .../{embassy_15.svg => embassy.svg}           |   2 +-
 .../{entrance_15.svg => entrance.svg}         |   2 +-
 .../{fast_food_15.svg => fast_food.svg}       |   2 +-
 svgs/svgs_iconset/{ferry_15.svg => ferry.svg} |   2 +-
 svgs/svgs_iconset/fire_station.svg            |   4 +
 svgs/svgs_iconset/fire_station_11.svg         |   2 +-
 svgs/svgs_iconset/fire_station_15.svg         |   4 -
 svgs/svgs_iconset/{fuel_15.svg => fuel.svg}   |   2 +-
 svgs/svgs_iconset/garden.svg                  |   4 +
 svgs/svgs_iconset/garden_15.svg               |   4 -
 svgs/svgs_iconset/{gift_15.svg => gift.svg}   |   2 +-
 svgs/svgs_iconset/{golf_15.svg => golf.svg}   |   2 +-
 svgs/svgs_iconset/grocery.svg                 |   1 +
 svgs/svgs_iconset/grocery_15.svg              |   1 -
 svgs/svgs_iconset/hairdresser.svg             |   5 +
 svgs/svgs_iconset/hairdresser_15.svg          |   5 -
 .../{harbor_15.svg => harbor.svg}             |   2 +-
 svgs/svgs_iconset/heart.svg                   |   2 +
 .../{heliport_15.svg => heliport.svg}         |   2 +-
 .../{heart_15.svg => hospital.svg}            |   4 +-
 svgs/svgs_iconset/hospital_15.svg             |   2 -
 .../{ice_cream_15.svg => ice_cream.svg}       |   2 +-
 svgs/svgs_iconset/industry.svg                |   3 +
 svgs/svgs_iconset/industry_15.svg             |   3 -
 .../{campsite_15.svg => information.svg}      |   5 +-
 svgs/svgs_iconset/laundry.svg                 |   3 +
 svgs/svgs_iconset/laundry_15.svg              |   3 -
 .../{library_15.svg => library.svg}           |   2 +-
 svgs/svgs_iconset/lighthouse.svg              |   3 +
 svgs/svgs_iconset/lighthouse_15.svg           |   3 -
 svgs/svgs_iconset/lodging.svg                 |   4 +
 svgs/svgs_iconset/lodging_15.svg              |   4 -
 svgs/svgs_iconset/marker.svg                  |   2 +
 svgs/svgs_iconset/marker_15.svg               |   2 -
 .../{water_15.svg => monument.svg}            |   3 +-
 svgs/svgs_iconset/monument_15.svg             |   2 -
 svgs/svgs_iconset/mountain.svg                |   3 +
 svgs/svgs_iconset/mountain_15.svg             |   3 -
 .../{museum_15.svg => museum.svg}             |   2 +-
 svgs/svgs_iconset/music.svg                   |   3 +
 svgs/svgs_iconset/music_15.svg                |   3 -
 svgs/svgs_iconset/{park_15.svg => park.svg}   |   2 +-
 .../{parking_15.svg => parking.svg}           |   2 +-
 ...rking_garage_15.svg => parking_garage.svg} |   2 +-
 svgs/svgs_iconset/pharmacy.svg                |   3 +
 svgs/svgs_iconset/pharmacy_15.svg             |   3 -
 .../{picnic_site_15.svg => picnic_site.svg}   |   2 +-
 svgs/svgs_iconset/pitch.svg                   |   3 +
 svgs/svgs_iconset/pitch_15.svg                |   3 -
 svgs/svgs_iconset/place_of_worship.svg        |   3 +
 svgs/svgs_iconset/place_of_worship_15.svg     |   3 -
 .../{playground_15.svg => playground.svg}     |   2 +-
 svgs/svgs_iconset/police.svg                  |   4 +
 svgs/svgs_iconset/police_15.svg               |   4 -
 svgs/svgs_iconset/post.svg                    |   4 +
 svgs/svgs_iconset/post_15.svg                 |   4 -
 svgs/svgs_iconset/prison.svg                  |   3 +
 svgs/svgs_iconset/prison_15.svg               |   3 -
 svgs/svgs_iconset/railway.svg                 |   1 +
 svgs/svgs_iconset/railway_15.svg              |   1 -
 ...railway_light_15.svg => railway_light.svg} |   2 +-
 ...railway_metro_15.svg => railway_metro.svg} |   2 +-
 ...{information_15.svg => ranger_station.svg} |   5 +-
 svgs/svgs_iconset/ranger_station_15.svg       |   2 -
 ..._jewish_15.svg => religious_christian.svg} |   3 +-
 svgs/svgs_iconset/religious_christian_15.svg  |   2 -
 svgs/svgs_iconset/religious_jewish.svg        |   1 +
 svgs/svgs_iconset/religious_muslim.svg        |   4 +
 svgs/svgs_iconset/religious_muslim_15.svg     |   4 -
 svgs/svgs_iconset/restaurant.svg              |   4 +
 svgs/svgs_iconset/restaurant_15.svg           |   4 -
 .../{school_15.svg => roadblock.svg}          |   2 +-
 svgs/svgs_iconset/roadblock_15.svg            |   1 -
 .../{rocket_15.svg => rocket.svg}             |   2 +-
 svgs/svgs_iconset/school.svg                  |   1 +
 svgs/svgs_iconset/shelter.svg                 |   1 +
 svgs/svgs_iconset/shelter_15.svg              |   1 -
 svgs/svgs_iconset/{shop_15.svg => shop.svg}   |   2 +-
 .../{skiing_15.svg => skiing.svg}             |   2 +-
 .../{soccer_15.svg => soccer.svg}             |   2 +-
 svgs/svgs_iconset/square.svg                  |   1 +
 svgs/svgs_iconset/square_15.svg               |   1 -
 svgs/svgs_iconset/square_stroked.svg          |   2 +
 svgs/svgs_iconset/square_stroked_11.svg       |   2 +-
 svgs/svgs_iconset/square_stroked_15.svg       |   2 -
 svgs/svgs_iconset/stadium.svg                 |   5 +
 svgs/svgs_iconset/stadium_15.svg              |   5 -
 svgs/svgs_iconset/star.svg                    |   2 +
 svgs/svgs_iconset/star_15.svg                 |   2 -
 .../{star_stroked_15.svg => star_stroked.svg} |   2 +-
 svgs/svgs_iconset/star_stroked_11.svg         |   2 +-
 svgs/svgs_iconset/suitcase.svg                |   2 +
 svgs/svgs_iconset/suitcase_15.svg             |   2 -
 svgs/svgs_iconset/{sushi_15.svg => sushi.svg} |   2 +-
 .../{swimming_15.svg => swimming.svg}         |   2 +-
 .../{telephone_15.svg => telephone.svg}       |   2 +-
 .../{tennis_15.svg => tennis.svg}             |   2 +-
 .../{theatre_15.svg => theatre.svg}           |   2 +-
 .../{toilets_15.svg => toilets.svg}           |   2 +-
 svgs/svgs_iconset/toilets_11.svg              |   2 +-
 svgs/svgs_iconset/town_hall.svg               |   2 +
 svgs/svgs_iconset/town_hall_15.svg            |   2 -
 .../{triangle_15.svg => triangle.svg}         |   2 +-
 ...le_stroked_15.svg => triangle_stroked.svg} |   2 +-
 .../{veterinary_15.svg => veterinary.svg}     |   2 +-
 .../{volcano_15.svg => volcano.svg}           |   2 +-
 .../{warehouse_15.svg => warehouse.svg}       |   2 +-
 svgs/svgs_iconset/waste_basket.svg            |   4 +
 svgs/svgs_iconset/waste_basket_15.svg         |   4 -
 svgs/svgs_iconset/water.svg                   |   1 +
 .../{wetland_15.svg => wetland.svg}           |   2 +-
 .../{wheelchair_15.svg => wheelchair.svg}     |   2 +-
 svgs/svgs_iconset/{zoo_15.svg => zoo.svg}     |   2 +-
 177 files changed, 341 insertions(+), 341 deletions(-)
 rename svgs/svgs_iconset/{aerialway_15.svg => aerialway.svg} (52%)
 rename svgs/svgs_iconset/{airfield_15.svg => airfield.svg} (53%)
 create mode 100644 svgs/svgs_iconset/airport.svg
 delete mode 100644 svgs/svgs_iconset/airport_15.svg
 rename svgs/svgs_iconset/{alcohol_shop_15.svg => alcohol_shop.svg} (54%)
 create mode 100644 svgs/svgs_iconset/american_football.svg
 delete mode 100644 svgs/svgs_iconset/american_football_15.svg
 rename svgs/svgs_iconset/{amusement_park_15.svg => amusement_park.svg} (71%)
 create mode 100644 svgs/svgs_iconset/aquarium.svg
 delete mode 100644 svgs/svgs_iconset/aquarium_15.svg
 create mode 100644 svgs/svgs_iconset/art_gallery.svg
 delete mode 100644 svgs/svgs_iconset/art_gallery_15.svg
 create mode 100644 svgs/svgs_iconset/attraction.svg
 delete mode 100644 svgs/svgs_iconset/attraction_15.svg
 rename svgs/svgs_iconset/{bakery_15.svg => bakery.svg} (59%)
 rename svgs/svgs_iconset/{bank_15.svg => bank.svg} (72%)
 create mode 100644 svgs/svgs_iconset/bar.svg
 delete mode 100644 svgs/svgs_iconset/bar_15.svg
 rename svgs/svgs_iconset/{baseball_15.svg => baseball.svg} (56%)
 rename svgs/svgs_iconset/{basketball_15.svg => basketball.svg} (60%)
 create mode 100644 svgs/svgs_iconset/beer.svg
 delete mode 100644 svgs/svgs_iconset/beer_15.svg
 rename svgs/svgs_iconset/{bicycle_15.svg => bicycle.svg} (71%)
 rename svgs/svgs_iconset/{bicycle_rental_15.svg => bicycle_rental.svg} (67%)
 create mode 100644 svgs/svgs_iconset/building.svg
 delete mode 100644 svgs/svgs_iconset/building_15.svg
 rename svgs/svgs_iconset/{bus_15.svg => bus.svg} (58%)
 create mode 100644 svgs/svgs_iconset/butcher.svg
 delete mode 100644 svgs/svgs_iconset/butcher_15.svg
 create mode 100644 svgs/svgs_iconset/cafe.svg
 delete mode 100644 svgs/svgs_iconset/cafe_15.svg
 create mode 100644 svgs/svgs_iconset/campsite.svg
 rename svgs/svgs_iconset/{car_15.svg => car.svg} (56%)
 create mode 100644 svgs/svgs_iconset/castle.svg
 delete mode 100644 svgs/svgs_iconset/castle_15.svg
 create mode 100644 svgs/svgs_iconset/cemetery.svg
 delete mode 100644 svgs/svgs_iconset/cemetery_15.svg
 rename svgs/svgs_iconset/{cinema_15.svg => cinema.svg} (51%)
 create mode 100644 svgs/svgs_iconset/circle.svg
 delete mode 100644 svgs/svgs_iconset/circle_15.svg
 rename svgs/svgs_iconset/{circle_stroked_15.svg => circle_stroked.svg} (53%)
 create mode 100644 svgs/svgs_iconset/clothing_store.svg
 delete mode 100644 svgs/svgs_iconset/clothing_store_15.svg
 create mode 100644 svgs/svgs_iconset/college.svg
 delete mode 100644 svgs/svgs_iconset/college_15.svg
 create mode 100644 svgs/svgs_iconset/commercial.svg
 delete mode 100644 svgs/svgs_iconset/commercial_15.svg
 rename svgs/svgs_iconset/{cricket_15.svg => cricket.svg} (63%)
 rename svgs/svgs_iconset/{cross_15.svg => cross.svg} (65%)
 rename svgs/svgs_iconset/{dam_15.svg => dam.svg} (85%)
 rename svgs/svgs_iconset/{danger_15.svg => danger.svg} (72%)
 create mode 100644 svgs/svgs_iconset/dentist.svg
 delete mode 100644 svgs/svgs_iconset/dentist_15.svg
 rename svgs/svgs_iconset/{doctors_15.svg => doctors.svg} (58%)
 create mode 100644 svgs/svgs_iconset/dog_park.svg
 delete mode 100644 svgs/svgs_iconset/dog_park_15.svg
 create mode 100644 svgs/svgs_iconset/drinking_water.svg
 delete mode 100644 svgs/svgs_iconset/drinking_water_15.svg
 rename svgs/svgs_iconset/{embassy_15.svg => embassy.svg} (52%)
 rename svgs/svgs_iconset/{entrance_15.svg => entrance.svg} (56%)
 rename svgs/svgs_iconset/{fast_food_15.svg => fast_food.svg} (54%)
 rename svgs/svgs_iconset/{ferry_15.svg => ferry.svg} (80%)
 create mode 100644 svgs/svgs_iconset/fire_station.svg
 delete mode 100644 svgs/svgs_iconset/fire_station_15.svg
 rename svgs/svgs_iconset/{fuel_15.svg => fuel.svg} (61%)
 create mode 100644 svgs/svgs_iconset/garden.svg
 delete mode 100644 svgs/svgs_iconset/garden_15.svg
 rename svgs/svgs_iconset/{gift_15.svg => gift.svg} (60%)
 rename svgs/svgs_iconset/{golf_15.svg => golf.svg} (56%)
 create mode 100644 svgs/svgs_iconset/grocery.svg
 delete mode 100644 svgs/svgs_iconset/grocery_15.svg
 create mode 100644 svgs/svgs_iconset/hairdresser.svg
 delete mode 100644 svgs/svgs_iconset/hairdresser_15.svg
 rename svgs/svgs_iconset/{harbor_15.svg => harbor.svg} (67%)
 create mode 100644 svgs/svgs_iconset/heart.svg
 rename svgs/svgs_iconset/{heliport_15.svg => heliport.svg} (64%)
 rename svgs/svgs_iconset/{heart_15.svg => hospital.svg} (60%)
 delete mode 100644 svgs/svgs_iconset/hospital_15.svg
 rename svgs/svgs_iconset/{ice_cream_15.svg => ice_cream.svg} (50%)
 create mode 100644 svgs/svgs_iconset/industry.svg
 delete mode 100644 svgs/svgs_iconset/industry_15.svg
 rename svgs/svgs_iconset/{campsite_15.svg => information.svg} (62%)
 create mode 100644 svgs/svgs_iconset/laundry.svg
 delete mode 100644 svgs/svgs_iconset/laundry_15.svg
 rename svgs/svgs_iconset/{library_15.svg => library.svg} (66%)
 create mode 100644 svgs/svgs_iconset/lighthouse.svg
 delete mode 100644 svgs/svgs_iconset/lighthouse_15.svg
 create mode 100644 svgs/svgs_iconset/lodging.svg
 delete mode 100644 svgs/svgs_iconset/lodging_15.svg
 create mode 100644 svgs/svgs_iconset/marker.svg
 delete mode 100644 svgs/svgs_iconset/marker_15.svg
 rename svgs/svgs_iconset/{water_15.svg => monument.svg} (65%)
 delete mode 100644 svgs/svgs_iconset/monument_15.svg
 create mode 100644 svgs/svgs_iconset/mountain.svg
 delete mode 100644 svgs/svgs_iconset/mountain_15.svg
 rename svgs/svgs_iconset/{museum_15.svg => museum.svg} (56%)
 create mode 100644 svgs/svgs_iconset/music.svg
 delete mode 100644 svgs/svgs_iconset/music_15.svg
 rename svgs/svgs_iconset/{park_15.svg => park.svg} (68%)
 rename svgs/svgs_iconset/{parking_15.svg => parking.svg} (50%)
 rename svgs/svgs_iconset/{parking_garage_15.svg => parking_garage.svg} (64%)
 create mode 100644 svgs/svgs_iconset/pharmacy.svg
 delete mode 100644 svgs/svgs_iconset/pharmacy_15.svg
 rename svgs/svgs_iconset/{picnic_site_15.svg => picnic_site.svg} (53%)
 create mode 100644 svgs/svgs_iconset/pitch.svg
 delete mode 100644 svgs/svgs_iconset/pitch_15.svg
 create mode 100644 svgs/svgs_iconset/place_of_worship.svg
 delete mode 100644 svgs/svgs_iconset/place_of_worship_15.svg
 rename svgs/svgs_iconset/{playground_15.svg => playground.svg} (66%)
 create mode 100644 svgs/svgs_iconset/police.svg
 delete mode 100644 svgs/svgs_iconset/police_15.svg
 create mode 100644 svgs/svgs_iconset/post.svg
 delete mode 100644 svgs/svgs_iconset/post_15.svg
 create mode 100644 svgs/svgs_iconset/prison.svg
 delete mode 100644 svgs/svgs_iconset/prison_15.svg
 create mode 100644 svgs/svgs_iconset/railway.svg
 delete mode 100644 svgs/svgs_iconset/railway_15.svg
 rename svgs/svgs_iconset/{railway_light_15.svg => railway_light.svg} (56%)
 rename svgs/svgs_iconset/{railway_metro_15.svg => railway_metro.svg} (60%)
 rename svgs/svgs_iconset/{information_15.svg => ranger_station.svg} (62%)
 delete mode 100644 svgs/svgs_iconset/ranger_station_15.svg
 rename svgs/svgs_iconset/{religious_jewish_15.svg => religious_christian.svg} (67%)
 delete mode 100644 svgs/svgs_iconset/religious_christian_15.svg
 create mode 100644 svgs/svgs_iconset/religious_jewish.svg
 create mode 100644 svgs/svgs_iconset/religious_muslim.svg
 delete mode 100644 svgs/svgs_iconset/religious_muslim_15.svg
 create mode 100644 svgs/svgs_iconset/restaurant.svg
 delete mode 100644 svgs/svgs_iconset/restaurant_15.svg
 rename svgs/svgs_iconset/{school_15.svg => roadblock.svg} (65%)
 delete mode 100644 svgs/svgs_iconset/roadblock_15.svg
 rename svgs/svgs_iconset/{rocket_15.svg => rocket.svg} (50%)
 create mode 100644 svgs/svgs_iconset/school.svg
 create mode 100644 svgs/svgs_iconset/shelter.svg
 delete mode 100644 svgs/svgs_iconset/shelter_15.svg
 rename svgs/svgs_iconset/{shop_15.svg => shop.svg} (55%)
 rename svgs/svgs_iconset/{skiing_15.svg => skiing.svg} (50%)
 rename svgs/svgs_iconset/{soccer_15.svg => soccer.svg} (54%)
 create mode 100644 svgs/svgs_iconset/square.svg
 delete mode 100644 svgs/svgs_iconset/square_15.svg
 create mode 100644 svgs/svgs_iconset/square_stroked.svg
 delete mode 100644 svgs/svgs_iconset/square_stroked_15.svg
 create mode 100644 svgs/svgs_iconset/stadium.svg
 delete mode 100644 svgs/svgs_iconset/stadium_15.svg
 create mode 100644 svgs/svgs_iconset/star.svg
 delete mode 100644 svgs/svgs_iconset/star_15.svg
 rename svgs/svgs_iconset/{star_stroked_15.svg => star_stroked.svg} (50%)
 create mode 100644 svgs/svgs_iconset/suitcase.svg
 delete mode 100644 svgs/svgs_iconset/suitcase_15.svg
 rename svgs/svgs_iconset/{sushi_15.svg => sushi.svg} (69%)
 rename svgs/svgs_iconset/{swimming_15.svg => swimming.svg} (52%)
 rename svgs/svgs_iconset/{telephone_15.svg => telephone.svg} (59%)
 rename svgs/svgs_iconset/{tennis_15.svg => tennis.svg} (67%)
 rename svgs/svgs_iconset/{theatre_15.svg => theatre.svg} (54%)
 rename svgs/svgs_iconset/{toilets_15.svg => toilets.svg} (66%)
 create mode 100644 svgs/svgs_iconset/town_hall.svg
 delete mode 100644 svgs/svgs_iconset/town_hall_15.svg
 rename svgs/svgs_iconset/{triangle_15.svg => triangle.svg} (64%)
 rename svgs/svgs_iconset/{triangle_stroked_15.svg => triangle_stroked.svg} (63%)
 rename svgs/svgs_iconset/{veterinary_15.svg => veterinary.svg} (72%)
 rename svgs/svgs_iconset/{volcano_15.svg => volcano.svg} (67%)
 rename svgs/svgs_iconset/{warehouse_15.svg => warehouse.svg} (51%)
 create mode 100644 svgs/svgs_iconset/waste_basket.svg
 delete mode 100644 svgs/svgs_iconset/waste_basket_15.svg
 create mode 100644 svgs/svgs_iconset/water.svg
 rename svgs/svgs_iconset/{wetland_15.svg => wetland.svg} (75%)
 rename svgs/svgs_iconset/{wheelchair_15.svg => wheelchair.svg} (67%)
 rename svgs/svgs_iconset/{zoo_15.svg => zoo.svg} (66%)

diff --git a/iconset.json b/iconset.json
index 7a267d09..c5ba8441 100644
--- a/iconset.json
+++ b/iconset.json
@@ -33,7 +33,7 @@
           ],
           "width": 11
         },
-        "building_15.svg": {
+        "building.svg": {
           "height": 15,
           "pathData": [
             {
@@ -63,7 +63,7 @@
           ],
           "width": 11
         },
-        "circle_stroked_15.svg": {
+        "circle_stroked.svg": {
           "height": 15,
           "pathData": [
             {
@@ -93,7 +93,7 @@
           ],
           "width": 11
         },
-        "circle_15.svg": {
+        "circle.svg": {
           "height": 15,
           "pathData": [
             {
@@ -123,7 +123,7 @@
           ],
           "width": 11
         },
-        "commercial_15.svg": {
+        "commercial.svg": {
           "height": 15,
           "pathData": [
             {
@@ -153,7 +153,7 @@
           ],
           "width": 11
         },
-        "cross_15.svg": {
+        "cross.svg": {
           "height": 15,
           "pathData": [
             {
@@ -183,7 +183,7 @@
           ],
           "width": 11
         },
-        "dam_15.svg": {
+        "dam.svg": {
           "height": 15,
           "pathData": [
             {
@@ -213,7 +213,7 @@
           ],
           "width": 11
         },
-        "industry_15.svg": {
+        "industry.svg": {
           "height": 15,
           "pathData": [
             {
@@ -243,7 +243,7 @@
           ],
           "width": 11
         },
-        "marker_15.svg": {
+        "marker.svg": {
           "height": 15,
           "pathData": [
             {
@@ -273,7 +273,7 @@
           ],
           "width": 11
         },
-        "square_stroked_15.svg": {
+        "square_stroked.svg": {
           "height": 15,
           "pathData": [
             {
@@ -303,7 +303,7 @@
           ],
           "width": 11
         },
-        "square_15.svg": {
+        "square.svg": {
           "height": 15,
           "pathData": [
             {
@@ -333,7 +333,7 @@
           ],
           "width": 11
         },
-        "star_stroked_15.svg": {
+        "star_stroked.svg": {
           "height": 15,
           "pathData": [
             {
@@ -363,7 +363,7 @@
           ],
           "width": 11
         },
-        "star_15.svg": {
+        "star.svg": {
           "height": 15,
           "pathData": [
             {
@@ -393,7 +393,7 @@
           ],
           "width": 11
         },
-        "triangle_15.svg": {
+        "triangle.svg": {
           "height": 15,
           "pathData": [
             {
@@ -423,7 +423,7 @@
           ],
           "width": 11
         },
-        "triangle_stroked_15.svg": {
+        "triangle_stroked.svg": {
           "height": 15,
           "pathData": [
             {
@@ -453,7 +453,7 @@
           ],
           "width": 11
         },
-        "warehouse_15.svg": {
+        "warehouse.svg": {
           "height": 15,
           "pathData": [
             {
@@ -504,7 +504,7 @@
           ],
           "width": 11
         },
-        "bank_15.svg": {
+        "bank.svg": {
           "height": 15,
           "pathData": [
             {
@@ -534,7 +534,7 @@
           ],
           "width": 11
         },
-        "clothing_store_15.svg": {
+        "clothing_store.svg": {
           "height": 15,
           "pathData": [
             {
@@ -564,7 +564,7 @@
           ],
           "width": 11
         },
-        "gift_15.svg": {
+        "gift.svg": {
           "height": 15,
           "pathData": [
             {
@@ -594,7 +594,7 @@
           ],
           "width": 11
         },
-        "grocery_15.svg": {
+        "grocery.svg": {
           "height": 15,
           "pathData": [
             {
@@ -624,7 +624,7 @@
           ],
           "width": 11
         },
-        "hairdresser_15.svg": {
+        "hairdresser.svg": {
           "height": 15,
           "pathData": [
             {
@@ -654,7 +654,7 @@
           ],
           "width": 11
         },
-        "laundry_15.svg": {
+        "laundry.svg": {
           "height": 15,
           "pathData": [
             {
@@ -684,7 +684,7 @@
           ],
           "width": 11
         },
-        "music_15.svg": {
+        "music.svg": {
           "height": 15,
           "pathData": [
             {
@@ -714,7 +714,7 @@
           ],
           "width": 11
         },
-        "pharmacy_15.svg": {
+        "pharmacy.svg": {
           "height": 15,
           "pathData": [
             {
@@ -744,7 +744,7 @@
           ],
           "width": 11
         },
-        "shop_15.svg": {
+        "shop.svg": {
           "height": 15,
           "pathData": [
             {
@@ -774,7 +774,7 @@
           ],
           "width": 11
         },
-        "suitcase_15.svg": {
+        "suitcase.svg": {
           "height": 15,
           "pathData": [
             {
@@ -822,7 +822,7 @@
           ],
           "width": 11
         },
-        "alcohol_shop_15.svg": {
+        "alcohol_shop.svg": {
           "height": 15,
           "pathData": [
             {
@@ -852,7 +852,7 @@
           ],
           "width": 11
         },
-        "bakery_15.svg": {
+        "bakery.svg": {
           "height": 15,
           "pathData": [
             {
@@ -885,7 +885,7 @@
           ],
           "width": 11
         },
-        "bar_15.svg": {
+        "bar.svg": {
           "height": 15,
           "pathData": [
             {
@@ -915,7 +915,7 @@
           ],
           "width": 11
         },
-        "beer_15.svg": {
+        "beer.svg": {
           "height": 15,
           "pathData": [
             {
@@ -945,7 +945,7 @@
           ],
           "width": 11
         },
-        "butcher_15.svg": {
+        "butcher.svg": {
           "height": 15,
           "pathData": [
             {
@@ -975,7 +975,7 @@
           ],
           "width": 11
         },
-        "cafe_15.svg": {
+        "cafe.svg": {
           "height": 15,
           "pathData": [
             {
@@ -1005,7 +1005,7 @@
           ],
           "width": 11
         },
-        "fast_food_15.svg": {
+        "fast_food.svg": {
           "height": 15,
           "pathData": [
             {
@@ -1035,7 +1035,7 @@
           ],
           "width": 11
         },
-        "ice_cream_15.svg": {
+        "ice_cream.svg": {
           "height": 15,
           "pathData": [
             {
@@ -1068,7 +1068,7 @@
           ],
           "width": 11
         },
-        "restaurant_15.svg": {
+        "restaurant.svg": {
           "height": 15,
           "pathData": [
             {
@@ -1098,7 +1098,7 @@
           ],
           "width": 11
         },
-        "sushi_15.svg": {
+        "sushi.svg": {
           "height": 15,
           "pathData": [
             {
@@ -1146,7 +1146,7 @@
           ],
           "width": 11
         },
-        "american_football_15.svg": {
+        "american_football.svg": {
           "height": 15,
           "pathData": [
             {
@@ -1176,7 +1176,7 @@
           ],
           "width": 11
         },
-        "baseball_15.svg": {
+        "baseball.svg": {
           "height": 15,
           "pathData": [
             {
@@ -1206,7 +1206,7 @@
           ],
           "width": 11
         },
-        "basketball_15.svg": {
+        "basketball.svg": {
           "height": 15,
           "pathData": [
             {
@@ -1236,7 +1236,7 @@
           ],
           "width": 11
         },
-        "cricket_15.svg": {
+        "cricket.svg": {
           "height": 15,
           "pathData": [
             {
@@ -1266,7 +1266,7 @@
           ],
           "width": 11
         },
-        "golf_15.svg": {
+        "golf.svg": {
           "height": 15,
           "pathData": [
             {
@@ -1296,7 +1296,7 @@
           ],
           "width": 11
         },
-        "pitch_15.svg": {
+        "pitch.svg": {
           "height": 15,
           "pathData": [
             {
@@ -1326,7 +1326,7 @@
           ],
           "width": 11
         },
-        "skiing_15.svg": {
+        "skiing.svg": {
           "height": 15,
           "pathData": [
             {
@@ -1356,7 +1356,7 @@
           ],
           "width": 11
         },
-        "soccer_15.svg": {
+        "soccer.svg": {
           "height": 15,
           "pathData": [
             {
@@ -1386,7 +1386,7 @@
           ],
           "width": 11
         },
-        "swimming_15.svg": {
+        "swimming.svg": {
           "height": 15,
           "pathData": [
             {
@@ -1416,7 +1416,7 @@
           ],
           "width": 11
         },
-        "tennis_15.svg": {
+        "tennis.svg": {
           "height": 15,
           "pathData": [
             {
@@ -1467,7 +1467,7 @@
           ],
           "width": 11
         },
-        "college_15.svg": {
+        "college.svg": {
           "height": 15,
           "pathData": [
             {
@@ -1497,7 +1497,7 @@
           ],
           "width": 11
         },
-        "library_15.svg": {
+        "library.svg": {
           "height": 15,
           "pathData": [
             {
@@ -1527,7 +1527,7 @@
           ],
           "width": 11
         },
-        "museum_15.svg": {
+        "museum.svg": {
           "height": 15,
           "pathData": [
             {
@@ -1557,7 +1557,7 @@
           ],
           "width": 11
         },
-        "school_15.svg": {
+        "school.svg": {
           "height": 15,
           "pathData": [
             {
@@ -1605,7 +1605,7 @@
           ],
           "width": 11
         },
-        "amusement_park_15.svg": {
+        "amusement_park.svg": {
           "height": 15,
           "pathData": [
             {
@@ -1635,7 +1635,7 @@
           ],
           "width": 11
         },
-        "aquarium_15.svg": {
+        "aquarium.svg": {
           "height": 15,
           "pathData": [
             {
@@ -1665,7 +1665,7 @@
           ],
           "width": 11
         },
-        "art_gallery_15.svg": {
+        "art_gallery.svg": {
           "height": 15,
           "pathData": [
             {
@@ -1695,7 +1695,7 @@
           ],
           "width": 11
         },
-        "attraction_15.svg": {
+        "attraction.svg": {
           "height": 15,
           "pathData": [
             {
@@ -1725,7 +1725,7 @@
           ],
           "width": 11
         },
-        "bicycle_15.svg": {
+        "bicycle.svg": {
           "height": 15,
           "pathData": [
             {
@@ -1755,7 +1755,7 @@
           ],
           "width": 11
         },
-        "bicycle_rental_15.svg": {
+        "bicycle_rental.svg": {
           "height": 15,
           "pathData": [
             {
@@ -1785,7 +1785,7 @@
           ],
           "width": 11
         },
-        "cinema_15.svg": {
+        "cinema.svg": {
           "height": 15,
           "pathData": [
             {
@@ -1815,7 +1815,7 @@
           ],
           "width": 11
         },
-        "dog_park_15.svg": {
+        "dog_park.svg": {
           "height": 15,
           "pathData": [
             {
@@ -1845,7 +1845,7 @@
           ],
           "width": 11
         },
-        "playground_15.svg": {
+        "playground.svg": {
           "height": 15,
           "pathData": [
             {
@@ -1875,7 +1875,7 @@
           ],
           "width": 11
         },
-        "stadium_15.svg": {
+        "stadium.svg": {
           "height": 15,
           "pathData": [
             {
@@ -1905,7 +1905,7 @@
           ],
           "width": 11
         },
-        "theatre_15.svg": {
+        "theatre.svg": {
           "height": 15,
           "pathData": [
             {
@@ -1935,7 +1935,7 @@
           ],
           "width": 11
         },
-        "zoo_15.svg": {
+        "zoo.svg": {
           "height": 15,
           "pathData": [
             {
@@ -1983,7 +1983,7 @@
           ],
           "width": 11
         },
-        "aerialway_15.svg": {
+        "aerialway.svg": {
           "height": 15,
           "pathData": [
             {
@@ -2013,7 +2013,7 @@
           ],
           "width": 11
         },
-        "airfield_15.svg": {
+        "airfield.svg": {
           "height": 15,
           "pathData": [
             {
@@ -2043,7 +2043,7 @@
           ],
           "width": 11
         },
-        "airport_15.svg": {
+        "airport.svg": {
           "height": 15,
           "pathData": [
             {
@@ -2073,7 +2073,7 @@
           ],
           "width": 11
         },
-        "bus_15.svg": {
+        "bus.svg": {
           "height": 15,
           "pathData": [
             {
@@ -2103,7 +2103,7 @@
           ],
           "width": 11
         },
-        "car_15.svg": {
+        "car.svg": {
           "height": 15,
           "pathData": [
             {
@@ -2133,7 +2133,7 @@
           ],
           "width": 11
         },
-        "entrance_15.svg": {
+        "entrance.svg": {
           "height": 15,
           "pathData": [
             {
@@ -2166,7 +2166,7 @@
           ],
           "width": 11
         },
-        "ferry_15.svg": {
+        "ferry.svg": {
           "height": 15,
           "pathData": [
             {
@@ -2196,7 +2196,7 @@
           ],
           "width": 11
         },
-        "fuel_15.svg": {
+        "fuel.svg": {
           "height": 15,
           "pathData": [
             {
@@ -2226,7 +2226,7 @@
           ],
           "width": 11
         },
-        "harbor_15.svg": {
+        "harbor.svg": {
           "height": 15,
           "pathData": [
             {
@@ -2256,7 +2256,7 @@
           ],
           "width": 11
         },
-        "heliport_15.svg": {
+        "heliport.svg": {
           "height": 15,
           "pathData": [
             {
@@ -2286,7 +2286,7 @@
           ],
           "width": 11
         },
-        "parking_15.svg": {
+        "parking.svg": {
           "height": 15,
           "pathData": [
             {
@@ -2316,7 +2316,7 @@
           ],
           "width": 11
         },
-        "parking_garage_15.svg": {
+        "parking_garage.svg": {
           "height": 15,
           "pathData": [
             {
@@ -2346,7 +2346,7 @@
           ],
           "width": 11
         },
-        "railway_15.svg": {
+        "railway.svg": {
           "height": 15,
           "pathData": [
             {
@@ -2376,7 +2376,7 @@
           ],
           "width": 11
         },
-        "railway_light_15.svg": {
+        "railway_light.svg": {
           "height": 15,
           "pathData": [
             {
@@ -2406,7 +2406,7 @@
           ],
           "width": 11
         },
-        "railway_metro_15.svg": {
+        "railway_metro.svg": {
           "height": 15,
           "pathData": [
             {
@@ -2454,7 +2454,7 @@
           ],
           "width": 11
         },
-        "place_of_worship_15.svg": {
+        "place_of_worship.svg": {
           "height": 15,
           "pathData": [
             {
@@ -2484,7 +2484,7 @@
           ],
           "width": 11
         },
-        "religious_christian_15.svg": {
+        "religious_christian.svg": {
           "height": 15,
           "pathData": [
             {
@@ -2514,7 +2514,7 @@
           ],
           "width": 11
         },
-        "religious_jewish_15.svg": {
+        "religious_jewish.svg": {
           "height": 15,
           "pathData": [
             {
@@ -2544,7 +2544,7 @@
           ],
           "width": 11
         },
-        "religious_muslim_15.svg": {
+        "religious_muslim.svg": {
           "height": 15,
           "pathData": [
             {
@@ -2592,7 +2592,7 @@
           ],
           "width": 11
         },
-        "cemetery_15.svg": {
+        "cemetery.svg": {
           "height": 15,
           "pathData": [
             {
@@ -2622,7 +2622,7 @@
           ],
           "width": 11
         },
-        "drinking_water_15.svg": {
+        "drinking_water.svg": {
           "height": 15,
           "pathData": [
             {
@@ -2652,7 +2652,7 @@
           ],
           "width": 11
         },
-        "embassy_15.svg": {
+        "embassy.svg": {
           "height": 15,
           "pathData": [
             {
@@ -2682,7 +2682,7 @@
           ],
           "width": 11
         },
-        "police_15.svg": {
+        "police.svg": {
           "height": 15,
           "pathData": [
             {
@@ -2712,7 +2712,7 @@
           ],
           "width": 11
         },
-        "post_15.svg": {
+        "post.svg": {
           "height": 15,
           "pathData": [
             {
@@ -2742,7 +2742,7 @@
           ],
           "width": 11
         },
-        "prison_15.svg": {
+        "prison.svg": {
           "height": 15,
           "pathData": [
             {
@@ -2772,7 +2772,7 @@
           ],
           "width": 11
         },
-        "ranger_station_15.svg": {
+        "ranger_station.svg": {
           "height": 15,
           "pathData": [
             {
@@ -2802,7 +2802,7 @@
           ],
           "width": 11
         },
-        "roadblock_15.svg": {
+        "roadblock.svg": {
           "height": 15,
           "pathData": [
             {
@@ -2832,7 +2832,7 @@
           ],
           "width": 11
         },
-        "rocket_15.svg": {
+        "rocket.svg": {
           "height": 15,
           "pathData": [
             {
@@ -2862,7 +2862,7 @@
           ],
           "width": 11
         },
-        "telephone_15.svg": {
+        "telephone.svg": {
           "height": 15,
           "pathData": [
             {
@@ -2892,7 +2892,7 @@
           ],
           "width": 11
         },
-        "toilets_15.svg": {
+        "toilets.svg": {
           "height": 15,
           "pathData": [
             {
@@ -2922,7 +2922,7 @@
           ],
           "width": 11
         },
-        "town_hall_15.svg": {
+        "town_hall.svg": {
           "height": 15,
           "pathData": [
             {
@@ -2952,7 +2952,7 @@
           ],
           "width": 11
         },
-        "waste_basket_15.svg": {
+        "waste_basket.svg": {
           "height": 15,
           "pathData": [
             {
@@ -2982,7 +2982,7 @@
           ],
           "width": 11
         },
-        "water_15.svg": {
+        "water.svg": {
           "height": 15,
           "pathData": [
             {
@@ -3012,7 +3012,7 @@
           ],
           "width": 11
         },
-        "wheelchair_15.svg": {
+        "wheelchair.svg": {
           "height": 15,
           "pathData": [
             {
@@ -3060,7 +3060,7 @@
           ],
           "width": 11
         },
-        "garden_15.svg": {
+        "garden.svg": {
           "height": 15,
           "pathData": [
             {
@@ -3090,7 +3090,7 @@
           ],
           "width": 11
         },
-        "mountain_15.svg": {
+        "mountain.svg": {
           "height": 15,
           "pathData": [
             {
@@ -3120,7 +3120,7 @@
           ],
           "width": 11
         },
-        "park_15.svg": {
+        "park.svg": {
           "height": 15,
           "pathData": [
             {
@@ -3150,7 +3150,7 @@
           ],
           "width": 11
         },
-        "picnic_site_15.svg": {
+        "picnic_site.svg": {
           "height": 15,
           "pathData": [
             {
@@ -3180,7 +3180,7 @@
           ],
           "width": 11
         },
-        "volcano_15.svg": {
+        "volcano.svg": {
           "height": 15,
           "pathData": [
             {
@@ -3210,7 +3210,7 @@
           ],
           "width": 11
         },
-        "wetland_15.svg": {
+        "wetland.svg": {
           "height": 15,
           "pathData": [
             {
@@ -3258,7 +3258,7 @@
           ],
           "width": 11
         },
-        "danger_15.svg": {
+        "danger.svg": {
           "height": 15,
           "pathData": [
             {
@@ -3288,7 +3288,7 @@
           ],
           "width": 11
         },
-        "dentist_15.svg": {
+        "dentist.svg": {
           "height": 15,
           "pathData": [
             {
@@ -3318,7 +3318,7 @@
           ],
           "width": 11
         },
-        "doctors_15.svg": {
+        "doctors.svg": {
           "height": 15,
           "pathData": [
             {
@@ -3348,7 +3348,7 @@
           ],
           "width": 11
         },
-        "fire_station_15.svg": {
+        "fire_station.svg": {
           "height": 15,
           "pathData": [
             {
@@ -3378,7 +3378,7 @@
           ],
           "width": 11
         },
-        "heart_15.svg": {
+        "heart.svg": {
           "height": 15,
           "pathData": [
             {
@@ -3408,7 +3408,7 @@
           ],
           "width": 11
         },
-        "hospital_15.svg": {
+        "hospital.svg": {
           "height": 15,
           "pathData": [
             {
@@ -3438,7 +3438,7 @@
           ],
           "width": 11
         },
-        "veterinary_15.svg": {
+        "veterinary.svg": {
           "height": 15,
           "pathData": [
             {
@@ -3498,7 +3498,7 @@
           ],
           "width": 11
         },
-        "campsite_15.svg": {
+        "campsite.svg": {
           "height": 15,
           "pathData": [
             {
@@ -3528,7 +3528,7 @@
           ],
           "width": 11
         },
-        "castle_15.svg": {
+        "castle.svg": {
           "height": 15,
           "pathData": [
             {
@@ -3558,7 +3558,7 @@
           ],
           "width": 11
         },
-        "information_15.svg": {
+        "information.svg": {
           "height": 15,
           "pathData": [
             {
@@ -3588,7 +3588,7 @@
           ],
           "width": 11
         },
-        "lighthouse_15.svg": {
+        "lighthouse.svg": {
           "height": 15,
           "pathData": [
             {
@@ -3618,7 +3618,7 @@
           ],
           "width": 11
         },
-        "lodging_15.svg": {
+        "lodging.svg": {
           "height": 15,
           "pathData": [
             {
@@ -3648,7 +3648,7 @@
           ],
           "width": 11
         },
-        "monument_15.svg": {
+        "monument.svg": {
           "height": 15,
           "pathData": [
             {
@@ -3678,7 +3678,7 @@
           ],
           "width": 11
         },
-        "shelter_15.svg": {
+        "shelter.svg": {
           "height": 15,
           "pathData": [
             {
diff --git a/style.json b/style.json
index a0369a6d..507db0dc 100644
--- a/style.json
+++ b/style.json
@@ -1393,7 +1393,7 @@
       "minzoom": 16,
       "filter": ["all", ["==", "$type", "Point"], [">=", "rank", 20]],
       "layout": {
-        "icon-image": "{class}_11",
+        "icon-image": "{class}",
         "text-anchor": "top",
         "text-field": "{name}",
         "text-font": ["Roboto Condensed Italic"],
@@ -1421,7 +1421,7 @@
         ["<", "rank", 20]
       ],
       "layout": {
-        "icon-image": "{class}_11",
+        "icon-image": "{class}",
         "text-anchor": "top",
         "text-field": "{name}",
         "text-font": ["Roboto Condensed Italic"],
@@ -1449,7 +1449,7 @@
         ["<", "rank", 7]
       ],
       "layout": {
-        "icon-image": "{class}_11",
+        "icon-image": "{class}",
         "text-anchor": "top",
         "text-field": "{name}",
         "text-font": ["Roboto Condensed Italic"],
@@ -1471,7 +1471,7 @@
       "source-layer": "poi",
       "filter": ["all", ["in", "class", "bus", "rail", "airport"]],
       "layout": {
-        "icon-image": "{class}_11",
+        "icon-image": "{class}",
         "text-anchor": "left",
         "text-field": "{name_en}",
         "text-font": ["Roboto Condensed Italic"],
diff --git a/svgs/svgs_iconset/aerialway_15.svg b/svgs/svgs_iconset/aerialway.svg
similarity index 52%
rename from svgs/svgs_iconset/aerialway_15.svg
rename to svgs/svgs_iconset/aerialway.svg
index 2b3a94b7..624dd09c 100644
--- a/svgs/svgs_iconset/aerialway_15.svg
+++ b/svgs/svgs_iconset/aerialway.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 19 19" height="19" width="19"><title>aerialway_15.svg</title><rect fill="none" x="0" y="0" width="19" height="19"></rect><rect x="0" y="0" width="19" height="19" rx="0" ry="0" fill="#4898ff"></rect><path fill="#fff" transform="translate(2 2)" d="M13,5H8V2.6c0.1854-0.1047,0.3325-0.2659,0.42-0.46L13.5,1.5C13.7761,1.5,14,1.2761,14,1s-0.2239-0.5-0.5-0.5L8.28,1.15
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 19 19" height="19" width="19"><title>aerialway.svg</title><rect fill="none" x="0" y="0" width="19" height="19"></rect><rect x="0" y="0" width="19" height="19" rx="0" ry="0" fill="#4898ff"></rect><path fill="#fff" transform="translate(2 2)" d="M13,5H8V2.6c0.1854-0.1047,0.3325-0.2659,0.42-0.46L13.5,1.5C13.7761,1.5,14,1.2761,14,1s-0.2239-0.5-0.5-0.5L8.28,1.15
 	C8.0954,0.9037,7.8077,0.7562,7.5,0.75C7.0963,0.752,6.7334,0.9966,6.58,1.37L1.5,2C1.2239,2,1,2.2239,1,2.5S1.2239,3,1.5,3
 	l5.22-0.65C6.7967,2.4503,6.8917,2.5351,7,2.6V5H2C1.4477,5,1,5.4477,1,6v7c0,0.5523,0.4477,1,1,1h11c0.5523,0,1-0.4477,1-1V6
 	C14,5.4477,13.5523,5,13,5z M7,11H3V7h4V11z M12,11H8V7h4V11z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/airfield_15.svg b/svgs/svgs_iconset/airfield.svg
similarity index 53%
rename from svgs/svgs_iconset/airfield_15.svg
rename to svgs/svgs_iconset/airfield.svg
index bdc68176..4b6a4f1f 100644
--- a/svgs/svgs_iconset/airfield_15.svg
+++ b/svgs/svgs_iconset/airfield.svg
@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 19 19" height="19" width="19"><title>airfield_15.svg</title><rect fill="none" x="0" y="0" width="19" height="19"></rect><rect x="0" y="0" width="19" height="19" rx="0" ry="0" fill="#4898ff"></rect><path fill="#fff" transform="translate(2 2)" d="M6.8182,0.6818H4.7727
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 19 19" height="19" width="19"><title>airfield.svg</title><rect fill="none" x="0" y="0" width="19" height="19"></rect><rect x="0" y="0" width="19" height="19" rx="0" ry="0" fill="#4898ff"></rect><path fill="#fff" transform="translate(2 2)" d="M6.8182,0.6818H4.7727
 	C4.0909,0.6818,4.0909,0,4.7727,0h5.4545c0.6818,0,0.6818,0.6818,0,0.6818H8.1818c0,0,0.8182,0.5909,0.8182,1.9545V4h6v2L9,8l-0.5,5
 	l2.5,1.3182V15H4v-0.6818L6.5,13L6,8L0,6V4h6V2.6364C6,1.2727,6.8182,0.6818,6.8182,0.6818z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/airport.svg b/svgs/svgs_iconset/airport.svg
new file mode 100644
index 00000000..d3665072
--- /dev/null
+++ b/svgs/svgs_iconset/airport.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 19 19" height="19" width="19"><title>airport.svg</title><rect fill="none" x="0" y="0" width="19" height="19"></rect><rect x="0" y="0" width="19" height="19" rx="0" ry="0" fill="#4898ff"></rect><path fill="#fff" transform="translate(2 2)" d="M15,6.8182L15,8.5l-6.5-1
+	l-0.3182,4.7727L11,14v1l-3.5-0.6818L4,15v-1l2.8182-1.7273L6.5,7.5L0,8.5V6.8182L6.5,4.5v-3c0,0,0-1.5,1-1.5s1,1.5,1,1.5v2.8182
+	L15,6.8182z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/airport_15.svg b/svgs/svgs_iconset/airport_15.svg
deleted file mode 100644
index 1fafd25f..00000000
--- a/svgs/svgs_iconset/airport_15.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 19 19" height="19" width="19"><title>airport_15.svg</title><rect fill="none" x="0" y="0" width="19" height="19"></rect><rect x="0" y="0" width="19" height="19" rx="0" ry="0" fill="#4898ff"></rect><path fill="#fff" transform="translate(2 2)" d="M15,6.8182L15,8.5l-6.5-1
-	l-0.3182,4.7727L11,14v1l-3.5-0.6818L4,15v-1l2.8182-1.7273L6.5,7.5L0,8.5V6.8182L6.5,4.5v-3c0,0,0-1.5,1-1.5s1,1.5,1,1.5v2.8182
-	L15,6.8182z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/alcohol_shop_15.svg b/svgs/svgs_iconset/alcohol_shop.svg
similarity index 54%
rename from svgs/svgs_iconset/alcohol_shop_15.svg
rename to svgs/svgs_iconset/alcohol_shop.svg
index 66d2da60..640c35af 100644
--- a/svgs/svgs_iconset/alcohol_shop_15.svg
+++ b/svgs/svgs_iconset/alcohol_shop.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>alcohol_shop_15.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#d97200" transform="translate(3 3)" d="M14,4h-4v3.44l0,0c0,0,0,0,0,0.06c0.003,0.9096,0.6193,1.7026,1.5,1.93V13H11c-0.2761,0-0.5,0.2239-0.5,0.5
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>alcohol_shop.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#d97200" transform="translate(3 3)" d="M14,4h-4v3.44l0,0c0,0,0,0,0,0.06c0.003,0.9096,0.6193,1.7026,1.5,1.93V13H11c-0.2761,0-0.5,0.2239-0.5,0.5
 	S10.7239,14,11,14h2c0.2761,0,0.5-0.2239,0.5-0.5S13.2761,13,13,13h-0.5V9.43c0.8807-0.2274,1.497-1.0204,1.5-1.93c0,0,0,0,0-0.06
 	l0,0V4z M13,7.5c0,0.5523-0.4477,1-1,1s-1-0.4477-1-1V5h2V7.5z M5.5,2.5V2C5.7761,2,6,1.7761,6,1.5S5.7761,1,5.5,1V0.5
 	C5.5,0.2239,5.2761,0,5,0H4C3.7239,0,3.5,0.2239,3.5,0.5V1C3.2239,1,3,1.2239,3,1.5S3.2239,2,3.5,2v0.5C3.5,3.93,1,5.57,1,7v6
diff --git a/svgs/svgs_iconset/american_football.svg b/svgs/svgs_iconset/american_football.svg
new file mode 100644
index 00000000..8ee97aad
--- /dev/null
+++ b/svgs/svgs_iconset/american_football.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>american_football.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#76a723" transform="translate(3 3)" d="M7.53,3C3.09,3,1,7.5,1,7.5S3.09,12,7.53,12S14,7.5,14,7.5S12,3,7.53,3z M11,7v1.5C11,8.7761,10.7761,9,10.5,9
+	S10,8.7761,10,8.5V8H8v0.5C8,8.7761,7.7761,9,7.5,9S7,8.7761,7,8.5V8H5v0.5C5,8.7761,4.7761,9,4.5,9S4,8.7761,4,8.5v-2
+	C4,6.2239,4.2239,6,4.5,6S5,6.2239,5,6.5V7h2V6.5C7,6.2239,7.2239,6,7.5,6S8,6.2239,8,6.5V7h2V6.5C10,6.2239,10.2239,6,10.5,6
+	S11,6.2239,11,6.5V7z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/american_football_11.svg b/svgs/svgs_iconset/american_football_11.svg
index 07736d63..227944d5 100644
--- a/svgs/svgs_iconset/american_football_11.svg
+++ b/svgs/svgs_iconset/american_football_11.svg
@@ -1,2 +1,2 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 17 17" height="17" width="17"><title>america_football_11.svg</title><rect fill="none" x="0" y="0" width="17" height="17"></rect><rect x="1" y="1" rx="7.5" ry="7.5" width="15" height="15" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="15" height="15" rx="7.5" ry="7.5" fill="#fff"></rect><path fill="#76a723" transform="translate(3 3)" d="M5.53,2C2.47,2,1,5.5,1,5.5S2.47,9,5.53,9S10,5.5,10,5.5S8.6,2,5.53,2z M7,6H4C3.7239,6,3.5,5.7761,3.5,5.5S3.7239,5,4,5h3
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 17 17" height="17" width="17"><title>american_football_11.svg</title><rect fill="none" x="0" y="0" width="17" height="17"></rect><rect x="1" y="1" rx="7.5" ry="7.5" width="15" height="15" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="15" height="15" rx="7.5" ry="7.5" fill="#fff"></rect><path fill="#76a723" transform="translate(3 3)" d="M5.53,2C2.47,2,1,5.5,1,5.5S2.47,9,5.53,9S10,5.5,10,5.5S8.6,2,5.53,2z M7,6H4C3.7239,6,3.5,5.7761,3.5,5.5S3.7239,5,4,5h3
 	c0.2761,0,0.5,0.2239,0.5,0.5S7.2761,6,7,6z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/american_football_15.svg b/svgs/svgs_iconset/american_football_15.svg
deleted file mode 100644
index 0a68bacc..00000000
--- a/svgs/svgs_iconset/american_football_15.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>america_football_15.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#76a723" transform="translate(3 3)" d="M7.53,3C3.09,3,1,7.5,1,7.5S3.09,12,7.53,12S14,7.5,14,7.5S12,3,7.53,3z M11,7v1.5C11,8.7761,10.7761,9,10.5,9
-	S10,8.7761,10,8.5V8H8v0.5C8,8.7761,7.7761,9,7.5,9S7,8.7761,7,8.5V8H5v0.5C5,8.7761,4.7761,9,4.5,9S4,8.7761,4,8.5v-2
-	C4,6.2239,4.2239,6,4.5,6S5,6.2239,5,6.5V7h2V6.5C7,6.2239,7.2239,6,7.5,6S8,6.2239,8,6.5V7h2V6.5C10,6.2239,10.2239,6,10.5,6
-	S11,6.2239,11,6.5V7z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/amusement_park_15.svg b/svgs/svgs_iconset/amusement_park.svg
similarity index 71%
rename from svgs/svgs_iconset/amusement_park_15.svg
rename to svgs/svgs_iconset/amusement_park.svg
index a37c78ec..0f7a0c79 100644
--- a/svgs/svgs_iconset/amusement_park_15.svg
+++ b/svgs/svgs_iconset/amusement_park.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>amusement_park_15.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#5d60be" transform="translate(3 3)" d="M7.5,0C3.919,0,1,2.919,1,6.5c0,2.3161,1.2251,4.3484,3.0566,5.5H4l-1,2h9l-1-2h-0.0566
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>amusement_park.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#5d60be" transform="translate(3 3)" d="M7.5,0C3.919,0,1,2.919,1,6.5c0,2.3161,1.2251,4.3484,3.0566,5.5H4l-1,2h9l-1-2h-0.0566
 	C12.7749,10.8484,14,8.8161,14,6.5C14,2.919,11.081,0,7.5,0z M7.375,1.5059v3.5c-0.3108,0.026-0.6057,0.1482-0.8438,0.3496
 	L4.0566,2.8809C4.9243,2.0555,6.0851,1.5376,7.375,1.5059z M7.625,1.5059c1.2899,0.0317,2.4507,0.5496,3.3184,1.375L8.4688,5.3555
 	c-0.0007-0.0007-0.0013-0.0013-0.002-0.002C8.229,5.1532,7.9348,5.0317,7.625,5.0059V1.5059z M3.8809,3.0566l2.4746,2.4746
diff --git a/svgs/svgs_iconset/aquarium.svg b/svgs/svgs_iconset/aquarium.svg
new file mode 100644
index 00000000..74bc5178
--- /dev/null
+++ b/svgs/svgs_iconset/aquarium.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>aquarium.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#5d60be" transform="translate(3 3)" d="M10.9,11.6c-0.3-0.6-0.3-2.3,0-2.8c0.4-0.6,3.4,1.4,3.4,1.4c0.9,0.4,0.9-6.1,0-5.7
+	c0,0-3.1,2.1-3.4,1.4c-0.3-0.7-0.3-2.1,0-2.8C11.2,2.5,15,2.4,15,2.4C15,1.7,12.1,1,10.9,1S8.4,1.1,6.8,1.8C5.2,2.4,3.9,3.4,2.7,4.6
+	S0,8.2,0,8.9s1.5,2.8,3.7,3.7s3.3,1.1,4.5,1.3c1.1,0.1,2.6,0,3.9-0.3c1-0.2,2.9-0.7,2.9-1.1C15,12.3,11.2,12.2,10.9,11.6z M4.5,9.3
+	C3.7,9.3,3,8.6,3,7.8s0.7-1.5,1.5-1.5S6,7,6,7.8S5.3,9.3,4.5,9.3z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/aquarium_15.svg b/svgs/svgs_iconset/aquarium_15.svg
deleted file mode 100644
index 05a802f1..00000000
--- a/svgs/svgs_iconset/aquarium_15.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>aquarium_15.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#5d60be" transform="translate(3 3)" d="M10.9,11.6c-0.3-0.6-0.3-2.3,0-2.8c0.4-0.6,3.4,1.4,3.4,1.4c0.9,0.4,0.9-6.1,0-5.7
-	c0,0-3.1,2.1-3.4,1.4c-0.3-0.7-0.3-2.1,0-2.8C11.2,2.5,15,2.4,15,2.4C15,1.7,12.1,1,10.9,1S8.4,1.1,6.8,1.8C5.2,2.4,3.9,3.4,2.7,4.6
-	S0,8.2,0,8.9s1.5,2.8,3.7,3.7s3.3,1.1,4.5,1.3c1.1,0.1,2.6,0,3.9-0.3c1-0.2,2.9-0.7,2.9-1.1C15,12.3,11.2,12.2,10.9,11.6z M4.5,9.3
-	C3.7,9.3,3,8.6,3,7.8s0.7-1.5,1.5-1.5S6,7,6,7.8S5.3,9.3,4.5,9.3z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/art_gallery.svg b/svgs/svgs_iconset/art_gallery.svg
new file mode 100644
index 00000000..2a20d9b2
--- /dev/null
+++ b/svgs/svgs_iconset/art_gallery.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>art_gallery.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#5d60be" transform="translate(3 3)" d="M10.71,4L7.85,1.15C7.6555,0.9539,7.339,0.9526,7.1429,1.1471C7.1419,1.1481,7.141,1.149,7.14,1.15L4.29,4H1.5
+	C1.2239,4,1,4.2239,1,4.5v9C1,13.7761,1.2239,14,1.5,14h12c0.2761,0,0.5-0.2239,0.5-0.5v-9C14,4.2239,13.7761,4,13.5,4H10.71z
+	 M7.5,2.21L9.29,4H5.71L7.5,2.21z M13,13H2V5h11V13z M5,8C4.4477,8,4,7.5523,4,7s0.4477-1,1-1s1,0.4477,1,1S5.5523,8,5,8z M12,12
+	H4.5L6,9l1.25,2.5L9.5,7L12,12z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/art_gallery_15.svg b/svgs/svgs_iconset/art_gallery_15.svg
deleted file mode 100644
index a10f68ed..00000000
--- a/svgs/svgs_iconset/art_gallery_15.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>art_gallery_15.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#5d60be" transform="translate(3 3)" d="M10.71,4L7.85,1.15C7.6555,0.9539,7.339,0.9526,7.1429,1.1471C7.1419,1.1481,7.141,1.149,7.14,1.15L4.29,4H1.5
-	C1.2239,4,1,4.2239,1,4.5v9C1,13.7761,1.2239,14,1.5,14h12c0.2761,0,0.5-0.2239,0.5-0.5v-9C14,4.2239,13.7761,4,13.5,4H10.71z
-	 M7.5,2.21L9.29,4H5.71L7.5,2.21z M13,13H2V5h11V13z M5,8C4.4477,8,4,7.5523,4,7s0.4477-1,1-1s1,0.4477,1,1S5.5523,8,5,8z M12,12
-	H4.5L6,9l1.25,2.5L9.5,7L12,12z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/attraction.svg b/svgs/svgs_iconset/attraction.svg
new file mode 100644
index 00000000..945da088
--- /dev/null
+++ b/svgs/svgs_iconset/attraction.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>attraction.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#5d60be" transform="translate(3 3)" d="M6,2C5.446,2,5.2478,2.5045,5,3L4.5,4h-2C1.669,4,1,4.669,1,5.5v5C1,11.331,1.669,12,2.5,12h10
+	c0.831,0,1.5-0.669,1.5-1.5v-5C14,4.669,13.331,4,12.5,4h-2L10,3C9.75,2.5,9.554,2,9,2H6z M2.5,5C2.7761,5,3,5.2239,3,5.5
+	S2.7761,6,2.5,6S2,5.7761,2,5.5S2.2239,5,2.5,5z M7.5,5c1.6569,0,3,1.3431,3,3s-1.3431,3-3,3s-3-1.3431-3-3S5.8431,5,7.5,5z
+	 M7.5,6.5C6.6716,6.5,6,7.1716,6,8l0,0c0,0.8284,0.6716,1.5,1.5,1.5l0,0C8.3284,9.5,9,8.8284,9,8l0,0C9,7.1716,8.3284,6.5,7.5,6.5
+	L7.5,6.5z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/attraction_15.svg b/svgs/svgs_iconset/attraction_15.svg
deleted file mode 100644
index 72b3a42b..00000000
--- a/svgs/svgs_iconset/attraction_15.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>attraction_15.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#5d60be" transform="translate(3 3)" d="M6,2C5.446,2,5.2478,2.5045,5,3L4.5,4h-2C1.669,4,1,4.669,1,5.5v5C1,11.331,1.669,12,2.5,12h10
-	c0.831,0,1.5-0.669,1.5-1.5v-5C14,4.669,13.331,4,12.5,4h-2L10,3C9.75,2.5,9.554,2,9,2H6z M2.5,5C2.7761,5,3,5.2239,3,5.5
-	S2.7761,6,2.5,6S2,5.7761,2,5.5S2.2239,5,2.5,5z M7.5,5c1.6569,0,3,1.3431,3,3s-1.3431,3-3,3s-3-1.3431-3-3S5.8431,5,7.5,5z
-	 M7.5,6.5C6.6716,6.5,6,7.1716,6,8l0,0c0,0.8284,0.6716,1.5,1.5,1.5l0,0C8.3284,9.5,9,8.8284,9,8l0,0C9,7.1716,8.3284,6.5,7.5,6.5
-	L7.5,6.5z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/bakery_15.svg b/svgs/svgs_iconset/bakery.svg
similarity index 59%
rename from svgs/svgs_iconset/bakery_15.svg
rename to svgs/svgs_iconset/bakery.svg
index baf8fdd6..5573a99b 100644
--- a/svgs/svgs_iconset/bakery_15.svg
+++ b/svgs/svgs_iconset/bakery.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>bakery_15.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#d97200" transform="translate(3 3)" d="M5.2941,4.3824L6,9.5
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>bakery.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#d97200" transform="translate(3 3)" d="M5.2941,4.3824L6,9.5
 	c0,0,0,1,1,1h1c1,0,1-1,1-1l0.7059-5.1176C9.7059,3,7.5,3,7.5,3S5.291,3,5.2941,4.3824z M3.5,5C2,5,2,6,2,6l1,4h1.5
 	c0.755,0,0.7941-0.7647,0.7941-0.7647L4.5,5H3.5z M1.5,7.5c0,0-0.6176-0.0294-1.0588,0.4118C0,8.3529,0,8.7941,0,8.7941V11h0.8824
 	C2,11,2,10,2,10L1.5,7.5z"></path><path fill="#d97200" transform="translate(3 3)" d="M11.5,5C13,5,13,6,13,6l-1,4h-1.5
diff --git a/svgs/svgs_iconset/bank_15.svg b/svgs/svgs_iconset/bank.svg
similarity index 72%
rename from svgs/svgs_iconset/bank_15.svg
rename to svgs/svgs_iconset/bank.svg
index 86ecc18a..1895fcb0 100644
--- a/svgs/svgs_iconset/bank_15.svg
+++ b/svgs/svgs_iconset/bank.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>bank_15.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#5d60be" transform="translate(3 3)" d="M1,3C0.446,3,0,3.446,0,4v7c0,0.554,0.446,1,1,1h13c0.554,0,1-0.446,1-1V4c0-0.554-0.446-1-1-1H1z M1,4h1.5
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>bank.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#5d60be" transform="translate(3 3)" d="M1,3C0.446,3,0,3.446,0,4v7c0,0.554,0.446,1,1,1h13c0.554,0,1-0.446,1-1V4c0-0.554-0.446-1-1-1H1z M1,4h1.5
 	C2.7761,4,3,4.2239,3,4.5S2.7761,5,2.5,5S2,4.7761,2,4.5L1.5,5C1.7761,5,2,5.2239,2,5.5S1.7761,6,1.5,6S1,5.7761,1,5.5V4z M7.5,4
 	C8.8807,4,10,5.567,10,7.5l0,0C10,9.433,8.8807,11,7.5,11S5,9.433,5,7.5S6.1193,4,7.5,4z M12.5,4H14v1.5C14,5.7761,13.7761,6,13.5,6
 	S13,5.7761,13,5.5S13.2239,5,13.5,5L13,4.5C13,4.7761,12.7761,5,12.5,5S12,4.7761,12,4.5S12.2239,4,12.5,4z M7.5,5.5
diff --git a/svgs/svgs_iconset/bar.svg b/svgs/svgs_iconset/bar.svg
new file mode 100644
index 00000000..d0e27075
--- /dev/null
+++ b/svgs/svgs_iconset/bar.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>bar.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#d97200" transform="translate(3 3)" d="M7.5,1c-2,0-7,0.25-6.5,0.75L7,8v4
+	c0,1-3,0.5-3,2h7c0-1.5-3-1-3-2V8l6-6.25C14.5,1.25,9.5,1,7.5,1z M7.5,2c2.5,0,4.75,0.25,4.75,0.25L11.5,3h-8L2.75,2.25
+	C2.75,2.25,5,2,7.5,2z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/bar_15.svg b/svgs/svgs_iconset/bar_15.svg
deleted file mode 100644
index 882f96c5..00000000
--- a/svgs/svgs_iconset/bar_15.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>bar_15.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#d97200" transform="translate(3 3)" d="M7.5,1c-2,0-7,0.25-6.5,0.75L7,8v4
-	c0,1-3,0.5-3,2h7c0-1.5-3-1-3-2V8l6-6.25C14.5,1.25,9.5,1,7.5,1z M7.5,2c2.5,0,4.75,0.25,4.75,0.25L11.5,3h-8L2.75,2.25
-	C2.75,2.25,5,2,7.5,2z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/baseball_15.svg b/svgs/svgs_iconset/baseball.svg
similarity index 56%
rename from svgs/svgs_iconset/baseball_15.svg
rename to svgs/svgs_iconset/baseball.svg
index d14202ba..74d78ac6 100644
--- a/svgs/svgs_iconset/baseball_15.svg
+++ b/svgs/svgs_iconset/baseball.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>baseball_15.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#76a723" transform="translate(3 3)" d="M10,3.5C10,4.3284,9.3284,5,8.5,5S7,4.3284,7,3.5S7.6716,2,8.5,2S10,2.6716,10,3.5z M7,0.28C7,0.1254,6.8746,0,6.72,0
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>baseball.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#76a723" transform="translate(3 3)" d="M10,3.5C10,4.3284,9.3284,5,8.5,5S7,4.3284,7,3.5S7.6716,2,8.5,2S10,2.6716,10,3.5z M7,0.28C7,0.1254,6.8746,0,6.72,0
 	c0,0,0,0,0,0C6.6221,0.0262,6.5348,0.0821,6.47,0.16L4,4.59C3.9941,4.6331,3.9941,4.6769,4,4.72C4,4.8746,4.1254,5,4.28,5
 	c0.1015-0.0243,0.1926-0.0803,0.26-0.16L7,0.41C7.006,0.3669,7.006,0.3231,7,0.28z M12.9,14.2L12.9,14.2L10,6.39l0,0
 	C9.9526,6.1627,9.7522,5.9999,9.52,6h-5c-0.2761,0-0.5,0.2239-0.5,0.5S4.2439,7,4.52,7H7l1.45,2.51l-4.27,4.61l0,0
diff --git a/svgs/svgs_iconset/basketball_15.svg b/svgs/svgs_iconset/basketball.svg
similarity index 60%
rename from svgs/svgs_iconset/basketball_15.svg
rename to svgs/svgs_iconset/basketball.svg
index 67737669..288d00a7 100644
--- a/svgs/svgs_iconset/basketball_15.svg
+++ b/svgs/svgs_iconset/basketball.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>basketball_15.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#76a723" transform="translate(3 3)" d="M9,3.5C9,4.3284,8.3284,5,7.5,5S6,4.3284,6,3.5S6.6716,2,7.5,2S9,2.6716,9,3.5z M14,1c-0.5523,0-1,0.4477-1,1s0.4477,1,1,1
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>basketball.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#76a723" transform="translate(3 3)" d="M9,3.5C9,4.3284,8.3284,5,7.5,5S6,4.3284,6,3.5S6.6716,2,7.5,2S9,2.6716,9,3.5z M14,1c-0.5523,0-1,0.4477-1,1s0.4477,1,1,1
 	s1-0.4477,1-1S14.5523,1,14,1z M11.89,13.19L9,9.58V6.5h0.5c0.1669-0.0018,0.3214-0.0885,0.41-0.23l0,0l1.94-2.42l0,0l0.06-0.08l0,0
 	C11.9661,3.6909,11.9974,3.5969,12,3.5c-0.0038-0.2761-0.2308-0.4968-0.5069-0.493C11.3597,3.0088,11.2326,3.0639,11.14,3.16l0,0
 	L9.26,5.5H5.5C5.3632,5.5018,5.233,5.5596,5.14,5.66l0,0l-2,2.54l0,0C3.0599,8.2807,3.0104,8.3868,3,8.5C3,8.7761,3.2239,9,3.5,9
diff --git a/svgs/svgs_iconset/beer.svg b/svgs/svgs_iconset/beer.svg
new file mode 100644
index 00000000..108f4e95
--- /dev/null
+++ b/svgs/svgs_iconset/beer.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>beer.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#d97200" transform="translate(3 3)" d="M12,5V2c0,0-1-1-4.5-1S3,2,3,2v3c0.0288,1.3915,0.3706,2.7586,1,4c0.6255,1.4348,0.6255,3.0652,0,4.5c0,0,0,1,3.5,1
+	s3.5-1,3.5-1c-0.6255-1.4348-0.6255-3.0652,0-4.5C11.6294,7.7586,11.9712,6.3915,12,5z M7.5,13.5
+	c-0.7966,0.035-1.5937-0.0596-2.36-0.28c0.203-0.7224,0.304-1.4696,0.3-2.22h4.12c-0.004,0.7504,0.097,1.4976,0.3,2.22
+	C9.0937,13.4404,8.2966,13.535,7.5,13.5z M7.5,5C6.3136,5.0299,5.1306,4.8609,4,4.5v-2C5.131,2.1411,6.3137,1.9722,7.5,2
+	C8.6863,1.9722,9.869,2.1411,11,2.5v2C9.8694,4.8609,8.6864,5.0299,7.5,5z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/beer_15.svg b/svgs/svgs_iconset/beer_15.svg
deleted file mode 100644
index 244b3489..00000000
--- a/svgs/svgs_iconset/beer_15.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>beer_15.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#d97200" transform="translate(3 3)" d="M12,5V2c0,0-1-1-4.5-1S3,2,3,2v3c0.0288,1.3915,0.3706,2.7586,1,4c0.6255,1.4348,0.6255,3.0652,0,4.5c0,0,0,1,3.5,1
-	s3.5-1,3.5-1c-0.6255-1.4348-0.6255-3.0652,0-4.5C11.6294,7.7586,11.9712,6.3915,12,5z M7.5,13.5
-	c-0.7966,0.035-1.5937-0.0596-2.36-0.28c0.203-0.7224,0.304-1.4696,0.3-2.22h4.12c-0.004,0.7504,0.097,1.4976,0.3,2.22
-	C9.0937,13.4404,8.2966,13.535,7.5,13.5z M7.5,5C6.3136,5.0299,5.1306,4.8609,4,4.5v-2C5.131,2.1411,6.3137,1.9722,7.5,2
-	C8.6863,1.9722,9.869,2.1411,11,2.5v2C9.8694,4.8609,8.6864,5.0299,7.5,5z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/bicycle_15.svg b/svgs/svgs_iconset/bicycle.svg
similarity index 71%
rename from svgs/svgs_iconset/bicycle_15.svg
rename to svgs/svgs_iconset/bicycle.svg
index d46267ab..bd63ca42 100644
--- a/svgs/svgs_iconset/bicycle_15.svg
+++ b/svgs/svgs_iconset/bicycle.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>bicycle_15.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#5d60be" transform="translate(3 3)" d="
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>bicycle.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#5d60be" transform="translate(3 3)" d="
 	M7.5,2c-0.6761-0.01-0.6761,1.0096,0,1H9v1.2656l-2.8027,2.334L5.2226,4H5.5c0.6761,0.01,0.6761-1.0096,0-1h-2
 	c-0.6761-0.01-0.6761,1.0096,0,1h0.6523L5.043,6.375C4.5752,6.1424,4.0559,6,3.5,6C1.5729,6,0,7.5729,0,9.5S1.5729,13,3.5,13
 	S7,11.4271,7,9.5c0-0.6699-0.2003-1.2911-0.5293-1.8242L9.291,5.3262l0.4629,1.1602C8.7114,7.0937,8,8.2112,8,9.5
diff --git a/svgs/svgs_iconset/bicycle_rental_15.svg b/svgs/svgs_iconset/bicycle_rental.svg
similarity index 67%
rename from svgs/svgs_iconset/bicycle_rental_15.svg
rename to svgs/svgs_iconset/bicycle_rental.svg
index 9cabc7d1..1fc2bb32 100644
--- a/svgs/svgs_iconset/bicycle_rental_15.svg
+++ b/svgs/svgs_iconset/bicycle_rental.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>bicycle_rental_15.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#5d60be" transform="translate(3 3)" d="
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>bicycle_rental.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#5d60be" transform="translate(3 3)" d="
 	M10,1C9.4477,1,9,1.4477,9,2c0,0.5523,0.4477,1,1,1s1-0.4477,1-1C11,1.4477,10.5523,1,10,1z M8.1445,2.9941
 	c-0.13,0.0005-0.2547,0.0517-0.3477,0.1426l-2.6406,2.5c-0.2256,0.2128-0.2051,0.5775,0.043,0.7637L7,7.75v2.75
 	c-0.01,0.6762,1.0096,0.6762,1,0v-3c0.0003-0.1574-0.0735-0.3057-0.1992-0.4004L7.0332,6.5234l1.818-1.7212l0.7484,0.9985
diff --git a/svgs/svgs_iconset/building.svg b/svgs/svgs_iconset/building.svg
new file mode 100644
index 00000000..cce3e9aa
--- /dev/null
+++ b/svgs/svgs_iconset/building.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 19 19" height="19" width="19"><title>building.svg</title><rect fill="none" x="0" y="0" width="19" height="19"></rect><path fill="#725a50" transform="translate(2 2)" d="M3,2v11h5v-3h3v3h1V2H3z M7,12H4v-2h3V12z M7,9H4V7h3V9z M7,6H4V4h3V6z M11,9H8V7h3V9z M11,6H8V4h3V6z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/building_15.svg b/svgs/svgs_iconset/building_15.svg
deleted file mode 100644
index 7effa038..00000000
--- a/svgs/svgs_iconset/building_15.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 19 19" height="19" width="19"><title>building_15.svg</title><rect fill="none" x="0" y="0" width="19" height="19"></rect><path fill="#725a50" transform="translate(2 2)" d="M3,2v11h5v-3h3v3h1V2H3z M7,12H4v-2h3V12z M7,9H4V7h3V9z M7,6H4V4h3V6z M11,9H8V7h3V9z M11,6H8V4h3V6z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/bus_15.svg b/svgs/svgs_iconset/bus.svg
similarity index 58%
rename from svgs/svgs_iconset/bus_15.svg
rename to svgs/svgs_iconset/bus.svg
index e3c1565a..74aef601 100644
--- a/svgs/svgs_iconset/bus_15.svg
+++ b/svgs/svgs_iconset/bus.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 19 19" height="19" width="19"><title>bus_15.svg</title><rect fill="none" x="0" y="0" width="19" height="19"></rect><rect x="0" y="0" width="19" height="19" rx="0" ry="0" fill="#4898ff"></rect><path fill="#fff" transform="translate(2 2)" d="M4,0C2.6364,0,1,0.7433,1,2.7461v5.4531V12c0,0,0,1,1,1v1c0,0,0,1,1,1s1-1,1-1v-1h7v1c0,0,0,1,1,1s1-1,1-1v-1
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 19 19" height="19" width="19"><title>bus.svg</title><rect fill="none" x="0" y="0" width="19" height="19"></rect><rect x="0" y="0" width="19" height="19" rx="0" ry="0" fill="#4898ff"></rect><path fill="#fff" transform="translate(2 2)" d="M4,0C2.6364,0,1,0.7433,1,2.7461v5.4531V12c0,0,0,1,1,1v1c0,0,0,1,1,1s1-1,1-1v-1h7v1c0,0,0,1,1,1s1-1,1-1v-1
 	c0,0,1,0,1-1V2.7461C14,0.7006,12.764,0,11.4004,0H4z M4.25,1.5h6.5C10.8885,1.5,11,1.6115,11,1.75S10.8885,2,10.75,2h-6.5
 	C4.1115,2,4,1.8885,4,1.75S4.1115,1.5,4.25,1.5z M3,3h9c1,0,1,0.9668,1,0.9668V7c0,0,0,1-1,1H3C2,8,2,7,2,7V4C2,4,2,3,3,3z M3,10
 	c0.5523,0,1,0.4477,1,1s-0.4477,1-1,1s-1-0.4477-1-1S2.4477,10,3,10z M12,10c0.5523,0,1,0.4477,1,1s-0.4477,1-1,1s-1-0.4477-1-1
diff --git a/svgs/svgs_iconset/butcher.svg b/svgs/svgs_iconset/butcher.svg
new file mode 100644
index 00000000..afa3120a
--- /dev/null
+++ b/svgs/svgs_iconset/butcher.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>butcher.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#d97200" transform="translate(3 3)" d="M15,8.1c0,1.376-1.363.694-1.363.694L12.5,9H11a5.309,5.309,0,0,1-1.5,2,3.272,3.272,0,0,1-.523,1.125c-.077.091-.061.2-.068.33L9,14.755a.264.264,0,0,1-.266.25A.242.242,0,0,1,8.5,14.8L8,11.5H4v3.253A.247.247,0,0,1,3.753,15h0a.25.25,0,0,1-.241-.2L3,12v-.5a8.2,8.2,0,0,1-1.426-.1A1.886,1.886,0,0,1,.9,12.826c-.128.083-.148.211-.133.386,0,0,.19,1.532.19,1.538a.25.25,0,0,1-.25.25.238.238,0,0,1-.23-.174l-.427-1.7a.35.35,0,0,1,.055-.3c.437-.68-.049-2.55-.049-2.55A1.354,1.354,0,0,1,0,9.922V7.5A2.027,2.027,0,0,1,2.736,5.586s.1.03.142.049a15.15,15.15,0,0,0,3.814.038l.179-.062a1.842,1.842,0,0,1,1.26,0,.972.972,0,0,1,.227.089,1.994,1.994,0,0,1,.287.171A1.8,1.8,0,0,0,9.5,6h1V5l.5.5c.5-1.5,2.5-1,2.5-1a1.687,1.687,0,0,0-1.5,1l2.5,2a.613.613,0,0,1,.186-.069A.318.318,0,0,1,15,7.752V8.1Z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/butcher_15.svg b/svgs/svgs_iconset/butcher_15.svg
deleted file mode 100644
index 1f24b5bd..00000000
--- a/svgs/svgs_iconset/butcher_15.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>butcher_15.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#d97200" transform="translate(3 3)" d="M15,8.1c0,1.376-1.363.694-1.363.694L12.5,9H11a5.309,5.309,0,0,1-1.5,2,3.272,3.272,0,0,1-.523,1.125c-.077.091-.061.2-.068.33L9,14.755a.264.264,0,0,1-.266.25A.242.242,0,0,1,8.5,14.8L8,11.5H4v3.253A.247.247,0,0,1,3.753,15h0a.25.25,0,0,1-.241-.2L3,12v-.5a8.2,8.2,0,0,1-1.426-.1A1.886,1.886,0,0,1,.9,12.826c-.128.083-.148.211-.133.386,0,0,.19,1.532.19,1.538a.25.25,0,0,1-.25.25.238.238,0,0,1-.23-.174l-.427-1.7a.35.35,0,0,1,.055-.3c.437-.68-.049-2.55-.049-2.55A1.354,1.354,0,0,1,0,9.922V7.5A2.027,2.027,0,0,1,2.736,5.586s.1.03.142.049a15.15,15.15,0,0,0,3.814.038l.179-.062a1.842,1.842,0,0,1,1.26,0,.972.972,0,0,1,.227.089,1.994,1.994,0,0,1,.287.171A1.8,1.8,0,0,0,9.5,6h1V5l.5.5c.5-1.5,2.5-1,2.5-1a1.687,1.687,0,0,0-1.5,1l2.5,2a.613.613,0,0,1,.186-.069A.318.318,0,0,1,15,7.752V8.1Z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/cafe.svg b/svgs/svgs_iconset/cafe.svg
new file mode 100644
index 00000000..a6e08002
--- /dev/null
+++ b/svgs/svgs_iconset/cafe.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>cafe.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#d97200" transform="translate(3 3)" d="M12,5h-2V3H2v4c0.0133,2.2091,1.8149,3.9891,4.024,3.9758C7.4345,10.9673,8.7362,10.2166,9.45,9H12c1.1046,0,2-0.8954,2-2
+	S13.1046,5,12,5z M12,8H9.86C9.9487,7.6739,9.9958,7.3379,10,7V6h2c0.5523,0,1,0.4477,1,1S12.5523,8,12,8z M10,12.5
+	c0,0.2761-0.2239,0.5-0.5,0.5h-7C2.2239,13,2,12.7761,2,12.5S2.2239,12,2.5,12h7C9.7761,12,10,12.2239,10,12.5z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/cafe_15.svg b/svgs/svgs_iconset/cafe_15.svg
deleted file mode 100644
index 96342092..00000000
--- a/svgs/svgs_iconset/cafe_15.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>cafe_15.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#d97200" transform="translate(3 3)" d="M12,5h-2V3H2v4c0.0133,2.2091,1.8149,3.9891,4.024,3.9758C7.4345,10.9673,8.7362,10.2166,9.45,9H12c1.1046,0,2-0.8954,2-2
-	S13.1046,5,12,5z M12,8H9.86C9.9487,7.6739,9.9958,7.3379,10,7V6h2c0.5523,0,1,0.4477,1,1S12.5523,8,12,8z M10,12.5
-	c0,0.2761-0.2239,0.5-0.5,0.5h-7C2.2239,13,2,12.7761,2,12.5S2.2239,12,2.5,12h7C9.7761,12,10,12.2239,10,12.5z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/campsite.svg b/svgs/svgs_iconset/campsite.svg
new file mode 100644
index 00000000..e645e6c9
--- /dev/null
+++ b/svgs/svgs_iconset/campsite.svg
@@ -0,0 +1,2 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>campsite.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#725a50" transform="translate(3 3)" d="M7,1.5
+	l-5.5,9H1c-1,0-1,1-1,1v1c0,0,0,1,1,1h13c1,0,1-1,1-1v-1c0,0,0-1-1-1h-0.5L8,1.5C7.8,1.1,7.2,1.1,7,1.5z M7.5,5l3.2,5.5H4.2L7.5,5z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/car_15.svg b/svgs/svgs_iconset/car.svg
similarity index 56%
rename from svgs/svgs_iconset/car_15.svg
rename to svgs/svgs_iconset/car.svg
index d2420b8e..4bb811c5 100644
--- a/svgs/svgs_iconset/car_15.svg
+++ b/svgs/svgs_iconset/car.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 19 19" height="19" width="19"><title>car_15.svg</title><rect fill="none" x="0" y="0" width="19" height="19"></rect><rect x="0" y="0" width="19" height="19" rx="0" ry="0" fill="#4898ff"></rect><path fill="#fff" transform="translate(2 2)" d="M14,7c-0.004-0.6904-0.4787-1.2889-1.15-1.45l-1.39-3.24l0,0l0,0l0,0C11.3833,2.1233,11.2019,2.001,11,2H4
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 19 19" height="19" width="19"><title>car.svg</title><rect fill="none" x="0" y="0" width="19" height="19"></rect><rect x="0" y="0" width="19" height="19" rx="0" ry="0" fill="#4898ff"></rect><path fill="#fff" transform="translate(2 2)" d="M14,7c-0.004-0.6904-0.4787-1.2889-1.15-1.45l-1.39-3.24l0,0l0,0l0,0C11.3833,2.1233,11.2019,2.001,11,2H4
 	C3.8124,2.0034,3.6425,2.1115,3.56,2.28l0,0l0,0l0,0L2.15,5.54C1.475,5.702,0.9994,6.3059,1,7v3.5h1v1c0,0.5523,0.4477,1,1,1
 	s1-0.4477,1-1v-1h7v1c0,0.5523,0.4477,1,1,1s1-0.4477,1-1v-1h1V7z M4.3,3h6.4l1.05,2.5h-8.5L4.3,3z M3,9C2.4477,9,2,8.5523,2,8
 	s0.4477-1,1-1s1,0.4477,1,1S3.5523,9,3,9z M12,9c-0.5523,0-1-0.4477-1-1s0.4477-1,1-1s1,0.4477,1,1S12.5523,9,12,9z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/castle.svg b/svgs/svgs_iconset/castle.svg
new file mode 100644
index 00000000..e7105c9e
--- /dev/null
+++ b/svgs/svgs_iconset/castle.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>castle.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#725a50" transform="translate(3 3)" d="M11,4H4C3.4477,4,3,3.5523,3,3V0.5C3,0.2239,3.2239,0,3.5,0S4,0.2239,4,0.5V2h1V1c0-0.5523,0.4477-1,1-1s1,0.4477,1,1v1h1V1
+	c0-0.5523,0.4477-1,1-1s1,0.4477,1,1v1h1V0.5C11,0.2239,11.2239,0,11.5,0S12,0.2239,12,0.5V3C12,3.5523,11.5523,4,11,4z M14,14.5
+	c0,0.2761-0.2239,0.5-0.5,0.5h-12C1.2239,15,1,14.7761,1,14.5S1.2239,14,1.5,14H2c0.5523,0,1-0.4477,1-1c0,0,1-6,1-7
+	c0-0.5523,0.4477-1,1-1h5c0.5523,0,1,0.4477,1,1c0,1,1,7,1,7c0,0.5523,0.4477,1,1,1h0.5c0.2723-0.0001,0.4946,0.2178,0.5,0.49V14.5z
+	 M9,10.5C9,9.6716,8.3284,9,7.5,9S6,9.6716,6,10.5V14h3V10.5z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/castle_15.svg b/svgs/svgs_iconset/castle_15.svg
deleted file mode 100644
index e0d71b97..00000000
--- a/svgs/svgs_iconset/castle_15.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>castle_15.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#725a50" transform="translate(3 3)" d="M11,4H4C3.4477,4,3,3.5523,3,3V0.5C3,0.2239,3.2239,0,3.5,0S4,0.2239,4,0.5V2h1V1c0-0.5523,0.4477-1,1-1s1,0.4477,1,1v1h1V1
-	c0-0.5523,0.4477-1,1-1s1,0.4477,1,1v1h1V0.5C11,0.2239,11.2239,0,11.5,0S12,0.2239,12,0.5V3C12,3.5523,11.5523,4,11,4z M14,14.5
-	c0,0.2761-0.2239,0.5-0.5,0.5h-12C1.2239,15,1,14.7761,1,14.5S1.2239,14,1.5,14H2c0.5523,0,1-0.4477,1-1c0,0,1-6,1-7
-	c0-0.5523,0.4477-1,1-1h5c0.5523,0,1,0.4477,1,1c0,1,1,7,1,7c0,0.5523,0.4477,1,1,1h0.5c0.2723-0.0001,0.4946,0.2178,0.5,0.49V14.5z
-	 M9,10.5C9,9.6716,8.3284,9,7.5,9S6,9.6716,6,10.5V14h3V10.5z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/cemetery.svg b/svgs/svgs_iconset/cemetery.svg
new file mode 100644
index 00000000..40903900
--- /dev/null
+++ b/svgs/svgs_iconset/cemetery.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>cemetery.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#725a50" transform="translate(3 3)" d="M11.46,12h-0.68L12,3.55c0.0175-0.2867-0.2008-0.5332-0.4874-0.5507C11.4884,2.9979,11.4641,2.9981,11.44,3h-1.18
+	c0-0.92-1.23-2-2.75-2S4.77,2.08,4.77,3H3.54C3.253,2.9885,3.0111,3.2117,2.9995,3.4987C2.9988,3.5158,2.999,3.5329,3,3.55L4.2,12
+	H3.55C3.2609,11.9886,3.0162,12.2112,3,12.5V14h9v-1.51C11.9839,12.2067,11.7435,11.9886,11.46,12z M4.5,5h6v1h-6V5z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/cemetery_15.svg b/svgs/svgs_iconset/cemetery_15.svg
deleted file mode 100644
index 45c081db..00000000
--- a/svgs/svgs_iconset/cemetery_15.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>cemetery_15.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#725a50" transform="translate(3 3)" d="M11.46,12h-0.68L12,3.55c0.0175-0.2867-0.2008-0.5332-0.4874-0.5507C11.4884,2.9979,11.4641,2.9981,11.44,3h-1.18
-	c0-0.92-1.23-2-2.75-2S4.77,2.08,4.77,3H3.54C3.253,2.9885,3.0111,3.2117,2.9995,3.4987C2.9988,3.5158,2.999,3.5329,3,3.55L4.2,12
-	H3.55C3.2609,11.9886,3.0162,12.2112,3,12.5V14h9v-1.51C11.9839,12.2067,11.7435,11.9886,11.46,12z M4.5,5h6v1h-6V5z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/cinema_15.svg b/svgs/svgs_iconset/cinema.svg
similarity index 51%
rename from svgs/svgs_iconset/cinema_15.svg
rename to svgs/svgs_iconset/cinema.svg
index 3d468a80..12c0fe6d 100644
--- a/svgs/svgs_iconset/cinema_15.svg
+++ b/svgs/svgs_iconset/cinema.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>cinema_15.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#5d60be" transform="translate(3 3)" d="M14,7.5v2c0,0.2761-0.2239,0.5-0.5,0.5S13,9.7761,13,9.5c0,0,0.06-0.5-1-0.5h-1v2.5c0,0.2761-0.2239,0.5-0.5,0.5h-8
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>cinema.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#5d60be" transform="translate(3 3)" d="M14,7.5v2c0,0.2761-0.2239,0.5-0.5,0.5S13,9.7761,13,9.5c0,0,0.06-0.5-1-0.5h-1v2.5c0,0.2761-0.2239,0.5-0.5,0.5h-8
 	C2.2239,12,2,11.7761,2,11.5v-4C2,7.2239,2.2239,7,2.5,7h8C10.7761,7,11,7.2239,11,7.5V8h1c1.06,0,1-0.5,1-0.5
 	C13,7.2239,13.2239,7,13.5,7S14,7.2239,14,7.5z M4,3C2.8954,3,2,3.8954,2,5s0.8954,2,2,2s2-0.8954,2-2S5.1046,3,4,3z M4,6
 	C3.4477,6,3,5.5523,3,5s0.4477-1,1-1s1,0.4477,1,1S4.5523,6,4,6z M8.5,2C7.1193,2,6,3.1193,6,4.5S7.1193,7,8.5,7S11,5.8807,11,4.5
diff --git a/svgs/svgs_iconset/circle.svg b/svgs/svgs_iconset/circle.svg
new file mode 100644
index 00000000..17c015e0
--- /dev/null
+++ b/svgs/svgs_iconset/circle.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 19 19" height="19" width="19"><title>circle.svg</title><rect fill="none" x="0" y="0" width="19" height="19"></rect><path fill="#725a50" transform="translate(2 2)" d="M14,7.5c0,3.5899-2.9101,6.5-6.5,6.5S1,11.0899,1,7.5S3.9101,1,7.5,1S14,3.9101,14,7.5z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/circle_15.svg b/svgs/svgs_iconset/circle_15.svg
deleted file mode 100644
index af054fe1..00000000
--- a/svgs/svgs_iconset/circle_15.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 19 19" height="19" width="19"><title>circle_15.svg</title><rect fill="none" x="0" y="0" width="19" height="19"></rect><path fill="#725a50" transform="translate(2 2)" d="M14,7.5c0,3.5899-2.9101,6.5-6.5,6.5S1,11.0899,1,7.5S3.9101,1,7.5,1S14,3.9101,14,7.5z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/circle_stroked_15.svg b/svgs/svgs_iconset/circle_stroked.svg
similarity index 53%
rename from svgs/svgs_iconset/circle_stroked_15.svg
rename to svgs/svgs_iconset/circle_stroked.svg
index a2b9d1cd..3d065514 100644
--- a/svgs/svgs_iconset/circle_stroked_15.svg
+++ b/svgs/svgs_iconset/circle_stroked.svg
@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 19 19" height="19" width="19"><title>circle-stroked_15.svg</title><rect fill="none" x="0" y="0" width="19" height="19"></rect><path fill="#725a50" transform="translate(2 2)" d="M7.5,0C11.6422,0,15,3.3578,15,7.5S11.6422,15,7.5,15
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 19 19" height="19" width="19"><title>circle_stroked.svg</title><rect fill="none" x="0" y="0" width="19" height="19"></rect><path fill="#725a50" transform="translate(2 2)" d="M7.5,0C11.6422,0,15,3.3578,15,7.5S11.6422,15,7.5,15
 	S0,11.6422,0,7.5S3.3578,0,7.5,0z M7.5,1.6666c-3.2217,0-5.8333,2.6117-5.8333,5.8334S4.2783,13.3334,7.5,13.3334
 	s5.8333-2.6117,5.8333-5.8334S10.7217,1.6666,7.5,1.6666z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/circle_stroked_11.svg b/svgs/svgs_iconset/circle_stroked_11.svg
index bc9a7c41..d8a8d75f 100644
--- a/svgs/svgs_iconset/circle_stroked_11.svg
+++ b/svgs/svgs_iconset/circle_stroked_11.svg
@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 15 15" height="15" width="15"><title>circle-stroked_11.svg</title><rect fill="none" x="0" y="0" width="15" height="15"></rect><path fill="#725a50" transform="translate(2 2)" d="M5.5,0C8.5376,0,11,2.4624,11,5.5S8.5376,11,5.5,11S0,8.5376,0,5.5
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 15 15" height="15" width="15"><title>circle_stroked_11.svg</title><rect fill="none" x="0" y="0" width="15" height="15"></rect><path fill="#725a50" transform="translate(2 2)" d="M5.5,0C8.5376,0,11,2.4624,11,5.5S8.5376,11,5.5,11S0,8.5376,0,5.5
 	S2.4624,0,5.5,0z M5.5,1.2222c-2.3626,0-4.2778,1.9152-4.2778,4.2778S3.1374,9.7778,5.5,9.7778S9.7778,7.8626,9.7778,5.5
 	S7.8626,1.2222,5.5,1.2222z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/clothing_store.svg b/svgs/svgs_iconset/clothing_store.svg
new file mode 100644
index 00000000..f6e5d647
--- /dev/null
+++ b/svgs/svgs_iconset/clothing_store.svg
@@ -0,0 +1,2 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>clothing_store.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#5d60be" transform="translate(3 3)" d="
+	M3.5,1L0,4v3h2.9L3,14h9V7h3V4l-3.5-3H10L7.5,5L5,1H3.5z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/clothing_store_15.svg b/svgs/svgs_iconset/clothing_store_15.svg
deleted file mode 100644
index 0b22f648..00000000
--- a/svgs/svgs_iconset/clothing_store_15.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>clothing_store_15.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#5d60be" transform="translate(3 3)" d="
-	M3.5,1L0,4v3h2.9L3,14h9V7h3V4l-3.5-3H10L7.5,5L5,1H3.5z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/college.svg b/svgs/svgs_iconset/college.svg
new file mode 100644
index 00000000..57c2b332
--- /dev/null
+++ b/svgs/svgs_iconset/college.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>college.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#725a50" transform="translate(3 3)" d="M7.5,1L0,4.5l2,0.9v1.7C1.4,7.3,1,7.9,1,8.5s0.4,1.2,1,1.4V10l-0.9,2.1
+	C0.8,13,1,14,2.5,14s1.7-1,1.4-1.9L3,10c0.6-0.3,1-0.8,1-1.5S3.6,7.3,3,7.1V5.9L7.5,8L15,4.5L7.5,1z M11.9,7.5l-4.5,2L5,8.4v0.1
+	c0,0.7-0.3,1.3-0.8,1.8l0.6,1.4v0.1C4.9,12.2,5,12.6,4.9,13c0.7,0.3,1.5,0.5,2.5,0.5c3.3,0,4.5-2,4.5-3L11.9,7.5L11.9,7.5z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/college_15.svg b/svgs/svgs_iconset/college_15.svg
deleted file mode 100644
index 769bf4af..00000000
--- a/svgs/svgs_iconset/college_15.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>college_15.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#725a50" transform="translate(3 3)" d="M7.5,1L0,4.5l2,0.9v1.7C1.4,7.3,1,7.9,1,8.5s0.4,1.2,1,1.4V10l-0.9,2.1
-	C0.8,13,1,14,2.5,14s1.7-1,1.4-1.9L3,10c0.6-0.3,1-0.8,1-1.5S3.6,7.3,3,7.1V5.9L7.5,8L15,4.5L7.5,1z M11.9,7.5l-4.5,2L5,8.4v0.1
-	c0,0.7-0.3,1.3-0.8,1.8l0.6,1.4v0.1C4.9,12.2,5,12.6,4.9,13c0.7,0.3,1.5,0.5,2.5,0.5c3.3,0,4.5-2,4.5-3L11.9,7.5L11.9,7.5z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/commercial.svg b/svgs/svgs_iconset/commercial.svg
new file mode 100644
index 00000000..7351e2cb
--- /dev/null
+++ b/svgs/svgs_iconset/commercial.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 19 19" height="19" width="19"><title>commercial.svg</title><rect fill="none" x="0" y="0" width="19" height="19"></rect><path fill="#725a50" transform="translate(2 2)" d="M14,7H1c0.0881-1.3829,0.427-2.7383,1-4h11C13.5731,4.2617,13.9119,5.6171,14,7z M3,8h9v6h-1V9H8v5H3V8z M4,11h3V9H4V11z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/commercial_15.svg b/svgs/svgs_iconset/commercial_15.svg
deleted file mode 100644
index 5bc181fa..00000000
--- a/svgs/svgs_iconset/commercial_15.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 19 19" height="19" width="19"><title>commercial_15.svg</title><rect fill="none" x="0" y="0" width="19" height="19"></rect><path fill="#725a50" transform="translate(2 2)" d="M14,7H1c0.0881-1.3829,0.427-2.7383,1-4h11C13.5731,4.2617,13.9119,5.6171,14,7z M3,8h9v6h-1V9H8v5H3V8z M4,11h3V9H4V11z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/cricket_15.svg b/svgs/svgs_iconset/cricket.svg
similarity index 63%
rename from svgs/svgs_iconset/cricket_15.svg
rename to svgs/svgs_iconset/cricket.svg
index deb1f178..18bdc5b3 100644
--- a/svgs/svgs_iconset/cricket_15.svg
+++ b/svgs/svgs_iconset/cricket.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>cricket_15.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#76a723" transform="translate(3 3)" d="M8,1.5C8,2.3284,7.3284,3,6.5,3S5,2.3284,5,1.5S5.6716,0,6.5,0S8,0.6716,8,1.5z M10.88,7.18L10.88,7.18l-2-2l0,0l0,0
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>cricket.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#76a723" transform="translate(3 3)" d="M8,1.5C8,2.3284,7.3284,3,6.5,3S5,2.3284,5,1.5S5.6716,0,6.5,0S8,0.6716,8,1.5z M10.88,7.18L10.88,7.18l-2-2l0,0l0,0
 	C8.7815,5.0616,8.6339,4.9952,8.48,5H3.75C3.3736,4.9915,3.0508,5.2669,3,5.64l0,0l-1,7.7l0,0c-0.0068,0.0464-0.0068,0.0936,0,0.14
 	c0,0.2761,0.2239,0.5,0.5,0.5c0.2251,0.0153,0.4315-0.1251,0.5-0.34l0,0l1.2-3.89l0,0l0.26-0.83l0.4,0.44l0,0L6,10.6v2.9
 	C6,13.7761,6.2239,14,6.5,14S7,13.7761,7,13.5v-3l0,0l0,0c-0.0081-0.0788-0.0356-0.1544-0.08-0.22l0,0L5.48,8.5l1-2.5h1.71l2,1.84
diff --git a/svgs/svgs_iconset/cross_15.svg b/svgs/svgs_iconset/cross.svg
similarity index 65%
rename from svgs/svgs_iconset/cross_15.svg
rename to svgs/svgs_iconset/cross.svg
index c90dbc49..61f6b159 100644
--- a/svgs/svgs_iconset/cross_15.svg
+++ b/svgs/svgs_iconset/cross.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 19 19" height="19" width="19"><title>cross_15.svg</title><rect fill="none" x="0" y="0" width="19" height="19"></rect><path fill="#725a50" transform="translate(2 2)" d="M2.64,1.27L7.5,6.13l4.84-4.84C12.5114,1.1076,12.7497,1.0029,13,1c0.5523,0,1,0.4477,1,1
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 19 19" height="19" width="19"><title>cross.svg</title><rect fill="none" x="0" y="0" width="19" height="19"></rect><path fill="#725a50" transform="translate(2 2)" d="M2.64,1.27L7.5,6.13l4.84-4.84C12.5114,1.1076,12.7497,1.0029,13,1c0.5523,0,1,0.4477,1,1
 	c0.0047,0.2478-0.093,0.4866-0.27,0.66L8.84,7.5l4.89,4.89c0.1648,0.1612,0.2615,0.3796,0.27,0.61c0,0.5523-0.4477,1-1,1
 	c-0.2577,0.0107-0.508-0.0873-0.69-0.27L7.5,8.87l-4.85,4.85C2.4793,13.8963,2.2453,13.9971,2,14c-0.5523,0-1-0.4477-1-1
 	c-0.0047-0.2478,0.093-0.4866,0.27-0.66L6.16,7.5L1.27,2.61C1.1052,2.4488,1.0085,2.2304,1,2c0-0.5523,0.4477-1,1-1
diff --git a/svgs/svgs_iconset/dam_15.svg b/svgs/svgs_iconset/dam.svg
similarity index 85%
rename from svgs/svgs_iconset/dam_15.svg
rename to svgs/svgs_iconset/dam.svg
index 881ee786..d0c572fd 100644
--- a/svgs/svgs_iconset/dam_15.svg
+++ b/svgs/svgs_iconset/dam.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 19 19" height="19" width="19"><title>dam_15.svg</title><rect fill="none" x="0" y="0" width="19" height="19"></rect><path fill="#725a50" transform="translate(2 2)" d="M13.94,9.5c0,0.2761-0.2239,0.5-0.5,0.5l0,0c-0.259,0.0219-0.4994,0.1439-0.67,0.34c-0.2714,0.2887-0.6175,0.4964-1,0.6
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 19 19" height="19" width="19"><title>dam.svg</title><rect fill="none" x="0" y="0" width="19" height="19"></rect><path fill="#725a50" transform="translate(2 2)" d="M13.94,9.5c0,0.2761-0.2239,0.5-0.5,0.5l0,0c-0.259,0.0219-0.4994,0.1439-0.67,0.34c-0.2714,0.2887-0.6175,0.4964-1,0.6
 	c-0.6115,0.1816-1.2734,0.0424-1.76-0.37l-0.39-0.35c-0.2976-0.3038-0.7851-0.3087-1.0889-0.0111
 	C8.5274,10.2126,8.5237,10.2163,8.52,10.22c-0.14,0.12-0.27,0.25-0.42,0.37c-0.7278,0.5784-1.7663,0.5489-2.46-0.07L5.3,10.19
 	l-0.1-0.06l0.3,1.22l0.49,2c0.0829,0.2634-0.0634,0.5441-0.3267,0.6271C5.6105,13.9937,5.5553,14.0014,5.5,14h-4
diff --git a/svgs/svgs_iconset/danger_15.svg b/svgs/svgs_iconset/danger.svg
similarity index 72%
rename from svgs/svgs_iconset/danger_15.svg
rename to svgs/svgs_iconset/danger.svg
index b13e252a..f9462798 100644
--- a/svgs/svgs_iconset/danger_15.svg
+++ b/svgs/svgs_iconset/danger.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>danger_15.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#ba3827" transform="translate(3 3)" d="M13.94,14.68c-0.0749,0.194-0.262,0.3215-0.47,0.32c-0.0595,0.0107-0.1205,0.0107-0.18,0L7.5,12.56L1.7,15
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>danger.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#ba3827" transform="translate(3 3)" d="M13.94,14.68c-0.0749,0.194-0.262,0.3215-0.47,0.32c-0.0595,0.0107-0.1205,0.0107-0.18,0L7.5,12.56L1.7,15
 	c-0.2572,0.1005-0.5472-0.0266-0.6476-0.2838C1.0516,14.7141,1.0508,14.7121,1.05,14.71c-0.1291-0.2441-0.0358-0.5467,0.2084-0.6757
 	C1.2845,14.0205,1.3118,14.009,1.34,14l4.85-2l-4.85-2C1.0758,9.9197,0.9267,9.6404,1.007,9.3762s0.3596-0.4133,0.6238-0.333
 	C1.6545,9.0504,1.6776,9.0594,1.7,9.07l5.8,2.41l5.8-2.41c0.2494-0.1185,0.5477-0.0124,0.6662,0.237
diff --git a/svgs/svgs_iconset/dentist.svg b/svgs/svgs_iconset/dentist.svg
new file mode 100644
index 00000000..8a465fb0
--- /dev/null
+++ b/svgs/svgs_iconset/dentist.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>dentist.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#ba3827" transform="translate(3 3)" d="M4.36,14c-1,0-0.56-2.67-0.86-5c-0.1-0.76-1-1.49-1.12-2.06C2,5,1.39,1.44,3.66,1S6,3,7.54,3s1.57-2.36,3.85-2
+	s1.59,3.9,1.29,5.9c-0.1,0.45-1.1,1.48-1.18,2.06c-0.33,2.4,0.32,5-0.8,5c-0.93,0-1.32-2.72-2-4.5C8.43,8.63,8.06,8,7.54,8
+	C6,8,5.75,14,4.36,14z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/dentist_15.svg b/svgs/svgs_iconset/dentist_15.svg
deleted file mode 100644
index 9f445e1c..00000000
--- a/svgs/svgs_iconset/dentist_15.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>dentist_15.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#ba3827" transform="translate(3 3)" d="M4.36,14c-1,0-0.56-2.67-0.86-5c-0.1-0.76-1-1.49-1.12-2.06C2,5,1.39,1.44,3.66,1S6,3,7.54,3s1.57-2.36,3.85-2
-	s1.59,3.9,1.29,5.9c-0.1,0.45-1.1,1.48-1.18,2.06c-0.33,2.4,0.32,5-0.8,5c-0.93,0-1.32-2.72-2-4.5C8.43,8.63,8.06,8,7.54,8
-	C6,8,5.75,14,4.36,14z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/doctors_15.svg b/svgs/svgs_iconset/doctors.svg
similarity index 58%
rename from svgs/svgs_iconset/doctors_15.svg
rename to svgs/svgs_iconset/doctors.svg
index 37179362..f8ad0dbe 100644
--- a/svgs/svgs_iconset/doctors_15.svg
+++ b/svgs/svgs_iconset/doctors.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>doctor_15.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#ba3827" transform="translate(3 3)" d="M5.5,7C4.1193,7,3,5.8807,3,4.5l0,0v-2C3,2.2239,3.2239,2,3.5,2H4c0.2761,0,0.5-0.2239,0.5-0.5S4.2761,1,4,1H3.5
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>doctors.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#ba3827" transform="translate(3 3)" d="M5.5,7C4.1193,7,3,5.8807,3,4.5l0,0v-2C3,2.2239,3.2239,2,3.5,2H4c0.2761,0,0.5-0.2239,0.5-0.5S4.2761,1,4,1H3.5
 	C2.6716,1,2,1.6716,2,2.5v2c0.0013,1.1466,0.5658,2.2195,1.51,2.87l0,0C4.4131,8.1662,4.9514,9.297,5,10.5C5,12.433,6.567,14,8.5,14
 	s3.5-1.567,3.5-3.5V9.93c1.0695-0.2761,1.7126-1.367,1.4365-2.4365C13.1603,6.424,12.0695,5.7809,11,6.057
 	C9.9305,6.3332,9.2874,7.424,9.5635,8.4935C9.7454,9.198,10.2955,9.7481,11,9.93v0.57c0,1.3807-1.1193,2.5-2.5,2.5S6,11.8807,6,10.5
diff --git a/svgs/svgs_iconset/doctors_11.svg b/svgs/svgs_iconset/doctors_11.svg
index 9b1edf39..394b022e 100644
--- a/svgs/svgs_iconset/doctors_11.svg
+++ b/svgs/svgs_iconset/doctors_11.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 17 17" height="17" width="17"><title>doctor_11.svg</title><rect fill="none" x="0" y="0" width="17" height="17"></rect><rect x="1" y="1" rx="7.5" ry="7.5" width="15" height="15" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="15" height="15" rx="7.5" ry="7.5" fill="#fff"></rect><path fill="#ba3827" transform="translate(3 3)" d="M9.5,5.87c0.0017-0.8174-0.6596-1.4813-1.477-1.483S6.5417,5.0466,6.54,5.864C6.5386,6.54,6.9955,7.131,7.65,7.3v0.42
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 17 17" height="17" width="17"><title>doctors_11.svg</title><rect fill="none" x="0" y="0" width="17" height="17"></rect><rect x="1" y="1" rx="7.5" ry="7.5" width="15" height="15" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="15" height="15" rx="7.5" ry="7.5" fill="#fff"></rect><path fill="#ba3827" transform="translate(3 3)" d="M9.5,5.87c0.0017-0.8174-0.6596-1.4813-1.477-1.483S6.5417,5.0466,6.54,5.864C6.5386,6.54,6.9955,7.131,7.65,7.3v0.42
 	c0,1.0245-0.8305,1.855-1.855,1.855S3.94,8.7445,3.94,7.72l0,0C3.9776,6.8275,4.3787,5.9893,5.05,5.4H5
 	c0.718-0.4684,1.1564-1.2628,1.17-2.12V1.79c0-0.613-0.4969-1.11-1.11-1.11c-0.0033,0-0.0067,0-0.01,0H4.5
 	c-0.2043,0-0.37,0.1657-0.37,0.37S4.2957,1.42,4.5,1.42h0.55c0.2043,0,0.37,0.1657,0.37,0.37v1.49l0,0
diff --git a/svgs/svgs_iconset/dog_park.svg b/svgs/svgs_iconset/dog_park.svg
new file mode 100644
index 00000000..1f8a8a33
--- /dev/null
+++ b/svgs/svgs_iconset/dog_park.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>dog_park.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#5d60be" transform="translate(3 3)" d="M 10.300781 1.2207031 C 9.9144812 1.2207031 9.6 1.2 9.5 2 L 9.0996094 4.5214844 L 11.5 6.5 L 13.5 6.5 C 14.9 6.5 15 5.5410156 15 5.5410156 L 13.099609 3.3222656 C 12.399609 2.6222656 11.7 2.5 11 2.5 L 11 2 C 11 2 11.067481 1.2206031 10.300781 1.2207031 z M 4.75 1.5 C 4.75 1.5 3.7992187 1.5206031 3.1992188 1.7207031 C 2.5992187 1.9207031 2 2.6210938 2 3.6210938 L 2 7.5214844 C 2 9.2214844 1.3 9.5 1 9.5 C 1 9.5 0 9.5214844 0 10.521484 L 0 12.720703 C 0 12.720703 0.00078125 13.521484 0.80078125 13.521484 L 1 13.521484 L 1.5 13.521484 L 2 13.521484 L 2 13.021484 L 2 12.822266 C 2 12.422266 1.8 12.221094 1.5 12.121094 L 1.5 11.021484 C 2.5 11.021484 2.6 10.820703 3 10.720703 L 3.5507812 12.917969 C 3.6507813 13.217969 3.7507813 13.417578 4.0507812 13.517578 L 5.0507812 13.517578 L 6 13.5 L 6 12.699219 C 6 12.022819 5 12 5 12 L 5 9.5 L 8.5 9.5 L 9.1992188 12.121094 C 9.5992188 13.521094 10.5 13.5 10.5 13.5 L 11 13.5 L 12 13.5 L 12 12.699219 C 12 11.987419 11 12 11 12 L 11.099609 7.921875 L 8 5.5 L 3.5 5.5 L 3.5 3.5 C 3.5 3.1 3.7765 3.0053 4 3 C 4.4941 2.9882 4.75 3 4.75 3 C 5.1642 3 5.5 2.6642 5.5 2.25 C 5.5 1.8358 5.1642 1.5 4.75 1.5 z M 11.75 4 C 11.8881 4 12 4.1119 12 4.25 C 12 4.3881 11.8881 4.5 11.75 4.5 C 11.6119 4.5 11.5 4.3881 11.5 4.25 C 11.5 4.1119 11.6119 4 11.75 4 z "></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/dog_park_15.svg b/svgs/svgs_iconset/dog_park_15.svg
deleted file mode 100644
index 741137f5..00000000
--- a/svgs/svgs_iconset/dog_park_15.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>dog_park_15.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#5d60be" transform="translate(3 3)" d="M 10.300781 1.2207031 C 9.9144812 1.2207031 9.6 1.2 9.5 2 L 9.0996094 4.5214844 L 11.5 6.5 L 13.5 6.5 C 14.9 6.5 15 5.5410156 15 5.5410156 L 13.099609 3.3222656 C 12.399609 2.6222656 11.7 2.5 11 2.5 L 11 2 C 11 2 11.067481 1.2206031 10.300781 1.2207031 z M 4.75 1.5 C 4.75 1.5 3.7992187 1.5206031 3.1992188 1.7207031 C 2.5992187 1.9207031 2 2.6210938 2 3.6210938 L 2 7.5214844 C 2 9.2214844 1.3 9.5 1 9.5 C 1 9.5 0 9.5214844 0 10.521484 L 0 12.720703 C 0 12.720703 0.00078125 13.521484 0.80078125 13.521484 L 1 13.521484 L 1.5 13.521484 L 2 13.521484 L 2 13.021484 L 2 12.822266 C 2 12.422266 1.8 12.221094 1.5 12.121094 L 1.5 11.021484 C 2.5 11.021484 2.6 10.820703 3 10.720703 L 3.5507812 12.917969 C 3.6507813 13.217969 3.7507813 13.417578 4.0507812 13.517578 L 5.0507812 13.517578 L 6 13.5 L 6 12.699219 C 6 12.022819 5 12 5 12 L 5 9.5 L 8.5 9.5 L 9.1992188 12.121094 C 9.5992188 13.521094 10.5 13.5 10.5 13.5 L 11 13.5 L 12 13.5 L 12 12.699219 C 12 11.987419 11 12 11 12 L 11.099609 7.921875 L 8 5.5 L 3.5 5.5 L 3.5 3.5 C 3.5 3.1 3.7765 3.0053 4 3 C 4.4941 2.9882 4.75 3 4.75 3 C 5.1642 3 5.5 2.6642 5.5 2.25 C 5.5 1.8358 5.1642 1.5 4.75 1.5 z M 11.75 4 C 11.8881 4 12 4.1119 12 4.25 C 12 4.3881 11.8881 4.5 11.75 4.5 C 11.6119 4.5 11.5 4.3881 11.5 4.25 C 11.5 4.1119 11.6119 4 11.75 4 z "></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/drinking_water.svg b/svgs/svgs_iconset/drinking_water.svg
new file mode 100644
index 00000000..375353de
--- /dev/null
+++ b/svgs/svgs_iconset/drinking_water.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>drinking_water.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#725a50" transform="translate(3 3)" d="M5,1h9v3H6.5C6.2239,4,6,4.2239,6,4.5V7H3V3C3,1.8954,3.8954,1,5,1z M5.9,11.94L5.9,11.94L5.9,11.94L5.9,11.94L4.5,9
+	l-1.39,2.93C3.0535,12.1156,3.0166,12.3067,3,12.5c-0.0021,0.8284,0.6678,1.5017,1.4962,1.5038
+	C5.3246,14.0059,5.9979,13.3361,6,12.5076c0.0005-0.1946-0.0369-0.3873-0.11-0.5676H5.9z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/drinking_water_11.svg b/svgs/svgs_iconset/drinking_water_11.svg
index de049c88..be869c1e 100644
--- a/svgs/svgs_iconset/drinking_water_11.svg
+++ b/svgs/svgs_iconset/drinking_water_11.svg
@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 17 17" height="17" width="17"><title>drinking-water_11.svg</title><rect fill="none" x="0" y="0" width="17" height="17"></rect><rect x="1" y="1" rx="7.5" ry="7.5" width="15" height="15" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="15" height="15" rx="7.5" ry="7.5" fill="#fff"></rect><path fill="#725a50" transform="translate(3 3)" d="M10,3H5C4.7239,3,4.5,3.2239,4.5,3.5V5h-2V2.51C2.4945,1.6816,3.1616,1.0056,3.99,1C3.9933,1,3.9967,1,4,1h6V3z M4.38,8.56
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 17 17" height="17" width="17"><title>drinking_water_11.svg</title><rect fill="none" x="0" y="0" width="17" height="17"></rect><rect x="1" y="1" rx="7.5" ry="7.5" width="15" height="15" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="15" height="15" rx="7.5" ry="7.5" fill="#fff"></rect><path fill="#725a50" transform="translate(3 3)" d="M10,3H5C4.7239,3,4.5,3.2239,4.5,3.5V5h-2V2.51C2.4945,1.6816,3.1616,1.0056,3.99,1C3.9933,1,3.9967,1,4,1h6V3z M4.38,8.56
 	L4.38,8.56L3.49,7L2.6,8.55l0,0C2.5286,8.6893,2.4909,8.8435,2.49,9c0.0003,0.5523,0.4482,0.9998,1.0005,0.9995
 	C4.0424,9.9992,4.4897,9.5519,4.49,9C4.4875,8.8468,4.4499,8.6963,4.38,8.56z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/drinking_water_15.svg b/svgs/svgs_iconset/drinking_water_15.svg
deleted file mode 100644
index a9ed066d..00000000
--- a/svgs/svgs_iconset/drinking_water_15.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>drinking_water_15.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#725a50" transform="translate(3 3)" d="M5,1h9v3H6.5C6.2239,4,6,4.2239,6,4.5V7H3V3C3,1.8954,3.8954,1,5,1z M5.9,11.94L5.9,11.94L5.9,11.94L5.9,11.94L4.5,9
-	l-1.39,2.93C3.0535,12.1156,3.0166,12.3067,3,12.5c-0.0021,0.8284,0.6678,1.5017,1.4962,1.5038
-	C5.3246,14.0059,5.9979,13.3361,6,12.5076c0.0005-0.1946-0.0369-0.3873-0.11-0.5676H5.9z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/embassy_15.svg b/svgs/svgs_iconset/embassy.svg
similarity index 52%
rename from svgs/svgs_iconset/embassy_15.svg
rename to svgs/svgs_iconset/embassy.svg
index da56cae8..44a1bceb 100644
--- a/svgs/svgs_iconset/embassy_15.svg
+++ b/svgs/svgs_iconset/embassy.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>embassy_15.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#725a50" transform="translate(3 3)" d="M6.65,2C5.43,2,4.48,3.38,4.11,3.82C4.0365,3.9102,3.9975,4.0237,4,4.14v4.4C3.9884,8.7827,4.1758,8.9889,4.4185,9.0005
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>embassy.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#725a50" transform="translate(3 3)" d="M6.65,2C5.43,2,4.48,3.38,4.11,3.82C4.0365,3.9102,3.9975,4.0237,4,4.14v4.4C3.9884,8.7827,4.1758,8.9889,4.4185,9.0005
 	C4.528,9.0057,4.6355,8.9699,4.72,8.9c0.4665-0.6264,1.1589-1.0461,1.93-1.17C8.06,7.73,8.6,9,10.07,9
 	c0.9948-0.0976,1.9415-0.4756,2.73-1.09c0.1272-0.0934,0.2016-0.2422,0.2-0.4V2.45c0.0275-0.2414-0.1459-0.4595-0.3874-0.487
 	C12.5332,1.954,12.4527,1.9668,12.38,2c-0.6813,0.5212-1.4706,0.8834-2.31,1.06C8.6,3.08,8.12,2,6.65,2z M2.5,3
diff --git a/svgs/svgs_iconset/entrance_15.svg b/svgs/svgs_iconset/entrance.svg
similarity index 56%
rename from svgs/svgs_iconset/entrance_15.svg
rename to svgs/svgs_iconset/entrance.svg
index 51fc9400..400a9952 100644
--- a/svgs/svgs_iconset/entrance_15.svg
+++ b/svgs/svgs_iconset/entrance.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 19 19" height="19" width="19"><title>entrance_15.svg</title><rect fill="none" x="0" y="0" width="19" height="19"></rect><rect x="0" y="0" width="19" height="19" rx="0" ry="0" fill="#4898ff"></rect><path fill="#fff" transform="translate(2 2)" d="M7,6.5v-1c0-0.5523-0.4477-1-1-1s-1,0.4477-1,1v3L7,6.5z M4.65,10.56L5,3c0-0.5523,0.4477-1,1-1s1,0.4477,1,1S6.5523,4,6,4
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 19 19" height="19" width="19"><title>entrance.svg</title><rect fill="none" x="0" y="0" width="19" height="19"></rect><rect x="0" y="0" width="19" height="19" rx="0" ry="0" fill="#4898ff"></rect><path fill="#fff" transform="translate(2 2)" d="M7,6.5v-1c0-0.5523-0.4477-1-1-1s-1,0.4477-1,1v3L7,6.5z M4.65,10.56L5,3c0-0.5523,0.4477-1,1-1s1,0.4477,1,1S6.5523,4,6,4
 	S5,3.5523,5,3L4.65,10.56z"></path><path fill="#fff" transform="translate(2 2)" d="M14,6L14,6c0,0.5523-0.4477,1-1,1h-1.58c-0.2658-0.0015-0.5213,0.1028-0.71,0.29l-5.42,5.42
 	c-0.1863,0.1847-0.4377,0.2889-0.7,0.29H2c-0.5523,0-1-0.4477-1-1l0,0c0-0.5523,0.4477-1,1-1h1.59
 	c0.2623-0.0011,0.5137-0.1053,0.7-0.29l5.42-5.42C9.8987,5.1028,10.1542,4.9985,10.42,5H13C13.5523,5,14,5.4477,14,6z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/fast_food_15.svg b/svgs/svgs_iconset/fast_food.svg
similarity index 54%
rename from svgs/svgs_iconset/fast_food_15.svg
rename to svgs/svgs_iconset/fast_food.svg
index 1f793604..f2f09a0a 100644
--- a/svgs/svgs_iconset/fast_food_15.svg
+++ b/svgs/svgs_iconset/fast_food.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>fast_food_15.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#d97200" transform="translate(3 3)" d="M14,8c0,0.5523-0.4477,1-1,1H2C1.4477,9,1,8.5523,1,8s0.4477-1,1-1h11C13.5523,7,14,7.4477,14,8z M3.5,10H2
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>fast_food.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#d97200" transform="translate(3 3)" d="M14,8c0,0.5523-0.4477,1-1,1H2C1.4477,9,1,8.5523,1,8s0.4477-1,1-1h11C13.5523,7,14,7.4477,14,8z M3.5,10H2
 	c0,1.6569,1.3431,3,3,3h5c1.6569,0,3-1.3431,3-3H3.5z M3,6H2V4c0-1.1046,0.8954-2,2-2h7c1.1046,0,2,0.8954,2,2v2H3z M11,4.5
 	C11,4.7761,11.2239,5,11.5,5S12,4.7761,12,4.5S11.7761,4,11.5,4S11,4.2239,11,4.5z M9,3.5C9,3.7761,9.2239,4,9.5,4S10,3.7761,10,3.5
 	S9.7761,3,9.5,3S9,3.2239,9,3.5z M7,4.5C7,4.7761,7.2239,5,7.5,5S8,4.7761,8,4.5S7.7761,4,7.5,4S7,4.2239,7,4.5z M5,3.5
diff --git a/svgs/svgs_iconset/ferry_15.svg b/svgs/svgs_iconset/ferry.svg
similarity index 80%
rename from svgs/svgs_iconset/ferry_15.svg
rename to svgs/svgs_iconset/ferry.svg
index 363b9f67..5531431a 100644
--- a/svgs/svgs_iconset/ferry_15.svg
+++ b/svgs/svgs_iconset/ferry.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 19 19" height="19" width="19"><title>ferry_15.svg</title><rect fill="none" x="0" y="0" width="19" height="19"></rect><rect x="0" y="0" width="19" height="19" rx="0" ry="0" fill="#4898ff"></rect><path fill="#fff" transform="translate(2 2)" d="M5.33,11c0.6745,0.009,1.3262,0.245,1.85,0.67l0.26,0.23h0.05l0.31-0.28c0.9817-0.8115,2.379-0.8846,3.44-0.18L13.5,7L12,6
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 19 19" height="19" width="19"><title>ferry.svg</title><rect fill="none" x="0" y="0" width="19" height="19"></rect><rect x="0" y="0" width="19" height="19" rx="0" ry="0" fill="#4898ff"></rect><path fill="#fff" transform="translate(2 2)" d="M5.33,11c0.6745,0.009,1.3262,0.245,1.85,0.67l0.26,0.23h0.05l0.31-0.28c0.9817-0.8115,2.379-0.8846,3.44-0.18L13.5,7L12,6
 	V2.45c-0.0466-0.8-0.6989-1.4305-1.5-1.45H10c0.0343-0.518-0.3579-0.9657-0.8759-1C9.0828-0.0027,9.0413-0.0027,9,0H6
 	C5.482-0.0343,5.0343,0.3579,5,0.8759C4.9973,0.9172,4.9973,0.9587,5,1H4.5C3.6989,1.0195,3.0466,1.65,3,2.45V6L1.5,7l2.25,4.53
 	C4.2143,11.2041,4.7631,11.02,5.33,11z M4,2.45c0.0105-0.2594,0.2293-0.4611,0.4886-0.4506C4.4924,1.9996,4.4962,1.9998,4.5,2h6
diff --git a/svgs/svgs_iconset/fire_station.svg b/svgs/svgs_iconset/fire_station.svg
new file mode 100644
index 00000000..b09c0d8b
--- /dev/null
+++ b/svgs/svgs_iconset/fire_station.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>fire_station.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#ba3827" transform="translate(3 3)" d="M7.5,0.5L5,4.5l-1.5-2
+	C2.9452,3.4753,0.8036,5.7924,0.8036,8.3036C0.8036,12.002,3.8017,15,7.5,15s6.6964-2.998,6.6964-6.6964
+	c0-2.5112-2.1416-4.8283-2.6964-5.8036l-1.5,2L7.5,0.5z M7.5,7c0,0,2.5,2.5618,2.5,4.5c0,0.8371-0.8259,2-2.5,2S5,12.3371,5,11.5
+	C5,9.6283,7.5,7,7.5,7z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/fire_station_11.svg b/svgs/svgs_iconset/fire_station_11.svg
index cbc94963..6958afa2 100644
--- a/svgs/svgs_iconset/fire_station_11.svg
+++ b/svgs/svgs_iconset/fire_station_11.svg
@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 17 17" height="17" width="17"><title>fire-station_11.svg</title><rect fill="none" x="0" y="0" width="17" height="17"></rect><rect x="1" y="1" rx="7.5" ry="7.5" width="15" height="15" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="15" height="15" rx="7.5" ry="7.5" fill="#fff"></rect><path fill="#ba3827" transform="translate(3 3)" d="M5.5,0l-2,4L2,2
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 17 17" height="17" width="17"><title>fire_station_11.svg</title><rect fill="none" x="0" y="0" width="17" height="17"></rect><rect x="1" y="1" rx="7.5" ry="7.5" width="15" height="15" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="15" height="15" rx="7.5" ry="7.5" fill="#fff"></rect><path fill="#ba3827" transform="translate(3 3)" d="M5.5,0l-2,4L2,2
 	C1.595,2.7121,0,4.1667,0,6c0,2.7001,2.7999,5,5.5,5S11,8.7001,11,6c0-1.8333-1.595-3.2879-2-4L7.5,4L5.5,0z M5.5,5.5
 	c0,0,2,1.585,2,3c0,0.6111-0.7778,1.2778-2,1.2778s-2-0.6667-2-1.2778C3.5,7.1336,5.5,5.5,5.5,5.5z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/fire_station_15.svg b/svgs/svgs_iconset/fire_station_15.svg
deleted file mode 100644
index 676931dd..00000000
--- a/svgs/svgs_iconset/fire_station_15.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>fire-station_15.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#ba3827" transform="translate(3 3)" d="M7.5,0.5L5,4.5l-1.5-2
-	C2.9452,3.4753,0.8036,5.7924,0.8036,8.3036C0.8036,12.002,3.8017,15,7.5,15s6.6964-2.998,6.6964-6.6964
-	c0-2.5112-2.1416-4.8283-2.6964-5.8036l-1.5,2L7.5,0.5z M7.5,7c0,0,2.5,2.5618,2.5,4.5c0,0.8371-0.8259,2-2.5,2S5,12.3371,5,11.5
-	C5,9.6283,7.5,7,7.5,7z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/fuel_15.svg b/svgs/svgs_iconset/fuel.svg
similarity index 61%
rename from svgs/svgs_iconset/fuel_15.svg
rename to svgs/svgs_iconset/fuel.svg
index d9193e74..664ade7e 100644
--- a/svgs/svgs_iconset/fuel_15.svg
+++ b/svgs/svgs_iconset/fuel.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 19 19" height="19" width="19"><title>fuel_15.svg</title><rect fill="none" x="0" y="0" width="19" height="19"></rect><rect x="0" y="0" width="19" height="19" rx="0" ry="0" fill="#4898ff"></rect><path fill="#fff" transform="translate(2 2)" d="M13,6L13,6v5.5c0,0.2761-0.2239,0.5-0.5,0.5S12,11.7761,12,11.5v-2C12,8.6716,11.3284,8,10.5,8H9V2c0-0.5523-0.4477-1-1-1H2
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 19 19" height="19" width="19"><title>fuel.svg</title><rect fill="none" x="0" y="0" width="19" height="19"></rect><rect x="0" y="0" width="19" height="19" rx="0" ry="0" fill="#4898ff"></rect><path fill="#fff" transform="translate(2 2)" d="M13,6L13,6v5.5c0,0.2761-0.2239,0.5-0.5,0.5S12,11.7761,12,11.5v-2C12,8.6716,11.3284,8,10.5,8H9V2c0-0.5523-0.4477-1-1-1H2
 	C1.4477,1,1,1.4477,1,2v11c0,0.5523,0.4477,1,1,1h6c0.5523,0,1-0.4477,1-1V9h1.5C10.7761,9,11,9.2239,11,9.5v2
 	c0,0.8284,0.6716,1.5,1.5,1.5s1.5-0.6716,1.5-1.5V5c0-0.5523-0.4477-1-1-1l0,0V2.49C12.9946,2.2178,12.7723,1.9999,12.5,2
 	c-0.2816,0.0047-0.5062,0.2367-0.5015,0.5184C11.9987,2.5289,11.9992,2.5395,12,2.55V5C12,5.5523,12.4477,6,13,6s1-0.4477,1-1
diff --git a/svgs/svgs_iconset/garden.svg b/svgs/svgs_iconset/garden.svg
new file mode 100644
index 00000000..73e55607
--- /dev/null
+++ b/svgs/svgs_iconset/garden.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>garden.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#76a723" transform="translate(3 3)" d="M13,8c0,3.31-2.19,6-5.5,6S2,11.31,2,8c2.2643,0.0191,4.2694,1.4667,5,3.61V7H4.5C3.6716,7,3,6.3284,3,5.5v-3
+	C3,2.2239,3.2239,2,3.5,2c0.1574,0,0.3056,0.0741,0.4,0.2l1.53,2l1.65-3c0.1498-0.232,0.4593-0.2985,0.6913-0.1487
+	C7.8308,1.0898,7.8815,1.1404,7.92,1.2l1.65,3l1.53-2c0.1657-0.2209,0.4791-0.2657,0.7-0.1C11.9259,2.1944,12,2.3426,12,2.5v3
+	C12,6.3284,11.3284,7,10.5,7H8v4.61C8.7306,9.4667,10.7357,8.0191,13,8z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/garden_15.svg b/svgs/svgs_iconset/garden_15.svg
deleted file mode 100644
index 32699f19..00000000
--- a/svgs/svgs_iconset/garden_15.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>garden_15.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#76a723" transform="translate(3 3)" d="M13,8c0,3.31-2.19,6-5.5,6S2,11.31,2,8c2.2643,0.0191,4.2694,1.4667,5,3.61V7H4.5C3.6716,7,3,6.3284,3,5.5v-3
-	C3,2.2239,3.2239,2,3.5,2c0.1574,0,0.3056,0.0741,0.4,0.2l1.53,2l1.65-3c0.1498-0.232,0.4593-0.2985,0.6913-0.1487
-	C7.8308,1.0898,7.8815,1.1404,7.92,1.2l1.65,3l1.53-2c0.1657-0.2209,0.4791-0.2657,0.7-0.1C11.9259,2.1944,12,2.3426,12,2.5v3
-	C12,6.3284,11.3284,7,10.5,7H8v4.61C8.7306,9.4667,10.7357,8.0191,13,8z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/gift_15.svg b/svgs/svgs_iconset/gift.svg
similarity index 60%
rename from svgs/svgs_iconset/gift_15.svg
rename to svgs/svgs_iconset/gift.svg
index 2f617e92..590f1f01 100644
--- a/svgs/svgs_iconset/gift_15.svg
+++ b/svgs/svgs_iconset/gift.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>gift_15.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#5d60be" transform="translate(3 3)" d="M6.5,5v2H0V5H6.5z M8.5,5v2H15V5H8.5z M1,8v4.5C1,13.3284,1.6716,14,2.5,14h4V8H1z M8.5,8v6h4c0.8284,0,1.5-0.6716,1.5-1.5
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>gift.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#5d60be" transform="translate(3 3)" d="M6.5,5v2H0V5H6.5z M8.5,5v2H15V5H8.5z M1,8v4.5C1,13.3284,1.6716,14,2.5,14h4V8H1z M8.5,8v6h4c0.8284,0,1.5-0.6716,1.5-1.5
 	V8H8.5z M10.5,0c-1.4033-0.0444-2.6497,0.8904-3,2.25C7.1497,0.8904,5.9033-0.0444,4.5,0c-1.0709-0.0337-1.9663,0.8072-2,1.8781
 	C2.4987,1.9187,2.4987,1.9594,2.5,2C2.3443,2.9427,2.9822,3.8331,3.9249,3.9888C4.0853,4.0153,4.2486,4.0191,4.41,4h6.13
 	c0.9548,0.1497,1.8503-0.5029,2-1.4577c0.0282-0.1797,0.0282-0.3626,0-0.5423c0.0002-1.1046-0.895-2.0002-1.9996-2.0004
diff --git a/svgs/svgs_iconset/golf_15.svg b/svgs/svgs_iconset/golf.svg
similarity index 56%
rename from svgs/svgs_iconset/golf_15.svg
rename to svgs/svgs_iconset/golf.svg
index da11e0fb..c57ade3f 100644
--- a/svgs/svgs_iconset/golf_15.svg
+++ b/svgs/svgs_iconset/golf.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>golf_15.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#76a723" transform="translate(3 3)" d="
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>golf.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#76a723" transform="translate(3 3)" d="
 	M3.3999,1.1c0,0.1,0,0.2,0,0.2c0,0.4,0.3,0.7,0.7,0.7c0.3,0,0.5-0.2,0.6-0.5l0,0L4.9,1l5.6,2.3L6.6,6C6.2,6.3,6.2,6.7,6.3,7.1
 	l0.9,2.1l-1.3,3.9C5.7,13.6,6.1,14,6.5,14c0.3,0,0.5-0.1,0.6-0.5l1.4-4l0.1,0.3v3.5c0,0,0,0.7,0.7,0.7s0.7-0.7,0.7-0.7V10
 	c0-0.2,0-0.3-0.1-0.5L8.5,6.1l2.7-1.9c0.2-0.2,0.4-0.3,0.4-0.6s-0.2-0.5-0.4-0.6L4,0.1c-0.0878,0-0.118,0.0179-0.2001,0.1
diff --git a/svgs/svgs_iconset/grocery.svg b/svgs/svgs_iconset/grocery.svg
new file mode 100644
index 00000000..d7a5e810
--- /dev/null
+++ b/svgs/svgs_iconset/grocery.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>grocery.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#5d60be" transform="translate(3 3)" d="M 13.199219 1.5 C 13.199219 1.5 11.808806 1.4588 11.253906 2 C 10.720406 2.5202 10.5 2.9177 10.5 4 L 1.1992188 4 L 2.59375 8.8144531 C 2.59725 8.8217531 2.6036219 8.8287375 2.6074219 8.8359375 C 2.8418219 9.4932375 3.4545469 9.9666406 4.1855469 9.9941406 C 4.1885469 9.9954406 4.1992187 10 4.1992188 10 L 10.699219 10 L 10.699219 10.199219 C 10.699219 10.199219 10.7 10.500391 10.5 10.900391 C 10.3 11.300391 10.200391 11.5 9.4003906 11.5 L 2.9003906 11.5 C 1.9003906 11.5 1.9003906 13 2.9003906 13 L 4.0996094 13 L 4.1992188 13 L 9.0996094 13 L 9.1992188 13 L 9.3007812 13 C 10.500781 13 11.399219 12.299609 11.699219 11.599609 C 11.999219 10.899609 12 10.300781 12 10.300781 L 12 10 L 12 4 C 12 3.4764 12.228619 3 12.699219 3 L 13.25 3 C 13.6642 3 14 2.6642 14 2.25 C 14 1.8358 13.6642 1.5 13.25 1.5 L 13.199219 1.5 z M 9.1992188 13 C 8.5992188 13 8.1992188 13.4 8.1992188 14 C 8.1992188 14.6 8.5992187 15 9.1992188 15 C 9.7992187 15 10.199219 14.6 10.199219 14 C 10.199219 13.4 9.7992188 13 9.1992188 13 z M 4.1992188 13 C 3.5992188 13 3.1992188 13.4 3.1992188 14 C 3.1992188 14.6 3.5992187 15 4.1992188 15 C 4.7992188 15 5.1992188 14.6 5.1992188 14 C 5.1992188 13.4 4.7992187 13 4.1992188 13 z "></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/grocery_15.svg b/svgs/svgs_iconset/grocery_15.svg
deleted file mode 100644
index d2a62a04..00000000
--- a/svgs/svgs_iconset/grocery_15.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>grocery_15.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#5d60be" transform="translate(3 3)" d="M 13.199219 1.5 C 13.199219 1.5 11.808806 1.4588 11.253906 2 C 10.720406 2.5202 10.5 2.9177 10.5 4 L 1.1992188 4 L 2.59375 8.8144531 C 2.59725 8.8217531 2.6036219 8.8287375 2.6074219 8.8359375 C 2.8418219 9.4932375 3.4545469 9.9666406 4.1855469 9.9941406 C 4.1885469 9.9954406 4.1992187 10 4.1992188 10 L 10.699219 10 L 10.699219 10.199219 C 10.699219 10.199219 10.7 10.500391 10.5 10.900391 C 10.3 11.300391 10.200391 11.5 9.4003906 11.5 L 2.9003906 11.5 C 1.9003906 11.5 1.9003906 13 2.9003906 13 L 4.0996094 13 L 4.1992188 13 L 9.0996094 13 L 9.1992188 13 L 9.3007812 13 C 10.500781 13 11.399219 12.299609 11.699219 11.599609 C 11.999219 10.899609 12 10.300781 12 10.300781 L 12 10 L 12 4 C 12 3.4764 12.228619 3 12.699219 3 L 13.25 3 C 13.6642 3 14 2.6642 14 2.25 C 14 1.8358 13.6642 1.5 13.25 1.5 L 13.199219 1.5 z M 9.1992188 13 C 8.5992188 13 8.1992188 13.4 8.1992188 14 C 8.1992188 14.6 8.5992187 15 9.1992188 15 C 9.7992187 15 10.199219 14.6 10.199219 14 C 10.199219 13.4 9.7992188 13 9.1992188 13 z M 4.1992188 13 C 3.5992188 13 3.1992188 13.4 3.1992188 14 C 3.1992188 14.6 3.5992187 15 4.1992188 15 C 4.7992188 15 5.1992188 14.6 5.1992188 14 C 5.1992188 13.4 4.7992187 13 4.1992188 13 z "></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/hairdresser.svg b/svgs/svgs_iconset/hairdresser.svg
new file mode 100644
index 00000000..c2e767fe
--- /dev/null
+++ b/svgs/svgs_iconset/hairdresser.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>hairdresser.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#5d60be" transform="translate(3 3)" d="M15,3c0,0-2-0.6-3.5,0.5l-4.3,3C6.4,5.9,5.2,5.2,4,4.8V4c0-1.1-0.9-2-2-2C0.9,2,0,2.9,0,4v1.5
+	C0,6,0.5,6,0.5,6H2h0.5C4.5,6,6,7.5,6,7.5S4.5,9,2.5,9H2H0.5C0.5,9,0,9,0,9.5V11c0,1.1,0.9,2,2,2c1.1,0,2-0.9,2-2v-0.8
+	c1.2-0.4,2.4-1.1,3.2-1.7l4.3,3C13,12.6,15,12,15,12L8.5,7.5L15,3z M3,5H2H1V4c0-0.6,0.4-1,1-1c0.6,0,1,0.4,1,1V5z M3,11
+	c0,0.6-0.4,1-1,1c-0.6,0-1-0.4-1-1v-1h1h1V11z M7.25,8c-0.2761,0-0.5-0.2239-0.5-0.5S6.9739,7,7.25,7s0.5,0.2239,0.5,0.5
+	S7.5261,8,7.25,8z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/hairdresser_15.svg b/svgs/svgs_iconset/hairdresser_15.svg
deleted file mode 100644
index 9b925aa6..00000000
--- a/svgs/svgs_iconset/hairdresser_15.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>hairdresser_15.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#5d60be" transform="translate(3 3)" d="M15,3c0,0-2-0.6-3.5,0.5l-4.3,3C6.4,5.9,5.2,5.2,4,4.8V4c0-1.1-0.9-2-2-2C0.9,2,0,2.9,0,4v1.5
-	C0,6,0.5,6,0.5,6H2h0.5C4.5,6,6,7.5,6,7.5S4.5,9,2.5,9H2H0.5C0.5,9,0,9,0,9.5V11c0,1.1,0.9,2,2,2c1.1,0,2-0.9,2-2v-0.8
-	c1.2-0.4,2.4-1.1,3.2-1.7l4.3,3C13,12.6,15,12,15,12L8.5,7.5L15,3z M3,5H2H1V4c0-0.6,0.4-1,1-1c0.6,0,1,0.4,1,1V5z M3,11
-	c0,0.6-0.4,1-1,1c-0.6,0-1-0.4-1-1v-1h1h1V11z M7.25,8c-0.2761,0-0.5-0.2239-0.5-0.5S6.9739,7,7.25,7s0.5,0.2239,0.5,0.5
-	S7.5261,8,7.25,8z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/harbor_15.svg b/svgs/svgs_iconset/harbor.svg
similarity index 67%
rename from svgs/svgs_iconset/harbor_15.svg
rename to svgs/svgs_iconset/harbor.svg
index 61acf7f0..418c7329 100644
--- a/svgs/svgs_iconset/harbor_15.svg
+++ b/svgs/svgs_iconset/harbor.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 19 19" height="19" width="19"><title>harbor_15.svg</title><rect fill="none" x="0" y="0" width="19" height="19"></rect><rect x="0" y="0" width="19" height="19" rx="0" ry="0" fill="#4898ff"></rect><path fill="#fff" transform="translate(2 2)" d="M7.5,0C5.5,0,4,1.567,4,3.5c0.0024,1.5629,1.0397,2.902,2.5,3.3379v6.0391
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 19 19" height="19" width="19"><title>harbor.svg</title><rect fill="none" x="0" y="0" width="19" height="19"></rect><rect x="0" y="0" width="19" height="19" rx="0" ry="0" fill="#4898ff"></rect><path fill="#fff" transform="translate(2 2)" d="M7.5,0C5.5,0,4,1.567,4,3.5c0.0024,1.5629,1.0397,2.902,2.5,3.3379v6.0391
 	c-0.9305-0.1647-1.8755-0.5496-2.6484-1.2695C2.7992,10.6273,2.002,9.0676,2.002,6.498c0.0077-0.5646-0.4531-1.0236-1.0176-1.0137
 	C0.4329,5.493-0.0076,5.9465,0,6.498c0,3.0029,1.0119,5.1955,2.4902,6.5723C3.9685,14.4471,5.8379,15,7.5,15
 	c1.6656,0,3.535-0.5596,5.0117-1.9395S14.998,9.4868,14.998,6.498c0.0648-1.3953-2.0628-1.3953-1.998,0
diff --git a/svgs/svgs_iconset/heart.svg b/svgs/svgs_iconset/heart.svg
new file mode 100644
index 00000000..6f5bf8e0
--- /dev/null
+++ b/svgs/svgs_iconset/heart.svg
@@ -0,0 +1,2 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>heart.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#ba3827" transform="translate(3 3)" d="M13.91,6.75c-1.17,2.25-4.3,5.31-6.07,6.94c-0.1903,0.1718-0.4797,0.1718-0.67,0C5.39,12.06,2.26,9,1.09,6.75
+	C-1.48,1.8,5-1.5,7.5,3.45C10-1.5,16.48,1.8,13.91,6.75z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/heliport_15.svg b/svgs/svgs_iconset/heliport.svg
similarity index 64%
rename from svgs/svgs_iconset/heliport_15.svg
rename to svgs/svgs_iconset/heliport.svg
index 3659c07b..725d617c 100644
--- a/svgs/svgs_iconset/heliport_15.svg
+++ b/svgs/svgs_iconset/heliport.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 19 19" height="19" width="19"><title>heliport_15.svg</title><rect fill="none" x="0" y="0" width="19" height="19"></rect><rect x="0" y="0" width="19" height="19" rx="0" ry="0" fill="#4898ff"></rect><path fill="#fff" transform="translate(2 2)" d="M4,2C3,2,3,3,4,3h4v1C7.723,4,7.5,4.223,7.5,4.5V5H5H3.9707H3.9316
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 19 19" height="19" width="19"><title>heliport.svg</title><rect fill="none" x="0" y="0" width="19" height="19"></rect><rect x="0" y="0" width="19" height="19" rx="0" ry="0" fill="#4898ff"></rect><path fill="#fff" transform="translate(2 2)" d="M4,2C3,2,3,3,4,3h4v1C7.723,4,7.5,4.223,7.5,4.5V5H5H3.9707H3.9316
 	C3.7041,4.1201,2.9122,3.5011,2,3.5c-1.1046,0-2,0.8954-2,2s0.8954,2,2,2c0.3722-0.001,0.7368-0.1058,1.0527-0.3027L5.5,10.5
 	C6.5074,11.9505,8.3182,12,9,12h5c0,0,1,0,1-1v-0.9941C15,9.2734,14.874,8.874,14.5,8.5l-3-3c0,0-0.5916-0.5-1.2734-0.5H9.5V4.5
 	C9.5,4.223,9.277,4,9,4V3h4c1,0,1-1,0-1C13,2,4,2,4,2z M2,4.5c0.5523,0,1,0.4477,1,1s-0.4477,1-1,1s-1-0.4477-1-1
diff --git a/svgs/svgs_iconset/heart_15.svg b/svgs/svgs_iconset/hospital.svg
similarity index 60%
rename from svgs/svgs_iconset/heart_15.svg
rename to svgs/svgs_iconset/hospital.svg
index f84a47b3..024067c7 100644
--- a/svgs/svgs_iconset/heart_15.svg
+++ b/svgs/svgs_iconset/hospital.svg
@@ -1,2 +1,2 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>heart_15.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#ba3827" transform="translate(3 3)" d="M13.91,6.75c-1.17,2.25-4.3,5.31-6.07,6.94c-0.1903,0.1718-0.4797,0.1718-0.67,0C5.39,12.06,2.26,9,1.09,6.75
-	C-1.48,1.8,5-1.5,7.5,3.45C10-1.5,16.48,1.8,13.91,6.75z"></path></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>hospital.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#ba3827" transform="translate(3 3)" d="M7,1C6.4,1,6,1.4,6,2v4H2C1.4,6,1,6.4,1,7v1
+	c0,0.6,0.4,1,1,1h4v4c0,0.6,0.4,1,1,1h1c0.6,0,1-0.4,1-1V9h4c0.6,0,1-0.4,1-1V7c0-0.6-0.4-1-1-1H9V2c0-0.6-0.4-1-1-1H7z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/hospital_15.svg b/svgs/svgs_iconset/hospital_15.svg
deleted file mode 100644
index d93fbc1f..00000000
--- a/svgs/svgs_iconset/hospital_15.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>hospital_15.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#ba3827" transform="translate(3 3)" d="M7,1C6.4,1,6,1.4,6,2v4H2C1.4,6,1,6.4,1,7v1
-	c0,0.6,0.4,1,1,1h4v4c0,0.6,0.4,1,1,1h1c0.6,0,1-0.4,1-1V9h4c0.6,0,1-0.4,1-1V7c0-0.6-0.4-1-1-1H9V2c0-0.6-0.4-1-1-1H7z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/ice_cream_15.svg b/svgs/svgs_iconset/ice_cream.svg
similarity index 50%
rename from svgs/svgs_iconset/ice_cream_15.svg
rename to svgs/svgs_iconset/ice_cream.svg
index a242edc8..65b52bdc 100644
--- a/svgs/svgs_iconset/ice_cream_15.svg
+++ b/svgs/svgs_iconset/ice_cream.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>ice_cream_15.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#d97200" transform="translate(3 3)" d="M5.44,8.17c0.7156,0.0006,1.414-0.2194,2-0.63C7.9037,7.8634,8.4391,8.0693,9,8.14h0.44L8,13.7
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>ice_cream.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#d97200" transform="translate(3 3)" d="M5.44,8.17c0.7156,0.0006,1.414-0.2194,2-0.63C7.9037,7.8634,8.4391,8.0693,9,8.14h0.44L8,13.7
 	c-0.1082,0.2541-0.4019,0.3723-0.656,0.264C7.2252,13.9134,7.1306,13.8188,7.08,13.7L5.44,8.17z"></path><path fill="#d97200" transform="translate(3 3)" d="M11.44,4.67c0,1.1046-0.8954,2-2,2s-2-0.8954-2-2l0,0l0,0l0,0c0,1.1046-0.8954,2-2,2s-2-0.8954-2-2s0.8954-2,2-2h0.12
 	C5.1756,1.6345,5.7035,0.4834,6.739,0.099s2.1866,0.1435,2.571,1.179c0.1667,0.449,0.1667,0.9429,0,1.3919h0.13
 	C10.5446,2.67,11.44,3.5654,11.44,4.67z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/industry.svg b/svgs/svgs_iconset/industry.svg
new file mode 100644
index 00000000..7738d4d3
--- /dev/null
+++ b/svgs/svgs_iconset/industry.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 19 19" height="19" width="19"><title>industry.svg</title><rect fill="none" x="0" y="0" width="19" height="19"></rect><path fill="#725a50" transform="translate(2 2)" d="M14,1v12H1V8.72c0.0016-0.1419,0.0634-0.2764,0.17-0.37l3-3.22c0.2074-0.1823,0.5234-0.1618,0.7056,0.0456
+	C4.9568,5.268,5.0011,5.387,5,5.51v3l3.16-3.37c0.2025-0.1878,0.5188-0.1759,0.7066,0.0266C8.9532,5.2599,9.0009,5.3827,9,5.51V11h3
+	V1H14z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/industry_15.svg b/svgs/svgs_iconset/industry_15.svg
deleted file mode 100644
index bd628a78..00000000
--- a/svgs/svgs_iconset/industry_15.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 19 19" height="19" width="19"><title>industry_15.svg</title><rect fill="none" x="0" y="0" width="19" height="19"></rect><path fill="#725a50" transform="translate(2 2)" d="M14,1v12H1V8.72c0.0016-0.1419,0.0634-0.2764,0.17-0.37l3-3.22c0.2074-0.1823,0.5234-0.1618,0.7056,0.0456
-	C4.9568,5.268,5.0011,5.387,5,5.51v3l3.16-3.37c0.2025-0.1878,0.5188-0.1759,0.7066,0.0266C8.9532,5.2599,9.0009,5.3827,9,5.51V11h3
-	V1H14z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/campsite_15.svg b/svgs/svgs_iconset/information.svg
similarity index 62%
rename from svgs/svgs_iconset/campsite_15.svg
rename to svgs/svgs_iconset/information.svg
index 0e843a1e..9364ef71 100644
--- a/svgs/svgs_iconset/campsite_15.svg
+++ b/svgs/svgs_iconset/information.svg
@@ -1,2 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>campsite_15.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#725a50" transform="translate(3 3)" d="M7,1.5
-	l-5.5,9H1c-1,0-1,1-1,1v1c0,0,0,1,1,1h13c1,0,1-1,1-1v-1c0,0,0-1-1-1h-0.5L8,1.5C7.8,1.1,7.2,1.1,7,1.5z M7.5,5l3.2,5.5H4.2L7.5,5z"></path></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>information.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#725a50" transform="translate(3 3)" d="M7.5,1
+	C6.7,1,6,1.7,6,2.5S6.7,4,7.5,4S9,3.3,9,2.5S8.3,1,7.5,1z M4,5v1c0,0,2,0,2,2v2c0,2-2,2-2,2v1h7v-1c0,0-2,0-2-2V6c0-0.5-0.5-1-1-1H4
+	z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/laundry.svg b/svgs/svgs_iconset/laundry.svg
new file mode 100644
index 00000000..37430d18
--- /dev/null
+++ b/svgs/svgs_iconset/laundry.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>laundry.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#5d60be" transform="translate(3 3)" d="M8,1L6,3H3c0,0-1,0-1,1v9c0,1,1,1,1,1h9c0,0,1,0,1-1V2c0-1-1-1-1-1
+	S8,1,8,1z M8.5,2h2C10.777,2,11,2.223,11,2.5S10.777,3,10.5,3h-2C8.223,3,8,2.777,8,2.5S8.223,2,8.5,2z M7.5,6
+	c1.6569,0,3,1.3431,3,3s-1.3431,3-3,3s-3-1.3431-3-3S5.8431,6,7.5,6z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/laundry_15.svg b/svgs/svgs_iconset/laundry_15.svg
deleted file mode 100644
index 02fb9668..00000000
--- a/svgs/svgs_iconset/laundry_15.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>laundry_15.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#5d60be" transform="translate(3 3)" d="M8,1L6,3H3c0,0-1,0-1,1v9c0,1,1,1,1,1h9c0,0,1,0,1-1V2c0-1-1-1-1-1
-	S8,1,8,1z M8.5,2h2C10.777,2,11,2.223,11,2.5S10.777,3,10.5,3h-2C8.223,3,8,2.777,8,2.5S8.223,2,8.5,2z M7.5,6
-	c1.6569,0,3,1.3431,3,3s-1.3431,3-3,3s-3-1.3431-3-3S5.8431,6,7.5,6z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/library_15.svg b/svgs/svgs_iconset/library.svg
similarity index 66%
rename from svgs/svgs_iconset/library_15.svg
rename to svgs/svgs_iconset/library.svg
index 32bd0dc3..9adb1719 100644
--- a/svgs/svgs_iconset/library_15.svg
+++ b/svgs/svgs_iconset/library.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>library_15.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#725a50" transform="translate(3 3)" d="M7.47,4.92C7.47,4.92,5.7,3,1,3v8c4.7,0,6.47,2,6.47,2S9.3,11,14,11V3C9.3,3,7.47,4.92,7.47,4.92z M13,10
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>library.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#725a50" transform="translate(3 3)" d="M7.47,4.92C7.47,4.92,5.7,3,1,3v8c4.7,0,6.47,2,6.47,2S9.3,11,14,11V3C9.3,3,7.47,4.92,7.47,4.92z M13,10
 	c-1.9614,0.0492-3.8727,0.6299-5.53,1.68C5.836,10.6273,3.9432,10.0459,2,10V4c3.4,0.26,4.73,1.6,4.75,1.61l0.73,0.74L8.2,5.6
 	c0,0,1.4-1.34,4.8-1.6V10z M8,10.24l-0.1-0.17c1.3011-0.5931,2.6827-0.9907,4.1-1.18v0.2c-1.3839,0.1953-2.7316,0.5929-4,1.18V10.24
 	z M8,9.24L7.9,9.07C9.2016,8.4802,10.5832,8.086,12,7.9v0.2c-1.3844,0.1988-2.7321,0.5997-4,1.19V9.24z M8,8.24L7.9,8.07
diff --git a/svgs/svgs_iconset/lighthouse.svg b/svgs/svgs_iconset/lighthouse.svg
new file mode 100644
index 00000000..452ff7ae
--- /dev/null
+++ b/svgs/svgs_iconset/lighthouse.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>lighthouse.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#725a50" transform="translate(3 3)" d="M4.5,6L0,7V6.5l4.5-1V6z M4.5,3.5L0,2.5V3l4.5,1V3.5z M10.5,3.5V4L15,3V2.5L10.5,3.5z M10.5,6L15,7V6.5l-4.5-1V6z M8,7V2
+	h2.5c0.2761,0.0552,0.5448-0.1239,0.6-0.4c0.0552-0.2761-0.1239-0.5448-0.4-0.6l-3-1C7.5696-0.0586,7.4204-0.0586,7.29,0l-3,1
+	c-0.2761,0.0552-0.4552,0.3239-0.4,0.6S4.2139,2.0552,4.49,2H7v5H5l-2,7h9l-2-7H8z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/lighthouse_15.svg b/svgs/svgs_iconset/lighthouse_15.svg
deleted file mode 100644
index da75e63f..00000000
--- a/svgs/svgs_iconset/lighthouse_15.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>lighthouse_15.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#725a50" transform="translate(3 3)" d="M4.5,6L0,7V6.5l4.5-1V6z M4.5,3.5L0,2.5V3l4.5,1V3.5z M10.5,3.5V4L15,3V2.5L10.5,3.5z M10.5,6L15,7V6.5l-4.5-1V6z M8,7V2
-	h2.5c0.2761,0.0552,0.5448-0.1239,0.6-0.4c0.0552-0.2761-0.1239-0.5448-0.4-0.6l-3-1C7.5696-0.0586,7.4204-0.0586,7.29,0l-3,1
-	c-0.2761,0.0552-0.4552,0.3239-0.4,0.6S4.2139,2.0552,4.49,2H7v5H5l-2,7h9l-2-7H8z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/lodging.svg b/svgs/svgs_iconset/lodging.svg
new file mode 100644
index 00000000..7cf77211
--- /dev/null
+++ b/svgs/svgs_iconset/lodging.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>lodging.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#725a50" transform="translate(3 3)" d="M0.5,2.5C0.2,2.5,0,2.7,0,3v7.5v2C0,12.8,0.2,13,0.5,13S1,12.8,1,12.5V11h13v1.5
+	c0,0.3,0.2,0.5,0.5,0.5s0.5-0.2,0.5-0.5v-2c0-0.3-0.2-0.5-0.5-0.5H1V3C1,2.7,0.8,2.5,0.5,2.5z M3.5,3C2.7,3,2,3.7,2,4.5l0,0
+	C2,5.3,2.7,6,3.5,6l0,0C4.3,6,5,5.3,5,4.5l0,0C5,3.7,4.3,3,3.5,3L3.5,3z M7,4C5.5,4,5.5,5.5,5.5,5.5V7h-3C2.2,7,2,7.2,2,7.5v1
+	C2,8.8,2.2,9,2.5,9H6h9V6.5C15,4,12.5,4,12.5,4H7z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/lodging_15.svg b/svgs/svgs_iconset/lodging_15.svg
deleted file mode 100644
index 0077875c..00000000
--- a/svgs/svgs_iconset/lodging_15.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>lodging_15.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#725a50" transform="translate(3 3)" d="M0.5,2.5C0.2,2.5,0,2.7,0,3v7.5v2C0,12.8,0.2,13,0.5,13S1,12.8,1,12.5V11h13v1.5
-	c0,0.3,0.2,0.5,0.5,0.5s0.5-0.2,0.5-0.5v-2c0-0.3-0.2-0.5-0.5-0.5H1V3C1,2.7,0.8,2.5,0.5,2.5z M3.5,3C2.7,3,2,3.7,2,4.5l0,0
-	C2,5.3,2.7,6,3.5,6l0,0C4.3,6,5,5.3,5,4.5l0,0C5,3.7,4.3,3,3.5,3L3.5,3z M7,4C5.5,4,5.5,5.5,5.5,5.5V7h-3C2.2,7,2,7.2,2,7.5v1
-	C2,8.8,2.2,9,2.5,9H6h9V6.5C15,4,12.5,4,12.5,4H7z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/marker.svg b/svgs/svgs_iconset/marker.svg
new file mode 100644
index 00000000..44526e15
--- /dev/null
+++ b/svgs/svgs_iconset/marker.svg
@@ -0,0 +1,2 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 19 19" height="19" width="19"><title>marker.svg</title><rect fill="none" x="0" y="0" width="19" height="19"></rect><path fill="#725a50" transform="translate(2 2)" d="M7.5,0C5.0676,0,2.2297,1.4865,2.2297,5.2703
+	C2.2297,7.8378,6.2838,13.5135,7.5,15c1.0811-1.4865,5.2703-7.027,5.2703-9.7297C12.7703,1.4865,9.9324,0,7.5,0z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/marker_15.svg b/svgs/svgs_iconset/marker_15.svg
deleted file mode 100644
index 8f92d600..00000000
--- a/svgs/svgs_iconset/marker_15.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 19 19" height="19" width="19"><title>marker_15.svg</title><rect fill="none" x="0" y="0" width="19" height="19"></rect><path fill="#725a50" transform="translate(2 2)" d="M7.5,0C5.0676,0,2.2297,1.4865,2.2297,5.2703
-	C2.2297,7.8378,6.2838,13.5135,7.5,15c1.0811-1.4865,5.2703-7.027,5.2703-9.7297C12.7703,1.4865,9.9324,0,7.5,0z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/water_15.svg b/svgs/svgs_iconset/monument.svg
similarity index 65%
rename from svgs/svgs_iconset/water_15.svg
rename to svgs/svgs_iconset/monument.svg
index 58a4ad5f..c33199a4 100644
--- a/svgs/svgs_iconset/water_15.svg
+++ b/svgs/svgs_iconset/monument.svg
@@ -1 +1,2 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>water_15.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#725a50" transform="translate(3 3)" d="M7.49,15C4.5288,14.827,2.1676,12.4615,2,9.5C2,6.6,6.25,1.66,7.49,0c1.24,1.66,5,6.59,5,9.49S10.17,15,7.49,15z"></path></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>monument.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#725a50" transform="translate(3 3)" d="M7.5,0L6,2.5v7h3v-7L7.5,0z M3,11.5
+	L3,15h9v-3.5L10.5,10h-6L3,11.5z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/monument_15.svg b/svgs/svgs_iconset/monument_15.svg
deleted file mode 100644
index 80497538..00000000
--- a/svgs/svgs_iconset/monument_15.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>monument_15.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#725a50" transform="translate(3 3)" d="M7.5,0L6,2.5v7h3v-7L7.5,0z M3,11.5
-	L3,15h9v-3.5L10.5,10h-6L3,11.5z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/mountain.svg b/svgs/svgs_iconset/mountain.svg
new file mode 100644
index 00000000..47d9f1ff
--- /dev/null
+++ b/svgs/svgs_iconset/mountain.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>mountain.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#76a723" transform="translate(3 3)" d="M7.5,2C7.2,2,7.1,2.2,6.9,2.4
+	l-5.8,9.5C1,12,1,12.2,1,12.3C1,12.8,1.4,13,1.7,13h11.6c0.4,0,0.7-0.2,0.7-0.7c0-0.2,0-0.2-0.1-0.4L8.2,2.4C8,2.2,7.8,2,7.5,2z
+	 M7.5,3.5L10.8,9H10L8.5,7.5L7.5,9l-1-1.5L5,9H4.1L7.5,3.5z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/mountain_15.svg b/svgs/svgs_iconset/mountain_15.svg
deleted file mode 100644
index 5bbe25b1..00000000
--- a/svgs/svgs_iconset/mountain_15.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>mountain_15.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#76a723" transform="translate(3 3)" d="M7.5,2C7.2,2,7.1,2.2,6.9,2.4
-	l-5.8,9.5C1,12,1,12.2,1,12.3C1,12.8,1.4,13,1.7,13h11.6c0.4,0,0.7-0.2,0.7-0.7c0-0.2,0-0.2-0.1-0.4L8.2,2.4C8,2.2,7.8,2,7.5,2z
-	 M7.5,3.5L10.8,9H10L8.5,7.5L7.5,9l-1-1.5L5,9H4.1L7.5,3.5z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/museum_15.svg b/svgs/svgs_iconset/museum.svg
similarity index 56%
rename from svgs/svgs_iconset/museum_15.svg
rename to svgs/svgs_iconset/museum.svg
index 0339869d..d5b0193e 100644
--- a/svgs/svgs_iconset/museum_15.svg
+++ b/svgs/svgs_iconset/museum.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>museum_15.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#725a50" transform="translate(3 3)" d="M7.5,0L1,3.4453V4h13V3.4453L7.5,0z M2,5v5l-1,1.5547V13h13v-1.4453L13,10
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>museum.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#725a50" transform="translate(3 3)" d="M7.5,0L1,3.4453V4h13V3.4453L7.5,0z M2,5v5l-1,1.5547V13h13v-1.4453L13,10
 	V5H2z M4.6152,6c0.169-0.0023,0.3318,0.0639,0.4512,0.1836L7.5,8.6172l2.4336-2.4336c0.2445-0.2437,0.6402-0.2432,0.884,0.0013
 	C10.9341,6.3017,10.9997,6.46,11,6.625v4.2422c0.0049,0.3452-0.271,0.629-0.6162,0.6338c-0.3452,0.0049-0.629-0.271-0.6338-0.6162
 	c-0.0001-0.0059-0.0001-0.0118,0-0.0177V8.1328L7.9414,9.9414c-0.244,0.2433-0.6388,0.2433-0.8828,0L5.25,8.1328v2.7344
diff --git a/svgs/svgs_iconset/music.svg b/svgs/svgs_iconset/music.svg
new file mode 100644
index 00000000..43d21392
--- /dev/null
+++ b/svgs/svgs_iconset/music.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>music.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#5d60be" transform="translate(3 3)" d="M13.5,1c-0.0804,0.0008-0.1594,0.0214-0.23,0.06L4.5,3.5C4.2239,3.5,4,3.7239,4,4v6.28C3.6971,10.1002,3.3522,10.0037,3,10
+	c-1.1046,0-2,0.8954-2,2s0.8954,2,2,2s2-0.8954,2-2V7.36l8-2.22v3.64c-0.3029-0.1798-0.6478-0.2763-1-0.28c-1.1046,0-2,0.8954-2,2
+	s0.8954,2,2,2s2-0.8954,2-2v-9C14,1.2239,13.7761,1,13.5,1z M13,4.14L5,6.36v-2l8-2.22C13,2.14,13,4.14,13,4.14z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/music_15.svg b/svgs/svgs_iconset/music_15.svg
deleted file mode 100644
index a71db896..00000000
--- a/svgs/svgs_iconset/music_15.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>music_15.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#5d60be" transform="translate(3 3)" d="M13.5,1c-0.0804,0.0008-0.1594,0.0214-0.23,0.06L4.5,3.5C4.2239,3.5,4,3.7239,4,4v6.28C3.6971,10.1002,3.3522,10.0037,3,10
-	c-1.1046,0-2,0.8954-2,2s0.8954,2,2,2s2-0.8954,2-2V7.36l8-2.22v3.64c-0.3029-0.1798-0.6478-0.2763-1-0.28c-1.1046,0-2,0.8954-2,2
-	s0.8954,2,2,2s2-0.8954,2-2v-9C14,1.2239,13.7761,1,13.5,1z M13,4.14L5,6.36v-2l8-2.22C13,2.14,13,4.14,13,4.14z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/park_15.svg b/svgs/svgs_iconset/park.svg
similarity index 68%
rename from svgs/svgs_iconset/park_15.svg
rename to svgs/svgs_iconset/park.svg
index fc1bfc37..f447b412 100644
--- a/svgs/svgs_iconset/park_15.svg
+++ b/svgs/svgs_iconset/park.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>park_15.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#76a723" transform="translate(3 3)" d="M14,5.75c0.0113-0.6863-0.3798-1.3159-1-1.61C12.9475,3.4906,12.4014,2.9926,11.75,3
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>park.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#76a723" transform="translate(3 3)" d="M14,5.75c0.0113-0.6863-0.3798-1.3159-1-1.61C12.9475,3.4906,12.4014,2.9926,11.75,3
 	c-0.0988,0.0079-0.1962,0.0281-0.29,0.06c-0.0607-0.66-0.6449-1.1458-1.3048-1.0851C9.8965,1.9987,9.6526,2.1058,9.46,2.28l0,0
 	c0-0.6904-0.5596-1.25-1.25-1.25S6.96,1.5896,6.96,2.28C6.96,2.28,7,2.3,7,2.33C6.4886,1.8913,5.7184,1.9503,5.2797,2.4618
 	C5.1316,2.6345,5.0347,2.8451,5,3.07C4.8417,3.0195,4.6761,2.9959,4.51,3C3.6816,2.9931,3.0044,3.659,2.9975,4.4874
diff --git a/svgs/svgs_iconset/parking_15.svg b/svgs/svgs_iconset/parking.svg
similarity index 50%
rename from svgs/svgs_iconset/parking_15.svg
rename to svgs/svgs_iconset/parking.svg
index 740c4c28..fb2499c1 100644
--- a/svgs/svgs_iconset/parking_15.svg
+++ b/svgs/svgs_iconset/parking.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 19 19" height="19" width="19"><title>parking_15.svg</title><rect fill="none" x="0" y="0" width="19" height="19"></rect><rect x="0" y="0" width="19" height="19" rx="0" ry="0" fill="#4898ff"></rect><path fill="#fff" transform="translate(2 2)" d="M11.85,8.37c-0.9532,0.7086-2.1239,1.0623-3.31,1H5.79V14H3V1h5.72c1.1305-0.0605,2.244,0.2952,3.13,1
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 19 19" height="19" width="19"><title>parking.svg</title><rect fill="none" x="0" y="0" width="19" height="19"></rect><rect x="0" y="0" width="19" height="19" rx="0" ry="0" fill="#4898ff"></rect><path fill="#fff" transform="translate(2 2)" d="M11.85,8.37c-0.9532,0.7086-2.1239,1.0623-3.31,1H5.79V14H3V1h5.72c1.1305-0.0605,2.244,0.2952,3.13,1
 	c0.8321,0.8147,1.2543,1.9601,1.15,3.12C13.1271,6.3214,12.7045,7.5159,11.85,8.37z M9.75,3.7C9.3254,3.3892,8.8052,3.237,8.28,3.27
 	H5.79v3.82h2.49c0.5315,0.0326,1.056-0.1351,1.47-0.47c0.3795-0.3947,0.5693-0.9346,0.52-1.48C10.324,4.606,10.1327,4.0763,9.75,3.7
 	z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/parking_garage_15.svg b/svgs/svgs_iconset/parking_garage.svg
similarity index 64%
rename from svgs/svgs_iconset/parking_garage_15.svg
rename to svgs/svgs_iconset/parking_garage.svg
index ce870377..655de446 100644
--- a/svgs/svgs_iconset/parking_garage_15.svg
+++ b/svgs/svgs_iconset/parking_garage.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 19 19" height="19" width="19"><title>parking_garage_15.svg</title><rect fill="none" x="0" y="0" width="19" height="19"></rect><rect x="0" y="0" width="19" height="19" rx="0" ry="0" fill="#4898ff"></rect><path fill="#fff" transform="translate(2 2)" d="M10.5,10.14c-0.6637,0.4788-1.4732,0.7121-2.29,0.66h-1.9V14h-1.9V5h3.92
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 19 19" height="19" width="19"><title>parking_garage.svg</title><rect fill="none" x="0" y="0" width="19" height="19"></rect><rect x="0" y="0" width="19" height="19" rx="0" ry="0" fill="#4898ff"></rect><path fill="#fff" transform="translate(2 2)" d="M10.5,10.14c-0.6637,0.4788-1.4732,0.7121-2.29,0.66h-1.9V14h-1.9V5h3.92
 	c0.7801-0.0414,1.5484,0.2041,2.16,0.69c0.5779,0.5595,0.875,1.3483,0.81,2.15C11.4042,8.6892,11.1088,9.5388,10.5,10.14z M9,6.9
 	C8.711,6.6881,8.3579,6.5822,8,6.6H6.31v2.65H8c0.3612,0.0191,0.717-0.0947,1-0.32c0.2559-0.2675,0.3867-0.6308,0.36-1
 	C9.4072,7.5493,9.274,7.1684,9,6.9z M14.41,4.21c0.114-0.2486,0.007-0.5427-0.24-0.66L7.5,0.45l-6.71,3.1
diff --git a/svgs/svgs_iconset/pharmacy.svg b/svgs/svgs_iconset/pharmacy.svg
new file mode 100644
index 00000000..3c550e11
--- /dev/null
+++ b/svgs/svgs_iconset/pharmacy.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>pharmacy.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#5d60be" transform="translate(3 3)" d="M9.5,4l1.07-1.54c0.0599,0.0046,0.1201,0.0046,0.18,0c0.6904-0.0004,1.2497-0.5603,1.2494-1.2506
+	C11.999,0.519,11.4391-0.0404,10.7487-0.04C10.0584-0.0396,9.499,0.5203,9.4994,1.2106c0,0.0131,0.0002,0.0262,0.0006,0.0394
+	c0,0,0,0.07,0,0.1L7,4H9.5z M12,6V5H3v1l1.5,3.5L3,13v1h9v-1l-1-3.5L12,6z M10,10H8v2H7v-2H5V9h2V7h1v2h2V10z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/pharmacy_15.svg b/svgs/svgs_iconset/pharmacy_15.svg
deleted file mode 100644
index 10a2d544..00000000
--- a/svgs/svgs_iconset/pharmacy_15.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>pharmacy_15.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#5d60be" transform="translate(3 3)" d="M9.5,4l1.07-1.54c0.0599,0.0046,0.1201,0.0046,0.18,0c0.6904-0.0004,1.2497-0.5603,1.2494-1.2506
-	C11.999,0.519,11.4391-0.0404,10.7487-0.04C10.0584-0.0396,9.499,0.5203,9.4994,1.2106c0,0.0131,0.0002,0.0262,0.0006,0.0394
-	c0,0,0,0.07,0,0.1L7,4H9.5z M12,6V5H3v1l1.5,3.5L3,13v1h9v-1l-1-3.5L12,6z M10,10H8v2H7v-2H5V9h2V7h1v2h2V10z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/picnic_site_15.svg b/svgs/svgs_iconset/picnic_site.svg
similarity index 53%
rename from svgs/svgs_iconset/picnic_site_15.svg
rename to svgs/svgs_iconset/picnic_site.svg
index 3df0eb2c..49139ea7 100644
--- a/svgs/svgs_iconset/picnic_site_15.svg
+++ b/svgs/svgs_iconset/picnic_site.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>picnic_site_15.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#76a723" transform="translate(3 3)" d="M4,3C3.446,3,3,3.446,3,4s0.446,1,1,1h1.2969
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>picnic_site.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#76a723" transform="translate(3 3)" d="M4,3C3.446,3,3,3.446,3,4s0.446,1,1,1h1.2969
 	L4.6523,7H2.5c-0.554,0-1,0.446-1,1s0.446,1,1,1h1.5098L3.041,12.0098c-0.1284,0.3939,0.0868,0.8173,0.4807,0.9457
 	s0.8173-0.0868,0.9457-0.4807c0.0005-0.0013,0.0009-0.0027,0.0013-0.004L5.5859,9h3.8281l1.1172,3.4707
 	c0.1273,0.3943,0.5501,0.6107,0.9443,0.4834s0.6107-0.5501,0.4834-0.9443l0,0L10.9902,9H12.5c0.554,0,1-0.446,1-1s-0.446-1-1-1
diff --git a/svgs/svgs_iconset/pitch.svg b/svgs/svgs_iconset/pitch.svg
new file mode 100644
index 00000000..fec299d6
--- /dev/null
+++ b/svgs/svgs_iconset/pitch.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>pitch.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#76a723" transform="translate(3 3)" d="M5,3C4.4477,3,4,2.5523,4,2s0.4477-1,1-1s1,0.4477,1,1S5.5523,3,5,3z M12.5,10H10L9,7L8,5.25L9,5l2.3,1l0,0
+	c0.2761,0.1105,0.5895-0.0239,0.7-0.3S11.9761,5.1105,11.7,5l0,0L9,4H7L5,5L4,6H2.5C2.2239,6,2,6.2239,2,6.5S2.2239,7,2.5,7H5l1-1
+	l1,2l-2,2v3.5C5,13.7761,5.2239,14,5.5,14S6,13.7761,6,13.5v-3.11L8,9l1,2h3.5c0.2761,0,0.5-0.2239,0.5-0.5S12.7761,10,12.5,10z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/pitch_15.svg b/svgs/svgs_iconset/pitch_15.svg
deleted file mode 100644
index 62305e68..00000000
--- a/svgs/svgs_iconset/pitch_15.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>pitch_15.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#76a723" transform="translate(3 3)" d="M5,3C4.4477,3,4,2.5523,4,2s0.4477-1,1-1s1,0.4477,1,1S5.5523,3,5,3z M12.5,10H10L9,7L8,5.25L9,5l2.3,1l0,0
-	c0.2761,0.1105,0.5895-0.0239,0.7-0.3S11.9761,5.1105,11.7,5l0,0L9,4H7L5,5L4,6H2.5C2.2239,6,2,6.2239,2,6.5S2.2239,7,2.5,7H5l1-1
-	l1,2l-2,2v3.5C5,13.7761,5.2239,14,5.5,14S6,13.7761,6,13.5v-3.11L8,9l1,2h3.5c0.2761,0,0.5-0.2239,0.5-0.5S12.7761,10,12.5,10z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/place_of_worship.svg b/svgs/svgs_iconset/place_of_worship.svg
new file mode 100644
index 00000000..c0bc1841
--- /dev/null
+++ b/svgs/svgs_iconset/place_of_worship.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>place_of_worship.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#725a50" transform="translate(3 3)" d="M7.5,0l-2,2v2h4V2
+	L7.5,0z M5.5,4.5L4,6h7L9.5,4.5H5.5z M2,6.5c-0.5523,0-1,0.4477-1,1V13h2V7.5C3,6.9477,2.5523,6.5,2,6.5z M4,6.5V13h7V6.5H4z
+	 M13,6.5c-0.5523,0-1,0.4477-1,1V13h2V7.5C14,6.9477,13.5523,6.5,13,6.5z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/place_of_worship_15.svg b/svgs/svgs_iconset/place_of_worship_15.svg
deleted file mode 100644
index b8739985..00000000
--- a/svgs/svgs_iconset/place_of_worship_15.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>place_of_worship_15.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#725a50" transform="translate(3 3)" d="M7.5,0l-2,2v2h4V2
-	L7.5,0z M5.5,4.5L4,6h7L9.5,4.5H5.5z M2,6.5c-0.5523,0-1,0.4477-1,1V13h2V7.5C3,6.9477,2.5523,6.5,2,6.5z M4,6.5V13h7V6.5H4z
-	 M13,6.5c-0.5523,0-1,0.4477-1,1V13h2V7.5C14,6.9477,13.5523,6.5,13,6.5z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/playground_15.svg b/svgs/svgs_iconset/playground.svg
similarity index 66%
rename from svgs/svgs_iconset/playground_15.svg
rename to svgs/svgs_iconset/playground.svg
index f802b683..ce328245 100644
--- a/svgs/svgs_iconset/playground_15.svg
+++ b/svgs/svgs_iconset/playground.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>playground_15.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#5d60be" transform="translate(3 3)" d="M2,1.15c0.2091-0.8016,1.0284-1.2819,1.83-1.0729s1.2819,1.0284,1.0729,1.83C4.7026,2.6752,3.9386,3.1542,3.16,3
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>playground.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#5d60be" transform="translate(3 3)" d="M2,1.15c0.2091-0.8016,1.0284-1.2819,1.83-1.0729s1.2819,1.0284,1.0729,1.83C4.7026,2.6752,3.9386,3.1542,3.16,3
 	C2.3474,2.839,1.8191,2.0498,1.98,1.2371C1.9858,1.2079,1.9925,1.1788,2,1.15z M13,12.32c0.1032,0.5426-0.2531,1.066-0.7956,1.1692
 	c-0.0015,0.0003-0.0029,0.0006-0.0044,0.0008c-0.4252,0.086-0.8574-0.1119-1.07-0.49l0,0L9.45,9.63L8,9.92L7.78,10H7.72v2.15
 	L8.34,12h0.14c0.2871,0.0054,0.5155,0.2425,0.5101,0.5297C8.9862,12.7361,8.8606,12.9207,8.67,13l-5,1l0,0
diff --git a/svgs/svgs_iconset/police.svg b/svgs/svgs_iconset/police.svg
new file mode 100644
index 00000000..d2ff3670
--- /dev/null
+++ b/svgs/svgs_iconset/police.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>police.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#725a50" transform="translate(3 3)" d="M5.5,1L6,2h5l0.5-1H5.5z M6,2.5v1.25c0,0,0,2.75,2.5,2.75S11,3.75,11,3.75V2.5H6z M1.9844,3.9863
+	C1.4329,3.9949,0.9924,4.4485,1,5v4c-0.0001,0.6398,0.5922,1.1152,1.2168,0.9766L5,9.3574V14l5.8789-6.9297
+	C10.7391,7.0294,10.5947,7,10.4414,7H6.5L3,7.7539V5C3.0077,4.4362,2.5481,3.9775,1.9844,3.9863z M11.748,7.7109L6.4121,14H12
+	V8.5586C12,8.2451,11.9061,7.9548,11.748,7.7109z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/police_15.svg b/svgs/svgs_iconset/police_15.svg
deleted file mode 100644
index 59b68689..00000000
--- a/svgs/svgs_iconset/police_15.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>police_15.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#725a50" transform="translate(3 3)" d="M5.5,1L6,2h5l0.5-1H5.5z M6,2.5v1.25c0,0,0,2.75,2.5,2.75S11,3.75,11,3.75V2.5H6z M1.9844,3.9863
-	C1.4329,3.9949,0.9924,4.4485,1,5v4c-0.0001,0.6398,0.5922,1.1152,1.2168,0.9766L5,9.3574V14l5.8789-6.9297
-	C10.7391,7.0294,10.5947,7,10.4414,7H6.5L3,7.7539V5C3.0077,4.4362,2.5481,3.9775,1.9844,3.9863z M11.748,7.7109L6.4121,14H12
-	V8.5586C12,8.2451,11.9061,7.9548,11.748,7.7109z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/post.svg b/svgs/svgs_iconset/post.svg
new file mode 100644
index 00000000..2a397d7e
--- /dev/null
+++ b/svgs/svgs_iconset/post.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>post.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#725a50" transform="translate(3 3)" d="M14,6.5V12c0,0.5523-0.4477,1-1,1H2c-0.5523,0-1-0.4477-1-1V6.5C1,6.2239,1.2239,6,1.5,6
+	c0.0692-0.0152,0.1408-0.0152,0.21,0l0,0l5.79,4l5.8-4l0,0c0.066-0.0138,0.134-0.0138,0.2,0C13.7761,6,14,6.2239,14,6.5z M1.25,3.92
+	L1.25,3.92L1.33,4L7.5,8l6.19-4l0,0h0.06l0,0c0.1796-0.0981,0.2792-0.2975,0.25-0.5C14,3.2239,13.7761,3,13.5,3h-12
+	C1.2239,3,1,3.2239,1,3.5C1.0026,3.6745,1.0978,3.8345,1.25,3.92z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/post_15.svg b/svgs/svgs_iconset/post_15.svg
deleted file mode 100644
index 7c813f0b..00000000
--- a/svgs/svgs_iconset/post_15.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>post_15.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#725a50" transform="translate(3 3)" d="M14,6.5V12c0,0.5523-0.4477,1-1,1H2c-0.5523,0-1-0.4477-1-1V6.5C1,6.2239,1.2239,6,1.5,6
-	c0.0692-0.0152,0.1408-0.0152,0.21,0l0,0l5.79,4l5.8-4l0,0c0.066-0.0138,0.134-0.0138,0.2,0C13.7761,6,14,6.2239,14,6.5z M1.25,3.92
-	L1.25,3.92L1.33,4L7.5,8l6.19-4l0,0h0.06l0,0c0.1796-0.0981,0.2792-0.2975,0.25-0.5C14,3.2239,13.7761,3,13.5,3h-12
-	C1.2239,3,1,3.2239,1,3.5C1.0026,3.6745,1.0978,3.8345,1.25,3.92z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/prison.svg b/svgs/svgs_iconset/prison.svg
new file mode 100644
index 00000000..6b79bc17
--- /dev/null
+++ b/svgs/svgs_iconset/prison.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>prison.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#725a50" transform="translate(3 3)" d="M3.5,1v13H12V1H3.5z M9.5,2H11v3.5H9.5V2z M4.5,2.0547H6V7H4.5V2.0547z M7,2.0547h1.5V7H7V2.0547z M10.25,6.5
+	C10.6642,6.5,11,6.8358,11,7.25S10.6642,8,10.25,8l0,0C9.8358,8,9.5,7.6642,9.5,7.25l0,0C9.5,6.8358,9.8358,6.5,10.25,6.5z M7,8
+	h1.4727L8.5,13H7.0273L7,8z M4.5,8.166H6V13H4.5V8.166z M9.5,9H11v4H9.5V9z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/prison_15.svg b/svgs/svgs_iconset/prison_15.svg
deleted file mode 100644
index 7e0ebb37..00000000
--- a/svgs/svgs_iconset/prison_15.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>prison_15.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#725a50" transform="translate(3 3)" d="M3.5,1v13H12V1H3.5z M9.5,2H11v3.5H9.5V2z M4.5,2.0547H6V7H4.5V2.0547z M7,2.0547h1.5V7H7V2.0547z M10.25,6.5
-	C10.6642,6.5,11,6.8358,11,7.25S10.6642,8,10.25,8l0,0C9.8358,8,9.5,7.6642,9.5,7.25l0,0C9.5,6.8358,9.8358,6.5,10.25,6.5z M7,8
-	h1.4727L8.5,13H7.0273L7,8z M4.5,8.166H6V13H4.5V8.166z M9.5,9H11v4H9.5V9z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/railway.svg b/svgs/svgs_iconset/railway.svg
new file mode 100644
index 00000000..cd497dcf
--- /dev/null
+++ b/svgs/svgs_iconset/railway.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 19 19" height="19" width="19"><title>railway.svg</title><rect fill="none" x="0" y="0" width="19" height="19"></rect><rect x="0" y="0" width="19" height="19" rx="0" ry="0" fill="#4898ff"></rect><path fill="#fff" transform="translate(2 2)" d="M 3 1 C 2.4477 1 2 1.4477 2 2 L 2 10 C 2 10.5523 2.4477 11 3 11 L 12 11 C 12.5523 11 13 10.5523 13 10 L 13 2 C 13 1.4477 12.5523 1 12 1 L 3 1 z M 5.75 1.5 L 5.7597656 1.5 L 9.2597656 1.5 C 9.3978656 1.5 9.5097656 1.6119 9.5097656 1.75 C 9.5097656 1.8881 9.3978656 2 9.2597656 2 L 5.75 2 C 5.6119 2 5.5 1.8881 5.5 1.75 C 5.5 1.6119 5.6119 1.5 5.75 1.5 z M 3.5 3 L 7 3 L 7 7 L 3.5 7 C 3.2239 7 3 6.7761 3 6.5 L 3 3.5 C 3 3.2239 3.2239 3 3.5 3 z M 8 3 L 11.5 3 C 11.7761 3 12 3.2239 12 3.5 L 12 6.5 C 12 6.7761 11.7761 7 11.5 7 L 8 7 L 8 3 z M 5 8 C 5.5523 8 6 8.4477 6 9 C 6 9.5523 5.5523 10 5 10 C 4.4477 10 4 9.5523 4 9 C 4 8.4477 4.4477 8 5 8 z M 10 8 C 10.5523 8 11 8.4477 11 9 C 11 9.5523 10.5523 10 10 10 C 9.4477 10 9 9.5523 9 9 C 9 8.4477 9.4477 8 10 8 z M 10.445312 11.994141 C 10.380597 11.999652 10.314981 12.018581 10.253906 12.050781 C 10.030606 12.168381 9.9302313 12.433922 10.019531 12.669922 L 10.189453 13 L 4.8105469 13 L 4.9394531 12.730469 C 5.0371531 12.472169 4.9067375 12.183637 4.6484375 12.085938 C 4.4124375 11.996738 4.1468969 12.097113 4.0292969 12.320312 L 3.0292969 14.320312 C 3.0080969 14.377912 2.9986 14.4387 3 14.5 C 3 14.7761 3.2239 15 3.5 15 C 3.6802 14.999 3.8450875 14.899434 3.9296875 14.740234 L 3.9296875 14.689453 L 4 14.689453 L 4.3105469 14 L 10.689453 14 L 11 14.689453 L 11 14.740234 C 11.0846 14.899434 11.249488 14.999 11.429688 15 C 11.705787 15 11.929688 14.7761 11.929688 14.5 C 11.949587 14.4212 11.949587 14.338566 11.929688 14.259766 L 10.929688 12.259766 C 10.833163 12.076541 10.639459 11.977608 10.445312 11.994141 z "></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/railway_15.svg b/svgs/svgs_iconset/railway_15.svg
deleted file mode 100644
index a2a8f566..00000000
--- a/svgs/svgs_iconset/railway_15.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 19 19" height="19" width="19"><title>railway_15.svg</title><rect fill="none" x="0" y="0" width="19" height="19"></rect><rect x="0" y="0" width="19" height="19" rx="0" ry="0" fill="#4898ff"></rect><path fill="#fff" transform="translate(2 2)" d="M 3 1 C 2.4477 1 2 1.4477 2 2 L 2 10 C 2 10.5523 2.4477 11 3 11 L 12 11 C 12.5523 11 13 10.5523 13 10 L 13 2 C 13 1.4477 12.5523 1 12 1 L 3 1 z M 5.75 1.5 L 5.7597656 1.5 L 9.2597656 1.5 C 9.3978656 1.5 9.5097656 1.6119 9.5097656 1.75 C 9.5097656 1.8881 9.3978656 2 9.2597656 2 L 5.75 2 C 5.6119 2 5.5 1.8881 5.5 1.75 C 5.5 1.6119 5.6119 1.5 5.75 1.5 z M 3.5 3 L 7 3 L 7 7 L 3.5 7 C 3.2239 7 3 6.7761 3 6.5 L 3 3.5 C 3 3.2239 3.2239 3 3.5 3 z M 8 3 L 11.5 3 C 11.7761 3 12 3.2239 12 3.5 L 12 6.5 C 12 6.7761 11.7761 7 11.5 7 L 8 7 L 8 3 z M 5 8 C 5.5523 8 6 8.4477 6 9 C 6 9.5523 5.5523 10 5 10 C 4.4477 10 4 9.5523 4 9 C 4 8.4477 4.4477 8 5 8 z M 10 8 C 10.5523 8 11 8.4477 11 9 C 11 9.5523 10.5523 10 10 10 C 9.4477 10 9 9.5523 9 9 C 9 8.4477 9.4477 8 10 8 z M 10.445312 11.994141 C 10.380597 11.999652 10.314981 12.018581 10.253906 12.050781 C 10.030606 12.168381 9.9302313 12.433922 10.019531 12.669922 L 10.189453 13 L 4.8105469 13 L 4.9394531 12.730469 C 5.0371531 12.472169 4.9067375 12.183637 4.6484375 12.085938 C 4.4124375 11.996738 4.1468969 12.097113 4.0292969 12.320312 L 3.0292969 14.320312 C 3.0080969 14.377912 2.9986 14.4387 3 14.5 C 3 14.7761 3.2239 15 3.5 15 C 3.6802 14.999 3.8450875 14.899434 3.9296875 14.740234 L 3.9296875 14.689453 L 4 14.689453 L 4.3105469 14 L 10.689453 14 L 11 14.689453 L 11 14.740234 C 11.0846 14.899434 11.249488 14.999 11.429688 15 C 11.705787 15 11.929688 14.7761 11.929688 14.5 C 11.949587 14.4212 11.949587 14.338566 11.929688 14.259766 L 10.929688 12.259766 C 10.833163 12.076541 10.639459 11.977608 10.445312 11.994141 z "></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/railway_light_15.svg b/svgs/svgs_iconset/railway_light.svg
similarity index 56%
rename from svgs/svgs_iconset/railway_light_15.svg
rename to svgs/svgs_iconset/railway_light.svg
index ae837efc..9a14bb86 100644
--- a/svgs/svgs_iconset/railway_light_15.svg
+++ b/svgs/svgs_iconset/railway_light.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 19 19" height="19" width="19"><title>railway_light_15.svg</title><rect fill="none" x="0" y="0" width="19" height="19"></rect><rect x="0" y="0" width="19" height="19" rx="0" ry="0" fill="#4898ff"></rect><path fill="#fff" transform="translate(2 2)" d="M5.5,0C5,0,5,0.5,5,0.5v1C5,1.777,5.223,2,5.5,2S6,1.777,6,1.5V1h1v2H6c0,0-2,0-2,2v3c0,3,3,3,3,3h1
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 19 19" height="19" width="19"><title>railway_light.svg</title><rect fill="none" x="0" y="0" width="19" height="19"></rect><rect x="0" y="0" width="19" height="19" rx="0" ry="0" fill="#4898ff"></rect><path fill="#fff" transform="translate(2 2)" d="M5.5,0C5,0,5,0.5,5,0.5v1C5,1.777,5.223,2,5.5,2S6,1.777,6,1.5V1h1v2H6c0,0-2,0-2,2v3c0,3,3,3,3,3h1
 	c0,0,3,0,3-3V5c0-2-2-2-2-2H8V1h1v0.5C9,1.777,9.223,2,9.5,2S10,1.777,10,1.5v-1C10,0,9.5,0,9.5,0H5.5z M7.5,4l2.0449,0.7734L10,6.5
 	C10.1316,7,9.5,7,9.5,7h-4c0,0-0.6316,0-0.5-0.5l0.4551-1.7266L7.5,4z M7.5,8C7.7761,8,8,8.2239,8,8.5S7.7761,9,7.5,9
 	S7,8.7761,7,8.5S7.2239,8,7.5,8z M4.125,12L3,15h1.5l0.375-1h5.25l0.375,1H12l-1.125-3h-1.5l0.375,1h-4.5l0.375-1H4.125z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/railway_metro_15.svg b/svgs/svgs_iconset/railway_metro.svg
similarity index 60%
rename from svgs/svgs_iconset/railway_metro_15.svg
rename to svgs/svgs_iconset/railway_metro.svg
index 098d8576..ade4dd92 100644
--- a/svgs/svgs_iconset/railway_metro_15.svg
+++ b/svgs/svgs_iconset/railway_metro.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 19 19" height="19" width="19"><title>railway_metro_15.svg</title><rect fill="none" x="0" y="0" width="19" height="19"></rect><rect x="0" y="0" width="19" height="19" rx="0" ry="0" fill="#4898ff"></rect><path fill="#fff" transform="translate(2 2)" d="M5.5,0c0,0-0.75,0-1,1L3,6.5V10c0,1,1,1,1,1h7c0,0,1,0,1-1V6.5L10.5,1c-0.2727-1-1-1-1-1H5.5z M6.5,1.5h2
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 19 19" height="19" width="19"><title>railway_metro.svg</title><rect fill="none" x="0" y="0" width="19" height="19"></rect><rect x="0" y="0" width="19" height="19" rx="0" ry="0" fill="#4898ff"></rect><path fill="#fff" transform="translate(2 2)" d="M5.5,0c0,0-0.75,0-1,1L3,6.5V10c0,1,1,1,1,1h7c0,0,1,0,1-1V6.5L10.5,1c-0.2727-1-1-1-1-1H5.5z M6.5,1.5h2
 	c0,0,0.5357,0,0.75,1L10,6c0.2146,1.0017-1,1-1,1H6c0,0-1.2146,0.0017-1-1l0.75-3.5C5.9643,1.5,6.5,1.5,6.5,1.5z M5,8
 	c0.5523,0,1,0.4477,1,1s-0.4477,1-1,1S4,9.5523,4,9S4.4477,8,5,8z M6.75,8h1.5C8.3885,8,8.5,8.1115,8.5,8.25S8.3885,8.5,8.25,8.5
 	h-1.5C6.6115,8.5,6.5,8.3885,6.5,8.25S6.6115,8,6.75,8z M10,8c0.5523,0,1,0.4477,1,1s-0.4477,1-1,1S9,9.5523,9,9S9.4477,8,10,8z
diff --git a/svgs/svgs_iconset/information_15.svg b/svgs/svgs_iconset/ranger_station.svg
similarity index 62%
rename from svgs/svgs_iconset/information_15.svg
rename to svgs/svgs_iconset/ranger_station.svg
index 57a49258..79718710 100644
--- a/svgs/svgs_iconset/information_15.svg
+++ b/svgs/svgs_iconset/ranger_station.svg
@@ -1,3 +1,2 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>information_15.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#725a50" transform="translate(3 3)" d="M7.5,1
-	C6.7,1,6,1.7,6,2.5S6.7,4,7.5,4S9,3.3,9,2.5S8.3,1,7.5,1z M4,5v1c0,0,2,0,2,2v2c0,2-2,2-2,2v1h7v-1c0,0-2,0-2-2V6c0-0.5-0.5-1-1-1H4
-	z"></path></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>ranger_station.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#725a50" transform="translate(3 3)" d="M9,0.5l-2,1v3.7734L2,8v6h4v-4h3
+	v4h4V8L8,5.2734V4l1-0.5l2,1l2-1v-3l-2,1L9,0.5z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/ranger_station_15.svg b/svgs/svgs_iconset/ranger_station_15.svg
deleted file mode 100644
index af366412..00000000
--- a/svgs/svgs_iconset/ranger_station_15.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>ranger_station_15.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#725a50" transform="translate(3 3)" d="M9,0.5l-2,1v3.7734L2,8v6h4v-4h3
-	v4h4V8L8,5.2734V4l1-0.5l2,1l2-1v-3l-2,1L9,0.5z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/religious_jewish_15.svg b/svgs/svgs_iconset/religious_christian.svg
similarity index 67%
rename from svgs/svgs_iconset/religious_jewish_15.svg
rename to svgs/svgs_iconset/religious_christian.svg
index 75ee2311..c32eaad2 100644
--- a/svgs/svgs_iconset/religious_jewish_15.svg
+++ b/svgs/svgs_iconset/religious_christian.svg
@@ -1 +1,2 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>religious_jewish_15.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#725a50" transform="translate(3 3)" d="M15,12H9.78L7.5,15l-2.26-3H0l2.7-4L0,4h5.3l2.2-4l2.34,4H15l-2.56,4L15,12z"></path></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>religious_christian.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#725a50" transform="translate(3 3)" d="M6,0.9552V4H3v3h3v8h3V7h3V4H9V1
+	c0-1-0.9776-1-0.9776-1H6.9887C6.9887,0,6,0,6,0.9552z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/religious_christian_15.svg b/svgs/svgs_iconset/religious_christian_15.svg
deleted file mode 100644
index 24c757f1..00000000
--- a/svgs/svgs_iconset/religious_christian_15.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>religious_christian_15.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#725a50" transform="translate(3 3)" d="M6,0.9552V4H3v3h3v8h3V7h3V4H9V1
-	c0-1-0.9776-1-0.9776-1H6.9887C6.9887,0,6,0,6,0.9552z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/religious_jewish.svg b/svgs/svgs_iconset/religious_jewish.svg
new file mode 100644
index 00000000..e70cce36
--- /dev/null
+++ b/svgs/svgs_iconset/religious_jewish.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>religious_jewish.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#725a50" transform="translate(3 3)" d="M15,12H9.78L7.5,15l-2.26-3H0l2.7-4L0,4h5.3l2.2-4l2.34,4H15l-2.56,4L15,12z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/religious_muslim.svg b/svgs/svgs_iconset/religious_muslim.svg
new file mode 100644
index 00000000..8252aaa0
--- /dev/null
+++ b/svgs/svgs_iconset/religious_muslim.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>religious_muslim.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#725a50" transform="translate(3 3)" d="M6.7941,0C3,0,0,3,0,6.7941
+	s3,6.7941,6.7941,6.7941c2.1176,0,4.4118-0.7059,5.6471-2.2941C11.6471,11.8235,10.1471,12.4412,9,12.4412
+	c-2.9118,0-5.1176-2.9118-5.1176-5.8235S6.0882,1.1471,9,1.1471c1.0588,0,2.5588,0.6176,3.4412,1.1471
+	C11.2059,0.7059,8.9118,0,6.7941,0z M11,3l-1,2.5H7L9.5,7l-1,3L11,8.5l2.5,1.5l-1-3L15,5.5h-3L11,3z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/religious_muslim_15.svg b/svgs/svgs_iconset/religious_muslim_15.svg
deleted file mode 100644
index b2c65161..00000000
--- a/svgs/svgs_iconset/religious_muslim_15.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>religious_muslim_15.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#725a50" transform="translate(3 3)" d="M6.7941,0C3,0,0,3,0,6.7941
-	s3,6.7941,6.7941,6.7941c2.1176,0,4.4118-0.7059,5.6471-2.2941C11.6471,11.8235,10.1471,12.4412,9,12.4412
-	c-2.9118,0-5.1176-2.9118-5.1176-5.8235S6.0882,1.1471,9,1.1471c1.0588,0,2.5588,0.6176,3.4412,1.1471
-	C11.2059,0.7059,8.9118,0,6.7941,0z M11,3l-1,2.5H7L9.5,7l-1,3L11,8.5l2.5,1.5l-1-3L15,5.5h-3L11,3z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/restaurant.svg b/svgs/svgs_iconset/restaurant.svg
new file mode 100644
index 00000000..306a7356
--- /dev/null
+++ b/svgs/svgs_iconset/restaurant.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>restaurant.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#d97200" transform="translate(3 3)" d="M3.5,0l-1,5.5c-0.1464,0.805,1.7815,1.181,1.75,2L4,14c-0.0384,0.9993,1,1,1,1s1.0384-0.0007,1-1L5.75,7.5
+	c-0.0314-0.8176,1.7334-1.1808,1.75-2L6.5,0H6l0.25,4L5.5,4.5L5.25,0h-0.5L4.5,4.5L3.75,4L4,0H3.5z M12,0
+	c-0.7364,0-1.9642,0.6549-2.4551,1.6367C9.1358,2.3731,9,4.0182,9,5v2.5c0,0.8182,1.0909,1,1.5,1L10,14c-0.0905,0.9959,1,1,1,1
+	s1,0,1-1V0z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/restaurant_15.svg b/svgs/svgs_iconset/restaurant_15.svg
deleted file mode 100644
index 5bb84f04..00000000
--- a/svgs/svgs_iconset/restaurant_15.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>restaurant_15.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#d97200" transform="translate(3 3)" d="M3.5,0l-1,5.5c-0.1464,0.805,1.7815,1.181,1.75,2L4,14c-0.0384,0.9993,1,1,1,1s1.0384-0.0007,1-1L5.75,7.5
-	c-0.0314-0.8176,1.7334-1.1808,1.75-2L6.5,0H6l0.25,4L5.5,4.5L5.25,0h-0.5L4.5,4.5L3.75,4L4,0H3.5z M12,0
-	c-0.7364,0-1.9642,0.6549-2.4551,1.6367C9.1358,2.3731,9,4.0182,9,5v2.5c0,0.8182,1.0909,1,1.5,1L10,14c-0.0905,0.9959,1,1,1,1
-	s1,0,1-1V0z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/school_15.svg b/svgs/svgs_iconset/roadblock.svg
similarity index 65%
rename from svgs/svgs_iconset/school_15.svg
rename to svgs/svgs_iconset/roadblock.svg
index 032cbd9d..f0177b8d 100644
--- a/svgs/svgs_iconset/school_15.svg
+++ b/svgs/svgs_iconset/roadblock.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>school_15.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#725a50" transform="translate(3 3)" d="M11,13v-1h2v-1H9.5v-1H13V9h-2V8h2V7h-2V6h2V5H9.5V4H13V3h-2V2h2V1H8v13h5v-1H11z M6,11H2V1h4V11z M6,12l-2,2l-2-2H6z"></path></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>roadblock.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#725a50" transform="translate(3 3)" d="M7.5,0C3.3579,0,0,3.3579,0,7.5S3.3579,15,7.5,15S15,11.6421,15,7.5S11.6421,0,7.5,0z M3,6h9v3H3V6z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/roadblock_15.svg b/svgs/svgs_iconset/roadblock_15.svg
deleted file mode 100644
index 5953b4b1..00000000
--- a/svgs/svgs_iconset/roadblock_15.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>roadblock_15.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#725a50" transform="translate(3 3)" d="M7.5,0C3.3579,0,0,3.3579,0,7.5S3.3579,15,7.5,15S15,11.6421,15,7.5S11.6421,0,7.5,0z M3,6h9v3H3V6z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/rocket_15.svg b/svgs/svgs_iconset/rocket.svg
similarity index 50%
rename from svgs/svgs_iconset/rocket_15.svg
rename to svgs/svgs_iconset/rocket.svg
index 182069e6..c11247f8 100644
--- a/svgs/svgs_iconset/rocket_15.svg
+++ b/svgs/svgs_iconset/rocket.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>rocket_15.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#725a50" transform="translate(3 3)" d="M12.5547,1c-2.1441,0-5.0211,1.471-6.9531,4H4
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>rocket.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#725a50" transform="translate(3 3)" d="M12.5547,1c-2.1441,0-5.0211,1.471-6.9531,4H4
 	C2.8427,5,2.1794,5.8638,1.7227,6.7773L1.1113,8h1.4434H4l1.5,1.5L7,11v1.4453v1.4434l1.2227-0.6113
 	C9.1362,12.8206,10,12.1573,10,11V9.3984c2.529-1.932,4-4.809,4-6.9531V1H12.5547z M10,4c0.5523,0,1,0.4477,1,1l0,0
 	c0,0.5523-0.4477,1-1,1l0,0C9.4477,6,9,5.5523,9,5v0C9,4.4477,9.4477,4,10,4L10,4z M3.5,10L3,10.5C2.2778,11.2222,2,13,2,13
diff --git a/svgs/svgs_iconset/school.svg b/svgs/svgs_iconset/school.svg
new file mode 100644
index 00000000..123a7308
--- /dev/null
+++ b/svgs/svgs_iconset/school.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>school.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#725a50" transform="translate(3 3)" d="M11,13v-1h2v-1H9.5v-1H13V9h-2V8h2V7h-2V6h2V5H9.5V4H13V3h-2V2h2V1H8v13h5v-1H11z M6,11H2V1h4V11z M6,12l-2,2l-2-2H6z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/shelter.svg b/svgs/svgs_iconset/shelter.svg
new file mode 100644
index 00000000..9ce59bac
--- /dev/null
+++ b/svgs/svgs_iconset/shelter.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>shelter.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#725a50" transform="translate(3 3)" d="M4,7v5h9.5v2H2l0,0l0,0V7.78L1,8.16V6l13-5v2.14L4,7z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/shelter_15.svg b/svgs/svgs_iconset/shelter_15.svg
deleted file mode 100644
index 520aff26..00000000
--- a/svgs/svgs_iconset/shelter_15.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>shelter_15.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#725a50" transform="translate(3 3)" d="M4,7v5h9.5v2H2l0,0l0,0V7.78L1,8.16V6l13-5v2.14L4,7z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/shop_15.svg b/svgs/svgs_iconset/shop.svg
similarity index 55%
rename from svgs/svgs_iconset/shop_15.svg
rename to svgs/svgs_iconset/shop.svg
index 5c67f201..5a62edff 100644
--- a/svgs/svgs_iconset/shop_15.svg
+++ b/svgs/svgs_iconset/shop.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>shop_15.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#5d60be" transform="translate(3 3)" d="M13.33,6H11.5l-0.39-2.33c-0.1601-0.7182-0.7017-1.2905-1.41-1.49C9.3507,2.0676,8.9869,2.007,8.62,2H6.38
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>shop.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#5d60be" transform="translate(3 3)" d="M13.33,6H11.5l-0.39-2.33c-0.1601-0.7182-0.7017-1.2905-1.41-1.49C9.3507,2.0676,8.9869,2.007,8.62,2H6.38
 	C6.0131,2.007,5.6493,2.0676,5.3,2.18C4.5917,2.3795,4.0501,2.9518,3.89,3.67L3.5,6H1.67C1.3939,5.9983,1.1687,6.2208,1.167,6.497
 	C1.1667,6.5489,1.1744,6.6005,1.19,6.65l1.88,6.3l0,0C3.2664,13.5746,3.8453,13.9996,4.5,14h6c0.651-0.0047,1.2247-0.4289,1.42-1.05
 	l0,0l1.88-6.3c0.0829-0.2634-0.0635-0.5441-0.3269-0.627C13.4268,6.0084,13.3786,6.0007,13.33,6z M4.52,6l0.36-2.17
diff --git a/svgs/svgs_iconset/skiing_15.svg b/svgs/svgs_iconset/skiing.svg
similarity index 50%
rename from svgs/svgs_iconset/skiing_15.svg
rename to svgs/svgs_iconset/skiing.svg
index 8cda69ff..0afb4f57 100644
--- a/svgs/svgs_iconset/skiing_15.svg
+++ b/svgs/svgs_iconset/skiing.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>skiing_15.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#76a723" transform="translate(3 3)" d="M15,4.5C15,5.3284,14.3284,6,13.5,6S12,5.3284,12,4.5S12.6716,3,13.5,3S15,3.6716,15,4.5z M13.72,11.89
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>skiing.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#76a723" transform="translate(3 3)" d="M15,4.5C15,5.3284,14.3284,6,13.5,6S12,5.3284,12,4.5S12.6716,3,13.5,3S15,3.6716,15,4.5z M13.72,11.89
 	c-0.0623-0.1197-0.2083-0.1684-0.33-0.11c-0.6846,0.4194-1.5208,0.5111-2.28,0.25L4.78,8.86L7.5,7.5v-3L9,5.25v3L10.5,9L12,8.25
 	L10.5,7.5V3l-3-1.5L6,2.25v4.5L3.28,8.11L0.61,6.78C0.4857,6.7192,0.3358,6.7707,0.275,6.895C0.2142,7.0193,0.2657,7.1692,0.39,7.23
 	l10.5,5.25c0.3156,0.135,0.6568,0.1998,1,0.19c0.5998-0.0103,1.1889-0.161,1.72-0.44c0.1236-0.0615,0.174-0.2116,0.1125-0.3352
diff --git a/svgs/svgs_iconset/soccer_15.svg b/svgs/svgs_iconset/soccer.svg
similarity index 54%
rename from svgs/svgs_iconset/soccer_15.svg
rename to svgs/svgs_iconset/soccer.svg
index 64eacd94..acabe989 100644
--- a/svgs/svgs_iconset/soccer_15.svg
+++ b/svgs/svgs_iconset/soccer.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>soccer_15.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#76a723" transform="translate(3 3)" d="M11,1.5C11,2.3284,10.3284,3,9.5,3S8,2.3284,8,1.5S8.6716,0,9.5,0S11,0.6716,11,1.5z M11,11c-0.5523,0-1,0.4477-1,1
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>soccer.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#76a723" transform="translate(3 3)" d="M11,1.5C11,2.3284,10.3284,3,9.5,3S8,2.3284,8,1.5S8.6716,0,9.5,0S11,0.6716,11,1.5z M11,11c-0.5523,0-1,0.4477-1,1
 	s0.4477,1,1,1s1-0.4477,1-1S11.5523,11,11,11z M12.84,6.09l-1.91-1.91l0,0C10.8399,4.0675,10.7041,4.0014,10.56,4H3.5
 	C3.2239,4,3,4.2239,3,4.5S3.2239,5,3.5,5h2.7L3,11.3l0,0c-0.0138,0.066-0.0138,0.134,0,0.2c-0.058,0.2761,0.1189,0.547,0.395,0.605
 	C3.6711,12.163,3.942,11.9861,4,11.71l0,0L5,10h2l-1.93,4.24l0,0C5.0228,14.3184,4.9986,14.4085,5,14.5
diff --git a/svgs/svgs_iconset/square.svg b/svgs/svgs_iconset/square.svg
new file mode 100644
index 00000000..8935aacf
--- /dev/null
+++ b/svgs/svgs_iconset/square.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 19 19" height="19" width="19"><title>square.svg</title><rect fill="none" x="0" y="0" width="19" height="19"></rect><path fill="#725a50" transform="translate(2 2)" d="M13,14H2c-0.5523,0-1-0.4477-1-1V2c0-0.5523,0.4477-1,1-1h11c0.5523,0,1,0.4477,1,1v11C14,13.5523,13.5523,14,13,14z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/square_15.svg b/svgs/svgs_iconset/square_15.svg
deleted file mode 100644
index 981c545f..00000000
--- a/svgs/svgs_iconset/square_15.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 19 19" height="19" width="19"><title>square_15.svg</title><rect fill="none" x="0" y="0" width="19" height="19"></rect><path fill="#725a50" transform="translate(2 2)" d="M13,14H2c-0.5523,0-1-0.4477-1-1V2c0-0.5523,0.4477-1,1-1h11c0.5523,0,1,0.4477,1,1v11C14,13.5523,13.5523,14,13,14z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/square_stroked.svg b/svgs/svgs_iconset/square_stroked.svg
new file mode 100644
index 00000000..d97fbc0d
--- /dev/null
+++ b/svgs/svgs_iconset/square_stroked.svg
@@ -0,0 +1,2 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 19 19" height="19" width="19"><title>square_stroked.svg</title><rect fill="none" x="0" y="0" width="19" height="19"></rect><path fill="#725a50" transform="translate(2 2)" d="M12.7,2.3v10.4H2.3V2.3H12.7 M13,1H2C1.4477,1,1,1.4477,1,2v11c0,0.5523,0.4477,1,1,1h11c0.5523,0,1-0.4477,1-1V2
+	C14,1.4477,13.5523,1,13,1L13,1z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/square_stroked_11.svg b/svgs/svgs_iconset/square_stroked_11.svg
index 4968ff82..965d9060 100644
--- a/svgs/svgs_iconset/square_stroked_11.svg
+++ b/svgs/svgs_iconset/square_stroked_11.svg
@@ -1,2 +1,2 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 15 15" height="15" width="15"><title>square-stroke_11.svg</title><rect fill="none" x="0" y="0" width="15" height="15"></rect><path fill="#725a50" transform="translate(2 2)" d="M9.19,1H1.81C1.3626,1,1,1.3626,1,1.81v7.38C1,9.6374,1.3626,10,1.81,10c0,0,0,0,0,0h7.38C9.6374,10,10,9.6374,10,9.19v0
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 15 15" height="15" width="15"><title>square_stroked_11.svg</title><rect fill="none" x="0" y="0" width="15" height="15"></rect><path fill="#725a50" transform="translate(2 2)" d="M9.19,1H1.81C1.3626,1,1,1.3626,1,1.81v7.38C1,9.6374,1.3626,10,1.81,10c0,0,0,0,0,0h7.38C9.6374,10,10,9.6374,10,9.19v0
 	V1.81C10,1.3626,9.6374,1,9.19,1L9.19,1L9.19,1z M2,2h7v7H2V2z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/square_stroked_15.svg b/svgs/svgs_iconset/square_stroked_15.svg
deleted file mode 100644
index 3ca092a0..00000000
--- a/svgs/svgs_iconset/square_stroked_15.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 19 19" height="19" width="19"><title>square-stroke_15.svg</title><rect fill="none" x="0" y="0" width="19" height="19"></rect><path fill="#725a50" transform="translate(2 2)" d="M12.7,2.3v10.4H2.3V2.3H12.7 M13,1H2C1.4477,1,1,1.4477,1,2v11c0,0.5523,0.4477,1,1,1h11c0.5523,0,1-0.4477,1-1V2
-	C14,1.4477,13.5523,1,13,1L13,1z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/stadium.svg b/svgs/svgs_iconset/stadium.svg
new file mode 100644
index 00000000..3ce9d3f8
--- /dev/null
+++ b/svgs/svgs_iconset/stadium.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>stadium.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#5d60be" transform="translate(3 3)" d="M7,1v2v1.5v0.5098C4.1695,5.1037,2.0021,5.9665,2,7v4.5c0,1.1046,2.4624,2,5.5,2s5.5-0.8954,5.5-2V7
+	c-0.0021-1.0335-2.1695-1.8963-5-1.9902V4.0625L11,2.75L7,1z M3,8.1465c0.5148,0.2671,1.2014,0.4843,2,0.6328v2.9668
+	C3.7948,11.477,3,11.0199,3,10.5V8.1465z M12,8.1484V10.5c0,0.5199-0.7948,0.977-2,1.2461V8.7812
+	C10.7986,8.6328,11.4852,8.4155,12,8.1484z M6,8.9219C6.4877,8.973,6.9925,8.9992,7.5,9C8.0073,8.9999,8.5121,8.9743,9,8.9238
+	v2.9844C8.5287,11.964,8.0288,12,7.5,12S6.4713,11.964,6,11.9082V8.9219z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/stadium_15.svg b/svgs/svgs_iconset/stadium_15.svg
deleted file mode 100644
index 8fe7cd56..00000000
--- a/svgs/svgs_iconset/stadium_15.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>stadium_15.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#5d60be" transform="translate(3 3)" d="M7,1v2v1.5v0.5098C4.1695,5.1037,2.0021,5.9665,2,7v4.5c0,1.1046,2.4624,2,5.5,2s5.5-0.8954,5.5-2V7
-	c-0.0021-1.0335-2.1695-1.8963-5-1.9902V4.0625L11,2.75L7,1z M3,8.1465c0.5148,0.2671,1.2014,0.4843,2,0.6328v2.9668
-	C3.7948,11.477,3,11.0199,3,10.5V8.1465z M12,8.1484V10.5c0,0.5199-0.7948,0.977-2,1.2461V8.7812
-	C10.7986,8.6328,11.4852,8.4155,12,8.1484z M6,8.9219C6.4877,8.973,6.9925,8.9992,7.5,9C8.0073,8.9999,8.5121,8.9743,9,8.9238
-	v2.9844C8.5287,11.964,8.0288,12,7.5,12S6.4713,11.964,6,11.9082V8.9219z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/star.svg b/svgs/svgs_iconset/star.svg
new file mode 100644
index 00000000..ad26527b
--- /dev/null
+++ b/svgs/svgs_iconset/star.svg
@@ -0,0 +1,2 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 19 19" height="19" width="19"><title>star.svg</title><rect fill="none" x="0" y="0" width="19" height="19"></rect><path fill="#725a50" transform="translate(2 2)" d="M7.5,0l-2,5h-5l4,3.5l-2,6l5-3.5
+	l5,3.5l-2-6l4-3.5h-5L7.5,0z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/star_15.svg b/svgs/svgs_iconset/star_15.svg
deleted file mode 100644
index 98fe8f45..00000000
--- a/svgs/svgs_iconset/star_15.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 19 19" height="19" width="19"><title>star_15.svg</title><rect fill="none" x="0" y="0" width="19" height="19"></rect><path fill="#725a50" transform="translate(2 2)" d="M7.5,0l-2,5h-5l4,3.5l-2,6l5-3.5
-	l5,3.5l-2-6l4-3.5h-5L7.5,0z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/star_stroked_15.svg b/svgs/svgs_iconset/star_stroked.svg
similarity index 50%
rename from svgs/svgs_iconset/star_stroked_15.svg
rename to svgs/svgs_iconset/star_stroked.svg
index edd1f402..03c1c2fa 100644
--- a/svgs/svgs_iconset/star_stroked_15.svg
+++ b/svgs/svgs_iconset/star_stroked.svg
@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 19 19" height="19" width="19"><title>star-stroke_15.svg</title><rect fill="none" x="0" y="0" width="19" height="19"></rect><path fill="#725a50" transform="translate(2 2)" d="M7.5,3.19l1.07,2.68L8.82,6.5h3l-2,1.75l-0.5,0.44l0.23,0.63l1,3.13l-2.48-1.77
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 19 19" height="19" width="19"><title>star_stroked.svg</title><rect fill="none" x="0" y="0" width="19" height="19"></rect><path fill="#725a50" transform="translate(2 2)" d="M7.5,3.19l1.07,2.68L8.82,6.5h3l-2,1.75l-0.5,0.44l0.23,0.63l1,3.13l-2.48-1.77
 	l-0.57-0.4l-0.57,0.4l-2.52,1.77l1-3.13l0.21-0.63l-0.5-0.44l-2-1.75h3l0.25-0.63L7.5,3.19 M7.5,0.5l-2,5h-5l4,3.5l-2,6l5-3.5l5,3.5
 	l-2-6l4-3.5h-5L7.5,0.5L7.5,0.5z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/star_stroked_11.svg b/svgs/svgs_iconset/star_stroked_11.svg
index f9ac3992..41ae2705 100644
--- a/svgs/svgs_iconset/star_stroked_11.svg
+++ b/svgs/svgs_iconset/star_stroked_11.svg
@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 15 15" height="15" width="15"><title>star-stroke_11.svg</title><rect fill="none" x="0" y="0" width="15" height="15"></rect><path fill="#725a50" transform="translate(2 2)" d="M5.5,2.69l0.59,1.47l0.25,0.63h1.81l-1,0.9l-0.5,0.44l0.18,0.63l0.56,1.69L6.07,7.53L5.5,7.12
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 15 15" height="15" width="15"><title>star_stroked_11.svg</title><rect fill="none" x="0" y="0" width="15" height="15"></rect><path fill="#725a50" transform="translate(2 2)" d="M5.5,2.69l0.59,1.47l0.25,0.63h1.81l-1,0.9l-0.5,0.44l0.18,0.63l0.56,1.69L6.07,7.53L5.5,7.12
 	l-0.57,0.4L3.62,8.44l0.55-1.68l0.21-0.63L3.88,5.7l-1-0.9h1.78l0.25-0.63L5.5,2.69 M5.5,0L4,3.79H0.19l3,2.66L1.71,11L5.5,8.34
 	L9.29,11L7.78,6.45l3-2.66H7L5.5,0L5.5,0z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/suitcase.svg b/svgs/svgs_iconset/suitcase.svg
new file mode 100644
index 00000000..dfafac30
--- /dev/null
+++ b/svgs/svgs_iconset/suitcase.svg
@@ -0,0 +1,2 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>suitcase.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#5d60be" transform="translate(3 3)" d="M11,4V2c0-1-1-1-1-1H5.0497
+	c0,0-1.1039,0.0015-1.0497,1v2H2c0,0-1,0-1,1v7c0,1,1,1,1,1h11c0,0,1,0,1-1V5c0-1-1-1-1-1H11z M5.5,2.5h4V4h-4V2.5z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/suitcase_15.svg b/svgs/svgs_iconset/suitcase_15.svg
deleted file mode 100644
index 07813ae2..00000000
--- a/svgs/svgs_iconset/suitcase_15.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>suitcase_15.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#5d60be" transform="translate(3 3)" d="M11,4V2c0-1-1-1-1-1H5.0497
-	c0,0-1.1039,0.0015-1.0497,1v2H2c0,0-1,0-1,1v7c0,1,1,1,1,1h11c0,0,1,0,1-1V5c0-1-1-1-1-1H11z M5.5,2.5h4V4h-4V2.5z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/sushi_15.svg b/svgs/svgs_iconset/sushi.svg
similarity index 69%
rename from svgs/svgs_iconset/sushi_15.svg
rename to svgs/svgs_iconset/sushi.svg
index 598055f8..10fdbc84 100644
--- a/svgs/svgs_iconset/sushi_15.svg
+++ b/svgs/svgs_iconset/sushi.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>sushi_15.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#d97200" transform="translate(3 3)" d="M5.5,3C5.2239,3,5,3.2239,5,3.5H2.75C1.2265,3.5,0,4.7265,0,6.25c0,0.8274,0.3687,1.5592,0.9434,2.0625
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>sushi.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#d97200" transform="translate(3 3)" d="M5.5,3C5.2239,3,5,3.2239,5,3.5H2.75C1.2265,3.5,0,4.7265,0,6.25c0,0.8274,0.3687,1.5592,0.9434,2.0625
 	C0.3803,8.6675,0,9.2893,0,10c0,1.0994,0.9006,2,2,2h3.5h2H10c1.0994,0,2-0.9006,2-2c0-0.4883-0.1863-0.9294-0.4805-1.2773
 	l2.1777,0.9629c0.3716,0.1831,0.8213,0.0303,1.0044-0.3413c0.1831-0.3716,0.0303-0.8213-0.3413-1.0044
 	c-0.0188-0.0093-0.038-0.0178-0.0576-0.0254l-1.8105-0.8027l1.6309-0.2715c0.4099-0.0599,0.6936-0.4408,0.6337-0.8507
diff --git a/svgs/svgs_iconset/swimming_15.svg b/svgs/svgs_iconset/swimming.svg
similarity index 52%
rename from svgs/svgs_iconset/swimming_15.svg
rename to svgs/svgs_iconset/swimming.svg
index ef6d7b91..68e54b84 100644
--- a/svgs/svgs_iconset/swimming_15.svg
+++ b/svgs/svgs_iconset/swimming.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>swimming_15.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#76a723" transform="translate(3 3)" d="M10.1113,2C9.9989,2,9.6758,2.1465,9.6758,2.1465L6.3535,3.8262
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>swimming.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#76a723" transform="translate(3 3)" d="M10.1113,2C9.9989,2,9.6758,2.1465,9.6758,2.1465L6.3535,3.8262
 	C5.9111,4.0024,5.7358,4.7081,6.002,5.0605l0.9707,1.4082L3.002,8.498L5,9.998l2.502-1.5l2.5,1.5l1.002-1.002l-3-4l2.5566-1.5293
 	c0.5286-0.2662,0.4434-0.7045,0.4434-0.9707C10.9999,2.2861,10.6437,2,10.1113,2z M12.252,5C11.2847,5,10.5,5.7827,10.5,6.75
 	s0.7847,1.752,1.752,1.752s1.75-0.7847,1.75-1.752S13.2192,5,12.252,5z M2.5,10L0,11.5V13l2.5-1.5L5,13l2.502-1.5l2.5,1.5L12,11.5
diff --git a/svgs/svgs_iconset/telephone_15.svg b/svgs/svgs_iconset/telephone.svg
similarity index 59%
rename from svgs/svgs_iconset/telephone_15.svg
rename to svgs/svgs_iconset/telephone.svg
index db10cf54..115c3a8b 100644
--- a/svgs/svgs_iconset/telephone_15.svg
+++ b/svgs/svgs_iconset/telephone.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>telephone_15.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#725a50" transform="translate(3 3)" d="M4.51,8.88c-0.1983,0.199-0.1983,0.521,0,0.72l0.72,0.72L3.07,12.5L2.7,12.13c-0.4028-0.3774-0.652-0.8902-0.7-1.44V9.24
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>telephone.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#725a50" transform="translate(3 3)" d="M4.51,8.88c-0.1983,0.199-0.1983,0.521,0,0.72l0.72,0.72L3.07,12.5L2.7,12.13c-0.4028-0.3774-0.652-0.8902-0.7-1.44V9.24
 	c0.0456-0.5534,0.295-1.0701,0.7-1.45l0.36-0.36l4.35-4.35l0.36-0.36C8.1467,2.3076,8.6638,2.0508,9.22,2h1.45
 	c0.5562,0.0508,1.0733,0.3076,1.45,0.72l0.36,0.36l-2.17,2.18L9.58,4.53c-0.199-0.1983-0.521-0.1983-0.72,0L4.51,8.88z M4.85,12.88
 	L4.13,13.6c0.3804,0.4004,1.0133,0.4166,1.4137,0.0363C5.5561,13.6245,5.5682,13.6124,5.58,13.6l0.72-0.72
diff --git a/svgs/svgs_iconset/tennis_15.svg b/svgs/svgs_iconset/tennis.svg
similarity index 67%
rename from svgs/svgs_iconset/tennis_15.svg
rename to svgs/svgs_iconset/tennis.svg
index e0eefc5b..de03c8c3 100644
--- a/svgs/svgs_iconset/tennis_15.svg
+++ b/svgs/svgs_iconset/tennis.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>tennis_15.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#76a723" transform="translate(3 3)" d="M8,4.5C8,5.3284,7.3284,6,6.5,6S5,5.3284,5,4.5S5.6716,3,6.5,3S8,3.6716,8,4.5z M14.38,5.05L14.38,5.05l-1.57-1.59
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>tennis.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#76a723" transform="translate(3 3)" d="M8,4.5C8,5.3284,7.3284,6,6.5,6S5,5.3284,5,4.5S5.6716,3,6.5,3S8,3.6716,8,4.5z M14.38,5.05L14.38,5.05l-1.57-1.59
 	c0.3629-0.7766,0.1576-1.7002-0.5-2.25c-0.4027-0.4248-0.9552-0.6759-1.54-0.7c-0.338-0.0102-0.6659,0.1159-0.91,0.35
 	c-0.5576,0.7788-0.4034,1.8585,0.35,2.45c0.4027,0.4248,0.9552,0.6759,1.54,0.7c0.2452-0.0035,0.4844-0.0763,0.69-0.21L14,5.39l0,0
 	c0.0399,0.0733,0.1165,0.1193,0.2,0.12c0.1381,0,0.25-0.1119,0.25-0.25C14.4623,5.1828,14.4361,5.1044,14.38,5.05z M12.31,3.3
diff --git a/svgs/svgs_iconset/theatre_15.svg b/svgs/svgs_iconset/theatre.svg
similarity index 54%
rename from svgs/svgs_iconset/theatre_15.svg
rename to svgs/svgs_iconset/theatre.svg
index fb53d3b3..25c60931 100644
--- a/svgs/svgs_iconset/theatre_15.svg
+++ b/svgs/svgs_iconset/theatre.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>theatre_15.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#5d60be" transform="translate(3 3)" d="M2,1c0,0-1,0-1,1v5.1582C1,8.8885,1.354,11,4.5,11H5V8L2.5,9c0,0,0-2.5,2.5-2.5V5
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>theatre.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#5d60be" transform="translate(3 3)" d="M2,1c0,0-1,0-1,1v5.1582C1,8.8885,1.354,11,4.5,11H5V8L2.5,9c0,0,0-2.5,2.5-2.5V5
 	c0-0.7078,0.0868-1.3209,0.5-1.7754C5.8815,2.805,6.5046,1.9674,8.1562,2.7539L9,3.3027V2c0,0,0-1-1-1C7.2922,1,6.0224,2,5,2
 	S2.7865,1,2,1z M3,3c0.5523,0,1,0.4477,1,1S3.5523,5,3,5S2,4.5523,2,4S2.4477,3,3,3z M7,4c0,0-1,0-1,1v5c0,2,1,4,4,4s4-2,4-4V5
 	c0-1-1-1-1-1c-0.7078,0-1.9776,1-3,1S7.7865,4,7,4z M8,6c0.5523,0,1,0.4477,1,1S8.5523,8,8,8S7,7.5523,7,7S7.4477,6,8,6z M12,6
diff --git a/svgs/svgs_iconset/toilets_15.svg b/svgs/svgs_iconset/toilets.svg
similarity index 66%
rename from svgs/svgs_iconset/toilets_15.svg
rename to svgs/svgs_iconset/toilets.svg
index 885e098e..8a060450 100644
--- a/svgs/svgs_iconset/toilets_15.svg
+++ b/svgs/svgs_iconset/toilets.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>toilet_15.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#725a50" transform="translate(3 3)" d="M4.5,3C3.6716,3,3,2.3284,3,1.5S3.6716,0,4.5,0S6,0.6716,6,1.5S5.3284,3,4.5,3z M14,1.5C14,0.6716,13.3284,0,12.5,0
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>toilets.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#725a50" transform="translate(3 3)" d="M4.5,3C3.6716,3,3,2.3284,3,1.5S3.6716,0,4.5,0S6,0.6716,6,1.5S5.3284,3,4.5,3z M14,1.5C14,0.6716,13.3284,0,12.5,0
 	S11,0.6716,11,1.5S11.6716,3,12.5,3S14,2.3284,14,1.5z M8.86,6.64L8.86,6.64L6.38,4.15l0,0C6.2798,4.0492,6.142,3.9949,6,4H3
 	C2.8697,4.0003,2.7445,4.0503,2.65,4.14l0,0L0.14,6.63c-0.2261,0.177-0.2659,0.5039-0.0889,0.73s0.5039,0.2659,0.73,0.0889
 	C0.8142,7.423,0.8441,7.3931,0.87,7.36L3,5.2L1,11h2v3.33c-0.0075,0.0497-0.0075,0.1003,0,0.15
diff --git a/svgs/svgs_iconset/toilets_11.svg b/svgs/svgs_iconset/toilets_11.svg
index bd723a87..7a47cb9a 100644
--- a/svgs/svgs_iconset/toilets_11.svg
+++ b/svgs/svgs_iconset/toilets_11.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 17 17" height="17" width="17"><title>toilet_11.svg</title><rect fill="none" x="0" y="0" width="17" height="17"></rect><rect x="1" y="1" rx="7.5" ry="7.5" width="15" height="15" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="15" height="15" rx="7.5" ry="7.5" fill="#fff"></rect><path fill="#725a50" transform="translate(3 3)" d="M3.33,2.19c-0.6075,0-1.1-0.4925-1.1-1.1s0.4925-1.1,1.1-1.1s1.1,0.4925,1.1,1.1v0C4.43,1.6975,3.9375,2.19,3.33,2.19z
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 17 17" height="17" width="17"><title>toilets_11.svg</title><rect fill="none" x="0" y="0" width="17" height="17"></rect><rect x="1" y="1" rx="7.5" ry="7.5" width="15" height="15" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="15" height="15" rx="7.5" ry="7.5" fill="#fff"></rect><path fill="#725a50" transform="translate(3 3)" d="M3.33,2.19c-0.6075,0-1.1-0.4925-1.1-1.1s0.4925-1.1,1.1-1.1s1.1,0.4925,1.1,1.1v0C4.43,1.6975,3.9375,2.19,3.33,2.19z
 	 M10.27,1.09c0-0.6075-0.4925-1.1-1.1-1.1c-0.6075,0-1.1,0.4925-1.1,1.1s0.4925,1.1,1.1,1.1c0.6036,0,1.0945-0.4864,1.1-1.09V1.09z
 	 M6.51,4.93L6.51,4.93L4.7,3.12l0,0C4.6306,3.0442,4.5328,3.0008,4.43,3H2.22C2.1271,3.0008,2.0378,3.0365,1.97,3.1H2L0.14,4.93
 	c-0.1709,0.1218-0.2107,0.3591-0.0889,0.53s0.3591,0.2107,0.53,0.0889C0.6155,5.5244,0.6455,5.4944,0.67,5.46l1.58-1.58L0.77,8h1.46
diff --git a/svgs/svgs_iconset/town_hall.svg b/svgs/svgs_iconset/town_hall.svg
new file mode 100644
index 00000000..fe8d09fa
--- /dev/null
+++ b/svgs/svgs_iconset/town_hall.svg
@@ -0,0 +1,2 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>town_hall.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#725a50" transform="translate(3 3)" d="M7.5,0L1,3.4453V4h13V3.4453L7.5,0z M2,5v5l-1,1.5547V13h13v-1.4453L13,10V5H2z M4,6h1v5.5H4V6z M7,6h1v5.5H7
+	V6z M10,6h1v5.5h-1V6z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/town_hall_15.svg b/svgs/svgs_iconset/town_hall_15.svg
deleted file mode 100644
index f8c10140..00000000
--- a/svgs/svgs_iconset/town_hall_15.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>town_hall_15.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#725a50" transform="translate(3 3)" d="M7.5,0L1,3.4453V4h13V3.4453L7.5,0z M2,5v5l-1,1.5547V13h13v-1.4453L13,10V5H2z M4,6h1v5.5H4V6z M7,6h1v5.5H7
-	V6z M10,6h1v5.5h-1V6z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/triangle_15.svg b/svgs/svgs_iconset/triangle.svg
similarity index 64%
rename from svgs/svgs_iconset/triangle_15.svg
rename to svgs/svgs_iconset/triangle.svg
index 751d1b83..fb313254 100644
--- a/svgs/svgs_iconset/triangle_15.svg
+++ b/svgs/svgs_iconset/triangle.svg
@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 19 19" height="19" width="19"><title>triangle_15.svg</title><rect fill="none" x="0" y="0" width="19" height="19"></rect><path fill="#725a50" transform="translate(2 2)" d="M7.5385,2
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 19 19" height="19" width="19"><title>triangle.svg</title><rect fill="none" x="0" y="0" width="19" height="19"></rect><path fill="#725a50" transform="translate(2 2)" d="M7.5385,2
 	C7.2437,2,7.0502,2.1772,6.9231,2.3846l-5.8462,9.5385C1,12,1,12.1538,1,12.3077C1,12.8462,1.3846,13,1.6923,13h11.6154
 	C13.6923,13,14,12.8462,14,12.3077c0-0.1538,0-0.2308-0.0769-0.3846L8.1538,2.3846C8.028,2.1765,7.7882,2,7.5385,2z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/triangle_stroked_15.svg b/svgs/svgs_iconset/triangle_stroked.svg
similarity index 63%
rename from svgs/svgs_iconset/triangle_stroked_15.svg
rename to svgs/svgs_iconset/triangle_stroked.svg
index ccdf2004..9b49a12c 100644
--- a/svgs/svgs_iconset/triangle_stroked_15.svg
+++ b/svgs/svgs_iconset/triangle_stroked.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 19 19" height="19" width="19"><title>triangle_stroked_15.svg</title><rect fill="none" x="0" y="0" width="19" height="19"></rect><path fill="#725a50" transform="translate(2 2)" d="M7.5243,1.5004
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 19 19" height="19" width="19"><title>triangle_stroked.svg</title><rect fill="none" x="0" y="0" width="19" height="19"></rect><path fill="#725a50" transform="translate(2 2)" d="M7.5243,1.5004
 	C7.2429,1.4913,6.9787,1.6423,6.8336,1.8952l-5.5,9.8692C1.0218,12.3078,1.395,12.9999,2,13h11
 	c0.605-0.0001,0.9782-0.6922,0.6664-1.2355l-5.5-9.8692C8.0302,1.6579,7.7884,1.5092,7.5243,1.5004z M7.5,3.8993l4.1267,7.4704
 	H3.3733L7.5,3.8993z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/veterinary_15.svg b/svgs/svgs_iconset/veterinary.svg
similarity index 72%
rename from svgs/svgs_iconset/veterinary_15.svg
rename to svgs/svgs_iconset/veterinary.svg
index 02a664c8..157b63f1 100644
--- a/svgs/svgs_iconset/veterinary_15.svg
+++ b/svgs/svgs_iconset/veterinary.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>veterinary_15.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#ba3827" transform="translate(3 3)" d="M7.5,6c-2.5,0-3,2.28-3,3.47l0,0c-0.6097,0.2059-1.1834,0.5062-1.7,0.89
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>veterinary.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#ba3827" transform="translate(3 3)" d="M7.5,6c-2.5,0-3,2.28-3,3.47l0,0c-0.6097,0.2059-1.1834,0.5062-1.7,0.89
 	c-0.871,0.6614-1.0492,1.8998-0.4,2.78c0.6799,0.8542,1.9081,1.0297,2.8,0.4c0.6779-0.4601,1.4808-0.701,2.3-0.69
 	c0.8192-0.011,1.6221,0.2299,2.3,0.69c0.8575,0.6854,2.1072,0.5515,2.8-0.3c0.6888-0.8134,0.5878-2.0313-0.2256-2.7201
 	c-0.0243-0.0206-0.0491-0.0406-0.0744-0.0599l-0.1-0.1c-0.5333-0.3564-1.1032-0.6548-1.7-0.89l0,0C10.5,8.29,10,6,7.5,6z"></path><path fill="#ba3827" transform="translate(3 3)" d="M2.08,4.3c-0.7348,0.3676-1.0652,1.2371-0.76,2c0.064,0.8282,0.7809,1.4517,1.61,1.4
diff --git a/svgs/svgs_iconset/volcano_15.svg b/svgs/svgs_iconset/volcano.svg
similarity index 67%
rename from svgs/svgs_iconset/volcano_15.svg
rename to svgs/svgs_iconset/volcano.svg
index 02923bd9..d7c65760 100644
--- a/svgs/svgs_iconset/volcano_15.svg
+++ b/svgs/svgs_iconset/volcano.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>volcano_15.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#76a723" transform="translate(3 3)" d="M8.4844,1.0002
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>volcano.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#76a723" transform="translate(3 3)" d="M8.4844,1.0002
 	c-0.1464,0.005-0.2835,0.0731-0.375,0.1875L6.4492,3.2619L4.8438,1.7385C4.4079,1.3374,3.7599,1.893,4.0899,2.385l1.666,2.4004
 	C5.9472,5.061,6.3503,5.0737,6.5586,4.8108C6.7249,4.6009,7,4.133,7.5,4.133s0.7929,0.4907,0.9414,0.6777
 	c0.175,0.2204,0.4973,0.2531,0.7129,0.0723l1.668-1.4004c0.4408-0.3741,0.0006-1.0735-0.5273-0.8379L9,3.2268V1.5002
diff --git a/svgs/svgs_iconset/warehouse_15.svg b/svgs/svgs_iconset/warehouse.svg
similarity index 51%
rename from svgs/svgs_iconset/warehouse_15.svg
rename to svgs/svgs_iconset/warehouse.svg
index b231450e..8e3a0bd5 100644
--- a/svgs/svgs_iconset/warehouse_15.svg
+++ b/svgs/svgs_iconset/warehouse.svg
@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 19 19" height="19" width="19"><title>warehouse_15.svg</title><rect fill="none" x="0" y="0" width="19" height="19"></rect><path fill="#725a50" transform="translate(2 2)" d="M13.5,5c-0.0762,0.0003-0.1514-0.0168-0.22-0.05L7.5,2L1.72,4.93C1.4632,5.0515,1.1565,4.9418,1.035,4.685
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 19 19" height="19" width="19"><title>warehouse.svg</title><rect fill="none" x="0" y="0" width="19" height="19"></rect><path fill="#725a50" transform="translate(2 2)" d="M13.5,5c-0.0762,0.0003-0.1514-0.0168-0.22-0.05L7.5,2L1.72,4.93C1.4632,5.0515,1.1565,4.9418,1.035,4.685
 	S1.0232,4.1215,1.28,4L7.5,0.92L13.72,4c0.2761,0.0608,0.4508,0.3339,0.39,0.61C14.0492,4.8861,13.7761,5.0608,13.5,5z M5,10H2v3h3
 	V10z M9,10H6v3h3V10z M13,10h-3v3h3V10z M11,6H8v3h3V6z M7,6H4v3h3V6z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/waste_basket.svg b/svgs/svgs_iconset/waste_basket.svg
new file mode 100644
index 00000000..f460626a
--- /dev/null
+++ b/svgs/svgs_iconset/waste_basket.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>waste_basket.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#725a50" transform="translate(3 3)" d="M12.41,5.58l-1.34,8c-0.0433,0.2368-0.2493,0.4091-0.49,0.41H4.42c-0.2407-0.0009-0.4467-0.1732-0.49-0.41l-1.34-8
+	C2.5458,5.3074,2.731,5.0506,3.0035,5.0064C3.0288,5.0023,3.0544,5.0002,3.08,5h8.83c0.2761-0.0036,0.5028,0.2174,0.5064,0.4935
+	C12.4168,5.5225,12.4146,5.5514,12.41,5.58z M13,3.5C13,3.7761,12.7761,4,12.5,4h-10C2.2239,4,2,3.7761,2,3.5S2.2239,3,2.5,3H5V1.5
+	C5,1.2239,5.2239,1,5.5,1h4C9.7761,1,10,1.2239,10,1.5V3h2.5C12.7761,3,13,3.2239,13,3.5z M9,3V2H6v1H9z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/waste_basket_15.svg b/svgs/svgs_iconset/waste_basket_15.svg
deleted file mode 100644
index 55e90d43..00000000
--- a/svgs/svgs_iconset/waste_basket_15.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>waste_basket_15.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#725a50" transform="translate(3 3)" d="M12.41,5.58l-1.34,8c-0.0433,0.2368-0.2493,0.4091-0.49,0.41H4.42c-0.2407-0.0009-0.4467-0.1732-0.49-0.41l-1.34-8
-	C2.5458,5.3074,2.731,5.0506,3.0035,5.0064C3.0288,5.0023,3.0544,5.0002,3.08,5h8.83c0.2761-0.0036,0.5028,0.2174,0.5064,0.4935
-	C12.4168,5.5225,12.4146,5.5514,12.41,5.58z M13,3.5C13,3.7761,12.7761,4,12.5,4h-10C2.2239,4,2,3.7761,2,3.5S2.2239,3,2.5,3H5V1.5
-	C5,1.2239,5.2239,1,5.5,1h4C9.7761,1,10,1.2239,10,1.5V3h2.5C12.7761,3,13,3.2239,13,3.5z M9,3V2H6v1H9z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/water.svg b/svgs/svgs_iconset/water.svg
new file mode 100644
index 00000000..e0f8860b
--- /dev/null
+++ b/svgs/svgs_iconset/water.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>water.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#725a50" transform="translate(3 3)" d="M7.49,15C4.5288,14.827,2.1676,12.4615,2,9.5C2,6.6,6.25,1.66,7.49,0c1.24,1.66,5,6.59,5,9.49S10.17,15,7.49,15z"></path></svg>
\ No newline at end of file
diff --git a/svgs/svgs_iconset/wetland_15.svg b/svgs/svgs_iconset/wetland.svg
similarity index 75%
rename from svgs/svgs_iconset/wetland_15.svg
rename to svgs/svgs_iconset/wetland.svg
index 3a2dd41a..ade81a32 100644
--- a/svgs/svgs_iconset/wetland_15.svg
+++ b/svgs/svgs_iconset/wetland.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>wetland_15.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#76a723" transform="translate(3 3)" d="M1.48,4.5C1.905,4.1467,2.4483,3.968,3,4c1.2273-0.0869,2.3154,0.7836,2.5,2l0.78,4.68c-0.6394-0.2893-1.3759-0.2709-2,0.05
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>wetland.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#76a723" transform="translate(3 3)" d="M1.48,4.5C1.905,4.1467,2.4483,3.968,3,4c1.2273-0.0869,2.3154,0.7836,2.5,2l0.78,4.68c-0.6394-0.2893-1.3759-0.2709-2,0.05
 	L3.48,6C3.1874,5.1347,2.3926,4.5387,1.48,4.5z M7.48,11.24c0.3816-0.3076,0.825-0.5293,1.3-0.65L10,3
 	c0.2926-0.8653,1.0874-1.4613,2-1.5c-0.4198-0.3485-0.955-0.5269-1.5-0.5C9.2727,0.9131,8.1846,1.7836,8,3l-1.3,7.79
 	C6.9786,10.9052,7.2408,11.0565,7.48,11.24z M11.8,10.74L11.8,10.74c0.1565-0.1277,0.3238-0.2414,0.5-0.34L13,6
diff --git a/svgs/svgs_iconset/wheelchair_15.svg b/svgs/svgs_iconset/wheelchair.svg
similarity index 67%
rename from svgs/svgs_iconset/wheelchair_15.svg
rename to svgs/svgs_iconset/wheelchair.svg
index 1b34e93a..ecb8a2c2 100644
--- a/svgs/svgs_iconset/wheelchair_15.svg
+++ b/svgs/svgs_iconset/wheelchair.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>wheelchair_15.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#725a50" transform="translate(3 3)" d="M12,1.5C12,2.3284,11.3284,3,10.5,3S9,2.3284,9,1.5S9.6716,0,10.5,0S12,0.6716,12,1.5z M2.82,4.87l1.74-1.71l1.85,1.29
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>wheelchair.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#725a50" transform="translate(3 3)" d="M12,1.5C12,2.3284,11.3284,3,10.5,3S9,2.3284,9,1.5S9.6716,0,10.5,0S12,0.6716,12,1.5z M2.82,4.87l1.74-1.71l1.85,1.29
 	L5.67,5.7c1.0747,0.3341,2.0207,0.9904,2.71,1.88l0.88-1.5c0.2295-0.4158,0.0785-0.939-0.3373-1.1685
 	C8.9218,4.911,8.9209,4.9105,8.92,4.91L8.3,4.54L4.79,2.1C4.5927,1.9594,4.3231,1.9805,4.15,2.15l-2,2
 	C1.9852,4.3716,2.0312,4.6848,2.2528,4.8496C2.4193,4.9735,2.645,4.9816,2.82,4.87z M8.13,10.94
diff --git a/svgs/svgs_iconset/zoo_15.svg b/svgs/svgs_iconset/zoo.svg
similarity index 66%
rename from svgs/svgs_iconset/zoo_15.svg
rename to svgs/svgs_iconset/zoo.svg
index 4b057d42..6df78d1d 100644
--- a/svgs/svgs_iconset/zoo_15.svg
+++ b/svgs/svgs_iconset/zoo.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>zoo_15.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#5d60be" transform="translate(3 3)" d="
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21" height="21" width="21"><title>zoo.svg</title><rect fill="none" x="0" y="0" width="21" height="21"></rect><rect x="1" y="1" rx="9.5" ry="9.5" width="19" height="19" stroke="#bbb" style="stroke-linejoin:round;stroke-miterlimit:4;" fill="#bbb" stroke-width="2"></rect><rect x="1" y="1" width="19" height="19" rx="9.5" ry="9.5" fill="#fff"></rect><path fill="#5d60be" transform="translate(3 3)" d="
 	M8.3879,3.8928C8.3879,3.8928,7.6818,5,7,5H4.5C3.8182,5,3.2016,5.4086,2.7273,5.8636L0.5,8C0.231,8.258,0.0072,8.7681,0,9
 	c-0.0156,0.5,0,1,0,1s1,0,1-1V8.5l1-1h0.5l0.158,0.2892c0,0-0.9535,1.8244-0.9535,3.5289C1.7046,12,2.3864,12,2.3864,12h0.6818
 	c0,0,0.3409,0,0-0.3409l-0.3409-0.3409C2.7273,10.6364,3.5002,9.6667,4,9c0,0,0.0168,1.1579,0,2c-0.008,0.4096,0.2721,1,0.6818,1

From 96ef826221929709a24b68f489cab16e149ee538 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn?= <pathmapper@posteo.de>
Date: Sun, 15 Oct 2023 11:47:04 +0200
Subject: [PATCH 2/2] Update README.md

---
 README.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 9f333d1a..a34da2a0 100644
--- a/README.md
+++ b/README.md
@@ -102,6 +102,9 @@ Green        | `#76a723`
 
 **Modify Icons**
 
+_When submitting a PR, no need to include the sprites. They will be automatically created when merging a PR.<br>
+The size 11 icons are included in the sprites for backward compatability. Please don't include new size 11 icons._
+
 1. Take the `iconset.json` and import it to the [Maki Editor](https://www.mapbox.com/maki-icons/editor/).
 2. Apply your changes and download the icons in SVG format and the iconset in JSON format.
 Save the downloaded SVGs from Maki Editor to the folder [svgs_iconset](https://github.com/maputnik/osm-liberty/tree/gh-pages/svgs/svgs_iconset).
@@ -110,7 +113,6 @@ Save the downloaded SVGs from Maki Editor to the folder [svgs_iconset](https://g
 These are the SVGs for road shields, the dot used for city and town layers and the road area pattern which could not be modified using the Maki Editor. To modify these you could use e.g. [Inkscape](https://inkscape.org).
 5. Install the NPM dev dependencies: `npm install` to have [spritezero-cli](https://gitlab.com/beyondtracks/spritezero-cli) available (we're using a fork of https://github.com/mapbox/spritezero-cli ).
 6. Generate the low and high resolution sprites: `npm run build_sprites`
-7. **When submitting a PR, no need to include the sprites. They will be automatically created when merging a PR.**
 
 ## Have a look at ...