From 5901be10271131a23857cd35a44a0395fa03d368 Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@mapbox.com>
Date: Tue, 5 Jun 2018 13:08:43 -0400
Subject: [PATCH] Replace `poi-` icons with `temaki-` icons (re: #3924)

---
 build_data.js                                 |   7 +-
 data/presets/presets.json                     | 422 +++++++++---------
 data/presets/presets/amenity/bench.json       |   2 +-
 data/presets/presets/amenity/casino.json      |   2 +-
 data/presets/presets/amenity/clock.json       |   2 +-
 data/presets/presets/amenity/fountain.json    |   2 +-
 .../presets/amenity/hunting_stand.json        |   2 +-
 .../presets/amenity/internet_cafe.json        |   2 +-
 .../amenity/place_of_worship/hindu.json       |   2 +-
 .../amenity/place_of_worship/shinto.json      |   2 +-
 .../amenity/place_of_worship/sikh.json        |   2 +-
 .../amenity/place_of_worship/taoist.json      |   2 +-
 .../amenity/sanitary_dump_station.json        |   2 +-
 data/presets/presets/amenity/shower.json      |   2 +-
 .../presets/amenity/social_facility.json      |   2 +-
 .../amenity/social_facility/food_bank.json    |   2 +-
 .../social_facility/homeless_shelter.json     |   2 +-
 .../presets/amenity/vending_machine.json      |   2 +-
 .../amenity/vending_machine/_news_papers.json |   2 +-
 .../amenity/vending_machine/cigarettes.json   |   2 +-
 .../amenity/vending_machine/coffee.json       |   2 +-
 .../amenity/vending_machine/condoms.json      |   2 +-
 .../amenity/vending_machine/drinks.json       |   2 +-
 .../amenity/vending_machine/electronics.json  |   2 +-
 .../vending_machine/elongated_coin.json       |   2 +-
 .../vending_machine/excrement_bags.json       |   2 +-
 .../vending_machine/feminine_hygiene.json     |   2 +-
 .../presets/amenity/vending_machine/food.json |   2 +-
 .../presets/amenity/vending_machine/fuel.json |   2 +-
 .../amenity/vending_machine/ice_cream.json    |   2 +-
 .../amenity/vending_machine/newspapers.json   |   2 +-
 .../parcel_pickup_dropoff.json                |   2 +-
 .../vending_machine/parking_tickets.json      |   2 +-
 .../public_transport_tickets.json             |   2 +-
 .../amenity/vending_machine/stamps.json       |   2 +-
 .../amenity/vending_machine/sweets.json       |   2 +-
 .../presets/attraction/drop_tower.json        |   2 +-
 data/presets/presets/building/ruins.json      |   2 +-
 data/presets/presets/craft.json               |   2 +-
 data/presets/presets/craft/blacksmith.json    |   2 +-
 data/presets/presets/craft/boatbuilder.json   |   2 +-
 data/presets/presets/craft/brewery.json       |   2 +-
 data/presets/presets/craft/carpenter.json     |   2 +-
 data/presets/presets/craft/carpet_layer.json  |   2 +-
 .../presets/craft/chimney_sweeper.json        |   2 +-
 data/presets/presets/craft/clockmaker.json    |   2 +-
 data/presets/presets/craft/distillery.json    |   2 +-
 data/presets/presets/craft/electrician.json   |   2 +-
 .../presets/craft/electronics_repair.json     |   2 +-
 data/presets/presets/craft/glaziery.json      |   2 +-
 data/presets/presets/craft/hvac.json          |   2 +-
 data/presets/presets/craft/insulator.json     |   2 +-
 .../presets/craft/metal_construction.json     |   2 +-
 data/presets/presets/craft/plasterer.json     |   2 +-
 data/presets/presets/craft/plumber.json       |   2 +-
 data/presets/presets/craft/rigger.json        |   2 +-
 data/presets/presets/craft/roofer.json        |   2 +-
 data/presets/presets/craft/saddler.json       |   2 +-
 data/presets/presets/craft/sailmaker.json     |   2 +-
 data/presets/presets/craft/scaffolder.json    |   2 +-
 data/presets/presets/craft/shoemaker.json     |   2 +-
 data/presets/presets/craft/stonemason.json    |   2 +-
 data/presets/presets/craft/tiler.json         |   2 +-
 data/presets/presets/craft/tinsmith.json      |   2 +-
 data/presets/presets/craft/upholsterer.json   |   2 +-
 data/presets/presets/craft/watchmaker.json    |   2 +-
 .../presets/craft/window_construction.json    |   2 +-
 .../presets/emergency/fire_hydrant.json       |   2 +-
 .../presets/highway/crosswalk-raised.json     |   2 +-
 data/presets/presets/highway/crosswalk.json   |   2 +-
 data/presets/presets/highway/elevator.json    |   2 +-
 data/presets/presets/highway/give_way.json    |   2 +-
 .../presets/highway/motorway_junction.json    |   2 +-
 .../presets/highway/pedestrian_area.json      |   2 +-
 data/presets/presets/highway/stop.json        |   2 +-
 data/presets/presets/highway/street_lamp.json |   2 +-
 .../presets/highway/traffic_signals.json      |   2 +-
 data/presets/presets/historic.json            |   2 +-
 .../presets/historic/archaeological_site.json |   2 +-
 .../presets/historic/boundary_stone.json      |   2 +-
 data/presets/presets/historic/ruins.json      |   2 +-
 data/presets/presets/junction.json            |   2 +-
 data/presets/presets/landuse/military.json    |   2 +-
 .../presets/landuse/military/barracks.json    |   2 +-
 .../presets/landuse/military/bunker.json      |   2 +-
 .../presets/landuse/military/naval_base.json  |   2 +-
 .../landuse/military/obstacle_course.json     |   2 +-
 .../presets/landuse/military/office.json      |   2 +-
 .../presets/landuse/military/range.json       |   2 +-
 .../landuse/military/training_area.json       |   2 +-
 .../presets/leisure/adult_gaming_centre.json  |   2 +-
 .../presets/presets/leisure/beach_resort.json |   2 +-
 data/presets/presets/leisure/bird_hide.json   |   2 +-
 .../presets/leisure/bowling_alley.json        |   2 +-
 data/presets/presets/leisure/common.json      |   2 +-
 data/presets/presets/leisure/slipway.json     |   2 +-
 data/presets/presets/man_made.json            |   2 +-
 data/presets/presets/man_made/antenna.json    |   2 +-
 data/presets/presets/man_made/chimney.json    |   2 +-
 data/presets/presets/man_made/crane.json      |   2 +-
 data/presets/presets/man_made/gasometer.json  |   2 +-
 data/presets/presets/man_made/mast.json       |   2 +-
 .../presets/man_made/monitoring_station.json  |   2 +-
 .../presets/presets/man_made/observation.json |   2 +-
 .../presets/man_made/petroleum_well.json      |   2 +-
 data/presets/presets/man_made/silo.json       |   2 +-
 .../presets/man_made/storage_tank.json        |   2 +-
 data/presets/presets/man_made/tower.json      |   2 +-
 data/presets/presets/man_made/windmill.json   |   2 +-
 data/presets/presets/natural/bay.json         |   2 +-
 data/presets/presets/natural/beach.json       |   2 +-
 data/presets/presets/natural/reef.json        |   2 +-
 data/presets/presets/power/_sub_station.json  |   2 +-
 data/presets/presets/power/generator.json     |   2 +-
 .../power/generator/source_nuclear.json       |   2 +-
 .../presets/power/generator/source_wind.json  |   2 +-
 data/presets/presets/power/substation.json    |   2 +-
 data/presets/presets/power/switch.json        |   2 +-
 data/presets/presets/power/transformer.json   |   2 +-
 .../public_transport/platform_light_rail.json |   2 +-
 .../public_transport/platform_monorail.json   |   2 +-
 .../public_transport/platform_subway.json     |   2 +-
 .../public_transport/platform_tram.json       |   2 +-
 .../public_transport/platform_trolleybus.json |   2 +-
 .../public_transport/station_light_rail.json  |   2 +-
 .../public_transport/station_monorail.json    |   2 +-
 .../public_transport/station_subway.json      |   2 +-
 .../public_transport/station_tram.json        |   2 +-
 .../public_transport/station_trolleybus.json  |   2 +-
 .../stop_position_light_rail.json             |   2 +-
 .../stop_position_monorail.json               |   2 +-
 .../stop_position_subway.json                 |   2 +-
 .../public_transport/stop_position_tram.json  |   2 +-
 .../stop_position_trolleybus.json             |   2 +-
 data/presets/presets/railway/_tram_stop.json  |   2 +-
 data/presets/presets/railway/buffer_stop.json |   2 +-
 data/presets/presets/railway/milestone.json   |   2 +-
 data/presets/presets/railway/signal.json      |   2 +-
 data/presets/presets/railway/switch.json      |   2 +-
 data/presets/presets/shop/doityourself.json   |   2 +-
 data/presets/presets/shop/hardware.json       |   2 +-
 data/presets/presets/shop/window_blind.json   |   2 +-
 data/presets/presets/tourism/viewpoint.json   |   2 +-
 data/presets/presets/traffic_calming.json     |   2 +-
 .../presets/presets/traffic_calming/bump.json |   2 +-
 .../presets/traffic_calming/chicane.json      |   2 +-
 .../presets/traffic_calming/choker.json       |   2 +-
 .../presets/traffic_calming/cushion.json      |   2 +-
 data/presets/presets/traffic_calming/dip.json |   2 +-
 .../presets/presets/traffic_calming/hump.json |   2 +-
 .../presets/traffic_calming/island.json       |   2 +-
 .../presets/traffic_calming/rumble_strip.json |   2 +-
 .../presets/traffic_calming/table.json        |   2 +-
 .../waterway/sanitary_dump_station.json       |   2 +-
 data/taginfo.json                             | 399 +++++++++++------
 modules/ui/preset_icon.js                     |  20 +-
 156 files changed, 645 insertions(+), 507 deletions(-)

diff --git a/build_data.js b/build_data.js
index 8e142bc8d..02d5c72ad 100644
--- a/build_data.js
+++ b/build_data.js
@@ -344,7 +344,12 @@ function generateTaginfo(presets, fields) {
         if (preset.geometry) {
             setObjectType(tag, preset);
         }
-        if (isMaki(preset.icon)) {
+
+        // add icon
+        if (/^temaki-/.test(preset.icon)) {
+            tag.icon_url = 'https://raw.githubusercontent.com/bhousel/temaki/master/icons/' +
+                preset.icon + '.svg?sanitize=true';
+        } else if (isMaki(preset.icon)) {
             tag.icon_url = 'https://raw.githubusercontent.com/mapbox/maki/master/icons/' +
                 preset.icon + '-15.svg?sanitize=true';
         }
diff --git a/data/presets/presets.json b/data/presets/presets.json
index f7ed19e43..63adc9694 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -937,7 +937,7 @@
             "name": "Barbecue/Grill"
         },
         "amenity/bench": {
-            "icon": "poi-bench",
+            "icon": "temaki-bench",
             "fields": [
                 "backrest"
             ],
@@ -1179,7 +1179,7 @@
             "name": "Car Wash"
         },
         "amenity/casino": {
-            "icon": "poi-dice",
+            "icon": "temaki-dice",
             "fields": [
                 "name",
                 "operator",
@@ -1369,7 +1369,7 @@
             "name": "Fertility Clinic"
         },
         "amenity/clock": {
-            "icon": "poi-clock",
+            "icon": "temaki-clock",
             "fields": [
                 "name",
                 "support",
@@ -1693,7 +1693,7 @@
             "name": "Food Court"
         },
         "amenity/fountain": {
-            "icon": "poi-fountain",
+            "icon": "temaki-fountain",
             "fields": [
                 "name"
             ],
@@ -1812,7 +1812,7 @@
             "name": "Hospital Grounds"
         },
         "amenity/hunting_stand": {
-            "icon": "poi-binoculars",
+            "icon": "temaki-binoculars",
             "geometry": [
                 "point",
                 "vertex",
@@ -1860,7 +1860,7 @@
             "name": "Ice Cream Shop"
         },
         "amenity/internet_cafe": {
-            "icon": "poi-mast",
+            "icon": "temaki-antenna",
             "fields": [
                 "name",
                 "operator",
@@ -2315,7 +2315,7 @@
             "name": "Church"
         },
         "amenity/place_of_worship/hindu": {
-            "icon": "poi-hinduist",
+            "icon": "temaki-hinduism",
             "fields": [
                 "name",
                 "denomination",
@@ -2399,7 +2399,7 @@
             "name": "Mosque"
         },
         "amenity/place_of_worship/shinto": {
-            "icon": "poi-shintoist",
+            "icon": "temaki-shinto",
             "fields": [
                 "name",
                 "denomination",
@@ -2426,7 +2426,7 @@
             "name": "Shinto Shrine"
         },
         "amenity/place_of_worship/sikh": {
-            "icon": "poi-sikhist",
+            "icon": "temaki-sikhism",
             "fields": [
                 "name",
                 "denomination",
@@ -2453,7 +2453,7 @@
             "name": "Sikh Temple"
         },
         "amenity/place_of_worship/taoist": {
-            "icon": "poi-taoist",
+            "icon": "temaki-taoism",
             "fields": [
                 "name",
                 "denomination",
@@ -2807,7 +2807,7 @@
             "name": "Restaurant"
         },
         "amenity/sanitary_dump_station": {
-            "icon": "poi-storage-tank",
+            "icon": "temaki-storage_tank",
             "fields": [
                 "operator",
                 "access_simple",
@@ -2881,7 +2881,7 @@
             "name": "Shelter"
         },
         "amenity/shower": {
-            "icon": "poi-shower",
+            "icon": "temaki-shower",
             "fields": [
                 "operator",
                 "opening_hours",
@@ -2922,7 +2922,7 @@
             "name": "Smoking Area"
         },
         "amenity/social_facility": {
-            "icon": "poi-social-facility",
+            "icon": "temaki-social_facility",
             "fields": [
                 "name",
                 "operator",
@@ -2944,7 +2944,7 @@
             "name": "Social Facility"
         },
         "amenity/social_facility/food_bank": {
-            "icon": "poi-social-facility",
+            "icon": "temaki-social_facility",
             "fields": [
                 "name",
                 "operator",
@@ -3004,7 +3004,7 @@
             "name": "Elderly Group Home"
         },
         "amenity/social_facility/homeless_shelter": {
-            "icon": "poi-social-facility",
+            "icon": "temaki-social_facility",
             "fields": [
                 "name",
                 "operator",
@@ -3239,7 +3239,7 @@
             "name": "University Grounds"
         },
         "amenity/vending_machine": {
-            "icon": "poi-vending-machine",
+            "icon": "temaki-vending_machine",
             "fields": [
                 "vending",
                 "operator",
@@ -3256,7 +3256,7 @@
             "name": "Vending Machine"
         },
         "amenity/vending_machine/news_papers": {
-            "icon": "poi-vending-machine",
+            "icon": "temaki-vending_machine",
             "fields": [
                 "vending",
                 "operator",
@@ -3282,7 +3282,7 @@
             "searchable": false
         },
         "amenity/vending_machine/cigarettes": {
-            "icon": "poi-vending-machine",
+            "icon": "temaki-vending_machine",
             "fields": [
                 "vending",
                 "operator",
@@ -3306,7 +3306,7 @@
             "name": "Cigarette Vending Machine"
         },
         "amenity/vending_machine/coffee": {
-            "icon": "poi-vending-machine",
+            "icon": "temaki-vending_machine",
             "fields": [
                 "vending",
                 "operator",
@@ -3330,7 +3330,7 @@
             "name": "Coffee Vending Machine"
         },
         "amenity/vending_machine/condoms": {
-            "icon": "poi-vending-machine",
+            "icon": "temaki-vending_machine",
             "fields": [
                 "vending",
                 "operator",
@@ -3354,7 +3354,7 @@
             "name": "Condom Vending Machine"
         },
         "amenity/vending_machine/drinks": {
-            "icon": "poi-vending-machine",
+            "icon": "temaki-vending_machine",
             "fields": [
                 "vending",
                 "operator",
@@ -3382,7 +3382,7 @@
             "name": "Drink Vending Machine"
         },
         "amenity/vending_machine/electronics": {
-            "icon": "poi-vending-machine",
+            "icon": "temaki-vending_machine",
             "fields": [
                 "vending",
                 "operator",
@@ -3411,7 +3411,7 @@
             "name": "Electronics Vending Machine"
         },
         "amenity/vending_machine/elongated_coin": {
-            "icon": "poi-vending-machine",
+            "icon": "temaki-vending_machine",
             "fields": [
                 "vending",
                 "operator",
@@ -3440,7 +3440,7 @@
             "name": "Flat Coin Vending Machine"
         },
         "amenity/vending_machine/excrement_bags": {
-            "icon": "poi-vending-machine",
+            "icon": "temaki-vending_machine",
             "fields": [
                 "vending",
                 "operator",
@@ -3468,7 +3468,7 @@
             "name": "Excrement Bag Vending Machine"
         },
         "amenity/vending_machine/feminine_hygiene": {
-            "icon": "poi-vending-machine",
+            "icon": "temaki-vending_machine",
             "fields": [
                 "vending",
                 "operator",
@@ -3498,7 +3498,7 @@
             "name": "Feminine Hygiene Vending Machine"
         },
         "amenity/vending_machine/food": {
-            "icon": "poi-vending-machine",
+            "icon": "temaki-vending_machine",
             "fields": [
                 "vending",
                 "operator",
@@ -3522,7 +3522,7 @@
             "name": "Food Vending Machine"
         },
         "amenity/vending_machine/fuel": {
-            "icon": "poi-vending-machine",
+            "icon": "temaki-vending_machine",
             "fields": [
                 "vending",
                 "operator",
@@ -3553,7 +3553,7 @@
             "name": "Gas Pump"
         },
         "amenity/vending_machine/ice_cream": {
-            "icon": "poi-vending-machine",
+            "icon": "temaki-vending_machine",
             "fields": [
                 "vending",
                 "operator",
@@ -3581,7 +3581,7 @@
             "name": "Ice Cream Vending Machine"
         },
         "amenity/vending_machine/newspapers": {
-            "icon": "poi-vending-machine",
+            "icon": "temaki-vending_machine",
             "fields": [
                 "vending",
                 "operator",
@@ -3606,7 +3606,7 @@
             "name": "Newspaper Vending Machine"
         },
         "amenity/vending_machine/parcel_pickup_dropoff": {
-            "icon": "poi-vending-machine",
+            "icon": "temaki-vending_machine",
             "fields": [
                 "vending",
                 "operator",
@@ -3632,7 +3632,7 @@
             "name": "Parcel Pickup/Dropoff Vending Machine"
         },
         "amenity/vending_machine/parking_tickets": {
-            "icon": "poi-vending-machine",
+            "icon": "temaki-vending_machine",
             "fields": [
                 "vending",
                 "operator",
@@ -3658,7 +3658,7 @@
             "name": "Parking Ticket Vending Machine"
         },
         "amenity/vending_machine/public_transport_tickets": {
-            "icon": "poi-vending-machine",
+            "icon": "temaki-vending_machine",
             "fields": [
                 "vending",
                 "operator",
@@ -3687,7 +3687,7 @@
             "name": "Transit Ticket Vending Machine"
         },
         "amenity/vending_machine/stamps": {
-            "icon": "poi-vending-machine",
+            "icon": "temaki-vending_machine",
             "fields": [
                 "vending",
                 "operator",
@@ -3713,7 +3713,7 @@
             "name": "Postage Vending Machine"
         },
         "amenity/vending_machine/sweets": {
-            "icon": "poi-vending-machine",
+            "icon": "temaki-vending_machine",
             "fields": [
                 "vending",
                 "operator",
@@ -4065,7 +4065,7 @@
             "name": "Dark Ride"
         },
         "attraction/drop_tower": {
-            "icon": "poi-tower",
+            "icon": "temaki-tower",
             "fields": [
                 "name",
                 "operator",
@@ -5115,7 +5115,7 @@
             "name": "Roof"
         },
         "building/ruins": {
-            "icon": "poi-ruins",
+            "icon": "temaki-ruins",
             "fields": [
                 "name",
                 "address",
@@ -5405,7 +5405,7 @@
             "name": "Club"
         },
         "craft": {
-            "icon": "poi-tool",
+            "icon": "temaki-tools",
             "fields": [
                 "name",
                 "craft",
@@ -5557,7 +5557,7 @@
             "name": "Beekeeper"
         },
         "craft/blacksmith": {
-            "icon": "poi-tool",
+            "icon": "temaki-tools",
             "fields": [
                 "name",
                 "operator",
@@ -5575,7 +5575,7 @@
             "name": "Blacksmith"
         },
         "craft/boatbuilder": {
-            "icon": "poi-tool",
+            "icon": "temaki-tools",
             "fields": [
                 "name",
                 "operator",
@@ -5615,7 +5615,7 @@
             "name": "Bookbinder"
         },
         "craft/brewery": {
-            "icon": "poi-storage-tank",
+            "icon": "temaki-storage_tank",
             "fields": [
                 "name",
                 "operator",
@@ -5642,7 +5642,7 @@
             "name": "Brewery"
         },
         "craft/carpenter": {
-            "icon": "poi-tool",
+            "icon": "temaki-tools",
             "fields": [
                 "name",
                 "operator",
@@ -5663,7 +5663,7 @@
             "name": "Carpenter"
         },
         "craft/carpet_layer": {
-            "icon": "poi-tool",
+            "icon": "temaki-tools",
             "fields": [
                 "name",
                 "operator",
@@ -5700,7 +5700,7 @@
             "name": "Caterer"
         },
         "craft/chimney_sweeper": {
-            "icon": "poi-chimney",
+            "icon": "temaki-chimney",
             "fields": [
                 "name",
                 "operator",
@@ -5718,7 +5718,7 @@
             "name": "Chimney Sweeper"
         },
         "craft/clockmaker": {
-            "icon": "poi-clock",
+            "icon": "temaki-clock",
             "fields": [
                 "name",
                 "operator",
@@ -5758,7 +5758,7 @@
             "name": "Candy Maker"
         },
         "craft/distillery": {
-            "icon": "poi-storage-tank",
+            "icon": "temaki-storage_tank",
             "fields": [
                 "name",
                 "operator",
@@ -5818,7 +5818,7 @@
             "name": "Dressmaker"
         },
         "craft/electrician": {
-            "icon": "poi-power",
+            "icon": "temaki-power",
             "fields": [
                 "name",
                 "operator",
@@ -5840,7 +5840,7 @@
             "name": "Electrician"
         },
         "craft/electronics_repair": {
-            "icon": "poi-tool",
+            "icon": "temaki-tools",
             "fields": [
                 "name",
                 "operator",
@@ -5880,7 +5880,7 @@
             "name": "Gardener"
         },
         "craft/glaziery": {
-            "icon": "poi-window",
+            "icon": "temaki-window",
             "fields": [
                 "name",
                 "operator",
@@ -5921,7 +5921,7 @@
             "name": "Handicraft"
         },
         "craft/hvac": {
-            "icon": "poi-tool",
+            "icon": "temaki-tools",
             "fields": [
                 "name",
                 "operator",
@@ -5944,7 +5944,7 @@
             "name": "HVAC"
         },
         "craft/insulator": {
-            "icon": "poi-tool",
+            "icon": "temaki-tools",
             "fields": [
                 "name",
                 "operator",
@@ -5980,7 +5980,7 @@
             "name": "Key Cutter"
         },
         "craft/metal_construction": {
-            "icon": "poi-tool",
+            "icon": "temaki-tools",
             "fields": [
                 "name",
                 "operator",
@@ -6055,7 +6055,7 @@
             "name": "Photographic Laboratory"
         },
         "craft/plasterer": {
-            "icon": "poi-tool",
+            "icon": "temaki-tools",
             "fields": [
                 "name",
                 "operator",
@@ -6073,7 +6073,7 @@
             "name": "Plasterer"
         },
         "craft/plumber": {
-            "icon": "poi-tool",
+            "icon": "temaki-tools",
             "fields": [
                 "name",
                 "operator",
@@ -6115,7 +6115,7 @@
             "name": "Pottery"
         },
         "craft/rigger": {
-            "icon": "poi-tool",
+            "icon": "temaki-tools",
             "fields": [
                 "name",
                 "operator",
@@ -6133,7 +6133,7 @@
             "name": "Rigger"
         },
         "craft/roofer": {
-            "icon": "poi-tool",
+            "icon": "temaki-tools",
             "fields": [
                 "name",
                 "operator",
@@ -6151,7 +6151,7 @@
             "name": "Roofer"
         },
         "craft/saddler": {
-            "icon": "poi-tool",
+            "icon": "temaki-tools",
             "fields": [
                 "name",
                 "operator",
@@ -6169,7 +6169,7 @@
             "name": "Saddler"
         },
         "craft/sailmaker": {
-            "icon": "poi-tool",
+            "icon": "temaki-tools",
             "fields": [
                 "name",
                 "operator",
@@ -6208,7 +6208,7 @@
             "name": "Sawmill"
         },
         "craft/scaffolder": {
-            "icon": "poi-tool",
+            "icon": "temaki-tools",
             "fields": [
                 "name",
                 "operator",
@@ -6244,7 +6244,7 @@
             "name": "Sculptor"
         },
         "craft/shoemaker": {
-            "icon": "poi-tool",
+            "icon": "temaki-tools",
             "fields": [
                 "name",
                 "operator",
@@ -6265,7 +6265,7 @@
             "name": "Shoemaker"
         },
         "craft/stonemason": {
-            "icon": "poi-tool",
+            "icon": "temaki-tools",
             "fields": [
                 "name",
                 "operator",
@@ -6286,7 +6286,7 @@
             "name": "Stonemason"
         },
         "craft/tiler": {
-            "icon": "poi-tool",
+            "icon": "temaki-tools",
             "fields": [
                 "name",
                 "operator",
@@ -6304,7 +6304,7 @@
             "name": "Tiler"
         },
         "craft/tinsmith": {
-            "icon": "poi-tool",
+            "icon": "temaki-tools",
             "fields": [
                 "name",
                 "operator",
@@ -6322,7 +6322,7 @@
             "name": "Tinsmith"
         },
         "craft/upholsterer": {
-            "icon": "poi-tool",
+            "icon": "temaki-tools",
             "fields": [
                 "name",
                 "operator",
@@ -6340,7 +6340,7 @@
             "name": "Upholsterer"
         },
         "craft/watchmaker": {
-            "icon": "poi-clock",
+            "icon": "temaki-clock",
             "fields": [
                 "name",
                 "operator",
@@ -6358,7 +6358,7 @@
             "name": "Watchmaker"
         },
         "craft/window_construction": {
-            "icon": "poi-window",
+            "icon": "temaki-window",
             "fields": [
                 "name",
                 "operator",
@@ -6528,7 +6528,7 @@
             "name": "Defibrillator"
         },
         "emergency/fire_hydrant": {
-            "icon": "poi-fire-hydrant",
+            "icon": "temaki-fire_hydrant",
             "fields": [
                 "fire_hydrant/type",
                 "fire_hydrant/position",
@@ -7492,7 +7492,7 @@
             "name": "Street Crossing"
         },
         "highway/crosswalk-raised": {
-            "icon": "poi-foot",
+            "icon": "temaki-pedestrian",
             "fields": [
                 "crossing",
                 "kerb",
@@ -7520,7 +7520,7 @@
             "name": "Raised Pedestrian Crosswalk"
         },
         "highway/crosswalk": {
-            "icon": "poi-foot",
+            "icon": "temaki-pedestrian",
             "fields": [
                 "crossing",
                 "kerb",
@@ -7565,7 +7565,7 @@
             "name": "Cycle Path"
         },
         "highway/elevator": {
-            "icon": "poi-elevator",
+            "icon": "temaki-elevator",
             "fields": [
                 "access_simple",
                 "opening_hours",
@@ -7609,7 +7609,7 @@
             "name": "Foot Path"
         },
         "highway/give_way": {
-            "icon": "poi-yield",
+            "icon": "temaki-yield",
             "fields": [
                 "direction_vertex"
             ],
@@ -7661,7 +7661,7 @@
             "name": "Mini-Roundabout"
         },
         "highway/motorway_junction": {
-            "icon": "poi-junction",
+            "icon": "temaki-junction",
             "geometry": [
                 "vertex"
             ],
@@ -7786,7 +7786,7 @@
             "name": "Path"
         },
         "highway/pedestrian_area": {
-            "icon": "poi-foot",
+            "icon": "temaki-pedestrian",
             "fields": [
                 "name",
                 "surface",
@@ -8238,7 +8238,7 @@
             "name": "Steps"
         },
         "highway/stop": {
-            "icon": "poi-stop",
+            "icon": "temaki-stop",
             "fields": [
                 "stop",
                 "direction_vertex"
@@ -8257,7 +8257,7 @@
             "name": "Stop Sign"
         },
         "highway/street_lamp": {
-            "icon": "poi-bulb",
+            "icon": "temaki-bulb",
             "geometry": [
                 "point",
                 "vertex"
@@ -8401,7 +8401,7 @@
             "name": "Traffic Mirror"
         },
         "highway/traffic_signals": {
-            "icon": "poi-traffic-signals",
+            "icon": "temaki-traffic_signals",
             "geometry": [
                 "vertex"
             ],
@@ -8518,7 +8518,7 @@
             "name": "Minor/Unclassified Road"
         },
         "historic": {
-            "icon": "poi-ruins",
+            "icon": "temaki-ruins",
             "fields": [
                 "historic",
                 "inscription"
@@ -8534,7 +8534,7 @@
             "name": "Historic Site"
         },
         "historic/archaeological_site": {
-            "icon": "poi-ruins",
+            "icon": "temaki-ruins",
             "fields": [
                 "name",
                 "historic/civilization",
@@ -8551,7 +8551,7 @@
             "name": "Archaeological Site"
         },
         "historic/boundary_stone": {
-            "icon": "poi-milestone",
+            "icon": "temaki-milestone",
             "fields": [
                 "name",
                 "inscription"
@@ -8625,7 +8625,7 @@
             "name": "Monument"
         },
         "historic/ruins": {
-            "icon": "poi-ruins",
+            "icon": "temaki-ruins",
             "fields": [
                 "name",
                 "historic/civilization",
@@ -8693,7 +8693,7 @@
             "name": "Wayside Shrine"
         },
         "junction": {
-            "icon": "poi-junction",
+            "icon": "temaki-junction",
             "fields": [
                 "name"
             ],
@@ -9138,7 +9138,7 @@
             "name": "Meadow"
         },
         "landuse/military": {
-            "icon": "poi-military",
+            "icon": "temaki-military",
             "fields": [
                 "name"
             ],
@@ -9193,7 +9193,7 @@
             "name": "Military Airfield"
         },
         "landuse/military/barracks": {
-            "icon": "poi-military",
+            "icon": "temaki-military",
             "fields": [
                 "name",
                 "building_area"
@@ -9228,7 +9228,7 @@
             "name": "Barracks"
         },
         "landuse/military/bunker": {
-            "icon": "poi-military",
+            "icon": "temaki-military",
             "fields": [
                 "name",
                 "bunker_type",
@@ -9338,7 +9338,7 @@
             "name": "Danger Area"
         },
         "landuse/military/naval_base": {
-            "icon": "poi-military",
+            "icon": "temaki-military",
             "fields": [
                 "name"
             ],
@@ -9404,7 +9404,7 @@
             "name": "Nuclear Explosion Site"
         },
         "landuse/military/obstacle_course": {
-            "icon": "poi-military",
+            "icon": "temaki-military",
             "geometry": [
                 "point",
                 "area"
@@ -9433,7 +9433,7 @@
             "name": "Obstacle Course"
         },
         "landuse/military/office": {
-            "icon": "poi-military",
+            "icon": "temaki-military",
             "fields": [
                 "name",
                 "building_area"
@@ -9470,7 +9470,7 @@
             "name": "Military Office"
         },
         "landuse/military/range": {
-            "icon": "poi-military",
+            "icon": "temaki-military",
             "fields": [
                 "name"
             ],
@@ -9510,7 +9510,7 @@
             "name": "Military Range"
         },
         "landuse/military/training_area": {
-            "icon": "poi-military",
+            "icon": "temaki-military",
             "fields": [
                 "name"
             ],
@@ -9720,7 +9720,7 @@
             "name": "Leisure"
         },
         "leisure/adult_gaming_centre": {
-            "icon": "poi-dice",
+            "icon": "temaki-dice",
             "fields": [
                 "name",
                 "operator",
@@ -9767,7 +9767,7 @@
             "name": "Amusement Arcade"
         },
         "leisure/beach_resort": {
-            "icon": "poi-beach",
+            "icon": "temaki-beach",
             "fields": [
                 "name",
                 "address",
@@ -9783,7 +9783,7 @@
             "name": "Beach Resort"
         },
         "leisure/bird_hide": {
-            "icon": "poi-binoculars",
+            "icon": "temaki-binoculars",
             "fields": [
                 "building_area"
             ],
@@ -9820,7 +9820,7 @@
             "name": "Bleachers"
         },
         "leisure/bowling_alley": {
-            "icon": "poi-bowling",
+            "icon": "temaki-bowling",
             "fields": [
                 "name",
                 "operator",
@@ -9842,7 +9842,7 @@
             "name": "Bowling Alley"
         },
         "leisure/common": {
-            "icon": "poi-foot",
+            "icon": "temaki-pedestrian",
             "geometry": [
                 "point",
                 "area"
@@ -11167,7 +11167,7 @@
             "name": "Sauna"
         },
         "leisure/slipway": {
-            "icon": "poi-beach",
+            "icon": "temaki-beach",
             "geometry": [
                 "point",
                 "line"
@@ -11324,7 +11324,7 @@
             "matchScore": 0.1
         },
         "man_made": {
-            "icon": "poi-storage-tank",
+            "icon": "temaki-storage_tank",
             "fields": [
                 "name",
                 "man_made"
@@ -11372,7 +11372,7 @@
             "name": "Adit"
         },
         "man_made/antenna": {
-            "icon": "poi-mast",
+            "icon": "temaki-antenna",
             "fields": [
                 "height",
                 "communication_multi"
@@ -11416,7 +11416,7 @@
             "name": "Bridge"
         },
         "man_made/chimney": {
-            "icon": "poi-chimney",
+            "icon": "temaki-chimney",
             "geometry": [
                 "point",
                 "area"
@@ -11444,7 +11444,7 @@
             "name": "Clearcut Forest"
         },
         "man_made/crane": {
-            "icon": "poi-crane",
+            "icon": "temaki-crane",
             "fields": [
                 "operator",
                 "height",
@@ -11481,7 +11481,7 @@
             "name": "Flagpole"
         },
         "man_made/gasometer": {
-            "icon": "poi-storage-tank",
+            "icon": "temaki-storage_tank",
             "geometry": [
                 "point",
                 "area"
@@ -11519,7 +11519,7 @@
             "name": "Lighthouse"
         },
         "man_made/mast": {
-            "icon": "poi-mast",
+            "icon": "temaki-antenna",
             "fields": [
                 "tower/type",
                 "tower/construction",
@@ -11551,7 +11551,7 @@
             "name": "Mast"
         },
         "man_made/monitoring_station": {
-            "icon": "poi-mast",
+            "icon": "temaki-antenna",
             "geometry": [
                 "point",
                 "area"
@@ -11573,7 +11573,7 @@
             "name": "Monitoring Station"
         },
         "man_made/observation": {
-            "icon": "poi-tower",
+            "icon": "temaki-tower",
             "geometry": [
                 "point",
                 "area"
@@ -11603,7 +11603,7 @@
             "name": "Observatory"
         },
         "man_made/petroleum_well": {
-            "icon": "poi-storage-tank",
+            "icon": "temaki-storage_tank",
             "geometry": [
                 "point"
             ],
@@ -11663,7 +11663,7 @@
             "name": "Pumping Station"
         },
         "man_made/silo": {
-            "icon": "poi-silo",
+            "icon": "temaki-silo",
             "fields": [
                 "building_area",
                 "crop"
@@ -11683,7 +11683,7 @@
             "name": "Silo"
         },
         "man_made/storage_tank": {
-            "icon": "poi-storage-tank",
+            "icon": "temaki-storage_tank",
             "fields": [
                 "building_area",
                 "content"
@@ -11789,7 +11789,7 @@
             "name": "Survey Point"
         },
         "man_made/tower": {
-            "icon": "poi-tower",
+            "icon": "temaki-tower",
             "fields": [
                 "tower/type",
                 "tower/construction",
@@ -11889,7 +11889,7 @@
             "name": "Watermill"
         },
         "man_made/windmill": {
-            "icon": "poi-windmill",
+            "icon": "temaki-windmill",
             "fields": [
                 "building_area"
             ],
@@ -12036,7 +12036,7 @@
             "name": "Bare Rock"
         },
         "natural/bay": {
-            "icon": "poi-beach",
+            "icon": "temaki-beach",
             "geometry": [
                 "point",
                 "area"
@@ -12051,7 +12051,7 @@
             "name": "Bay"
         },
         "natural/beach": {
-            "icon": "poi-beach",
+            "icon": "temaki-beach",
             "fields": [
                 "surface"
             ],
@@ -12204,7 +12204,7 @@
             "name": "Peak"
         },
         "natural/reef": {
-            "icon": "poi-beach",
+            "icon": "temaki-beach",
             "geometry": [
                 "point",
                 "area"
@@ -13796,7 +13796,7 @@
             "matchScore": 0.1
         },
         "power/sub_station": {
-            "icon": "poi-power",
+            "icon": "temaki-power",
             "fields": [
                 "substation",
                 "operator",
@@ -13818,7 +13818,7 @@
             "searchable": false
         },
         "power/generator": {
-            "icon": "poi-power",
+            "icon": "temaki-power",
             "fields": [
                 "operator",
                 "generator/source",
@@ -13844,7 +13844,7 @@
             "name": "Power Generator"
         },
         "power/generator/source_nuclear": {
-            "icon": "poi-nuclear",
+            "icon": "temaki-radiation",
             "fields": [
                 "operator",
                 "generator/source",
@@ -13877,7 +13877,7 @@
             "name": "Nuclear Reactor"
         },
         "power/generator/source_wind": {
-            "icon": "poi-wind",
+            "icon": "temaki-wind_turbine",
             "fields": [
                 "operator",
                 "generator/source",
@@ -13989,7 +13989,7 @@
             "name": "Power Pole"
         },
         "power/substation": {
-            "icon": "poi-power",
+            "icon": "temaki-power",
             "fields": [
                 "substation",
                 "operator",
@@ -14006,7 +14006,7 @@
             "name": "Substation"
         },
         "power/switch": {
-            "icon": "poi-power",
+            "icon": "temaki-power",
             "fields": [
                 "switch",
                 "operator",
@@ -14038,7 +14038,7 @@
             "name": "High-Voltage Tower"
         },
         "power/transformer": {
-            "icon": "poi-power",
+            "icon": "temaki-power",
             "fields": [
                 "transformer",
                 "operator",
@@ -14603,7 +14603,7 @@
             "name": "Ferry Stop / Platform"
         },
         "public_transport/platform_light_rail": {
-            "icon": "poi-light-rail",
+            "icon": "temaki-light_rail",
             "fields": [
                 "name",
                 "ref_platform",
@@ -14652,7 +14652,7 @@
             "name": "Light Rail Stop / Platform"
         },
         "public_transport/platform_monorail": {
-            "icon": "poi-monorail",
+            "icon": "temaki-monorail",
             "fields": [
                 "name",
                 "ref_platform",
@@ -14697,7 +14697,7 @@
             "name": "Monorail Stop / Platform"
         },
         "public_transport/platform_subway": {
-            "icon": "poi-subway",
+            "icon": "temaki-subway",
             "fields": [
                 "name",
                 "ref_platform",
@@ -14791,7 +14791,7 @@
             "name": "Train Stop / Platform"
         },
         "public_transport/platform_tram": {
-            "icon": "poi-tram",
+            "icon": "temaki-tram",
             "fields": [
                 "name",
                 "ref_platform",
@@ -14841,7 +14841,7 @@
             "name": "Tram Stop / Platform"
         },
         "public_transport/platform_trolleybus": {
-            "icon": "poi-trolleybus",
+            "icon": "temaki-trolleybus",
             "fields": [
                 "name",
                 "ref_platform",
@@ -15050,7 +15050,7 @@
             "name": "Ferry Station / Terminal"
         },
         "public_transport/station_light_rail": {
-            "icon": "poi-light-rail",
+            "icon": "temaki-light_rail",
             "fields": [
                 "name",
                 "network",
@@ -15102,7 +15102,7 @@
             "name": "Light Rail Station"
         },
         "public_transport/station_monorail": {
-            "icon": "poi-monorail",
+            "icon": "temaki-monorail",
             "fields": [
                 "name",
                 "network",
@@ -15148,7 +15148,7 @@
             "name": "Monorail Station"
         },
         "public_transport/station_subway": {
-            "icon": "poi-subway",
+            "icon": "temaki-subway",
             "fields": [
                 "name",
                 "network",
@@ -15285,7 +15285,7 @@
             "name": "Train Station"
         },
         "public_transport/station_tram": {
-            "icon": "poi-tram",
+            "icon": "temaki-tram",
             "fields": [
                 "name",
                 "network",
@@ -15326,7 +15326,7 @@
             "name": "Tram Station"
         },
         "public_transport/station_trolleybus": {
-            "icon": "poi-trolleybus",
+            "icon": "temaki-trolleybus",
             "fields": [
                 "name",
                 "network",
@@ -15525,7 +15525,7 @@
             "name": "Ferry Stopping Location"
         },
         "public_transport/stop_position_light_rail": {
-            "icon": "poi-light-rail",
+            "icon": "temaki-light_rail",
             "fields": [
                 "name",
                 "ref_stop_position",
@@ -15568,7 +15568,7 @@
             "name": "Light Rail Stopping Location"
         },
         "public_transport/stop_position_monorail": {
-            "icon": "poi-monorail",
+            "icon": "temaki-monorail",
             "fields": [
                 "name",
                 "ref_stop_position",
@@ -15607,7 +15607,7 @@
             "name": "Monorail Stopping Location"
         },
         "public_transport/stop_position_subway": {
-            "icon": "poi-subway",
+            "icon": "temaki-subway",
             "fields": [
                 "name",
                 "ref_stop_position",
@@ -15689,7 +15689,7 @@
             "name": "Train Stopping Location"
         },
         "public_transport/stop_position_tram": {
-            "icon": "poi-tram",
+            "icon": "temaki-tram",
             "fields": [
                 "name",
                 "ref_stop_position",
@@ -15733,7 +15733,7 @@
             "name": "Tram Stopping Location"
         },
         "public_transport/stop_position_trolleybus": {
-            "icon": "poi-trolleybus",
+            "icon": "temaki-trolleybus",
             "fields": [
                 "name",
                 "ref_stop_position",
@@ -15854,7 +15854,7 @@
             "searchable": false
         },
         "railway/tram_stop": {
-            "icon": "poi-tram",
+            "icon": "temaki-tram",
             "fields": [
                 "name",
                 "network",
@@ -15893,7 +15893,7 @@
             "name": "Abandoned Railway"
         },
         "railway/buffer_stop": {
-            "icon": "poi-buffer-stop",
+            "icon": "temaki-buffer-stop",
             "geometry": [
                 "vertex"
             ],
@@ -16021,7 +16021,7 @@
             "name": "Light Rail"
         },
         "railway/milestone": {
-            "icon": "poi-milestone",
+            "icon": "temaki-milestone",
             "geometry": [
                 "point",
                 "vertex"
@@ -16127,7 +16127,7 @@
             "name": "Rail"
         },
         "railway/signal": {
-            "icon": "poi-railway-signals",
+            "icon": "temaki-railway_signals",
             "geometry": [
                 "point",
                 "vertex"
@@ -16189,7 +16189,7 @@
             "name": "Subway"
         },
         "railway/switch": {
-            "icon": "poi-junction",
+            "icon": "temaki-junction",
             "geometry": [
                 "vertex"
             ],
@@ -17276,7 +17276,7 @@
             "name": "Department Store"
         },
         "shop/doityourself": {
-            "icon": "poi-tool",
+            "icon": "temaki-tools",
             "fields": [
                 "name",
                 "operator",
@@ -17670,7 +17670,7 @@
             "name": "Hairdresser"
         },
         "shop/hardware": {
-            "icon": "poi-tool",
+            "icon": "temaki-tools",
             "fields": [
                 "name",
                 "operator",
@@ -19002,7 +19002,7 @@
             "name": "Wholesale Store"
         },
         "shop/window_blind": {
-            "icon": "poi-window",
+            "icon": "temaki-window",
             "fields": [
                 "name",
                 "operator",
@@ -19563,7 +19563,7 @@
             "matchScore": 2
         },
         "tourism/viewpoint": {
-            "icon": "poi-binoculars",
+            "icon": "temaki-binoculars",
             "geometry": [
                 "point",
                 "vertex"
@@ -19619,7 +19619,7 @@
             "name": "Zoo"
         },
         "traffic_calming": {
-            "icon": "poi-warning",
+            "icon": "temaki-diamond",
             "fields": [
                 "traffic_calming",
                 "direction_vertex"
@@ -19640,7 +19640,7 @@
             "name": "Traffic Calming"
         },
         "traffic_calming/bump": {
-            "icon": "poi-warning",
+            "icon": "temaki-diamond",
             "fields": [
                 "surface",
                 "direction_vertex"
@@ -19660,7 +19660,7 @@
             "name": "Speed Bump"
         },
         "traffic_calming/chicane": {
-            "icon": "poi-warning",
+            "icon": "temaki-diamond",
             "fields": [
                 "direction_vertex"
             ],
@@ -19679,7 +19679,7 @@
             "name": "Traffic Chicane"
         },
         "traffic_calming/choker": {
-            "icon": "poi-warning",
+            "icon": "temaki-diamond",
             "fields": [
                 "direction_vertex"
             ],
@@ -19697,7 +19697,7 @@
             "name": "Traffic Choker"
         },
         "traffic_calming/cushion": {
-            "icon": "poi-warning",
+            "icon": "temaki-diamond",
             "fields": [
                 "surface",
                 "direction_vertex"
@@ -19718,7 +19718,7 @@
             "name": "Speed Cushion"
         },
         "traffic_calming/dip": {
-            "icon": "poi-warning",
+            "icon": "temaki-diamond",
             "fields": [
                 "surface",
                 "direction_vertex"
@@ -19737,7 +19737,7 @@
             "name": "Dip"
         },
         "traffic_calming/hump": {
-            "icon": "poi-warning",
+            "icon": "temaki-diamond",
             "fields": [
                 "surface",
                 "direction_vertex"
@@ -19757,7 +19757,7 @@
             "name": "Speed Hump"
         },
         "traffic_calming/island": {
-            "icon": "poi-warning",
+            "icon": "temaki-diamond",
             "geometry": [
                 "vertex"
             ],
@@ -19772,7 +19772,7 @@
             "name": "Traffic Island"
         },
         "traffic_calming/rumble_strip": {
-            "icon": "poi-warning",
+            "icon": "temaki-diamond",
             "fields": [
                 "direction_vertex"
             ],
@@ -19791,7 +19791,7 @@
             "name": "Rumble Strip"
         },
         "traffic_calming/table": {
-            "icon": "poi-warning",
+            "icon": "temaki-diamond",
             "fields": [
                 "surface"
             ],
@@ -20475,7 +20475,7 @@
             "name": "Riverbank"
         },
         "waterway/sanitary_dump_station": {
-            "icon": "poi-storage-tank",
+            "icon": "temaki-storage_tank",
             "fields": [
                 "name",
                 "operator",
@@ -61509,7 +61509,7 @@
                 "amenity": "social_facility"
             },
             "name": "Safe Haven",
-            "icon": "poi-social-facility",
+            "icon": "temaki-social_facility",
             "geometry": [
                 "point",
                 "area"
@@ -61532,7 +61532,7 @@
                 "amenity": "social_facility"
             },
             "name": "Детский дом",
-            "icon": "poi-social-facility",
+            "icon": "temaki-social_facility",
             "geometry": [
                 "point",
                 "area"
@@ -61555,7 +61555,7 @@
                 "amenity": "social_facility"
             },
             "name": "Социальный участковый",
-            "icon": "poi-social-facility",
+            "icon": "temaki-social_facility",
             "geometry": [
                 "point",
                 "area"
@@ -62231,7 +62231,7 @@
                 "man_made": "windmill"
             },
             "name": "De Hoop",
-            "icon": "poi-windmill",
+            "icon": "temaki-windmill",
             "geometry": [
                 "point",
                 "area"
@@ -77282,7 +77282,7 @@
                 "shop": "doityourself"
             },
             "name": "Ace Hardware",
-            "icon": "poi-tool",
+            "icon": "temaki-tools",
             "geometry": [
                 "point",
                 "area"
@@ -77303,7 +77303,7 @@
                 "shop": "doityourself"
             },
             "name": "B&Q",
-            "icon": "poi-tool",
+            "icon": "temaki-tools",
             "geometry": [
                 "point",
                 "area"
@@ -77324,7 +77324,7 @@
                 "shop": "doityourself"
             },
             "name": "Bauhaus",
-            "icon": "poi-tool",
+            "icon": "temaki-tools",
             "geometry": [
                 "point",
                 "area"
@@ -77345,7 +77345,7 @@
                 "shop": "doityourself"
             },
             "name": "Biltema",
-            "icon": "poi-tool",
+            "icon": "temaki-tools",
             "geometry": [
                 "point",
                 "area"
@@ -77366,7 +77366,7 @@
                 "shop": "doityourself"
             },
             "name": "Brico",
-            "icon": "poi-tool",
+            "icon": "temaki-tools",
             "geometry": [
                 "point",
                 "area"
@@ -77387,7 +77387,7 @@
                 "shop": "doityourself"
             },
             "name": "Bricomarché",
-            "icon": "poi-tool",
+            "icon": "temaki-tools",
             "geometry": [
                 "point",
                 "area"
@@ -77408,7 +77408,7 @@
                 "shop": "doityourself"
             },
             "name": "Bricorama",
-            "icon": "poi-tool",
+            "icon": "temaki-tools",
             "geometry": [
                 "point",
                 "area"
@@ -77429,7 +77429,7 @@
                 "shop": "doityourself"
             },
             "name": "Bunnings Warehouse",
-            "icon": "poi-tool",
+            "icon": "temaki-tools",
             "geometry": [
                 "point",
                 "area"
@@ -77450,7 +77450,7 @@
                 "shop": "doityourself"
             },
             "name": "Castorama",
-            "icon": "poi-tool",
+            "icon": "temaki-tools",
             "geometry": [
                 "point",
                 "area"
@@ -77471,7 +77471,7 @@
                 "shop": "doityourself"
             },
             "name": "Easy",
-            "icon": "poi-tool",
+            "icon": "temaki-tools",
             "geometry": [
                 "point",
                 "area"
@@ -77492,7 +77492,7 @@
                 "shop": "doityourself"
             },
             "name": "Gamma",
-            "icon": "poi-tool",
+            "icon": "temaki-tools",
             "geometry": [
                 "point",
                 "area"
@@ -77513,7 +77513,7 @@
                 "shop": "doityourself"
             },
             "name": "Globus Baumarkt",
-            "icon": "poi-tool",
+            "icon": "temaki-tools",
             "geometry": [
                 "point",
                 "area"
@@ -77534,7 +77534,7 @@
                 "shop": "doityourself"
             },
             "name": "Hagebaumarkt",
-            "icon": "poi-tool",
+            "icon": "temaki-tools",
             "geometry": [
                 "point",
                 "area"
@@ -77555,7 +77555,7 @@
                 "shop": "doityourself"
             },
             "name": "Hellweg",
-            "icon": "poi-tool",
+            "icon": "temaki-tools",
             "geometry": [
                 "point",
                 "area"
@@ -77576,7 +77576,7 @@
                 "shop": "doityourself"
             },
             "name": "Home Depot",
-            "icon": "poi-tool",
+            "icon": "temaki-tools",
             "geometry": [
                 "point",
                 "area"
@@ -77597,7 +77597,7 @@
                 "shop": "doityourself"
             },
             "name": "Home Hardware",
-            "icon": "poi-tool",
+            "icon": "temaki-tools",
             "geometry": [
                 "point",
                 "area"
@@ -77618,7 +77618,7 @@
                 "shop": "doityourself"
             },
             "name": "Homebase",
-            "icon": "poi-tool",
+            "icon": "temaki-tools",
             "geometry": [
                 "point",
                 "area"
@@ -77639,7 +77639,7 @@
                 "shop": "doityourself"
             },
             "name": "Hornbach",
-            "icon": "poi-tool",
+            "icon": "temaki-tools",
             "geometry": [
                 "point",
                 "area"
@@ -77660,7 +77660,7 @@
                 "shop": "doityourself"
             },
             "name": "Hubo",
-            "icon": "poi-tool",
+            "icon": "temaki-tools",
             "geometry": [
                 "point",
                 "area"
@@ -77681,7 +77681,7 @@
                 "shop": "doityourself"
             },
             "name": "Karwei",
-            "icon": "poi-tool",
+            "icon": "temaki-tools",
             "geometry": [
                 "point",
                 "area"
@@ -77702,7 +77702,7 @@
                 "shop": "doityourself"
             },
             "name": "Lagerhaus",
-            "icon": "poi-tool",
+            "icon": "temaki-tools",
             "geometry": [
                 "point",
                 "area"
@@ -77723,7 +77723,7 @@
                 "shop": "doityourself"
             },
             "name": "Leroy Merlin",
-            "icon": "poi-tool",
+            "icon": "temaki-tools",
             "geometry": [
                 "point",
                 "area"
@@ -77744,7 +77744,7 @@
                 "shop": "doityourself"
             },
             "name": "Lowe's",
-            "icon": "poi-tool",
+            "icon": "temaki-tools",
             "geometry": [
                 "point",
                 "area"
@@ -77765,7 +77765,7 @@
                 "shop": "doityourself"
             },
             "name": "Lowes",
-            "icon": "poi-tool",
+            "icon": "temaki-tools",
             "geometry": [
                 "point",
                 "area"
@@ -77786,7 +77786,7 @@
                 "shop": "doityourself"
             },
             "name": "Menards",
-            "icon": "poi-tool",
+            "icon": "temaki-tools",
             "geometry": [
                 "point",
                 "area"
@@ -77807,7 +77807,7 @@
                 "shop": "doityourself"
             },
             "name": "Mr Bricolage",
-            "icon": "poi-tool",
+            "icon": "temaki-tools",
             "geometry": [
                 "point",
                 "area"
@@ -77828,7 +77828,7 @@
                 "shop": "doityourself"
             },
             "name": "Mr.Bricolage",
-            "icon": "poi-tool",
+            "icon": "temaki-tools",
             "geometry": [
                 "point",
                 "area"
@@ -77849,7 +77849,7 @@
                 "shop": "doityourself"
             },
             "name": "OBI",
-            "icon": "poi-tool",
+            "icon": "temaki-tools",
             "geometry": [
                 "point",
                 "area"
@@ -77870,7 +77870,7 @@
                 "shop": "doityourself"
             },
             "name": "Point P",
-            "icon": "poi-tool",
+            "icon": "temaki-tools",
             "geometry": [
                 "point",
                 "area"
@@ -77891,7 +77891,7 @@
                 "shop": "doityourself"
             },
             "name": "Praktiker",
-            "icon": "poi-tool",
+            "icon": "temaki-tools",
             "geometry": [
                 "point",
                 "area"
@@ -77912,7 +77912,7 @@
                 "shop": "doityourself"
             },
             "name": "Praxis",
-            "icon": "poi-tool",
+            "icon": "temaki-tools",
             "geometry": [
                 "point",
                 "area"
@@ -77933,7 +77933,7 @@
                 "shop": "doityourself"
             },
             "name": "Rona",
-            "icon": "poi-tool",
+            "icon": "temaki-tools",
             "geometry": [
                 "point",
                 "area"
@@ -77954,7 +77954,7 @@
                 "shop": "doityourself"
             },
             "name": "Screwfix",
-            "icon": "poi-tool",
+            "icon": "temaki-tools",
             "geometry": [
                 "point",
                 "area"
@@ -77975,7 +77975,7 @@
                 "shop": "doityourself"
             },
             "name": "Sonderpreis Baumarkt",
-            "icon": "poi-tool",
+            "icon": "temaki-tools",
             "geometry": [
                 "point",
                 "area"
@@ -77996,7 +77996,7 @@
                 "shop": "doityourself"
             },
             "name": "Tekzen",
-            "icon": "poi-tool",
+            "icon": "temaki-tools",
             "geometry": [
                 "point",
                 "area"
@@ -78017,7 +78017,7 @@
                 "shop": "doityourself"
             },
             "name": "Toom Baumarkt",
-            "icon": "poi-tool",
+            "icon": "temaki-tools",
             "geometry": [
                 "point",
                 "area"
@@ -78038,7 +78038,7 @@
                 "shop": "doityourself"
             },
             "name": "Weldom",
-            "icon": "poi-tool",
+            "icon": "temaki-tools",
             "geometry": [
                 "point",
                 "area"
@@ -78059,7 +78059,7 @@
                 "shop": "doityourself"
             },
             "name": "Wickes",
-            "icon": "poi-tool",
+            "icon": "temaki-tools",
             "geometry": [
                 "point",
                 "area"
@@ -78080,7 +78080,7 @@
                 "shop": "doityourself"
             },
             "name": "Леруа Мерлен",
-            "icon": "poi-tool",
+            "icon": "temaki-tools",
             "geometry": [
                 "point",
                 "area"
@@ -78101,7 +78101,7 @@
                 "shop": "doityourself"
             },
             "name": "Мастер",
-            "icon": "poi-tool",
+            "icon": "temaki-tools",
             "geometry": [
                 "point",
                 "area"
@@ -78122,7 +78122,7 @@
                 "shop": "doityourself"
             },
             "name": "Строитель",
-            "icon": "poi-tool",
+            "icon": "temaki-tools",
             "geometry": [
                 "point",
                 "area"
@@ -78143,7 +78143,7 @@
                 "shop": "doityourself"
             },
             "name": "Стройматериалы",
-            "icon": "poi-tool",
+            "icon": "temaki-tools",
             "geometry": [
                 "point",
                 "area"
@@ -78164,7 +78164,7 @@
                 "shop": "doityourself"
             },
             "name": "カインズホーム",
-            "icon": "poi-tool",
+            "icon": "temaki-tools",
             "geometry": [
                 "point",
                 "area"
@@ -78185,7 +78185,7 @@
                 "shop": "doityourself"
             },
             "name": "コメリ",
-            "icon": "poi-tool",
+            "icon": "temaki-tools",
             "geometry": [
                 "point",
                 "area"
@@ -78206,7 +78206,7 @@
                 "shop": "doityourself"
             },
             "name": "コーナン",
-            "icon": "poi-tool",
+            "icon": "temaki-tools",
             "geometry": [
                 "point",
                 "area"
@@ -80747,7 +80747,7 @@
                 "shop": "hardware"
             },
             "name": "1000 мелочей",
-            "icon": "poi-tool",
+            "icon": "temaki-tools",
             "geometry": [
                 "point",
                 "area"
@@ -80768,7 +80768,7 @@
                 "shop": "hardware"
             },
             "name": "Ferretería",
-            "icon": "poi-tool",
+            "icon": "temaki-tools",
             "geometry": [
                 "point",
                 "area"
@@ -80789,7 +80789,7 @@
                 "shop": "hardware"
             },
             "name": "Harbor Freight Tools",
-            "icon": "poi-tool",
+            "icon": "temaki-tools",
             "geometry": [
                 "point",
                 "area"
@@ -80810,7 +80810,7 @@
                 "shop": "hardware"
             },
             "name": "Quincaillerie",
-            "icon": "poi-tool",
+            "icon": "temaki-tools",
             "geometry": [
                 "point",
                 "area"
@@ -80831,7 +80831,7 @@
                 "shop": "hardware"
             },
             "name": "True Value",
-            "icon": "poi-tool",
+            "icon": "temaki-tools",
             "geometry": [
                 "point",
                 "area"
@@ -80852,7 +80852,7 @@
                 "shop": "hardware"
             },
             "name": "Würth",
-            "icon": "poi-tool",
+            "icon": "temaki-tools",
             "geometry": [
                 "point",
                 "area"
@@ -80873,7 +80873,7 @@
                 "shop": "hardware"
             },
             "name": "Промтовары",
-            "icon": "poi-tool",
+            "icon": "temaki-tools",
             "geometry": [
                 "point",
                 "area"
@@ -80894,7 +80894,7 @@
                 "shop": "hardware"
             },
             "name": "Сантехника",
-            "icon": "poi-tool",
+            "icon": "temaki-tools",
             "geometry": [
                 "point",
                 "area"
@@ -80915,7 +80915,7 @@
                 "shop": "hardware"
             },
             "name": "Товары для дома",
-            "icon": "poi-tool",
+            "icon": "temaki-tools",
             "geometry": [
                 "point",
                 "area"
@@ -80936,7 +80936,7 @@
                 "shop": "hardware"
             },
             "name": "Хозтовары",
-            "icon": "poi-tool",
+            "icon": "temaki-tools",
             "geometry": [
                 "point",
                 "area"
diff --git a/data/presets/presets/amenity/bench.json b/data/presets/presets/amenity/bench.json
index f3054c114..fa9be5ffc 100644
--- a/data/presets/presets/amenity/bench.json
+++ b/data/presets/presets/amenity/bench.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-bench",
+    "icon": "temaki-bench",
     "fields": [
         "backrest"
     ],
diff --git a/data/presets/presets/amenity/casino.json b/data/presets/presets/amenity/casino.json
index 8322025ef..1c8715cb5 100644
--- a/data/presets/presets/amenity/casino.json
+++ b/data/presets/presets/amenity/casino.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-dice",
+    "icon": "temaki-dice",
     "fields": [
         "name",
         "operator",
diff --git a/data/presets/presets/amenity/clock.json b/data/presets/presets/amenity/clock.json
index 7d45a11ef..62265686e 100644
--- a/data/presets/presets/amenity/clock.json
+++ b/data/presets/presets/amenity/clock.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-clock",
+    "icon": "temaki-clock",
     "fields": [
         "name",
         "support",
diff --git a/data/presets/presets/amenity/fountain.json b/data/presets/presets/amenity/fountain.json
index 27afc73ac..10ac67cc0 100644
--- a/data/presets/presets/amenity/fountain.json
+++ b/data/presets/presets/amenity/fountain.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-fountain",
+    "icon": "temaki-fountain",
     "fields": [
         "name"
     ],
diff --git a/data/presets/presets/amenity/hunting_stand.json b/data/presets/presets/amenity/hunting_stand.json
index a6d81f7ea..34d696e8f 100644
--- a/data/presets/presets/amenity/hunting_stand.json
+++ b/data/presets/presets/amenity/hunting_stand.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-binoculars",
+    "icon": "temaki-binoculars",
     "geometry": [
         "point",
         "vertex",
diff --git a/data/presets/presets/amenity/internet_cafe.json b/data/presets/presets/amenity/internet_cafe.json
index 4e4d03b9a..ecac9ad83 100644
--- a/data/presets/presets/amenity/internet_cafe.json
+++ b/data/presets/presets/amenity/internet_cafe.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-mast",
+    "icon": "temaki-antenna",
     "fields": [
         "name",
         "operator",
diff --git a/data/presets/presets/amenity/place_of_worship/hindu.json b/data/presets/presets/amenity/place_of_worship/hindu.json
index d54440dbf..d6dba5466 100644
--- a/data/presets/presets/amenity/place_of_worship/hindu.json
+++ b/data/presets/presets/amenity/place_of_worship/hindu.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-hinduist",
+    "icon": "temaki-hinduism",
     "fields": [
         "name",
         "denomination",
diff --git a/data/presets/presets/amenity/place_of_worship/shinto.json b/data/presets/presets/amenity/place_of_worship/shinto.json
index 49cf2bfca..7a940b181 100644
--- a/data/presets/presets/amenity/place_of_worship/shinto.json
+++ b/data/presets/presets/amenity/place_of_worship/shinto.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-shintoist",
+    "icon": "temaki-shinto",
     "fields": [
         "name",
         "denomination",
diff --git a/data/presets/presets/amenity/place_of_worship/sikh.json b/data/presets/presets/amenity/place_of_worship/sikh.json
index fc1ad93d8..fb2aba2fc 100644
--- a/data/presets/presets/amenity/place_of_worship/sikh.json
+++ b/data/presets/presets/amenity/place_of_worship/sikh.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-sikhist",
+    "icon": "temaki-sikhism",
     "fields": [
         "name",
         "denomination",
diff --git a/data/presets/presets/amenity/place_of_worship/taoist.json b/data/presets/presets/amenity/place_of_worship/taoist.json
index 795b1e6ea..a4fbcde3d 100644
--- a/data/presets/presets/amenity/place_of_worship/taoist.json
+++ b/data/presets/presets/amenity/place_of_worship/taoist.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-taoist",
+    "icon": "temaki-taoism",
     "fields": [
         "name",
         "denomination",
diff --git a/data/presets/presets/amenity/sanitary_dump_station.json b/data/presets/presets/amenity/sanitary_dump_station.json
index 159d7f0bc..0fd87d474 100644
--- a/data/presets/presets/amenity/sanitary_dump_station.json
+++ b/data/presets/presets/amenity/sanitary_dump_station.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-storage-tank",
+    "icon": "temaki-storage_tank",
     "fields": [
         "operator",
         "access_simple",
diff --git a/data/presets/presets/amenity/shower.json b/data/presets/presets/amenity/shower.json
index 44eeee07b..9584ec2f4 100644
--- a/data/presets/presets/amenity/shower.json
+++ b/data/presets/presets/amenity/shower.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-shower",
+    "icon": "temaki-shower",
     "fields": [
         "operator",
         "opening_hours",
diff --git a/data/presets/presets/amenity/social_facility.json b/data/presets/presets/amenity/social_facility.json
index aa24ed6b2..70f8c7305 100644
--- a/data/presets/presets/amenity/social_facility.json
+++ b/data/presets/presets/amenity/social_facility.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-social-facility",
+    "icon": "temaki-social_facility",
     "fields": [
         "name",
         "operator",
diff --git a/data/presets/presets/amenity/social_facility/food_bank.json b/data/presets/presets/amenity/social_facility/food_bank.json
index 5d14e231e..7e65c67da 100644
--- a/data/presets/presets/amenity/social_facility/food_bank.json
+++ b/data/presets/presets/amenity/social_facility/food_bank.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-social-facility",
+    "icon": "temaki-social_facility",
     "fields": [
         "name",
         "operator",
diff --git a/data/presets/presets/amenity/social_facility/homeless_shelter.json b/data/presets/presets/amenity/social_facility/homeless_shelter.json
index 59bc7035a..44947292a 100644
--- a/data/presets/presets/amenity/social_facility/homeless_shelter.json
+++ b/data/presets/presets/amenity/social_facility/homeless_shelter.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-social-facility",
+    "icon": "temaki-social_facility",
     "fields": [
         "name",
         "operator",
diff --git a/data/presets/presets/amenity/vending_machine.json b/data/presets/presets/amenity/vending_machine.json
index 96b0ce16a..c4e2b93e0 100644
--- a/data/presets/presets/amenity/vending_machine.json
+++ b/data/presets/presets/amenity/vending_machine.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-vending-machine",
+    "icon": "temaki-vending_machine",
     "fields": [
         "vending",
         "operator",
diff --git a/data/presets/presets/amenity/vending_machine/_news_papers.json b/data/presets/presets/amenity/vending_machine/_news_papers.json
index 01a2840d4..afbe65517 100644
--- a/data/presets/presets/amenity/vending_machine/_news_papers.json
+++ b/data/presets/presets/amenity/vending_machine/_news_papers.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-vending-machine",
+    "icon": "temaki-vending_machine",
     "fields": [
         "vending",
         "operator",
diff --git a/data/presets/presets/amenity/vending_machine/cigarettes.json b/data/presets/presets/amenity/vending_machine/cigarettes.json
index 125462b75..5e295b574 100644
--- a/data/presets/presets/amenity/vending_machine/cigarettes.json
+++ b/data/presets/presets/amenity/vending_machine/cigarettes.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-vending-machine",
+    "icon": "temaki-vending_machine",
     "fields": [
         "vending",
         "operator",
diff --git a/data/presets/presets/amenity/vending_machine/coffee.json b/data/presets/presets/amenity/vending_machine/coffee.json
index b156a970b..9a5fef0d4 100644
--- a/data/presets/presets/amenity/vending_machine/coffee.json
+++ b/data/presets/presets/amenity/vending_machine/coffee.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-vending-machine",
+    "icon": "temaki-vending_machine",
     "fields": [
         "vending",
         "operator",
diff --git a/data/presets/presets/amenity/vending_machine/condoms.json b/data/presets/presets/amenity/vending_machine/condoms.json
index 46ac3292e..e355be38b 100644
--- a/data/presets/presets/amenity/vending_machine/condoms.json
+++ b/data/presets/presets/amenity/vending_machine/condoms.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-vending-machine",
+    "icon": "temaki-vending_machine",
     "fields": [
         "vending",
         "operator",
diff --git a/data/presets/presets/amenity/vending_machine/drinks.json b/data/presets/presets/amenity/vending_machine/drinks.json
index 7f3d3ac2a..325988a44 100644
--- a/data/presets/presets/amenity/vending_machine/drinks.json
+++ b/data/presets/presets/amenity/vending_machine/drinks.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-vending-machine",
+    "icon": "temaki-vending_machine",
     "fields": [
         "vending",
         "operator",
diff --git a/data/presets/presets/amenity/vending_machine/electronics.json b/data/presets/presets/amenity/vending_machine/electronics.json
index 9deea1d64..50fc0be81 100644
--- a/data/presets/presets/amenity/vending_machine/electronics.json
+++ b/data/presets/presets/amenity/vending_machine/electronics.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-vending-machine",
+    "icon": "temaki-vending_machine",
     "fields": [
         "vending",
         "operator",
diff --git a/data/presets/presets/amenity/vending_machine/elongated_coin.json b/data/presets/presets/amenity/vending_machine/elongated_coin.json
index 13a27cf00..9cf3e756d 100644
--- a/data/presets/presets/amenity/vending_machine/elongated_coin.json
+++ b/data/presets/presets/amenity/vending_machine/elongated_coin.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-vending-machine",
+    "icon": "temaki-vending_machine",
     "fields": [
         "vending",
         "operator",
diff --git a/data/presets/presets/amenity/vending_machine/excrement_bags.json b/data/presets/presets/amenity/vending_machine/excrement_bags.json
index 6c41925b4..15dec93e6 100644
--- a/data/presets/presets/amenity/vending_machine/excrement_bags.json
+++ b/data/presets/presets/amenity/vending_machine/excrement_bags.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-vending-machine",
+    "icon": "temaki-vending_machine",
     "fields": [
         "vending",
         "operator",
diff --git a/data/presets/presets/amenity/vending_machine/feminine_hygiene.json b/data/presets/presets/amenity/vending_machine/feminine_hygiene.json
index e798a75ba..e8589fd46 100644
--- a/data/presets/presets/amenity/vending_machine/feminine_hygiene.json
+++ b/data/presets/presets/amenity/vending_machine/feminine_hygiene.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-vending-machine",
+    "icon": "temaki-vending_machine",
     "fields": [
         "vending",
         "operator",
diff --git a/data/presets/presets/amenity/vending_machine/food.json b/data/presets/presets/amenity/vending_machine/food.json
index 235c6550a..8d1d15c22 100644
--- a/data/presets/presets/amenity/vending_machine/food.json
+++ b/data/presets/presets/amenity/vending_machine/food.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-vending-machine",
+    "icon": "temaki-vending_machine",
     "fields": [
         "vending",
         "operator",
diff --git a/data/presets/presets/amenity/vending_machine/fuel.json b/data/presets/presets/amenity/vending_machine/fuel.json
index 17ca35192..f10bd1349 100644
--- a/data/presets/presets/amenity/vending_machine/fuel.json
+++ b/data/presets/presets/amenity/vending_machine/fuel.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-vending-machine",
+    "icon": "temaki-vending_machine",
     "fields": [
         "vending",
         "operator",
diff --git a/data/presets/presets/amenity/vending_machine/ice_cream.json b/data/presets/presets/amenity/vending_machine/ice_cream.json
index 8afab7be4..a07055c6b 100644
--- a/data/presets/presets/amenity/vending_machine/ice_cream.json
+++ b/data/presets/presets/amenity/vending_machine/ice_cream.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-vending-machine",
+    "icon": "temaki-vending_machine",
     "fields": [
         "vending",
         "operator",
diff --git a/data/presets/presets/amenity/vending_machine/newspapers.json b/data/presets/presets/amenity/vending_machine/newspapers.json
index 49601a932..affacec2d 100644
--- a/data/presets/presets/amenity/vending_machine/newspapers.json
+++ b/data/presets/presets/amenity/vending_machine/newspapers.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-vending-machine",
+    "icon": "temaki-vending_machine",
     "fields": [
         "vending",
         "operator",
diff --git a/data/presets/presets/amenity/vending_machine/parcel_pickup_dropoff.json b/data/presets/presets/amenity/vending_machine/parcel_pickup_dropoff.json
index a7f8a6bd6..a500ef405 100644
--- a/data/presets/presets/amenity/vending_machine/parcel_pickup_dropoff.json
+++ b/data/presets/presets/amenity/vending_machine/parcel_pickup_dropoff.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-vending-machine",
+    "icon": "temaki-vending_machine",
     "fields": [
         "vending",
         "operator",
diff --git a/data/presets/presets/amenity/vending_machine/parking_tickets.json b/data/presets/presets/amenity/vending_machine/parking_tickets.json
index d729e830d..94c3b5324 100644
--- a/data/presets/presets/amenity/vending_machine/parking_tickets.json
+++ b/data/presets/presets/amenity/vending_machine/parking_tickets.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-vending-machine",
+    "icon": "temaki-vending_machine",
     "fields": [
         "vending",
         "operator",
diff --git a/data/presets/presets/amenity/vending_machine/public_transport_tickets.json b/data/presets/presets/amenity/vending_machine/public_transport_tickets.json
index e38dc09e6..918771ff6 100644
--- a/data/presets/presets/amenity/vending_machine/public_transport_tickets.json
+++ b/data/presets/presets/amenity/vending_machine/public_transport_tickets.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-vending-machine",
+    "icon": "temaki-vending_machine",
     "fields": [
         "vending",
         "operator",
diff --git a/data/presets/presets/amenity/vending_machine/stamps.json b/data/presets/presets/amenity/vending_machine/stamps.json
index 5ee180d2d..b664fa412 100644
--- a/data/presets/presets/amenity/vending_machine/stamps.json
+++ b/data/presets/presets/amenity/vending_machine/stamps.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-vending-machine",
+    "icon": "temaki-vending_machine",
     "fields": [
         "vending",
         "operator",
diff --git a/data/presets/presets/amenity/vending_machine/sweets.json b/data/presets/presets/amenity/vending_machine/sweets.json
index 495b75fba..92bcfc768 100644
--- a/data/presets/presets/amenity/vending_machine/sweets.json
+++ b/data/presets/presets/amenity/vending_machine/sweets.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-vending-machine",
+    "icon": "temaki-vending_machine",
     "fields": [
         "vending",
         "operator",
diff --git a/data/presets/presets/attraction/drop_tower.json b/data/presets/presets/attraction/drop_tower.json
index 6e14a2eea..4a7bd0fb5 100644
--- a/data/presets/presets/attraction/drop_tower.json
+++ b/data/presets/presets/attraction/drop_tower.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-tower",
+    "icon": "temaki-tower",
     "fields": [
         "name",
         "operator",
diff --git a/data/presets/presets/building/ruins.json b/data/presets/presets/building/ruins.json
index c39a7201b..408ec6307 100644
--- a/data/presets/presets/building/ruins.json
+++ b/data/presets/presets/building/ruins.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-ruins",
+    "icon": "temaki-ruins",
     "fields": [
         "name",
         "address",
diff --git a/data/presets/presets/craft.json b/data/presets/presets/craft.json
index 2f88a6113..1cf6de68a 100644
--- a/data/presets/presets/craft.json
+++ b/data/presets/presets/craft.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-tool",
+    "icon": "temaki-tools",
     "fields": [
         "name",
         "craft",
diff --git a/data/presets/presets/craft/blacksmith.json b/data/presets/presets/craft/blacksmith.json
index 9f640cf4c..fac48b971 100644
--- a/data/presets/presets/craft/blacksmith.json
+++ b/data/presets/presets/craft/blacksmith.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-tool",
+    "icon": "temaki-tools",
     "fields": [
         "name",
         "operator",
diff --git a/data/presets/presets/craft/boatbuilder.json b/data/presets/presets/craft/boatbuilder.json
index c199fceec..41fd50251 100644
--- a/data/presets/presets/craft/boatbuilder.json
+++ b/data/presets/presets/craft/boatbuilder.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-tool",
+    "icon": "temaki-tools",
     "fields": [
         "name",
         "operator",
diff --git a/data/presets/presets/craft/brewery.json b/data/presets/presets/craft/brewery.json
index f570748ee..4813b3004 100644
--- a/data/presets/presets/craft/brewery.json
+++ b/data/presets/presets/craft/brewery.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-storage-tank",
+    "icon": "temaki-storage_tank",
     "fields": [
         "name",
         "operator",
diff --git a/data/presets/presets/craft/carpenter.json b/data/presets/presets/craft/carpenter.json
index 93e299075..ffacc6158 100644
--- a/data/presets/presets/craft/carpenter.json
+++ b/data/presets/presets/craft/carpenter.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-tool",
+    "icon": "temaki-tools",
     "fields": [
         "name",
         "operator",
diff --git a/data/presets/presets/craft/carpet_layer.json b/data/presets/presets/craft/carpet_layer.json
index 4b3a76e96..4efdb5d68 100644
--- a/data/presets/presets/craft/carpet_layer.json
+++ b/data/presets/presets/craft/carpet_layer.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-tool",
+    "icon": "temaki-tools",
     "fields": [
         "name",
         "operator",
diff --git a/data/presets/presets/craft/chimney_sweeper.json b/data/presets/presets/craft/chimney_sweeper.json
index 92f1ac592..33329cb04 100644
--- a/data/presets/presets/craft/chimney_sweeper.json
+++ b/data/presets/presets/craft/chimney_sweeper.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-chimney",
+    "icon": "temaki-chimney",
     "fields": [
         "name",
         "operator",
diff --git a/data/presets/presets/craft/clockmaker.json b/data/presets/presets/craft/clockmaker.json
index 11d8357bb..311091936 100644
--- a/data/presets/presets/craft/clockmaker.json
+++ b/data/presets/presets/craft/clockmaker.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-clock",
+    "icon": "temaki-clock",
     "fields": [
         "name",
         "operator",
diff --git a/data/presets/presets/craft/distillery.json b/data/presets/presets/craft/distillery.json
index be2bd1a90..a48d27e09 100644
--- a/data/presets/presets/craft/distillery.json
+++ b/data/presets/presets/craft/distillery.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-storage-tank",
+    "icon": "temaki-storage_tank",
     "fields": [
         "name",
         "operator",
diff --git a/data/presets/presets/craft/electrician.json b/data/presets/presets/craft/electrician.json
index 36c99cdd3..6f30d42b9 100644
--- a/data/presets/presets/craft/electrician.json
+++ b/data/presets/presets/craft/electrician.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-power",
+    "icon": "temaki-power",
     "fields": [
         "name",
         "operator",
diff --git a/data/presets/presets/craft/electronics_repair.json b/data/presets/presets/craft/electronics_repair.json
index 08cb7f3e4..5d30131ab 100644
--- a/data/presets/presets/craft/electronics_repair.json
+++ b/data/presets/presets/craft/electronics_repair.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-tool",
+    "icon": "temaki-tools",
     "fields": [
         "name",
         "operator",
diff --git a/data/presets/presets/craft/glaziery.json b/data/presets/presets/craft/glaziery.json
index 8178423af..ac4e2b9cf 100644
--- a/data/presets/presets/craft/glaziery.json
+++ b/data/presets/presets/craft/glaziery.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-window",
+    "icon": "temaki-window",
     "fields": [
         "name",
         "operator",
diff --git a/data/presets/presets/craft/hvac.json b/data/presets/presets/craft/hvac.json
index f696ba20d..eb73b3d64 100644
--- a/data/presets/presets/craft/hvac.json
+++ b/data/presets/presets/craft/hvac.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-tool",
+    "icon": "temaki-tools",
     "fields": [
         "name",
         "operator",
diff --git a/data/presets/presets/craft/insulator.json b/data/presets/presets/craft/insulator.json
index 926c437e6..4c16506e9 100644
--- a/data/presets/presets/craft/insulator.json
+++ b/data/presets/presets/craft/insulator.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-tool",
+    "icon": "temaki-tools",
     "fields": [
         "name",
         "operator",
diff --git a/data/presets/presets/craft/metal_construction.json b/data/presets/presets/craft/metal_construction.json
index acb6a6f9d..f2d467c0c 100644
--- a/data/presets/presets/craft/metal_construction.json
+++ b/data/presets/presets/craft/metal_construction.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-tool",
+    "icon": "temaki-tools",
     "fields": [
         "name",
         "operator",
diff --git a/data/presets/presets/craft/plasterer.json b/data/presets/presets/craft/plasterer.json
index 145154f49..79676d0c8 100644
--- a/data/presets/presets/craft/plasterer.json
+++ b/data/presets/presets/craft/plasterer.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-tool",
+    "icon": "temaki-tools",
     "fields": [
         "name",
         "operator",
diff --git a/data/presets/presets/craft/plumber.json b/data/presets/presets/craft/plumber.json
index e086ea39a..5e5649074 100644
--- a/data/presets/presets/craft/plumber.json
+++ b/data/presets/presets/craft/plumber.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-tool",
+    "icon": "temaki-tools",
     "fields": [
         "name",
         "operator",
diff --git a/data/presets/presets/craft/rigger.json b/data/presets/presets/craft/rigger.json
index e5f6be6ec..7e566088d 100644
--- a/data/presets/presets/craft/rigger.json
+++ b/data/presets/presets/craft/rigger.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-tool",
+    "icon": "temaki-tools",
     "fields": [
         "name",
         "operator",
diff --git a/data/presets/presets/craft/roofer.json b/data/presets/presets/craft/roofer.json
index 31863245b..65b64d370 100644
--- a/data/presets/presets/craft/roofer.json
+++ b/data/presets/presets/craft/roofer.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-tool",
+    "icon": "temaki-tools",
     "fields": [
         "name",
         "operator",
diff --git a/data/presets/presets/craft/saddler.json b/data/presets/presets/craft/saddler.json
index 0d28316cd..b427da5dc 100644
--- a/data/presets/presets/craft/saddler.json
+++ b/data/presets/presets/craft/saddler.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-tool",
+    "icon": "temaki-tools",
     "fields": [
         "name",
         "operator",
diff --git a/data/presets/presets/craft/sailmaker.json b/data/presets/presets/craft/sailmaker.json
index 9398f8b2f..debd16446 100644
--- a/data/presets/presets/craft/sailmaker.json
+++ b/data/presets/presets/craft/sailmaker.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-tool",
+    "icon": "temaki-tools",
     "fields": [
         "name",
         "operator",
diff --git a/data/presets/presets/craft/scaffolder.json b/data/presets/presets/craft/scaffolder.json
index 76e1b7066..79d7495dc 100644
--- a/data/presets/presets/craft/scaffolder.json
+++ b/data/presets/presets/craft/scaffolder.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-tool",
+    "icon": "temaki-tools",
     "fields": [
         "name",
         "operator",
diff --git a/data/presets/presets/craft/shoemaker.json b/data/presets/presets/craft/shoemaker.json
index 1a0264792..96cdf8f3d 100644
--- a/data/presets/presets/craft/shoemaker.json
+++ b/data/presets/presets/craft/shoemaker.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-tool",
+    "icon": "temaki-tools",
     "fields": [
         "name",
         "operator",
diff --git a/data/presets/presets/craft/stonemason.json b/data/presets/presets/craft/stonemason.json
index 130b774fd..67530cd0f 100644
--- a/data/presets/presets/craft/stonemason.json
+++ b/data/presets/presets/craft/stonemason.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-tool",
+    "icon": "temaki-tools",
     "fields": [
         "name",
         "operator",
diff --git a/data/presets/presets/craft/tiler.json b/data/presets/presets/craft/tiler.json
index bdc64cb3d..90da85769 100644
--- a/data/presets/presets/craft/tiler.json
+++ b/data/presets/presets/craft/tiler.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-tool",
+    "icon": "temaki-tools",
     "fields": [
         "name",
         "operator",
diff --git a/data/presets/presets/craft/tinsmith.json b/data/presets/presets/craft/tinsmith.json
index ddde08555..a18c92b97 100644
--- a/data/presets/presets/craft/tinsmith.json
+++ b/data/presets/presets/craft/tinsmith.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-tool",
+    "icon": "temaki-tools",
     "fields": [
         "name",
         "operator",
diff --git a/data/presets/presets/craft/upholsterer.json b/data/presets/presets/craft/upholsterer.json
index ec46b95e4..3cebef71f 100644
--- a/data/presets/presets/craft/upholsterer.json
+++ b/data/presets/presets/craft/upholsterer.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-tool",
+    "icon": "temaki-tools",
     "fields": [
         "name",
         "operator",
diff --git a/data/presets/presets/craft/watchmaker.json b/data/presets/presets/craft/watchmaker.json
index f83f2a63d..960dadd3c 100644
--- a/data/presets/presets/craft/watchmaker.json
+++ b/data/presets/presets/craft/watchmaker.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-clock",
+    "icon": "temaki-clock",
     "fields": [
         "name",
         "operator",
diff --git a/data/presets/presets/craft/window_construction.json b/data/presets/presets/craft/window_construction.json
index de00f08a1..2297082ed 100644
--- a/data/presets/presets/craft/window_construction.json
+++ b/data/presets/presets/craft/window_construction.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-window",
+    "icon": "temaki-window",
     "fields": [
         "name",
         "operator",
diff --git a/data/presets/presets/emergency/fire_hydrant.json b/data/presets/presets/emergency/fire_hydrant.json
index 688977234..1cdc55205 100644
--- a/data/presets/presets/emergency/fire_hydrant.json
+++ b/data/presets/presets/emergency/fire_hydrant.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-fire-hydrant",
+    "icon": "temaki-fire_hydrant",
     "fields": [
         "fire_hydrant/type",
         "fire_hydrant/position",
diff --git a/data/presets/presets/highway/crosswalk-raised.json b/data/presets/presets/highway/crosswalk-raised.json
index b5340ad3e..452d61a6c 100644
--- a/data/presets/presets/highway/crosswalk-raised.json
+++ b/data/presets/presets/highway/crosswalk-raised.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-foot",
+    "icon": "temaki-pedestrian",
     "fields": [
         "crossing",
         "kerb",
diff --git a/data/presets/presets/highway/crosswalk.json b/data/presets/presets/highway/crosswalk.json
index 08dc6a3b1..f59394d4d 100644
--- a/data/presets/presets/highway/crosswalk.json
+++ b/data/presets/presets/highway/crosswalk.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-foot",
+    "icon": "temaki-pedestrian",
     "fields": [
         "crossing",
         "kerb",
diff --git a/data/presets/presets/highway/elevator.json b/data/presets/presets/highway/elevator.json
index 43c74bbf8..afe3f13e4 100644
--- a/data/presets/presets/highway/elevator.json
+++ b/data/presets/presets/highway/elevator.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-elevator",
+    "icon": "temaki-elevator",
     "fields": [
         "access_simple",
         "opening_hours",
diff --git a/data/presets/presets/highway/give_way.json b/data/presets/presets/highway/give_way.json
index 3477820fc..5716e0dee 100644
--- a/data/presets/presets/highway/give_way.json
+++ b/data/presets/presets/highway/give_way.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-yield",
+    "icon": "temaki-yield",
     "fields": [
         "direction_vertex"
     ],
diff --git a/data/presets/presets/highway/motorway_junction.json b/data/presets/presets/highway/motorway_junction.json
index f2f297b5b..078b23704 100644
--- a/data/presets/presets/highway/motorway_junction.json
+++ b/data/presets/presets/highway/motorway_junction.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-junction",
+    "icon": "temaki-junction",
     "geometry": [
         "vertex"
     ],
diff --git a/data/presets/presets/highway/pedestrian_area.json b/data/presets/presets/highway/pedestrian_area.json
index 1f305b3b6..1d8cc69d7 100644
--- a/data/presets/presets/highway/pedestrian_area.json
+++ b/data/presets/presets/highway/pedestrian_area.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-foot",
+    "icon": "temaki-pedestrian",
     "fields": [
         "name",
         "surface",
diff --git a/data/presets/presets/highway/stop.json b/data/presets/presets/highway/stop.json
index ec4576d12..c8eaa6195 100644
--- a/data/presets/presets/highway/stop.json
+++ b/data/presets/presets/highway/stop.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-stop",
+    "icon": "temaki-stop",
     "fields": [
         "stop",
         "direction_vertex"
diff --git a/data/presets/presets/highway/street_lamp.json b/data/presets/presets/highway/street_lamp.json
index e5531b076..e6c50d362 100644
--- a/data/presets/presets/highway/street_lamp.json
+++ b/data/presets/presets/highway/street_lamp.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-bulb",
+    "icon": "temaki-bulb",
     "geometry": [
         "point",
         "vertex"
diff --git a/data/presets/presets/highway/traffic_signals.json b/data/presets/presets/highway/traffic_signals.json
index 2350052fd..f4cb1eeed 100644
--- a/data/presets/presets/highway/traffic_signals.json
+++ b/data/presets/presets/highway/traffic_signals.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-traffic-signals",
+    "icon": "temaki-traffic_signals",
     "geometry": [
         "vertex"
     ],
diff --git a/data/presets/presets/historic.json b/data/presets/presets/historic.json
index 69fb81a4c..9a5605b17 100644
--- a/data/presets/presets/historic.json
+++ b/data/presets/presets/historic.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-ruins",
+    "icon": "temaki-ruins",
     "fields": [
         "historic",
         "inscription"
diff --git a/data/presets/presets/historic/archaeological_site.json b/data/presets/presets/historic/archaeological_site.json
index 2c6246abb..d0860eee3 100644
--- a/data/presets/presets/historic/archaeological_site.json
+++ b/data/presets/presets/historic/archaeological_site.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-ruins",
+    "icon": "temaki-ruins",
     "fields": [
         "name",
         "historic/civilization",
diff --git a/data/presets/presets/historic/boundary_stone.json b/data/presets/presets/historic/boundary_stone.json
index 17995e544..7c7c7e74f 100644
--- a/data/presets/presets/historic/boundary_stone.json
+++ b/data/presets/presets/historic/boundary_stone.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-milestone",
+    "icon": "temaki-milestone",
     "fields": [
         "name",
         "inscription"
diff --git a/data/presets/presets/historic/ruins.json b/data/presets/presets/historic/ruins.json
index c240bbce1..b54ec96ab 100644
--- a/data/presets/presets/historic/ruins.json
+++ b/data/presets/presets/historic/ruins.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-ruins",
+    "icon": "temaki-ruins",
     "fields": [
         "name",
         "historic/civilization",
diff --git a/data/presets/presets/junction.json b/data/presets/presets/junction.json
index d7a8e420a..4f0cd3b02 100644
--- a/data/presets/presets/junction.json
+++ b/data/presets/presets/junction.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-junction",
+    "icon": "temaki-junction",
     "fields": [
         "name"
     ],
diff --git a/data/presets/presets/landuse/military.json b/data/presets/presets/landuse/military.json
index 661513dec..39129b2de 100644
--- a/data/presets/presets/landuse/military.json
+++ b/data/presets/presets/landuse/military.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-military",
+    "icon": "temaki-military",
     "fields": [
         "name"
     ],
diff --git a/data/presets/presets/landuse/military/barracks.json b/data/presets/presets/landuse/military/barracks.json
index aeb5aa7b1..d56d0187e 100644
--- a/data/presets/presets/landuse/military/barracks.json
+++ b/data/presets/presets/landuse/military/barracks.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-military",
+    "icon": "temaki-military",
     "fields": [
         "name",
         "building_area"
diff --git a/data/presets/presets/landuse/military/bunker.json b/data/presets/presets/landuse/military/bunker.json
index b3e52d279..ff726bb00 100644
--- a/data/presets/presets/landuse/military/bunker.json
+++ b/data/presets/presets/landuse/military/bunker.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-military",
+    "icon": "temaki-military",
     "fields": [
         "name",
         "bunker_type",
diff --git a/data/presets/presets/landuse/military/naval_base.json b/data/presets/presets/landuse/military/naval_base.json
index c00fcc928..13ee9706c 100644
--- a/data/presets/presets/landuse/military/naval_base.json
+++ b/data/presets/presets/landuse/military/naval_base.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-military",
+    "icon": "temaki-military",
     "fields": [
         "name"
     ],
diff --git a/data/presets/presets/landuse/military/obstacle_course.json b/data/presets/presets/landuse/military/obstacle_course.json
index 197a896be..db1a9622e 100644
--- a/data/presets/presets/landuse/military/obstacle_course.json
+++ b/data/presets/presets/landuse/military/obstacle_course.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-military",
+    "icon": "temaki-military",
     "geometry": [
         "point",
         "area"
diff --git a/data/presets/presets/landuse/military/office.json b/data/presets/presets/landuse/military/office.json
index a0fc084c0..1369fd62f 100644
--- a/data/presets/presets/landuse/military/office.json
+++ b/data/presets/presets/landuse/military/office.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-military",
+    "icon": "temaki-military",
     "fields": [
         "name",
         "building_area"
diff --git a/data/presets/presets/landuse/military/range.json b/data/presets/presets/landuse/military/range.json
index 023efaf51..a986dfe86 100644
--- a/data/presets/presets/landuse/military/range.json
+++ b/data/presets/presets/landuse/military/range.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-military",
+    "icon": "temaki-military",
     "fields": [
         "name"
     ],
diff --git a/data/presets/presets/landuse/military/training_area.json b/data/presets/presets/landuse/military/training_area.json
index 0acb652b3..f002e92cd 100644
--- a/data/presets/presets/landuse/military/training_area.json
+++ b/data/presets/presets/landuse/military/training_area.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-military",
+    "icon": "temaki-military",
     "fields": [
         "name"
     ],
diff --git a/data/presets/presets/leisure/adult_gaming_centre.json b/data/presets/presets/leisure/adult_gaming_centre.json
index c65cb9f67..7cce63bc0 100644
--- a/data/presets/presets/leisure/adult_gaming_centre.json
+++ b/data/presets/presets/leisure/adult_gaming_centre.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-dice",
+    "icon": "temaki-dice",
     "fields": [
         "name",
         "operator",
diff --git a/data/presets/presets/leisure/beach_resort.json b/data/presets/presets/leisure/beach_resort.json
index 6dceb2b42..540dc0f49 100644
--- a/data/presets/presets/leisure/beach_resort.json
+++ b/data/presets/presets/leisure/beach_resort.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-beach",
+    "icon": "temaki-beach",
     "fields": [
         "name",
         "address",
diff --git a/data/presets/presets/leisure/bird_hide.json b/data/presets/presets/leisure/bird_hide.json
index c768054fc..780702345 100644
--- a/data/presets/presets/leisure/bird_hide.json
+++ b/data/presets/presets/leisure/bird_hide.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-binoculars",
+    "icon": "temaki-binoculars",
     "fields": [
         "building_area"
     ],
diff --git a/data/presets/presets/leisure/bowling_alley.json b/data/presets/presets/leisure/bowling_alley.json
index ce6938a3a..ba8e432e0 100644
--- a/data/presets/presets/leisure/bowling_alley.json
+++ b/data/presets/presets/leisure/bowling_alley.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-bowling",
+    "icon": "temaki-bowling",
     "fields": [
         "name",
         "operator",
diff --git a/data/presets/presets/leisure/common.json b/data/presets/presets/leisure/common.json
index 549a69860..f5464bd3f 100644
--- a/data/presets/presets/leisure/common.json
+++ b/data/presets/presets/leisure/common.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-foot",
+    "icon": "temaki-pedestrian",
     "geometry": [
         "point",
         "area"
diff --git a/data/presets/presets/leisure/slipway.json b/data/presets/presets/leisure/slipway.json
index 9d7b2ea6f..82f3c0622 100644
--- a/data/presets/presets/leisure/slipway.json
+++ b/data/presets/presets/leisure/slipway.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-beach",
+    "icon": "temaki-beach",
     "geometry": [
         "point",
         "line"
diff --git a/data/presets/presets/man_made.json b/data/presets/presets/man_made.json
index 254b1b229..64665804d 100644
--- a/data/presets/presets/man_made.json
+++ b/data/presets/presets/man_made.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-storage-tank",
+    "icon": "temaki-storage_tank",
     "fields": [
         "name",
         "man_made"
diff --git a/data/presets/presets/man_made/antenna.json b/data/presets/presets/man_made/antenna.json
index a62e9bedf..78abb4eb1 100644
--- a/data/presets/presets/man_made/antenna.json
+++ b/data/presets/presets/man_made/antenna.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-mast",
+    "icon": "temaki-antenna",
     "fields": [
         "height",
         "communication_multi"
diff --git a/data/presets/presets/man_made/chimney.json b/data/presets/presets/man_made/chimney.json
index 99696f7e7..b5e15d94e 100644
--- a/data/presets/presets/man_made/chimney.json
+++ b/data/presets/presets/man_made/chimney.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-chimney",
+    "icon": "temaki-chimney",
     "geometry": [
         "point",
         "area"
diff --git a/data/presets/presets/man_made/crane.json b/data/presets/presets/man_made/crane.json
index a2b6f06d5..a7cdda0ac 100644
--- a/data/presets/presets/man_made/crane.json
+++ b/data/presets/presets/man_made/crane.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-crane",
+    "icon": "temaki-crane",
     "fields": [
         "operator",
         "height",
diff --git a/data/presets/presets/man_made/gasometer.json b/data/presets/presets/man_made/gasometer.json
index 5fb4786b8..63daf508b 100644
--- a/data/presets/presets/man_made/gasometer.json
+++ b/data/presets/presets/man_made/gasometer.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-storage-tank",
+    "icon": "temaki-storage_tank",
     "geometry": [
         "point",
         "area"
diff --git a/data/presets/presets/man_made/mast.json b/data/presets/presets/man_made/mast.json
index b9e215870..ef3c0ca20 100644
--- a/data/presets/presets/man_made/mast.json
+++ b/data/presets/presets/man_made/mast.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-mast",
+    "icon": "temaki-antenna",
     "fields": [
         "tower/type",
         "tower/construction",
diff --git a/data/presets/presets/man_made/monitoring_station.json b/data/presets/presets/man_made/monitoring_station.json
index 3b24481bf..00a98f0d7 100644
--- a/data/presets/presets/man_made/monitoring_station.json
+++ b/data/presets/presets/man_made/monitoring_station.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-mast",
+    "icon": "temaki-antenna",
     "geometry": [
         "point",
         "area"
diff --git a/data/presets/presets/man_made/observation.json b/data/presets/presets/man_made/observation.json
index 8261afc1d..960ff6f3f 100644
--- a/data/presets/presets/man_made/observation.json
+++ b/data/presets/presets/man_made/observation.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-tower",
+    "icon": "temaki-tower",
     "geometry": [
         "point",
         "area"
diff --git a/data/presets/presets/man_made/petroleum_well.json b/data/presets/presets/man_made/petroleum_well.json
index c79db8111..a875be74d 100644
--- a/data/presets/presets/man_made/petroleum_well.json
+++ b/data/presets/presets/man_made/petroleum_well.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-storage-tank",
+    "icon": "temaki-storage_tank",
     "geometry": [
         "point"
     ],
diff --git a/data/presets/presets/man_made/silo.json b/data/presets/presets/man_made/silo.json
index 572ab9f25..a59a67d9e 100644
--- a/data/presets/presets/man_made/silo.json
+++ b/data/presets/presets/man_made/silo.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-silo",
+    "icon": "temaki-silo",
     "fields": [
         "building_area",
         "crop"
diff --git a/data/presets/presets/man_made/storage_tank.json b/data/presets/presets/man_made/storage_tank.json
index df0c549bc..826fcf6fe 100644
--- a/data/presets/presets/man_made/storage_tank.json
+++ b/data/presets/presets/man_made/storage_tank.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-storage-tank",
+    "icon": "temaki-storage_tank",
     "fields": [
         "building_area",
         "content"
diff --git a/data/presets/presets/man_made/tower.json b/data/presets/presets/man_made/tower.json
index 7734de62a..b9d1c610e 100644
--- a/data/presets/presets/man_made/tower.json
+++ b/data/presets/presets/man_made/tower.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-tower",
+    "icon": "temaki-tower",
     "fields": [
         "tower/type",
         "tower/construction",
diff --git a/data/presets/presets/man_made/windmill.json b/data/presets/presets/man_made/windmill.json
index a2cca5abf..3ba43b5c2 100644
--- a/data/presets/presets/man_made/windmill.json
+++ b/data/presets/presets/man_made/windmill.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-windmill",
+    "icon": "temaki-windmill",
     "fields": [
         "building_area"
     ],
diff --git a/data/presets/presets/natural/bay.json b/data/presets/presets/natural/bay.json
index 40429d777..5c936c3e0 100644
--- a/data/presets/presets/natural/bay.json
+++ b/data/presets/presets/natural/bay.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-beach",
+    "icon": "temaki-beach",
     "geometry": [
         "point",
         "area"
diff --git a/data/presets/presets/natural/beach.json b/data/presets/presets/natural/beach.json
index c4081cd74..0df61b34d 100644
--- a/data/presets/presets/natural/beach.json
+++ b/data/presets/presets/natural/beach.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-beach",
+    "icon": "temaki-beach",
     "fields": [
         "surface"
     ],
diff --git a/data/presets/presets/natural/reef.json b/data/presets/presets/natural/reef.json
index 1e4ddb6d7..96f3de1cf 100644
--- a/data/presets/presets/natural/reef.json
+++ b/data/presets/presets/natural/reef.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-beach",
+    "icon": "temaki-beach",
     "geometry": [
         "point",
         "area"
diff --git a/data/presets/presets/power/_sub_station.json b/data/presets/presets/power/_sub_station.json
index 6f75de3f5..c24918f28 100644
--- a/data/presets/presets/power/_sub_station.json
+++ b/data/presets/presets/power/_sub_station.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-power",
+    "icon": "temaki-power",
     "fields": [
         "substation",
         "operator",
diff --git a/data/presets/presets/power/generator.json b/data/presets/presets/power/generator.json
index f52fef86d..a6458c6c7 100644
--- a/data/presets/presets/power/generator.json
+++ b/data/presets/presets/power/generator.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-power",
+    "icon": "temaki-power",
     "fields": [
         "operator",
         "generator/source",
diff --git a/data/presets/presets/power/generator/source_nuclear.json b/data/presets/presets/power/generator/source_nuclear.json
index 8d83e6f6c..f4ab63e3a 100644
--- a/data/presets/presets/power/generator/source_nuclear.json
+++ b/data/presets/presets/power/generator/source_nuclear.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-nuclear",
+    "icon": "temaki-radiation",
     "fields": [
         "operator",
         "generator/source",
diff --git a/data/presets/presets/power/generator/source_wind.json b/data/presets/presets/power/generator/source_wind.json
index 4cf6ca95d..cb436bece 100644
--- a/data/presets/presets/power/generator/source_wind.json
+++ b/data/presets/presets/power/generator/source_wind.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-wind",
+    "icon": "temaki-wind_turbine",
     "fields": [
         "operator",
         "generator/source",
diff --git a/data/presets/presets/power/substation.json b/data/presets/presets/power/substation.json
index eb7544814..320146e59 100644
--- a/data/presets/presets/power/substation.json
+++ b/data/presets/presets/power/substation.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-power",
+    "icon": "temaki-power",
     "fields": [
         "substation",
         "operator",
diff --git a/data/presets/presets/power/switch.json b/data/presets/presets/power/switch.json
index 734b18f48..550cc497b 100644
--- a/data/presets/presets/power/switch.json
+++ b/data/presets/presets/power/switch.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-power",
+    "icon": "temaki-power",
     "fields": [
         "switch",
         "operator",
diff --git a/data/presets/presets/power/transformer.json b/data/presets/presets/power/transformer.json
index a5a851135..0e315f893 100644
--- a/data/presets/presets/power/transformer.json
+++ b/data/presets/presets/power/transformer.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-power",
+    "icon": "temaki-power",
     "fields": [
         "transformer",
         "operator",
diff --git a/data/presets/presets/public_transport/platform_light_rail.json b/data/presets/presets/public_transport/platform_light_rail.json
index 6b376861a..23247ae98 100644
--- a/data/presets/presets/public_transport/platform_light_rail.json
+++ b/data/presets/presets/public_transport/platform_light_rail.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-light-rail",
+    "icon": "temaki-light_rail",
     "fields": [
         "name",
         "ref_platform",
diff --git a/data/presets/presets/public_transport/platform_monorail.json b/data/presets/presets/public_transport/platform_monorail.json
index 3505e6c3d..48f523a30 100644
--- a/data/presets/presets/public_transport/platform_monorail.json
+++ b/data/presets/presets/public_transport/platform_monorail.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-monorail",
+    "icon": "temaki-monorail",
     "fields": [
         "name",
         "ref_platform",
diff --git a/data/presets/presets/public_transport/platform_subway.json b/data/presets/presets/public_transport/platform_subway.json
index 2dae96182..fdd0407c3 100644
--- a/data/presets/presets/public_transport/platform_subway.json
+++ b/data/presets/presets/public_transport/platform_subway.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-subway",
+    "icon": "temaki-subway",
     "fields": [
         "name",
         "ref_platform",
diff --git a/data/presets/presets/public_transport/platform_tram.json b/data/presets/presets/public_transport/platform_tram.json
index 2677ab543..3cc2e0dff 100644
--- a/data/presets/presets/public_transport/platform_tram.json
+++ b/data/presets/presets/public_transport/platform_tram.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-tram",
+    "icon": "temaki-tram",
     "fields": [
         "name",
         "ref_platform",
diff --git a/data/presets/presets/public_transport/platform_trolleybus.json b/data/presets/presets/public_transport/platform_trolleybus.json
index b897aba99..cdc1a1a1a 100644
--- a/data/presets/presets/public_transport/platform_trolleybus.json
+++ b/data/presets/presets/public_transport/platform_trolleybus.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-trolleybus",
+    "icon": "temaki-trolleybus",
     "fields": [
         "name",
         "ref_platform",
diff --git a/data/presets/presets/public_transport/station_light_rail.json b/data/presets/presets/public_transport/station_light_rail.json
index a1181aba9..9e74ffefa 100644
--- a/data/presets/presets/public_transport/station_light_rail.json
+++ b/data/presets/presets/public_transport/station_light_rail.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-light-rail",
+    "icon": "temaki-light_rail",
     "fields": [
         "name",
         "network",
diff --git a/data/presets/presets/public_transport/station_monorail.json b/data/presets/presets/public_transport/station_monorail.json
index 6b6d1aac6..a141e3c30 100644
--- a/data/presets/presets/public_transport/station_monorail.json
+++ b/data/presets/presets/public_transport/station_monorail.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-monorail",
+    "icon": "temaki-monorail",
     "fields": [
         "name",
         "network",
diff --git a/data/presets/presets/public_transport/station_subway.json b/data/presets/presets/public_transport/station_subway.json
index 526c003d6..6fe9594d9 100644
--- a/data/presets/presets/public_transport/station_subway.json
+++ b/data/presets/presets/public_transport/station_subway.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-subway",
+    "icon": "temaki-subway",
     "fields": [
         "name",
         "network",
diff --git a/data/presets/presets/public_transport/station_tram.json b/data/presets/presets/public_transport/station_tram.json
index dc8efbce1..72aaecb40 100644
--- a/data/presets/presets/public_transport/station_tram.json
+++ b/data/presets/presets/public_transport/station_tram.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-tram",
+    "icon": "temaki-tram",
     "fields": [
         "name",
         "network",
diff --git a/data/presets/presets/public_transport/station_trolleybus.json b/data/presets/presets/public_transport/station_trolleybus.json
index 519e2eeb6..80a515461 100644
--- a/data/presets/presets/public_transport/station_trolleybus.json
+++ b/data/presets/presets/public_transport/station_trolleybus.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-trolleybus",
+    "icon": "temaki-trolleybus",
     "fields": [
         "name",
         "network",
diff --git a/data/presets/presets/public_transport/stop_position_light_rail.json b/data/presets/presets/public_transport/stop_position_light_rail.json
index c1e8a9eab..d563a380f 100644
--- a/data/presets/presets/public_transport/stop_position_light_rail.json
+++ b/data/presets/presets/public_transport/stop_position_light_rail.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-light-rail",
+    "icon": "temaki-light_rail",
     "fields": [
         "name",
         "ref_stop_position",
diff --git a/data/presets/presets/public_transport/stop_position_monorail.json b/data/presets/presets/public_transport/stop_position_monorail.json
index 8c23674a1..78b2cdbe5 100644
--- a/data/presets/presets/public_transport/stop_position_monorail.json
+++ b/data/presets/presets/public_transport/stop_position_monorail.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-monorail",
+    "icon": "temaki-monorail",
     "fields": [
         "name",
         "ref_stop_position",
diff --git a/data/presets/presets/public_transport/stop_position_subway.json b/data/presets/presets/public_transport/stop_position_subway.json
index 046b412ef..969a744b4 100644
--- a/data/presets/presets/public_transport/stop_position_subway.json
+++ b/data/presets/presets/public_transport/stop_position_subway.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-subway",
+    "icon": "temaki-subway",
     "fields": [
         "name",
         "ref_stop_position",
diff --git a/data/presets/presets/public_transport/stop_position_tram.json b/data/presets/presets/public_transport/stop_position_tram.json
index 58fe6fbb6..0952abbf2 100644
--- a/data/presets/presets/public_transport/stop_position_tram.json
+++ b/data/presets/presets/public_transport/stop_position_tram.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-tram",
+    "icon": "temaki-tram",
     "fields": [
         "name",
         "ref_stop_position",
diff --git a/data/presets/presets/public_transport/stop_position_trolleybus.json b/data/presets/presets/public_transport/stop_position_trolleybus.json
index 39b79dcb1..f51cb6f6f 100644
--- a/data/presets/presets/public_transport/stop_position_trolleybus.json
+++ b/data/presets/presets/public_transport/stop_position_trolleybus.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-trolleybus",
+    "icon": "temaki-trolleybus",
     "fields": [
         "name",
         "ref_stop_position",
diff --git a/data/presets/presets/railway/_tram_stop.json b/data/presets/presets/railway/_tram_stop.json
index e78912aa3..ef6a1a6eb 100644
--- a/data/presets/presets/railway/_tram_stop.json
+++ b/data/presets/presets/railway/_tram_stop.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-tram",
+    "icon": "temaki-tram",
     "fields": [
         "name",
         "network",
diff --git a/data/presets/presets/railway/buffer_stop.json b/data/presets/presets/railway/buffer_stop.json
index a0f6f8165..d1d0f1e98 100644
--- a/data/presets/presets/railway/buffer_stop.json
+++ b/data/presets/presets/railway/buffer_stop.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-buffer-stop",
+    "icon": "temaki-buffer-stop",
     "geometry": [
         "vertex"
     ],
diff --git a/data/presets/presets/railway/milestone.json b/data/presets/presets/railway/milestone.json
index 328eef562..50b846d24 100644
--- a/data/presets/presets/railway/milestone.json
+++ b/data/presets/presets/railway/milestone.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-milestone",
+    "icon": "temaki-milestone",
     "geometry": [
         "point",
         "vertex"
diff --git a/data/presets/presets/railway/signal.json b/data/presets/presets/railway/signal.json
index 9c62f5276..83f56eea2 100644
--- a/data/presets/presets/railway/signal.json
+++ b/data/presets/presets/railway/signal.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-railway-signals",
+    "icon": "temaki-railway_signals",
     "geometry": [
         "point",
         "vertex"
diff --git a/data/presets/presets/railway/switch.json b/data/presets/presets/railway/switch.json
index 9de580718..d5d6d8bad 100644
--- a/data/presets/presets/railway/switch.json
+++ b/data/presets/presets/railway/switch.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-junction",
+    "icon": "temaki-junction",
     "geometry": [
         "vertex"
     ],
diff --git a/data/presets/presets/shop/doityourself.json b/data/presets/presets/shop/doityourself.json
index f482befe8..37da9c3c3 100644
--- a/data/presets/presets/shop/doityourself.json
+++ b/data/presets/presets/shop/doityourself.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-tool",
+    "icon": "temaki-tools",
     "fields": [
         "name",
         "operator",
diff --git a/data/presets/presets/shop/hardware.json b/data/presets/presets/shop/hardware.json
index 8623b593a..05f3e6cc9 100644
--- a/data/presets/presets/shop/hardware.json
+++ b/data/presets/presets/shop/hardware.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-tool",
+    "icon": "temaki-tools",
     "fields": [
         "name",
         "operator",
diff --git a/data/presets/presets/shop/window_blind.json b/data/presets/presets/shop/window_blind.json
index 868d4b9b8..4caa30544 100644
--- a/data/presets/presets/shop/window_blind.json
+++ b/data/presets/presets/shop/window_blind.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-window",
+    "icon": "temaki-window",
     "fields": [
         "name",
         "operator",
diff --git a/data/presets/presets/tourism/viewpoint.json b/data/presets/presets/tourism/viewpoint.json
index 1d7ebb4eb..6cd2a2f4d 100644
--- a/data/presets/presets/tourism/viewpoint.json
+++ b/data/presets/presets/tourism/viewpoint.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-binoculars",
+    "icon": "temaki-binoculars",
     "geometry": [
         "point",
         "vertex"
diff --git a/data/presets/presets/traffic_calming.json b/data/presets/presets/traffic_calming.json
index 5048a9e73..520ce7ec0 100644
--- a/data/presets/presets/traffic_calming.json
+++ b/data/presets/presets/traffic_calming.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-warning",
+    "icon": "temaki-diamond",
     "fields": [
         "traffic_calming",
         "direction_vertex"
diff --git a/data/presets/presets/traffic_calming/bump.json b/data/presets/presets/traffic_calming/bump.json
index 2d281beab..25159504b 100644
--- a/data/presets/presets/traffic_calming/bump.json
+++ b/data/presets/presets/traffic_calming/bump.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-warning",
+    "icon": "temaki-diamond",
     "fields": [
         "surface",
         "direction_vertex"
diff --git a/data/presets/presets/traffic_calming/chicane.json b/data/presets/presets/traffic_calming/chicane.json
index 3fbd53cb0..2a2cead7a 100644
--- a/data/presets/presets/traffic_calming/chicane.json
+++ b/data/presets/presets/traffic_calming/chicane.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-warning",
+    "icon": "temaki-diamond",
     "fields": [
         "direction_vertex"
     ],
diff --git a/data/presets/presets/traffic_calming/choker.json b/data/presets/presets/traffic_calming/choker.json
index 78688ef90..51683d807 100644
--- a/data/presets/presets/traffic_calming/choker.json
+++ b/data/presets/presets/traffic_calming/choker.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-warning",
+    "icon": "temaki-diamond",
     "fields": [
         "direction_vertex"
     ],
diff --git a/data/presets/presets/traffic_calming/cushion.json b/data/presets/presets/traffic_calming/cushion.json
index 47a3d5930..2a3488a7b 100644
--- a/data/presets/presets/traffic_calming/cushion.json
+++ b/data/presets/presets/traffic_calming/cushion.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-warning",
+    "icon": "temaki-diamond",
     "fields": [
         "surface",
         "direction_vertex"
diff --git a/data/presets/presets/traffic_calming/dip.json b/data/presets/presets/traffic_calming/dip.json
index aecc88ab4..62f5c30f0 100644
--- a/data/presets/presets/traffic_calming/dip.json
+++ b/data/presets/presets/traffic_calming/dip.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-warning",
+    "icon": "temaki-diamond",
     "fields": [
         "surface",
         "direction_vertex"
diff --git a/data/presets/presets/traffic_calming/hump.json b/data/presets/presets/traffic_calming/hump.json
index 3c17b96be..e2473861e 100644
--- a/data/presets/presets/traffic_calming/hump.json
+++ b/data/presets/presets/traffic_calming/hump.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-warning",
+    "icon": "temaki-diamond",
     "fields": [
         "surface",
         "direction_vertex"
diff --git a/data/presets/presets/traffic_calming/island.json b/data/presets/presets/traffic_calming/island.json
index fdc7c9b6a..10a49d3de 100644
--- a/data/presets/presets/traffic_calming/island.json
+++ b/data/presets/presets/traffic_calming/island.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-warning",
+    "icon": "temaki-diamond",
     "geometry": [
         "vertex"
     ],
diff --git a/data/presets/presets/traffic_calming/rumble_strip.json b/data/presets/presets/traffic_calming/rumble_strip.json
index 37a3ca57f..f0e9848c3 100644
--- a/data/presets/presets/traffic_calming/rumble_strip.json
+++ b/data/presets/presets/traffic_calming/rumble_strip.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-warning",
+    "icon": "temaki-diamond",
     "fields": [
         "direction_vertex"
     ],
diff --git a/data/presets/presets/traffic_calming/table.json b/data/presets/presets/traffic_calming/table.json
index 275adfff1..fe4b4340d 100644
--- a/data/presets/presets/traffic_calming/table.json
+++ b/data/presets/presets/traffic_calming/table.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-warning",
+    "icon": "temaki-diamond",
     "fields": [
         "surface"
     ],
diff --git a/data/presets/presets/waterway/sanitary_dump_station.json b/data/presets/presets/waterway/sanitary_dump_station.json
index b7f3d4edc..7f0cea15b 100644
--- a/data/presets/presets/waterway/sanitary_dump_station.json
+++ b/data/presets/presets/waterway/sanitary_dump_station.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-storage-tank",
+    "icon": "temaki-storage_tank",
     "fields": [
         "name",
         "operator",
diff --git a/data/taginfo.json b/data/taginfo.json
index 1ec94a3c6..1b502ab42 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -460,7 +460,8 @@
             "object_types": [
                 "node",
                 "way"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-bench.svg?sanitize=true"
         },
         {
             "key": "amenity",
@@ -577,7 +578,8 @@
             "object_types": [
                 "node",
                 "area"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-dice.svg?sanitize=true"
         },
         {
             "key": "amenity",
@@ -644,7 +646,8 @@
             "description": "Clock",
             "object_types": [
                 "node"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-clock.svg?sanitize=true"
         },
         {
             "key": "amenity",
@@ -792,7 +795,8 @@
             "object_types": [
                 "node",
                 "area"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-fountain.svg?sanitize=true"
         },
         {
             "key": "amenity",
@@ -839,7 +843,8 @@
             "object_types": [
                 "node",
                 "area"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-binoculars.svg?sanitize=true"
         },
         {
             "key": "amenity",
@@ -858,7 +863,8 @@
             "object_types": [
                 "node",
                 "area"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-antenna.svg?sanitize=true"
         },
         {
             "key": "amenity",
@@ -1025,7 +1031,8 @@
             "object_types": [
                 "node",
                 "area"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-hinduism.svg?sanitize=true"
         },
         {
             "key": "religion",
@@ -1054,7 +1061,8 @@
             "object_types": [
                 "node",
                 "area"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-shinto.svg?sanitize=true"
         },
         {
             "key": "religion",
@@ -1063,7 +1071,8 @@
             "object_types": [
                 "node",
                 "area"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-sikhism.svg?sanitize=true"
         },
         {
             "key": "religion",
@@ -1072,7 +1081,8 @@
             "object_types": [
                 "node",
                 "area"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-taoism.svg?sanitize=true"
         },
         {
             "key": "amenity",
@@ -1199,7 +1209,8 @@
             "object_types": [
                 "node",
                 "area"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-storage_tank.svg?sanitize=true"
         },
         {
             "key": "amenity",
@@ -1228,7 +1239,8 @@
             "object_types": [
                 "node",
                 "area"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-shower.svg?sanitize=true"
         },
         {
             "key": "amenity",
@@ -1246,7 +1258,8 @@
             "object_types": [
                 "node",
                 "area"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-social_facility.svg?sanitize=true"
         },
         {
             "key": "social_facility",
@@ -1255,7 +1268,8 @@
             "object_types": [
                 "node",
                 "area"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-social_facility.svg?sanitize=true"
         },
         {
             "key": "social_facility:for",
@@ -1274,7 +1288,8 @@
             "object_types": [
                 "node",
                 "area"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-social_facility.svg?sanitize=true"
         },
         {
             "key": "amenity",
@@ -1351,7 +1366,8 @@
             "description": "Vending Machine",
             "object_types": [
                 "node"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-vending_machine.svg?sanitize=true"
         },
         {
             "key": "vending",
@@ -1359,7 +1375,8 @@
             "description": "Newspaper Vending Machine",
             "object_types": [
                 "node"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-vending_machine.svg?sanitize=true"
         },
         {
             "key": "vending",
@@ -1367,7 +1384,8 @@
             "description": "Cigarette Vending Machine",
             "object_types": [
                 "node"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-vending_machine.svg?sanitize=true"
         },
         {
             "key": "vending",
@@ -1375,7 +1393,8 @@
             "description": "Coffee Vending Machine",
             "object_types": [
                 "node"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-vending_machine.svg?sanitize=true"
         },
         {
             "key": "vending",
@@ -1383,7 +1402,8 @@
             "description": "Condom Vending Machine",
             "object_types": [
                 "node"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-vending_machine.svg?sanitize=true"
         },
         {
             "key": "vending",
@@ -1391,7 +1411,8 @@
             "description": "Drink Vending Machine",
             "object_types": [
                 "node"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-vending_machine.svg?sanitize=true"
         },
         {
             "key": "vending",
@@ -1399,7 +1420,8 @@
             "description": "Electronics Vending Machine",
             "object_types": [
                 "node"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-vending_machine.svg?sanitize=true"
         },
         {
             "key": "vending",
@@ -1407,7 +1429,8 @@
             "description": "Flat Coin Vending Machine",
             "object_types": [
                 "node"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-vending_machine.svg?sanitize=true"
         },
         {
             "key": "vending",
@@ -1415,7 +1438,8 @@
             "description": "Excrement Bag Vending Machine",
             "object_types": [
                 "node"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-vending_machine.svg?sanitize=true"
         },
         {
             "key": "vending",
@@ -1423,7 +1447,8 @@
             "description": "Feminine Hygiene Vending Machine",
             "object_types": [
                 "node"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-vending_machine.svg?sanitize=true"
         },
         {
             "key": "vending",
@@ -1431,7 +1456,8 @@
             "description": "Food Vending Machine",
             "object_types": [
                 "node"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-vending_machine.svg?sanitize=true"
         },
         {
             "key": "vending",
@@ -1439,7 +1465,8 @@
             "description": "Gas Pump",
             "object_types": [
                 "node"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-vending_machine.svg?sanitize=true"
         },
         {
             "key": "vending",
@@ -1447,7 +1474,8 @@
             "description": "Ice Cream Vending Machine",
             "object_types": [
                 "node"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-vending_machine.svg?sanitize=true"
         },
         {
             "key": "vending",
@@ -1455,7 +1483,8 @@
             "description": "Newspaper Vending Machine",
             "object_types": [
                 "node"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-vending_machine.svg?sanitize=true"
         },
         {
             "key": "vending",
@@ -1463,7 +1492,8 @@
             "description": "Parcel Pickup/Dropoff Vending Machine",
             "object_types": [
                 "node"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-vending_machine.svg?sanitize=true"
         },
         {
             "key": "vending",
@@ -1471,7 +1501,8 @@
             "description": "Parking Ticket Vending Machine",
             "object_types": [
                 "node"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-vending_machine.svg?sanitize=true"
         },
         {
             "key": "vending",
@@ -1479,7 +1510,8 @@
             "description": "Transit Ticket Vending Machine",
             "object_types": [
                 "node"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-vending_machine.svg?sanitize=true"
         },
         {
             "key": "vending",
@@ -1487,7 +1519,8 @@
             "description": "Postage Vending Machine",
             "object_types": [
                 "node"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-vending_machine.svg?sanitize=true"
         },
         {
             "key": "vending",
@@ -1495,7 +1528,8 @@
             "description": "Snack Vending Machine",
             "object_types": [
                 "node"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-vending_machine.svg?sanitize=true"
         },
         {
             "key": "amenity",
@@ -1658,7 +1692,8 @@
             "object_types": [
                 "node",
                 "area"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-tower.svg?sanitize=true"
         },
         {
             "key": "attraction",
@@ -2228,7 +2263,8 @@
             "description": "Building Ruins",
             "object_types": [
                 "area"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-ruins.svg?sanitize=true"
         },
         {
             "key": "building",
@@ -2363,7 +2399,8 @@
             "object_types": [
                 "node",
                 "area"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-tools.svg?sanitize=true"
         },
         {
             "key": "craft",
@@ -2432,7 +2469,8 @@
             "object_types": [
                 "node",
                 "area"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-tools.svg?sanitize=true"
         },
         {
             "key": "craft",
@@ -2441,7 +2479,8 @@
             "object_types": [
                 "node",
                 "area"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-tools.svg?sanitize=true"
         },
         {
             "key": "craft",
@@ -2460,7 +2499,8 @@
             "object_types": [
                 "node",
                 "area"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-storage_tank.svg?sanitize=true"
         },
         {
             "key": "craft",
@@ -2469,7 +2509,8 @@
             "object_types": [
                 "node",
                 "area"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-tools.svg?sanitize=true"
         },
         {
             "key": "craft",
@@ -2478,7 +2519,8 @@
             "object_types": [
                 "node",
                 "area"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-tools.svg?sanitize=true"
         },
         {
             "key": "craft",
@@ -2497,7 +2539,8 @@
             "object_types": [
                 "node",
                 "area"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-chimney.svg?sanitize=true"
         },
         {
             "key": "craft",
@@ -2506,7 +2549,8 @@
             "object_types": [
                 "node",
                 "area"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-clock.svg?sanitize=true"
         },
         {
             "key": "craft",
@@ -2525,7 +2569,8 @@
             "object_types": [
                 "node",
                 "area"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-storage_tank.svg?sanitize=true"
         },
         {
             "key": "craft",
@@ -2544,7 +2589,8 @@
             "object_types": [
                 "node",
                 "area"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-power.svg?sanitize=true"
         },
         {
             "key": "craft",
@@ -2553,7 +2599,8 @@
             "object_types": [
                 "node",
                 "area"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-tools.svg?sanitize=true"
         },
         {
             "key": "craft",
@@ -2572,7 +2619,8 @@
             "object_types": [
                 "node",
                 "area"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-window.svg?sanitize=true"
         },
         {
             "key": "craft",
@@ -2591,7 +2639,8 @@
             "object_types": [
                 "node",
                 "area"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-tools.svg?sanitize=true"
         },
         {
             "key": "craft",
@@ -2600,7 +2649,8 @@
             "object_types": [
                 "node",
                 "area"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-tools.svg?sanitize=true"
         },
         {
             "key": "craft",
@@ -2619,7 +2669,8 @@
             "object_types": [
                 "node",
                 "area"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-tools.svg?sanitize=true"
         },
         {
             "key": "craft",
@@ -2658,7 +2709,8 @@
             "object_types": [
                 "node",
                 "area"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-tools.svg?sanitize=true"
         },
         {
             "key": "craft",
@@ -2667,7 +2719,8 @@
             "object_types": [
                 "node",
                 "area"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-tools.svg?sanitize=true"
         },
         {
             "key": "craft",
@@ -2686,7 +2739,8 @@
             "object_types": [
                 "node",
                 "area"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-tools.svg?sanitize=true"
         },
         {
             "key": "craft",
@@ -2695,7 +2749,8 @@
             "object_types": [
                 "node",
                 "area"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-tools.svg?sanitize=true"
         },
         {
             "key": "craft",
@@ -2704,7 +2759,8 @@
             "object_types": [
                 "node",
                 "area"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-tools.svg?sanitize=true"
         },
         {
             "key": "craft",
@@ -2713,7 +2769,8 @@
             "object_types": [
                 "node",
                 "area"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-tools.svg?sanitize=true"
         },
         {
             "key": "craft",
@@ -2732,7 +2789,8 @@
             "object_types": [
                 "node",
                 "area"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-tools.svg?sanitize=true"
         },
         {
             "key": "craft",
@@ -2751,7 +2809,8 @@
             "object_types": [
                 "node",
                 "area"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-tools.svg?sanitize=true"
         },
         {
             "key": "craft",
@@ -2760,7 +2819,8 @@
             "object_types": [
                 "node",
                 "area"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-tools.svg?sanitize=true"
         },
         {
             "key": "craft",
@@ -2769,7 +2829,8 @@
             "object_types": [
                 "node",
                 "area"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-tools.svg?sanitize=true"
         },
         {
             "key": "craft",
@@ -2778,7 +2839,8 @@
             "object_types": [
                 "node",
                 "area"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-tools.svg?sanitize=true"
         },
         {
             "key": "craft",
@@ -2787,7 +2849,8 @@
             "object_types": [
                 "node",
                 "area"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-tools.svg?sanitize=true"
         },
         {
             "key": "craft",
@@ -2796,7 +2859,8 @@
             "object_types": [
                 "node",
                 "area"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-clock.svg?sanitize=true"
         },
         {
             "key": "craft",
@@ -2805,7 +2869,8 @@
             "object_types": [
                 "node",
                 "area"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-window.svg?sanitize=true"
         },
         {
             "key": "craft",
@@ -2898,7 +2963,8 @@
             "description": "Fire Hydrant",
             "object_types": [
                 "node"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-fire_hydrant.svg?sanitize=true"
         },
         {
             "key": "emergency",
@@ -3252,7 +3318,8 @@
             "description": "Elevator",
             "object_types": [
                 "node"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-elevator.svg?sanitize=true"
         },
         {
             "key": "highway",
@@ -3268,7 +3335,8 @@
             "description": "Yield Sign",
             "object_types": [
                 "node"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-yield.svg?sanitize=true"
         },
         {
             "key": "highway",
@@ -3293,7 +3361,8 @@
             "description": "Motorway Junction / Exit",
             "object_types": [
                 "node"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-junction.svg?sanitize=true"
         },
         {
             "key": "highway",
@@ -3485,7 +3554,8 @@
             "description": "Stop Sign",
             "object_types": [
                 "node"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-stop.svg?sanitize=true"
         },
         {
             "key": "highway",
@@ -3493,7 +3563,8 @@
             "description": "Street Lamp",
             "object_types": [
                 "node"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-bulb.svg?sanitize=true"
         },
         {
             "key": "highway",
@@ -3533,7 +3604,8 @@
             "description": "Traffic Signals",
             "object_types": [
                 "node"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-traffic_signals.svg?sanitize=true"
         },
         {
             "key": "highway",
@@ -3583,7 +3655,8 @@
             "object_types": [
                 "node",
                 "area"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-ruins.svg?sanitize=true"
         },
         {
             "key": "historic",
@@ -3592,7 +3665,8 @@
             "object_types": [
                 "node",
                 "area"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-ruins.svg?sanitize=true"
         },
         {
             "key": "historic",
@@ -3600,7 +3674,8 @@
             "description": "Boundary Stone",
             "object_types": [
                 "node"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-milestone.svg?sanitize=true"
         },
         {
             "key": "historic",
@@ -3639,7 +3714,8 @@
             "object_types": [
                 "node",
                 "area"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-ruins.svg?sanitize=true"
         },
         {
             "key": "historic",
@@ -3678,7 +3754,8 @@
             "object_types": [
                 "node",
                 "area"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-junction.svg?sanitize=true"
         },
         {
             "key": "landuse",
@@ -3878,7 +3955,8 @@
             "description": "Military Area",
             "object_types": [
                 "area"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-military.svg?sanitize=true"
         },
         {
             "key": "military",
@@ -3897,7 +3975,8 @@
             "object_types": [
                 "node",
                 "area"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-military.svg?sanitize=true"
         },
         {
             "key": "military",
@@ -3906,7 +3985,8 @@
             "object_types": [
                 "node",
                 "area"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-military.svg?sanitize=true"
         },
         {
             "key": "military",
@@ -3935,7 +4015,8 @@
             "object_types": [
                 "node",
                 "area"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-military.svg?sanitize=true"
         },
         {
             "key": "military",
@@ -3954,7 +4035,8 @@
             "object_types": [
                 "node",
                 "area"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-military.svg?sanitize=true"
         },
         {
             "key": "military",
@@ -3963,7 +4045,8 @@
             "object_types": [
                 "node",
                 "area"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-military.svg?sanitize=true"
         },
         {
             "key": "military",
@@ -3972,7 +4055,8 @@
             "object_types": [
                 "node",
                 "area"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-military.svg?sanitize=true"
         },
         {
             "key": "military",
@@ -3981,7 +4065,8 @@
             "object_types": [
                 "node",
                 "area"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-military.svg?sanitize=true"
         },
         {
             "key": "landuse",
@@ -4077,7 +4162,8 @@
             "object_types": [
                 "node",
                 "area"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-dice.svg?sanitize=true"
         },
         {
             "key": "leisure",
@@ -4096,7 +4182,8 @@
             "object_types": [
                 "node",
                 "area"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-beach.svg?sanitize=true"
         },
         {
             "key": "leisure",
@@ -4105,7 +4192,8 @@
             "object_types": [
                 "node",
                 "area"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-binoculars.svg?sanitize=true"
         },
         {
             "key": "leisure",
@@ -4123,7 +4211,8 @@
             "object_types": [
                 "node",
                 "area"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-bowling.svg?sanitize=true"
         },
         {
             "key": "leisure",
@@ -4132,7 +4221,8 @@
             "object_types": [
                 "node",
                 "area"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-pedestrian.svg?sanitize=true"
         },
         {
             "key": "leisure",
@@ -4630,7 +4720,8 @@
             "object_types": [
                 "node",
                 "way"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-beach.svg?sanitize=true"
         },
         {
             "key": "leisure",
@@ -4699,7 +4790,8 @@
                 "node",
                 "way",
                 "area"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-storage_tank.svg?sanitize=true"
         },
         {
             "key": "man_made",
@@ -4725,7 +4817,8 @@
             "description": "Antenna",
             "object_types": [
                 "node"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-antenna.svg?sanitize=true"
         },
         {
             "key": "man_made",
@@ -4751,7 +4844,8 @@
             "object_types": [
                 "node",
                 "area"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-chimney.svg?sanitize=true"
         },
         {
             "key": "man_made",
@@ -4770,7 +4864,8 @@
                 "node",
                 "way",
                 "area"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-crane.svg?sanitize=true"
         },
         {
             "key": "man_made",
@@ -4796,7 +4891,8 @@
             "object_types": [
                 "node",
                 "area"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-storage_tank.svg?sanitize=true"
         },
         {
             "key": "man_made",
@@ -4823,7 +4919,8 @@
             "description": "Mast",
             "object_types": [
                 "node"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-antenna.svg?sanitize=true"
         },
         {
             "key": "man_made",
@@ -4832,7 +4929,8 @@
             "object_types": [
                 "node",
                 "area"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-antenna.svg?sanitize=true"
         },
         {
             "key": "tower:type",
@@ -4841,7 +4939,8 @@
             "object_types": [
                 "node",
                 "area"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-tower.svg?sanitize=true"
         },
         {
             "key": "man_made",
@@ -4858,7 +4957,8 @@
             "description": "Oil Well",
             "object_types": [
                 "node"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-storage_tank.svg?sanitize=true"
         },
         {
             "key": "man_made",
@@ -4894,7 +4994,8 @@
             "object_types": [
                 "node",
                 "area"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-silo.svg?sanitize=true"
         },
         {
             "key": "man_made",
@@ -4903,7 +5004,8 @@
             "object_types": [
                 "node",
                 "area"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-storage_tank.svg?sanitize=true"
         },
         {
             "key": "surveillance:type",
@@ -4939,7 +5041,8 @@
             "object_types": [
                 "node",
                 "area"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-tower.svg?sanitize=true"
         },
         {
             "key": "man_made",
@@ -4998,7 +5101,8 @@
             "object_types": [
                 "node",
                 "area"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-windmill.svg?sanitize=true"
         },
         {
             "key": "man_made",
@@ -5060,7 +5164,8 @@
             "object_types": [
                 "node",
                 "area"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-beach.svg?sanitize=true"
         },
         {
             "key": "natural",
@@ -5069,7 +5174,8 @@
             "object_types": [
                 "node",
                 "area"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-beach.svg?sanitize=true"
         },
         {
             "key": "natural",
@@ -5156,7 +5262,8 @@
             "object_types": [
                 "node",
                 "area"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-beach.svg?sanitize=true"
         },
         {
             "key": "natural",
@@ -5972,7 +6079,8 @@
             "object_types": [
                 "node",
                 "area"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-power.svg?sanitize=true"
         },
         {
             "key": "power",
@@ -5981,7 +6089,8 @@
             "object_types": [
                 "node",
                 "area"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-power.svg?sanitize=true"
         },
         {
             "key": "generator:method",
@@ -5990,7 +6099,8 @@
             "object_types": [
                 "node",
                 "area"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-radiation.svg?sanitize=true"
         },
         {
             "key": "generator:method",
@@ -5999,7 +6109,8 @@
             "object_types": [
                 "node",
                 "area"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-wind_turbine.svg?sanitize=true"
         },
         {
             "key": "power",
@@ -6041,7 +6152,8 @@
             "object_types": [
                 "node",
                 "area"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-power.svg?sanitize=true"
         },
         {
             "key": "power",
@@ -6050,7 +6162,8 @@
             "object_types": [
                 "node",
                 "area"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-power.svg?sanitize=true"
         },
         {
             "key": "power",
@@ -6067,7 +6180,8 @@
             "object_types": [
                 "node",
                 "area"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-power.svg?sanitize=true"
         },
         {
             "key": "aerialway",
@@ -6212,7 +6326,8 @@
             "description": "Tram Stopping Position",
             "object_types": [
                 "node"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-tram.svg?sanitize=true"
         },
         {
             "key": "railway",
@@ -6228,7 +6343,8 @@
             "description": "Buffer Stop",
             "object_types": [
                 "node"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-buffer-stop.svg?sanitize=true"
         },
         {
             "key": "railway",
@@ -6287,7 +6403,8 @@
             "description": "Railway Milestone",
             "object_types": [
                 "node"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-milestone.svg?sanitize=true"
         },
         {
             "key": "railway",
@@ -6327,7 +6444,8 @@
             "description": "Railway Signal",
             "object_types": [
                 "node"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-railway_signals.svg?sanitize=true"
         },
         {
             "key": "railway",
@@ -6352,7 +6470,8 @@
             "description": "Railway Switch",
             "object_types": [
                 "node"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-junction.svg?sanitize=true"
         },
         {
             "key": "railway",
@@ -6836,7 +6955,8 @@
             "object_types": [
                 "node",
                 "area"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-tools.svg?sanitize=true"
         },
         {
             "key": "shop",
@@ -7005,7 +7125,8 @@
             "object_types": [
                 "node",
                 "area"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-tools.svg?sanitize=true"
         },
         {
             "key": "shop",
@@ -7644,7 +7765,8 @@
             "object_types": [
                 "node",
                 "area"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-window.svg?sanitize=true"
         },
         {
             "key": "shop",
@@ -7888,7 +8010,8 @@
             "description": "Viewpoint",
             "object_types": [
                 "node"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-binoculars.svg?sanitize=true"
         },
         {
             "key": "tourism",
@@ -7916,7 +8039,8 @@
             "object_types": [
                 "node",
                 "way"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-diamond.svg?sanitize=true"
         },
         {
             "key": "traffic_calming",
@@ -7925,7 +8049,8 @@
             "object_types": [
                 "node",
                 "way"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-diamond.svg?sanitize=true"
         },
         {
             "key": "traffic_calming",
@@ -7934,7 +8059,8 @@
             "object_types": [
                 "node",
                 "way"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-diamond.svg?sanitize=true"
         },
         {
             "key": "traffic_calming",
@@ -7943,7 +8069,8 @@
             "object_types": [
                 "node",
                 "way"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-diamond.svg?sanitize=true"
         },
         {
             "key": "traffic_calming",
@@ -7952,7 +8079,8 @@
             "object_types": [
                 "node",
                 "way"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-diamond.svg?sanitize=true"
         },
         {
             "key": "traffic_calming",
@@ -7961,7 +8089,8 @@
             "object_types": [
                 "node",
                 "way"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-diamond.svg?sanitize=true"
         },
         {
             "key": "traffic_calming",
@@ -7970,7 +8099,8 @@
             "object_types": [
                 "node",
                 "way"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-diamond.svg?sanitize=true"
         },
         {
             "key": "traffic_calming",
@@ -7978,7 +8108,8 @@
             "description": "Traffic Island",
             "object_types": [
                 "node"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-diamond.svg?sanitize=true"
         },
         {
             "key": "traffic_calming",
@@ -7987,7 +8118,8 @@
             "object_types": [
                 "node",
                 "way"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-diamond.svg?sanitize=true"
         },
         {
             "key": "type",
@@ -8311,7 +8443,8 @@
             "object_types": [
                 "node",
                 "area"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/temaki-storage_tank.svg?sanitize=true"
         },
         {
             "key": "intermittent",
diff --git a/modules/ui/preset_icon.js b/modules/ui/preset_icon.js
index 8cac58443..768d2818e 100644
--- a/modules/ui/preset_icon.js
+++ b/modules/ui/preset_icon.js
@@ -20,20 +20,20 @@ export function uiPresetIcon() {
         else if (geom === 'line')
             return 'other-line';
         else if (geom === 'vertex')
-            return p.isFallback() ? '' : 'poi-vertex';
+            return p.isFallback() ? '' : 'temaki-vertex';
         else
             return 'marker-stroked';
     }
 
 
     function render() {
-        var selection = d3_select(this),
-            p = preset.apply(this, arguments),
-            geom = geometry.apply(this, arguments),
-            picon = getIcon(p, geom),
-            isPoi = picon.match(/^poi-/) !== null,
-            isMaki = dataFeatureIcons.indexOf(picon) !== -1,
-            isFramed = (geom === 'area' || geom === 'verex');
+        var selection = d3_select(this);
+        var p = preset.apply(this, arguments);
+        var geom = geometry.apply(this, arguments);
+        var picon = getIcon(p, geom);
+        var isMaki = dataFeatureIcons.indexOf(picon) !== -1;
+        var isTemaki = /^temaki-/.test(picon);
+        var isFramed = (geom === 'area' || geom === 'vertex');
 
 
         function tag_classes(p) {
@@ -84,12 +84,12 @@ export function uiPresetIcon() {
 
         icon
             .attr('class', 'preset-icon preset-icon-' +
-                ((isMaki || isPoi) ? (isFramed ? '24' : '28') : (isFramed ? '44' : '60'))
+                ((isMaki || isTemaki) ? (isFramed ? '24' : '28') : (isFramed ? '44' : '60'))
             );
 
         icon.selectAll('svg')
             .attr('class', function() {
-                return 'icon ' + picon + (isMaki || isPoi ? '' : tag_classes(p));
+                return 'icon ' + picon + (isMaki || isTemaki ? '' : tag_classes(p));
             });
 
         icon.selectAll('use')