diff --git a/data/presets/presets.json b/data/presets/presets.json
index 2ecc86622..ba163eb62 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -3651,7 +3651,7 @@
             "name": "Camp Pitch"
         },
         "craft": {
-            "icon": "marker-stroked",
+            "icon": "poi-tool",
             "fields": [
                 "craft",
                 "operator",
@@ -3780,7 +3780,7 @@
             "name": "Beekeeper"
         },
         "craft/blacksmith": {
-            "icon": "farm",
+            "icon": "poi-tool",
             "fields": [
                 "operator",
                 "address",
@@ -3797,7 +3797,7 @@
             "name": "Blacksmith"
         },
         "craft/boatbuilder": {
-            "icon": "marker-stroked",
+            "icon": "poi-tool",
             "fields": [
                 "operator",
                 "address",
@@ -3855,7 +3855,7 @@
             "name": "Brewery"
         },
         "craft/carpenter": {
-            "icon": "logging",
+            "icon": "poi-tool",
             "fields": [
                 "operator",
                 "address",
@@ -3875,7 +3875,7 @@
             "name": "Carpenter"
         },
         "craft/carpet_layer": {
-            "icon": "square",
+            "icon": "poi-tool",
             "fields": [
                 "operator",
                 "address",
@@ -4049,7 +4049,7 @@
             "name": "Handicraft"
         },
         "craft/hvac": {
-            "icon": "marker-stroked",
+            "icon": "poi-tool",
             "fields": [
                 "operator",
                 "address",
@@ -4105,7 +4105,7 @@
             "name": "Key Cutter"
         },
         "craft/metal_construction": {
-            "icon": "marker-stroked",
+            "icon": "poi-tool",
             "fields": [
                 "operator",
                 "address",
@@ -4176,7 +4176,7 @@
             "name": "Photographic Laboratory"
         },
         "craft/plasterer": {
-            "icon": "marker-stroked",
+            "icon": "poi-tool",
             "fields": [
                 "operator",
                 "address",
@@ -4193,7 +4193,7 @@
             "name": "Plasterer"
         },
         "craft/plumber": {
-            "icon": "marker-stroked",
+            "icon": "poi-tool",
             "fields": [
                 "operator",
                 "address",
@@ -4233,7 +4233,7 @@
             "name": "Pottery"
         },
         "craft/rigger": {
-            "icon": "marker-stroked",
+            "icon": "poi-tool",
             "fields": [
                 "operator",
                 "address",
@@ -4250,7 +4250,7 @@
             "name": "Rigger"
         },
         "craft/roofer": {
-            "icon": "marker-stroked",
+            "icon": "poi-tool",
             "fields": [
                 "operator",
                 "address",
@@ -4267,7 +4267,7 @@
             "name": "Roofer"
         },
         "craft/saddler": {
-            "icon": "marker-stroked",
+            "icon": "poi-tool",
             "fields": [
                 "operator",
                 "address",
@@ -4284,7 +4284,7 @@
             "name": "Saddler"
         },
         "craft/sailmaker": {
-            "icon": "marker-stroked",
+            "icon": "poi-tool",
             "fields": [
                 "operator",
                 "address",
@@ -4321,7 +4321,7 @@
             "name": "Sawmill"
         },
         "craft/scaffolder": {
-            "icon": "marker-stroked",
+            "icon": "poi-tool",
             "fields": [
                 "operator",
                 "address",
@@ -4355,7 +4355,7 @@
             "name": "Sculpter"
         },
         "craft/shoemaker": {
-            "icon": "marker-stroked",
+            "icon": "poi-tool",
             "fields": [
                 "operator",
                 "address",
@@ -4375,7 +4375,7 @@
             "name": "Shoemaker"
         },
         "craft/stonemason": {
-            "icon": "marker-stroked",
+            "icon": "poi-tool",
             "fields": [
                 "operator",
                 "address",
@@ -4412,7 +4412,7 @@
             "name": "Chimney Sweep"
         },
         "craft/tiler": {
-            "icon": "marker-stroked",
+            "icon": "poi-tool",
             "fields": [
                 "operator",
                 "address",
@@ -4429,7 +4429,7 @@
             "name": "Tiler"
         },
         "craft/tinsmith": {
-            "icon": "marker-stroked",
+            "icon": "poi-tool",
             "fields": [
                 "operator",
                 "address",
@@ -4446,7 +4446,7 @@
             "name": "Tinsmith"
         },
         "craft/upholsterer": {
-            "icon": "marker-stroked",
+            "icon": "poi-tool",
             "fields": [
                 "operator",
                 "address",
@@ -4480,7 +4480,7 @@
             "name": "Watchmaker"
         },
         "craft/window_construction": {
-            "icon": "marker-stroked",
+            "icon": "poi-tool",
             "fields": [
                 "operator",
                 "address",
@@ -10317,7 +10317,7 @@
             "name": "Department Store"
         },
         "shop/doityourself": {
-            "icon": "shop",
+            "icon": "poi-tool",
             "fields": [
                 "operator",
                 "address",
@@ -10666,7 +10666,7 @@
             "name": "Hairdresser"
         },
         "shop/hardware": {
-            "icon": "shop",
+            "icon": "poi-tool",
             "fields": [
                 "operator",
                 "address",
@@ -36891,7 +36891,7 @@
                 "shop": "doityourself"
             },
             "name": "Hornbach",
-            "icon": "shop",
+            "icon": "poi-tool",
             "geometry": [
                 "point",
                 "area"
@@ -36910,7 +36910,7 @@
                 "shop": "doityourself"
             },
             "name": "B&Q",
-            "icon": "shop",
+            "icon": "poi-tool",
             "geometry": [
                 "point",
                 "area"
@@ -36929,7 +36929,7 @@
                 "shop": "doityourself"
             },
             "name": "Hubo",
-            "icon": "shop",
+            "icon": "poi-tool",
             "geometry": [
                 "point",
                 "area"
@@ -36948,7 +36948,7 @@
                 "shop": "doityourself"
             },
             "name": "Mr Bricolage",
-            "icon": "shop",
+            "icon": "poi-tool",
             "geometry": [
                 "point",
                 "area"
@@ -36967,7 +36967,7 @@
                 "shop": "doityourself"
             },
             "name": "Gamma",
-            "icon": "shop",
+            "icon": "poi-tool",
             "geometry": [
                 "point",
                 "area"
@@ -36986,7 +36986,7 @@
                 "shop": "doityourself"
             },
             "name": "OBI",
-            "icon": "shop",
+            "icon": "poi-tool",
             "geometry": [
                 "point",
                 "area"
@@ -37005,7 +37005,7 @@
                 "shop": "doityourself"
             },
             "name": "Lowes",
-            "icon": "shop",
+            "icon": "poi-tool",
             "geometry": [
                 "point",
                 "area"
@@ -37024,7 +37024,7 @@
                 "shop": "doityourself"
             },
             "name": "Wickes",
-            "icon": "shop",
+            "icon": "poi-tool",
             "geometry": [
                 "point",
                 "area"
@@ -37043,7 +37043,7 @@
                 "shop": "doityourself"
             },
             "name": "Hagebau",
-            "icon": "shop",
+            "icon": "poi-tool",
             "geometry": [
                 "point",
                 "area"
@@ -37062,7 +37062,7 @@
                 "shop": "doityourself"
             },
             "name": "Max Bahr",
-            "icon": "shop",
+            "icon": "poi-tool",
             "geometry": [
                 "point",
                 "area"
@@ -37081,7 +37081,7 @@
                 "shop": "doityourself"
             },
             "name": "Castorama",
-            "icon": "shop",
+            "icon": "poi-tool",
             "geometry": [
                 "point",
                 "area"
@@ -37100,7 +37100,7 @@
                 "shop": "doityourself"
             },
             "name": "Rona",
-            "icon": "shop",
+            "icon": "poi-tool",
             "geometry": [
                 "point",
                 "area"
@@ -37119,7 +37119,7 @@
                 "shop": "doityourself"
             },
             "name": "Home Depot",
-            "icon": "shop",
+            "icon": "poi-tool",
             "geometry": [
                 "point",
                 "area"
@@ -37138,7 +37138,7 @@
                 "shop": "doityourself"
             },
             "name": "Toom Baumarkt",
-            "icon": "shop",
+            "icon": "poi-tool",
             "geometry": [
                 "point",
                 "area"
@@ -37157,7 +37157,7 @@
                 "shop": "doityourself"
             },
             "name": "Homebase",
-            "icon": "shop",
+            "icon": "poi-tool",
             "geometry": [
                 "point",
                 "area"
@@ -37176,7 +37176,7 @@
                 "shop": "doityourself"
             },
             "name": "Baumax",
-            "icon": "shop",
+            "icon": "poi-tool",
             "geometry": [
                 "point",
                 "area"
@@ -37195,7 +37195,7 @@
                 "shop": "doityourself"
             },
             "name": "Lagerhaus",
-            "icon": "shop",
+            "icon": "poi-tool",
             "geometry": [
                 "point",
                 "area"
@@ -37214,7 +37214,7 @@
                 "shop": "doityourself"
             },
             "name": "Bauhaus",
-            "icon": "shop",
+            "icon": "poi-tool",
             "geometry": [
                 "point",
                 "area"
@@ -37233,7 +37233,7 @@
                 "shop": "doityourself"
             },
             "name": "Canadian Tire",
-            "icon": "shop",
+            "icon": "poi-tool",
             "geometry": [
                 "point",
                 "area"
@@ -37252,7 +37252,7 @@
                 "shop": "doityourself"
             },
             "name": "Leroy Merlin",
-            "icon": "shop",
+            "icon": "poi-tool",
             "geometry": [
                 "point",
                 "area"
@@ -37271,7 +37271,7 @@
                 "shop": "doityourself"
             },
             "name": "Hellweg",
-            "icon": "shop",
+            "icon": "poi-tool",
             "geometry": [
                 "point",
                 "area"
@@ -37290,7 +37290,7 @@
                 "shop": "doityourself"
             },
             "name": "Brico",
-            "icon": "shop",
+            "icon": "poi-tool",
             "geometry": [
                 "point",
                 "area"
@@ -37309,7 +37309,7 @@
                 "shop": "doityourself"
             },
             "name": "Bricomarché",
-            "icon": "shop",
+            "icon": "poi-tool",
             "geometry": [
                 "point",
                 "area"
@@ -37328,7 +37328,7 @@
                 "shop": "doityourself"
             },
             "name": "Toom",
-            "icon": "shop",
+            "icon": "poi-tool",
             "geometry": [
                 "point",
                 "area"
@@ -37347,7 +37347,7 @@
                 "shop": "doityourself"
             },
             "name": "Hagebaumarkt",
-            "icon": "shop",
+            "icon": "poi-tool",
             "geometry": [
                 "point",
                 "area"
@@ -37366,7 +37366,7 @@
                 "shop": "doityourself"
             },
             "name": "Praktiker",
-            "icon": "shop",
+            "icon": "poi-tool",
             "geometry": [
                 "point",
                 "area"
@@ -37385,7 +37385,7 @@
                 "shop": "doityourself"
             },
             "name": "Menards",
-            "icon": "shop",
+            "icon": "poi-tool",
             "geometry": [
                 "point",
                 "area"
@@ -37404,7 +37404,7 @@
                 "shop": "doityourself"
             },
             "name": "Weldom",
-            "icon": "shop",
+            "icon": "poi-tool",
             "geometry": [
                 "point",
                 "area"
@@ -37423,7 +37423,7 @@
                 "shop": "doityourself"
             },
             "name": "Bunnings Warehouse",
-            "icon": "shop",
+            "icon": "poi-tool",
             "geometry": [
                 "point",
                 "area"
@@ -37442,7 +37442,7 @@
                 "shop": "doityourself"
             },
             "name": "Ace Hardware",
-            "icon": "shop",
+            "icon": "poi-tool",
             "geometry": [
                 "point",
                 "area"
@@ -37461,7 +37461,7 @@
                 "shop": "doityourself"
             },
             "name": "Home Hardware",
-            "icon": "shop",
+            "icon": "poi-tool",
             "geometry": [
                 "point",
                 "area"
@@ -37480,7 +37480,7 @@
                 "shop": "doityourself"
             },
             "name": "Стройматериалы",
-            "icon": "shop",
+            "icon": "poi-tool",
             "geometry": [
                 "point",
                 "area"
@@ -37499,7 +37499,7 @@
                 "shop": "doityourself"
             },
             "name": "Bricorama",
-            "icon": "shop",
+            "icon": "poi-tool",
             "geometry": [
                 "point",
                 "area"
@@ -37518,7 +37518,7 @@
                 "shop": "doityourself"
             },
             "name": "Point P",
-            "icon": "shop",
+            "icon": "poi-tool",
             "geometry": [
                 "point",
                 "area"
@@ -42252,7 +42252,7 @@
                 "shop": "hardware"
             },
             "name": "1000 мелочей",
-            "icon": "shop",
+            "icon": "poi-tool",
             "geometry": [
                 "point",
                 "area"
@@ -42271,7 +42271,7 @@
                 "shop": "hardware"
             },
             "name": "Хозтовары",
-            "icon": "shop",
+            "icon": "poi-tool",
             "geometry": [
                 "point",
                 "area"
diff --git a/data/presets/presets/craft.json b/data/presets/presets/craft.json
index b75ee3ebc..912aaee54 100644
--- a/data/presets/presets/craft.json
+++ b/data/presets/presets/craft.json
@@ -1,5 +1,5 @@
 {
-    "icon": "marker-stroked",
+    "icon": "poi-tool",
     "fields": [
         "craft",
         "operator",
diff --git a/data/presets/presets/craft/blacksmith.json b/data/presets/presets/craft/blacksmith.json
index a2dfedd13..977b5fd22 100644
--- a/data/presets/presets/craft/blacksmith.json
+++ b/data/presets/presets/craft/blacksmith.json
@@ -1,5 +1,5 @@
 {
-    "icon": "farm",
+    "icon": "poi-tool",
     "fields": [
         "operator",
         "address",
diff --git a/data/presets/presets/craft/boatbuilder.json b/data/presets/presets/craft/boatbuilder.json
index 0f246d187..5eb9064f0 100644
--- a/data/presets/presets/craft/boatbuilder.json
+++ b/data/presets/presets/craft/boatbuilder.json
@@ -1,5 +1,5 @@
 {
-    "icon": "marker-stroked",
+    "icon": "poi-tool",
     "fields": [
         "operator",
         "address",
diff --git a/data/presets/presets/craft/carpenter.json b/data/presets/presets/craft/carpenter.json
index 570ecd67b..30b74ccef 100644
--- a/data/presets/presets/craft/carpenter.json
+++ b/data/presets/presets/craft/carpenter.json
@@ -1,5 +1,5 @@
 {
-    "icon": "logging",
+    "icon": "poi-tool",
     "fields": [
         "operator",
         "address",
diff --git a/data/presets/presets/craft/carpet_layer.json b/data/presets/presets/craft/carpet_layer.json
index f7f7bab2f..bfb2bb9d4 100644
--- a/data/presets/presets/craft/carpet_layer.json
+++ b/data/presets/presets/craft/carpet_layer.json
@@ -1,5 +1,5 @@
 {
-    "icon": "square",
+    "icon": "poi-tool",
     "fields": [
         "operator",
         "address",
diff --git a/data/presets/presets/craft/hvac.json b/data/presets/presets/craft/hvac.json
index 62a87ec2c..e6bacb0ce 100644
--- a/data/presets/presets/craft/hvac.json
+++ b/data/presets/presets/craft/hvac.json
@@ -1,5 +1,5 @@
 {
-    "icon": "marker-stroked",
+    "icon": "poi-tool",
     "fields": [
         "operator",
         "address",
diff --git a/data/presets/presets/craft/metal_construction.json b/data/presets/presets/craft/metal_construction.json
index 190173b2d..f944ae636 100644
--- a/data/presets/presets/craft/metal_construction.json
+++ b/data/presets/presets/craft/metal_construction.json
@@ -1,5 +1,5 @@
 {
-    "icon": "marker-stroked",
+    "icon": "poi-tool",
     "fields": [
         "operator",
         "address",
diff --git a/data/presets/presets/craft/plasterer.json b/data/presets/presets/craft/plasterer.json
index 9c2a437f2..b92bb3ef8 100644
--- a/data/presets/presets/craft/plasterer.json
+++ b/data/presets/presets/craft/plasterer.json
@@ -1,5 +1,5 @@
 {
-    "icon": "marker-stroked",
+    "icon": "poi-tool",
     "fields": [
         "operator",
         "address",
diff --git a/data/presets/presets/craft/plumber.json b/data/presets/presets/craft/plumber.json
index 4a18b28fe..69b5bb2cb 100644
--- a/data/presets/presets/craft/plumber.json
+++ b/data/presets/presets/craft/plumber.json
@@ -1,5 +1,5 @@
 {
-    "icon": "marker-stroked",
+    "icon": "poi-tool",
     "fields": [
         "operator",
         "address",
diff --git a/data/presets/presets/craft/rigger.json b/data/presets/presets/craft/rigger.json
index 4aab146a8..dc707dcf8 100644
--- a/data/presets/presets/craft/rigger.json
+++ b/data/presets/presets/craft/rigger.json
@@ -1,5 +1,5 @@
 {
-    "icon": "marker-stroked",
+    "icon": "poi-tool",
     "fields": [
         "operator",
         "address",
diff --git a/data/presets/presets/craft/roofer.json b/data/presets/presets/craft/roofer.json
index fbb6489ee..a1bed47df 100644
--- a/data/presets/presets/craft/roofer.json
+++ b/data/presets/presets/craft/roofer.json
@@ -1,5 +1,5 @@
 {
-    "icon": "marker-stroked",
+    "icon": "poi-tool",
     "fields": [
         "operator",
         "address",
diff --git a/data/presets/presets/craft/saddler.json b/data/presets/presets/craft/saddler.json
index 7d9997665..b86683961 100644
--- a/data/presets/presets/craft/saddler.json
+++ b/data/presets/presets/craft/saddler.json
@@ -1,5 +1,5 @@
 {
-    "icon": "marker-stroked",
+    "icon": "poi-tool",
     "fields": [
         "operator",
         "address",
diff --git a/data/presets/presets/craft/sailmaker.json b/data/presets/presets/craft/sailmaker.json
index bffd63633..11a6d4813 100644
--- a/data/presets/presets/craft/sailmaker.json
+++ b/data/presets/presets/craft/sailmaker.json
@@ -1,5 +1,5 @@
 {
-    "icon": "marker-stroked",
+    "icon": "poi-tool",
     "fields": [
         "operator",
         "address",
diff --git a/data/presets/presets/craft/scaffolder.json b/data/presets/presets/craft/scaffolder.json
index 5f6305af0..de0b9e3e9 100644
--- a/data/presets/presets/craft/scaffolder.json
+++ b/data/presets/presets/craft/scaffolder.json
@@ -1,5 +1,5 @@
 {
-    "icon": "marker-stroked",
+    "icon": "poi-tool",
     "fields": [
         "operator",
         "address",
diff --git a/data/presets/presets/craft/shoemaker.json b/data/presets/presets/craft/shoemaker.json
index abf7c5050..4f17689c5 100644
--- a/data/presets/presets/craft/shoemaker.json
+++ b/data/presets/presets/craft/shoemaker.json
@@ -1,5 +1,5 @@
 {
-    "icon": "marker-stroked",
+    "icon": "poi-tool",
     "fields": [
         "operator",
         "address",
diff --git a/data/presets/presets/craft/stonemason.json b/data/presets/presets/craft/stonemason.json
index 8253c16cf..cd9ce55f5 100644
--- a/data/presets/presets/craft/stonemason.json
+++ b/data/presets/presets/craft/stonemason.json
@@ -1,5 +1,5 @@
 {
-    "icon": "marker-stroked",
+    "icon": "poi-tool",
     "fields": [
         "operator",
         "address",
diff --git a/data/presets/presets/craft/tiler.json b/data/presets/presets/craft/tiler.json
index 4fd90825a..e92161882 100644
--- a/data/presets/presets/craft/tiler.json
+++ b/data/presets/presets/craft/tiler.json
@@ -1,5 +1,5 @@
 {
-    "icon": "marker-stroked",
+    "icon": "poi-tool",
     "fields": [
         "operator",
         "address",
diff --git a/data/presets/presets/craft/tinsmith.json b/data/presets/presets/craft/tinsmith.json
index 689515b6e..43f651ddf 100644
--- a/data/presets/presets/craft/tinsmith.json
+++ b/data/presets/presets/craft/tinsmith.json
@@ -1,5 +1,5 @@
 {
-    "icon": "marker-stroked",
+    "icon": "poi-tool",
     "fields": [
         "operator",
         "address",
diff --git a/data/presets/presets/craft/upholsterer.json b/data/presets/presets/craft/upholsterer.json
index 575407047..08d663299 100644
--- a/data/presets/presets/craft/upholsterer.json
+++ b/data/presets/presets/craft/upholsterer.json
@@ -1,5 +1,5 @@
 {
-    "icon": "marker-stroked",
+    "icon": "poi-tool",
     "fields": [
         "operator",
         "address",
diff --git a/data/presets/presets/craft/window_construction.json b/data/presets/presets/craft/window_construction.json
index 832b77dc6..1fd837a55 100644
--- a/data/presets/presets/craft/window_construction.json
+++ b/data/presets/presets/craft/window_construction.json
@@ -1,5 +1,5 @@
 {
-    "icon": "marker-stroked",
+    "icon": "poi-tool",
     "fields": [
         "operator",
         "address",
diff --git a/data/presets/presets/shop/doityourself.json b/data/presets/presets/shop/doityourself.json
index af771ac74..1d6d7aca5 100644
--- a/data/presets/presets/shop/doityourself.json
+++ b/data/presets/presets/shop/doityourself.json
@@ -1,5 +1,5 @@
 {
-    "icon": "shop",
+    "icon": "poi-tool",
     "fields": [
         "operator",
         "address",
diff --git a/data/presets/presets/shop/hardware.json b/data/presets/presets/shop/hardware.json
index 349a716d7..a9a2d6116 100644
--- a/data/presets/presets/shop/hardware.json
+++ b/data/presets/presets/shop/hardware.json
@@ -1,5 +1,5 @@
 {
-    "icon": "shop",
+    "icon": "poi-tool",
     "fields": [
         "operator",
         "address",
diff --git a/svg/iD-sprite.json b/svg/iD-sprite.json
index b8d6d7fa9..82b0a7aa8 100644
--- a/svg/iD-sprite.json
+++ b/svg/iD-sprite.json
@@ -285,6 +285,7 @@
     "poi-storage-tank":         { "viewBox": "460 335 15 15" },
     "poi-silo":                 { "viewBox": "475 335 15 15" },
     "poi-street-lamp":          { "viewBox": "490 335 15 15" },
+    "poi-tool":                 { "viewBox": "505 335 15 15" },
 
     "poi-vending-machine-shape":   { "fill": "currentColor" },
     "poi-dice-shape":              { "fill": "currentColor" },
@@ -293,6 +294,7 @@
     "poi-storage-tank-shape":      { "fill": "currentColor" },
     "poi-silo-shape":              { "fill": "currentColor" },
     "poi-street-lamp-shape":       { "fill": "currentColor" },
+    "poi-tool-shape":              { "fill": "currentColor" },
 
     "turn-yes":                 { "viewBox": "200 320 44 24" },
     "turn-no":                  { "viewBox": "244 320 44 24" },
diff --git a/svg/iD-sprite.src.idraw b/svg/iD-sprite.src.idraw
index a78ede0b0..871cf538a 100644
Binary files a/svg/iD-sprite.src.idraw and b/svg/iD-sprite.src.idraw differ
diff --git a/svg/iD-sprite.src.svg b/svg/iD-sprite.src.svg
index 0eb074bd2..f880bb9fe 100644
--- a/svg/iD-sprite.src.svg
+++ b/svg/iD-sprite.src.svg
@@ -232,6 +232,9 @@
     </g>
   </g>
   <g id="poi">
+    <g id="poi-tool">
+      <path d="M510.547,336.671 C510.801,336.986 510.989,337.328 511.109,337.697 C511.23,338.066 511.267,338.811 511.267,338.811 C511.267,338.811 511.173,339.548 511.027,339.9 C510.877,340.251 510.662,340.57 510.377,340.854 C510.191,341.041 509.5,341.5 509,341.5 C509,341.5 509,347 509,348.5 C509,350 507,350 507,348.5 C507,347.5 507,341.5 507,341.5 C506.5,341.5 506.11,340.999 505.932,340.828 C505.629,340.525 505.399,340.178 505.241,339.787 C505.083,339.395 505.002,339.002 505,338.604 C504.998,338.207 505.071,337.817 505.221,337.432 C505.369,337.049 505.593,336.707 505.893,336.406 C506.181,336.119 506.513,335.897 506.893,335.74 C507.274,335.585 507.667,335.504 508.073,335.5 L506.796,338.282 L507.695,339.577 L509.25,339.444 z M520,335.5 L518.5,335.5 C518.5,336 518,336.5 517.5,336.5 C517,336.5 516.077,336.5 515,336.5 C513.5,336.5 512,338.553 512,340 C513,339.053 513.385,339 515,339 L515,348.5 C515,350 517,350 517,348.5 C517,347 517,339 517,339 L517.5,339 C518,339 518.5,339.5 518.5,340 L520,340 C520,340 520,335.5 520,335.5 z" fill="#000000" id="poi-tool-shape"/>
+    </g>
     <g id="poi-street-lamp">
       <path d="M501.25,339 L501.25,341 L500.75,341 L500.75,339 L501.25,339 z M503.224,338.888 L502.776,339.112 L503.776,341.112 L504.224,340.888 L503.224,338.888 z M498.776,338.888 L497.776,340.888 L498.224,341.112 L499.224,339.112 L498.776,338.888 z M501,335 C500.763,335 500.367,335.014 499.862,335.056 C499.021,335.126 498.179,335.253 497.382,335.452 C496.707,335.621 496.093,335.836 495.553,336.106 C493.179,337.293 492,339.65 492,343 L492,349 C492,349.552 492.448,350 493,350 C493.552,350 494,349.552 494,349 L494,343 C494,340.35 494.821,338.707 496.447,337.894 C496.845,337.696 497.324,337.528 497.867,337.392 C499.04,337.157 498.568,337.222 499.273,337.139 C498.831,337.465 499.039,337.295 498.646,337.646 C498.331,337.961 498.555,338.5 499,338.5 L503,338.5 C503.445,338.5 503.669,337.961 503.354,337.646 C503.207,337.5 502.965,337.292 502.652,337.084 C501.786,336.633 502.134,336.713 501.682,336.628 C502.015,336.296 501.899,336.5 502,336 C502,335.448 501.552,335 501,335 z" fill="#000000" id="poi-street-lamp-shape"/>
     </g>