diff --git a/coinmap-icons.js b/coinmap-icons.js
index 94ba54c..0af133a 100644
--- a/coinmap-icons.js
+++ b/coinmap-icons.js
@@ -1,157 +1,141 @@
-var icon_bitcoin = L.icon({iconUrl: 'bitcoin.png', iconSize: [24, 24] });
-var icon_transport_airport = L.icon({iconUrl: 'icons/transport_airport.n.24.png', iconSize: [24, 24] });
-var icon_place_of_worship_unknown3 = L.icon({iconUrl: 'icons/place_of_worship_unknown3.n.24.png', iconSize: [24, 24] });
+var icon_accommodation_alpinehut = L.icon({iconUrl: 'icons/accommodation_alpinehut.n.24.png', iconSize: [24, 24] });
+var icon_accommodation_bed_and_breakfast = L.icon({iconUrl: 'icons/accommodation_bed_and_breakfast.n.24.png', iconSize: [24, 24] });
+var icon_accommodation_camping = L.icon({iconUrl: 'icons/accommodation_camping.n.24.png', iconSize: [24, 24] });
+var icon_accommodation_caravan_park = L.icon({iconUrl: 'icons/accommodation_caravan_park.n.24.png', iconSize: [24, 24] });
+var icon_accommodation_chalet = L.icon({iconUrl: 'icons/accommodation_chalet.n.24.png', iconSize: [24, 24] });
+var icon_accommodation_hotel = L.icon({iconUrl: 'icons/accommodation_hotel.n.24.png', iconSize: [24, 24] });
+var icon_accommodation_motel = L.icon({iconUrl: 'icons/accommodation_motel.n.24.png', iconSize: [24, 24] });
+var icon_accommodation_shelter2 = L.icon({iconUrl: 'icons/accommodation_shelter2.n.24.png', iconSize: [24, 24] });
+var icon_accommodation_youth_hostel = L.icon({iconUrl: 'icons/accommodation_youth_hostel.n.24.png', iconSize: [24, 24] });
+var icon_amenity_bench = L.icon({iconUrl: 'icons/amenity_bench.n.24.png', iconSize: [24, 24] });
 var icon_amenity_firestation2 = L.icon({iconUrl: 'icons/amenity_firestation2.n.24.png', iconSize: [24, 24] });
-var icon_tourist_zoo = L.icon({iconUrl: 'icons/tourist_zoo.n.24.png', iconSize: [24, 24] });
-var icon_transport_speedbump = L.icon({iconUrl: 'icons/transport_speedbump.n.24.png', iconSize: [24, 24] });
-var icon_food_pub = L.icon({iconUrl: 'icons/food_pub.n.24.png', iconSize: [24, 24] });
-var icon_power_substation = L.icon({iconUrl: 'icons/power_substation.n.24.png', iconSize: [24, 24] });
-var icon_poi_place_village = L.icon({iconUrl: 'icons/poi_place_village.n.24.png', iconSize: [24, 24] });
-var icon_tourist_memorial = L.icon({iconUrl: 'icons/tourist_memorial.n.24.png', iconSize: [24, 24] });
-var icon_shopping_clothes = L.icon({iconUrl: 'icons/shopping_clothes.n.24.png', iconSize: [24, 24] });
+var icon_amenity_fountain2 = L.icon({iconUrl: 'icons/amenity_fountain2.n.24.png', iconSize: [24, 24] });
+var icon_amenity_information = L.icon({iconUrl: 'icons/amenity_information.n.24.png', iconSize: [24, 24] });
+var icon_amenity_library = L.icon({iconUrl: 'icons/amenity_library.n.24.png', iconSize: [24, 24] });
+var icon_amenity_playground = L.icon({iconUrl: 'icons/amenity_playground.n.24.png', iconSize: [24, 24] });
+var icon_amenity_police2 = L.icon({iconUrl: 'icons/amenity_police2.n.24.png', iconSize: [24, 24] });
+var icon_amenity_post_box = L.icon({iconUrl: 'icons/amenity_post_box.n.24.png', iconSize: [24, 24] });
+var icon_amenity_post_office = L.icon({iconUrl: 'icons/amenity_post_office.n.24.png', iconSize: [24, 24] });
+var icon_amenity_recycling = L.icon({iconUrl: 'icons/amenity_recycling.n.24.png', iconSize: [24, 24] });
 var icon_amenity_telephone = L.icon({iconUrl: 'icons/amenity_telephone.n.24.png', iconSize: [24, 24] });
-var icon_health_hospital = L.icon({iconUrl: 'icons/health_hospital.n.24.png', iconSize: [24, 24] });
-var icon_shopping_greengrocer = L.icon({iconUrl: 'icons/shopping_greengrocer.n.24.png', iconSize: [24, 24] });
-var icon_tourist_monument = L.icon({iconUrl: 'icons/tourist_monument.n.24.png', iconSize: [24, 24] });
-var icon_sport_golf = L.icon({iconUrl: 'icons/sport_golf.n.24.png', iconSize: [24, 24] });
-var icon_transport_bus_stop2 = L.icon({iconUrl: 'icons/transport_bus_stop2.n.24.png', iconSize: [24, 24] });
-var icon_poi_place_suburb = L.icon({iconUrl: 'icons/poi_place_suburb.n.24.png', iconSize: [24, 24] });
-var icon_shopping_fish = L.icon({iconUrl: 'icons/shopping_fish.n.24.png', iconSize: [24, 24] });
-var icon_tourist_theatre = L.icon({iconUrl: 'icons/tourist_theatre.n.24.png', iconSize: [24, 24] });
-var icon_transport_parking_bicycle = L.icon({iconUrl: 'icons/transport_parking_bicycle.n.24.png', iconSize: [24, 24] });
-var icon_amenity_town_hall = L.icon({iconUrl: 'icons/amenity_town_hall.n.24.png', iconSize: [24, 24] });
 var icon_amenity_toilets = L.icon({iconUrl: 'icons/amenity_toilets.n.24.png', iconSize: [24, 24] });
-var icon_money_bank2 = L.icon({iconUrl: 'icons/money_bank2.n.24.png', iconSize: [24, 24] });
-var icon_sport_leisure_centre = L.icon({iconUrl: 'icons/sport_leisure_centre.n.24.png', iconSize: [24, 24] });
-var icon_shopping_kiosk = L.icon({iconUrl: 'icons/shopping_kiosk.n.24.png', iconSize: [24, 24] });
-var icon_emergency_telepho = L.icon({iconUrl: 'icons/emergency-telepho.n.24.png', iconSize: [24, 24] });
-var icon_shopping_convenience = L.icon({iconUrl: 'icons/shopping_convenience.n.24.png', iconSize: [24, 24] });
-var icon_shopping_book = L.icon({iconUrl: 'icons/shopping_book.n.24.png', iconSize: [24, 24] });
-var icon_barrier_toll_booth = L.icon({iconUrl: 'icons/barrier_toll_booth.n.24.png', iconSize: [24, 24] });
-var icon_shopping_jewelry = L.icon({iconUrl: 'icons/shopping_jewelry.n.24.png', iconSize: [24, 24] });
-var icon_food_drinkingtap = L.icon({iconUrl: 'icons/food_drinkingtap.n.24.png', iconSize: [24, 24] });
-var icon_shopping_butcher = L.icon({iconUrl: 'icons/shopping_butcher.n.24.png', iconSize: [24, 24] });
-var icon_accommodation_shelter2 = L.icon({iconUrl: 'icons/accommodation_shelter2.n.24.png', iconSize: [24, 24] });
-var icon_transport_train_station = L.icon({iconUrl: 'icons/transport_train_station.n.24.png', iconSize: [24, 24] });
-var icon_landuse_grass = L.icon({iconUrl: 'icons/landuse_grass.n.24.png', iconSize: [24, 24] });
-var icon_tourist_battlefield = L.icon({iconUrl: 'icons/tourist_battlefield.n.24.png', iconSize: [24, 24] });
-var icon_shopping_alcohol = L.icon({iconUrl: 'icons/shopping_alcohol.n.24.png', iconSize: [24, 24] });
-var icon_shopping_bakery = L.icon({iconUrl: 'icons/shopping_bakery.n.24.png', iconSize: [24, 24] });
-var icon_shopping_florist = L.icon({iconUrl: 'icons/shopping_florist.n.24.png', iconSize: [24, 24] });
-var icon_transport_parking_car = L.icon({iconUrl: 'icons/transport_parking_car.n.24.png', iconSize: [24, 24] });
-var icon_transport_miniroundabout_anticlockwise = L.icon({iconUrl: 'icons/transport_miniroundabout_anticlockwise.n.24.png', iconSize: [24, 24] });
-var icon_landuse_grass = L.icon({iconUrl: 'icons/landuse_grass.n.24.png', iconSize: [24, 24] });
-var icon_building_ge = L.icon({iconUrl: 'icons/building_ge.n.24.png', iconSize: [24, 24] });
-var icon_power_tower_high2 = L.icon({iconUrl: 'icons/power_tower_high2.n.24.png', iconSize: [24, 24] });
-var icon_amenity_library = L.icon({iconUrl: 'icons/amenity_library.n.24.png', iconSize: [24, 24] });
-var icon_money_atm = L.icon({iconUrl: 'icons/money_atm.n.24.png', iconSize: [24, 24] });
-var icon_transport_turning_circle = L.icon({iconUrl: 'icons/transport_turning_circle.n.24.png', iconSize: [24, 24] });
-var icon_shopping_motorcycle = L.icon({iconUrl: 'icons/shopping_motorcycle.n.24.png', iconSize: [24, 24] });
-var icon_accommodation_motel = L.icon({iconUrl: 'icons/accommodation_motel.n.24.png', iconSize: [24, 24] });
-var icon_tourist_castle = L.icon({iconUrl: 'icons/tourist_castle.n.24.png', iconSize: [24, 24] });
+var icon_amenity_town_hall = L.icon({iconUrl: 'icons/amenity_town_hall.n.24.png', iconSize: [24, 24] });
+var icon_amenity_waste_bin = L.icon({iconUrl: 'icons/amenity_waste_bin.n.24.png', iconSize: [24, 24] });
 var icon_barrier_bloc = L.icon({iconUrl: 'icons/barrier_bloc.n.24.png', iconSize: [24, 24] });
-var icon_sport_shooting = L.icon({iconUrl: 'icons/sport_shooting.n.24.png', iconSize: [24, 24] });
-var icon_health_veterinary = L.icon({iconUrl: 'icons/health_veterinary.n.24.png', iconSize: [24, 24] });
+var icon_barrier_bollard = L.icon({iconUrl: 'icons/barrier_bollard.n.24.png', iconSize: [24, 24] });
+var icon_barrier_cattle_gr = L.icon({iconUrl: 'icons/barrier_cattle_gr.n.24.png', iconSize: [24, 24] });
+var icon_barrier_cycle_barri = L.icon({iconUrl: 'icons/barrier_cycle_barri.n.24.png', iconSize: [24, 24] });
 var icon_barrier_gate = L.icon({iconUrl: 'icons/barrier_gate.n.24.png', iconSize: [24, 24] });
 var icon_barrier_kissing_ga = L.icon({iconUrl: 'icons/barrier_kissing_ga.n.24.png', iconSize: [24, 24] });
-var icon_tourist_picnic = L.icon({iconUrl: 'icons/tourist_picnic.n.24.png', iconSize: [24, 24] });
-var icon_landuse_coniferous = L.icon({iconUrl: 'icons/landuse_coniferous.n.24.png', iconSize: [24, 24] });
-var icon_transport_fuel = L.icon({iconUrl: 'icons/transport_fuel.n.24.png', iconSize: [24, 24] });
-var icon_power_tower_low = L.icon({iconUrl: 'icons/power_tower_low.n.24.png', iconSize: [24, 24] });
-var icon_landuse_grass = L.icon({iconUrl: 'icons/landuse_grass.n.24.png', iconSize: [24, 24] });
-var icon_poi_boundary_administrative = L.icon({iconUrl: 'icons/poi_boundary_administrative.n.24.png', iconSize: [24, 24] });
-var icon_shopping_confectionery = L.icon({iconUrl: 'icons/shopping_confectionery.n.24.png', iconSize: [24, 24] });
-var icon_shopping_gift = L.icon({iconUrl: 'icons/shopping_gift.n.24.png', iconSize: [24, 24] });
 var icon_barrier_lift_gate = L.icon({iconUrl: 'icons/barrier_lift_gate.n.24.png', iconSize: [24, 24] });
-var icon_tourist_attraction = L.icon({iconUrl: 'icons/tourist_attraction.n.24.png', iconSize: [24, 24] });
-var icon_accommodation_youth_hostel = L.icon({iconUrl: 'icons/accommodation_youth_hostel.n.24.png', iconSize: [24, 24] });
-var icon_accommodation_chalet = L.icon({iconUrl: 'icons/accommodation_chalet.n.24.png', iconSize: [24, 24] });
-var icon_sport_leisure_centre = L.icon({iconUrl: 'icons/sport_leisure_centre.n.24.png', iconSize: [24, 24] });
+var icon_barrier_stile = L.icon({iconUrl: 'icons/barrier_stile.n.24.png', iconSize: [24, 24] });
+var icon_barrier_toll_booth = L.icon({iconUrl: 'icons/barrier_toll_booth.n.24.png', iconSize: [24, 24] });
+var icon_bitcoin = L.icon({iconUrl: 'bitcoin.png', iconSize: [24, 24] });
+var icon_building_ge = L.icon({iconUrl: 'icons/building_ge.n.24.png', iconSize: [24, 24] });
+var icon_education_nursery3 = L.icon({iconUrl: 'icons/education_nursery3.n.24.png', iconSize: [24, 24] });
+var icon_education_school = L.icon({iconUrl: 'icons/education_school.n.24.png', iconSize: [24, 24] });
+var icon_education_university = L.icon({iconUrl: 'icons/education_university.n.24.png', iconSize: [24, 24] });
+var icon_emergency_telepho = L.icon({iconUrl: 'icons/emergency-telepho.n.24.png', iconSize: [24, 24] });
+var icon_food_bar = L.icon({iconUrl: 'icons/food_bar.n.24.png', iconSize: [24, 24] });
+var icon_food_cafe = L.icon({iconUrl: 'icons/food_cafe.n.24.png', iconSize: [24, 24] });
+var icon_food_drinkingtap = L.icon({iconUrl: 'icons/food_drinkingtap.n.24.png', iconSize: [24, 24] });
+var icon_food_fastfood = L.icon({iconUrl: 'icons/food_fastfood.n.24.png', iconSize: [24, 24] });
 var icon_food_nightclub = L.icon({iconUrl: 'icons/food_nightclub.n.24.png', iconSize: [24, 24] });
-var icon_transport_car_wash = L.icon({iconUrl: 'icons/transport_car_wash.n.24.png', iconSize: [24, 24] });
-var icon_amenity_waste_bin = L.icon({iconUrl: 'icons/amenity_waste_bin.n.24.png', iconSize: [24, 24] });
-var icon_accommodation_caravan_park = L.icon({iconUrl: 'icons/accommodation_caravan_park.n.24.png', iconSize: [24, 24] });
-var icon_amenity_recycling = L.icon({iconUrl: 'icons/amenity_recycling.n.24.png', iconSize: [24, 24] });
+var icon_food_pub = L.icon({iconUrl: 'icons/food_pub.n.24.png', iconSize: [24, 24] });
+var icon_food_restaurant = L.icon({iconUrl: 'icons/food_restaurant.n.24.png', iconSize: [24, 24] });
+var icon_health_hospital = L.icon({iconUrl: 'icons/health_hospital.n.24.png', iconSize: [24, 24] });
 var icon_health_pharmacy = L.icon({iconUrl: 'icons/health_pharmacy.n.24.png', iconSize: [24, 24] });
-var icon_sport_leisure_centre = L.icon({iconUrl: 'icons/sport_leisure_centre.n.24.png', iconSize: [24, 24] });
+var icon_health_veterinary = L.icon({iconUrl: 'icons/health_veterinary.n.24.png', iconSize: [24, 24] });
+var icon_landuse_coniferous = L.icon({iconUrl: 'icons/landuse_coniferous.n.24.png', iconSize: [24, 24] });
+var icon_landuse_grass = L.icon({iconUrl: 'icons/landuse_grass.n.24.png', iconSize: [24, 24] });
+var icon_money_atm = L.icon({iconUrl: 'icons/money_atm.n.24.png', iconSize: [24, 24] });
+var icon_money_bank2 = L.icon({iconUrl: 'icons/money_bank2.n.24.png', iconSize: [24, 24] });
 var icon_place_of_worship_unknown3 = L.icon({iconUrl: 'icons/place_of_worship_unknown3.n.24.png', iconSize: [24, 24] });
-var icon_tourist_art_gallery2 = L.icon({iconUrl: 'icons/tourist_art_gallery2.n.24.png', iconSize: [24, 24] });
-var icon_education_school = L.icon({iconUrl: 'icons/education_school.n.24.png', iconSize: [24, 24] });
-var icon_amenity_police2 = L.icon({iconUrl: 'icons/amenity_police2.n.24.png', iconSize: [24, 24] });
-var icon_food_bar = L.icon({iconUrl: 'icons/food_bar.n.24.png', iconSize: [24, 24] });
+var icon_place_of_worship_unknown = L.icon({iconUrl: 'icons/place_of_worship_unknown.n.24.png', iconSize: [24, 24] });
+var icon_poi_boundary_administrative = L.icon({iconUrl: 'icons/poi_boundary_administrative.n.24.png', iconSize: [24, 24] });
+var icon_poi_military_bunker = L.icon({iconUrl: 'icons/poi_military_bunker.n.24.png', iconSize: [24, 24] });
+var icon_poi_mine = L.icon({iconUrl: 'icons/poi_mine.n.24.png', iconSize: [24, 24] });
+var icon_poi_place_city = L.icon({iconUrl: 'icons/poi_place_city.n.24.png', iconSize: [24, 24] });
 var icon_poi_place_hamlet = L.icon({iconUrl: 'icons/poi_place_hamlet.n.24.png', iconSize: [24, 24] });
-var icon_shopping_bicycle = L.icon({iconUrl: 'icons/shopping_bicycle.n.24.png', iconSize: [24, 24] });
-var icon_shopping_toys = L.icon({iconUrl: 'icons/shopping_toys.n.24.png', iconSize: [24, 24] });
-var icon_landuse_grass = L.icon({iconUrl: 'icons/landuse_grass.n.24.png', iconSize: [24, 24] });
+var icon_poi_place_suburb = L.icon({iconUrl: 'icons/poi_place_suburb.n.24.png', iconSize: [24, 24] });
+var icon_poi_place_town = L.icon({iconUrl: 'icons/poi_place_town.n.24.png', iconSize: [24, 24] });
+var icon_poi_place_village = L.icon({iconUrl: 'icons/poi_place_village.n.24.png', iconSize: [24, 24] });
 var icon_power_st = L.icon({iconUrl: 'icons/power_st.n.24.png', iconSize: [24, 24] });
-var icon_transport_tram_stop = L.icon({iconUrl: 'icons/transport_tram_stop.n.24.png', iconSize: [24, 24] });
-var icon_landuse_coniferous = L.icon({iconUrl: 'icons/landuse_coniferous.n.24.png', iconSize: [24, 24] });
+var icon_power_substation = L.icon({iconUrl: 'icons/power_substation.n.24.png', iconSize: [24, 24] });
+var icon_power_tower_high2 = L.icon({iconUrl: 'icons/power_tower_high2.n.24.png', iconSize: [24, 24] });
+var icon_power_tower_low = L.icon({iconUrl: 'icons/power_tower_low.n.24.png', iconSize: [24, 24] });
 var icon_power_transformer = L.icon({iconUrl: 'icons/power_transformer.n.24.png', iconSize: [24, 24] });
-var icon_transport_taxi_rank = L.icon({iconUrl: 'icons/transport_taxi_rank.n.24.png', iconSize: [24, 24] });
-var icon_shopping_supermarket = L.icon({iconUrl: 'icons/shopping_supermarket.n.24.png', iconSize: [24, 24] });
-var icon_shopping_marketplace = L.icon({iconUrl: 'icons/shopping_marketplace.n.24.png', iconSize: [24, 24] });
-var icon_accommodation_hotel = L.icon({iconUrl: 'icons/accommodation_hotel.n.24.png', iconSize: [24, 24] });
-var icon_barrier_stile = L.icon({iconUrl: 'icons/barrier_stile.n.24.png', iconSize: [24, 24] });
-var icon_place_of_worship_unknown = L.icon({iconUrl: 'icons/place_of_worship_unknown.n.24.png', iconSize: [24, 24] });
-var icon_poi_place_suburb = L.icon({iconUrl: 'icons/poi_place_suburb.n.24.png', iconSize: [24, 24] });
+var icon_shopping_alcohol = L.icon({iconUrl: 'icons/shopping_alcohol.n.24.png', iconSize: [24, 24] });
+var icon_shopping_bakery = L.icon({iconUrl: 'icons/shopping_bakery.n.24.png', iconSize: [24, 24] });
+var icon_shopping_bicycle = L.icon({iconUrl: 'icons/shopping_bicycle.n.24.png', iconSize: [24, 24] });
+var icon_shopping_book = L.icon({iconUrl: 'icons/shopping_book.n.24.png', iconSize: [24, 24] });
+var icon_shopping_butcher = L.icon({iconUrl: 'icons/shopping_butcher.n.24.png', iconSize: [24, 24] });
+var icon_shopping_car = L.icon({iconUrl: 'icons/shopping_car.n.24.png', iconSize: [24, 24] });
+var icon_shopping_car_repair = L.icon({iconUrl: 'icons/shopping_car_repair.n.24.png', iconSize: [24, 24] });
+var icon_shopping_clothes = L.icon({iconUrl: 'icons/shopping_clothes.n.24.png', iconSize: [24, 24] });
+var icon_shopping_computer = L.icon({iconUrl: 'icons/shopping_computer.n.24.png', iconSize: [24, 24] });
+var icon_shopping_confectionery = L.icon({iconUrl: 'icons/shopping_confectionery.n.24.png', iconSize: [24, 24] });
+var icon_shopping_convenience = L.icon({iconUrl: 'icons/shopping_convenience.n.24.png', iconSize: [24, 24] });
+var icon_shopping_department_store = L.icon({iconUrl: 'icons/shopping_department_store.n.24.png', iconSize: [24, 24] });
+var icon_shopping_diy = L.icon({iconUrl: 'icons/shopping_diy.n.24.png', iconSize: [24, 24] });
+var icon_shopping_fish = L.icon({iconUrl: 'icons/shopping_fish.n.24.png', iconSize: [24, 24] });
+var icon_shopping_florist = L.icon({iconUrl: 'icons/shopping_florist.n.24.png', iconSize: [24, 24] });
+var icon_shopping_garden_centre = L.icon({iconUrl: 'icons/shopping_garden_centre.n.24.png', iconSize: [24, 24] });
+var icon_shopping_gift = L.icon({iconUrl: 'icons/shopping_gift.n.24.png', iconSize: [24, 24] });
+var icon_shopping_greengrocer = L.icon({iconUrl: 'icons/shopping_greengrocer.n.24.png', iconSize: [24, 24] });
 var icon_shopping_hairdresser = L.icon({iconUrl: 'icons/shopping_hairdresser.n.24.png', iconSize: [24, 24] });
-var icon_tourist_archaeological = L.icon({iconUrl: 'icons/tourist_archaeological.n.24.png', iconSize: [24, 24] });
-var icon_transport_rental_car = L.icon({iconUrl: 'icons/transport_rental_car.n.24.png', iconSize: [24, 24] });
-var icon_transport_airport_gate = L.icon({iconUrl: 'icons/transport_airport_gate.n.24.png', iconSize: [24, 24] });
-var icon_amenity_bench = L.icon({iconUrl: 'icons/amenity_bench.n.24.png', iconSize: [24, 24] });
-var icon_tourist_ruin = L.icon({iconUrl: 'icons/tourist_ruin.n.24.png', iconSize: [24, 24] });
-var icon_building_ge = L.icon({iconUrl: 'icons/building_ge.n.24.png', iconSize: [24, 24] });
-var icon_transport_bus_station = L.icon({iconUrl: 'icons/transport_bus_station.n.24.png', iconSize: [24, 24] });
-var icon_accommodation_bed_and_breakfast = L.icon({iconUrl: 'icons/accommodation_bed_and_breakfast.n.24.png', iconSize: [24, 24] });
 var icon_shopping_hifi = L.icon({iconUrl: 'icons/shopping_hifi.n.24.png', iconSize: [24, 24] });
-var icon_shopping_music = L.icon({iconUrl: 'icons/shopping_music.n.24.png', iconSize: [24, 24] });
-var icon_shopping_car_repair = L.icon({iconUrl: 'icons/shopping_car_repair.n.24.png', iconSize: [24, 24] });
-var icon_tourist_view_point = L.icon({iconUrl: 'icons/tourist_view_point.n.24.png', iconSize: [24, 24] });
-var icon_food_restaurant = L.icon({iconUrl: 'icons/food_restaurant.n.24.png', iconSize: [24, 24] });
-var icon_poi_military_bunker = L.icon({iconUrl: 'icons/poi_military_bunker.n.24.png', iconSize: [24, 24] });
-var icon_amenity_fountain2 = L.icon({iconUrl: 'icons/amenity_fountain2.n.24.png', iconSize: [24, 24] });
-var icon_poi_place_town = L.icon({iconUrl: 'icons/poi_place_town.n.24.png', iconSize: [24, 24] });
-var icon_amenity_information = L.icon({iconUrl: 'icons/amenity_information.n.24.png', iconSize: [24, 24] });
+var icon_shopping_jewelry = L.icon({iconUrl: 'icons/shopping_jewelry.n.24.png', iconSize: [24, 24] });
+var icon_shopping_kiosk = L.icon({iconUrl: 'icons/shopping_kiosk.n.24.png', iconSize: [24, 24] });
 var icon_shopping_laundrette = L.icon({iconUrl: 'icons/shopping_laundrette.n.24.png', iconSize: [24, 24] });
+var icon_shopping_marketplace = L.icon({iconUrl: 'icons/shopping_marketplace.n.24.png', iconSize: [24, 24] });
+var icon_shopping_mobile_phone = L.icon({iconUrl: 'icons/shopping_mobile_phone.n.24.png', iconSize: [24, 24] });
+var icon_shopping_motorcycle = L.icon({iconUrl: 'icons/shopping_motorcycle.n.24.png', iconSize: [24, 24] });
+var icon_shopping_music = L.icon({iconUrl: 'icons/shopping_music.n.24.png', iconSize: [24, 24] });
+var icon_shopping_newspaper = L.icon({iconUrl: 'icons/shopping_newspaper.n.24.png', iconSize: [24, 24] });
+var icon_shopping_supermarket = L.icon({iconUrl: 'icons/shopping_supermarket.n.24.png', iconSize: [24, 24] });
+var icon_shopping_toys = L.icon({iconUrl: 'icons/shopping_toys.n.24.png', iconSize: [24, 24] });
+var icon_shopping_vending_machine = L.icon({iconUrl: 'icons/shopping_vending_machine.n.24.png', iconSize: [24, 24] });
+var icon_sport_golf = L.icon({iconUrl: 'icons/sport_golf.n.24.png', iconSize: [24, 24] });
+var icon_sport_leisure_centre = L.icon({iconUrl: 'icons/sport_leisure_centre.n.24.png', iconSize: [24, 24] });
+var icon_sport_shooting = L.icon({iconUrl: 'icons/sport_shooting.n.24.png', iconSize: [24, 24] });
+var icon_sport_stadium = L.icon({iconUrl: 'icons/sport_stadium.n.24.png', iconSize: [24, 24] });
+var icon_sport_swimming_outdoor = L.icon({iconUrl: 'icons/sport_swimming_outdoor.n.24.png', iconSize: [24, 24] });
+var icon_tourist_archaeological = L.icon({iconUrl: 'icons/tourist_archaeological.n.24.png', iconSize: [24, 24] });
+var icon_tourist_art_gallery2 = L.icon({iconUrl: 'icons/tourist_art_gallery2.n.24.png', iconSize: [24, 24] });
+var icon_tourist_attraction = L.icon({iconUrl: 'icons/tourist_attraction.n.24.png', iconSize: [24, 24] });
+var icon_tourist_battlefield = L.icon({iconUrl: 'icons/tourist_battlefield.n.24.png', iconSize: [24, 24] });
+var icon_tourist_castle = L.icon({iconUrl: 'icons/tourist_castle.n.24.png', iconSize: [24, 24] });
 var icon_tourist_cinema = L.icon({iconUrl: 'icons/tourist_cinema.n.24.png', iconSize: [24, 24] });
-var icon_tourist_theme_park = L.icon({iconUrl: 'icons/tourist_theme_park.n.24.png', iconSize: [24, 24] });
-var icon_amenity_playground = L.icon({iconUrl: 'icons/amenity_playground.n.24.png', iconSize: [24, 24] });
-var icon_transport_marina = L.icon({iconUrl: 'icons/transport_marina.n.24.png', iconSize: [24, 24] });
-var icon_barrier_cattle_gr = L.icon({iconUrl: 'icons/barrier_cattle_gr.n.24.png', iconSize: [24, 24] });
+var icon_tourist_memorial = L.icon({iconUrl: 'icons/tourist_memorial.n.24.png', iconSize: [24, 24] });
+var icon_tourist_monument = L.icon({iconUrl: 'icons/tourist_monument.n.24.png', iconSize: [24, 24] });
+var icon_tourist_museum = L.icon({iconUrl: 'icons/tourist_museum.n.24.png', iconSize: [24, 24] });
 var icon_tourist_picnic = L.icon({iconUrl: 'icons/tourist_picnic.n.24.png', iconSize: [24, 24] });
+var icon_tourist_ruin = L.icon({iconUrl: 'icons/tourist_ruin.n.24.png', iconSize: [24, 24] });
+var icon_tourist_theatre = L.icon({iconUrl: 'icons/tourist_theatre.n.24.png', iconSize: [24, 24] });
+var icon_tourist_theme_park = L.icon({iconUrl: 'icons/tourist_theme_park.n.24.png', iconSize: [24, 24] });
+var icon_tourist_view_point = L.icon({iconUrl: 'icons/tourist_view_point.n.24.png', iconSize: [24, 24] });
+var icon_tourist_zoo = L.icon({iconUrl: 'icons/tourist_zoo.n.24.png', iconSize: [24, 24] });
+var icon_transport_airport_gate = L.icon({iconUrl: 'icons/transport_airport_gate.n.24.png', iconSize: [24, 24] });
+var icon_transport_airport = L.icon({iconUrl: 'icons/transport_airport.n.24.png', iconSize: [24, 24] });
+var icon_transport_airport_terminal = L.icon({iconUrl: 'icons/transport_airport_terminal.n.24.png', iconSize: [24, 24] });
+var icon_transport_bus_station = L.icon({iconUrl: 'icons/transport_bus_station.n.24.png', iconSize: [24, 24] });
+var icon_transport_bus_stop2 = L.icon({iconUrl: 'icons/transport_bus_stop2.n.24.png', iconSize: [24, 24] });
+var icon_transport_car_wash = L.icon({iconUrl: 'icons/transport_car_wash.n.24.png', iconSize: [24, 24] });
+var icon_transport_fuel = L.icon({iconUrl: 'icons/transport_fuel.n.24.png', iconSize: [24, 24] });
 var icon_transport_helicopter_pad = L.icon({iconUrl: 'icons/transport_helicopter_pad.n.24.png', iconSize: [24, 24] });
-var icon_barrier_cycle_barri = L.icon({iconUrl: 'icons/barrier_cycle_barri.n.24.png', iconSize: [24, 24] });
-var icon_barrier_bollard = L.icon({iconUrl: 'icons/barrier_bollard.n.24.png', iconSize: [24, 24] });
-var icon_building_ge = L.icon({iconUrl: 'icons/building_ge.n.24.png', iconSize: [24, 24] });
+var icon_transport_marina = L.icon({iconUrl: 'icons/transport_marina.n.24.png', iconSize: [24, 24] });
+var icon_transport_miniroundabout_anticlockwise = L.icon({iconUrl: 'icons/transport_miniroundabout_anticlockwise.n.24.png', iconSize: [24, 24] });
+var icon_transport_parking_bicycle = L.icon({iconUrl: 'icons/transport_parking_bicycle.n.24.png', iconSize: [24, 24] });
+var icon_transport_parking_car = L.icon({iconUrl: 'icons/transport_parking_car.n.24.png', iconSize: [24, 24] });
 var icon_transport_port = L.icon({iconUrl: 'icons/transport_port.n.24.png', iconSize: [24, 24] });
-var icon_amenity_post_office = L.icon({iconUrl: 'icons/amenity_post_office.n.24.png', iconSize: [24, 24] });
-var icon_building_ge = L.icon({iconUrl: 'icons/building_ge.n.24.png', iconSize: [24, 24] });
-var icon_tourist_museum = L.icon({iconUrl: 'icons/tourist_museum.n.24.png', iconSize: [24, 24] });
-var icon_shopping_garden_centre = L.icon({iconUrl: 'icons/shopping_garden_centre.n.24.png', iconSize: [24, 24] });
+var icon_transport_rental_bicycle = L.icon({iconUrl: 'icons/transport_rental_bicycle.n.24.png', iconSize: [24, 24] });
+var icon_transport_rental_car = L.icon({iconUrl: 'icons/transport_rental_car.n.24.png', iconSize: [24, 24] });
 var icon_transport_slipway = L.icon({iconUrl: 'icons/transport_slipway.n.24.png', iconSize: [24, 24] });
-var icon_shopping_vending_machine = L.icon({iconUrl: 'icons/shopping_vending_machine.n.24.png', iconSize: [24, 24] });
-var icon_landuse_grass = L.icon({iconUrl: 'icons/landuse_grass.n.24.png', iconSize: [24, 24] });
-var icon_food_fastfood = L.icon({iconUrl: 'icons/food_fastfood.n.24.png', iconSize: [24, 24] });
-var icon_education_university = L.icon({iconUrl: 'icons/education_university.n.24.png', iconSize: [24, 24] });
-var icon_shopping_car = L.icon({iconUrl: 'icons/shopping_car.n.24.png', iconSize: [24, 24] });
-var icon_amenity_post_box = L.icon({iconUrl: 'icons/amenity_post_box.n.24.png', iconSize: [24, 24] });
-var icon_transport_airport_terminal = L.icon({iconUrl: 'icons/transport_airport_terminal.n.24.png', iconSize: [24, 24] });
-var icon_poi_mine = L.icon({iconUrl: 'icons/poi_mine.n.24.png', iconSize: [24, 24] });
-var icon_food_cafe = L.icon({iconUrl: 'icons/food_cafe.n.24.png', iconSize: [24, 24] });
-var icon_building_ge = L.icon({iconUrl: 'icons/building_ge.n.24.png', iconSize: [24, 24] });
+var icon_transport_speedbump = L.icon({iconUrl: 'icons/transport_speedbump.n.24.png', iconSize: [24, 24] });
+var icon_transport_taxi_rank = L.icon({iconUrl: 'icons/transport_taxi_rank.n.24.png', iconSize: [24, 24] });
+var icon_transport_train_station = L.icon({iconUrl: 'icons/transport_train_station.n.24.png', iconSize: [24, 24] });
+var icon_transport_tram_stop = L.icon({iconUrl: 'icons/transport_tram_stop.n.24.png', iconSize: [24, 24] });
+var icon_transport_turning_circle = L.icon({iconUrl: 'icons/transport_turning_circle.n.24.png', iconSize: [24, 24] });
 var icon_transport_weir = L.icon({iconUrl: 'icons/transport_weir.n.24.png', iconSize: [24, 24] });
-var icon_sport_leisure_centre = L.icon({iconUrl: 'icons/sport_leisure_centre.n.24.png', iconSize: [24, 24] });
-var icon_shopping_diy = L.icon({iconUrl: 'icons/shopping_diy.n.24.png', iconSize: [24, 24] });
-var icon_landuse_grass = L.icon({iconUrl: 'icons/landuse_grass.n.24.png', iconSize: [24, 24] });
-var icon_accommodation_camping = L.icon({iconUrl: 'icons/accommodation_camping.n.24.png', iconSize: [24, 24] });
-var icon_sport_stadium = L.icon({iconUrl: 'icons/sport_stadium.n.24.png', iconSize: [24, 24] });
-var icon_building_ge = L.icon({iconUrl: 'icons/building_ge.n.24.png', iconSize: [24, 24] });
-var icon_education_university = L.icon({iconUrl: 'icons/education_university.n.24.png', iconSize: [24, 24] });
-var icon_building_ge = L.icon({iconUrl: 'icons/building_ge.n.24.png', iconSize: [24, 24] });
 var icon_transport_zebracrossing = L.icon({iconUrl: 'icons/transport_zebracrossing.n.24.png', iconSize: [24, 24] });
-var icon_poi_place_city = L.icon({iconUrl: 'icons/poi_place_city.n.24.png', iconSize: [24, 24] });
-var icon_transport_rental_bicycle = L.icon({iconUrl: 'icons/transport_rental_bicycle.n.24.png', iconSize: [24, 24] });
-var icon_sport_swimming_outdoor = L.icon({iconUrl: 'icons/sport_swimming_outdoor.n.24.png', iconSize: [24, 24] });
-var icon_education_nursery3 = L.icon({iconUrl: 'icons/education_nursery3.n.24.png', iconSize: [24, 24] });
-var icon_accommodation_alpinehut = L.icon({iconUrl: 'icons/accommodation_alpinehut.n.24.png', iconSize: [24, 24] });
-var icon_shopping_department_store = L.icon({iconUrl: 'icons/shopping_department_store.n.24.png', iconSize: [24, 24] });