diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index b186ac70d3..99f4648da5 100644
Binary files a/data/drules_proto.bin and b/data/drules_proto.bin differ
diff --git a/data/drules_proto.txt b/data/drules_proto.txt
index 26f1004808..59d3d194cf 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -19153,6 +19153,57 @@ cont {
     }
   }
 }
+cont {
+  name: "craft"
+  element {
+    scale: 18
+    symbol {
+      name: "craft-m"
+      priority: 500
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9500
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "craft-m"
+      priority: 500
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9500
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "craft-m"
+      priority: 500
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9500
+    }
+  }
+}
 cont {
   name: "craft-beekeeper"
   element {
@@ -120588,7 +120639,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "hand-m"
+      name: "craft-m"
       priority: 1600
       min_distance: 10
     }
@@ -120605,7 +120656,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "hand-m"
+      name: "craft-m"
       priority: 1600
       min_distance: 24
     }
@@ -120622,7 +120673,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "hand-m"
+      name: "craft-m"
       priority: 1600
       min_distance: 24
     }
@@ -120639,7 +120690,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "hand-m"
+      name: "craft-m"
       priority: 1600
       min_distance: 24
     }
@@ -120656,7 +120707,7 @@ cont {
   element {
     scale: 20
     symbol {
-      name: "hand-m"
+      name: "craft-m"
       priority: 1600
       min_distance: 24
     }
diff --git a/data/drules_proto_default_dark.bin b/data/drules_proto_default_dark.bin
index 7950d1f275..47684bc010 100644
Binary files a/data/drules_proto_default_dark.bin and b/data/drules_proto_default_dark.bin differ
diff --git a/data/drules_proto_default_dark.txt b/data/drules_proto_default_dark.txt
index 23b6295ecc..60cd814859 100644
--- a/data/drules_proto_default_dark.txt
+++ b/data/drules_proto_default_dark.txt
@@ -18075,6 +18075,57 @@ cont {
     }
   }
 }
+cont {
+  name: "craft"
+  element {
+    scale: 18
+    symbol {
+      name: "craft-m"
+      priority: 500
+    }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9500
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "craft-m"
+      priority: 500
+    }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9500
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "craft-m"
+      priority: 500
+    }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9500
+    }
+  }
+}
 cont {
   name: "craft-beekeeper"
   element {
@@ -116341,7 +116392,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "hand-m"
+      name: "craft-m"
       priority: 1600
       min_distance: 10
     }
@@ -116358,7 +116409,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "hand-m"
+      name: "craft-m"
       priority: 1600
       min_distance: 24
     }
@@ -116375,7 +116426,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "hand-m"
+      name: "craft-m"
       priority: 1600
       min_distance: 24
     }
@@ -116392,7 +116443,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "hand-m"
+      name: "craft-m"
       priority: 1600
       min_distance: 24
     }
@@ -116409,7 +116460,7 @@ cont {
   element {
     scale: 20
     symbol {
-      name: "hand-m"
+      name: "craft-m"
       priority: 1600
       min_distance: 24
     }
diff --git a/data/drules_proto_default_light.bin b/data/drules_proto_default_light.bin
index 69fcbc4420..6967adee3c 100644
Binary files a/data/drules_proto_default_light.bin and b/data/drules_proto_default_light.bin differ
diff --git a/data/drules_proto_default_light.txt b/data/drules_proto_default_light.txt
index 7df27474f8..64a3a1c0f6 100644
--- a/data/drules_proto_default_light.txt
+++ b/data/drules_proto_default_light.txt
@@ -18075,6 +18075,57 @@ cont {
     }
   }
 }
+cont {
+  name: "craft"
+  element {
+    scale: 18
+    symbol {
+      name: "craft-m"
+      priority: 500
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9500
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "craft-m"
+      priority: 500
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9500
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "craft-m"
+      priority: 500
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9500
+    }
+  }
+}
 cont {
   name: "craft-beekeeper"
   element {
@@ -116126,7 +116177,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "hand-m"
+      name: "craft-m"
       priority: 1600
       min_distance: 10
     }
@@ -116143,7 +116194,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "hand-m"
+      name: "craft-m"
       priority: 1600
       min_distance: 24
     }
@@ -116160,7 +116211,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "hand-m"
+      name: "craft-m"
       priority: 1600
       min_distance: 24
     }
@@ -116177,7 +116228,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "hand-m"
+      name: "craft-m"
       priority: 1600
       min_distance: 24
     }
@@ -116194,7 +116245,7 @@ cont {
   element {
     scale: 20
     symbol {
-      name: "hand-m"
+      name: "craft-m"
       priority: 1600
       min_distance: 24
     }
diff --git a/data/drules_proto_outdoors_dark.bin b/data/drules_proto_outdoors_dark.bin
index fa6d6b62dd..220167a7f1 100644
Binary files a/data/drules_proto_outdoors_dark.bin and b/data/drules_proto_outdoors_dark.bin differ
diff --git a/data/drules_proto_outdoors_dark.txt b/data/drules_proto_outdoors_dark.txt
index 5363dfd886..7885f5b97d 100644
--- a/data/drules_proto_outdoors_dark.txt
+++ b/data/drules_proto_outdoors_dark.txt
@@ -18650,6 +18650,57 @@ cont {
     }
   }
 }
+cont {
+  name: "craft"
+  element {
+    scale: 18
+    symbol {
+      name: "craft-m"
+      priority: 500
+    }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9500
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "craft-m"
+      priority: 500
+    }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9500
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "craft-m"
+      priority: 500
+    }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9500
+    }
+  }
+}
 cont {
   name: "craft-beekeeper"
   element {
@@ -121064,7 +121115,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "hand-m"
+      name: "craft-m"
       priority: 1600
       min_distance: 10
     }
@@ -121081,7 +121132,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "hand-m"
+      name: "craft-m"
       priority: 1600
       min_distance: 24
     }
@@ -121098,7 +121149,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "hand-m"
+      name: "craft-m"
       priority: 1600
       min_distance: 24
     }
@@ -121115,7 +121166,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "hand-m"
+      name: "craft-m"
       priority: 1600
       min_distance: 24
     }
@@ -121132,7 +121183,7 @@ cont {
   element {
     scale: 20
     symbol {
-      name: "hand-m"
+      name: "craft-m"
       priority: 1600
       min_distance: 24
     }
diff --git a/data/drules_proto_outdoors_light.bin b/data/drules_proto_outdoors_light.bin
index 61684b4a14..fc75f3ed4d 100644
Binary files a/data/drules_proto_outdoors_light.bin and b/data/drules_proto_outdoors_light.bin differ
diff --git a/data/drules_proto_outdoors_light.txt b/data/drules_proto_outdoors_light.txt
index ff4f0ce62b..0c7d43766e 100644
--- a/data/drules_proto_outdoors_light.txt
+++ b/data/drules_proto_outdoors_light.txt
@@ -18650,6 +18650,57 @@ cont {
     }
   }
 }
+cont {
+  name: "craft"
+  element {
+    scale: 18
+    symbol {
+      name: "craft-m"
+      priority: 500
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9500
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "craft-m"
+      priority: 500
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9500
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "craft-m"
+      priority: 500
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9500
+    }
+  }
+}
 cont {
   name: "craft-beekeeper"
   element {
@@ -120849,7 +120900,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "hand-m"
+      name: "craft-m"
       priority: 1600
       min_distance: 10
     }
@@ -120866,7 +120917,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "hand-m"
+      name: "craft-m"
       priority: 1600
       min_distance: 24
     }
@@ -120883,7 +120934,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "hand-m"
+      name: "craft-m"
       priority: 1600
       min_distance: 24
     }
@@ -120900,7 +120951,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "hand-m"
+      name: "craft-m"
       priority: 1600
       min_distance: 24
     }
@@ -120917,7 +120968,7 @@ cont {
   element {
     scale: 20
     symbol {
-      name: "hand-m"
+      name: "craft-m"
       priority: 1600
       min_distance: 24
     }
diff --git a/data/resources-6plus_dark/symbols.png b/data/resources-6plus_dark/symbols.png
index 26865372be..1a8daa6500 100644
Binary files a/data/resources-6plus_dark/symbols.png and b/data/resources-6plus_dark/symbols.png differ
diff --git a/data/resources-6plus_dark/symbols.sdf b/data/resources-6plus_dark/symbols.sdf
index 45de47340d..edb24c92ef 100644
--- a/data/resources-6plus_dark/symbols.sdf
+++ b/data/resources-6plus_dark/symbols.sdf
@@ -341,55 +341,55 @@
   <symbol maxX="1102" maxY="754" minX="1044" minY="696" name="helipad-m"/>
   <symbol maxX="1160" maxY="754" minX="1102" minY="696" name="handicraft-m"/>
   <symbol maxX="1218" maxY="754" minX="1160" minY="696" name="handball-m"/>
-  <symbol maxX="1276" maxY="754" minX="1218" minY="696" name="hand-m"/>
-  <symbol maxX="1334" maxY="754" minX="1276" minY="696" name="hairdresser-m"/>
-  <symbol maxX="1392" maxY="754" minX="1334" minY="696" name="hackerspace-m"/>
-  <symbol maxX="1450" maxY="754" minX="1392" minY="696" name="guidepost"/>
-  <symbol maxX="1508" maxY="754" minX="1450" minY="696" name="grocery-m"/>
-  <symbol maxX="1566" maxY="754" minX="1508" minY="696" name="grinding_mill-m"/>
-  <symbol maxX="1624" maxY="754" minX="1566" minY="696" name="greengrocer-m"/>
-  <symbol maxX="1682" maxY="754" minX="1624" minY="696" name="golf-m"/>
-  <symbol maxX="1740" maxY="754" minX="1682" minY="696" name="gift-m"/>
-  <symbol maxX="1798" maxY="754" minX="1740" minY="696" name="geyser-m"/>
-  <symbol maxX="1856" maxY="754" minX="1798" minY="696" name="garden_center-m"/>
-  <symbol maxX="1914" maxY="754" minX="1856" minY="696" name="garden-outline-m"/>
-  <symbol maxX="1972" maxY="754" minX="1914" minY="696" name="garden-m"/>
-  <symbol maxX="2030" maxY="754" minX="1972" minY="696" name="gambling-m"/>
-  <symbol maxX="58" maxY="812" minX="0" minY="754" name="gallery-m"/>
-  <symbol maxX="116" maxY="812" minX="58" minY="754" name="furniture-m"/>
-  <symbol maxX="174" maxY="812" minX="116" minY="754" name="funicular-m"/>
-  <symbol maxX="232" maxY="812" minX="174" minY="754" name="funeral_directors-m"/>
-  <symbol maxX="290" maxY="812" minX="232" minY="754" name="fuel-m"/>
-  <symbol maxX="348" maxY="812" minX="290" minY="754" name="fuel-dispenser-m"/>
-  <symbol maxX="406" maxY="812" minX="348" minY="754" name="fountain-s"/>
-  <symbol maxX="464" maxY="812" minX="406" minY="754" name="fountain-m"/>
-  <symbol maxX="522" maxY="812" minX="464" minY="754" name="florist-m"/>
-  <symbol maxX="580" maxY="812" minX="522" minY="754" name="fitness_station-m"/>
-  <symbol maxX="638" maxY="812" minX="580" minY="754" name="fitness_centre-m"/>
-  <symbol maxX="696" maxY="812" minX="638" minY="754" name="firehydrant-m"/>
-  <symbol maxX="754" maxY="812" minX="696" minY="754" name="fire_station-m"/>
-  <symbol maxX="812" maxY="812" minX="754" minY="754" name="fastfood-m"/>
-  <symbol maxX="870" maxY="812" minX="812" minY="754" name="factory-m"/>
-  <symbol maxX="928" maxY="812" minX="870" minY="754" name="excrement_bags-m"/>
-  <symbol maxX="986" maxY="812" minX="928" minY="754" name="erotic-m"/>
-  <symbol maxX="1044" maxY="812" minX="986" minY="754" name="equestrian-m"/>
-  <symbol maxX="1102" maxY="812" minX="1044" minY="754" name="emergency-phone-m"/>
-  <symbol maxX="1160" maxY="812" minX="1102" minY="754" name="embassy-m"/>
-  <symbol maxX="1218" maxY="812" minX="1160" minY="754" name="electronics-m"/>
-  <symbol maxX="1276" maxY="812" minX="1218" minY="754" name="electrician-m"/>
-  <symbol maxX="1334" maxY="812" minX="1276" minY="754" name="dump-station-m"/>
-  <symbol maxX="1392" maxY="812" minX="1334" minY="754" name="dry_cleaning-m"/>
-  <symbol maxX="1450" maxY="812" minX="1392" minY="754" name="driving_school-m"/>
-  <symbol maxX="1508" maxY="812" minX="1450" minY="754" name="drinking-water-m"/>
-  <symbol maxX="1566" maxY="812" minX="1508" minY="754" name="doityourself-m"/>
-  <symbol maxX="1624" maxY="812" minX="1566" minY="754" name="dog_park-m"/>
-  <symbol maxX="1682" maxY="812" minX="1624" minY="754" name="diving-m"/>
-  <symbol maxX="1740" maxY="812" minX="1682" minY="754" name="department_store-m"/>
-  <symbol maxX="1798" maxY="812" minX="1740" minY="754" name="dentist-m"/>
-  <symbol maxX="1856" maxY="812" minX="1798" minY="754" name="defibrillator-m"/>
-  <symbol maxX="1914" maxY="812" minX="1856" minY="754" name="curling-m"/>
-  <symbol maxX="1972" maxY="812" minX="1914" minY="754" name="cross-m"/>
-  <symbol maxX="2030" maxY="812" minX="1972" minY="754" name="cricket-m"/>
+  <symbol maxX="1276" maxY="754" minX="1218" minY="696" name="hairdresser-m"/>
+  <symbol maxX="1334" maxY="754" minX="1276" minY="696" name="hackerspace-m"/>
+  <symbol maxX="1392" maxY="754" minX="1334" minY="696" name="guidepost"/>
+  <symbol maxX="1450" maxY="754" minX="1392" minY="696" name="grocery-m"/>
+  <symbol maxX="1508" maxY="754" minX="1450" minY="696" name="grinding_mill-m"/>
+  <symbol maxX="1566" maxY="754" minX="1508" minY="696" name="greengrocer-m"/>
+  <symbol maxX="1624" maxY="754" minX="1566" minY="696" name="golf-m"/>
+  <symbol maxX="1682" maxY="754" minX="1624" minY="696" name="gift-m"/>
+  <symbol maxX="1740" maxY="754" minX="1682" minY="696" name="geyser-m"/>
+  <symbol maxX="1798" maxY="754" minX="1740" minY="696" name="garden_center-m"/>
+  <symbol maxX="1856" maxY="754" minX="1798" minY="696" name="garden-outline-m"/>
+  <symbol maxX="1914" maxY="754" minX="1856" minY="696" name="garden-m"/>
+  <symbol maxX="1972" maxY="754" minX="1914" minY="696" name="gambling-m"/>
+  <symbol maxX="2030" maxY="754" minX="1972" minY="696" name="gallery-m"/>
+  <symbol maxX="58" maxY="812" minX="0" minY="754" name="furniture-m"/>
+  <symbol maxX="116" maxY="812" minX="58" minY="754" name="funicular-m"/>
+  <symbol maxX="174" maxY="812" minX="116" minY="754" name="funeral_directors-m"/>
+  <symbol maxX="232" maxY="812" minX="174" minY="754" name="fuel-m"/>
+  <symbol maxX="290" maxY="812" minX="232" minY="754" name="fuel-dispenser-m"/>
+  <symbol maxX="348" maxY="812" minX="290" minY="754" name="fountain-s"/>
+  <symbol maxX="406" maxY="812" minX="348" minY="754" name="fountain-m"/>
+  <symbol maxX="464" maxY="812" minX="406" minY="754" name="florist-m"/>
+  <symbol maxX="522" maxY="812" minX="464" minY="754" name="fitness_station-m"/>
+  <symbol maxX="580" maxY="812" minX="522" minY="754" name="fitness_centre-m"/>
+  <symbol maxX="638" maxY="812" minX="580" minY="754" name="firehydrant-m"/>
+  <symbol maxX="696" maxY="812" minX="638" minY="754" name="fire_station-m"/>
+  <symbol maxX="754" maxY="812" minX="696" minY="754" name="fastfood-m"/>
+  <symbol maxX="812" maxY="812" minX="754" minY="754" name="factory-m"/>
+  <symbol maxX="870" maxY="812" minX="812" minY="754" name="excrement_bags-m"/>
+  <symbol maxX="928" maxY="812" minX="870" minY="754" name="erotic-m"/>
+  <symbol maxX="986" maxY="812" minX="928" minY="754" name="equestrian-m"/>
+  <symbol maxX="1044" maxY="812" minX="986" minY="754" name="emergency-phone-m"/>
+  <symbol maxX="1102" maxY="812" minX="1044" minY="754" name="embassy-m"/>
+  <symbol maxX="1160" maxY="812" minX="1102" minY="754" name="electronics-m"/>
+  <symbol maxX="1218" maxY="812" minX="1160" minY="754" name="electrician-m"/>
+  <symbol maxX="1276" maxY="812" minX="1218" minY="754" name="dump-station-m"/>
+  <symbol maxX="1334" maxY="812" minX="1276" minY="754" name="dry_cleaning-m"/>
+  <symbol maxX="1392" maxY="812" minX="1334" minY="754" name="driving_school-m"/>
+  <symbol maxX="1450" maxY="812" minX="1392" minY="754" name="drinking-water-m"/>
+  <symbol maxX="1508" maxY="812" minX="1450" minY="754" name="doityourself-m"/>
+  <symbol maxX="1566" maxY="812" minX="1508" minY="754" name="dog_park-m"/>
+  <symbol maxX="1624" maxY="812" minX="1566" minY="754" name="diving-m"/>
+  <symbol maxX="1682" maxY="812" minX="1624" minY="754" name="department_store-m"/>
+  <symbol maxX="1740" maxY="812" minX="1682" minY="754" name="dentist-m"/>
+  <symbol maxX="1798" maxY="812" minX="1740" minY="754" name="defibrillator-m"/>
+  <symbol maxX="1856" maxY="812" minX="1798" minY="754" name="curling-m"/>
+  <symbol maxX="1914" maxY="812" minX="1856" minY="754" name="cross-m"/>
+  <symbol maxX="1972" maxY="812" minX="1914" minY="754" name="cricket-m"/>
+  <symbol maxX="2030" maxY="812" minX="1972" minY="754" name="craft-m"/>
   <symbol maxX="58" maxY="870" minX="0" minY="812" name="copyshop-m"/>
   <symbol maxX="116" maxY="870" minX="58" minY="812" name="convenience-m"/>
   <symbol maxX="174" maxY="870" minX="116" minY="812" name="computer-m"/>
diff --git a/data/resources-6plus_light/symbols.png b/data/resources-6plus_light/symbols.png
index a4477ddfb9..f65bc96f15 100644
Binary files a/data/resources-6plus_light/symbols.png and b/data/resources-6plus_light/symbols.png differ
diff --git a/data/resources-6plus_light/symbols.sdf b/data/resources-6plus_light/symbols.sdf
index b024f56321..49cfd07c43 100644
--- a/data/resources-6plus_light/symbols.sdf
+++ b/data/resources-6plus_light/symbols.sdf
@@ -341,55 +341,55 @@
   <symbol maxX="1102" maxY="754" minX="1044" minY="696" name="helipad-m"/>
   <symbol maxX="1160" maxY="754" minX="1102" minY="696" name="handicraft-m"/>
   <symbol maxX="1218" maxY="754" minX="1160" minY="696" name="handball-m"/>
-  <symbol maxX="1276" maxY="754" minX="1218" minY="696" name="hand-m"/>
-  <symbol maxX="1334" maxY="754" minX="1276" minY="696" name="hairdresser-m"/>
-  <symbol maxX="1392" maxY="754" minX="1334" minY="696" name="hackerspace-m"/>
-  <symbol maxX="1450" maxY="754" minX="1392" minY="696" name="guidepost"/>
-  <symbol maxX="1508" maxY="754" minX="1450" minY="696" name="grocery-m"/>
-  <symbol maxX="1566" maxY="754" minX="1508" minY="696" name="grinding_mill-m"/>
-  <symbol maxX="1624" maxY="754" minX="1566" minY="696" name="greengrocer-m"/>
-  <symbol maxX="1682" maxY="754" minX="1624" minY="696" name="golf-m"/>
-  <symbol maxX="1740" maxY="754" minX="1682" minY="696" name="gift-m"/>
-  <symbol maxX="1798" maxY="754" minX="1740" minY="696" name="geyser-m"/>
-  <symbol maxX="1856" maxY="754" minX="1798" minY="696" name="garden_center-m"/>
-  <symbol maxX="1914" maxY="754" minX="1856" minY="696" name="garden-outline-m"/>
-  <symbol maxX="1972" maxY="754" minX="1914" minY="696" name="garden-m"/>
-  <symbol maxX="2030" maxY="754" minX="1972" minY="696" name="gambling-m"/>
-  <symbol maxX="58" maxY="812" minX="0" minY="754" name="gallery-m"/>
-  <symbol maxX="116" maxY="812" minX="58" minY="754" name="furniture-m"/>
-  <symbol maxX="174" maxY="812" minX="116" minY="754" name="funicular-m"/>
-  <symbol maxX="232" maxY="812" minX="174" minY="754" name="funeral_directors-m"/>
-  <symbol maxX="290" maxY="812" minX="232" minY="754" name="fuel-m"/>
-  <symbol maxX="348" maxY="812" minX="290" minY="754" name="fuel-dispenser-m"/>
-  <symbol maxX="406" maxY="812" minX="348" minY="754" name="fountain-s"/>
-  <symbol maxX="464" maxY="812" minX="406" minY="754" name="fountain-m"/>
-  <symbol maxX="522" maxY="812" minX="464" minY="754" name="florist-m"/>
-  <symbol maxX="580" maxY="812" minX="522" minY="754" name="fitness_station-m"/>
-  <symbol maxX="638" maxY="812" minX="580" minY="754" name="fitness_centre-m"/>
-  <symbol maxX="696" maxY="812" minX="638" minY="754" name="firehydrant-m"/>
-  <symbol maxX="754" maxY="812" minX="696" minY="754" name="fire_station-m"/>
-  <symbol maxX="812" maxY="812" minX="754" minY="754" name="fastfood-m"/>
-  <symbol maxX="870" maxY="812" minX="812" minY="754" name="factory-m"/>
-  <symbol maxX="928" maxY="812" minX="870" minY="754" name="excrement_bags-m"/>
-  <symbol maxX="986" maxY="812" minX="928" minY="754" name="erotic-m"/>
-  <symbol maxX="1044" maxY="812" minX="986" minY="754" name="equestrian-m"/>
-  <symbol maxX="1102" maxY="812" minX="1044" minY="754" name="emergency-phone-m"/>
-  <symbol maxX="1160" maxY="812" minX="1102" minY="754" name="embassy-m"/>
-  <symbol maxX="1218" maxY="812" minX="1160" minY="754" name="electronics-m"/>
-  <symbol maxX="1276" maxY="812" minX="1218" minY="754" name="electrician-m"/>
-  <symbol maxX="1334" maxY="812" minX="1276" minY="754" name="dump-station-m"/>
-  <symbol maxX="1392" maxY="812" minX="1334" minY="754" name="dry_cleaning-m"/>
-  <symbol maxX="1450" maxY="812" minX="1392" minY="754" name="driving_school-m"/>
-  <symbol maxX="1508" maxY="812" minX="1450" minY="754" name="drinking-water-m"/>
-  <symbol maxX="1566" maxY="812" minX="1508" minY="754" name="doityourself-m"/>
-  <symbol maxX="1624" maxY="812" minX="1566" minY="754" name="dog_park-m"/>
-  <symbol maxX="1682" maxY="812" minX="1624" minY="754" name="diving-m"/>
-  <symbol maxX="1740" maxY="812" minX="1682" minY="754" name="department_store-m"/>
-  <symbol maxX="1798" maxY="812" minX="1740" minY="754" name="dentist-m"/>
-  <symbol maxX="1856" maxY="812" minX="1798" minY="754" name="defibrillator-m"/>
-  <symbol maxX="1914" maxY="812" minX="1856" minY="754" name="curling-m"/>
-  <symbol maxX="1972" maxY="812" minX="1914" minY="754" name="cross-m"/>
-  <symbol maxX="2030" maxY="812" minX="1972" minY="754" name="cricket-m"/>
+  <symbol maxX="1276" maxY="754" minX="1218" minY="696" name="hairdresser-m"/>
+  <symbol maxX="1334" maxY="754" minX="1276" minY="696" name="hackerspace-m"/>
+  <symbol maxX="1392" maxY="754" minX="1334" minY="696" name="guidepost"/>
+  <symbol maxX="1450" maxY="754" minX="1392" minY="696" name="grocery-m"/>
+  <symbol maxX="1508" maxY="754" minX="1450" minY="696" name="grinding_mill-m"/>
+  <symbol maxX="1566" maxY="754" minX="1508" minY="696" name="greengrocer-m"/>
+  <symbol maxX="1624" maxY="754" minX="1566" minY="696" name="golf-m"/>
+  <symbol maxX="1682" maxY="754" minX="1624" minY="696" name="gift-m"/>
+  <symbol maxX="1740" maxY="754" minX="1682" minY="696" name="geyser-m"/>
+  <symbol maxX="1798" maxY="754" minX="1740" minY="696" name="garden_center-m"/>
+  <symbol maxX="1856" maxY="754" minX="1798" minY="696" name="garden-outline-m"/>
+  <symbol maxX="1914" maxY="754" minX="1856" minY="696" name="garden-m"/>
+  <symbol maxX="1972" maxY="754" minX="1914" minY="696" name="gambling-m"/>
+  <symbol maxX="2030" maxY="754" minX="1972" minY="696" name="gallery-m"/>
+  <symbol maxX="58" maxY="812" minX="0" minY="754" name="furniture-m"/>
+  <symbol maxX="116" maxY="812" minX="58" minY="754" name="funicular-m"/>
+  <symbol maxX="174" maxY="812" minX="116" minY="754" name="funeral_directors-m"/>
+  <symbol maxX="232" maxY="812" minX="174" minY="754" name="fuel-m"/>
+  <symbol maxX="290" maxY="812" minX="232" minY="754" name="fuel-dispenser-m"/>
+  <symbol maxX="348" maxY="812" minX="290" minY="754" name="fountain-s"/>
+  <symbol maxX="406" maxY="812" minX="348" minY="754" name="fountain-m"/>
+  <symbol maxX="464" maxY="812" minX="406" minY="754" name="florist-m"/>
+  <symbol maxX="522" maxY="812" minX="464" minY="754" name="fitness_station-m"/>
+  <symbol maxX="580" maxY="812" minX="522" minY="754" name="fitness_centre-m"/>
+  <symbol maxX="638" maxY="812" minX="580" minY="754" name="firehydrant-m"/>
+  <symbol maxX="696" maxY="812" minX="638" minY="754" name="fire_station-m"/>
+  <symbol maxX="754" maxY="812" minX="696" minY="754" name="fastfood-m"/>
+  <symbol maxX="812" maxY="812" minX="754" minY="754" name="factory-m"/>
+  <symbol maxX="870" maxY="812" minX="812" minY="754" name="excrement_bags-m"/>
+  <symbol maxX="928" maxY="812" minX="870" minY="754" name="erotic-m"/>
+  <symbol maxX="986" maxY="812" minX="928" minY="754" name="equestrian-m"/>
+  <symbol maxX="1044" maxY="812" minX="986" minY="754" name="emergency-phone-m"/>
+  <symbol maxX="1102" maxY="812" minX="1044" minY="754" name="embassy-m"/>
+  <symbol maxX="1160" maxY="812" minX="1102" minY="754" name="electronics-m"/>
+  <symbol maxX="1218" maxY="812" minX="1160" minY="754" name="electrician-m"/>
+  <symbol maxX="1276" maxY="812" minX="1218" minY="754" name="dump-station-m"/>
+  <symbol maxX="1334" maxY="812" minX="1276" minY="754" name="dry_cleaning-m"/>
+  <symbol maxX="1392" maxY="812" minX="1334" minY="754" name="driving_school-m"/>
+  <symbol maxX="1450" maxY="812" minX="1392" minY="754" name="drinking-water-m"/>
+  <symbol maxX="1508" maxY="812" minX="1450" minY="754" name="doityourself-m"/>
+  <symbol maxX="1566" maxY="812" minX="1508" minY="754" name="dog_park-m"/>
+  <symbol maxX="1624" maxY="812" minX="1566" minY="754" name="diving-m"/>
+  <symbol maxX="1682" maxY="812" minX="1624" minY="754" name="department_store-m"/>
+  <symbol maxX="1740" maxY="812" minX="1682" minY="754" name="dentist-m"/>
+  <symbol maxX="1798" maxY="812" minX="1740" minY="754" name="defibrillator-m"/>
+  <symbol maxX="1856" maxY="812" minX="1798" minY="754" name="curling-m"/>
+  <symbol maxX="1914" maxY="812" minX="1856" minY="754" name="cross-m"/>
+  <symbol maxX="1972" maxY="812" minX="1914" minY="754" name="cricket-m"/>
+  <symbol maxX="2030" maxY="812" minX="1972" minY="754" name="craft-m"/>
   <symbol maxX="58" maxY="870" minX="0" minY="812" name="copyshop-m"/>
   <symbol maxX="116" maxY="870" minX="58" minY="812" name="convenience-m"/>
   <symbol maxX="174" maxY="870" minX="116" minY="812" name="computer-m"/>
diff --git a/data/resources-hdpi_dark/symbols.png b/data/resources-hdpi_dark/symbols.png
index 084b51580c..78bab5021b 100644
Binary files a/data/resources-hdpi_dark/symbols.png and b/data/resources-hdpi_dark/symbols.png differ
diff --git a/data/resources-hdpi_dark/symbols.sdf b/data/resources-hdpi_dark/symbols.sdf
index 7225681195..53ae759f58 100644
--- a/data/resources-hdpi_dark/symbols.sdf
+++ b/data/resources-hdpi_dark/symbols.sdf
@@ -347,55 +347,55 @@
   <symbol maxX="310" maxY="533" minX="279" minY="502" name="helipad-m"/>
   <symbol maxX="341" maxY="533" minX="310" minY="502" name="handicraft-m"/>
   <symbol maxX="372" maxY="533" minX="341" minY="502" name="handball-m"/>
-  <symbol maxX="403" maxY="533" minX="372" minY="502" name="hand-m"/>
-  <symbol maxX="434" maxY="533" minX="403" minY="502" name="hairdresser-m"/>
-  <symbol maxX="465" maxY="533" minX="434" minY="502" name="hackerspace-m"/>
-  <symbol maxX="496" maxY="533" minX="465" minY="502" name="guidepost"/>
-  <symbol maxX="527" maxY="533" minX="496" minY="502" name="grocery-m"/>
-  <symbol maxX="558" maxY="533" minX="527" minY="502" name="grinding_mill-m"/>
-  <symbol maxX="589" maxY="533" minX="558" minY="502" name="greengrocer-m"/>
-  <symbol maxX="620" maxY="533" minX="589" minY="502" name="golf-m"/>
-  <symbol maxX="651" maxY="533" minX="620" minY="502" name="gift-m"/>
-  <symbol maxX="682" maxY="533" minX="651" minY="502" name="geyser-m"/>
-  <symbol maxX="713" maxY="533" minX="682" minY="502" name="garden_center-m"/>
-  <symbol maxX="744" maxY="533" minX="713" minY="502" name="garden-outline-m"/>
-  <symbol maxX="775" maxY="533" minX="744" minY="502" name="garden-m"/>
-  <symbol maxX="806" maxY="533" minX="775" minY="502" name="gambling-m"/>
-  <symbol maxX="837" maxY="533" minX="806" minY="502" name="gallery-m"/>
-  <symbol maxX="868" maxY="533" minX="837" minY="502" name="furniture-m"/>
-  <symbol maxX="899" maxY="533" minX="868" minY="502" name="funicular-m"/>
-  <symbol maxX="930" maxY="533" minX="899" minY="502" name="funeral_directors-m"/>
-  <symbol maxX="961" maxY="533" minX="930" minY="502" name="fuel-m"/>
-  <symbol maxX="992" maxY="533" minX="961" minY="502" name="fuel-dispenser-m"/>
-  <symbol maxX="1023" maxY="533" minX="992" minY="502" name="fountain-s"/>
-  <symbol maxX="31" maxY="564" minX="0" minY="533" name="fountain-m"/>
-  <symbol maxX="62" maxY="564" minX="31" minY="533" name="florist-m"/>
-  <symbol maxX="93" maxY="564" minX="62" minY="533" name="fitness_station-m"/>
-  <symbol maxX="124" maxY="564" minX="93" minY="533" name="fitness_centre-m"/>
-  <symbol maxX="155" maxY="564" minX="124" minY="533" name="firehydrant-m"/>
-  <symbol maxX="186" maxY="564" minX="155" minY="533" name="fire_station-m"/>
-  <symbol maxX="217" maxY="564" minX="186" minY="533" name="fastfood-m"/>
-  <symbol maxX="248" maxY="564" minX="217" minY="533" name="factory-m"/>
-  <symbol maxX="279" maxY="564" minX="248" minY="533" name="excrement_bags-m"/>
-  <symbol maxX="310" maxY="564" minX="279" minY="533" name="erotic-m"/>
-  <symbol maxX="341" maxY="564" minX="310" minY="533" name="equestrian-m"/>
-  <symbol maxX="372" maxY="564" minX="341" minY="533" name="emergency-phone-m"/>
-  <symbol maxX="403" maxY="564" minX="372" minY="533" name="embassy-m"/>
-  <symbol maxX="434" maxY="564" minX="403" minY="533" name="electronics-m"/>
-  <symbol maxX="465" maxY="564" minX="434" minY="533" name="electrician-m"/>
-  <symbol maxX="496" maxY="564" minX="465" minY="533" name="dump-station-m"/>
-  <symbol maxX="527" maxY="564" minX="496" minY="533" name="dry_cleaning-m"/>
-  <symbol maxX="558" maxY="564" minX="527" minY="533" name="driving_school-m"/>
-  <symbol maxX="589" maxY="564" minX="558" minY="533" name="drinking-water-m"/>
-  <symbol maxX="620" maxY="564" minX="589" minY="533" name="doityourself-m"/>
-  <symbol maxX="651" maxY="564" minX="620" minY="533" name="dog_park-m"/>
-  <symbol maxX="682" maxY="564" minX="651" minY="533" name="diving-m"/>
-  <symbol maxX="713" maxY="564" minX="682" minY="533" name="department_store-m"/>
-  <symbol maxX="744" maxY="564" minX="713" minY="533" name="dentist-m"/>
-  <symbol maxX="775" maxY="564" minX="744" minY="533" name="defibrillator-m"/>
-  <symbol maxX="806" maxY="564" minX="775" minY="533" name="curling-m"/>
-  <symbol maxX="837" maxY="564" minX="806" minY="533" name="cross-m"/>
-  <symbol maxX="868" maxY="564" minX="837" minY="533" name="cricket-m"/>
+  <symbol maxX="403" maxY="533" minX="372" minY="502" name="hairdresser-m"/>
+  <symbol maxX="434" maxY="533" minX="403" minY="502" name="hackerspace-m"/>
+  <symbol maxX="465" maxY="533" minX="434" minY="502" name="guidepost"/>
+  <symbol maxX="496" maxY="533" minX="465" minY="502" name="grocery-m"/>
+  <symbol maxX="527" maxY="533" minX="496" minY="502" name="grinding_mill-m"/>
+  <symbol maxX="558" maxY="533" minX="527" minY="502" name="greengrocer-m"/>
+  <symbol maxX="589" maxY="533" minX="558" minY="502" name="golf-m"/>
+  <symbol maxX="620" maxY="533" minX="589" minY="502" name="gift-m"/>
+  <symbol maxX="651" maxY="533" minX="620" minY="502" name="geyser-m"/>
+  <symbol maxX="682" maxY="533" minX="651" minY="502" name="garden_center-m"/>
+  <symbol maxX="713" maxY="533" minX="682" minY="502" name="garden-outline-m"/>
+  <symbol maxX="744" maxY="533" minX="713" minY="502" name="garden-m"/>
+  <symbol maxX="775" maxY="533" minX="744" minY="502" name="gambling-m"/>
+  <symbol maxX="806" maxY="533" minX="775" minY="502" name="gallery-m"/>
+  <symbol maxX="837" maxY="533" minX="806" minY="502" name="furniture-m"/>
+  <symbol maxX="868" maxY="533" minX="837" minY="502" name="funicular-m"/>
+  <symbol maxX="899" maxY="533" minX="868" minY="502" name="funeral_directors-m"/>
+  <symbol maxX="930" maxY="533" minX="899" minY="502" name="fuel-m"/>
+  <symbol maxX="961" maxY="533" minX="930" minY="502" name="fuel-dispenser-m"/>
+  <symbol maxX="992" maxY="533" minX="961" minY="502" name="fountain-s"/>
+  <symbol maxX="1023" maxY="533" minX="992" minY="502" name="fountain-m"/>
+  <symbol maxX="31" maxY="564" minX="0" minY="533" name="florist-m"/>
+  <symbol maxX="62" maxY="564" minX="31" minY="533" name="fitness_station-m"/>
+  <symbol maxX="93" maxY="564" minX="62" minY="533" name="fitness_centre-m"/>
+  <symbol maxX="124" maxY="564" minX="93" minY="533" name="firehydrant-m"/>
+  <symbol maxX="155" maxY="564" minX="124" minY="533" name="fire_station-m"/>
+  <symbol maxX="186" maxY="564" minX="155" minY="533" name="fastfood-m"/>
+  <symbol maxX="217" maxY="564" minX="186" minY="533" name="factory-m"/>
+  <symbol maxX="248" maxY="564" minX="217" minY="533" name="excrement_bags-m"/>
+  <symbol maxX="279" maxY="564" minX="248" minY="533" name="erotic-m"/>
+  <symbol maxX="310" maxY="564" minX="279" minY="533" name="equestrian-m"/>
+  <symbol maxX="341" maxY="564" minX="310" minY="533" name="emergency-phone-m"/>
+  <symbol maxX="372" maxY="564" minX="341" minY="533" name="embassy-m"/>
+  <symbol maxX="403" maxY="564" minX="372" minY="533" name="electronics-m"/>
+  <symbol maxX="434" maxY="564" minX="403" minY="533" name="electrician-m"/>
+  <symbol maxX="465" maxY="564" minX="434" minY="533" name="dump-station-m"/>
+  <symbol maxX="496" maxY="564" minX="465" minY="533" name="dry_cleaning-m"/>
+  <symbol maxX="527" maxY="564" minX="496" minY="533" name="driving_school-m"/>
+  <symbol maxX="558" maxY="564" minX="527" minY="533" name="drinking-water-m"/>
+  <symbol maxX="589" maxY="564" minX="558" minY="533" name="doityourself-m"/>
+  <symbol maxX="620" maxY="564" minX="589" minY="533" name="dog_park-m"/>
+  <symbol maxX="651" maxY="564" minX="620" minY="533" name="diving-m"/>
+  <symbol maxX="682" maxY="564" minX="651" minY="533" name="department_store-m"/>
+  <symbol maxX="713" maxY="564" minX="682" minY="533" name="dentist-m"/>
+  <symbol maxX="744" maxY="564" minX="713" minY="533" name="defibrillator-m"/>
+  <symbol maxX="775" maxY="564" minX="744" minY="533" name="curling-m"/>
+  <symbol maxX="806" maxY="564" minX="775" minY="533" name="cross-m"/>
+  <symbol maxX="837" maxY="564" minX="806" minY="533" name="cricket-m"/>
+  <symbol maxX="868" maxY="564" minX="837" minY="533" name="craft-m"/>
   <symbol maxX="899" maxY="564" minX="868" minY="533" name="copyshop-m"/>
   <symbol maxX="930" maxY="564" minX="899" minY="533" name="convenience-m"/>
   <symbol maxX="961" maxY="564" minX="930" minY="533" name="computer-m"/>
diff --git a/data/resources-hdpi_light/symbols.png b/data/resources-hdpi_light/symbols.png
index 9160f344fe..41bfad413a 100644
Binary files a/data/resources-hdpi_light/symbols.png and b/data/resources-hdpi_light/symbols.png differ
diff --git a/data/resources-hdpi_light/symbols.sdf b/data/resources-hdpi_light/symbols.sdf
index 7225681195..53ae759f58 100644
--- a/data/resources-hdpi_light/symbols.sdf
+++ b/data/resources-hdpi_light/symbols.sdf
@@ -347,55 +347,55 @@
   <symbol maxX="310" maxY="533" minX="279" minY="502" name="helipad-m"/>
   <symbol maxX="341" maxY="533" minX="310" minY="502" name="handicraft-m"/>
   <symbol maxX="372" maxY="533" minX="341" minY="502" name="handball-m"/>
-  <symbol maxX="403" maxY="533" minX="372" minY="502" name="hand-m"/>
-  <symbol maxX="434" maxY="533" minX="403" minY="502" name="hairdresser-m"/>
-  <symbol maxX="465" maxY="533" minX="434" minY="502" name="hackerspace-m"/>
-  <symbol maxX="496" maxY="533" minX="465" minY="502" name="guidepost"/>
-  <symbol maxX="527" maxY="533" minX="496" minY="502" name="grocery-m"/>
-  <symbol maxX="558" maxY="533" minX="527" minY="502" name="grinding_mill-m"/>
-  <symbol maxX="589" maxY="533" minX="558" minY="502" name="greengrocer-m"/>
-  <symbol maxX="620" maxY="533" minX="589" minY="502" name="golf-m"/>
-  <symbol maxX="651" maxY="533" minX="620" minY="502" name="gift-m"/>
-  <symbol maxX="682" maxY="533" minX="651" minY="502" name="geyser-m"/>
-  <symbol maxX="713" maxY="533" minX="682" minY="502" name="garden_center-m"/>
-  <symbol maxX="744" maxY="533" minX="713" minY="502" name="garden-outline-m"/>
-  <symbol maxX="775" maxY="533" minX="744" minY="502" name="garden-m"/>
-  <symbol maxX="806" maxY="533" minX="775" minY="502" name="gambling-m"/>
-  <symbol maxX="837" maxY="533" minX="806" minY="502" name="gallery-m"/>
-  <symbol maxX="868" maxY="533" minX="837" minY="502" name="furniture-m"/>
-  <symbol maxX="899" maxY="533" minX="868" minY="502" name="funicular-m"/>
-  <symbol maxX="930" maxY="533" minX="899" minY="502" name="funeral_directors-m"/>
-  <symbol maxX="961" maxY="533" minX="930" minY="502" name="fuel-m"/>
-  <symbol maxX="992" maxY="533" minX="961" minY="502" name="fuel-dispenser-m"/>
-  <symbol maxX="1023" maxY="533" minX="992" minY="502" name="fountain-s"/>
-  <symbol maxX="31" maxY="564" minX="0" minY="533" name="fountain-m"/>
-  <symbol maxX="62" maxY="564" minX="31" minY="533" name="florist-m"/>
-  <symbol maxX="93" maxY="564" minX="62" minY="533" name="fitness_station-m"/>
-  <symbol maxX="124" maxY="564" minX="93" minY="533" name="fitness_centre-m"/>
-  <symbol maxX="155" maxY="564" minX="124" minY="533" name="firehydrant-m"/>
-  <symbol maxX="186" maxY="564" minX="155" minY="533" name="fire_station-m"/>
-  <symbol maxX="217" maxY="564" minX="186" minY="533" name="fastfood-m"/>
-  <symbol maxX="248" maxY="564" minX="217" minY="533" name="factory-m"/>
-  <symbol maxX="279" maxY="564" minX="248" minY="533" name="excrement_bags-m"/>
-  <symbol maxX="310" maxY="564" minX="279" minY="533" name="erotic-m"/>
-  <symbol maxX="341" maxY="564" minX="310" minY="533" name="equestrian-m"/>
-  <symbol maxX="372" maxY="564" minX="341" minY="533" name="emergency-phone-m"/>
-  <symbol maxX="403" maxY="564" minX="372" minY="533" name="embassy-m"/>
-  <symbol maxX="434" maxY="564" minX="403" minY="533" name="electronics-m"/>
-  <symbol maxX="465" maxY="564" minX="434" minY="533" name="electrician-m"/>
-  <symbol maxX="496" maxY="564" minX="465" minY="533" name="dump-station-m"/>
-  <symbol maxX="527" maxY="564" minX="496" minY="533" name="dry_cleaning-m"/>
-  <symbol maxX="558" maxY="564" minX="527" minY="533" name="driving_school-m"/>
-  <symbol maxX="589" maxY="564" minX="558" minY="533" name="drinking-water-m"/>
-  <symbol maxX="620" maxY="564" minX="589" minY="533" name="doityourself-m"/>
-  <symbol maxX="651" maxY="564" minX="620" minY="533" name="dog_park-m"/>
-  <symbol maxX="682" maxY="564" minX="651" minY="533" name="diving-m"/>
-  <symbol maxX="713" maxY="564" minX="682" minY="533" name="department_store-m"/>
-  <symbol maxX="744" maxY="564" minX="713" minY="533" name="dentist-m"/>
-  <symbol maxX="775" maxY="564" minX="744" minY="533" name="defibrillator-m"/>
-  <symbol maxX="806" maxY="564" minX="775" minY="533" name="curling-m"/>
-  <symbol maxX="837" maxY="564" minX="806" minY="533" name="cross-m"/>
-  <symbol maxX="868" maxY="564" minX="837" minY="533" name="cricket-m"/>
+  <symbol maxX="403" maxY="533" minX="372" minY="502" name="hairdresser-m"/>
+  <symbol maxX="434" maxY="533" minX="403" minY="502" name="hackerspace-m"/>
+  <symbol maxX="465" maxY="533" minX="434" minY="502" name="guidepost"/>
+  <symbol maxX="496" maxY="533" minX="465" minY="502" name="grocery-m"/>
+  <symbol maxX="527" maxY="533" minX="496" minY="502" name="grinding_mill-m"/>
+  <symbol maxX="558" maxY="533" minX="527" minY="502" name="greengrocer-m"/>
+  <symbol maxX="589" maxY="533" minX="558" minY="502" name="golf-m"/>
+  <symbol maxX="620" maxY="533" minX="589" minY="502" name="gift-m"/>
+  <symbol maxX="651" maxY="533" minX="620" minY="502" name="geyser-m"/>
+  <symbol maxX="682" maxY="533" minX="651" minY="502" name="garden_center-m"/>
+  <symbol maxX="713" maxY="533" minX="682" minY="502" name="garden-outline-m"/>
+  <symbol maxX="744" maxY="533" minX="713" minY="502" name="garden-m"/>
+  <symbol maxX="775" maxY="533" minX="744" minY="502" name="gambling-m"/>
+  <symbol maxX="806" maxY="533" minX="775" minY="502" name="gallery-m"/>
+  <symbol maxX="837" maxY="533" minX="806" minY="502" name="furniture-m"/>
+  <symbol maxX="868" maxY="533" minX="837" minY="502" name="funicular-m"/>
+  <symbol maxX="899" maxY="533" minX="868" minY="502" name="funeral_directors-m"/>
+  <symbol maxX="930" maxY="533" minX="899" minY="502" name="fuel-m"/>
+  <symbol maxX="961" maxY="533" minX="930" minY="502" name="fuel-dispenser-m"/>
+  <symbol maxX="992" maxY="533" minX="961" minY="502" name="fountain-s"/>
+  <symbol maxX="1023" maxY="533" minX="992" minY="502" name="fountain-m"/>
+  <symbol maxX="31" maxY="564" minX="0" minY="533" name="florist-m"/>
+  <symbol maxX="62" maxY="564" minX="31" minY="533" name="fitness_station-m"/>
+  <symbol maxX="93" maxY="564" minX="62" minY="533" name="fitness_centre-m"/>
+  <symbol maxX="124" maxY="564" minX="93" minY="533" name="firehydrant-m"/>
+  <symbol maxX="155" maxY="564" minX="124" minY="533" name="fire_station-m"/>
+  <symbol maxX="186" maxY="564" minX="155" minY="533" name="fastfood-m"/>
+  <symbol maxX="217" maxY="564" minX="186" minY="533" name="factory-m"/>
+  <symbol maxX="248" maxY="564" minX="217" minY="533" name="excrement_bags-m"/>
+  <symbol maxX="279" maxY="564" minX="248" minY="533" name="erotic-m"/>
+  <symbol maxX="310" maxY="564" minX="279" minY="533" name="equestrian-m"/>
+  <symbol maxX="341" maxY="564" minX="310" minY="533" name="emergency-phone-m"/>
+  <symbol maxX="372" maxY="564" minX="341" minY="533" name="embassy-m"/>
+  <symbol maxX="403" maxY="564" minX="372" minY="533" name="electronics-m"/>
+  <symbol maxX="434" maxY="564" minX="403" minY="533" name="electrician-m"/>
+  <symbol maxX="465" maxY="564" minX="434" minY="533" name="dump-station-m"/>
+  <symbol maxX="496" maxY="564" minX="465" minY="533" name="dry_cleaning-m"/>
+  <symbol maxX="527" maxY="564" minX="496" minY="533" name="driving_school-m"/>
+  <symbol maxX="558" maxY="564" minX="527" minY="533" name="drinking-water-m"/>
+  <symbol maxX="589" maxY="564" minX="558" minY="533" name="doityourself-m"/>
+  <symbol maxX="620" maxY="564" minX="589" minY="533" name="dog_park-m"/>
+  <symbol maxX="651" maxY="564" minX="620" minY="533" name="diving-m"/>
+  <symbol maxX="682" maxY="564" minX="651" minY="533" name="department_store-m"/>
+  <symbol maxX="713" maxY="564" minX="682" minY="533" name="dentist-m"/>
+  <symbol maxX="744" maxY="564" minX="713" minY="533" name="defibrillator-m"/>
+  <symbol maxX="775" maxY="564" minX="744" minY="533" name="curling-m"/>
+  <symbol maxX="806" maxY="564" minX="775" minY="533" name="cross-m"/>
+  <symbol maxX="837" maxY="564" minX="806" minY="533" name="cricket-m"/>
+  <symbol maxX="868" maxY="564" minX="837" minY="533" name="craft-m"/>
   <symbol maxX="899" maxY="564" minX="868" minY="533" name="copyshop-m"/>
   <symbol maxX="930" maxY="564" minX="899" minY="533" name="convenience-m"/>
   <symbol maxX="961" maxY="564" minX="930" minY="533" name="computer-m"/>
diff --git a/data/resources-mdpi_dark/symbols.png b/data/resources-mdpi_dark/symbols.png
index 893d7334bb..e084dcd767 100644
Binary files a/data/resources-mdpi_dark/symbols.png and b/data/resources-mdpi_dark/symbols.png differ
diff --git a/data/resources-mdpi_dark/symbols.sdf b/data/resources-mdpi_dark/symbols.sdf
index 4e54d3e33e..060a713c04 100644
--- a/data/resources-mdpi_dark/symbols.sdf
+++ b/data/resources-mdpi_dark/symbols.sdf
@@ -347,55 +347,55 @@
   <symbol maxX="637" maxY="264" minX="615" minY="242" name="helipad-m"/>
   <symbol maxX="659" maxY="264" minX="637" minY="242" name="handicraft-m"/>
   <symbol maxX="681" maxY="264" minX="659" minY="242" name="handball-m"/>
-  <symbol maxX="703" maxY="264" minX="681" minY="242" name="hand-m"/>
-  <symbol maxX="725" maxY="264" minX="703" minY="242" name="hairdresser-m"/>
-  <symbol maxX="747" maxY="264" minX="725" minY="242" name="hackerspace-m"/>
-  <symbol maxX="769" maxY="264" minX="747" minY="242" name="guidepost"/>
-  <symbol maxX="791" maxY="264" minX="769" minY="242" name="grocery-m"/>
-  <symbol maxX="813" maxY="264" minX="791" minY="242" name="grinding_mill-m"/>
-  <symbol maxX="835" maxY="264" minX="813" minY="242" name="greengrocer-m"/>
-  <symbol maxX="857" maxY="264" minX="835" minY="242" name="golf-m"/>
-  <symbol maxX="879" maxY="264" minX="857" minY="242" name="gift-m"/>
-  <symbol maxX="901" maxY="264" minX="879" minY="242" name="geyser-m"/>
-  <symbol maxX="923" maxY="264" minX="901" minY="242" name="garden_center-m"/>
-  <symbol maxX="945" maxY="264" minX="923" minY="242" name="garden-outline-m"/>
-  <symbol maxX="967" maxY="264" minX="945" minY="242" name="garden-m"/>
-  <symbol maxX="989" maxY="264" minX="967" minY="242" name="gambling-m"/>
-  <symbol maxX="1011" maxY="264" minX="989" minY="242" name="gallery-m"/>
-  <symbol maxX="22" maxY="286" minX="0" minY="264" name="furniture-m"/>
-  <symbol maxX="44" maxY="286" minX="22" minY="264" name="funicular-m"/>
-  <symbol maxX="66" maxY="286" minX="44" minY="264" name="funeral_directors-m"/>
-  <symbol maxX="88" maxY="286" minX="66" minY="264" name="fuel-m"/>
-  <symbol maxX="110" maxY="286" minX="88" minY="264" name="fuel-dispenser-m"/>
-  <symbol maxX="132" maxY="286" minX="110" minY="264" name="fountain-s"/>
-  <symbol maxX="154" maxY="286" minX="132" minY="264" name="fountain-m"/>
-  <symbol maxX="176" maxY="286" minX="154" minY="264" name="florist-m"/>
-  <symbol maxX="198" maxY="286" minX="176" minY="264" name="fitness_station-m"/>
-  <symbol maxX="220" maxY="286" minX="198" minY="264" name="fitness_centre-m"/>
-  <symbol maxX="242" maxY="286" minX="220" minY="264" name="firehydrant-m"/>
-  <symbol maxX="264" maxY="286" minX="242" minY="264" name="fire_station-m"/>
-  <symbol maxX="286" maxY="286" minX="264" minY="264" name="fastfood-m"/>
-  <symbol maxX="308" maxY="286" minX="286" minY="264" name="factory-m"/>
-  <symbol maxX="330" maxY="286" minX="308" minY="264" name="excrement_bags-m"/>
-  <symbol maxX="352" maxY="286" minX="330" minY="264" name="erotic-m"/>
-  <symbol maxX="374" maxY="286" minX="352" minY="264" name="equestrian-m"/>
-  <symbol maxX="396" maxY="286" minX="374" minY="264" name="emergency-phone-m"/>
-  <symbol maxX="418" maxY="286" minX="396" minY="264" name="embassy-m"/>
-  <symbol maxX="440" maxY="286" minX="418" minY="264" name="electronics-m"/>
-  <symbol maxX="462" maxY="286" minX="440" minY="264" name="electrician-m"/>
-  <symbol maxX="484" maxY="286" minX="462" minY="264" name="dump-station-m"/>
-  <symbol maxX="506" maxY="286" minX="484" minY="264" name="dry_cleaning-m"/>
-  <symbol maxX="528" maxY="286" minX="506" minY="264" name="driving_school-m"/>
-  <symbol maxX="550" maxY="286" minX="528" minY="264" name="drinking-water-m"/>
-  <symbol maxX="572" maxY="286" minX="550" minY="264" name="doityourself-m"/>
-  <symbol maxX="594" maxY="286" minX="572" minY="264" name="dog_park-m"/>
-  <symbol maxX="616" maxY="286" minX="594" minY="264" name="diving-m"/>
-  <symbol maxX="638" maxY="286" minX="616" minY="264" name="department_store-m"/>
-  <symbol maxX="660" maxY="286" minX="638" minY="264" name="dentist-m"/>
-  <symbol maxX="682" maxY="286" minX="660" minY="264" name="defibrillator-m"/>
-  <symbol maxX="704" maxY="286" minX="682" minY="264" name="curling-m"/>
-  <symbol maxX="726" maxY="286" minX="704" minY="264" name="cross-m"/>
-  <symbol maxX="748" maxY="286" minX="726" minY="264" name="cricket-m"/>
+  <symbol maxX="703" maxY="264" minX="681" minY="242" name="hairdresser-m"/>
+  <symbol maxX="725" maxY="264" minX="703" minY="242" name="hackerspace-m"/>
+  <symbol maxX="747" maxY="264" minX="725" minY="242" name="guidepost"/>
+  <symbol maxX="769" maxY="264" minX="747" minY="242" name="grocery-m"/>
+  <symbol maxX="791" maxY="264" minX="769" minY="242" name="grinding_mill-m"/>
+  <symbol maxX="813" maxY="264" minX="791" minY="242" name="greengrocer-m"/>
+  <symbol maxX="835" maxY="264" minX="813" minY="242" name="golf-m"/>
+  <symbol maxX="857" maxY="264" minX="835" minY="242" name="gift-m"/>
+  <symbol maxX="879" maxY="264" minX="857" minY="242" name="geyser-m"/>
+  <symbol maxX="901" maxY="264" minX="879" minY="242" name="garden_center-m"/>
+  <symbol maxX="923" maxY="264" minX="901" minY="242" name="garden-outline-m"/>
+  <symbol maxX="945" maxY="264" minX="923" minY="242" name="garden-m"/>
+  <symbol maxX="967" maxY="264" minX="945" minY="242" name="gambling-m"/>
+  <symbol maxX="989" maxY="264" minX="967" minY="242" name="gallery-m"/>
+  <symbol maxX="1011" maxY="264" minX="989" minY="242" name="furniture-m"/>
+  <symbol maxX="22" maxY="286" minX="0" minY="264" name="funicular-m"/>
+  <symbol maxX="44" maxY="286" minX="22" minY="264" name="funeral_directors-m"/>
+  <symbol maxX="66" maxY="286" minX="44" minY="264" name="fuel-m"/>
+  <symbol maxX="88" maxY="286" minX="66" minY="264" name="fuel-dispenser-m"/>
+  <symbol maxX="110" maxY="286" minX="88" minY="264" name="fountain-s"/>
+  <symbol maxX="132" maxY="286" minX="110" minY="264" name="fountain-m"/>
+  <symbol maxX="154" maxY="286" minX="132" minY="264" name="florist-m"/>
+  <symbol maxX="176" maxY="286" minX="154" minY="264" name="fitness_station-m"/>
+  <symbol maxX="198" maxY="286" minX="176" minY="264" name="fitness_centre-m"/>
+  <symbol maxX="220" maxY="286" minX="198" minY="264" name="firehydrant-m"/>
+  <symbol maxX="242" maxY="286" minX="220" minY="264" name="fire_station-m"/>
+  <symbol maxX="264" maxY="286" minX="242" minY="264" name="fastfood-m"/>
+  <symbol maxX="286" maxY="286" minX="264" minY="264" name="factory-m"/>
+  <symbol maxX="308" maxY="286" minX="286" minY="264" name="excrement_bags-m"/>
+  <symbol maxX="330" maxY="286" minX="308" minY="264" name="erotic-m"/>
+  <symbol maxX="352" maxY="286" minX="330" minY="264" name="equestrian-m"/>
+  <symbol maxX="374" maxY="286" minX="352" minY="264" name="emergency-phone-m"/>
+  <symbol maxX="396" maxY="286" minX="374" minY="264" name="embassy-m"/>
+  <symbol maxX="418" maxY="286" minX="396" minY="264" name="electronics-m"/>
+  <symbol maxX="440" maxY="286" minX="418" minY="264" name="electrician-m"/>
+  <symbol maxX="462" maxY="286" minX="440" minY="264" name="dump-station-m"/>
+  <symbol maxX="484" maxY="286" minX="462" minY="264" name="dry_cleaning-m"/>
+  <symbol maxX="506" maxY="286" minX="484" minY="264" name="driving_school-m"/>
+  <symbol maxX="528" maxY="286" minX="506" minY="264" name="drinking-water-m"/>
+  <symbol maxX="550" maxY="286" minX="528" minY="264" name="doityourself-m"/>
+  <symbol maxX="572" maxY="286" minX="550" minY="264" name="dog_park-m"/>
+  <symbol maxX="594" maxY="286" minX="572" minY="264" name="diving-m"/>
+  <symbol maxX="616" maxY="286" minX="594" minY="264" name="department_store-m"/>
+  <symbol maxX="638" maxY="286" minX="616" minY="264" name="dentist-m"/>
+  <symbol maxX="660" maxY="286" minX="638" minY="264" name="defibrillator-m"/>
+  <symbol maxX="682" maxY="286" minX="660" minY="264" name="curling-m"/>
+  <symbol maxX="704" maxY="286" minX="682" minY="264" name="cross-m"/>
+  <symbol maxX="726" maxY="286" minX="704" minY="264" name="cricket-m"/>
+  <symbol maxX="748" maxY="286" minX="726" minY="264" name="craft-m"/>
   <symbol maxX="770" maxY="286" minX="748" minY="264" name="copyshop-m"/>
   <symbol maxX="792" maxY="286" minX="770" minY="264" name="convenience-m"/>
   <symbol maxX="814" maxY="286" minX="792" minY="264" name="computer-m"/>
diff --git a/data/resources-mdpi_light/symbols.png b/data/resources-mdpi_light/symbols.png
index 12353b122d..dd9704d162 100644
Binary files a/data/resources-mdpi_light/symbols.png and b/data/resources-mdpi_light/symbols.png differ
diff --git a/data/resources-mdpi_light/symbols.sdf b/data/resources-mdpi_light/symbols.sdf
index 4e54d3e33e..060a713c04 100644
--- a/data/resources-mdpi_light/symbols.sdf
+++ b/data/resources-mdpi_light/symbols.sdf
@@ -347,55 +347,55 @@
   <symbol maxX="637" maxY="264" minX="615" minY="242" name="helipad-m"/>
   <symbol maxX="659" maxY="264" minX="637" minY="242" name="handicraft-m"/>
   <symbol maxX="681" maxY="264" minX="659" minY="242" name="handball-m"/>
-  <symbol maxX="703" maxY="264" minX="681" minY="242" name="hand-m"/>
-  <symbol maxX="725" maxY="264" minX="703" minY="242" name="hairdresser-m"/>
-  <symbol maxX="747" maxY="264" minX="725" minY="242" name="hackerspace-m"/>
-  <symbol maxX="769" maxY="264" minX="747" minY="242" name="guidepost"/>
-  <symbol maxX="791" maxY="264" minX="769" minY="242" name="grocery-m"/>
-  <symbol maxX="813" maxY="264" minX="791" minY="242" name="grinding_mill-m"/>
-  <symbol maxX="835" maxY="264" minX="813" minY="242" name="greengrocer-m"/>
-  <symbol maxX="857" maxY="264" minX="835" minY="242" name="golf-m"/>
-  <symbol maxX="879" maxY="264" minX="857" minY="242" name="gift-m"/>
-  <symbol maxX="901" maxY="264" minX="879" minY="242" name="geyser-m"/>
-  <symbol maxX="923" maxY="264" minX="901" minY="242" name="garden_center-m"/>
-  <symbol maxX="945" maxY="264" minX="923" minY="242" name="garden-outline-m"/>
-  <symbol maxX="967" maxY="264" minX="945" minY="242" name="garden-m"/>
-  <symbol maxX="989" maxY="264" minX="967" minY="242" name="gambling-m"/>
-  <symbol maxX="1011" maxY="264" minX="989" minY="242" name="gallery-m"/>
-  <symbol maxX="22" maxY="286" minX="0" minY="264" name="furniture-m"/>
-  <symbol maxX="44" maxY="286" minX="22" minY="264" name="funicular-m"/>
-  <symbol maxX="66" maxY="286" minX="44" minY="264" name="funeral_directors-m"/>
-  <symbol maxX="88" maxY="286" minX="66" minY="264" name="fuel-m"/>
-  <symbol maxX="110" maxY="286" minX="88" minY="264" name="fuel-dispenser-m"/>
-  <symbol maxX="132" maxY="286" minX="110" minY="264" name="fountain-s"/>
-  <symbol maxX="154" maxY="286" minX="132" minY="264" name="fountain-m"/>
-  <symbol maxX="176" maxY="286" minX="154" minY="264" name="florist-m"/>
-  <symbol maxX="198" maxY="286" minX="176" minY="264" name="fitness_station-m"/>
-  <symbol maxX="220" maxY="286" minX="198" minY="264" name="fitness_centre-m"/>
-  <symbol maxX="242" maxY="286" minX="220" minY="264" name="firehydrant-m"/>
-  <symbol maxX="264" maxY="286" minX="242" minY="264" name="fire_station-m"/>
-  <symbol maxX="286" maxY="286" minX="264" minY="264" name="fastfood-m"/>
-  <symbol maxX="308" maxY="286" minX="286" minY="264" name="factory-m"/>
-  <symbol maxX="330" maxY="286" minX="308" minY="264" name="excrement_bags-m"/>
-  <symbol maxX="352" maxY="286" minX="330" minY="264" name="erotic-m"/>
-  <symbol maxX="374" maxY="286" minX="352" minY="264" name="equestrian-m"/>
-  <symbol maxX="396" maxY="286" minX="374" minY="264" name="emergency-phone-m"/>
-  <symbol maxX="418" maxY="286" minX="396" minY="264" name="embassy-m"/>
-  <symbol maxX="440" maxY="286" minX="418" minY="264" name="electronics-m"/>
-  <symbol maxX="462" maxY="286" minX="440" minY="264" name="electrician-m"/>
-  <symbol maxX="484" maxY="286" minX="462" minY="264" name="dump-station-m"/>
-  <symbol maxX="506" maxY="286" minX="484" minY="264" name="dry_cleaning-m"/>
-  <symbol maxX="528" maxY="286" minX="506" minY="264" name="driving_school-m"/>
-  <symbol maxX="550" maxY="286" minX="528" minY="264" name="drinking-water-m"/>
-  <symbol maxX="572" maxY="286" minX="550" minY="264" name="doityourself-m"/>
-  <symbol maxX="594" maxY="286" minX="572" minY="264" name="dog_park-m"/>
-  <symbol maxX="616" maxY="286" minX="594" minY="264" name="diving-m"/>
-  <symbol maxX="638" maxY="286" minX="616" minY="264" name="department_store-m"/>
-  <symbol maxX="660" maxY="286" minX="638" minY="264" name="dentist-m"/>
-  <symbol maxX="682" maxY="286" minX="660" minY="264" name="defibrillator-m"/>
-  <symbol maxX="704" maxY="286" minX="682" minY="264" name="curling-m"/>
-  <symbol maxX="726" maxY="286" minX="704" minY="264" name="cross-m"/>
-  <symbol maxX="748" maxY="286" minX="726" minY="264" name="cricket-m"/>
+  <symbol maxX="703" maxY="264" minX="681" minY="242" name="hairdresser-m"/>
+  <symbol maxX="725" maxY="264" minX="703" minY="242" name="hackerspace-m"/>
+  <symbol maxX="747" maxY="264" minX="725" minY="242" name="guidepost"/>
+  <symbol maxX="769" maxY="264" minX="747" minY="242" name="grocery-m"/>
+  <symbol maxX="791" maxY="264" minX="769" minY="242" name="grinding_mill-m"/>
+  <symbol maxX="813" maxY="264" minX="791" minY="242" name="greengrocer-m"/>
+  <symbol maxX="835" maxY="264" minX="813" minY="242" name="golf-m"/>
+  <symbol maxX="857" maxY="264" minX="835" minY="242" name="gift-m"/>
+  <symbol maxX="879" maxY="264" minX="857" minY="242" name="geyser-m"/>
+  <symbol maxX="901" maxY="264" minX="879" minY="242" name="garden_center-m"/>
+  <symbol maxX="923" maxY="264" minX="901" minY="242" name="garden-outline-m"/>
+  <symbol maxX="945" maxY="264" minX="923" minY="242" name="garden-m"/>
+  <symbol maxX="967" maxY="264" minX="945" minY="242" name="gambling-m"/>
+  <symbol maxX="989" maxY="264" minX="967" minY="242" name="gallery-m"/>
+  <symbol maxX="1011" maxY="264" minX="989" minY="242" name="furniture-m"/>
+  <symbol maxX="22" maxY="286" minX="0" minY="264" name="funicular-m"/>
+  <symbol maxX="44" maxY="286" minX="22" minY="264" name="funeral_directors-m"/>
+  <symbol maxX="66" maxY="286" minX="44" minY="264" name="fuel-m"/>
+  <symbol maxX="88" maxY="286" minX="66" minY="264" name="fuel-dispenser-m"/>
+  <symbol maxX="110" maxY="286" minX="88" minY="264" name="fountain-s"/>
+  <symbol maxX="132" maxY="286" minX="110" minY="264" name="fountain-m"/>
+  <symbol maxX="154" maxY="286" minX="132" minY="264" name="florist-m"/>
+  <symbol maxX="176" maxY="286" minX="154" minY="264" name="fitness_station-m"/>
+  <symbol maxX="198" maxY="286" minX="176" minY="264" name="fitness_centre-m"/>
+  <symbol maxX="220" maxY="286" minX="198" minY="264" name="firehydrant-m"/>
+  <symbol maxX="242" maxY="286" minX="220" minY="264" name="fire_station-m"/>
+  <symbol maxX="264" maxY="286" minX="242" minY="264" name="fastfood-m"/>
+  <symbol maxX="286" maxY="286" minX="264" minY="264" name="factory-m"/>
+  <symbol maxX="308" maxY="286" minX="286" minY="264" name="excrement_bags-m"/>
+  <symbol maxX="330" maxY="286" minX="308" minY="264" name="erotic-m"/>
+  <symbol maxX="352" maxY="286" minX="330" minY="264" name="equestrian-m"/>
+  <symbol maxX="374" maxY="286" minX="352" minY="264" name="emergency-phone-m"/>
+  <symbol maxX="396" maxY="286" minX="374" minY="264" name="embassy-m"/>
+  <symbol maxX="418" maxY="286" minX="396" minY="264" name="electronics-m"/>
+  <symbol maxX="440" maxY="286" minX="418" minY="264" name="electrician-m"/>
+  <symbol maxX="462" maxY="286" minX="440" minY="264" name="dump-station-m"/>
+  <symbol maxX="484" maxY="286" minX="462" minY="264" name="dry_cleaning-m"/>
+  <symbol maxX="506" maxY="286" minX="484" minY="264" name="driving_school-m"/>
+  <symbol maxX="528" maxY="286" minX="506" minY="264" name="drinking-water-m"/>
+  <symbol maxX="550" maxY="286" minX="528" minY="264" name="doityourself-m"/>
+  <symbol maxX="572" maxY="286" minX="550" minY="264" name="dog_park-m"/>
+  <symbol maxX="594" maxY="286" minX="572" minY="264" name="diving-m"/>
+  <symbol maxX="616" maxY="286" minX="594" minY="264" name="department_store-m"/>
+  <symbol maxX="638" maxY="286" minX="616" minY="264" name="dentist-m"/>
+  <symbol maxX="660" maxY="286" minX="638" minY="264" name="defibrillator-m"/>
+  <symbol maxX="682" maxY="286" minX="660" minY="264" name="curling-m"/>
+  <symbol maxX="704" maxY="286" minX="682" minY="264" name="cross-m"/>
+  <symbol maxX="726" maxY="286" minX="704" minY="264" name="cricket-m"/>
+  <symbol maxX="748" maxY="286" minX="726" minY="264" name="craft-m"/>
   <symbol maxX="770" maxY="286" minX="748" minY="264" name="copyshop-m"/>
   <symbol maxX="792" maxY="286" minX="770" minY="264" name="convenience-m"/>
   <symbol maxX="814" maxY="286" minX="792" minY="264" name="computer-m"/>
diff --git a/data/resources-xhdpi_dark/symbols.png b/data/resources-xhdpi_dark/symbols.png
index 85cf86373a..bc01ac1caf 100644
Binary files a/data/resources-xhdpi_dark/symbols.png and b/data/resources-xhdpi_dark/symbols.png differ
diff --git a/data/resources-xhdpi_dark/symbols.sdf b/data/resources-xhdpi_dark/symbols.sdf
index e677f22717..ab298902ae 100644
--- a/data/resources-xhdpi_dark/symbols.sdf
+++ b/data/resources-xhdpi_dark/symbols.sdf
@@ -347,55 +347,55 @@
   <symbol maxX="1998" maxY="453" minX="1958" minY="413" name="helipad-m"/>
   <symbol maxX="2038" maxY="453" minX="1998" minY="413" name="handicraft-m"/>
   <symbol maxX="40" maxY="493" minX="0" minY="453" name="handball-m"/>
-  <symbol maxX="80" maxY="493" minX="40" minY="453" name="hand-m"/>
-  <symbol maxX="120" maxY="493" minX="80" minY="453" name="hairdresser-m"/>
-  <symbol maxX="160" maxY="493" minX="120" minY="453" name="hackerspace-m"/>
-  <symbol maxX="200" maxY="493" minX="160" minY="453" name="guidepost"/>
-  <symbol maxX="240" maxY="493" minX="200" minY="453" name="grocery-m"/>
-  <symbol maxX="280" maxY="493" minX="240" minY="453" name="grinding_mill-m"/>
-  <symbol maxX="320" maxY="493" minX="280" minY="453" name="greengrocer-m"/>
-  <symbol maxX="360" maxY="493" minX="320" minY="453" name="golf-m"/>
-  <symbol maxX="400" maxY="493" minX="360" minY="453" name="gift-m"/>
-  <symbol maxX="440" maxY="493" minX="400" minY="453" name="geyser-m"/>
-  <symbol maxX="480" maxY="493" minX="440" minY="453" name="garden_center-m"/>
-  <symbol maxX="520" maxY="493" minX="480" minY="453" name="garden-outline-m"/>
-  <symbol maxX="560" maxY="493" minX="520" minY="453" name="garden-m"/>
-  <symbol maxX="600" maxY="493" minX="560" minY="453" name="gambling-m"/>
-  <symbol maxX="640" maxY="493" minX="600" minY="453" name="gallery-m"/>
-  <symbol maxX="680" maxY="493" minX="640" minY="453" name="furniture-m"/>
-  <symbol maxX="720" maxY="493" minX="680" minY="453" name="funicular-m"/>
-  <symbol maxX="760" maxY="493" minX="720" minY="453" name="funeral_directors-m"/>
-  <symbol maxX="800" maxY="493" minX="760" minY="453" name="fuel-m"/>
-  <symbol maxX="840" maxY="493" minX="800" minY="453" name="fuel-dispenser-m"/>
-  <symbol maxX="880" maxY="493" minX="840" minY="453" name="fountain-s"/>
-  <symbol maxX="920" maxY="493" minX="880" minY="453" name="fountain-m"/>
-  <symbol maxX="960" maxY="493" minX="920" minY="453" name="florist-m"/>
-  <symbol maxX="1000" maxY="493" minX="960" minY="453" name="fitness_station-m"/>
-  <symbol maxX="1040" maxY="493" minX="1000" minY="453" name="fitness_centre-m"/>
-  <symbol maxX="1080" maxY="493" minX="1040" minY="453" name="firehydrant-m"/>
-  <symbol maxX="1120" maxY="493" minX="1080" minY="453" name="fire_station-m"/>
-  <symbol maxX="1160" maxY="493" minX="1120" minY="453" name="fastfood-m"/>
-  <symbol maxX="1200" maxY="493" minX="1160" minY="453" name="factory-m"/>
-  <symbol maxX="1240" maxY="493" minX="1200" minY="453" name="excrement_bags-m"/>
-  <symbol maxX="1280" maxY="493" minX="1240" minY="453" name="erotic-m"/>
-  <symbol maxX="1320" maxY="493" minX="1280" minY="453" name="equestrian-m"/>
-  <symbol maxX="1360" maxY="493" minX="1320" minY="453" name="emergency-phone-m"/>
-  <symbol maxX="1400" maxY="493" minX="1360" minY="453" name="embassy-m"/>
-  <symbol maxX="1440" maxY="493" minX="1400" minY="453" name="electronics-m"/>
-  <symbol maxX="1480" maxY="493" minX="1440" minY="453" name="electrician-m"/>
-  <symbol maxX="1520" maxY="493" minX="1480" minY="453" name="dump-station-m"/>
-  <symbol maxX="1560" maxY="493" minX="1520" minY="453" name="dry_cleaning-m"/>
-  <symbol maxX="1600" maxY="493" minX="1560" minY="453" name="driving_school-m"/>
-  <symbol maxX="1640" maxY="493" minX="1600" minY="453" name="drinking-water-m"/>
-  <symbol maxX="1680" maxY="493" minX="1640" minY="453" name="doityourself-m"/>
-  <symbol maxX="1720" maxY="493" minX="1680" minY="453" name="dog_park-m"/>
-  <symbol maxX="1760" maxY="493" minX="1720" minY="453" name="diving-m"/>
-  <symbol maxX="1800" maxY="493" minX="1760" minY="453" name="department_store-m"/>
-  <symbol maxX="1840" maxY="493" minX="1800" minY="453" name="dentist-m"/>
-  <symbol maxX="1880" maxY="493" minX="1840" minY="453" name="defibrillator-m"/>
-  <symbol maxX="1920" maxY="493" minX="1880" minY="453" name="curling-m"/>
-  <symbol maxX="1960" maxY="493" minX="1920" minY="453" name="cross-m"/>
-  <symbol maxX="2000" maxY="493" minX="1960" minY="453" name="cricket-m"/>
+  <symbol maxX="80" maxY="493" minX="40" minY="453" name="hairdresser-m"/>
+  <symbol maxX="120" maxY="493" minX="80" minY="453" name="hackerspace-m"/>
+  <symbol maxX="160" maxY="493" minX="120" minY="453" name="guidepost"/>
+  <symbol maxX="200" maxY="493" minX="160" minY="453" name="grocery-m"/>
+  <symbol maxX="240" maxY="493" minX="200" minY="453" name="grinding_mill-m"/>
+  <symbol maxX="280" maxY="493" minX="240" minY="453" name="greengrocer-m"/>
+  <symbol maxX="320" maxY="493" minX="280" minY="453" name="golf-m"/>
+  <symbol maxX="360" maxY="493" minX="320" minY="453" name="gift-m"/>
+  <symbol maxX="400" maxY="493" minX="360" minY="453" name="geyser-m"/>
+  <symbol maxX="440" maxY="493" minX="400" minY="453" name="garden_center-m"/>
+  <symbol maxX="480" maxY="493" minX="440" minY="453" name="garden-outline-m"/>
+  <symbol maxX="520" maxY="493" minX="480" minY="453" name="garden-m"/>
+  <symbol maxX="560" maxY="493" minX="520" minY="453" name="gambling-m"/>
+  <symbol maxX="600" maxY="493" minX="560" minY="453" name="gallery-m"/>
+  <symbol maxX="640" maxY="493" minX="600" minY="453" name="furniture-m"/>
+  <symbol maxX="680" maxY="493" minX="640" minY="453" name="funicular-m"/>
+  <symbol maxX="720" maxY="493" minX="680" minY="453" name="funeral_directors-m"/>
+  <symbol maxX="760" maxY="493" minX="720" minY="453" name="fuel-m"/>
+  <symbol maxX="800" maxY="493" minX="760" minY="453" name="fuel-dispenser-m"/>
+  <symbol maxX="840" maxY="493" minX="800" minY="453" name="fountain-s"/>
+  <symbol maxX="880" maxY="493" minX="840" minY="453" name="fountain-m"/>
+  <symbol maxX="920" maxY="493" minX="880" minY="453" name="florist-m"/>
+  <symbol maxX="960" maxY="493" minX="920" minY="453" name="fitness_station-m"/>
+  <symbol maxX="1000" maxY="493" minX="960" minY="453" name="fitness_centre-m"/>
+  <symbol maxX="1040" maxY="493" minX="1000" minY="453" name="firehydrant-m"/>
+  <symbol maxX="1080" maxY="493" minX="1040" minY="453" name="fire_station-m"/>
+  <symbol maxX="1120" maxY="493" minX="1080" minY="453" name="fastfood-m"/>
+  <symbol maxX="1160" maxY="493" minX="1120" minY="453" name="factory-m"/>
+  <symbol maxX="1200" maxY="493" minX="1160" minY="453" name="excrement_bags-m"/>
+  <symbol maxX="1240" maxY="493" minX="1200" minY="453" name="erotic-m"/>
+  <symbol maxX="1280" maxY="493" minX="1240" minY="453" name="equestrian-m"/>
+  <symbol maxX="1320" maxY="493" minX="1280" minY="453" name="emergency-phone-m"/>
+  <symbol maxX="1360" maxY="493" minX="1320" minY="453" name="embassy-m"/>
+  <symbol maxX="1400" maxY="493" minX="1360" minY="453" name="electronics-m"/>
+  <symbol maxX="1440" maxY="493" minX="1400" minY="453" name="electrician-m"/>
+  <symbol maxX="1480" maxY="493" minX="1440" minY="453" name="dump-station-m"/>
+  <symbol maxX="1520" maxY="493" minX="1480" minY="453" name="dry_cleaning-m"/>
+  <symbol maxX="1560" maxY="493" minX="1520" minY="453" name="driving_school-m"/>
+  <symbol maxX="1600" maxY="493" minX="1560" minY="453" name="drinking-water-m"/>
+  <symbol maxX="1640" maxY="493" minX="1600" minY="453" name="doityourself-m"/>
+  <symbol maxX="1680" maxY="493" minX="1640" minY="453" name="dog_park-m"/>
+  <symbol maxX="1720" maxY="493" minX="1680" minY="453" name="diving-m"/>
+  <symbol maxX="1760" maxY="493" minX="1720" minY="453" name="department_store-m"/>
+  <symbol maxX="1800" maxY="493" minX="1760" minY="453" name="dentist-m"/>
+  <symbol maxX="1840" maxY="493" minX="1800" minY="453" name="defibrillator-m"/>
+  <symbol maxX="1880" maxY="493" minX="1840" minY="453" name="curling-m"/>
+  <symbol maxX="1920" maxY="493" minX="1880" minY="453" name="cross-m"/>
+  <symbol maxX="1960" maxY="493" minX="1920" minY="453" name="cricket-m"/>
+  <symbol maxX="2000" maxY="493" minX="1960" minY="453" name="craft-m"/>
   <symbol maxX="2040" maxY="493" minX="2000" minY="453" name="copyshop-m"/>
   <symbol maxX="40" maxY="533" minX="0" minY="493" name="convenience-m"/>
   <symbol maxX="80" maxY="533" minX="40" minY="493" name="computer-m"/>
diff --git a/data/resources-xhdpi_light/symbols.png b/data/resources-xhdpi_light/symbols.png
index 220878e212..e0160437f3 100644
Binary files a/data/resources-xhdpi_light/symbols.png and b/data/resources-xhdpi_light/symbols.png differ
diff --git a/data/resources-xhdpi_light/symbols.sdf b/data/resources-xhdpi_light/symbols.sdf
index e677f22717..ab298902ae 100644
--- a/data/resources-xhdpi_light/symbols.sdf
+++ b/data/resources-xhdpi_light/symbols.sdf
@@ -347,55 +347,55 @@
   <symbol maxX="1998" maxY="453" minX="1958" minY="413" name="helipad-m"/>
   <symbol maxX="2038" maxY="453" minX="1998" minY="413" name="handicraft-m"/>
   <symbol maxX="40" maxY="493" minX="0" minY="453" name="handball-m"/>
-  <symbol maxX="80" maxY="493" minX="40" minY="453" name="hand-m"/>
-  <symbol maxX="120" maxY="493" minX="80" minY="453" name="hairdresser-m"/>
-  <symbol maxX="160" maxY="493" minX="120" minY="453" name="hackerspace-m"/>
-  <symbol maxX="200" maxY="493" minX="160" minY="453" name="guidepost"/>
-  <symbol maxX="240" maxY="493" minX="200" minY="453" name="grocery-m"/>
-  <symbol maxX="280" maxY="493" minX="240" minY="453" name="grinding_mill-m"/>
-  <symbol maxX="320" maxY="493" minX="280" minY="453" name="greengrocer-m"/>
-  <symbol maxX="360" maxY="493" minX="320" minY="453" name="golf-m"/>
-  <symbol maxX="400" maxY="493" minX="360" minY="453" name="gift-m"/>
-  <symbol maxX="440" maxY="493" minX="400" minY="453" name="geyser-m"/>
-  <symbol maxX="480" maxY="493" minX="440" minY="453" name="garden_center-m"/>
-  <symbol maxX="520" maxY="493" minX="480" minY="453" name="garden-outline-m"/>
-  <symbol maxX="560" maxY="493" minX="520" minY="453" name="garden-m"/>
-  <symbol maxX="600" maxY="493" minX="560" minY="453" name="gambling-m"/>
-  <symbol maxX="640" maxY="493" minX="600" minY="453" name="gallery-m"/>
-  <symbol maxX="680" maxY="493" minX="640" minY="453" name="furniture-m"/>
-  <symbol maxX="720" maxY="493" minX="680" minY="453" name="funicular-m"/>
-  <symbol maxX="760" maxY="493" minX="720" minY="453" name="funeral_directors-m"/>
-  <symbol maxX="800" maxY="493" minX="760" minY="453" name="fuel-m"/>
-  <symbol maxX="840" maxY="493" minX="800" minY="453" name="fuel-dispenser-m"/>
-  <symbol maxX="880" maxY="493" minX="840" minY="453" name="fountain-s"/>
-  <symbol maxX="920" maxY="493" minX="880" minY="453" name="fountain-m"/>
-  <symbol maxX="960" maxY="493" minX="920" minY="453" name="florist-m"/>
-  <symbol maxX="1000" maxY="493" minX="960" minY="453" name="fitness_station-m"/>
-  <symbol maxX="1040" maxY="493" minX="1000" minY="453" name="fitness_centre-m"/>
-  <symbol maxX="1080" maxY="493" minX="1040" minY="453" name="firehydrant-m"/>
-  <symbol maxX="1120" maxY="493" minX="1080" minY="453" name="fire_station-m"/>
-  <symbol maxX="1160" maxY="493" minX="1120" minY="453" name="fastfood-m"/>
-  <symbol maxX="1200" maxY="493" minX="1160" minY="453" name="factory-m"/>
-  <symbol maxX="1240" maxY="493" minX="1200" minY="453" name="excrement_bags-m"/>
-  <symbol maxX="1280" maxY="493" minX="1240" minY="453" name="erotic-m"/>
-  <symbol maxX="1320" maxY="493" minX="1280" minY="453" name="equestrian-m"/>
-  <symbol maxX="1360" maxY="493" minX="1320" minY="453" name="emergency-phone-m"/>
-  <symbol maxX="1400" maxY="493" minX="1360" minY="453" name="embassy-m"/>
-  <symbol maxX="1440" maxY="493" minX="1400" minY="453" name="electronics-m"/>
-  <symbol maxX="1480" maxY="493" minX="1440" minY="453" name="electrician-m"/>
-  <symbol maxX="1520" maxY="493" minX="1480" minY="453" name="dump-station-m"/>
-  <symbol maxX="1560" maxY="493" minX="1520" minY="453" name="dry_cleaning-m"/>
-  <symbol maxX="1600" maxY="493" minX="1560" minY="453" name="driving_school-m"/>
-  <symbol maxX="1640" maxY="493" minX="1600" minY="453" name="drinking-water-m"/>
-  <symbol maxX="1680" maxY="493" minX="1640" minY="453" name="doityourself-m"/>
-  <symbol maxX="1720" maxY="493" minX="1680" minY="453" name="dog_park-m"/>
-  <symbol maxX="1760" maxY="493" minX="1720" minY="453" name="diving-m"/>
-  <symbol maxX="1800" maxY="493" minX="1760" minY="453" name="department_store-m"/>
-  <symbol maxX="1840" maxY="493" minX="1800" minY="453" name="dentist-m"/>
-  <symbol maxX="1880" maxY="493" minX="1840" minY="453" name="defibrillator-m"/>
-  <symbol maxX="1920" maxY="493" minX="1880" minY="453" name="curling-m"/>
-  <symbol maxX="1960" maxY="493" minX="1920" minY="453" name="cross-m"/>
-  <symbol maxX="2000" maxY="493" minX="1960" minY="453" name="cricket-m"/>
+  <symbol maxX="80" maxY="493" minX="40" minY="453" name="hairdresser-m"/>
+  <symbol maxX="120" maxY="493" minX="80" minY="453" name="hackerspace-m"/>
+  <symbol maxX="160" maxY="493" minX="120" minY="453" name="guidepost"/>
+  <symbol maxX="200" maxY="493" minX="160" minY="453" name="grocery-m"/>
+  <symbol maxX="240" maxY="493" minX="200" minY="453" name="grinding_mill-m"/>
+  <symbol maxX="280" maxY="493" minX="240" minY="453" name="greengrocer-m"/>
+  <symbol maxX="320" maxY="493" minX="280" minY="453" name="golf-m"/>
+  <symbol maxX="360" maxY="493" minX="320" minY="453" name="gift-m"/>
+  <symbol maxX="400" maxY="493" minX="360" minY="453" name="geyser-m"/>
+  <symbol maxX="440" maxY="493" minX="400" minY="453" name="garden_center-m"/>
+  <symbol maxX="480" maxY="493" minX="440" minY="453" name="garden-outline-m"/>
+  <symbol maxX="520" maxY="493" minX="480" minY="453" name="garden-m"/>
+  <symbol maxX="560" maxY="493" minX="520" minY="453" name="gambling-m"/>
+  <symbol maxX="600" maxY="493" minX="560" minY="453" name="gallery-m"/>
+  <symbol maxX="640" maxY="493" minX="600" minY="453" name="furniture-m"/>
+  <symbol maxX="680" maxY="493" minX="640" minY="453" name="funicular-m"/>
+  <symbol maxX="720" maxY="493" minX="680" minY="453" name="funeral_directors-m"/>
+  <symbol maxX="760" maxY="493" minX="720" minY="453" name="fuel-m"/>
+  <symbol maxX="800" maxY="493" minX="760" minY="453" name="fuel-dispenser-m"/>
+  <symbol maxX="840" maxY="493" minX="800" minY="453" name="fountain-s"/>
+  <symbol maxX="880" maxY="493" minX="840" minY="453" name="fountain-m"/>
+  <symbol maxX="920" maxY="493" minX="880" minY="453" name="florist-m"/>
+  <symbol maxX="960" maxY="493" minX="920" minY="453" name="fitness_station-m"/>
+  <symbol maxX="1000" maxY="493" minX="960" minY="453" name="fitness_centre-m"/>
+  <symbol maxX="1040" maxY="493" minX="1000" minY="453" name="firehydrant-m"/>
+  <symbol maxX="1080" maxY="493" minX="1040" minY="453" name="fire_station-m"/>
+  <symbol maxX="1120" maxY="493" minX="1080" minY="453" name="fastfood-m"/>
+  <symbol maxX="1160" maxY="493" minX="1120" minY="453" name="factory-m"/>
+  <symbol maxX="1200" maxY="493" minX="1160" minY="453" name="excrement_bags-m"/>
+  <symbol maxX="1240" maxY="493" minX="1200" minY="453" name="erotic-m"/>
+  <symbol maxX="1280" maxY="493" minX="1240" minY="453" name="equestrian-m"/>
+  <symbol maxX="1320" maxY="493" minX="1280" minY="453" name="emergency-phone-m"/>
+  <symbol maxX="1360" maxY="493" minX="1320" minY="453" name="embassy-m"/>
+  <symbol maxX="1400" maxY="493" minX="1360" minY="453" name="electronics-m"/>
+  <symbol maxX="1440" maxY="493" minX="1400" minY="453" name="electrician-m"/>
+  <symbol maxX="1480" maxY="493" minX="1440" minY="453" name="dump-station-m"/>
+  <symbol maxX="1520" maxY="493" minX="1480" minY="453" name="dry_cleaning-m"/>
+  <symbol maxX="1560" maxY="493" minX="1520" minY="453" name="driving_school-m"/>
+  <symbol maxX="1600" maxY="493" minX="1560" minY="453" name="drinking-water-m"/>
+  <symbol maxX="1640" maxY="493" minX="1600" minY="453" name="doityourself-m"/>
+  <symbol maxX="1680" maxY="493" minX="1640" minY="453" name="dog_park-m"/>
+  <symbol maxX="1720" maxY="493" minX="1680" minY="453" name="diving-m"/>
+  <symbol maxX="1760" maxY="493" minX="1720" minY="453" name="department_store-m"/>
+  <symbol maxX="1800" maxY="493" minX="1760" minY="453" name="dentist-m"/>
+  <symbol maxX="1840" maxY="493" minX="1800" minY="453" name="defibrillator-m"/>
+  <symbol maxX="1880" maxY="493" minX="1840" minY="453" name="curling-m"/>
+  <symbol maxX="1920" maxY="493" minX="1880" minY="453" name="cross-m"/>
+  <symbol maxX="1960" maxY="493" minX="1920" minY="453" name="cricket-m"/>
+  <symbol maxX="2000" maxY="493" minX="1960" minY="453" name="craft-m"/>
   <symbol maxX="2040" maxY="493" minX="2000" minY="453" name="copyshop-m"/>
   <symbol maxX="40" maxY="533" minX="0" minY="493" name="convenience-m"/>
   <symbol maxX="80" maxY="533" minX="40" minY="493" name="computer-m"/>
diff --git a/data/resources-xxhdpi_dark/symbols.png b/data/resources-xxhdpi_dark/symbols.png
index 77afee1803..a68f27a2d6 100644
Binary files a/data/resources-xxhdpi_dark/symbols.png and b/data/resources-xxhdpi_dark/symbols.png differ
diff --git a/data/resources-xxhdpi_dark/symbols.sdf b/data/resources-xxhdpi_dark/symbols.sdf
index a5dfd3e6a8..6b75082d94 100644
--- a/data/resources-xxhdpi_dark/symbols.sdf
+++ b/data/resources-xxhdpi_dark/symbols.sdf
@@ -347,55 +347,55 @@
   <symbol maxX="1218" maxY="949" minX="1160" minY="891" name="helipad-m"/>
   <symbol maxX="1276" maxY="949" minX="1218" minY="891" name="handicraft-m"/>
   <symbol maxX="1334" maxY="949" minX="1276" minY="891" name="handball-m"/>
-  <symbol maxX="1392" maxY="949" minX="1334" minY="891" name="hand-m"/>
-  <symbol maxX="1450" maxY="949" minX="1392" minY="891" name="hairdresser-m"/>
-  <symbol maxX="1508" maxY="949" minX="1450" minY="891" name="hackerspace-m"/>
-  <symbol maxX="1566" maxY="949" minX="1508" minY="891" name="guidepost"/>
-  <symbol maxX="1624" maxY="949" minX="1566" minY="891" name="grocery-m"/>
-  <symbol maxX="1682" maxY="949" minX="1624" minY="891" name="grinding_mill-m"/>
-  <symbol maxX="1740" maxY="949" minX="1682" minY="891" name="greengrocer-m"/>
-  <symbol maxX="1798" maxY="949" minX="1740" minY="891" name="golf-m"/>
-  <symbol maxX="1856" maxY="949" minX="1798" minY="891" name="gift-m"/>
-  <symbol maxX="1914" maxY="949" minX="1856" minY="891" name="geyser-m"/>
-  <symbol maxX="1972" maxY="949" minX="1914" minY="891" name="garden_center-m"/>
-  <symbol maxX="2030" maxY="949" minX="1972" minY="891" name="garden-outline-m"/>
-  <symbol maxX="58" maxY="1007" minX="0" minY="949" name="garden-m"/>
-  <symbol maxX="116" maxY="1007" minX="58" minY="949" name="gambling-m"/>
-  <symbol maxX="174" maxY="1007" minX="116" minY="949" name="gallery-m"/>
-  <symbol maxX="232" maxY="1007" minX="174" minY="949" name="furniture-m"/>
-  <symbol maxX="290" maxY="1007" minX="232" minY="949" name="funicular-m"/>
-  <symbol maxX="348" maxY="1007" minX="290" minY="949" name="funeral_directors-m"/>
-  <symbol maxX="406" maxY="1007" minX="348" minY="949" name="fuel-m"/>
-  <symbol maxX="464" maxY="1007" minX="406" minY="949" name="fuel-dispenser-m"/>
-  <symbol maxX="522" maxY="1007" minX="464" minY="949" name="fountain-s"/>
-  <symbol maxX="580" maxY="1007" minX="522" minY="949" name="fountain-m"/>
-  <symbol maxX="638" maxY="1007" minX="580" minY="949" name="florist-m"/>
-  <symbol maxX="696" maxY="1007" minX="638" minY="949" name="fitness_station-m"/>
-  <symbol maxX="754" maxY="1007" minX="696" minY="949" name="fitness_centre-m"/>
-  <symbol maxX="812" maxY="1007" minX="754" minY="949" name="firehydrant-m"/>
-  <symbol maxX="870" maxY="1007" minX="812" minY="949" name="fire_station-m"/>
-  <symbol maxX="928" maxY="1007" minX="870" minY="949" name="fastfood-m"/>
-  <symbol maxX="986" maxY="1007" minX="928" minY="949" name="factory-m"/>
-  <symbol maxX="1044" maxY="1007" minX="986" minY="949" name="excrement_bags-m"/>
-  <symbol maxX="1102" maxY="1007" minX="1044" minY="949" name="erotic-m"/>
-  <symbol maxX="1160" maxY="1007" minX="1102" minY="949" name="equestrian-m"/>
-  <symbol maxX="1218" maxY="1007" minX="1160" minY="949" name="emergency-phone-m"/>
-  <symbol maxX="1276" maxY="1007" minX="1218" minY="949" name="embassy-m"/>
-  <symbol maxX="1334" maxY="1007" minX="1276" minY="949" name="electronics-m"/>
-  <symbol maxX="1392" maxY="1007" minX="1334" minY="949" name="electrician-m"/>
-  <symbol maxX="1450" maxY="1007" minX="1392" minY="949" name="dump-station-m"/>
-  <symbol maxX="1508" maxY="1007" minX="1450" minY="949" name="dry_cleaning-m"/>
-  <symbol maxX="1566" maxY="1007" minX="1508" minY="949" name="driving_school-m"/>
-  <symbol maxX="1624" maxY="1007" minX="1566" minY="949" name="drinking-water-m"/>
-  <symbol maxX="1682" maxY="1007" minX="1624" minY="949" name="doityourself-m"/>
-  <symbol maxX="1740" maxY="1007" minX="1682" minY="949" name="dog_park-m"/>
-  <symbol maxX="1798" maxY="1007" minX="1740" minY="949" name="diving-m"/>
-  <symbol maxX="1856" maxY="1007" minX="1798" minY="949" name="department_store-m"/>
-  <symbol maxX="1914" maxY="1007" minX="1856" minY="949" name="dentist-m"/>
-  <symbol maxX="1972" maxY="1007" minX="1914" minY="949" name="defibrillator-m"/>
-  <symbol maxX="2030" maxY="1007" minX="1972" minY="949" name="curling-m"/>
-  <symbol maxX="58" maxY="1065" minX="0" minY="1007" name="cross-m"/>
-  <symbol maxX="116" maxY="1065" minX="58" minY="1007" name="cricket-m"/>
+  <symbol maxX="1392" maxY="949" minX="1334" minY="891" name="hairdresser-m"/>
+  <symbol maxX="1450" maxY="949" minX="1392" minY="891" name="hackerspace-m"/>
+  <symbol maxX="1508" maxY="949" minX="1450" minY="891" name="guidepost"/>
+  <symbol maxX="1566" maxY="949" minX="1508" minY="891" name="grocery-m"/>
+  <symbol maxX="1624" maxY="949" minX="1566" minY="891" name="grinding_mill-m"/>
+  <symbol maxX="1682" maxY="949" minX="1624" minY="891" name="greengrocer-m"/>
+  <symbol maxX="1740" maxY="949" minX="1682" minY="891" name="golf-m"/>
+  <symbol maxX="1798" maxY="949" minX="1740" minY="891" name="gift-m"/>
+  <symbol maxX="1856" maxY="949" minX="1798" minY="891" name="geyser-m"/>
+  <symbol maxX="1914" maxY="949" minX="1856" minY="891" name="garden_center-m"/>
+  <symbol maxX="1972" maxY="949" minX="1914" minY="891" name="garden-outline-m"/>
+  <symbol maxX="2030" maxY="949" minX="1972" minY="891" name="garden-m"/>
+  <symbol maxX="58" maxY="1007" minX="0" minY="949" name="gambling-m"/>
+  <symbol maxX="116" maxY="1007" minX="58" minY="949" name="gallery-m"/>
+  <symbol maxX="174" maxY="1007" minX="116" minY="949" name="furniture-m"/>
+  <symbol maxX="232" maxY="1007" minX="174" minY="949" name="funicular-m"/>
+  <symbol maxX="290" maxY="1007" minX="232" minY="949" name="funeral_directors-m"/>
+  <symbol maxX="348" maxY="1007" minX="290" minY="949" name="fuel-m"/>
+  <symbol maxX="406" maxY="1007" minX="348" minY="949" name="fuel-dispenser-m"/>
+  <symbol maxX="464" maxY="1007" minX="406" minY="949" name="fountain-s"/>
+  <symbol maxX="522" maxY="1007" minX="464" minY="949" name="fountain-m"/>
+  <symbol maxX="580" maxY="1007" minX="522" minY="949" name="florist-m"/>
+  <symbol maxX="638" maxY="1007" minX="580" minY="949" name="fitness_station-m"/>
+  <symbol maxX="696" maxY="1007" minX="638" minY="949" name="fitness_centre-m"/>
+  <symbol maxX="754" maxY="1007" minX="696" minY="949" name="firehydrant-m"/>
+  <symbol maxX="812" maxY="1007" minX="754" minY="949" name="fire_station-m"/>
+  <symbol maxX="870" maxY="1007" minX="812" minY="949" name="fastfood-m"/>
+  <symbol maxX="928" maxY="1007" minX="870" minY="949" name="factory-m"/>
+  <symbol maxX="986" maxY="1007" minX="928" minY="949" name="excrement_bags-m"/>
+  <symbol maxX="1044" maxY="1007" minX="986" minY="949" name="erotic-m"/>
+  <symbol maxX="1102" maxY="1007" minX="1044" minY="949" name="equestrian-m"/>
+  <symbol maxX="1160" maxY="1007" minX="1102" minY="949" name="emergency-phone-m"/>
+  <symbol maxX="1218" maxY="1007" minX="1160" minY="949" name="embassy-m"/>
+  <symbol maxX="1276" maxY="1007" minX="1218" minY="949" name="electronics-m"/>
+  <symbol maxX="1334" maxY="1007" minX="1276" minY="949" name="electrician-m"/>
+  <symbol maxX="1392" maxY="1007" minX="1334" minY="949" name="dump-station-m"/>
+  <symbol maxX="1450" maxY="1007" minX="1392" minY="949" name="dry_cleaning-m"/>
+  <symbol maxX="1508" maxY="1007" minX="1450" minY="949" name="driving_school-m"/>
+  <symbol maxX="1566" maxY="1007" minX="1508" minY="949" name="drinking-water-m"/>
+  <symbol maxX="1624" maxY="1007" minX="1566" minY="949" name="doityourself-m"/>
+  <symbol maxX="1682" maxY="1007" minX="1624" minY="949" name="dog_park-m"/>
+  <symbol maxX="1740" maxY="1007" minX="1682" minY="949" name="diving-m"/>
+  <symbol maxX="1798" maxY="1007" minX="1740" minY="949" name="department_store-m"/>
+  <symbol maxX="1856" maxY="1007" minX="1798" minY="949" name="dentist-m"/>
+  <symbol maxX="1914" maxY="1007" minX="1856" minY="949" name="defibrillator-m"/>
+  <symbol maxX="1972" maxY="1007" minX="1914" minY="949" name="curling-m"/>
+  <symbol maxX="2030" maxY="1007" minX="1972" minY="949" name="cross-m"/>
+  <symbol maxX="58" maxY="1065" minX="0" minY="1007" name="cricket-m"/>
+  <symbol maxX="116" maxY="1065" minX="58" minY="1007" name="craft-m"/>
   <symbol maxX="174" maxY="1065" minX="116" minY="1007" name="copyshop-m"/>
   <symbol maxX="232" maxY="1065" minX="174" minY="1007" name="convenience-m"/>
   <symbol maxX="290" maxY="1065" minX="232" minY="1007" name="computer-m"/>
diff --git a/data/resources-xxhdpi_light/symbols.png b/data/resources-xxhdpi_light/symbols.png
index 67aadfa147..9aade0ef93 100644
Binary files a/data/resources-xxhdpi_light/symbols.png and b/data/resources-xxhdpi_light/symbols.png differ
diff --git a/data/resources-xxhdpi_light/symbols.sdf b/data/resources-xxhdpi_light/symbols.sdf
index a5dfd3e6a8..6b75082d94 100644
--- a/data/resources-xxhdpi_light/symbols.sdf
+++ b/data/resources-xxhdpi_light/symbols.sdf
@@ -347,55 +347,55 @@
   <symbol maxX="1218" maxY="949" minX="1160" minY="891" name="helipad-m"/>
   <symbol maxX="1276" maxY="949" minX="1218" minY="891" name="handicraft-m"/>
   <symbol maxX="1334" maxY="949" minX="1276" minY="891" name="handball-m"/>
-  <symbol maxX="1392" maxY="949" minX="1334" minY="891" name="hand-m"/>
-  <symbol maxX="1450" maxY="949" minX="1392" minY="891" name="hairdresser-m"/>
-  <symbol maxX="1508" maxY="949" minX="1450" minY="891" name="hackerspace-m"/>
-  <symbol maxX="1566" maxY="949" minX="1508" minY="891" name="guidepost"/>
-  <symbol maxX="1624" maxY="949" minX="1566" minY="891" name="grocery-m"/>
-  <symbol maxX="1682" maxY="949" minX="1624" minY="891" name="grinding_mill-m"/>
-  <symbol maxX="1740" maxY="949" minX="1682" minY="891" name="greengrocer-m"/>
-  <symbol maxX="1798" maxY="949" minX="1740" minY="891" name="golf-m"/>
-  <symbol maxX="1856" maxY="949" minX="1798" minY="891" name="gift-m"/>
-  <symbol maxX="1914" maxY="949" minX="1856" minY="891" name="geyser-m"/>
-  <symbol maxX="1972" maxY="949" minX="1914" minY="891" name="garden_center-m"/>
-  <symbol maxX="2030" maxY="949" minX="1972" minY="891" name="garden-outline-m"/>
-  <symbol maxX="58" maxY="1007" minX="0" minY="949" name="garden-m"/>
-  <symbol maxX="116" maxY="1007" minX="58" minY="949" name="gambling-m"/>
-  <symbol maxX="174" maxY="1007" minX="116" minY="949" name="gallery-m"/>
-  <symbol maxX="232" maxY="1007" minX="174" minY="949" name="furniture-m"/>
-  <symbol maxX="290" maxY="1007" minX="232" minY="949" name="funicular-m"/>
-  <symbol maxX="348" maxY="1007" minX="290" minY="949" name="funeral_directors-m"/>
-  <symbol maxX="406" maxY="1007" minX="348" minY="949" name="fuel-m"/>
-  <symbol maxX="464" maxY="1007" minX="406" minY="949" name="fuel-dispenser-m"/>
-  <symbol maxX="522" maxY="1007" minX="464" minY="949" name="fountain-s"/>
-  <symbol maxX="580" maxY="1007" minX="522" minY="949" name="fountain-m"/>
-  <symbol maxX="638" maxY="1007" minX="580" minY="949" name="florist-m"/>
-  <symbol maxX="696" maxY="1007" minX="638" minY="949" name="fitness_station-m"/>
-  <symbol maxX="754" maxY="1007" minX="696" minY="949" name="fitness_centre-m"/>
-  <symbol maxX="812" maxY="1007" minX="754" minY="949" name="firehydrant-m"/>
-  <symbol maxX="870" maxY="1007" minX="812" minY="949" name="fire_station-m"/>
-  <symbol maxX="928" maxY="1007" minX="870" minY="949" name="fastfood-m"/>
-  <symbol maxX="986" maxY="1007" minX="928" minY="949" name="factory-m"/>
-  <symbol maxX="1044" maxY="1007" minX="986" minY="949" name="excrement_bags-m"/>
-  <symbol maxX="1102" maxY="1007" minX="1044" minY="949" name="erotic-m"/>
-  <symbol maxX="1160" maxY="1007" minX="1102" minY="949" name="equestrian-m"/>
-  <symbol maxX="1218" maxY="1007" minX="1160" minY="949" name="emergency-phone-m"/>
-  <symbol maxX="1276" maxY="1007" minX="1218" minY="949" name="embassy-m"/>
-  <symbol maxX="1334" maxY="1007" minX="1276" minY="949" name="electronics-m"/>
-  <symbol maxX="1392" maxY="1007" minX="1334" minY="949" name="electrician-m"/>
-  <symbol maxX="1450" maxY="1007" minX="1392" minY="949" name="dump-station-m"/>
-  <symbol maxX="1508" maxY="1007" minX="1450" minY="949" name="dry_cleaning-m"/>
-  <symbol maxX="1566" maxY="1007" minX="1508" minY="949" name="driving_school-m"/>
-  <symbol maxX="1624" maxY="1007" minX="1566" minY="949" name="drinking-water-m"/>
-  <symbol maxX="1682" maxY="1007" minX="1624" minY="949" name="doityourself-m"/>
-  <symbol maxX="1740" maxY="1007" minX="1682" minY="949" name="dog_park-m"/>
-  <symbol maxX="1798" maxY="1007" minX="1740" minY="949" name="diving-m"/>
-  <symbol maxX="1856" maxY="1007" minX="1798" minY="949" name="department_store-m"/>
-  <symbol maxX="1914" maxY="1007" minX="1856" minY="949" name="dentist-m"/>
-  <symbol maxX="1972" maxY="1007" minX="1914" minY="949" name="defibrillator-m"/>
-  <symbol maxX="2030" maxY="1007" minX="1972" minY="949" name="curling-m"/>
-  <symbol maxX="58" maxY="1065" minX="0" minY="1007" name="cross-m"/>
-  <symbol maxX="116" maxY="1065" minX="58" minY="1007" name="cricket-m"/>
+  <symbol maxX="1392" maxY="949" minX="1334" minY="891" name="hairdresser-m"/>
+  <symbol maxX="1450" maxY="949" minX="1392" minY="891" name="hackerspace-m"/>
+  <symbol maxX="1508" maxY="949" minX="1450" minY="891" name="guidepost"/>
+  <symbol maxX="1566" maxY="949" minX="1508" minY="891" name="grocery-m"/>
+  <symbol maxX="1624" maxY="949" minX="1566" minY="891" name="grinding_mill-m"/>
+  <symbol maxX="1682" maxY="949" minX="1624" minY="891" name="greengrocer-m"/>
+  <symbol maxX="1740" maxY="949" minX="1682" minY="891" name="golf-m"/>
+  <symbol maxX="1798" maxY="949" minX="1740" minY="891" name="gift-m"/>
+  <symbol maxX="1856" maxY="949" minX="1798" minY="891" name="geyser-m"/>
+  <symbol maxX="1914" maxY="949" minX="1856" minY="891" name="garden_center-m"/>
+  <symbol maxX="1972" maxY="949" minX="1914" minY="891" name="garden-outline-m"/>
+  <symbol maxX="2030" maxY="949" minX="1972" minY="891" name="garden-m"/>
+  <symbol maxX="58" maxY="1007" minX="0" minY="949" name="gambling-m"/>
+  <symbol maxX="116" maxY="1007" minX="58" minY="949" name="gallery-m"/>
+  <symbol maxX="174" maxY="1007" minX="116" minY="949" name="furniture-m"/>
+  <symbol maxX="232" maxY="1007" minX="174" minY="949" name="funicular-m"/>
+  <symbol maxX="290" maxY="1007" minX="232" minY="949" name="funeral_directors-m"/>
+  <symbol maxX="348" maxY="1007" minX="290" minY="949" name="fuel-m"/>
+  <symbol maxX="406" maxY="1007" minX="348" minY="949" name="fuel-dispenser-m"/>
+  <symbol maxX="464" maxY="1007" minX="406" minY="949" name="fountain-s"/>
+  <symbol maxX="522" maxY="1007" minX="464" minY="949" name="fountain-m"/>
+  <symbol maxX="580" maxY="1007" minX="522" minY="949" name="florist-m"/>
+  <symbol maxX="638" maxY="1007" minX="580" minY="949" name="fitness_station-m"/>
+  <symbol maxX="696" maxY="1007" minX="638" minY="949" name="fitness_centre-m"/>
+  <symbol maxX="754" maxY="1007" minX="696" minY="949" name="firehydrant-m"/>
+  <symbol maxX="812" maxY="1007" minX="754" minY="949" name="fire_station-m"/>
+  <symbol maxX="870" maxY="1007" minX="812" minY="949" name="fastfood-m"/>
+  <symbol maxX="928" maxY="1007" minX="870" minY="949" name="factory-m"/>
+  <symbol maxX="986" maxY="1007" minX="928" minY="949" name="excrement_bags-m"/>
+  <symbol maxX="1044" maxY="1007" minX="986" minY="949" name="erotic-m"/>
+  <symbol maxX="1102" maxY="1007" minX="1044" minY="949" name="equestrian-m"/>
+  <symbol maxX="1160" maxY="1007" minX="1102" minY="949" name="emergency-phone-m"/>
+  <symbol maxX="1218" maxY="1007" minX="1160" minY="949" name="embassy-m"/>
+  <symbol maxX="1276" maxY="1007" minX="1218" minY="949" name="electronics-m"/>
+  <symbol maxX="1334" maxY="1007" minX="1276" minY="949" name="electrician-m"/>
+  <symbol maxX="1392" maxY="1007" minX="1334" minY="949" name="dump-station-m"/>
+  <symbol maxX="1450" maxY="1007" minX="1392" minY="949" name="dry_cleaning-m"/>
+  <symbol maxX="1508" maxY="1007" minX="1450" minY="949" name="driving_school-m"/>
+  <symbol maxX="1566" maxY="1007" minX="1508" minY="949" name="drinking-water-m"/>
+  <symbol maxX="1624" maxY="1007" minX="1566" minY="949" name="doityourself-m"/>
+  <symbol maxX="1682" maxY="1007" minX="1624" minY="949" name="dog_park-m"/>
+  <symbol maxX="1740" maxY="1007" minX="1682" minY="949" name="diving-m"/>
+  <symbol maxX="1798" maxY="1007" minX="1740" minY="949" name="department_store-m"/>
+  <symbol maxX="1856" maxY="1007" minX="1798" minY="949" name="dentist-m"/>
+  <symbol maxX="1914" maxY="1007" minX="1856" minY="949" name="defibrillator-m"/>
+  <symbol maxX="1972" maxY="1007" minX="1914" minY="949" name="curling-m"/>
+  <symbol maxX="2030" maxY="1007" minX="1972" minY="949" name="cross-m"/>
+  <symbol maxX="58" maxY="1065" minX="0" minY="1007" name="cricket-m"/>
+  <symbol maxX="116" maxY="1065" minX="58" minY="1007" name="craft-m"/>
   <symbol maxX="174" maxY="1065" minX="116" minY="1007" name="copyshop-m"/>
   <symbol maxX="232" maxY="1065" minX="174" minY="1007" name="convenience-m"/>
   <symbol maxX="290" maxY="1065" minX="232" minY="1007" name="computer-m"/>
diff --git a/data/resources-xxxhdpi_dark/symbols.png b/data/resources-xxxhdpi_dark/symbols.png
index ec70369621..0ab3d92d68 100644
Binary files a/data/resources-xxxhdpi_dark/symbols.png and b/data/resources-xxxhdpi_dark/symbols.png differ
diff --git a/data/resources-xxxhdpi_dark/symbols.sdf b/data/resources-xxxhdpi_dark/symbols.sdf
index 13d1663e99..e1a6577459 100644
--- a/data/resources-xxxhdpi_dark/symbols.sdf
+++ b/data/resources-xxxhdpi_dark/symbols.sdf
@@ -347,55 +347,55 @@
   <symbol maxX="1224" maxY="1262" minX="1156" minY="1194" name="helipad-m"/>
   <symbol maxX="1292" maxY="1262" minX="1224" minY="1194" name="handicraft-m"/>
   <symbol maxX="1360" maxY="1262" minX="1292" minY="1194" name="handball-m"/>
-  <symbol maxX="1428" maxY="1262" minX="1360" minY="1194" name="hand-m"/>
-  <symbol maxX="1496" maxY="1262" minX="1428" minY="1194" name="hairdresser-m"/>
-  <symbol maxX="1564" maxY="1262" minX="1496" minY="1194" name="hackerspace-m"/>
-  <symbol maxX="1632" maxY="1262" minX="1564" minY="1194" name="guidepost"/>
-  <symbol maxX="1700" maxY="1262" minX="1632" minY="1194" name="grocery-m"/>
-  <symbol maxX="1768" maxY="1262" minX="1700" minY="1194" name="grinding_mill-m"/>
-  <symbol maxX="1836" maxY="1262" minX="1768" minY="1194" name="greengrocer-m"/>
-  <symbol maxX="1904" maxY="1262" minX="1836" minY="1194" name="golf-m"/>
-  <symbol maxX="1972" maxY="1262" minX="1904" minY="1194" name="gift-m"/>
-  <symbol maxX="2040" maxY="1262" minX="1972" minY="1194" name="geyser-m"/>
-  <symbol maxX="68" maxY="1330" minX="0" minY="1262" name="garden_center-m"/>
-  <symbol maxX="136" maxY="1330" minX="68" minY="1262" name="garden-outline-m"/>
-  <symbol maxX="204" maxY="1330" minX="136" minY="1262" name="garden-m"/>
-  <symbol maxX="272" maxY="1330" minX="204" minY="1262" name="gambling-m"/>
-  <symbol maxX="340" maxY="1330" minX="272" minY="1262" name="gallery-m"/>
-  <symbol maxX="408" maxY="1330" minX="340" minY="1262" name="furniture-m"/>
-  <symbol maxX="476" maxY="1330" minX="408" minY="1262" name="funicular-m"/>
-  <symbol maxX="544" maxY="1330" minX="476" minY="1262" name="funeral_directors-m"/>
-  <symbol maxX="612" maxY="1330" minX="544" minY="1262" name="fuel-m"/>
-  <symbol maxX="680" maxY="1330" minX="612" minY="1262" name="fuel-dispenser-m"/>
-  <symbol maxX="748" maxY="1330" minX="680" minY="1262" name="fountain-s"/>
-  <symbol maxX="816" maxY="1330" minX="748" minY="1262" name="fountain-m"/>
-  <symbol maxX="884" maxY="1330" minX="816" minY="1262" name="florist-m"/>
-  <symbol maxX="952" maxY="1330" minX="884" minY="1262" name="fitness_station-m"/>
-  <symbol maxX="1020" maxY="1330" minX="952" minY="1262" name="fitness_centre-m"/>
-  <symbol maxX="1088" maxY="1330" minX="1020" minY="1262" name="firehydrant-m"/>
-  <symbol maxX="1156" maxY="1330" minX="1088" minY="1262" name="fire_station-m"/>
-  <symbol maxX="1224" maxY="1330" minX="1156" minY="1262" name="fastfood-m"/>
-  <symbol maxX="1292" maxY="1330" minX="1224" minY="1262" name="factory-m"/>
-  <symbol maxX="1360" maxY="1330" minX="1292" minY="1262" name="excrement_bags-m"/>
-  <symbol maxX="1428" maxY="1330" minX="1360" minY="1262" name="erotic-m"/>
-  <symbol maxX="1496" maxY="1330" minX="1428" minY="1262" name="equestrian-m"/>
-  <symbol maxX="1564" maxY="1330" minX="1496" minY="1262" name="emergency-phone-m"/>
-  <symbol maxX="1632" maxY="1330" minX="1564" minY="1262" name="embassy-m"/>
-  <symbol maxX="1700" maxY="1330" minX="1632" minY="1262" name="electronics-m"/>
-  <symbol maxX="1768" maxY="1330" minX="1700" minY="1262" name="electrician-m"/>
-  <symbol maxX="1836" maxY="1330" minX="1768" minY="1262" name="dump-station-m"/>
-  <symbol maxX="1904" maxY="1330" minX="1836" minY="1262" name="dry_cleaning-m"/>
-  <symbol maxX="1972" maxY="1330" minX="1904" minY="1262" name="driving_school-m"/>
-  <symbol maxX="2040" maxY="1330" minX="1972" minY="1262" name="drinking-water-m"/>
-  <symbol maxX="68" maxY="1398" minX="0" minY="1330" name="doityourself-m"/>
-  <symbol maxX="136" maxY="1398" minX="68" minY="1330" name="dog_park-m"/>
-  <symbol maxX="204" maxY="1398" minX="136" minY="1330" name="diving-m"/>
-  <symbol maxX="272" maxY="1398" minX="204" minY="1330" name="department_store-m"/>
-  <symbol maxX="340" maxY="1398" minX="272" minY="1330" name="dentist-m"/>
-  <symbol maxX="408" maxY="1398" minX="340" minY="1330" name="defibrillator-m"/>
-  <symbol maxX="476" maxY="1398" minX="408" minY="1330" name="curling-m"/>
-  <symbol maxX="544" maxY="1398" minX="476" minY="1330" name="cross-m"/>
-  <symbol maxX="612" maxY="1398" minX="544" minY="1330" name="cricket-m"/>
+  <symbol maxX="1428" maxY="1262" minX="1360" minY="1194" name="hairdresser-m"/>
+  <symbol maxX="1496" maxY="1262" minX="1428" minY="1194" name="hackerspace-m"/>
+  <symbol maxX="1564" maxY="1262" minX="1496" minY="1194" name="guidepost"/>
+  <symbol maxX="1632" maxY="1262" minX="1564" minY="1194" name="grocery-m"/>
+  <symbol maxX="1700" maxY="1262" minX="1632" minY="1194" name="grinding_mill-m"/>
+  <symbol maxX="1768" maxY="1262" minX="1700" minY="1194" name="greengrocer-m"/>
+  <symbol maxX="1836" maxY="1262" minX="1768" minY="1194" name="golf-m"/>
+  <symbol maxX="1904" maxY="1262" minX="1836" minY="1194" name="gift-m"/>
+  <symbol maxX="1972" maxY="1262" minX="1904" minY="1194" name="geyser-m"/>
+  <symbol maxX="2040" maxY="1262" minX="1972" minY="1194" name="garden_center-m"/>
+  <symbol maxX="68" maxY="1330" minX="0" minY="1262" name="garden-outline-m"/>
+  <symbol maxX="136" maxY="1330" minX="68" minY="1262" name="garden-m"/>
+  <symbol maxX="204" maxY="1330" minX="136" minY="1262" name="gambling-m"/>
+  <symbol maxX="272" maxY="1330" minX="204" minY="1262" name="gallery-m"/>
+  <symbol maxX="340" maxY="1330" minX="272" minY="1262" name="furniture-m"/>
+  <symbol maxX="408" maxY="1330" minX="340" minY="1262" name="funicular-m"/>
+  <symbol maxX="476" maxY="1330" minX="408" minY="1262" name="funeral_directors-m"/>
+  <symbol maxX="544" maxY="1330" minX="476" minY="1262" name="fuel-m"/>
+  <symbol maxX="612" maxY="1330" minX="544" minY="1262" name="fuel-dispenser-m"/>
+  <symbol maxX="680" maxY="1330" minX="612" minY="1262" name="fountain-s"/>
+  <symbol maxX="748" maxY="1330" minX="680" minY="1262" name="fountain-m"/>
+  <symbol maxX="816" maxY="1330" minX="748" minY="1262" name="florist-m"/>
+  <symbol maxX="884" maxY="1330" minX="816" minY="1262" name="fitness_station-m"/>
+  <symbol maxX="952" maxY="1330" minX="884" minY="1262" name="fitness_centre-m"/>
+  <symbol maxX="1020" maxY="1330" minX="952" minY="1262" name="firehydrant-m"/>
+  <symbol maxX="1088" maxY="1330" minX="1020" minY="1262" name="fire_station-m"/>
+  <symbol maxX="1156" maxY="1330" minX="1088" minY="1262" name="fastfood-m"/>
+  <symbol maxX="1224" maxY="1330" minX="1156" minY="1262" name="factory-m"/>
+  <symbol maxX="1292" maxY="1330" minX="1224" minY="1262" name="excrement_bags-m"/>
+  <symbol maxX="1360" maxY="1330" minX="1292" minY="1262" name="erotic-m"/>
+  <symbol maxX="1428" maxY="1330" minX="1360" minY="1262" name="equestrian-m"/>
+  <symbol maxX="1496" maxY="1330" minX="1428" minY="1262" name="emergency-phone-m"/>
+  <symbol maxX="1564" maxY="1330" minX="1496" minY="1262" name="embassy-m"/>
+  <symbol maxX="1632" maxY="1330" minX="1564" minY="1262" name="electronics-m"/>
+  <symbol maxX="1700" maxY="1330" minX="1632" minY="1262" name="electrician-m"/>
+  <symbol maxX="1768" maxY="1330" minX="1700" minY="1262" name="dump-station-m"/>
+  <symbol maxX="1836" maxY="1330" minX="1768" minY="1262" name="dry_cleaning-m"/>
+  <symbol maxX="1904" maxY="1330" minX="1836" minY="1262" name="driving_school-m"/>
+  <symbol maxX="1972" maxY="1330" minX="1904" minY="1262" name="drinking-water-m"/>
+  <symbol maxX="2040" maxY="1330" minX="1972" minY="1262" name="doityourself-m"/>
+  <symbol maxX="68" maxY="1398" minX="0" minY="1330" name="dog_park-m"/>
+  <symbol maxX="136" maxY="1398" minX="68" minY="1330" name="diving-m"/>
+  <symbol maxX="204" maxY="1398" minX="136" minY="1330" name="department_store-m"/>
+  <symbol maxX="272" maxY="1398" minX="204" minY="1330" name="dentist-m"/>
+  <symbol maxX="340" maxY="1398" minX="272" minY="1330" name="defibrillator-m"/>
+  <symbol maxX="408" maxY="1398" minX="340" minY="1330" name="curling-m"/>
+  <symbol maxX="476" maxY="1398" minX="408" minY="1330" name="cross-m"/>
+  <symbol maxX="544" maxY="1398" minX="476" minY="1330" name="cricket-m"/>
+  <symbol maxX="612" maxY="1398" minX="544" minY="1330" name="craft-m"/>
   <symbol maxX="680" maxY="1398" minX="612" minY="1330" name="copyshop-m"/>
   <symbol maxX="748" maxY="1398" minX="680" minY="1330" name="convenience-m"/>
   <symbol maxX="816" maxY="1398" minX="748" minY="1330" name="computer-m"/>
diff --git a/data/resources-xxxhdpi_light/symbols.png b/data/resources-xxxhdpi_light/symbols.png
index 5c8137c86f..de5df3475a 100644
Binary files a/data/resources-xxxhdpi_light/symbols.png and b/data/resources-xxxhdpi_light/symbols.png differ
diff --git a/data/resources-xxxhdpi_light/symbols.sdf b/data/resources-xxxhdpi_light/symbols.sdf
index 13d1663e99..e1a6577459 100644
--- a/data/resources-xxxhdpi_light/symbols.sdf
+++ b/data/resources-xxxhdpi_light/symbols.sdf
@@ -347,55 +347,55 @@
   <symbol maxX="1224" maxY="1262" minX="1156" minY="1194" name="helipad-m"/>
   <symbol maxX="1292" maxY="1262" minX="1224" minY="1194" name="handicraft-m"/>
   <symbol maxX="1360" maxY="1262" minX="1292" minY="1194" name="handball-m"/>
-  <symbol maxX="1428" maxY="1262" minX="1360" minY="1194" name="hand-m"/>
-  <symbol maxX="1496" maxY="1262" minX="1428" minY="1194" name="hairdresser-m"/>
-  <symbol maxX="1564" maxY="1262" minX="1496" minY="1194" name="hackerspace-m"/>
-  <symbol maxX="1632" maxY="1262" minX="1564" minY="1194" name="guidepost"/>
-  <symbol maxX="1700" maxY="1262" minX="1632" minY="1194" name="grocery-m"/>
-  <symbol maxX="1768" maxY="1262" minX="1700" minY="1194" name="grinding_mill-m"/>
-  <symbol maxX="1836" maxY="1262" minX="1768" minY="1194" name="greengrocer-m"/>
-  <symbol maxX="1904" maxY="1262" minX="1836" minY="1194" name="golf-m"/>
-  <symbol maxX="1972" maxY="1262" minX="1904" minY="1194" name="gift-m"/>
-  <symbol maxX="2040" maxY="1262" minX="1972" minY="1194" name="geyser-m"/>
-  <symbol maxX="68" maxY="1330" minX="0" minY="1262" name="garden_center-m"/>
-  <symbol maxX="136" maxY="1330" minX="68" minY="1262" name="garden-outline-m"/>
-  <symbol maxX="204" maxY="1330" minX="136" minY="1262" name="garden-m"/>
-  <symbol maxX="272" maxY="1330" minX="204" minY="1262" name="gambling-m"/>
-  <symbol maxX="340" maxY="1330" minX="272" minY="1262" name="gallery-m"/>
-  <symbol maxX="408" maxY="1330" minX="340" minY="1262" name="furniture-m"/>
-  <symbol maxX="476" maxY="1330" minX="408" minY="1262" name="funicular-m"/>
-  <symbol maxX="544" maxY="1330" minX="476" minY="1262" name="funeral_directors-m"/>
-  <symbol maxX="612" maxY="1330" minX="544" minY="1262" name="fuel-m"/>
-  <symbol maxX="680" maxY="1330" minX="612" minY="1262" name="fuel-dispenser-m"/>
-  <symbol maxX="748" maxY="1330" minX="680" minY="1262" name="fountain-s"/>
-  <symbol maxX="816" maxY="1330" minX="748" minY="1262" name="fountain-m"/>
-  <symbol maxX="884" maxY="1330" minX="816" minY="1262" name="florist-m"/>
-  <symbol maxX="952" maxY="1330" minX="884" minY="1262" name="fitness_station-m"/>
-  <symbol maxX="1020" maxY="1330" minX="952" minY="1262" name="fitness_centre-m"/>
-  <symbol maxX="1088" maxY="1330" minX="1020" minY="1262" name="firehydrant-m"/>
-  <symbol maxX="1156" maxY="1330" minX="1088" minY="1262" name="fire_station-m"/>
-  <symbol maxX="1224" maxY="1330" minX="1156" minY="1262" name="fastfood-m"/>
-  <symbol maxX="1292" maxY="1330" minX="1224" minY="1262" name="factory-m"/>
-  <symbol maxX="1360" maxY="1330" minX="1292" minY="1262" name="excrement_bags-m"/>
-  <symbol maxX="1428" maxY="1330" minX="1360" minY="1262" name="erotic-m"/>
-  <symbol maxX="1496" maxY="1330" minX="1428" minY="1262" name="equestrian-m"/>
-  <symbol maxX="1564" maxY="1330" minX="1496" minY="1262" name="emergency-phone-m"/>
-  <symbol maxX="1632" maxY="1330" minX="1564" minY="1262" name="embassy-m"/>
-  <symbol maxX="1700" maxY="1330" minX="1632" minY="1262" name="electronics-m"/>
-  <symbol maxX="1768" maxY="1330" minX="1700" minY="1262" name="electrician-m"/>
-  <symbol maxX="1836" maxY="1330" minX="1768" minY="1262" name="dump-station-m"/>
-  <symbol maxX="1904" maxY="1330" minX="1836" minY="1262" name="dry_cleaning-m"/>
-  <symbol maxX="1972" maxY="1330" minX="1904" minY="1262" name="driving_school-m"/>
-  <symbol maxX="2040" maxY="1330" minX="1972" minY="1262" name="drinking-water-m"/>
-  <symbol maxX="68" maxY="1398" minX="0" minY="1330" name="doityourself-m"/>
-  <symbol maxX="136" maxY="1398" minX="68" minY="1330" name="dog_park-m"/>
-  <symbol maxX="204" maxY="1398" minX="136" minY="1330" name="diving-m"/>
-  <symbol maxX="272" maxY="1398" minX="204" minY="1330" name="department_store-m"/>
-  <symbol maxX="340" maxY="1398" minX="272" minY="1330" name="dentist-m"/>
-  <symbol maxX="408" maxY="1398" minX="340" minY="1330" name="defibrillator-m"/>
-  <symbol maxX="476" maxY="1398" minX="408" minY="1330" name="curling-m"/>
-  <symbol maxX="544" maxY="1398" minX="476" minY="1330" name="cross-m"/>
-  <symbol maxX="612" maxY="1398" minX="544" minY="1330" name="cricket-m"/>
+  <symbol maxX="1428" maxY="1262" minX="1360" minY="1194" name="hairdresser-m"/>
+  <symbol maxX="1496" maxY="1262" minX="1428" minY="1194" name="hackerspace-m"/>
+  <symbol maxX="1564" maxY="1262" minX="1496" minY="1194" name="guidepost"/>
+  <symbol maxX="1632" maxY="1262" minX="1564" minY="1194" name="grocery-m"/>
+  <symbol maxX="1700" maxY="1262" minX="1632" minY="1194" name="grinding_mill-m"/>
+  <symbol maxX="1768" maxY="1262" minX="1700" minY="1194" name="greengrocer-m"/>
+  <symbol maxX="1836" maxY="1262" minX="1768" minY="1194" name="golf-m"/>
+  <symbol maxX="1904" maxY="1262" minX="1836" minY="1194" name="gift-m"/>
+  <symbol maxX="1972" maxY="1262" minX="1904" minY="1194" name="geyser-m"/>
+  <symbol maxX="2040" maxY="1262" minX="1972" minY="1194" name="garden_center-m"/>
+  <symbol maxX="68" maxY="1330" minX="0" minY="1262" name="garden-outline-m"/>
+  <symbol maxX="136" maxY="1330" minX="68" minY="1262" name="garden-m"/>
+  <symbol maxX="204" maxY="1330" minX="136" minY="1262" name="gambling-m"/>
+  <symbol maxX="272" maxY="1330" minX="204" minY="1262" name="gallery-m"/>
+  <symbol maxX="340" maxY="1330" minX="272" minY="1262" name="furniture-m"/>
+  <symbol maxX="408" maxY="1330" minX="340" minY="1262" name="funicular-m"/>
+  <symbol maxX="476" maxY="1330" minX="408" minY="1262" name="funeral_directors-m"/>
+  <symbol maxX="544" maxY="1330" minX="476" minY="1262" name="fuel-m"/>
+  <symbol maxX="612" maxY="1330" minX="544" minY="1262" name="fuel-dispenser-m"/>
+  <symbol maxX="680" maxY="1330" minX="612" minY="1262" name="fountain-s"/>
+  <symbol maxX="748" maxY="1330" minX="680" minY="1262" name="fountain-m"/>
+  <symbol maxX="816" maxY="1330" minX="748" minY="1262" name="florist-m"/>
+  <symbol maxX="884" maxY="1330" minX="816" minY="1262" name="fitness_station-m"/>
+  <symbol maxX="952" maxY="1330" minX="884" minY="1262" name="fitness_centre-m"/>
+  <symbol maxX="1020" maxY="1330" minX="952" minY="1262" name="firehydrant-m"/>
+  <symbol maxX="1088" maxY="1330" minX="1020" minY="1262" name="fire_station-m"/>
+  <symbol maxX="1156" maxY="1330" minX="1088" minY="1262" name="fastfood-m"/>
+  <symbol maxX="1224" maxY="1330" minX="1156" minY="1262" name="factory-m"/>
+  <symbol maxX="1292" maxY="1330" minX="1224" minY="1262" name="excrement_bags-m"/>
+  <symbol maxX="1360" maxY="1330" minX="1292" minY="1262" name="erotic-m"/>
+  <symbol maxX="1428" maxY="1330" minX="1360" minY="1262" name="equestrian-m"/>
+  <symbol maxX="1496" maxY="1330" minX="1428" minY="1262" name="emergency-phone-m"/>
+  <symbol maxX="1564" maxY="1330" minX="1496" minY="1262" name="embassy-m"/>
+  <symbol maxX="1632" maxY="1330" minX="1564" minY="1262" name="electronics-m"/>
+  <symbol maxX="1700" maxY="1330" minX="1632" minY="1262" name="electrician-m"/>
+  <symbol maxX="1768" maxY="1330" minX="1700" minY="1262" name="dump-station-m"/>
+  <symbol maxX="1836" maxY="1330" minX="1768" minY="1262" name="dry_cleaning-m"/>
+  <symbol maxX="1904" maxY="1330" minX="1836" minY="1262" name="driving_school-m"/>
+  <symbol maxX="1972" maxY="1330" minX="1904" minY="1262" name="drinking-water-m"/>
+  <symbol maxX="2040" maxY="1330" minX="1972" minY="1262" name="doityourself-m"/>
+  <symbol maxX="68" maxY="1398" minX="0" minY="1330" name="dog_park-m"/>
+  <symbol maxX="136" maxY="1398" minX="68" minY="1330" name="diving-m"/>
+  <symbol maxX="204" maxY="1398" minX="136" minY="1330" name="department_store-m"/>
+  <symbol maxX="272" maxY="1398" minX="204" minY="1330" name="dentist-m"/>
+  <symbol maxX="340" maxY="1398" minX="272" minY="1330" name="defibrillator-m"/>
+  <symbol maxX="408" maxY="1398" minX="340" minY="1330" name="curling-m"/>
+  <symbol maxX="476" maxY="1398" minX="408" minY="1330" name="cross-m"/>
+  <symbol maxX="544" maxY="1398" minX="476" minY="1330" name="cricket-m"/>
+  <symbol maxX="612" maxY="1398" minX="544" minY="1330" name="craft-m"/>
   <symbol maxX="680" maxY="1398" minX="612" minY="1330" name="copyshop-m"/>
   <symbol maxX="748" maxY="1398" minX="680" minY="1330" name="convenience-m"/>
   <symbol maxX="816" maxY="1398" minX="748" minY="1330" name="computer-m"/>
diff --git a/data/types.txt b/data/types.txt
index e27f6ad69b..e1706e252a 100644
--- a/data/types.txt
+++ b/data/types.txt
@@ -1597,3 +1597,4 @@ amenity|recycling|container
 *railway|subway_entrance|boston
 *leisure|miniature_golf
 *amenity|social_facility
+*craft