diff --git a/data/colors.txt b/data/colors.txt
index fc21177e03..af4647da8a 100644
--- a/data/colors.txt
+++ b/data/colors.txt
@@ -22,7 +22,6 @@
 1643545
 2038555
 2105376
-2171161
 2171163
 2229797
 2236945
@@ -31,13 +30,17 @@
 2498323
 2499106
 2631706
+2695475
 2770241
+2827062
 2828327
 2836760
+3155515
 3158064
 3166424
 3354413
 3355443
+3418688
 3584191
 3677969
 3677972
@@ -174,7 +177,7 @@
 15326578
 15527148
 15591634
-15592411
+15591638
 15631086
 15649877
 15652006
@@ -186,6 +189,7 @@
 15763456
 15786204
 15855336
+15920858
 15921870
 16154634
 16178442
diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index c3321aa272..a4365d7eb8 100644
Binary files a/data/drules_proto_clear.bin and b/data/drules_proto_clear.bin differ
diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt
index c5636bd6e6..8062b2aec0 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -2664,10 +2664,25 @@ cont {
 cont {
   name: "amenity-dentist"
   element {
-    scale: 19
+    scale: 17
     symbol {
-      name: "none"
-      priority: 16000
+      name: "dentist-l"
+      priority: 16837
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15837
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "dentist-l"
+      priority: 16837
     }
     caption {
       primary {
@@ -2675,17 +2690,76 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15000
+      priority: 15837
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "dentist-l"
+      priority: 16837
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15837
     }
   }
 }
 cont {
   name: "amenity-doctors"
   element {
-    scale: 19
+    scale: 14
+    area {
+      color: 16308697
+      priority: -15973
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 16308697
+      priority: -15973
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 16308697
+      priority: -15973
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 16308697
+      priority: -15163
+    }
     symbol {
-      name: "none"
-      priority: 16000
+      name: "hospital-l"
+      priority: 16837
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15837
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 16308697
+      priority: -15163
+    }
+    symbol {
+      name: "hospital-l"
+      priority: 16837
     }
     caption {
       primary {
@@ -2693,7 +2767,26 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15000
+      priority: 15837
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 16308697
+      priority: -15163
+    }
+    symbol {
+      name: "hospital-l"
+      priority: 16837
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15837
     }
   }
 }
@@ -5931,14 +6024,14 @@ cont {
   element {
     scale: 14
     area {
-      color: 14934482
+      color: 15591638
       priority: -15838
     }
   }
   element {
     scale: 15
     area {
-      color: 14934482
+      color: 15591638
       priority: -15838
     }
     caption {
@@ -5952,7 +6045,7 @@ cont {
   element {
     scale: 16
     area {
-      color: 15592411
+      color: 15920858
       priority: -15838
     }
     caption {
@@ -5966,7 +6059,7 @@ cont {
   element {
     scale: 17
     area {
-      color: 15592411
+      color: 15920858
       priority: -15838
     }
     caption {
@@ -5980,7 +6073,7 @@ cont {
   element {
     scale: 18
     area {
-      color: 15592411
+      color: 15920858
       priority: -15838
     }
     caption {
@@ -5994,7 +6087,7 @@ cont {
   element {
     scale: 19
     area {
-      color: 15592411
+      color: 15920858
       priority: -15838
     }
     caption {
@@ -6011,42 +6104,42 @@ cont {
   element {
     scale: 14
     area {
-      color: 14934482
+      color: 15591638
       priority: -15838
     }
   }
   element {
     scale: 15
     area {
-      color: 14934482
+      color: 15591638
       priority: -15838
     }
   }
   element {
     scale: 16
     area {
-      color: 15592411
+      color: 15920858
       priority: -15838
     }
   }
   element {
     scale: 17
     area {
-      color: 15592411
+      color: 15920858
       priority: -15838
     }
   }
   element {
     scale: 18
     area {
-      color: 15592411
+      color: 15920858
       priority: -15838
     }
   }
   element {
     scale: 19
     area {
-      color: 15592411
+      color: 15920858
       priority: -15838
     }
   }
@@ -6056,14 +6149,14 @@ cont {
   element {
     scale: 14
     area {
-      color: 14934482
+      color: 15591638
       priority: -15838
     }
   }
   element {
     scale: 15
     area {
-      color: 14934482
+      color: 15591638
       priority: -15838
     }
     caption {
@@ -6077,7 +6170,7 @@ cont {
   element {
     scale: 16
     area {
-      color: 15592411
+      color: 15920858
       priority: -15838
     }
     caption {
@@ -6091,7 +6184,7 @@ cont {
   element {
     scale: 17
     area {
-      color: 15592411
+      color: 15920858
       priority: -15838
     }
     caption {
@@ -6105,7 +6198,7 @@ cont {
   element {
     scale: 18
     area {
-      color: 15592411
+      color: 15920858
       priority: -15838
     }
     caption {
@@ -6119,7 +6212,7 @@ cont {
   element {
     scale: 19
     area {
-      color: 15592411
+      color: 15920858
       priority: -15838
     }
     caption {
@@ -9456,7 +9549,7 @@ cont {
       cap: BUTTCAP
     }
     area {
-      color: 14934482
+      color: 15591638
       priority: -15838
     }
   }
@@ -9474,7 +9567,7 @@ cont {
       cap: BUTTCAP
     }
     area {
-      color: 14934482
+      color: 15591638
       priority: -15838
     }
     caption {
@@ -9500,7 +9593,7 @@ cont {
       cap: ROUNDCAP
     }
     area {
-      color: 15592411
+      color: 15920858
       priority: -15838
     }
     caption {
@@ -9526,7 +9619,7 @@ cont {
       cap: ROUNDCAP
     }
     area {
-      color: 15592411
+      color: 15920858
       priority: -15838
     }
     caption {
@@ -9552,7 +9645,7 @@ cont {
       cap: ROUNDCAP
     }
     area {
-      color: 15592411
+      color: 15920858
       priority: -15838
     }
     caption {
@@ -9578,7 +9671,7 @@ cont {
       cap: ROUNDCAP
     }
     area {
-      color: 15592411
+      color: 15920858
       priority: -15838
     }
     caption {
@@ -15328,7 +15421,7 @@ cont {
       cap: BUTTCAP
     }
     area {
-      color: 14934482
+      color: 15591638
       priority: -15838
     }
     path_text {
@@ -15354,7 +15447,7 @@ cont {
       cap: BUTTCAP
     }
     area {
-      color: 14934482
+      color: 15591638
       priority: -15838
     }
     caption {
@@ -15380,7 +15473,7 @@ cont {
       cap: ROUNDCAP
     }
     area {
-      color: 15592411
+      color: 15920858
       priority: -15838
     }
     caption {
@@ -15406,7 +15499,7 @@ cont {
       cap: ROUNDCAP
     }
     area {
-      color: 15592411
+      color: 15920858
       priority: -15838
     }
     caption {
@@ -15432,7 +15525,7 @@ cont {
       cap: ROUNDCAP
     }
     area {
-      color: 15592411
+      color: 15920858
       priority: -15838
     }
     caption {
@@ -15458,7 +15551,7 @@ cont {
       cap: ROUNDCAP
     }
     area {
-      color: 15592411
+      color: 15920858
       priority: -15838
     }
     caption {
@@ -48083,28 +48176,28 @@ cont {
   element {
     scale: 16
     area {
-      color: 14934482
+      color: 15591638
       priority: -15838
     }
   }
   element {
     scale: 17
     area {
-      color: 14934482
+      color: 15591638
       priority: -15838
     }
   }
   element {
     scale: 18
     area {
-      color: 14934482
+      color: 15591638
       priority: -15838
     }
   }
   element {
     scale: 19
     area {
-      color: 14934482
+      color: 15591638
       priority: -15838
     }
   }
@@ -49643,28 +49736,28 @@ cont {
   element {
     scale: 16
     area {
-      color: 14934482
+      color: 15591638
       priority: -15838
     }
   }
   element {
     scale: 17
     area {
-      color: 14934482
+      color: 15591638
       priority: -15838
     }
   }
   element {
     scale: 18
     area {
-      color: 14934482
+      color: 15591638
       priority: -15838
     }
   }
   element {
     scale: 19
     area {
-      color: 14934482
+      color: 15591638
       priority: -15838
     }
   }
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index 747ec396c1..cc2174d39c 100644
Binary files a/data/drules_proto_dark.bin and b/data/drules_proto_dark.bin differ
diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt
index 7c4a94d5dd..aad9a3d50f 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -1121,14 +1121,14 @@ cont {
   element {
     scale: 11
     area {
-      color: 3681605
+      color: 3418688
       priority: -15987
     }
   }
   element {
     scale: 12
     area {
-      color: 3681605
+      color: 3155515
       priority: -15068
     }
     symbol {
@@ -1155,7 +1155,7 @@ cont {
   element {
     scale: 13
     area {
-      color: 3681605
+      color: 3155515
       priority: -15068
     }
     symbol {
@@ -1182,7 +1182,7 @@ cont {
   element {
     scale: 14
     area {
-      color: 3681605
+      color: 2827062
       priority: -15068
     }
     symbol {
@@ -1209,7 +1209,7 @@ cont {
   element {
     scale: 15
     area {
-      color: 3681605
+      color: 2695475
       priority: -15068
     }
     symbol {
@@ -1236,7 +1236,7 @@ cont {
   element {
     scale: 16
     area {
-      color: 3681605
+      color: 2695475
       priority: -15068
     }
     symbol {
@@ -1263,7 +1263,7 @@ cont {
   element {
     scale: 17
     area {
-      color: 3681605
+      color: 2695475
       priority: -15068
     }
     symbol {
@@ -1290,7 +1290,7 @@ cont {
   element {
     scale: 18
     area {
-      color: 3681605
+      color: 2695475
       priority: -15068
     }
     symbol {
@@ -1317,7 +1317,7 @@ cont {
   element {
     scale: 19
     area {
-      color: 3681605
+      color: 2695475
       priority: -15068
     }
     symbol {
@@ -1367,7 +1367,7 @@ cont {
   element {
     scale: 11
     area {
-      color: 3681605
+      color: 3418688
       priority: -15068
     }
     symbol {
@@ -1394,7 +1394,7 @@ cont {
   element {
     scale: 12
     area {
-      color: 3681605
+      color: 3155515
       priority: -15068
     }
     symbol {
@@ -1421,7 +1421,7 @@ cont {
   element {
     scale: 13
     area {
-      color: 3681605
+      color: 3155515
       priority: -15068
     }
     symbol {
@@ -1448,7 +1448,7 @@ cont {
   element {
     scale: 14
     area {
-      color: 3681605
+      color: 2827062
       priority: -15068
     }
     symbol {
@@ -1475,7 +1475,7 @@ cont {
   element {
     scale: 15
     area {
-      color: 3681605
+      color: 2695475
       priority: -15068
     }
     symbol {
@@ -1502,7 +1502,7 @@ cont {
   element {
     scale: 16
     area {
-      color: 3681605
+      color: 2695475
       priority: -15068
     }
     symbol {
@@ -1529,7 +1529,7 @@ cont {
   element {
     scale: 17
     area {
-      color: 3681605
+      color: 2695475
       priority: -15068
     }
     symbol {
@@ -1556,7 +1556,7 @@ cont {
   element {
     scale: 18
     area {
-      color: 3681605
+      color: 2695475
       priority: -15068
     }
     symbol {
@@ -1583,7 +1583,7 @@ cont {
   element {
     scale: 19
     area {
-      color: 3681605
+      color: 2695475
       priority: -15068
     }
     symbol {
@@ -2664,10 +2664,25 @@ cont {
 cont {
   name: "amenity-dentist"
   element {
-    scale: 19
+    scale: 17
     symbol {
-      name: "none"
-      priority: 16000
+      name: "dentist-l"
+      priority: 16837
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15837
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "dentist-l"
+      priority: 16837
     }
     caption {
       primary {
@@ -2675,17 +2690,76 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15000
+      priority: 15837
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "dentist-l"
+      priority: 16837
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15837
     }
   }
 }
 cont {
   name: "amenity-doctors"
   element {
-    scale: 19
+    scale: 14
+    area {
+      color: 2496790
+      priority: -15973
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 2496790
+      priority: -15973
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 2496790
+      priority: -15973
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 2496790
+      priority: -15163
+    }
     symbol {
-      name: "none"
-      priority: 16000
+      name: "hospital-l"
+      priority: 16837
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15837
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 2496790
+      priority: -15163
+    }
+    symbol {
+      name: "hospital-l"
+      priority: 16837
     }
     caption {
       primary {
@@ -2693,7 +2767,26 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15000
+      priority: 15837
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 2496790
+      priority: -15163
+    }
+    symbol {
+      name: "hospital-l"
+      priority: 16837
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15837
     }
   }
 }
@@ -48115,7 +48208,7 @@ cont {
     scale: 16
     lines {
       width: 1.6
-      color: 2171161
+      color: 3355443
       dashdot {
         dd: 6.3
         dd: 6.3
@@ -48129,7 +48222,7 @@ cont {
     scale: 17
     lines {
       width: 1.6
-      color: 2171161
+      color: 3355443
       dashdot {
         dd: 6.3
         dd: 6.3
@@ -48143,7 +48236,7 @@ cont {
     scale: 18
     lines {
       width: 1.6
-      color: 2171161
+      color: 3355443
       dashdot {
         dd: 6.3
         dd: 6.3
@@ -48157,7 +48250,7 @@ cont {
     scale: 19
     lines {
       width: 1.6
-      color: 2171161
+      color: 3355443
       dashdot {
         dd: 6.3
         dd: 6.3
@@ -48174,7 +48267,7 @@ cont {
     scale: 16
     lines {
       width: 1.6
-      color: 2171161
+      color: 3355443
       dashdot {
         dd: 6.3
         dd: 6.3
@@ -48188,7 +48281,7 @@ cont {
     scale: 17
     lines {
       width: 1.6
-      color: 2171161
+      color: 3355443
       dashdot {
         dd: 6.3
         dd: 6.3
@@ -48202,7 +48295,7 @@ cont {
     scale: 18
     lines {
       width: 1.6
-      color: 2171161
+      color: 3355443
       dashdot {
         dd: 6.3
         dd: 6.3
@@ -48216,7 +48309,7 @@ cont {
     scale: 19
     lines {
       width: 1.6
-      color: 2171161
+      color: 3355443
       dashdot {
         dd: 6.3
         dd: 6.3
@@ -48233,7 +48326,7 @@ cont {
     scale: 16
     lines {
       width: 1.6
-      color: 2171161
+      color: 3355443
       dashdot {
         dd: 6.3
         dd: 6.3
@@ -48247,7 +48340,7 @@ cont {
     scale: 17
     lines {
       width: 1.6
-      color: 2171161
+      color: 3355443
       dashdot {
         dd: 6.3
         dd: 6.3
@@ -48261,7 +48354,7 @@ cont {
     scale: 18
     lines {
       width: 1.6
-      color: 2171161
+      color: 3355443
       dashdot {
         dd: 6.3
         dd: 6.3
@@ -48275,7 +48368,7 @@ cont {
     scale: 19
     lines {
       width: 1.6
-      color: 2171161
+      color: 3355443
       dashdot {
         dd: 6.3
         dd: 6.3
@@ -48292,7 +48385,7 @@ cont {
     scale: 18
     lines {
       width: 1.0
-      color: 2171161
+      color: 3355443
       dashdot {
         dd: 1.8
         dd: 5.4
@@ -48306,7 +48399,7 @@ cont {
     scale: 19
     lines {
       width: 1.0
-      color: 2171161
+      color: 3355443
       dashdot {
         dd: 1.8
         dd: 5.4
@@ -48323,7 +48416,7 @@ cont {
     scale: 18
     lines {
       width: 1.0
-      color: 2171161
+      color: 3355443
       dashdot {
         dd: 1.8
         dd: 5.4
@@ -48337,7 +48430,7 @@ cont {
     scale: 19
     lines {
       width: 1.0
-      color: 2171161
+      color: 3355443
       dashdot {
         dd: 1.8
         dd: 5.4
@@ -48354,7 +48447,7 @@ cont {
     scale: 13
     lines {
       width: 2.0
-      color: 2171161
+      color: 3355443
       priority: 1635
       join: ROUNDJOIN
       cap: BUTTCAP
@@ -48364,7 +48457,7 @@ cont {
     scale: 14
     lines {
       width: 2.0
-      color: 2171161
+      color: 3355443
       priority: 1635
       join: ROUNDJOIN
       cap: BUTTCAP
@@ -48374,7 +48467,7 @@ cont {
     scale: 15
     lines {
       width: 3.0
-      color: 2171161
+      color: 3355443
       priority: 1635
       join: ROUNDJOIN
       cap: BUTTCAP
@@ -48384,7 +48477,7 @@ cont {
     scale: 16
     lines {
       width: 3.0
-      color: 2171161
+      color: 3355443
       priority: 1635
       join: ROUNDJOIN
       cap: ROUNDCAP
@@ -48394,7 +48487,7 @@ cont {
     scale: 17
     lines {
       width: 3.0
-      color: 2171161
+      color: 3355443
       priority: 1635
       join: ROUNDJOIN
       cap: ROUNDCAP
@@ -48404,7 +48497,7 @@ cont {
     scale: 18
     lines {
       width: 3.0
-      color: 2171161
+      color: 3355443
       priority: 1635
       join: ROUNDJOIN
       cap: ROUNDCAP
@@ -48414,7 +48507,7 @@ cont {
     scale: 19
     lines {
       width: 3.0
-      color: 2171161
+      color: 3355443
       priority: 1635
       join: ROUNDJOIN
       cap: ROUNDCAP
@@ -48427,7 +48520,7 @@ cont {
     scale: 13
     lines {
       width: 2.0
-      color: 2171161
+      color: 3355443
       priority: 1635
       join: ROUNDJOIN
       cap: BUTTCAP
@@ -48437,7 +48530,7 @@ cont {
     scale: 14
     lines {
       width: 2.0
-      color: 2171161
+      color: 3355443
       priority: 1635
       join: ROUNDJOIN
       cap: BUTTCAP
@@ -48447,7 +48540,7 @@ cont {
     scale: 15
     lines {
       width: 3.0
-      color: 2171161
+      color: 3355443
       priority: 1635
       join: ROUNDJOIN
       cap: BUTTCAP
@@ -48457,7 +48550,7 @@ cont {
     scale: 16
     lines {
       width: 3.0
-      color: 2171161
+      color: 3355443
       priority: 1635
       join: ROUNDJOIN
       cap: ROUNDCAP
@@ -48467,7 +48560,7 @@ cont {
     scale: 17
     lines {
       width: 3.0
-      color: 2171161
+      color: 3355443
       priority: 1635
       join: ROUNDJOIN
       cap: ROUNDCAP
@@ -48477,7 +48570,7 @@ cont {
     scale: 18
     lines {
       width: 3.0
-      color: 2171161
+      color: 3355443
       priority: 1635
       join: ROUNDJOIN
       cap: ROUNDCAP
@@ -48487,7 +48580,7 @@ cont {
     scale: 19
     lines {
       width: 3.0
-      color: 2171161
+      color: 3355443
       priority: 1635
       join: ROUNDJOIN
       cap: ROUNDCAP
@@ -48500,7 +48593,7 @@ cont {
     scale: 13
     lines {
       width: 2.0
-      color: 2171161
+      color: 3355443
       priority: 1635
       join: ROUNDJOIN
       cap: BUTTCAP
@@ -48510,7 +48603,7 @@ cont {
     scale: 14
     lines {
       width: 2.0
-      color: 2171161
+      color: 3355443
       priority: 1635
       join: ROUNDJOIN
       cap: BUTTCAP
@@ -48520,7 +48613,7 @@ cont {
     scale: 15
     lines {
       width: 3.0
-      color: 2171161
+      color: 3355443
       priority: 1635
       join: ROUNDJOIN
       cap: BUTTCAP
@@ -48530,7 +48623,7 @@ cont {
     scale: 16
     lines {
       width: 3.0
-      color: 2171161
+      color: 3355443
       priority: 1635
       join: ROUNDJOIN
       cap: ROUNDCAP
@@ -48540,7 +48633,7 @@ cont {
     scale: 17
     lines {
       width: 3.0
-      color: 2171161
+      color: 3355443
       priority: 1635
       join: ROUNDJOIN
       cap: ROUNDCAP
@@ -48550,7 +48643,7 @@ cont {
     scale: 18
     lines {
       width: 3.0
-      color: 2171161
+      color: 3355443
       priority: 1635
       join: ROUNDJOIN
       cap: ROUNDCAP
@@ -48560,7 +48653,7 @@ cont {
     scale: 19
     lines {
       width: 3.0
-      color: 2171161
+      color: 3355443
       priority: 1635
       join: ROUNDJOIN
       cap: ROUNDCAP
@@ -48795,7 +48888,7 @@ cont {
     scale: 13
     lines {
       width: 0.8
-      color: 2171161
+      color: 3355443
       priority: 1486
       join: ROUNDJOIN
       cap: BUTTCAP
@@ -48805,7 +48898,7 @@ cont {
     scale: 14
     lines {
       width: 1.0
-      color: 2171161
+      color: 3355443
       priority: 1486
       join: ROUNDJOIN
       cap: BUTTCAP
@@ -48815,7 +48908,7 @@ cont {
     scale: 15
     lines {
       width: 1.2
-      color: 2171161
+      color: 3355443
       priority: 1486
       join: ROUNDJOIN
       cap: BUTTCAP
@@ -48825,14 +48918,14 @@ cont {
     scale: 16
     lines {
       width: 2.6
-      color: 2171161
+      color: 3355443
       priority: 1486
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 1.3
-      color: 0
+      color: 1118481
       dashdot {
         dd: 4.5
         dd: 4.5
@@ -48846,14 +48939,14 @@ cont {
     scale: 17
     lines {
       width: 3.0
-      color: 2171161
+      color: 3355443
       priority: 1486
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 2.0
-      color: 0
+      color: 1118481
       dashdot {
         dd: 6.3
         dd: 6.3
@@ -48867,14 +48960,14 @@ cont {
     scale: 18
     lines {
       width: 3.0
-      color: 2171161
+      color: 3355443
       priority: 1486
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 2.0
-      color: 0
+      color: 1118481
       dashdot {
         dd: 8.1
         dd: 8.1
@@ -48888,14 +48981,14 @@ cont {
     scale: 19
     lines {
       width: 3.0
-      color: 2171161
+      color: 3355443
       priority: 1486
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 2.0
-      color: 0
+      color: 1118481
       dashdot {
         dd: 8.1
         dd: 8.1
@@ -48912,7 +49005,7 @@ cont {
     scale: 13
     lines {
       width: 0.8
-      color: 2171161
+      color: 3355443
       priority: 1486
       join: ROUNDJOIN
       cap: BUTTCAP
@@ -48922,7 +49015,7 @@ cont {
     scale: 14
     lines {
       width: 1.0
-      color: 2171161
+      color: 3355443
       priority: 1486
       join: ROUNDJOIN
       cap: BUTTCAP
@@ -48946,7 +49039,7 @@ cont {
     scale: 15
     lines {
       width: 1.2
-      color: 2171161
+      color: 3355443
       priority: 1486
       join: ROUNDJOIN
       cap: BUTTCAP
@@ -48970,7 +49063,7 @@ cont {
     scale: 16
     lines {
       width: 2.6
-      color: 2171161
+      color: 3355443
       priority: 1486
       join: ROUNDJOIN
       cap: ROUNDCAP
@@ -48991,7 +49084,7 @@ cont {
     }
     lines {
       width: 1.3
-      color: 0
+      color: 1118481
       dashdot {
         dd: 4.5
         dd: 4.5
@@ -49005,7 +49098,7 @@ cont {
     scale: 17
     lines {
       width: 3.0
-      color: 2171161
+      color: 3355443
       priority: 1486
       join: ROUNDJOIN
       cap: ROUNDCAP
@@ -49026,7 +49119,7 @@ cont {
     }
     lines {
       width: 2.0
-      color: 0
+      color: 1118481
       dashdot {
         dd: 6.3
         dd: 6.3
@@ -49040,7 +49133,7 @@ cont {
     scale: 18
     lines {
       width: 3.0
-      color: 2171161
+      color: 3355443
       priority: 1486
       join: ROUNDJOIN
       cap: ROUNDCAP
@@ -49061,7 +49154,7 @@ cont {
     }
     lines {
       width: 2.0
-      color: 0
+      color: 1118481
       dashdot {
         dd: 8.1
         dd: 8.1
@@ -49075,7 +49168,7 @@ cont {
     scale: 19
     lines {
       width: 3.0
-      color: 2171161
+      color: 3355443
       priority: 1486
       join: ROUNDJOIN
       cap: ROUNDCAP
@@ -49096,7 +49189,7 @@ cont {
     }
     lines {
       width: 2.0
-      color: 0
+      color: 1118481
       dashdot {
         dd: 8.1
         dd: 8.1
@@ -49113,7 +49206,7 @@ cont {
     scale: 13
     lines {
       width: 0.8
-      color: 2171161
+      color: 3355443
       priority: 1486
       join: ROUNDJOIN
       cap: BUTTCAP
@@ -49123,7 +49216,7 @@ cont {
     scale: 14
     lines {
       width: 3.0
-      color: 2171161
+      color: 2236962
       dashdot {
         dd: 5.0
         dd: 5.0
@@ -49134,7 +49227,7 @@ cont {
     }
     lines {
       width: 1.0
-      color: 2171161
+      color: 3355443
       priority: 1486
       join: ROUNDJOIN
       cap: BUTTCAP
@@ -49144,7 +49237,7 @@ cont {
     scale: 15
     lines {
       width: 3.2
-      color: 2171161
+      color: 2236962
       dashdot {
         dd: 5.0
         dd: 5.0
@@ -49155,7 +49248,7 @@ cont {
     }
     lines {
       width: 1.2
-      color: 2171161
+      color: 3355443
       priority: 1486
       join: ROUNDJOIN
       cap: BUTTCAP
@@ -49165,7 +49258,7 @@ cont {
     scale: 16
     lines {
       width: 4.6
-      color: 2171161
+      color: 2236962
       dashdot {
         dd: 5.0
         dd: 5.0
@@ -49176,14 +49269,14 @@ cont {
     }
     lines {
       width: 2.6
-      color: 2171161
+      color: 3355443
       priority: 1486
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 1.3
-      color: 0
+      color: 1118481
       dashdot {
         dd: 4.5
         dd: 4.5
@@ -49197,7 +49290,7 @@ cont {
     scale: 17
     lines {
       width: 5.0
-      color: 2171161
+      color: 2236962
       dashdot {
         dd: 5.0
         dd: 5.0
@@ -49208,14 +49301,14 @@ cont {
     }
     lines {
       width: 3.0
-      color: 2171161
+      color: 3355443
       priority: 1486
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 2.0
-      color: 0
+      color: 1118481
       dashdot {
         dd: 6.3
         dd: 6.3
@@ -49229,7 +49322,7 @@ cont {
     scale: 18
     lines {
       width: 5.0
-      color: 2171161
+      color: 2236962
       dashdot {
         dd: 5.0
         dd: 5.0
@@ -49240,14 +49333,14 @@ cont {
     }
     lines {
       width: 3.0
-      color: 2171161
+      color: 3355443
       priority: 1486
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 2.0
-      color: 0
+      color: 1118481
       dashdot {
         dd: 8.1
         dd: 8.1
@@ -49261,7 +49354,7 @@ cont {
     scale: 19
     lines {
       width: 5.0
-      color: 2171161
+      color: 2236962
       dashdot {
         dd: 5.0
         dd: 5.0
@@ -49272,14 +49365,14 @@ cont {
     }
     lines {
       width: 3.0
-      color: 2171161
+      color: 3355443
       priority: 1486
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 2.0
-      color: 0
+      color: 1118481
       dashdot {
         dd: 8.1
         dd: 8.1
@@ -49296,7 +49389,7 @@ cont {
     scale: 14
     lines {
       width: 1.0
-      color: 2171161
+      color: 3355443
       priority: 1635
       join: ROUNDJOIN
       cap: BUTTCAP
@@ -49306,7 +49399,7 @@ cont {
     scale: 15
     lines {
       width: 1.2
-      color: 2171161
+      color: 3355443
       priority: 1635
       join: ROUNDJOIN
       cap: BUTTCAP
@@ -49316,7 +49409,7 @@ cont {
     scale: 16
     lines {
       width: 1.2
-      color: 2171161
+      color: 3355443
       priority: 1635
       join: ROUNDJOIN
       cap: ROUNDCAP
@@ -49326,7 +49419,7 @@ cont {
     scale: 17
     lines {
       width: 2.0
-      color: 2171161
+      color: 3355443
       priority: 1635
       join: ROUNDJOIN
       cap: ROUNDCAP
@@ -49336,7 +49429,7 @@ cont {
     scale: 18
     lines {
       width: 2.0
-      color: 2171161
+      color: 3355443
       priority: 1635
       join: ROUNDJOIN
       cap: ROUNDCAP
@@ -49346,7 +49439,7 @@ cont {
     scale: 19
     lines {
       width: 2.0
-      color: 2171161
+      color: 3355443
       priority: 1635
       join: ROUNDJOIN
       cap: ROUNDCAP
@@ -49359,7 +49452,7 @@ cont {
     scale: 14
     lines {
       width: 1.0
-      color: 2171161
+      color: 3355443
       priority: 1635
       join: ROUNDJOIN
       cap: BUTTCAP
@@ -49369,7 +49462,7 @@ cont {
     scale: 15
     lines {
       width: 1.2
-      color: 2171161
+      color: 3355443
       priority: 1635
       join: ROUNDJOIN
       cap: BUTTCAP
@@ -49379,7 +49472,7 @@ cont {
     scale: 16
     lines {
       width: 1.2
-      color: 2171161
+      color: 3355443
       priority: 1635
       join: ROUNDJOIN
       cap: ROUNDCAP
@@ -49389,7 +49482,7 @@ cont {
     scale: 17
     lines {
       width: 2.0
-      color: 2171161
+      color: 3355443
       priority: 1635
       join: ROUNDJOIN
       cap: ROUNDCAP
@@ -49399,7 +49492,7 @@ cont {
     scale: 18
     lines {
       width: 2.0
-      color: 2171161
+      color: 3355443
       priority: 1635
       join: ROUNDJOIN
       cap: ROUNDCAP
@@ -49409,7 +49502,7 @@ cont {
     scale: 19
     lines {
       width: 2.0
-      color: 2171161
+      color: 3355443
       priority: 1635
       join: ROUNDJOIN
       cap: ROUNDCAP
@@ -49422,7 +49515,7 @@ cont {
     scale: 14
     lines {
       width: 1.0
-      color: 2171161
+      color: 3355443
       priority: 1635
       join: ROUNDJOIN
       cap: BUTTCAP
@@ -49432,7 +49525,7 @@ cont {
     scale: 15
     lines {
       width: 1.2
-      color: 2171161
+      color: 3355443
       priority: 1635
       join: ROUNDJOIN
       cap: BUTTCAP
@@ -49442,7 +49535,7 @@ cont {
     scale: 16
     lines {
       width: 1.2
-      color: 2171161
+      color: 3355443
       priority: 1635
       join: ROUNDJOIN
       cap: ROUNDCAP
@@ -49452,7 +49545,7 @@ cont {
     scale: 17
     lines {
       width: 2.0
-      color: 2171161
+      color: 3355443
       priority: 1635
       join: ROUNDJOIN
       cap: ROUNDCAP
@@ -49462,7 +49555,7 @@ cont {
     scale: 18
     lines {
       width: 2.0
-      color: 2171161
+      color: 3355443
       priority: 1635
       join: ROUNDJOIN
       cap: ROUNDCAP
@@ -49472,7 +49565,7 @@ cont {
     scale: 19
     lines {
       width: 2.0
-      color: 2171161
+      color: 3355443
       priority: 1635
       join: ROUNDJOIN
       cap: ROUNDCAP
@@ -49485,7 +49578,7 @@ cont {
     scale: 15
     lines {
       width: 1.2
-      color: 2171161
+      color: 3355443
       priority: 1635
       join: ROUNDJOIN
       cap: BUTTCAP
@@ -49495,7 +49588,7 @@ cont {
     scale: 16
     lines {
       width: 1.2
-      color: 2171161
+      color: 3355443
       priority: 1635
       join: ROUNDJOIN
       cap: ROUNDCAP
@@ -49505,7 +49598,7 @@ cont {
     scale: 17
     lines {
       width: 2.0
-      color: 2171161
+      color: 3355443
       priority: 1635
       join: ROUNDJOIN
       cap: ROUNDCAP
@@ -49515,7 +49608,7 @@ cont {
     scale: 18
     lines {
       width: 2.0
-      color: 2171161
+      color: 3355443
       priority: 1635
       join: ROUNDJOIN
       cap: ROUNDCAP
@@ -49525,7 +49618,7 @@ cont {
     scale: 19
     lines {
       width: 2.0
-      color: 2171161
+      color: 3355443
       priority: 1635
       join: ROUNDJOIN
       cap: ROUNDCAP
@@ -49538,7 +49631,7 @@ cont {
     scale: 15
     lines {
       width: 1.2
-      color: 2171161
+      color: 3355443
       priority: 1635
       join: ROUNDJOIN
       cap: BUTTCAP
@@ -49548,7 +49641,7 @@ cont {
     scale: 16
     lines {
       width: 1.2
-      color: 2171161
+      color: 3355443
       priority: 1635
       join: ROUNDJOIN
       cap: ROUNDCAP
@@ -49558,7 +49651,7 @@ cont {
     scale: 17
     lines {
       width: 2.0
-      color: 2171161
+      color: 3355443
       priority: 1635
       join: ROUNDJOIN
       cap: ROUNDCAP
@@ -49568,7 +49661,7 @@ cont {
     scale: 18
     lines {
       width: 2.0
-      color: 2171161
+      color: 3355443
       priority: 1635
       join: ROUNDJOIN
       cap: ROUNDCAP
@@ -49578,7 +49671,7 @@ cont {
     scale: 19
     lines {
       width: 2.0
-      color: 2171161
+      color: 3355443
       priority: 1635
       join: ROUNDJOIN
       cap: ROUNDCAP
@@ -49591,7 +49684,7 @@ cont {
     scale: 15
     lines {
       width: 1.2
-      color: 2171161
+      color: 3355443
       priority: 1635
       join: ROUNDJOIN
       cap: BUTTCAP
@@ -49601,7 +49694,7 @@ cont {
     scale: 16
     lines {
       width: 1.2
-      color: 2171161
+      color: 3355443
       priority: 1635
       join: ROUNDJOIN
       cap: ROUNDCAP
@@ -49611,7 +49704,7 @@ cont {
     scale: 17
     lines {
       width: 2.0
-      color: 2171161
+      color: 3355443
       priority: 1635
       join: ROUNDJOIN
       cap: ROUNDCAP
@@ -49621,7 +49714,7 @@ cont {
     scale: 18
     lines {
       width: 2.0
-      color: 2171161
+      color: 3355443
       priority: 1635
       join: ROUNDJOIN
       cap: ROUNDCAP
@@ -49631,7 +49724,7 @@ cont {
     scale: 19
     lines {
       width: 2.0
-      color: 2171161
+      color: 3355443
       priority: 1635
       join: ROUNDJOIN
       cap: ROUNDCAP
@@ -49675,7 +49768,7 @@ cont {
     scale: 16
     lines {
       width: 1.6
-      color: 2171161
+      color: 3355443
       dashdot {
         dd: 6.3
         dd: 6.3
@@ -49689,7 +49782,7 @@ cont {
     scale: 17
     lines {
       width: 1.6
-      color: 2171161
+      color: 3355443
       dashdot {
         dd: 6.3
         dd: 6.3
@@ -49703,7 +49796,7 @@ cont {
     scale: 18
     lines {
       width: 1.6
-      color: 2171161
+      color: 3355443
       dashdot {
         dd: 6.3
         dd: 6.3
@@ -49717,7 +49810,7 @@ cont {
     scale: 19
     lines {
       width: 1.6
-      color: 2171161
+      color: 3355443
       dashdot {
         dd: 6.3
         dd: 6.3
@@ -49734,7 +49827,7 @@ cont {
     scale: 16
     lines {
       width: 1.6
-      color: 2171161
+      color: 3355443
       dashdot {
         dd: 6.3
         dd: 6.3
@@ -49748,7 +49841,7 @@ cont {
     scale: 17
     lines {
       width: 1.6
-      color: 2171161
+      color: 3355443
       dashdot {
         dd: 6.3
         dd: 6.3
@@ -49762,7 +49855,7 @@ cont {
     scale: 18
     lines {
       width: 1.6
-      color: 2171161
+      color: 3355443
       dashdot {
         dd: 6.3
         dd: 6.3
@@ -49776,7 +49869,7 @@ cont {
     scale: 19
     lines {
       width: 1.6
-      color: 2171161
+      color: 3355443
       dashdot {
         dd: 6.3
         dd: 6.3
@@ -49793,7 +49886,7 @@ cont {
     scale: 16
     lines {
       width: 1.6
-      color: 2171161
+      color: 3355443
       dashdot {
         dd: 6.3
         dd: 6.3
@@ -49807,7 +49900,7 @@ cont {
     scale: 17
     lines {
       width: 1.6
-      color: 2171161
+      color: 3355443
       dashdot {
         dd: 6.3
         dd: 6.3
@@ -49821,7 +49914,7 @@ cont {
     scale: 18
     lines {
       width: 1.6
-      color: 2171161
+      color: 3355443
       dashdot {
         dd: 6.3
         dd: 6.3
@@ -49835,7 +49928,7 @@ cont {
     scale: 19
     lines {
       width: 1.6
-      color: 2171161
+      color: 3355443
       dashdot {
         dd: 6.3
         dd: 6.3
@@ -49852,7 +49945,7 @@ cont {
     scale: 11
     lines {
       width: 0.6
-      color: 2171161
+      color: 3355443
       priority: 1486
       join: BEVELJOIN
       cap: BUTTCAP
@@ -49862,7 +49955,7 @@ cont {
     scale: 12
     lines {
       width: 0.6
-      color: 2171161
+      color: 3355443
       priority: 1486
       join: BEVELJOIN
       cap: BUTTCAP
@@ -49872,7 +49965,7 @@ cont {
     scale: 13
     lines {
       width: 0.8
-      color: 2171161
+      color: 3355443
       priority: 1486
       join: ROUNDJOIN
       cap: BUTTCAP
@@ -49882,7 +49975,7 @@ cont {
     scale: 14
     lines {
       width: 1.0
-      color: 2171161
+      color: 3355443
       priority: 1486
       join: ROUNDJOIN
       cap: BUTTCAP
@@ -49892,7 +49985,7 @@ cont {
     scale: 15
     lines {
       width: 1.2
-      color: 2171161
+      color: 3355443
       priority: 1486
       join: ROUNDJOIN
       cap: BUTTCAP
@@ -49902,14 +49995,14 @@ cont {
     scale: 16
     lines {
       width: 2.6
-      color: 2171161
+      color: 3355443
       priority: 1486
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 1.3
-      color: 0
+      color: 1118481
       dashdot {
         dd: 4.5
         dd: 4.5
@@ -49923,14 +50016,14 @@ cont {
     scale: 17
     lines {
       width: 3.0
-      color: 2171161
+      color: 3355443
       priority: 1486
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 2.0
-      color: 0
+      color: 1118481
       dashdot {
         dd: 6.3
         dd: 6.3
@@ -49944,14 +50037,14 @@ cont {
     scale: 18
     lines {
       width: 3.0
-      color: 2171161
+      color: 3355443
       priority: 1486
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 2.0
-      color: 0
+      color: 1118481
       dashdot {
         dd: 8.1
         dd: 8.1
@@ -49965,14 +50058,14 @@ cont {
     scale: 19
     lines {
       width: 3.0
-      color: 2171161
+      color: 3355443
       priority: 1486
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 2.0
-      color: 0
+      color: 1118481
       dashdot {
         dd: 8.1
         dd: 8.1
@@ -49989,7 +50082,7 @@ cont {
     scale: 11
     lines {
       width: 0.6
-      color: 2171161
+      color: 3355443
       priority: 1486
       join: BEVELJOIN
       cap: BUTTCAP
@@ -49999,7 +50092,7 @@ cont {
     scale: 12
     lines {
       width: 0.6
-      color: 2171161
+      color: 3355443
       priority: 1486
       join: BEVELJOIN
       cap: BUTTCAP
@@ -50009,7 +50102,7 @@ cont {
     scale: 13
     lines {
       width: 0.8
-      color: 2171161
+      color: 3355443
       priority: 1486
       join: ROUNDJOIN
       cap: BUTTCAP
@@ -50019,7 +50112,7 @@ cont {
     scale: 14
     lines {
       width: 1.0
-      color: 2171161
+      color: 3355443
       priority: 1486
       join: ROUNDJOIN
       cap: BUTTCAP
@@ -50043,7 +50136,7 @@ cont {
     scale: 15
     lines {
       width: 1.2
-      color: 2171161
+      color: 3355443
       priority: 1486
       join: ROUNDJOIN
       cap: BUTTCAP
@@ -50067,7 +50160,7 @@ cont {
     scale: 16
     lines {
       width: 2.6
-      color: 2171161
+      color: 3355443
       priority: 1486
       join: ROUNDJOIN
       cap: ROUNDCAP
@@ -50088,7 +50181,7 @@ cont {
     }
     lines {
       width: 1.3
-      color: 0
+      color: 1118481
       dashdot {
         dd: 4.5
         dd: 4.5
@@ -50102,7 +50195,7 @@ cont {
     scale: 17
     lines {
       width: 3.0
-      color: 2171161
+      color: 3355443
       priority: 1486
       join: ROUNDJOIN
       cap: ROUNDCAP
@@ -50123,7 +50216,7 @@ cont {
     }
     lines {
       width: 2.0
-      color: 0
+      color: 1118481
       dashdot {
         dd: 6.3
         dd: 6.3
@@ -50137,7 +50230,7 @@ cont {
     scale: 18
     lines {
       width: 3.0
-      color: 2171161
+      color: 3355443
       priority: 1486
       join: ROUNDJOIN
       cap: ROUNDCAP
@@ -50158,7 +50251,7 @@ cont {
     }
     lines {
       width: 2.0
-      color: 0
+      color: 1118481
       dashdot {
         dd: 8.1
         dd: 8.1
@@ -50172,7 +50265,7 @@ cont {
     scale: 19
     lines {
       width: 3.0
-      color: 2171161
+      color: 3355443
       priority: 1486
       join: ROUNDJOIN
       cap: ROUNDCAP
@@ -50193,7 +50286,7 @@ cont {
     }
     lines {
       width: 2.0
-      color: 0
+      color: 1118481
       dashdot {
         dd: 8.1
         dd: 8.1
@@ -50210,7 +50303,7 @@ cont {
     scale: 11
     lines {
       width: 0.6
-      color: 2171161
+      color: 3355443
       priority: 1486
       join: BEVELJOIN
       cap: BUTTCAP
@@ -50220,7 +50313,7 @@ cont {
     scale: 12
     lines {
       width: 0.6
-      color: 2171161
+      color: 3355443
       priority: 1486
       join: BEVELJOIN
       cap: BUTTCAP
@@ -50230,7 +50323,7 @@ cont {
     scale: 13
     lines {
       width: 0.8
-      color: 2171161
+      color: 3355443
       priority: 1486
       join: ROUNDJOIN
       cap: BUTTCAP
@@ -50240,7 +50333,7 @@ cont {
     scale: 14
     lines {
       width: 1.0
-      color: 2171161
+      color: 3355443
       priority: 1486
       join: ROUNDJOIN
       cap: BUTTCAP
@@ -50250,7 +50343,7 @@ cont {
     scale: 15
     lines {
       width: 1.2
-      color: 2171161
+      color: 3355443
       priority: 1486
       join: ROUNDJOIN
       cap: BUTTCAP
@@ -50260,14 +50353,14 @@ cont {
     scale: 16
     lines {
       width: 2.6
-      color: 2171161
+      color: 3355443
       priority: 1486
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 1.3
-      color: 0
+      color: 1118481
       dashdot {
         dd: 4.5
         dd: 4.5
@@ -50281,14 +50374,14 @@ cont {
     scale: 17
     lines {
       width: 3.0
-      color: 2171161
+      color: 3355443
       priority: 1486
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 2.0
-      color: 0
+      color: 1118481
       dashdot {
         dd: 6.3
         dd: 6.3
@@ -50302,14 +50395,14 @@ cont {
     scale: 18
     lines {
       width: 3.0
-      color: 2171161
+      color: 3355443
       priority: 1486
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 2.0
-      color: 0
+      color: 1118481
       dashdot {
         dd: 8.1
         dd: 8.1
@@ -50323,14 +50416,14 @@ cont {
     scale: 19
     lines {
       width: 3.0
-      color: 2171161
+      color: 3355443
       priority: 1486
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 2.0
-      color: 0
+      color: 1118481
       dashdot {
         dd: 8.1
         dd: 8.1
@@ -50347,7 +50440,7 @@ cont {
     scale: 11
     lines {
       width: 0.6
-      color: 2171161
+      color: 3355443
       priority: 1486
       join: BEVELJOIN
       cap: BUTTCAP
@@ -50357,7 +50450,7 @@ cont {
     scale: 12
     lines {
       width: 0.6
-      color: 2171161
+      color: 3355443
       priority: 1486
       join: BEVELJOIN
       cap: BUTTCAP
@@ -50367,7 +50460,7 @@ cont {
     scale: 13
     lines {
       width: 0.8
-      color: 2171161
+      color: 3355443
       priority: 1486
       join: ROUNDJOIN
       cap: BUTTCAP
@@ -50377,7 +50470,7 @@ cont {
     scale: 14
     lines {
       width: 3.0
-      color: 2171161
+      color: 2236962
       dashdot {
         dd: 5.0
         dd: 5.0
@@ -50388,7 +50481,7 @@ cont {
     }
     lines {
       width: 1.0
-      color: 2171161
+      color: 3355443
       priority: 1486
       join: ROUNDJOIN
       cap: BUTTCAP
@@ -50398,7 +50491,7 @@ cont {
     scale: 15
     lines {
       width: 3.2
-      color: 2171161
+      color: 2236962
       dashdot {
         dd: 5.0
         dd: 5.0
@@ -50409,7 +50502,7 @@ cont {
     }
     lines {
       width: 1.2
-      color: 2171161
+      color: 3355443
       priority: 1486
       join: ROUNDJOIN
       cap: BUTTCAP
@@ -50419,7 +50512,7 @@ cont {
     scale: 16
     lines {
       width: 4.6
-      color: 2171161
+      color: 2236962
       dashdot {
         dd: 5.0
         dd: 5.0
@@ -50430,14 +50523,14 @@ cont {
     }
     lines {
       width: 2.6
-      color: 2171161
+      color: 3355443
       priority: 1486
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 1.3
-      color: 0
+      color: 1118481
       dashdot {
         dd: 4.5
         dd: 4.5
@@ -50451,7 +50544,7 @@ cont {
     scale: 17
     lines {
       width: 5.0
-      color: 2171161
+      color: 2236962
       dashdot {
         dd: 5.0
         dd: 5.0
@@ -50462,14 +50555,14 @@ cont {
     }
     lines {
       width: 3.0
-      color: 2171161
+      color: 3355443
       priority: 1486
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 2.0
-      color: 0
+      color: 1118481
       dashdot {
         dd: 6.3
         dd: 6.3
@@ -50483,7 +50576,7 @@ cont {
     scale: 18
     lines {
       width: 5.0
-      color: 2171161
+      color: 2236962
       dashdot {
         dd: 5.0
         dd: 5.0
@@ -50494,14 +50587,14 @@ cont {
     }
     lines {
       width: 3.0
-      color: 2171161
+      color: 3355443
       priority: 1486
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 2.0
-      color: 0
+      color: 1118481
       dashdot {
         dd: 8.1
         dd: 8.1
@@ -50515,7 +50608,7 @@ cont {
     scale: 19
     lines {
       width: 5.0
-      color: 2171161
+      color: 2236962
       dashdot {
         dd: 5.0
         dd: 5.0
@@ -50526,14 +50619,14 @@ cont {
     }
     lines {
       width: 3.0
-      color: 2171161
+      color: 3355443
       priority: 1486
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 2.0
-      color: 0
+      color: 1118481
       dashdot {
         dd: 8.1
         dd: 8.1
@@ -56591,7 +56684,7 @@ cont {
     scale: 11
     lines {
       width: 0.6
-      color: 2171161
+      color: 3355443
       priority: 1486
       join: BEVELJOIN
       cap: BUTTCAP
@@ -56601,7 +56694,7 @@ cont {
     scale: 12
     lines {
       width: 0.6
-      color: 2171161
+      color: 3355443
       priority: 1486
       join: BEVELJOIN
       cap: BUTTCAP
@@ -56611,7 +56704,7 @@ cont {
     scale: 13
     lines {
       width: 0.8
-      color: 2171161
+      color: 3355443
       priority: 1486
       join: ROUNDJOIN
       cap: BUTTCAP
@@ -56621,7 +56714,7 @@ cont {
     scale: 14
     lines {
       width: 1.0
-      color: 2171161
+      color: 3355443
       priority: 1486
       join: ROUNDJOIN
       cap: BUTTCAP
@@ -56631,7 +56724,7 @@ cont {
     scale: 15
     lines {
       width: 1.2
-      color: 2171161
+      color: 3355443
       priority: 1486
       join: ROUNDJOIN
       cap: BUTTCAP
@@ -56641,14 +56734,14 @@ cont {
     scale: 16
     lines {
       width: 2.6
-      color: 2171161
+      color: 3355443
       priority: 1486
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 1.3
-      color: 0
+      color: 1118481
       dashdot {
         dd: 4.5
         dd: 4.5
@@ -56662,14 +56755,14 @@ cont {
     scale: 17
     lines {
       width: 3.0
-      color: 2171161
+      color: 3355443
       priority: 1486
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 2.0
-      color: 0
+      color: 1118481
       dashdot {
         dd: 6.3
         dd: 6.3
@@ -56683,14 +56776,14 @@ cont {
     scale: 18
     lines {
       width: 3.0
-      color: 2171161
+      color: 3355443
       priority: 1486
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 2.0
-      color: 0
+      color: 1118481
       dashdot {
         dd: 8.1
         dd: 8.1
@@ -56704,14 +56797,14 @@ cont {
     scale: 19
     lines {
       width: 3.0
-      color: 2171161
+      color: 3355443
       priority: 1486
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 2.0
-      color: 0
+      color: 1118481
       dashdot {
         dd: 8.1
         dd: 8.1
@@ -56728,7 +56821,7 @@ cont {
     scale: 11
     lines {
       width: 0.6
-      color: 2171161
+      color: 3355443
       priority: 1486
       join: BEVELJOIN
       cap: BUTTCAP
@@ -56738,7 +56831,7 @@ cont {
     scale: 12
     lines {
       width: 0.6
-      color: 2171161
+      color: 3355443
       priority: 1486
       join: BEVELJOIN
       cap: BUTTCAP
@@ -56748,7 +56841,7 @@ cont {
     scale: 13
     lines {
       width: 0.8
-      color: 2171161
+      color: 3355443
       priority: 1486
       join: ROUNDJOIN
       cap: BUTTCAP
@@ -56758,7 +56851,7 @@ cont {
     scale: 14
     lines {
       width: 1.0
-      color: 2171161
+      color: 3355443
       priority: 1486
       join: ROUNDJOIN
       cap: BUTTCAP
@@ -56782,7 +56875,7 @@ cont {
     scale: 15
     lines {
       width: 1.2
-      color: 2171161
+      color: 3355443
       priority: 1486
       join: ROUNDJOIN
       cap: BUTTCAP
@@ -56806,7 +56899,7 @@ cont {
     scale: 16
     lines {
       width: 2.6
-      color: 2171161
+      color: 3355443
       priority: 1486
       join: ROUNDJOIN
       cap: ROUNDCAP
@@ -56827,7 +56920,7 @@ cont {
     }
     lines {
       width: 1.3
-      color: 0
+      color: 1118481
       dashdot {
         dd: 4.5
         dd: 4.5
@@ -56841,7 +56934,7 @@ cont {
     scale: 17
     lines {
       width: 3.0
-      color: 2171161
+      color: 3355443
       priority: 1486
       join: ROUNDJOIN
       cap: ROUNDCAP
@@ -56862,7 +56955,7 @@ cont {
     }
     lines {
       width: 2.0
-      color: 0
+      color: 1118481
       dashdot {
         dd: 6.3
         dd: 6.3
@@ -56876,7 +56969,7 @@ cont {
     scale: 18
     lines {
       width: 3.0
-      color: 2171161
+      color: 3355443
       priority: 1486
       join: ROUNDJOIN
       cap: ROUNDCAP
@@ -56897,7 +56990,7 @@ cont {
     }
     lines {
       width: 2.0
-      color: 0
+      color: 1118481
       dashdot {
         dd: 8.1
         dd: 8.1
@@ -56911,7 +57004,7 @@ cont {
     scale: 19
     lines {
       width: 3.0
-      color: 2171161
+      color: 3355443
       priority: 1486
       join: ROUNDJOIN
       cap: ROUNDCAP
@@ -56932,7 +57025,7 @@ cont {
     }
     lines {
       width: 2.0
-      color: 0
+      color: 1118481
       dashdot {
         dd: 8.1
         dd: 8.1
@@ -56949,7 +57042,7 @@ cont {
     scale: 11
     lines {
       width: 0.6
-      color: 2171161
+      color: 3355443
       priority: 1486
       join: BEVELJOIN
       cap: BUTTCAP
@@ -56959,7 +57052,7 @@ cont {
     scale: 12
     lines {
       width: 0.6
-      color: 2171161
+      color: 3355443
       priority: 1486
       join: BEVELJOIN
       cap: BUTTCAP
@@ -56969,7 +57062,7 @@ cont {
     scale: 13
     lines {
       width: 0.8
-      color: 2171161
+      color: 3355443
       priority: 1486
       join: ROUNDJOIN
       cap: BUTTCAP
@@ -56979,7 +57072,7 @@ cont {
     scale: 14
     lines {
       width: 3.0
-      color: 2171161
+      color: 2236962
       dashdot {
         dd: 5.0
         dd: 5.0
@@ -56990,7 +57083,7 @@ cont {
     }
     lines {
       width: 1.0
-      color: 2171161
+      color: 3355443
       priority: 1486
       join: ROUNDJOIN
       cap: BUTTCAP
@@ -57000,7 +57093,7 @@ cont {
     scale: 15
     lines {
       width: 3.2
-      color: 2171161
+      color: 2236962
       dashdot {
         dd: 5.0
         dd: 5.0
@@ -57011,7 +57104,7 @@ cont {
     }
     lines {
       width: 1.2
-      color: 2171161
+      color: 3355443
       priority: 1486
       join: ROUNDJOIN
       cap: BUTTCAP
@@ -57021,7 +57114,7 @@ cont {
     scale: 16
     lines {
       width: 4.6
-      color: 2171161
+      color: 2236962
       dashdot {
         dd: 5.0
         dd: 5.0
@@ -57032,14 +57125,14 @@ cont {
     }
     lines {
       width: 2.6
-      color: 2171161
+      color: 3355443
       priority: 1486
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 1.3
-      color: 0
+      color: 1118481
       dashdot {
         dd: 4.5
         dd: 4.5
@@ -57053,7 +57146,7 @@ cont {
     scale: 17
     lines {
       width: 5.0
-      color: 2171161
+      color: 2236962
       dashdot {
         dd: 5.0
         dd: 5.0
@@ -57064,14 +57157,14 @@ cont {
     }
     lines {
       width: 3.0
-      color: 2171161
+      color: 3355443
       priority: 1486
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 2.0
-      color: 0
+      color: 1118481
       dashdot {
         dd: 6.3
         dd: 6.3
@@ -57085,7 +57178,7 @@ cont {
     scale: 18
     lines {
       width: 5.0
-      color: 2171161
+      color: 2236962
       dashdot {
         dd: 5.0
         dd: 5.0
@@ -57096,14 +57189,14 @@ cont {
     }
     lines {
       width: 3.0
-      color: 2171161
+      color: 3355443
       priority: 1486
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 2.0
-      color: 0
+      color: 1118481
       dashdot {
         dd: 8.1
         dd: 8.1
@@ -57117,7 +57210,7 @@ cont {
     scale: 19
     lines {
       width: 5.0
-      color: 2171161
+      color: 2236962
       dashdot {
         dd: 5.0
         dd: 5.0
@@ -57128,14 +57221,14 @@ cont {
     }
     lines {
       width: 3.0
-      color: 2171161
+      color: 3355443
       priority: 1486
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 2.0
-      color: 0
+      color: 1118481
       dashdot {
         dd: 8.1
         dd: 8.1
diff --git a/data/resources-6plus_clear/symbols.png b/data/resources-6plus_clear/symbols.png
index 3952d262c3..16c61f2be5 100644
Binary files a/data/resources-6plus_clear/symbols.png and b/data/resources-6plus_clear/symbols.png differ
diff --git a/data/resources-6plus_clear/symbols.sdf b/data/resources-6plus_clear/symbols.sdf
index e77a2f602f..8fced21dc1 100644
--- a/data/resources-6plus_clear/symbols.sdf
+++ b/data/resources-6plus_clear/symbols.sdf
@@ -7,457 +7,460 @@
   <symbol minX="626" maxX="695" minY="0" maxY="88" name="current-position-compas"/>
   <symbol minX="695" maxX="764" minY="0" maxY="88" name="current-routing-compas"/>
   <symbol minX="764" maxX="842" minY="0" maxY="78" name="search-result-active"/>
-  <symbol minX="842" maxX="877" minY="0" maxY="69" name="placemark-green"/>
-  <symbol minX="877" maxX="912" minY="0" maxY="69" name="placemark-brown"/>
-  <symbol minX="912" maxX="947" minY="0" maxY="69" name="placemark-pink"/>
-  <symbol minX="947" maxX="982" minY="0" maxY="69" name="placemark-purple"/>
+  <symbol minX="842" maxX="877" minY="0" maxY="69" name="placemark-pink"/>
+  <symbol minX="877" maxX="912" minY="0" maxY="69" name="placemark-purple"/>
+  <symbol minX="912" maxX="947" minY="0" maxY="69" name="placemark-green"/>
+  <symbol minX="947" maxX="982" minY="0" maxY="69" name="placemark-brown"/>
   <symbol minX="982" maxX="1017" minY="0" maxY="69" name="placemark-blue"/>
   <symbol minX="1017" maxX="1052" minY="0" maxY="69" name="placemark-red"/>
   <symbol minX="1052" maxX="1087" minY="0" maxY="69" name="placemark-yellow"/>
   <symbol minX="1087" maxX="1122" minY="0" maxY="69" name="placemark-orange"/>
-  <symbol minX="1122" maxX="1180" minY="0" maxY="58" name="shop-l"/>
+  <symbol minX="1122" maxX="1180" minY="0" maxY="58" name="military-l"/>
   <symbol minX="1180" maxX="1238" minY="0" maxY="58" name="atm-l"/>
-  <symbol minX="1238" maxX="1296" minY="0" maxY="58" name="shop-bicycle-l"/>
-  <symbol minX="1296" maxX="1354" minY="0" maxY="58" name="archery-l"/>
+  <symbol minX="1238" maxX="1296" minY="0" maxY="58" name="airport-l"/>
+  <symbol minX="1296" maxX="1354" minY="0" maxY="58" name="airport-m"/>
   <symbol minX="1354" maxX="1412" minY="0" maxY="58" name="australian-football-l"/>
-  <symbol minX="1412" maxX="1470" minY="0" maxY="58" name="shoes-l"/>
+  <symbol minX="1412" maxX="1470" minY="0" maxY="58" name="alcohol-l"/>
   <symbol minX="1470" maxX="1528" minY="0" maxY="58" name="bakery-l"/>
-  <symbol minX="1528" maxX="1586" minY="0" maxY="58" name="ship-l"/>
+  <symbol minX="1528" maxX="1586" minY="0" maxY="58" name="alpine_hut-l"/>
   <symbol minX="1586" maxX="1643" minY="0" maxY="58" name="bank-l"/>
   <symbol minX="1643" maxX="1699" minY="0" maxY="58" name="bank-m"/>
   <symbol minX="1699" maxX="1756" minY="0" maxY="58" name="banknote-l"/>
-  <symbol minX="1756" maxX="1814" minY="0" maxY="58" name="skiing-l"/>
+  <symbol minX="1756" maxX="1814" minY="0" maxY="58" name="america-football-l"/>
   <symbol minX="1814" maxX="1872" minY="0" maxY="58" name="bar-l"/>
-  <symbol minX="1872" maxX="1930" minY="0" maxY="58" name="school-l"/>
-  <symbol minX="1930" maxX="1988" minY="0" maxY="58" name="soccer-l"/>
+  <symbol minX="1872" maxX="1930" minY="0" maxY="58" name="archery-l"/>
+  <symbol minX="1930" maxX="1988" minY="0" maxY="58" name="zoo-l"/>
   <symbol minX="1988" maxX="2046" minY="0" maxY="58" name="baseball-l"/>
-  <symbol minX="0" maxX="58" minY="165" maxY="223" name="restaurant-l"/>
-  <symbol minX="58" maxX="116" minY="165" maxY="223" name="america-football-l"/>
+  <symbol minX="0" maxX="58" minY="165" maxY="223" name="windmill-l"/>
+  <symbol minX="58" maxX="116" minY="165" maxY="223" name="wayside_shrine-l"/>
   <symbol minX="116" maxX="174" minY="165" maxY="223" name="basketball-l"/>
-  <symbol minX="174" maxX="230" minY="165" maxY="223" name="remains-m"/>
-  <symbol minX="230" maxX="287" minY="165" maxY="223" name="remains-l"/>
-  <symbol minX="287" maxX="345" minY="165" maxY="223" name="bbq-l"/>
-  <symbol minX="345" maxX="403" minY="165" maxY="223" name="recycling-l"/>
+  <symbol minX="174" maxX="232" minY="165" maxY="223" name="wayside_cross-l"/>
+  <symbol minX="232" maxX="288" minY="165" maxY="223" name="waterfall-m"/>
+  <symbol minX="288" maxX="346" minY="165" maxY="223" name="bbq-l"/>
+  <symbol minX="346" maxX="403" minY="165" maxY="223" name="waterfall-l"/>
   <symbol minX="403" maxX="460" minY="165" maxY="223" name="bcontrol-l"/>
   <symbol minX="460" maxX="516" minY="165" maxY="223" name="bcontrol-m"/>
-  <symbol minX="516" maxX="574" minY="165" maxY="223" name="sports-l"/>
+  <symbol minX="516" maxX="574" minY="165" maxY="223" name="volcano-l"/>
   <symbol minX="574" maxX="632" minY="165" maxY="223" name="beach-l"/>
-  <symbol minX="632" maxX="690" minY="165" maxY="223" name="pub-l"/>
+  <symbol minX="632" maxX="690" minY="165" maxY="223" name="vending-l"/>
   <symbol minX="690" maxX="748" minY="165" maxY="223" name="beauty-l"/>
-  <symbol minX="748" maxX="806" minY="165" maxY="223" name="power-m"/>
+  <symbol minX="748" maxX="806" minY="165" maxY="223" name="tram-l"/>
   <symbol minX="806" maxX="863" minY="165" maxY="223" name="beer-l"/>
   <symbol minX="863" maxX="919" minY="165" maxY="223" name="beer-m"/>
-  <symbol minX="919" maxX="977" minY="165" maxY="223" name="power-l"/>
-  <symbol minX="977" maxX="1035" minY="165" maxY="223" name="alpine_hut-l"/>
+  <symbol minX="919" maxX="977" minY="165" maxY="223" name="train-l"/>
+  <symbol minX="977" maxX="1035" minY="165" maxY="223" name="toys-l"/>
   <symbol minX="1035" maxX="1093" minY="165" maxY="223" name="bicycle-l"/>
-  <symbol minX="1093" maxX="1151" minY="165" maxY="223" name="postbox-l"/>
-  <symbol minX="1151" maxX="1209" minY="165" maxY="223" name="police-l"/>
+  <symbol minX="1093" maxX="1151" minY="165" maxY="223" name="townhall-l"/>
+  <symbol minX="1151" maxX="1209" minY="165" maxY="223" name="tourism-l"/>
   <symbol minX="1209" maxX="1267" minY="165" maxY="223" name="book-shop-l"/>
-  <symbol minX="1267" maxX="1325" minY="165" maxY="223" name="place-of-worship-l"/>
-  <symbol minX="1325" maxX="1383" minY="165" maxY="223" name="alcohol-l"/>
+  <symbol minX="1267" maxX="1325" minY="165" maxY="223" name="tomb-l"/>
+  <symbol minX="1325" maxX="1383" minY="165" maxY="223" name="toll_booth-l"/>
   <symbol minX="1383" maxX="1441" minY="165" maxY="223" name="boundary_stone-l"/>
-  <symbol minX="1441" maxX="1499" minY="165" maxY="223" name="pitch-l"/>
+  <symbol minX="1441" maxX="1499" minY="165" maxY="223" name="toilets-l"/>
   <symbol minX="1499" maxX="1557" minY="165" maxY="223" name="bowls-l"/>
-  <symbol minX="1557" maxX="1613" minY="165" maxY="223" name="picnic-m"/>
-  <symbol minX="1613" maxX="1671" minY="165" maxY="223" name="bus-l"/>
-  <symbol minX="1671" maxX="1728" minY="165" maxY="223" name="picnic-l"/>
-  <symbol minX="1728" maxX="1786" minY="165" maxY="223" name="subway-entrance-l"/>
-  <symbol minX="1786" maxX="1844" minY="165" maxY="223" name="butcher-l"/>
-  <symbol minX="1844" maxX="1902" minY="165" maxY="223" name="phone-l"/>
-  <symbol minX="1902" maxX="1960" minY="165" maxY="223" name="cable-car-l"/>
-  <symbol minX="1960" maxX="2018" minY="165" maxY="223" name="pharmacy-l"/>
-  <symbol minX="0" maxX="58" minY="223" maxY="281" name="airport-m"/>
+  <symbol minX="1557" maxX="1615" minY="165" maxY="223" name="theatre-l"/>
+  <symbol minX="1615" maxX="1673" minY="165" maxY="223" name="bus-l"/>
+  <symbol minX="1673" maxX="1731" minY="165" maxY="223" name="tennis-l"/>
+  <symbol minX="1731" maxX="1789" minY="165" maxY="223" name="taxi-l"/>
+  <symbol minX="1789" maxX="1847" minY="165" maxY="223" name="butcher-l"/>
+  <symbol minX="1847" maxX="1905" minY="165" maxY="223" name="swimming-l"/>
+  <symbol minX="1905" maxX="1963" minY="165" maxY="223" name="cable-car-l"/>
+  <symbol minX="1963" maxX="2021" minY="165" maxY="223" name="sweets-l"/>
+  <symbol minX="0" maxX="58" minY="223" maxY="281" name="subway-spb-l"/>
   <symbol minX="58" maxX="116" minY="223" maxY="281" name="cafe-l"/>
-  <symbol minX="116" maxX="174" minY="223" maxY="281" name="subway-l"/>
-  <symbol minX="174" maxX="232" minY="223" maxY="281" name="airport-l"/>
+  <symbol minX="116" maxX="174" minY="223" maxY="281" name="subway-paris-l"/>
+  <symbol minX="174" maxX="232" minY="223" maxY="281" name="subway-newyork-l"/>
   <symbol minX="232" maxX="290" minY="223" maxY="281" name="campsite-l"/>
-  <symbol minX="290" maxX="348" minY="223" maxY="281" name="subway-newyork-l"/>
-  <symbol minX="348" maxX="406" minY="223" maxY="281" name="parking-meter-l"/>
+  <symbol minX="290" maxX="348" minY="223" maxY="281" name="subway-l"/>
+  <symbol minX="348" maxX="406" minY="223" maxY="281" name="subway-entrance-l"/>
   <symbol minX="406" maxX="463" minY="223" maxY="281" name="car-repair-l"/>
   <symbol minX="463" maxX="519" minY="223" maxY="281" name="car-repair-m"/>
-  <symbol minX="519" maxX="577" minY="223" maxY="281" name="zoo-l"/>
+  <symbol minX="519" maxX="577" minY="223" maxY="281" name="sports-l"/>
   <symbol minX="577" maxX="635" minY="223" maxY="281" name="car_sharing-l"/>
-  <symbol minX="635" maxX="693" minY="223" maxY="281" name="subway-paris-l"/>
+  <symbol minX="635" maxX="693" minY="223" maxY="281" name="soccer-l"/>
   <symbol minX="693" maxX="751" minY="223" maxY="281" name="caravan_site-l"/>
-  <symbol minX="751" maxX="809" minY="223" maxY="281" name="park-l"/>
+  <symbol minX="751" maxX="809" minY="223" maxY="281" name="skiing-l"/>
   <symbol minX="809" maxX="867" minY="223" maxY="281" name="casino-l"/>
-  <symbol minX="867" maxX="925" minY="223" maxY="281" name="optician-l"/>
-  <symbol minX="925" maxX="981" minY="223" maxY="281" name="office-m"/>
-  <symbol minX="981" maxX="1039" minY="223" maxY="281" name="cave-l"/>
-  <symbol minX="1039" maxX="1096" minY="223" maxY="281" name="office-l"/>
-  <symbol minX="1096" maxX="1154" minY="223" maxY="281" name="windmill-l"/>
-  <symbol minX="1154" maxX="1212" minY="223" maxY="281" name="cemetery-l"/>
-  <symbol minX="1212" maxX="1270" minY="223" maxY="281" name="nparkf-l"/>
-  <symbol minX="1270" maxX="1328" minY="223" maxY="281" name="npark-l"/>
-  <symbol minX="1328" maxX="1386" minY="223" maxY="281" name="chemist-l"/>
-  <symbol minX="1386" maxX="1444" minY="223" maxY="281" name="subway-spb-l"/>
-  <symbol minX="1444" maxX="1502" minY="223" maxY="281" name="cinema-l"/>
-  <symbol minX="1502" maxX="1560" minY="223" maxY="281" name="museum-l"/>
-  <symbol minX="1560" maxX="1618" minY="223" maxY="281" name="wayside_shrine-l"/>
+  <symbol minX="867" maxX="925" minY="223" maxY="281" name="shop-l"/>
+  <symbol minX="925" maxX="983" minY="223" maxY="281" name="shop-bicycle-l"/>
+  <symbol minX="983" maxX="1041" minY="223" maxY="281" name="cave-l"/>
+  <symbol minX="1041" maxX="1099" minY="223" maxY="281" name="shoes-l"/>
+  <symbol minX="1099" maxX="1157" minY="223" maxY="281" name="ship-l"/>
+  <symbol minX="1157" maxX="1215" minY="223" maxY="281" name="cemetery-l"/>
+  <symbol minX="1215" maxX="1273" minY="223" maxY="281" name="school-l"/>
+  <symbol minX="1273" maxX="1331" minY="223" maxY="281" name="restaurant-l"/>
+  <symbol minX="1331" maxX="1389" minY="223" maxY="281" name="chemist-l"/>
+  <symbol minX="1389" maxX="1445" minY="223" maxY="281" name="remains-m"/>
+  <symbol minX="1445" maxX="1503" minY="223" maxY="281" name="cinema-l"/>
+  <symbol minX="1503" maxX="1560" minY="223" maxY="281" name="remains-l"/>
+  <symbol minX="1560" maxX="1618" minY="223" maxY="281" name="recycling-l"/>
   <symbol minX="1618" maxX="1676" minY="223" maxY="281" name="clothes-l"/>
-  <symbol minX="1676" maxX="1734" minY="223" maxY="281" name="motel-l"/>
+  <symbol minX="1676" maxX="1734" minY="223" maxY="281" name="pub-l"/>
   <symbol minX="1734" maxX="1792" minY="223" maxY="281" name="college-l"/>
-  <symbol minX="1792" maxX="1850" minY="223" maxY="281" name="sweets-l"/>
-  <symbol minX="1850" maxX="1908" minY="223" maxY="281" name="monument-l"/>
+  <symbol minX="1792" maxX="1850" minY="223" maxY="281" name="power-m"/>
+  <symbol minX="1850" maxX="1908" minY="223" maxY="281" name="power-l"/>
   <symbol minX="1908" maxX="1966" minY="223" maxY="281" name="computer-l"/>
-  <symbol minX="1966" maxX="2024" minY="223" maxY="281" name="mobile_phone-l"/>
+  <symbol minX="1966" maxX="2024" minY="223" maxY="281" name="postbox-l"/>
   <symbol minX="0" maxX="58" minY="281" maxY="339" name="convenience-l"/>
-  <symbol minX="58" maxX="116" minY="281" maxY="339" name="military-l"/>
+  <symbol minX="58" maxX="116" minY="281" maxY="339" name="police-l"/>
   <symbol minX="116" maxX="174" minY="281" maxY="339" name="cricket-l"/>
-  <symbol minX="174" maxX="232" minY="281" maxY="339" name="swimming-l"/>
-  <symbol minX="232" maxX="290" minY="281" maxY="339" name="wayside_cross-l"/>
-  <symbol minX="290" maxX="348" minY="281" maxY="339" name="marketplace-l"/>
-  <symbol minX="348" maxX="404" minY="281" maxY="339" name="waterfall-m"/>
-  <symbol minX="404" maxX="462" minY="281" maxY="339" name="curling-l"/>
-  <symbol minX="462" maxX="520" minY="281" maxY="339" name="taxi-l"/>
-  <symbol minX="520" maxX="578" minY="281" maxY="339" name="department_store-l"/>
-  <symbol minX="578" maxX="636" minY="281" maxY="339" name="mail-l"/>
-  <symbol minX="636" maxX="694" minY="281" maxY="339" name="diving-l"/>
-  <symbol minX="694" maxX="752" minY="281" maxY="339" name="lightrail-berlin-l"/>
-  <symbol minX="752" maxX="810" minY="281" maxY="339" name="dog_park-l"/>
-  <symbol minX="810" maxX="868" minY="281" maxY="339" name="tennis-l"/>
-  <symbol minX="868" maxX="926" minY="281" maxY="339" name="doityourself-l"/>
-  <symbol minX="926" maxX="984" minY="281" maxY="339" name="lighthouse-l"/>
-  <symbol minX="984" maxX="1041" minY="281" maxY="339" name="waterfall-l"/>
-  <symbol minX="1041" maxX="1099" minY="281" maxY="339" name="lift_gate-l"/>
-  <symbol minX="1099" maxX="1157" minY="281" maxY="339" name="volcano-l"/>
-  <symbol minX="1157" maxX="1215" minY="281" maxY="339" name="drinking-water-l"/>
-  <symbol minX="1215" maxX="1273" minY="281" maxY="339" name="library-l"/>
-  <symbol minX="1273" maxX="1329" minY="281" maxY="339" name="laundry-m"/>
-  <symbol minX="1329" maxX="1386" minY="281" maxY="339" name="laundry-l"/>
-  <symbol minX="1386" maxX="1444" minY="281" maxY="339" name="electronics-l"/>
-  <symbol minX="1444" maxX="1502" minY="281" maxY="339" name="kiosk-l"/>
-  <symbol minX="1502" maxX="1560" minY="281" maxY="339" name="embassy-l"/>
-  <symbol minX="1560" maxX="1618" minY="281" maxY="339" name="theatre-l"/>
-  <symbol minX="1618" maxX="1676" minY="281" maxY="339" name="vending-l"/>
-  <symbol minX="1676" maxX="1734" minY="281" maxY="339" name="kindergarten-m"/>
-  <symbol minX="1734" maxX="1792" minY="281" maxY="339" name="tram-l"/>
-  <symbol minX="1792" maxX="1850" minY="281" maxY="339" name="equestrian-l"/>
-  <symbol minX="1850" maxX="1908" minY="281" maxY="339" name="equestrian-m"/>
-  <symbol minX="1908" maxX="1966" minY="281" maxY="339" name="kindergarten-l"/>
-  <symbol minX="1966" maxX="2024" minY="281" maxY="339" name="fastfood-l"/>
-  <symbol minX="0" maxX="58" minY="339" maxY="397" name="jewelry-l"/>
-  <symbol minX="58" maxX="116" minY="339" maxY="397" name="train-l"/>
-  <symbol minX="116" maxX="174" minY="339" maxY="397" name="fire_station-l"/>
-  <symbol minX="174" maxX="232" minY="339" maxY="397" name="information-l"/>
-  <symbol minX="232" maxX="288" minY="339" maxY="397" name="hunting-tower-m"/>
-  <symbol minX="288" maxX="346" minY="339" maxY="397" name="florist-l"/>
-  <symbol minX="346" maxX="403" minY="339" maxY="397" name="hunting-tower-l"/>
-  <symbol minX="403" maxX="461" minY="339" maxY="397" name="fountain-l"/>
-  <symbol minX="461" maxX="519" minY="339" maxY="397" name="toilets-l"/>
-  <symbol minX="519" maxX="577" minY="339" maxY="397" name="toys-l"/>
-  <symbol minX="577" maxX="635" minY="339" maxY="397" name="fuel-l"/>
-  <symbol minX="635" maxX="693" minY="339" maxY="397" name="hotel-l"/>
-  <symbol minX="693" maxX="751" minY="339" maxY="397" name="hospital-l"/>
-  <symbol minX="751" maxX="809" minY="339" maxY="397" name="funicular-l"/>
-  <symbol minX="809" maxX="867" minY="339" maxY="397" name="historic-ship-l"/>
-  <symbol minX="867" maxX="925" minY="339" maxY="397" name="townhall-l"/>
-  <symbol minX="925" maxX="983" minY="339" maxY="397" name="furniture-l"/>
-  <symbol minX="983" maxX="1039" minY="339" maxY="397" name="heliport-m"/>
-  <symbol minX="1039" maxX="1097" minY="339" maxY="397" name="gallery-l"/>
-  <symbol minX="1097" maxX="1154" minY="339" maxY="397" name="heliport-l"/>
-  <symbol minX="1154" maxX="1212" minY="339" maxY="397" name="toll_booth-l"/>
-  <symbol minX="1212" maxX="1270" minY="339" maxY="397" name="garden-l"/>
-  <symbol minX="1270" maxX="1328" minY="339" maxY="397" name="helipad-l"/>
-  <symbol minX="1328" maxX="1386" minY="339" maxY="397" name="tourism-l"/>
-  <symbol minX="1386" maxX="1444" minY="339" maxY="397" name="garden_center-l"/>
-  <symbol minX="1444" maxX="1502" minY="339" maxY="397" name="hardware-l"/>
-  <symbol minX="1502" maxX="1560" minY="339" maxY="397" name="gate-l"/>
-  <symbol minX="1560" maxX="1618" minY="339" maxY="397" name="hand-m"/>
-  <symbol minX="1618" maxX="1676" minY="339" maxY="397" name="gift-l"/>
-  <symbol minX="1676" maxX="1734" minY="339" maxY="397" name="hand-l"/>
-  <symbol minX="1734" maxX="1792" minY="339" maxY="397" name="golf-l"/>
-  <symbol minX="1792" maxX="1850" minY="339" maxY="397" name="hairdresser-l"/>
-  <symbol minX="1850" maxX="1908" minY="339" maxY="397" name="tomb-l"/>
-  <symbol minX="1908" maxX="1966" minY="339" maxY="397" name="greengrocer-l"/>
-  <symbol minX="1966" maxX="2024" minY="339" maxY="397" name="grocery-l"/>
-  <symbol minX="0" maxX="56" minY="397" maxY="453" name="greengrocer-m"/>
-  <symbol minX="56" maxX="112" minY="397" maxY="453" name="grocery-m"/>
-  <symbol minX="112" maxX="168" minY="397" maxY="453" name="tomb-m"/>
-  <symbol minX="168" maxX="224" minY="397" maxY="453" name="golf-m"/>
-  <symbol minX="224" maxX="280" minY="397" maxY="453" name="hairdresser-m"/>
-  <symbol minX="280" maxX="336" minY="397" maxY="453" name="gift-m"/>
-  <symbol minX="336" maxX="392" minY="397" maxY="453" name="gate-m"/>
-  <symbol minX="392" maxX="448" minY="397" maxY="453" name="toll_booth-m"/>
-  <symbol minX="448" maxX="504" minY="397" maxY="453" name="archery-m"/>
-  <symbol minX="504" maxX="560" minY="397" maxY="453" name="hardware-m"/>
-  <symbol minX="560" maxX="616" minY="397" maxY="453" name="garden-m"/>
-  <symbol minX="616" maxX="672" minY="397" maxY="453" name="helipad-m"/>
-  <symbol minX="672" maxX="728" minY="397" maxY="453" name="tourism-m"/>
-  <symbol minX="728" maxX="784" minY="397" maxY="453" name="gallery-m"/>
-  <symbol minX="784" maxX="840" minY="397" maxY="453" name="furniture-m"/>
-  <symbol minX="840" maxX="896" minY="397" maxY="453" name="garden_center-m"/>
-  <symbol minX="896" maxX="952" minY="397" maxY="453" name="funicular-m"/>
-  <symbol minX="952" maxX="1008" minY="397" maxY="453" name="historic-ship-m"/>
-  <symbol minX="1008" maxX="1064" minY="397" maxY="453" name="townhall-m"/>
-  <symbol minX="1064" maxX="1120" minY="397" maxY="453" name="hospital-m"/>
-  <symbol minX="1120" maxX="1176" minY="397" maxY="453" name="toilets-m"/>
-  <symbol minX="1176" maxX="1232" minY="397" maxY="453" name="fuel-m"/>
-  <symbol minX="1232" maxX="1288" minY="397" maxY="453" name="hotel-m"/>
-  <symbol minX="1288" maxX="1344" minY="397" maxY="453" name="fountain-m"/>
-  <symbol minX="1344" maxX="1400" minY="397" maxY="453" name="florist-m"/>
-  <symbol minX="1400" maxX="1456" minY="397" maxY="453" name="toys-m"/>
-  <symbol minX="1456" maxX="1512" minY="397" maxY="453" name="shop-bicycle-m"/>
-  <symbol minX="1512" maxX="1568" minY="397" maxY="453" name="fire_station-m"/>
-  <symbol minX="1568" maxX="1624" minY="397" maxY="453" name="information-m"/>
-  <symbol minX="1624" maxX="1680" minY="397" maxY="453" name="theatre-m"/>
-  <symbol minX="1680" maxX="1736" minY="397" maxY="453" name="fastfood-m"/>
-  <symbol minX="1736" maxX="1792" minY="397" maxY="453" name="jewelry-m"/>
-  <symbol minX="1792" maxX="1848" minY="397" maxY="453" name="train-m"/>
-  <symbol minX="1848" maxX="1904" minY="397" maxY="453" name="tram-m"/>
-  <symbol minX="1904" maxX="1960" minY="397" maxY="453" name="embassy-m"/>
-  <symbol minX="1960" maxX="2016" minY="397" maxY="453" name="electronics-m"/>
-  <symbol minX="0" maxX="56" minY="453" maxY="509" name="kiosk-m"/>
-  <symbol minX="56" maxX="112" minY="453" maxY="509" name="drugs"/>
-  <symbol minX="112" maxX="168" minY="453" maxY="509" name="vending-m"/>
-  <symbol minX="168" maxX="224" minY="453" maxY="509" name="drinking-water-m"/>
-  <symbol minX="224" maxX="280" minY="453" maxY="509" name="library-m"/>
-  <symbol minX="280" maxX="336" minY="453" maxY="509" name="tennis-m"/>
-  <symbol minX="336" maxX="392" minY="453" maxY="509" name="volcano-m"/>
-  <symbol minX="392" maxX="448" minY="453" maxY="509" name="lift_gate-m"/>
-  <symbol minX="448" maxX="504" minY="453" maxY="509" name="doityourself-m"/>
-  <symbol minX="504" maxX="560" minY="453" maxY="509" name="lighthouse-m"/>
-  <symbol minX="560" maxX="616" minY="453" maxY="509" name="dog_park-m"/>
-  <symbol minX="616" maxX="672" minY="453" maxY="509" name="diving-m"/>
-  <symbol minX="672" maxX="728" minY="453" maxY="509" name="atm-m"/>
-  <symbol minX="728" maxX="784" minY="453" maxY="509" name="taxi-m"/>
-  <symbol minX="784" maxX="840" minY="453" maxY="509" name="department_store-m"/>
-  <symbol minX="840" maxX="896" minY="453" maxY="509" name="mail-m"/>
-  <symbol minX="896" maxX="952" minY="453" maxY="509" name="curling-m"/>
-  <symbol minX="952" maxX="1008" minY="453" maxY="509" name="shoes-m"/>
-  <symbol minX="1008" maxX="1064" minY="453" maxY="509" name="marketplace-m"/>
-  <symbol minX="1064" maxX="1120" minY="453" maxY="509" name="swimming-m"/>
-  <symbol minX="1120" maxX="1176" minY="453" maxY="509" name="cricket-m"/>
-  <symbol minX="1176" maxX="1232" minY="453" maxY="509" name="convenience-m"/>
-  <symbol minX="1232" maxX="1288" minY="453" maxY="509" name="military-m"/>
-  <symbol minX="1288" maxX="1344" minY="453" maxY="509" name="sweets-m"/>
-  <symbol minX="1344" maxX="1400" minY="453" maxY="509" name="computer-m"/>
-  <symbol minX="1400" maxX="1456" minY="453" maxY="509" name="mobile_phone-m"/>
-  <symbol minX="1456" maxX="1512" minY="453" maxY="509" name="wayside_cross-m"/>
-  <symbol minX="1512" maxX="1568" minY="453" maxY="509" name="monument-m"/>
-  <symbol minX="1568" maxX="1624" minY="453" maxY="509" name="college-m"/>
-  <symbol minX="1624" maxX="1680" minY="453" maxY="509" name="clothes-m"/>
-  <symbol minX="1680" maxX="1736" minY="453" maxY="509" name="motel-m"/>
-  <symbol minX="1736" maxX="1792" minY="453" maxY="509" name="cinema-m"/>
-  <symbol minX="1792" maxX="1848" minY="453" maxY="509" name="museum-m"/>
-  <symbol minX="1848" maxX="1904" minY="453" maxY="509" name="subway-spb-m"/>
-  <symbol minX="1904" maxX="1960" minY="453" maxY="509" name="australian-football-m"/>
-  <symbol minX="1960" maxX="2016" minY="453" maxY="509" name="shop-m"/>
-  <symbol minX="0" maxX="56" minY="509" maxY="565" name="ship-m"/>
-  <symbol minX="56" maxX="112" minY="509" maxY="565" name="bakery-m"/>
-  <symbol minX="112" maxX="168" minY="509" maxY="565" name="banknote-m"/>
-  <symbol minX="168" maxX="224" minY="509" maxY="565" name="chemist-m"/>
-  <symbol minX="224" maxX="280" minY="509" maxY="565" name="wayside_shrine-m"/>
-  <symbol minX="280" maxX="336" minY="509" maxY="565" name="npark-m"/>
-  <symbol minX="336" maxX="392" minY="509" maxY="565" name="school-m"/>
-  <symbol minX="392" maxX="448" minY="509" maxY="565" name="cemetery-m"/>
-  <symbol minX="448" maxX="504" minY="509" maxY="565" name="nparkf-m "/>
-  <symbol minX="504" maxX="560" minY="509" maxY="565" name="nparkf-m"/>
-  <symbol minX="560" maxX="616" minY="509" maxY="565" name="bar-m"/>
-  <symbol minX="616" maxX="672" minY="509" maxY="565" name="cave-m"/>
-  <symbol minX="672" maxX="728" minY="509" maxY="565" name="windmill-m"/>
-  <symbol minX="728" maxX="784" minY="509" maxY="565" name="skiing-m"/>
-  <symbol minX="784" maxX="840" minY="509" maxY="565" name="casino-m"/>
-  <symbol minX="840" maxX="896" minY="509" maxY="565" name="optician-m"/>
-  <symbol minX="896" maxX="952" minY="509" maxY="565" name="caravan_site-m"/>
-  <symbol minX="952" maxX="1008" minY="509" maxY="565" name="park-m"/>
-  <symbol minX="1008" maxX="1064" minY="509" maxY="565" name="america-football-m"/>
-  <symbol minX="1064" maxX="1120" minY="509" maxY="565" name="restaurant-m"/>
-  <symbol minX="1120" maxX="1176" minY="509" maxY="565" name="car_sharing-m"/>
-  <symbol minX="1176" maxX="1232" minY="509" maxY="565" name="zoo-m"/>
-  <symbol minX="1232" maxX="1288" minY="509" maxY="565" name="parking-meter-m"/>
-  <symbol minX="1288" maxX="1344" minY="509" maxY="565" name="subway-newyork-m"/>
-  <symbol minX="1344" maxX="1400" minY="509" maxY="565" name="campsite-m"/>
-  <symbol minX="1400" maxX="1456" minY="509" maxY="565" name="baseball-m"/>
-  <symbol minX="1456" maxX="1512" minY="509" maxY="565" name="basketball-m"/>
-  <symbol minX="1512" maxX="1568" minY="509" maxY="565" name="subway-m"/>
-  <symbol minX="1568" maxX="1624" minY="509" maxY="565" name="alpine_hut-m"/>
-  <symbol minX="1624" maxX="1680" minY="509" maxY="565" name="cafe-m"/>
-  <symbol minX="1680" maxX="1736" minY="509" maxY="565" name="pharmacy-2-m"/>
-  <symbol minX="1736" maxX="1792" minY="509" maxY="565" name="cable-car-m"/>
-  <symbol minX="1792" maxX="1848" minY="509" maxY="565" name="pharmacy-m"/>
-  <symbol minX="1848" maxX="1904" minY="509" maxY="565" name="subway-entrance-m"/>
-  <symbol minX="1904" maxX="1960" minY="509" maxY="565" name="butcher-m"/>
-  <symbol minX="1960" maxX="2016" minY="509" maxY="565" name="phone-m"/>
-  <symbol minX="0" maxX="56" minY="565" maxY="621" name="soccer-m"/>
-  <symbol minX="56" maxX="112" minY="565" maxY="621" name="bus-m"/>
-  <symbol minX="112" maxX="168" minY="565" maxY="621" name="bowls-m"/>
-  <symbol minX="168" maxX="224" minY="565" maxY="621" name="recycling-m"/>
-  <symbol minX="224" maxX="280" minY="565" maxY="621" name="boundary_stone-m"/>
-  <symbol minX="280" maxX="336" minY="565" maxY="621" name="pitch-m"/>
-  <symbol minX="336" maxX="392" minY="565" maxY="621" name="subway-entrance-2-m"/>
-  <symbol minX="392" maxX="448" minY="565" maxY="621" name="book-shop-m"/>
-  <symbol minX="448" maxX="504" minY="565" maxY="621" name="place-of-worship-m"/>
-  <symbol minX="504" maxX="560" minY="565" maxY="621" name="bbq-m"/>
-  <symbol minX="560" maxX="616" minY="565" maxY="621" name="alcohol-m"/>
-  <symbol minX="616" maxX="672" minY="565" maxY="621" name="police-m"/>
-  <symbol minX="672" maxX="728" minY="565" maxY="621" name="pub-m"/>
-  <symbol minX="728" maxX="784" minY="565" maxY="621" name="bicycle-m"/>
-  <symbol minX="784" maxX="840" minY="565" maxY="621" name="postbox-m"/>
-  <symbol minX="840" maxX="896" minY="565" maxY="621" name="beach-m"/>
-  <symbol minX="896" maxX="952" minY="565" maxY="621" name="beauty-m"/>
-  <symbol minX="952" maxX="1008" minY="565" maxY="621" name="sports-m"/>
-  <symbol minX="1008" maxX="1059" minY="565" maxY="616" name="subway-rome-l"/>
-  <symbol minX="1059" maxX="1110" minY="565" maxY="616" name="subway-berlin-l"/>
-  <symbol minX="1110" maxX="1161" minY="565" maxY="616" name="lightrail-berlin-m"/>
-  <symbol minX="1161" maxX="1212" minY="565" maxY="616" name="speedcam-l"/>
-  <symbol minX="1212" maxX="1263" minY="565" maxY="616" name="parking-l"/>
-  <symbol minX="1263" maxX="1321" minY="565" maxY="616" name="subway-moscow-l"/>
-  <symbol minX="1321" maxX="1368" minY="565" maxY="612" name="no-icon-leisure"/>
-  <symbol minX="1368" maxX="1415" minY="565" maxY="612" name="subway-paris-m"/>
-  <symbol minX="1415" maxX="1462" minY="565" maxY="612" name="no-icon-amenity"/>
-  <symbol minX="1462" maxX="1509" minY="565" maxY="612" name="no-icon-tourism"/>
-  <symbol minX="1509" maxX="1563" minY="565" maxY="612" name="subway-moscow-m"/>
-  <symbol minX="1563" maxX="1610" minY="565" maxY="612" name="subway-berlin-m"/>
-  <symbol minX="1610" maxX="1657" minY="565" maxY="612" name="no-icon"/>
-  <symbol minX="1657" maxX="1704" minY="565" maxY="612" name="subway-rome-m"/>
-  <symbol minX="1704" maxX="1751" minY="565" maxY="612" name="no-icon-shop"/>
-  <symbol minX="1751" maxX="1793" minY="565" maxY="610" name="office-s"/>
-  <symbol minX="1793" maxX="1835" minY="565" maxY="610" name="beer-s"/>
-  <symbol minX="1835" maxX="1877" minY="565" maxY="610" name="remains-s"/>
-  <symbol minX="1877" maxX="1935" minY="565" maxY="610" name="subway-london-l"/>
-  <symbol minX="1935" maxX="1980" minY="565" maxY="610" name="airport-s"/>
-  <symbol minX="1980" maxX="2022" minY="565" maxY="610" name="picnic-s"/>
-  <symbol minX="0" maxX="42" minY="621" maxY="666" name="waterfall-s"/>
-  <symbol minX="42" maxX="84" minY="621" maxY="666" name="bcontrol-s"/>
-  <symbol minX="84" maxX="126" minY="621" maxY="666" name="hunting-tower-s"/>
-  <symbol minX="126" maxX="168" minY="621" maxY="666" name="heliport-s"/>
-  <symbol minX="168" maxX="210" minY="621" maxY="663" name="ship-s"/>
-  <symbol minX="210" maxX="252" minY="621" maxY="663" name="shop-s"/>
-  <symbol minX="252" maxX="294" minY="621" maxY="663" name="school-s"/>
-  <symbol minX="294" maxX="336" minY="621" maxY="663" name="funicular-s"/>
-  <symbol minX="336" maxX="378" minY="621" maxY="663" name="skiing-s"/>
-  <symbol minX="378" maxX="420" minY="621" maxY="663" name="restaurant-s"/>
-  <symbol minX="420" maxX="462" minY="621" maxY="663" name="recycling-s"/>
-  <symbol minX="462" maxX="504" minY="621" maxY="663" name="soccer-s"/>
-  <symbol minX="504" maxX="546" minY="621" maxY="663" name="alcohol-s"/>
-  <symbol minX="546" maxX="588" minY="621" maxY="663" name="speedcam-m"/>
-  <symbol minX="588" maxX="630" minY="621" maxY="663" name="america-football-s"/>
-  <symbol minX="630" maxX="672" minY="621" maxY="663" name="pub-s"/>
-  <symbol minX="672" maxX="714" minY="621" maxY="663" name="power-s"/>
-  <symbol minX="714" maxX="756" minY="621" maxY="663" name="tourism-s"/>
-  <symbol minX="756" maxX="798" minY="621" maxY="663" name="atm-s"/>
-  <symbol minX="798" maxX="840" minY="621" maxY="663" name="bar-s"/>
-  <symbol minX="840" maxX="882" minY="621" maxY="663" name="gallery-s"/>
-  <symbol minX="882" maxX="940" minY="621" maxY="663" name="subway-barcelona-m"/>
-  <symbol minX="940" maxX="991" minY="621" maxY="663" name="subway-barcelona-s"/>
-  <symbol minX="991" maxX="1033" minY="621" maxY="663" name="police-s"/>
-  <symbol minX="1033" maxX="1075" minY="621" maxY="663" name="place-of-worship-s"/>
-  <symbol minX="1075" maxX="1117" minY="621" maxY="663" name="baseball-s"/>
-  <symbol minX="1117" maxX="1159" minY="621" maxY="663" name="pitch-s"/>
-  <symbol minX="1159" maxX="1201" minY="621" maxY="663" name="subway-entrance-2-s"/>
-  <symbol minX="1201" maxX="1243" minY="621" maxY="663" name="subway-entrance-arrow"/>
-  <symbol minX="1243" maxX="1285" minY="621" maxY="663" name="phone-s"/>
-  <symbol minX="1285" maxX="1327" minY="621" maxY="663" name="pharmacy-s"/>
-  <symbol minX="1327" maxX="1369" minY="621" maxY="663" name="subway-entrance-s"/>
-  <symbol minX="1369" maxX="1411" minY="621" maxY="663" name="basketball-s"/>
-  <symbol minX="1411" maxX="1453" minY="621" maxY="663" name="bicycle-s"/>
-  <symbol minX="1453" maxX="1495" minY="621" maxY="663" name="book-shop-s"/>
-  <symbol minX="1495" maxX="1537" minY="621" maxY="663" name="bus-s"/>
-  <symbol minX="1537" maxX="1579" minY="621" maxY="663" name="cable-car-s"/>
-  <symbol minX="1579" maxX="1635" minY="621" maxY="663" name="subway-london-m"/>
-  <symbol minX="1635" maxX="1677" minY="621" maxY="663" name="cafe-s"/>
-  <symbol minX="1677" maxX="1719" minY="621" maxY="663" name="zoo-s"/>
-  <symbol minX="1719" maxX="1761" minY="621" maxY="663" name="garden-s"/>
-  <symbol minX="1761" maxX="1819" minY="621" maxY="663" name="subway-madrid-m"/>
-  <symbol minX="1819" maxX="1861" minY="621" maxY="663" name="campsite-s"/>
-  <symbol minX="1861" maxX="1903" minY="621" maxY="663" name="car-repair-s"/>
-  <symbol minX="1903" maxX="1945" minY="621" maxY="663" name="windmill-s"/>
-  <symbol minX="1945" maxX="1987" minY="621" maxY="663" name="casino-s"/>
-  <symbol minX="1987" maxX="2029" minY="621" maxY="663" name="cave-s"/>
-  <symbol minX="0" maxX="42" minY="666" maxY="708" name="cemetery-s"/>
-  <symbol minX="42" maxX="84" minY="666" maxY="708" name="cinema-s"/>
-  <symbol minX="84" maxX="126" minY="666" maxY="708" name="college-s"/>
-  <symbol minX="126" maxX="168" minY="666" maxY="708" name="volcano-s"/>
-  <symbol minX="168" maxX="210" minY="666" maxY="708" name="subway-newyork-s"/>
-  <symbol minX="210" maxX="252" minY="666" maxY="708" name="drinking-water-s"/>
-  <symbol minX="252" maxX="294" minY="666" maxY="708" name="golf-s"/>
-  <symbol minX="294" maxX="336" minY="666" maxY="708" name="park-s"/>
-  <symbol minX="336" maxX="378" minY="666" maxY="708" name="embassy-s"/>
-  <symbol minX="378" maxX="420" minY="666" maxY="708" name="nparkf-s"/>
-  <symbol minX="420" maxX="462" minY="666" maxY="708" name="npark-s"/>
-  <symbol minX="462" maxX="504" minY="666" maxY="708" name="tram-s"/>
-  <symbol minX="504" maxX="546" minY="666" maxY="708" name="subway-s"/>
-  <symbol minX="546" maxX="588" minY="666" maxY="708" name="train-s"/>
-  <symbol minX="588" maxX="630" minY="666" maxY="708" name="museum-s"/>
-  <symbol minX="630" maxX="672" minY="666" maxY="708" name="subway-spb-s"/>
-  <symbol minX="672" maxX="714" minY="666" maxY="708" name="equestrian-s"/>
-  <symbol minX="714" maxX="756" minY="666" maxY="708" name="fastfood-s"/>
-  <symbol minX="756" maxX="798" minY="666" maxY="708" name="fire_station-s"/>
-  <symbol minX="798" maxX="840" minY="666" maxY="708" name="fountain-s"/>
-  <symbol minX="840" maxX="882" minY="666" maxY="708" name="monument-s"/>
-  <symbol minX="882" maxX="924" minY="666" maxY="708" name="military-s"/>
-  <symbol minX="924" maxX="966" minY="666" maxY="708" name="townhall-s"/>
-  <symbol minX="966" maxX="1024" minY="666" maxY="708" name="metro-barcelona-m"/>
-  <symbol minX="1024" maxX="1066" minY="666" maxY="708" name="swimming-s"/>
-  <symbol minX="1066" maxX="1108" minY="666" maxY="708" name="mail-s"/>
-  <symbol minX="1108" maxX="1150" minY="666" maxY="708" name="fuel-s"/>
-  <symbol minX="1150" maxX="1192" minY="666" maxY="708" name="lighthouse-s"/>
-  <symbol minX="1192" maxX="1234" minY="666" maxY="708" name="library-s"/>
-  <symbol minX="1234" maxX="1276" minY="666" maxY="708" name="tennis-s"/>
-  <symbol minX="1276" maxX="1318" minY="666" maxY="708" name="kindergarten-s"/>
-  <symbol minX="1318" maxX="1360" minY="666" maxY="708" name="information-s"/>
-  <symbol minX="1360" maxX="1402" minY="666" maxY="708" name="theatre-s"/>
-  <symbol minX="1402" maxX="1444" minY="666" maxY="708" name="hotel-s"/>
-  <symbol minX="1444" maxX="1486" minY="666" maxY="708" name="hospital-s"/>
-  <symbol minX="1486" maxX="1528" minY="666" maxY="708" name="toilets-s"/>
-  <symbol minX="1528" maxX="1570" minY="666" maxY="708" name="helipad-s"/>
-  <symbol minX="1570" maxX="1612" minY="666" maxY="708" name="hand-s"/>
-  <symbol minX="1612" maxX="1654" minY="666" maxY="708" name="grocery-s"/>
-  <symbol minX="1654" maxX="1712" minY="666" maxY="707" name="subway-madrid-l"/>
-  <symbol minX="1712" maxX="1770" minY="666" maxY="707" name="subway-barcelona-l"/>
-  <symbol minX="1770" maxX="1810" minY="666" maxY="706" name="parking-m"/>
-  <symbol minX="1810" maxX="1850" minY="666" maxY="706" name="route_from"/>
-  <symbol minX="1850" maxX="1888" minY="666" maxY="706" name="s-arrow"/>
-  <symbol minX="1888" maxX="1926" minY="666" maxY="704" name="lightrail-berlin-s"/>
-  <symbol minX="1926" maxX="1977" minY="666" maxY="704" name="metro-barcelona-s"/>
-  <symbol minX="1977" maxX="2028" minY="666" maxY="704" name="subway-madrid-s"/>
-  <symbol minX="0" maxX="38" minY="708" maxY="746" name="subway-paris-s"/>
-  <symbol minX="38" maxX="76" minY="708" maxY="746" name="current-position"/>
-  <symbol minX="76" maxX="114" minY="708" maxY="746" name="peak-l"/>
-  <symbol minX="114" maxX="170" minY="708" maxY="746" name="subway-kiev-m"/>
-  <symbol minX="170" maxX="226" minY="708" maxY="746" name="subway-kiev-l"/>
-  <symbol minX="226" maxX="262" minY="708" maxY="744" name="subway-moscow-s"/>
-  <symbol minX="262" maxX="295" minY="708" maxY="741" name="subway-rome-s"/>
-  <symbol minX="295" maxX="328" minY="708" maxY="741" name="subway-berlin-s"/>
-  <symbol minX="328" maxX="366" minY="708" maxY="741" name="bench"/>
-  <symbol minX="366" maxX="399" minY="708" maxY="741" name="parking-s"/>
-  <symbol minX="399" maxX="432" minY="708" maxY="741" name="speedcam-s"/>
-  <symbol minX="432" maxX="474" minY="708" maxY="741" name="subway-london-s"/>
-  <symbol minX="474" maxX="530" minY="708" maxY="739" name="subway-minsk-l"/>
-  <symbol minX="530" maxX="563" minY="708" maxY="739" name="peakt-l"/>
-  <symbol minX="563" maxX="594" minY="708" maxY="739" name="survey_point-l"/>
-  <symbol minX="594" maxX="625" minY="708" maxY="739" name="star-l"/>
-  <symbol minX="625" maxX="654" minY="708" maxY="737" name="api-result"/>
-  <symbol minX="654" maxX="683" minY="708" maxY="737" name="star-m"/>
-  <symbol minX="683" maxX="730" minY="708" maxY="737" name="subway-kiev-s"/>
-  <symbol minX="730" maxX="758" minY="708" maxY="736" name="search-result"/>
-  <symbol minX="758" maxX="805" minY="708" maxY="735" name="subway-minsk-m"/>
-  <symbol minX="805" maxX="834" minY="708" maxY="735" name="peak-m"/>
-  <symbol minX="834" maxX="861" minY="708" maxY="735" name="survey_point-m"/>
-  <symbol minX="861" maxX="888" minY="708" maxY="735" name="subway-newyork-xs"/>
-  <symbol minX="888" maxX="915" minY="708" maxY="735" name="subway-xs"/>
-  <symbol minX="915" maxX="957" minY="708" maxY="735" name="railway-crossing"/>
-  <symbol minX="957" maxX="999" minY="708" maxY="732" name="subway-minsk-s"/>
-  <symbol minX="999" maxX="1023" minY="708" maxY="732" name="crossing-l"/>
-  <symbol minX="1023" maxX="1047" minY="708" maxY="732" name="star-s"/>
-  <symbol minX="1047" maxX="1098" minY="708" maxY="730" name="arrow-m"/>
-  <symbol minX="1098" maxX="1122" minY="708" maxY="730" name="peak-s"/>
-  <symbol minX="1122" maxX="1146" minY="708" maxY="730" name="peakt-m"/>
-  <symbol minX="1146" maxX="1168" minY="708" maxY="730" name="survey_point-s"/>
-  <symbol minX="1168" maxX="1188" minY="708" maxY="728" name="crossing-m"/>
-  <symbol minX="1188" maxX="1208" minY="708" maxY="728" name="entrance-s"/>
-  <symbol minX="1208" maxX="1228" minY="708" maxY="726" name="peakt-s"/>
-  <symbol minX="1228" maxX="1243" minY="708" maxY="723" name="tree-l"/>
-  <symbol minX="1243" maxX="1258" minY="708" maxY="723" name="crossing-s"/>
-  <symbol minX="1258" maxX="1273" minY="708" maxY="723" name="none"/>
-  <symbol minX="1273" maxX="1288" minY="708" maxY="723" name="dot-m"/>
-  <symbol minX="1288" maxX="1326" minY="708" maxY="723" name="arrow-s"/>
-  <symbol minX="1326" maxX="1339" minY="708" maxY="721" name="tree-m"/>
-  <symbol minX="1339" maxX="1352" minY="708" maxY="721" name="entrance-xs"/>
-  <symbol minX="1352" maxX="1363" minY="708" maxY="719" name="dot-s-light"/>
-  <symbol minX="1363" maxX="1374" minY="708" maxY="719" name="tree-s"/>
-  <symbol minX="1374" maxX="1385" minY="708" maxY="719" name="zero-icon"/>
-  <symbol minX="1385" maxX="1396" minY="708" maxY="719" name="dot-s"/>
+  <symbol minX="174" maxX="232" minY="281" maxY="339" name="place-of-worship-l"/>
+  <symbol minX="232" maxX="290" minY="281" maxY="339" name="pitch-l"/>
+  <symbol minX="290" maxX="346" minY="281" maxY="339" name="picnic-m"/>
+  <symbol minX="346" maxX="403" minY="281" maxY="339" name="picnic-l"/>
+  <symbol minX="403" maxX="461" minY="281" maxY="339" name="curling-l"/>
+  <symbol minX="461" maxX="519" minY="281" maxY="339" name="phone-l"/>
+  <symbol minX="519" maxX="577" minY="281" maxY="339" name="dentist-l"/>
+  <symbol minX="577" maxX="635" minY="281" maxY="339" name="dentist-m"/>
+  <symbol minX="635" maxX="693" minY="281" maxY="339" name="pharmacy-l"/>
+  <symbol minX="693" maxX="751" minY="281" maxY="339" name="department_store-l"/>
+  <symbol minX="751" maxX="809" minY="281" maxY="339" name="parking-meter-l"/>
+  <symbol minX="809" maxX="867" minY="281" maxY="339" name="diving-l"/>
+  <symbol minX="867" maxX="925" minY="281" maxY="339" name="park-l"/>
+  <symbol minX="925" maxX="983" minY="281" maxY="339" name="dog_park-l"/>
+  <symbol minX="983" maxX="1041" minY="281" maxY="339" name="optician-l"/>
+  <symbol minX="1041" maxX="1099" minY="281" maxY="339" name="doityourself-l"/>
+  <symbol minX="1099" maxX="1155" minY="281" maxY="339" name="office-m"/>
+  <symbol minX="1155" maxX="1212" minY="281" maxY="339" name="office-l"/>
+  <symbol minX="1212" maxX="1270" minY="281" maxY="339" name="nparkf-l"/>
+  <symbol minX="1270" maxX="1328" minY="281" maxY="339" name="npark-l"/>
+  <symbol minX="1328" maxX="1386" minY="281" maxY="339" name="drinking-water-l"/>
+  <symbol minX="1386" maxX="1444" minY="281" maxY="339" name="museum-l"/>
+  <symbol minX="1444" maxX="1502" minY="281" maxY="339" name="motel-l"/>
+  <symbol minX="1502" maxX="1560" minY="281" maxY="339" name="monument-l"/>
+  <symbol minX="1560" maxX="1618" minY="281" maxY="339" name="electronics-l"/>
+  <symbol minX="1618" maxX="1676" minY="281" maxY="339" name="mobile_phone-l"/>
+  <symbol minX="1676" maxX="1734" minY="281" maxY="339" name="embassy-l"/>
+  <symbol minX="1734" maxX="1792" minY="281" maxY="339" name="marketplace-l"/>
+  <symbol minX="1792" maxX="1850" minY="281" maxY="339" name="mail-l"/>
+  <symbol minX="1850" maxX="1908" minY="281" maxY="339" name="lightrail-berlin-l"/>
+  <symbol minX="1908" maxX="1966" minY="281" maxY="339" name="lighthouse-l"/>
+  <symbol minX="1966" maxX="2024" minY="281" maxY="339" name="equestrian-l"/>
+  <symbol minX="0" maxX="58" minY="339" maxY="397" name="equestrian-m"/>
+  <symbol minX="58" maxX="116" minY="339" maxY="397" name="lift_gate-l"/>
+  <symbol minX="116" maxX="174" minY="339" maxY="397" name="fastfood-l"/>
+  <symbol minX="174" maxX="232" minY="339" maxY="397" name="library-l"/>
+  <symbol minX="232" maxX="288" minY="339" maxY="397" name="laundry-m"/>
+  <symbol minX="288" maxX="346" minY="339" maxY="397" name="fire_station-l"/>
+  <symbol minX="346" maxX="403" minY="339" maxY="397" name="laundry-l"/>
+  <symbol minX="403" maxX="461" minY="339" maxY="397" name="kiosk-l"/>
+  <symbol minX="461" maxX="519" minY="339" maxY="397" name="florist-l"/>
+  <symbol minX="519" maxX="577" minY="339" maxY="397" name="kindergarten-m"/>
+  <symbol minX="577" maxX="635" minY="339" maxY="397" name="fountain-l"/>
+  <symbol minX="635" maxX="693" minY="339" maxY="397" name="kindergarten-l"/>
+  <symbol minX="693" maxX="751" minY="339" maxY="397" name="jewelry-l"/>
+  <symbol minX="751" maxX="809" minY="339" maxY="397" name="fuel-l"/>
+  <symbol minX="809" maxX="867" minY="339" maxY="397" name="information-l"/>
+  <symbol minX="867" maxX="923" minY="339" maxY="397" name="hunting-tower-m"/>
+  <symbol minX="923" maxX="981" minY="339" maxY="397" name="funicular-l"/>
+  <symbol minX="981" maxX="1038" minY="339" maxY="397" name="hunting-tower-l"/>
+  <symbol minX="1038" maxX="1096" minY="339" maxY="397" name="hotel-l"/>
+  <symbol minX="1096" maxX="1154" minY="339" maxY="397" name="furniture-l"/>
+  <symbol minX="1154" maxX="1212" minY="339" maxY="397" name="hospital-l"/>
+  <symbol minX="1212" maxX="1270" minY="339" maxY="397" name="gallery-l"/>
+  <symbol minX="1270" maxX="1328" minY="339" maxY="397" name="historic-ship-l"/>
+  <symbol minX="1328" maxX="1384" minY="339" maxY="397" name="heliport-m"/>
+  <symbol minX="1384" maxX="1442" minY="339" maxY="397" name="garden-l"/>
+  <symbol minX="1442" maxX="1499" minY="339" maxY="397" name="heliport-l"/>
+  <symbol minX="1499" maxX="1557" minY="339" maxY="397" name="helipad-l"/>
+  <symbol minX="1557" maxX="1615" minY="339" maxY="397" name="garden_center-l"/>
+  <symbol minX="1615" maxX="1673" minY="339" maxY="397" name="hardware-l"/>
+  <symbol minX="1673" maxX="1731" minY="339" maxY="397" name="gate-l"/>
+  <symbol minX="1731" maxX="1789" minY="339" maxY="397" name="hand-m"/>
+  <symbol minX="1789" maxX="1847" minY="339" maxY="397" name="gift-l"/>
+  <symbol minX="1847" maxX="1905" minY="339" maxY="397" name="hand-l"/>
+  <symbol minX="1905" maxX="1963" minY="339" maxY="397" name="golf-l"/>
+  <symbol minX="1963" maxX="2021" minY="339" maxY="397" name="hairdresser-l"/>
+  <symbol minX="0" maxX="58" minY="397" maxY="455" name="grocery-l"/>
+  <symbol minX="58" maxX="116" minY="397" maxY="455" name="greengrocer-l"/>
+  <symbol minX="116" maxX="172" minY="397" maxY="453" name="greengrocer-m"/>
+  <symbol minX="172" maxX="228" minY="397" maxY="453" name="atm-m"/>
+  <symbol minX="228" maxX="284" minY="397" maxY="453" name="grocery-m"/>
+  <symbol minX="284" maxX="340" minY="397" maxY="453" name="casino-m"/>
+  <symbol minX="340" maxX="396" minY="397" maxY="453" name="golf-m"/>
+  <symbol minX="396" maxX="452" minY="397" maxY="453" name="hairdresser-m"/>
+  <symbol minX="452" maxX="508" minY="397" maxY="453" name="gift-m"/>
+  <symbol minX="508" maxX="564" minY="397" maxY="453" name="gate-m"/>
+  <symbol minX="564" maxX="620" minY="397" maxY="453" name="australian-football-m"/>
+  <symbol minX="620" maxX="676" minY="397" maxY="453" name="garden_center-m"/>
+  <symbol minX="676" maxX="732" minY="397" maxY="453" name="hardware-m"/>
+  <symbol minX="732" maxX="788" minY="397" maxY="453" name="alcohol-m"/>
+  <symbol minX="788" maxX="844" minY="397" maxY="453" name="helipad-m"/>
+  <symbol minX="844" maxX="900" minY="397" maxY="453" name="bakery-m"/>
+  <symbol minX="900" maxX="956" minY="397" maxY="453" name="garden-m"/>
+  <symbol minX="956" maxX="1012" minY="397" maxY="453" name="alpine_hut-m"/>
+  <symbol minX="1012" maxX="1068" minY="397" maxY="453" name="shoes-m"/>
+  <symbol minX="1068" maxX="1124" minY="397" maxY="453" name="gallery-m"/>
+  <symbol minX="1124" maxX="1180" minY="397" maxY="453" name="historic-ship-m"/>
+  <symbol minX="1180" maxX="1236" minY="397" maxY="453" name="furniture-m"/>
+  <symbol minX="1236" maxX="1292" minY="397" maxY="453" name="hospital-m"/>
+  <symbol minX="1292" maxX="1348" minY="397" maxY="453" name="banknote-m"/>
+  <symbol minX="1348" maxX="1404" minY="397" maxY="453" name="america-football-m"/>
+  <symbol minX="1404" maxX="1460" minY="397" maxY="453" name="hotel-m"/>
+  <symbol minX="1460" maxX="1516" minY="397" maxY="453" name="bar-m"/>
+  <symbol minX="1516" maxX="1572" minY="397" maxY="453" name="funicular-m"/>
+  <symbol minX="1572" maxX="1628" minY="397" maxY="453" name="archery-m"/>
+  <symbol minX="1628" maxX="1684" minY="397" maxY="453" name="cave-m"/>
+  <symbol minX="1684" maxX="1740" minY="397" maxY="453" name="fuel-m"/>
+  <symbol minX="1740" maxX="1796" minY="397" maxY="453" name="information-m"/>
+  <symbol minX="1796" maxX="1852" minY="397" maxY="453" name="zoo-m"/>
+  <symbol minX="1852" maxX="1908" minY="397" maxY="453" name="windmill-m"/>
+  <symbol minX="1908" maxX="1964" minY="397" maxY="453" name="jewelry-m"/>
+  <symbol minX="1964" maxX="2020" minY="397" maxY="453" name="fountain-m"/>
+  <symbol minX="0" maxX="56" minY="455" maxY="511" name="florist-m"/>
+  <symbol minX="56" maxX="112" minY="455" maxY="511" name="baseball-m"/>
+  <symbol minX="112" maxX="168" minY="455" maxY="511" name="wayside_shrine-m"/>
+  <symbol minX="168" maxX="224" minY="455" maxY="511" name="kiosk-m"/>
+  <symbol minX="224" maxX="280" minY="455" maxY="511" name="fire_station-m"/>
+  <symbol minX="280" maxX="336" minY="455" maxY="511" name="wayside_cross-m"/>
+  <symbol minX="336" maxX="392" minY="455" maxY="511" name="fastfood-m"/>
+  <symbol minX="392" maxX="448" minY="455" maxY="511" name="library-m"/>
+  <symbol minX="448" maxX="504" minY="455" maxY="511" name="basketball-m"/>
+  <symbol minX="504" maxX="560" minY="455" maxY="511" name="shop-m"/>
+  <symbol minX="560" maxX="616" minY="455" maxY="511" name="lift_gate-m"/>
+  <symbol minX="616" maxX="672" minY="455" maxY="511" name="bbq-m"/>
+  <symbol minX="672" maxX="728" minY="455" maxY="511" name="lighthouse-m"/>
+  <symbol minX="728" maxX="784" minY="455" maxY="511" name="volcano-m"/>
+  <symbol minX="784" maxX="840" minY="455" maxY="511" name="ship-m"/>
+  <symbol minX="840" maxX="896" minY="455" maxY="511" name="caravan_site-m"/>
+  <symbol minX="896" maxX="952" minY="455" maxY="511" name="vending-m"/>
+  <symbol minX="952" maxX="1008" minY="455" maxY="511" name="beach-m"/>
+  <symbol minX="1008" maxX="1064" minY="455" maxY="511" name="mail-m"/>
+  <symbol minX="1064" maxX="1120" minY="455" maxY="511" name="tram-m"/>
+  <symbol minX="1120" maxX="1176" minY="455" maxY="511" name="embassy-m"/>
+  <symbol minX="1176" maxX="1232" minY="455" maxY="511" name="marketplace-m"/>
+  <symbol minX="1232" maxX="1288" minY="455" maxY="511" name="beauty-m"/>
+  <symbol minX="1288" maxX="1344" minY="455" maxY="511" name="train-m"/>
+  <symbol minX="1344" maxX="1400" minY="455" maxY="511" name="skiing-m"/>
+  <symbol minX="1400" maxX="1456" minY="455" maxY="511" name="military-m"/>
+  <symbol minX="1456" maxX="1512" minY="455" maxY="511" name="toys-m"/>
+  <symbol minX="1512" maxX="1568" minY="455" maxY="511" name="electronics-m"/>
+  <symbol minX="1568" maxX="1624" minY="455" maxY="511" name="mobile_phone-m"/>
+  <symbol minX="1624" maxX="1680" minY="455" maxY="511" name="drugs"/>
+  <symbol minX="1680" maxX="1736" minY="455" maxY="511" name="monument-m"/>
+  <symbol minX="1736" maxX="1792" minY="455" maxY="511" name="townhall-m"/>
+  <symbol minX="1792" maxX="1848" minY="455" maxY="511" name="bicycle-m"/>
+  <symbol minX="1848" maxX="1904" minY="455" maxY="511" name="motel-m"/>
+  <symbol minX="1904" maxX="1960" minY="455" maxY="511" name="drinking-water-m"/>
+  <symbol minX="1960" maxX="2016" minY="455" maxY="511" name="museum-m"/>
+  <symbol minX="0" maxX="56" minY="511" maxY="567" name="tourism-m"/>
+  <symbol minX="56" maxX="112" minY="511" maxY="567" name="school-m"/>
+  <symbol minX="112" maxX="168" minY="511" maxY="567" name="cemetery-m"/>
+  <symbol minX="168" maxX="224" minY="511" maxY="567" name="car_sharing-m"/>
+  <symbol minX="224" maxX="280" minY="511" maxY="567" name="soccer-m"/>
+  <symbol minX="280" maxX="336" minY="511" maxY="567" name="shop-bicycle-m"/>
+  <symbol minX="336" maxX="392" minY="511" maxY="567" name="tomb-m"/>
+  <symbol minX="392" maxX="448" minY="511" maxY="567" name="book-shop-m"/>
+  <symbol minX="448" maxX="504" minY="511" maxY="567" name="npark-m"/>
+  <symbol minX="504" maxX="560" minY="511" maxY="567" name="toll_booth-m"/>
+  <symbol minX="560" maxX="616" minY="511" maxY="567" name="toilets-m"/>
+  <symbol minX="616" maxX="672" minY="511" maxY="567" name="nparkf-m "/>
+  <symbol minX="672" maxX="728" minY="511" maxY="567" name="nparkf-m"/>
+  <symbol minX="728" maxX="784" minY="511" maxY="567" name="boundary_stone-m"/>
+  <symbol minX="784" maxX="840" minY="511" maxY="567" name="theatre-m"/>
+  <symbol minX="840" maxX="896" minY="511" maxY="567" name="doityourself-m"/>
+  <symbol minX="896" maxX="952" minY="511" maxY="567" name="restaurant-m"/>
+  <symbol minX="952" maxX="1008" minY="511" maxY="567" name="dog_park-m"/>
+  <symbol minX="1008" maxX="1064" minY="511" maxY="567" name="optician-m"/>
+  <symbol minX="1064" maxX="1120" minY="511" maxY="567" name="diving-m"/>
+  <symbol minX="1120" maxX="1176" minY="511" maxY="567" name="park-m"/>
+  <symbol minX="1176" maxX="1232" minY="511" maxY="567" name="bowls-m"/>
+  <symbol minX="1232" maxX="1288" minY="511" maxY="567" name="chemist-m"/>
+  <symbol minX="1288" maxX="1344" minY="511" maxY="567" name="tennis-m"/>
+  <symbol minX="1344" maxX="1400" minY="511" maxY="567" name="department_store-m"/>
+  <symbol minX="1400" maxX="1456" minY="511" maxY="567" name="parking-meter-m"/>
+  <symbol minX="1456" maxX="1512" minY="511" maxY="567" name="bus-m"/>
+  <symbol minX="1512" maxX="1568" minY="511" maxY="567" name="taxi-m"/>
+  <symbol minX="1568" maxX="1624" minY="511" maxY="567" name="swimming-m"/>
+  <symbol minX="1624" maxX="1680" minY="511" maxY="567" name="butcher-m"/>
+  <symbol minX="1680" maxX="1736" minY="511" maxY="567" name="sweets-m"/>
+  <symbol minX="1736" maxX="1792" minY="511" maxY="567" name="cable-car-m"/>
+  <symbol minX="1792" maxX="1848" minY="511" maxY="567" name="subway-spb-m"/>
+  <symbol minX="1848" maxX="1904" minY="511" maxY="567" name="pharmacy-2-m"/>
+  <symbol minX="1904" maxX="1960" minY="511" maxY="567" name="cinema-m"/>
+  <symbol minX="1960" maxX="2016" minY="511" maxY="567" name="pharmacy-m"/>
+  <symbol minX="0" maxX="56" minY="567" maxY="623" name="sports-m"/>
+  <symbol minX="56" maxX="112" minY="567" maxY="623" name="curling-m"/>
+  <symbol minX="112" maxX="168" minY="567" maxY="623" name="phone-m"/>
+  <symbol minX="168" maxX="224" minY="567" maxY="623" name="recycling-m"/>
+  <symbol minX="224" maxX="280" minY="567" maxY="623" name="cafe-m"/>
+  <symbol minX="280" maxX="336" minY="567" maxY="623" name="subway-newyork-m"/>
+  <symbol minX="336" maxX="392" minY="567" maxY="623" name="subway-entrance-2-m"/>
+  <symbol minX="392" maxX="448" minY="567" maxY="623" name="pub-m"/>
+  <symbol minX="448" maxX="504" minY="567" maxY="623" name="pitch-m"/>
+  <symbol minX="504" maxX="560" minY="567" maxY="623" name="clothes-m"/>
+  <symbol minX="560" maxX="616" minY="567" maxY="623" name="cricket-m"/>
+  <symbol minX="616" maxX="672" minY="567" maxY="623" name="place-of-worship-m"/>
+  <symbol minX="672" maxX="728" minY="567" maxY="623" name="subway-m"/>
+  <symbol minX="728" maxX="784" minY="567" maxY="623" name="convenience-m"/>
+  <symbol minX="784" maxX="840" minY="567" maxY="623" name="police-m"/>
+  <symbol minX="840" maxX="896" minY="567" maxY="623" name="subway-entrance-m"/>
+  <symbol minX="896" maxX="952" minY="567" maxY="623" name="computer-m"/>
+  <symbol minX="952" maxX="1008" minY="567" maxY="623" name="postbox-m"/>
+  <symbol minX="1008" maxX="1064" minY="567" maxY="623" name="campsite-m"/>
+  <symbol minX="1064" maxX="1120" minY="567" maxY="623" name="college-m"/>
+  <symbol minX="1120" maxX="1171" minY="567" maxY="618" name="subway-rome-l"/>
+  <symbol minX="1171" maxX="1229" minY="567" maxY="618" name="subway-moscow-l"/>
+  <symbol minX="1229" maxX="1280" minY="567" maxY="618" name="speedcam-l"/>
+  <symbol minX="1280" maxX="1331" minY="567" maxY="618" name="lightrail-berlin-m"/>
+  <symbol minX="1331" maxX="1382" minY="567" maxY="618" name="parking-l"/>
+  <symbol minX="1382" maxX="1433" minY="567" maxY="618" name="subway-berlin-l"/>
+  <symbol minX="1433" maxX="1480" minY="567" maxY="614" name="subway-paris-m"/>
+  <symbol minX="1480" maxX="1527" minY="567" maxY="614" name="no-icon"/>
+  <symbol minX="1527" maxX="1574" minY="567" maxY="614" name="subway-rome-m"/>
+  <symbol minX="1574" maxX="1621" minY="567" maxY="614" name="subway-berlin-m"/>
+  <symbol minX="1621" maxX="1668" minY="567" maxY="614" name="no-icon-amenity"/>
+  <symbol minX="1668" maxX="1722" minY="567" maxY="614" name="subway-moscow-m"/>
+  <symbol minX="1722" maxX="1769" minY="567" maxY="614" name="no-icon-leisure"/>
+  <symbol minX="1769" maxX="1816" minY="567" maxY="614" name="no-icon-tourism"/>
+  <symbol minX="1816" maxX="1863" minY="567" maxY="614" name="no-icon-shop"/>
+  <symbol minX="1863" maxX="1921" minY="567" maxY="612" name="subway-london-l"/>
+  <symbol minX="1921" maxX="1963" minY="567" maxY="612" name="remains-s"/>
+  <symbol minX="1963" maxX="2005" minY="567" maxY="612" name="beer-s"/>
+  <symbol minX="2005" maxX="2047" minY="567" maxY="612" name="picnic-s"/>
+  <symbol minX="0" maxX="42" minY="623" maxY="668" name="bcontrol-s"/>
+  <symbol minX="42" maxX="84" minY="623" maxY="668" name="waterfall-s"/>
+  <symbol minX="84" maxX="126" minY="623" maxY="668" name="hunting-tower-s"/>
+  <symbol minX="126" maxX="168" minY="623" maxY="668" name="heliport-s"/>
+  <symbol minX="168" maxX="213" minY="623" maxY="668" name="airport-s"/>
+  <symbol minX="213" maxX="255" minY="623" maxY="668" name="office-s"/>
+  <symbol minX="255" maxX="297" minY="623" maxY="665" name="casino-s"/>
+  <symbol minX="297" maxX="339" minY="623" maxY="665" name="ship-s"/>
+  <symbol minX="339" maxX="381" minY="623" maxY="665" name="shop-s"/>
+  <symbol minX="381" maxX="423" minY="623" maxY="665" name="cave-s"/>
+  <symbol minX="423" maxX="465" minY="623" maxY="665" name="school-s"/>
+  <symbol minX="465" maxX="507" minY="623" maxY="665" name="skiing-s"/>
+  <symbol minX="507" maxX="549" minY="623" maxY="665" name="golf-s"/>
+  <symbol minX="549" maxX="591" minY="623" maxY="665" name="restaurant-s"/>
+  <symbol minX="591" maxX="633" minY="623" maxY="665" name="soccer-s"/>
+  <symbol minX="633" maxX="675" minY="623" maxY="665" name="cemetery-s"/>
+  <symbol minX="675" maxX="717" minY="623" maxY="665" name="speedcam-m"/>
+  <symbol minX="717" maxX="759" minY="623" maxY="665" name="atm-s"/>
+  <symbol minX="759" maxX="801" minY="623" maxY="665" name="car-repair-s"/>
+  <symbol minX="801" maxX="843" minY="623" maxY="665" name="recycling-s"/>
+  <symbol minX="843" maxX="885" minY="623" maxY="665" name="grocery-s"/>
+  <symbol minX="885" maxX="927" minY="623" maxY="665" name="hand-s"/>
+  <symbol minX="927" maxX="969" minY="623" maxY="665" name="garden-s"/>
+  <symbol minX="969" maxX="1011" minY="623" maxY="665" name="alcohol-s"/>
+  <symbol minX="1011" maxX="1069" minY="623" maxY="665" name="subway-barcelona-m"/>
+  <symbol minX="1069" maxX="1120" minY="623" maxY="665" name="subway-barcelona-s"/>
+  <symbol minX="1120" maxX="1162" minY="623" maxY="665" name="cinema-s"/>
+  <symbol minX="1162" maxX="1204" minY="623" maxY="665" name="helipad-s"/>
+  <symbol minX="1204" maxX="1246" minY="623" maxY="665" name="gallery-s"/>
+  <symbol minX="1246" maxX="1288" minY="623" maxY="665" name="pub-s"/>
+  <symbol minX="1288" maxX="1330" minY="623" maxY="665" name="subway-entrance-2-s"/>
+  <symbol minX="1330" maxX="1372" minY="623" maxY="665" name="subway-entrance-arrow"/>
+  <symbol minX="1372" maxX="1414" minY="623" maxY="665" name="campsite-s"/>
+  <symbol minX="1414" maxX="1456" minY="623" maxY="665" name="power-s"/>
+  <symbol minX="1456" maxX="1498" minY="623" maxY="665" name="subway-entrance-s"/>
+  <symbol minX="1498" maxX="1540" minY="623" maxY="665" name="hospital-s"/>
+  <symbol minX="1540" maxX="1582" minY="623" maxY="665" name="funicular-s"/>
+  <symbol minX="1582" maxX="1624" minY="623" maxY="665" name="america-football-s"/>
+  <symbol minX="1624" maxX="1666" minY="623" maxY="665" name="college-s"/>
+  <symbol minX="1666" maxX="1708" minY="623" maxY="665" name="police-s"/>
+  <symbol minX="1708" maxX="1764" minY="623" maxY="665" name="subway-london-m"/>
+  <symbol minX="1764" maxX="1806" minY="623" maxY="665" name="hotel-s"/>
+  <symbol minX="1806" maxX="1848" minY="623" maxY="665" name="place-of-worship-s"/>
+  <symbol minX="1848" maxX="1890" minY="623" maxY="665" name="fuel-s"/>
+  <symbol minX="1890" maxX="1948" minY="623" maxY="665" name="subway-madrid-m"/>
+  <symbol minX="1948" maxX="1990" minY="623" maxY="665" name="zoo-s"/>
+  <symbol minX="1990" maxX="2032" minY="623" maxY="665" name="information-s"/>
+  <symbol minX="0" maxX="42" minY="668" maxY="710" name="bar-s"/>
+  <symbol minX="42" maxX="84" minY="668" maxY="710" name="windmill-s"/>
+  <symbol minX="84" maxX="126" minY="668" maxY="710" name="pitch-s"/>
+  <symbol minX="126" maxX="168" minY="668" maxY="710" name="fountain-s"/>
+  <symbol minX="168" maxX="210" minY="668" maxY="710" name="kindergarten-s"/>
+  <symbol minX="210" maxX="252" minY="668" maxY="710" name="cafe-s"/>
+  <symbol minX="252" maxX="294" minY="668" maxY="710" name="fire_station-s"/>
+  <symbol minX="294" maxX="336" minY="668" maxY="710" name="subway-newyork-s"/>
+  <symbol minX="336" maxX="378" minY="668" maxY="710" name="baseball-s"/>
+  <symbol minX="378" maxX="420" minY="668" maxY="710" name="fastfood-s"/>
+  <symbol minX="420" maxX="462" minY="668" maxY="710" name="phone-s"/>
+  <symbol minX="462" maxX="504" minY="668" maxY="710" name="library-s"/>
+  <symbol minX="504" maxX="546" minY="668" maxY="710" name="pharmacy-s"/>
+  <symbol minX="546" maxX="588" minY="668" maxY="710" name="dentist-s"/>
+  <symbol minX="588" maxX="630" minY="668" maxY="710" name="equestrian-s"/>
+  <symbol minX="630" maxX="672" minY="668" maxY="710" name="subway-s"/>
+  <symbol minX="672" maxX="714" minY="668" maxY="710" name="cable-car-s"/>
+  <symbol minX="714" maxX="756" minY="668" maxY="710" name="basketball-s"/>
+  <symbol minX="756" maxX="798" minY="668" maxY="710" name="subway-spb-s"/>
+  <symbol minX="798" maxX="840" minY="668" maxY="710" name="volcano-s"/>
+  <symbol minX="840" maxX="882" minY="668" maxY="710" name="lighthouse-s"/>
+  <symbol minX="882" maxX="924" minY="668" maxY="710" name="embassy-s"/>
+  <symbol minX="924" maxX="966" minY="668" maxY="710" name="tram-s"/>
+  <symbol minX="966" maxX="1008" minY="668" maxY="710" name="mail-s"/>
+  <symbol minX="1008" maxX="1066" minY="668" maxY="710" name="metro-barcelona-m"/>
+  <symbol minX="1066" maxX="1108" minY="668" maxY="710" name="train-s"/>
+  <symbol minX="1108" maxX="1150" minY="668" maxY="710" name="military-s"/>
+  <symbol minX="1150" maxX="1192" minY="668" maxY="710" name="swimming-s"/>
+  <symbol minX="1192" maxX="1234" minY="668" maxY="710" name="bus-s"/>
+  <symbol minX="1234" maxX="1276" minY="668" maxY="710" name="townhall-s"/>
+  <symbol minX="1276" maxX="1318" minY="668" maxY="710" name="monument-s"/>
+  <symbol minX="1318" maxX="1360" minY="668" maxY="710" name="drinking-water-s"/>
+  <symbol minX="1360" maxX="1402" minY="668" maxY="710" name="tennis-s"/>
+  <symbol minX="1402" maxX="1444" minY="668" maxY="710" name="park-s"/>
+  <symbol minX="1444" maxX="1486" minY="668" maxY="710" name="tourism-s"/>
+  <symbol minX="1486" maxX="1528" minY="668" maxY="710" name="theatre-s"/>
+  <symbol minX="1528" maxX="1570" minY="668" maxY="710" name="nparkf-s"/>
+  <symbol minX="1570" maxX="1612" minY="668" maxY="710" name="museum-s"/>
+  <symbol minX="1612" maxX="1654" minY="668" maxY="710" name="toilets-s"/>
+  <symbol minX="1654" maxX="1696" minY="668" maxY="710" name="book-shop-s"/>
+  <symbol minX="1696" maxX="1738" minY="668" maxY="710" name="npark-s"/>
+  <symbol minX="1738" maxX="1780" minY="668" maxY="710" name="bicycle-s"/>
+  <symbol minX="1780" maxX="1838" minY="668" maxY="709" name="subway-barcelona-l"/>
+  <symbol minX="1838" maxX="1896" minY="668" maxY="709" name="subway-madrid-l"/>
+  <symbol minX="1896" maxX="1934" minY="668" maxY="708" name="s-arrow"/>
+  <symbol minX="1934" maxX="1974" minY="668" maxY="708" name="route_from"/>
+  <symbol minX="1974" maxX="2014" minY="668" maxY="708" name="parking-m"/>
+  <symbol minX="0" maxX="38" minY="710" maxY="748" name="current-position"/>
+  <symbol minX="38" maxX="76" minY="710" maxY="748" name="peak-l"/>
+  <symbol minX="76" maxX="132" minY="710" maxY="748" name="subway-kiev-l"/>
+  <symbol minX="132" maxX="170" minY="710" maxY="748" name="lightrail-berlin-s"/>
+  <symbol minX="170" maxX="221" minY="710" maxY="748" name="subway-madrid-s"/>
+  <symbol minX="221" maxX="272" minY="710" maxY="748" name="metro-barcelona-s"/>
+  <symbol minX="272" maxX="328" minY="710" maxY="748" name="subway-kiev-m"/>
+  <symbol minX="328" maxX="366" minY="710" maxY="748" name="subway-paris-s"/>
+  <symbol minX="366" maxX="402" minY="710" maxY="746" name="subway-moscow-s"/>
+  <symbol minX="402" maxX="435" minY="710" maxY="743" name="speedcam-s"/>
+  <symbol minX="435" maxX="468" minY="710" maxY="743" name="subway-rome-s"/>
+  <symbol minX="468" maxX="501" minY="710" maxY="743" name="subway-berlin-s"/>
+  <symbol minX="501" maxX="543" minY="710" maxY="743" name="subway-london-s"/>
+  <symbol minX="543" maxX="576" minY="710" maxY="743" name="parking-s"/>
+  <symbol minX="576" maxX="614" minY="710" maxY="743" name="bench"/>
+  <symbol minX="614" maxX="670" minY="710" maxY="741" name="subway-minsk-l"/>
+  <symbol minX="670" maxX="701" minY="710" maxY="741" name="survey_point-l"/>
+  <symbol minX="701" maxX="732" minY="710" maxY="741" name="star-l"/>
+  <symbol minX="732" maxX="765" minY="710" maxY="741" name="peakt-l"/>
+  <symbol minX="765" maxX="812" minY="710" maxY="739" name="subway-kiev-s"/>
+  <symbol minX="812" maxX="841" minY="710" maxY="739" name="star-m"/>
+  <symbol minX="841" maxX="870" minY="710" maxY="739" name="api-result"/>
+  <symbol minX="870" maxX="898" minY="710" maxY="738" name="search-result"/>
+  <symbol minX="898" maxX="925" minY="710" maxY="737" name="subway-newyork-xs"/>
+  <symbol minX="925" maxX="952" minY="710" maxY="737" name="subway-xs"/>
+  <symbol minX="952" maxX="994" minY="710" maxY="737" name="railway-crossing"/>
+  <symbol minX="994" maxX="1023" minY="710" maxY="737" name="peak-m"/>
+  <symbol minX="1023" maxX="1050" minY="710" maxY="737" name="survey_point-m"/>
+  <symbol minX="1050" maxX="1097" minY="710" maxY="737" name="subway-minsk-m"/>
+  <symbol minX="1097" maxX="1121" minY="710" maxY="734" name="star-s"/>
+  <symbol minX="1121" maxX="1145" minY="710" maxY="734" name="crossing-l"/>
+  <symbol minX="1145" maxX="1187" minY="710" maxY="734" name="subway-minsk-s"/>
+  <symbol minX="1187" maxX="1209" minY="710" maxY="732" name="survey_point-s"/>
+  <symbol minX="1209" maxX="1260" minY="710" maxY="732" name="arrow-m"/>
+  <symbol minX="1260" maxX="1284" minY="710" maxY="732" name="peak-s"/>
+  <symbol minX="1284" maxX="1308" minY="710" maxY="732" name="peakt-m"/>
+  <symbol minX="1308" maxX="1328" minY="710" maxY="730" name="crossing-m"/>
+  <symbol minX="1328" maxX="1348" minY="710" maxY="730" name="entrance-s"/>
+  <symbol minX="1348" maxX="1368" minY="710" maxY="728" name="peakt-s"/>
+  <symbol minX="1368" maxX="1383" minY="710" maxY="725" name="none"/>
+  <symbol minX="1383" maxX="1421" minY="710" maxY="725" name="arrow-s"/>
+  <symbol minX="1421" maxX="1436" minY="710" maxY="725" name="dot-m"/>
+  <symbol minX="1436" maxX="1451" minY="710" maxY="725" name="crossing-s"/>
+  <symbol minX="1451" maxX="1466" minY="710" maxY="725" name="tree-l"/>
+  <symbol minX="1466" maxX="1479" minY="710" maxY="723" name="tree-m"/>
+  <symbol minX="1479" maxX="1492" minY="710" maxY="723" name="entrance-xs"/>
+  <symbol minX="1492" maxX="1503" minY="710" maxY="721" name="tree-s"/>
+  <symbol minX="1503" maxX="1514" minY="710" maxY="721" name="dot-s-light"/>
+  <symbol minX="1514" maxX="1525" minY="710" maxY="721" name="dot-s"/>
+  <symbol minX="1525" maxX="1536" minY="710" maxY="721" name="zero-icon"/>
  </file>
 </root>
diff --git a/data/resources-6plus_dark/symbols.png b/data/resources-6plus_dark/symbols.png
index 96af7b5056..9b4b6bd97e 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 4e8a95ce3b..77aaaca4e2 100644
--- a/data/resources-6plus_dark/symbols.sdf
+++ b/data/resources-6plus_dark/symbols.sdf
@@ -7,455 +7,458 @@
   <symbol minX="626" maxX="695" minY="0" maxY="88" name="current-position-compas"/>
   <symbol minX="695" maxX="764" minY="0" maxY="88" name="current-routing-compas"/>
   <symbol minX="764" maxX="842" minY="0" maxY="78" name="search-result-active"/>
-  <symbol minX="842" maxX="877" minY="0" maxY="69" name="placemark-blue"/>
-  <symbol minX="877" maxX="912" minY="0" maxY="69" name="placemark-yellow"/>
-  <symbol minX="912" maxX="947" minY="0" maxY="69" name="placemark-brown"/>
-  <symbol minX="947" maxX="982" minY="0" maxY="69" name="placemark-red"/>
-  <symbol minX="982" maxX="1017" minY="0" maxY="69" name="placemark-purple"/>
-  <symbol minX="1017" maxX="1052" minY="0" maxY="69" name="placemark-green"/>
-  <symbol minX="1052" maxX="1087" minY="0" maxY="69" name="placemark-pink"/>
+  <symbol minX="842" maxX="877" minY="0" maxY="69" name="placemark-green"/>
+  <symbol minX="877" maxX="912" minY="0" maxY="69" name="placemark-brown"/>
+  <symbol minX="912" maxX="947" minY="0" maxY="69" name="placemark-pink"/>
+  <symbol minX="947" maxX="982" minY="0" maxY="69" name="placemark-purple"/>
+  <symbol minX="982" maxX="1017" minY="0" maxY="69" name="placemark-blue"/>
+  <symbol minX="1017" maxX="1052" minY="0" maxY="69" name="placemark-red"/>
+  <symbol minX="1052" maxX="1087" minY="0" maxY="69" name="placemark-yellow"/>
   <symbol minX="1087" maxX="1122" minY="0" maxY="69" name="placemark-orange"/>
-  <symbol minX="1122" maxX="1180" minY="0" maxY="58" name="archery-l"/>
+  <symbol minX="1122" maxX="1180" minY="0" maxY="58" name="shop-l"/>
   <symbol minX="1180" maxX="1238" minY="0" maxY="58" name="atm-l"/>
-  <symbol minX="1238" maxX="1296" minY="0" maxY="58" name="america-football-l"/>
-  <symbol minX="1296" maxX="1354" minY="0" maxY="58" name="alpine_hut-l"/>
-  <symbol minX="1354" maxX="1412" minY="0" maxY="58" name="alcohol-l"/>
+  <symbol minX="1238" maxX="1296" minY="0" maxY="58" name="shop-l copy"/>
+  <symbol minX="1296" maxX="1354" minY="0" maxY="58" name="archery-l"/>
+  <symbol minX="1354" maxX="1412" minY="0" maxY="58" name="shop-bicycle-l"/>
   <symbol minX="1412" maxX="1470" minY="0" maxY="58" name="australian-football-l"/>
-  <symbol minX="1470" maxX="1528" minY="0" maxY="58" name="airport-m"/>
+  <symbol minX="1470" maxX="1528" minY="0" maxY="58" name="shoes-l"/>
   <symbol minX="1528" maxX="1586" minY="0" maxY="58" name="bakery-l"/>
-  <symbol minX="1586" maxX="1644" minY="0" maxY="58" name="airport-l"/>
-  <symbol minX="1644" maxX="1702" minY="0" maxY="58" name="zoo-l"/>
+  <symbol minX="1586" maxX="1644" minY="0" maxY="58" name="ship-l"/>
+  <symbol minX="1644" maxX="1702" minY="0" maxY="58" name="school-l"/>
   <symbol minX="1702" maxX="1759" minY="0" maxY="58" name="bank-l"/>
   <symbol minX="1759" maxX="1815" minY="0" maxY="58" name="bank-m"/>
   <symbol minX="1815" maxX="1872" minY="0" maxY="58" name="banknote-l"/>
-  <symbol minX="1872" maxX="1930" minY="0" maxY="58" name="windmill-l"/>
+  <symbol minX="1872" maxX="1930" minY="0" maxY="58" name="skiing-l"/>
   <symbol minX="1930" maxX="1988" minY="0" maxY="58" name="bar-l"/>
-  <symbol minX="1988" maxX="2046" minY="0" maxY="58" name="wayside_shrine-l"/>
-  <symbol minX="0" maxX="58" minY="165" maxY="223" name="wayside_cross-l"/>
+  <symbol minX="1988" maxX="2046" minY="0" maxY="58" name="restaurant-l"/>
+  <symbol minX="0" maxX="58" minY="165" maxY="223" name="america-football-l"/>
   <symbol minX="58" maxX="116" minY="165" maxY="223" name="baseball-l"/>
-  <symbol minX="116" maxX="174" minY="165" maxY="223" name="waterfall-l"/>
-  <symbol minX="174" maxX="232" minY="165" maxY="223" name="volcano-l"/>
+  <symbol minX="116" maxX="174" minY="165" maxY="223" name="soccer-l"/>
+  <symbol minX="174" maxX="232" minY="165" maxY="223" name="remains-l"/>
   <symbol minX="232" maxX="290" minY="165" maxY="223" name="basketball-l"/>
-  <symbol minX="290" maxX="348" minY="165" maxY="223" name="vending-l"/>
-  <symbol minX="348" maxX="406" minY="165" maxY="223" name="tram-l"/>
+  <symbol minX="290" maxX="348" minY="165" maxY="223" name="recycling-l"/>
+  <symbol minX="348" maxX="406" minY="165" maxY="223" name="alpine_hut-l"/>
   <symbol minX="406" maxX="464" minY="165" maxY="223" name="bbq-l"/>
-  <symbol minX="464" maxX="522" minY="165" maxY="223" name="train-l"/>
+  <symbol minX="464" maxX="522" minY="165" maxY="223" name="sports-l"/>
   <symbol minX="522" maxX="580" minY="165" maxY="223" name="bcontrol-l"/>
-  <symbol minX="580" maxX="638" minY="165" maxY="223" name="toys-l"/>
-  <symbol minX="638" maxX="696" minY="165" maxY="223" name="townhall-l"/>
+  <symbol minX="580" maxX="638" minY="165" maxY="223" name="pub-l"/>
+  <symbol minX="638" maxX="696" minY="165" maxY="223" name="power-m"/>
   <symbol minX="696" maxX="754" minY="165" maxY="223" name="beach-l"/>
-  <symbol minX="754" maxX="812" minY="165" maxY="223" name="tourism-l"/>
+  <symbol minX="754" maxX="812" minY="165" maxY="223" name="power-l"/>
   <symbol minX="812" maxX="870" minY="165" maxY="223" name="beauty-l"/>
-  <symbol minX="870" maxX="928" minY="165" maxY="223" name="tomb-l"/>
+  <symbol minX="870" maxX="928" minY="165" maxY="223" name="postbox-l"/>
   <symbol minX="928" maxX="986" minY="165" maxY="223" name="beer-l"/>
-  <symbol minX="986" maxX="1044" minY="165" maxY="223" name="toll_booth-l"/>
-  <symbol minX="1044" maxX="1102" minY="165" maxY="223" name="toilets-l"/>
-  <symbol minX="1102" maxX="1160" minY="165" maxY="223" name="theatre-l"/>
+  <symbol minX="986" maxX="1044" minY="165" maxY="223" name="police-l"/>
+  <symbol minX="1044" maxX="1102" minY="165" maxY="223" name="alcohol-l"/>
+  <symbol minX="1102" maxX="1160" minY="165" maxY="223" name="place-of-worship-l"/>
   <symbol minX="1160" maxX="1218" minY="165" maxY="223" name="bicycle-l"/>
-  <symbol minX="1218" maxX="1276" minY="165" maxY="223" name="tennis-l"/>
-  <symbol minX="1276" maxX="1334" minY="165" maxY="223" name="taxi-l"/>
+  <symbol minX="1218" maxX="1276" minY="165" maxY="223" name="pitch-l"/>
+  <symbol minX="1276" maxX="1334" minY="165" maxY="223" name="airport-m"/>
   <symbol minX="1334" maxX="1392" minY="165" maxY="223" name="book-shop-l"/>
-  <symbol minX="1392" maxX="1450" minY="165" maxY="223" name="swimming-l"/>
-  <symbol minX="1450" maxX="1508" minY="165" maxY="223" name="sweets-l"/>
+  <symbol minX="1392" maxX="1450" minY="165" maxY="223" name="picnic-l"/>
+  <symbol minX="1450" maxX="1508" minY="165" maxY="223" name="airport-l"/>
   <symbol minX="1508" maxX="1566" minY="165" maxY="223" name="boundary_stone-l"/>
-  <symbol minX="1566" maxX="1624" minY="165" maxY="223" name="subway-spb-l"/>
+  <symbol minX="1566" maxX="1624" minY="165" maxY="223" name="subway-entrance-l"/>
   <symbol minX="1624" maxX="1682" minY="165" maxY="223" name="bowls-l"/>
-  <symbol minX="1682" maxX="1740" minY="165" maxY="223" name="subway-paris-l"/>
+  <symbol minX="1682" maxX="1740" minY="165" maxY="223" name="phone-l"/>
   <symbol minX="1740" maxX="1798" minY="165" maxY="223" name="bus-l"/>
-  <symbol minX="1798" maxX="1856" minY="165" maxY="223" name="subway-newyork-l"/>
+  <symbol minX="1798" maxX="1856" minY="165" maxY="223" name="pharmacy-l"/>
   <symbol minX="1856" maxX="1914" minY="165" maxY="223" name="subway-l"/>
   <symbol minX="1914" maxX="1972" minY="165" maxY="223" name="butcher-l"/>
-  <symbol minX="1972" maxX="2030" minY="165" maxY="223" name="subway-entrance-l"/>
+  <symbol minX="1972" maxX="2030" minY="165" maxY="223" name="peak-l"/>
   <symbol minX="0" maxX="58" minY="223" maxY="281" name="cable-car-l"/>
-  <symbol minX="58" maxX="116" minY="223" maxY="281" name="sports-l"/>
-  <symbol minX="116" maxX="174" minY="223" maxY="281" name="soccer-l"/>
+  <symbol minX="58" maxX="116" minY="223" maxY="281" name="parking-meter-l"/>
+  <symbol minX="116" maxX="174" minY="223" maxY="281" name="zoo-l"/>
   <symbol minX="174" maxX="232" minY="223" maxY="281" name="cafe-l"/>
-  <symbol minX="232" maxX="290" minY="223" maxY="281" name="skiing-l"/>
-  <symbol minX="290" maxX="348" minY="223" maxY="281" name="shop-l"/>
+  <symbol minX="232" maxX="290" minY="223" maxY="281" name="subway-newyork-l"/>
+  <symbol minX="290" maxX="348" minY="223" maxY="281" name="park-l"/>
   <symbol minX="348" maxX="406" minY="223" maxY="281" name="campsite-l"/>
-  <symbol minX="406" maxX="464" minY="223" maxY="281" name="shop-l copy"/>
-  <symbol minX="464" maxX="522" minY="223" maxY="281" name="shop-bicycle-l"/>
+  <symbol minX="406" maxX="464" minY="223" maxY="281" name="optician-l"/>
+  <symbol minX="464" maxX="522" minY="223" maxY="281" name="windmill-l"/>
   <symbol minX="522" maxX="580" minY="223" maxY="281" name="car-repair-l"/>
-  <symbol minX="580" maxX="638" minY="223" maxY="281" name="shoes-l"/>
-  <symbol minX="638" maxX="696" minY="223" maxY="281" name="ship-l"/>
+  <symbol minX="580" maxX="638" minY="223" maxY="281" name="subway-paris-l"/>
+  <symbol minX="638" maxX="696" minY="223" maxY="281" name="office-l"/>
   <symbol minX="696" maxX="754" minY="223" maxY="281" name="car_sharing-l"/>
-  <symbol minX="754" maxX="812" minY="223" maxY="281" name="school-l"/>
+  <symbol minX="754" maxX="812" minY="223" maxY="281" name="nparkf-l"/>
   <symbol minX="812" maxX="870" minY="223" maxY="281" name="caravan_site-l"/>
-  <symbol minX="870" maxX="928" minY="223" maxY="281" name="restaurant-l"/>
+  <symbol minX="870" maxX="928" minY="223" maxY="281" name="npark-l"/>
   <symbol minX="928" maxX="986" minY="223" maxY="281" name="casino-l"/>
-  <symbol minX="986" maxX="1044" minY="223" maxY="281" name="remains-l"/>
-  <symbol minX="1044" maxX="1102" minY="223" maxY="281" name="recycling-l"/>
+  <symbol minX="986" maxX="1044" minY="223" maxY="281" name="subway-spb-l"/>
+  <symbol minX="1044" maxX="1102" minY="223" maxY="281" name="wayside_shrine-l"/>
   <symbol minX="1102" maxX="1160" minY="223" maxY="281" name="cave-l"/>
-  <symbol minX="1160" maxX="1218" minY="223" maxY="281" name="pub-l"/>
-  <symbol minX="1218" maxX="1276" minY="223" maxY="281" name="power-m"/>
+  <symbol minX="1160" maxX="1218" minY="223" maxY="281" name="museum-l"/>
+  <symbol minX="1218" maxX="1276" minY="223" maxY="281" name="motel-l"/>
   <symbol minX="1276" maxX="1334" minY="223" maxY="281" name="cemetery-l"/>
-  <symbol minX="1334" maxX="1392" minY="223" maxY="281" name="power-l"/>
-  <symbol minX="1392" maxX="1450" minY="223" maxY="281" name="postbox-l"/>
+  <symbol minX="1334" maxX="1392" minY="223" maxY="281" name="monument-l"/>
+  <symbol minX="1392" maxX="1450" minY="223" maxY="281" name="wayside_cross-l"/>
   <symbol minX="1450" maxX="1508" minY="223" maxY="281" name="chemist-l"/>
-  <symbol minX="1508" maxX="1566" minY="223" maxY="281" name="police-l"/>
+  <symbol minX="1508" maxX="1566" minY="223" maxY="281" name="mobile_phone-l"/>
   <symbol minX="1566" maxX="1624" minY="223" maxY="281" name="cinema-l"/>
-  <symbol minX="1624" maxX="1682" minY="223" maxY="281" name="place-of-worship-l"/>
-  <symbol minX="1682" maxX="1740" minY="223" maxY="281" name="pitch-l"/>
+  <symbol minX="1624" maxX="1682" minY="223" maxY="281" name="sweets-l"/>
+  <symbol minX="1682" maxX="1740" minY="223" maxY="281" name="military-l"/>
   <symbol minX="1740" maxX="1798" minY="223" maxY="281" name="clothes-l"/>
-  <symbol minX="1798" maxX="1856" minY="223" maxY="281" name="picnic-l"/>
+  <symbol minX="1798" maxX="1856" minY="223" maxY="281" name="swimming-l"/>
   <symbol minX="1856" maxX="1914" minY="223" maxY="281" name="college-l"/>
-  <symbol minX="1914" maxX="1972" minY="223" maxY="281" name="phone-l"/>
-  <symbol minX="1972" maxX="2030" minY="223" maxY="281" name="pharmacy-l"/>
+  <symbol minX="1914" maxX="1972" minY="223" maxY="281" name="marketplace-l"/>
+  <symbol minX="1972" maxX="2030" minY="223" maxY="281" name="waterfall-l"/>
   <symbol minX="0" maxX="58" minY="281" maxY="339" name="computer-l"/>
-  <symbol minX="58" maxX="116" minY="281" maxY="339" name="peak-l"/>
+  <symbol minX="58" maxX="116" minY="281" maxY="339" name="mail-l"/>
   <symbol minX="116" maxX="174" minY="281" maxY="339" name="convenience-l"/>
-  <symbol minX="174" maxX="232" minY="281" maxY="339" name="parking-meter-l"/>
+  <symbol minX="174" maxX="232" minY="281" maxY="339" name="taxi-l"/>
   <symbol minX="232" maxX="290" minY="281" maxY="339" name="cricket-l"/>
-  <symbol minX="290" maxX="348" minY="281" maxY="339" name="park-l"/>
+  <symbol minX="290" maxX="348" minY="281" maxY="339" name="lightrail-berlin-l"/>
   <symbol minX="348" maxX="406" minY="281" maxY="339" name="curling-l"/>
-  <symbol minX="406" maxX="464" minY="281" maxY="339" name="optician-l"/>
-  <symbol minX="464" maxX="522" minY="281" maxY="339" name="department_store-l"/>
-  <symbol minX="522" maxX="580" minY="281" maxY="339" name="office-l"/>
-  <symbol minX="580" maxX="638" minY="281" maxY="339" name="diving-l"/>
-  <symbol minX="638" maxX="696" minY="281" maxY="339" name="nparkf-l"/>
-  <symbol minX="696" maxX="754" minY="281" maxY="339" name="dog_park-l"/>
-  <symbol minX="754" maxX="812" minY="281" maxY="339" name="npark-l"/>
-  <symbol minX="812" maxX="870" minY="281" maxY="339" name="doityourself-l"/>
-  <symbol minX="870" maxX="928" minY="281" maxY="339" name="museum-l"/>
-  <symbol minX="928" maxX="986" minY="281" maxY="339" name="motel-l"/>
-  <symbol minX="986" maxX="1044" minY="281" maxY="339" name="monument-l"/>
-  <symbol minX="1044" maxX="1102" minY="281" maxY="339" name="mobile_phone-l"/>
-  <symbol minX="1102" maxX="1160" minY="281" maxY="339" name="drinking-water-l"/>
-  <symbol minX="1160" maxX="1218" minY="281" maxY="339" name="military-l"/>
-  <symbol minX="1218" maxX="1276" minY="281" maxY="339" name="marketplace-l"/>
-  <symbol minX="1276" maxX="1334" minY="281" maxY="339" name="mail-l"/>
-  <symbol minX="1334" maxX="1392" minY="281" maxY="339" name="electronics-l"/>
-  <symbol minX="1392" maxX="1450" minY="281" maxY="339" name="lightrail-berlin-l"/>
-  <symbol minX="1450" maxX="1508" minY="281" maxY="339" name="embassy-l"/>
-  <symbol minX="1508" maxX="1566" minY="281" maxY="339" name="lighthouse-l"/>
-  <symbol minX="1566" maxX="1624" minY="281" maxY="339" name="lift_gate-l"/>
-  <symbol minX="1624" maxX="1682" minY="281" maxY="339" name="library-l"/>
-  <symbol minX="1682" maxX="1740" minY="281" maxY="339" name="laundry-l"/>
-  <symbol minX="1740" maxX="1798" minY="281" maxY="339" name="equestrian-l"/>
-  <symbol minX="1798" maxX="1856" minY="281" maxY="339" name="equestrian-m"/>
-  <symbol minX="1856" maxX="1914" minY="281" maxY="339" name="fastfood-l"/>
-  <symbol minX="1914" maxX="1972" minY="281" maxY="339" name="kiosk-l"/>
-  <symbol minX="1972" maxX="2030" minY="281" maxY="339" name="kindergarten-m"/>
-  <symbol minX="0" maxX="58" minY="339" maxY="397" name="fire_station-l"/>
-  <symbol minX="58" maxX="116" minY="339" maxY="397" name="kindergarten-l"/>
-  <symbol minX="116" maxX="174" minY="339" maxY="397" name="jewelry-l"/>
-  <symbol minX="174" maxX="232" minY="339" maxY="397" name="florist-l"/>
-  <symbol minX="232" maxX="290" minY="339" maxY="397" name="information-l"/>
-  <symbol minX="290" maxX="348" minY="339" maxY="397" name="fountain-l"/>
-  <symbol minX="348" maxX="406" minY="339" maxY="397" name="hunting-tower-l"/>
-  <symbol minX="406" maxX="464" minY="339" maxY="397" name="hotel-l"/>
-  <symbol minX="464" maxX="522" minY="339" maxY="397" name="fuel-l copy"/>
-  <symbol minX="522" maxX="580" minY="339" maxY="397" name="fuel-l"/>
-  <symbol minX="580" maxX="638" minY="339" maxY="397" name="hospital-l"/>
-  <symbol minX="638" maxX="696" minY="339" maxY="397" name="historic-ship-l"/>
-  <symbol minX="696" maxX="754" minY="339" maxY="397" name="funicular-l"/>
-  <symbol minX="754" maxX="812" minY="339" maxY="397" name="heliport-l"/>
-  <symbol minX="812" maxX="870" minY="339" maxY="397" name="helipad-l"/>
-  <symbol minX="870" maxX="928" minY="339" maxY="397" name="furniture-l"/>
-  <symbol minX="928" maxX="986" minY="339" maxY="397" name="hardware-l"/>
-  <symbol minX="986" maxX="1044" minY="339" maxY="397" name="gallery-l"/>
-  <symbol minX="1044" maxX="1102" minY="339" maxY="397" name="hand-m"/>
-  <symbol minX="1102" maxX="1160" minY="339" maxY="397" name="hand-l"/>
-  <symbol minX="1160" maxX="1218" minY="339" maxY="397" name="garden-l"/>
-  <symbol minX="1218" maxX="1276" minY="339" maxY="397" name="hairdresser-l"/>
-  <symbol minX="1276" maxX="1334" minY="339" maxY="397" name="grocery-l"/>
-  <symbol minX="1334" maxX="1392" minY="339" maxY="397" name="garden_center-l"/>
+  <symbol minX="406" maxX="464" minY="281" maxY="339" name="lighthouse-l"/>
+  <symbol minX="464" maxX="522" minY="281" maxY="339" name="dentist-l"/>
+  <symbol minX="522" maxX="580" minY="281" maxY="339" name="dentist-m"/>
+  <symbol minX="580" maxX="638" minY="281" maxY="339" name="lift_gate-l"/>
+  <symbol minX="638" maxX="696" minY="281" maxY="339" name="department_store-l"/>
+  <symbol minX="696" maxX="754" minY="281" maxY="339" name="tennis-l"/>
+  <symbol minX="754" maxX="812" minY="281" maxY="339" name="diving-l"/>
+  <symbol minX="812" maxX="870" minY="281" maxY="339" name="library-l"/>
+  <symbol minX="870" maxX="928" minY="281" maxY="339" name="dog_park-l"/>
+  <symbol minX="928" maxX="986" minY="281" maxY="339" name="laundry-l"/>
+  <symbol minX="986" maxX="1044" minY="281" maxY="339" name="doityourself-l"/>
+  <symbol minX="1044" maxX="1102" minY="281" maxY="339" name="kiosk-l"/>
+  <symbol minX="1102" maxX="1160" minY="281" maxY="339" name="volcano-l"/>
+  <symbol minX="1160" maxX="1218" minY="281" maxY="339" name="kindergarten-m"/>
+  <symbol minX="1218" maxX="1276" minY="281" maxY="339" name="vending-l"/>
+  <symbol minX="1276" maxX="1334" minY="281" maxY="339" name="drinking-water-l"/>
+  <symbol minX="1334" maxX="1392" minY="281" maxY="339" name="kindergarten-l"/>
+  <symbol minX="1392" maxX="1450" minY="281" maxY="339" name="jewelry-l"/>
+  <symbol minX="1450" maxX="1508" minY="281" maxY="339" name="theatre-l"/>
+  <symbol minX="1508" maxX="1566" minY="281" maxY="339" name="electronics-l"/>
+  <symbol minX="1566" maxX="1624" minY="281" maxY="339" name="information-l"/>
+  <symbol minX="1624" maxX="1682" minY="281" maxY="339" name="embassy-l"/>
+  <symbol minX="1682" maxX="1740" minY="281" maxY="339" name="hunting-tower-l"/>
+  <symbol minX="1740" maxX="1798" minY="281" maxY="339" name="tram-l"/>
+  <symbol minX="1798" maxX="1856" minY="281" maxY="339" name="hotel-l"/>
+  <symbol minX="1856" maxX="1914" minY="281" maxY="339" name="train-l"/>
+  <symbol minX="1914" maxX="1972" minY="281" maxY="339" name="equestrian-l"/>
+  <symbol minX="1972" maxX="2030" minY="281" maxY="339" name="equestrian-m"/>
+  <symbol minX="0" maxX="58" minY="339" maxY="397" name="fastfood-l"/>
+  <symbol minX="58" maxX="116" minY="339" maxY="397" name="toilets-l"/>
+  <symbol minX="116" maxX="174" minY="339" maxY="397" name="hospital-l"/>
+  <symbol minX="174" maxX="232" minY="339" maxY="397" name="fire_station-l"/>
+  <symbol minX="232" maxX="290" minY="339" maxY="397" name="historic-ship-l"/>
+  <symbol minX="290" maxX="348" minY="339" maxY="397" name="toys-l"/>
+  <symbol minX="348" maxX="406" minY="339" maxY="397" name="florist-l"/>
+  <symbol minX="406" maxX="464" minY="339" maxY="397" name="heliport-l"/>
+  <symbol minX="464" maxX="522" minY="339" maxY="397" name="fountain-l"/>
+  <symbol minX="522" maxX="580" minY="339" maxY="397" name="toll_booth-l"/>
+  <symbol minX="580" maxX="638" minY="339" maxY="397" name="helipad-l"/>
+  <symbol minX="638" maxX="696" minY="339" maxY="397" name="fuel-l copy"/>
+  <symbol minX="696" maxX="754" minY="339" maxY="397" name="fuel-l"/>
+  <symbol minX="754" maxX="812" minY="339" maxY="397" name="hardware-l"/>
+  <symbol minX="812" maxX="870" minY="339" maxY="397" name="townhall-l"/>
+  <symbol minX="870" maxX="928" minY="339" maxY="397" name="funicular-l"/>
+  <symbol minX="928" maxX="986" minY="339" maxY="397" name="hand-m"/>
+  <symbol minX="986" maxX="1044" minY="339" maxY="397" name="hand-l"/>
+  <symbol minX="1044" maxX="1102" minY="339" maxY="397" name="furniture-l"/>
+  <symbol minX="1102" maxX="1160" minY="339" maxY="397" name="hairdresser-l"/>
+  <symbol minX="1160" maxX="1218" minY="339" maxY="397" name="gallery-l"/>
+  <symbol minX="1218" maxX="1276" minY="339" maxY="397" name="grocery-l"/>
+  <symbol minX="1276" maxX="1334" minY="339" maxY="397" name="tourism-l"/>
+  <symbol minX="1334" maxX="1392" minY="339" maxY="397" name="garden-l"/>
   <symbol minX="1392" maxX="1450" minY="339" maxY="397" name="greengrocer-l"/>
-  <symbol minX="1450" maxX="1508" minY="339" maxY="397" name="gate-l"/>
-  <symbol minX="1508" maxX="1566" minY="339" maxY="397" name="golf-l"/>
-  <symbol minX="1566" maxX="1624" minY="339" maxY="397" name="gift-l"/>
-  <symbol minX="1624" maxX="1680" minY="339" maxY="395" name="gift-m"/>
-  <symbol minX="1680" maxX="1736" minY="339" maxY="395" name="gate-m"/>
-  <symbol minX="1736" maxX="1792" minY="339" maxY="395" name="golf-m"/>
-  <symbol minX="1792" maxX="1848" minY="339" maxY="395" name="alcohol-m"/>
-  <symbol minX="1848" maxX="1904" minY="339" maxY="395" name="garden_center-m"/>
-  <symbol minX="1904" maxX="1960" minY="339" maxY="395" name="greengrocer-m"/>
-  <symbol minX="1960" maxX="2016" minY="339" maxY="395" name="alpine_hut-m"/>
-  <symbol minX="0" maxX="56" minY="397" maxY="453" name="grocery-m"/>
-  <symbol minX="56" maxX="112" minY="397" maxY="453" name="america-football-m"/>
-  <symbol minX="112" maxX="168" minY="397" maxY="453" name="garden-m"/>
-  <symbol minX="168" maxX="224" minY="397" maxY="453" name="hairdresser-m"/>
-  <symbol minX="224" maxX="280" minY="397" maxY="453" name="archery-m"/>
-  <symbol minX="280" maxX="336" minY="397" maxY="453" name="gallery-m"/>
-  <symbol minX="336" maxX="392" minY="397" maxY="453" name="furniture-m"/>
-  <symbol minX="392" maxX="448" minY="397" maxY="453" name="hardware-m"/>
-  <symbol minX="448" maxX="504" minY="397" maxY="453" name="atm-m"/>
-  <symbol minX="504" maxX="560" minY="397" maxY="453" name="helipad-m"/>
-  <symbol minX="560" maxX="616" minY="397" maxY="453" name="australian-football-m"/>
-  <symbol minX="616" maxX="672" minY="397" maxY="453" name="funicular-m"/>
-  <symbol minX="672" maxX="728" minY="397" maxY="453" name="heliport-m"/>
-  <symbol minX="728" maxX="784" minY="397" maxY="453" name="bakery-m"/>
-  <symbol minX="784" maxX="840" minY="397" maxY="453" name="zoo-m"/>
-  <symbol minX="840" maxX="896" minY="397" maxY="453" name="historic-ship-m"/>
-  <symbol minX="896" maxX="952" minY="397" maxY="453" name="fuel-m"/>
-  <symbol minX="952" maxX="1008" minY="397" maxY="453" name="hospital-m"/>
-  <symbol minX="1008" maxX="1064" minY="397" maxY="453" name="bank-2-m"/>
-  <symbol minX="1064" maxX="1120" minY="397" maxY="453" name="windmill-m"/>
-  <symbol minX="1120" maxX="1176" minY="397" maxY="453" name="hotel-m"/>
-  <symbol minX="1176" maxX="1232" minY="397" maxY="453" name="banknote-m"/>
-  <symbol minX="1232" maxX="1288" minY="397" maxY="453" name="fountain-m"/>
-  <symbol minX="1288" maxX="1344" minY="397" maxY="453" name="hunting-tower-m"/>
-  <symbol minX="1344" maxX="1400" minY="397" maxY="453" name="florist-m"/>
-  <symbol minX="1400" maxX="1456" minY="397" maxY="453" name="information-m"/>
-  <symbol minX="1456" maxX="1512" minY="397" maxY="453" name="wayside_shrine-m"/>
-  <symbol minX="1512" maxX="1568" minY="397" maxY="453" name="bar-m"/>
-  <symbol minX="1568" maxX="1624" minY="397" maxY="453" name="jewelry-m"/>
-  <symbol minX="1624" maxX="1680" minY="397" maxY="453" name="fire_station-m"/>
-  <symbol minX="1680" maxX="1736" minY="397" maxY="453" name="wayside_cross-m"/>
-  <symbol minX="1736" maxX="1792" minY="397" maxY="453" name="waterfall-m"/>
-  <symbol minX="1792" maxX="1848" minY="397" maxY="453" name="fastfood-m"/>
-  <symbol minX="1848" maxX="1904" minY="397" maxY="453" name="kiosk-m"/>
-  <symbol minX="1904" maxX="1960" minY="397" maxY="453" name="baseball-m"/>
-  <symbol minX="1960" maxX="2016" minY="397" maxY="453" name="laundry-m"/>
-  <symbol minX="0" maxX="56" minY="453" maxY="509" name="volcano-m"/>
-  <symbol minX="56" maxX="112" minY="453" maxY="509" name="library-m"/>
-  <symbol minX="112" maxX="168" minY="453" maxY="509" name="vending-m"/>
-  <symbol minX="168" maxX="224" minY="453" maxY="509" name="basketball-m"/>
-  <symbol minX="224" maxX="280" minY="453" maxY="509" name="lift_gate-m"/>
-  <symbol minX="280" maxX="336" minY="453" maxY="509" name="embassy-m"/>
-  <symbol minX="336" maxX="392" minY="453" maxY="509" name="lighthouse-m"/>
-  <symbol minX="392" maxX="448" minY="453" maxY="509" name="tram-m"/>
-  <symbol minX="448" maxX="504" minY="453" maxY="509" name="electronics-m"/>
-  <symbol minX="504" maxX="560" minY="453" maxY="509" name="train-m"/>
-  <symbol minX="560" maxX="616" minY="453" maxY="509" name="bbq-m"/>
-  <symbol minX="616" maxX="672" minY="453" maxY="509" name="drugs"/>
-  <symbol minX="672" maxX="728" minY="453" maxY="509" name="mail-m"/>
-  <symbol minX="728" maxX="784" minY="453" maxY="509" name="toys-m"/>
-  <symbol minX="784" maxX="840" minY="453" maxY="509" name="bcontrol-m"/>
-  <symbol minX="840" maxX="896" minY="453" maxY="509" name="marketplace-m"/>
-  <symbol minX="896" maxX="952" minY="453" maxY="509" name="townhall-m"/>
-  <symbol minX="952" maxX="1008" minY="453" maxY="509" name="tourism-m"/>
-  <symbol minX="1008" maxX="1064" minY="453" maxY="509" name="drinking-water-m"/>
-  <symbol minX="1064" maxX="1120" minY="453" maxY="509" name="military-m"/>
-  <symbol minX="1120" maxX="1176" minY="453" maxY="509" name="beach-m"/>
-  <symbol minX="1176" maxX="1232" minY="453" maxY="509" name="tomb-m"/>
-  <symbol minX="1232" maxX="1288" minY="453" maxY="509" name="mobile_phone-m"/>
-  <symbol minX="1288" maxX="1344" minY="453" maxY="509" name="beauty-m"/>
-  <symbol minX="1344" maxX="1400" minY="453" maxY="509" name="monument-m"/>
-  <symbol minX="1400" maxX="1456" minY="453" maxY="509" name="toll_booth-m"/>
-  <symbol minX="1456" maxX="1512" minY="453" maxY="509" name="beer-m"/>
-  <symbol minX="1512" maxX="1568" minY="453" maxY="509" name="motel-m"/>
-  <symbol minX="1568" maxX="1624" minY="453" maxY="509" name="doityourself-m"/>
-  <symbol minX="1624" maxX="1680" minY="453" maxY="509" name="museum-m"/>
-  <symbol minX="1680" maxX="1736" minY="453" maxY="509" name="toilets-m"/>
-  <symbol minX="1736" maxX="1792" minY="453" maxY="509" name="theatre-m"/>
-  <symbol minX="1792" maxX="1848" minY="453" maxY="509" name="tennis-m"/>
-  <symbol minX="1848" maxX="1904" minY="453" maxY="509" name="bicycle-m"/>
-  <symbol minX="1904" maxX="1960" minY="453" maxY="509" name="taxi-m"/>
-  <symbol minX="1960" maxX="2016" minY="453" maxY="509" name="swimming-m"/>
-  <symbol minX="0" maxX="56" minY="509" maxY="565" name="book-shop-m"/>
-  <symbol minX="56" maxX="112" minY="509" maxY="565" name="dog_park-m"/>
-  <symbol minX="112" maxX="168" minY="509" maxY="565" name="npark-m"/>
-  <symbol minX="168" maxX="224" minY="509" maxY="565" name="sweets-m"/>
-  <symbol minX="224" maxX="280" minY="509" maxY="565" name="diving-m"/>
-  <symbol minX="280" maxX="336" minY="509" maxY="565" name="nparkf-m"/>
-  <symbol minX="336" maxX="392" minY="509" maxY="565" name="subway-spb-m"/>
-  <symbol minX="392" maxX="448" minY="509" maxY="565" name="department_store-m"/>
-  <symbol minX="448" maxX="504" minY="509" maxY="565" name="office-m"/>
-  <symbol minX="504" maxX="560" minY="509" maxY="565" name="boundary_stone-m"/>
-  <symbol minX="560" maxX="616" minY="509" maxY="565" name="curling-m"/>
-  <symbol minX="616" maxX="672" minY="509" maxY="565" name="optician-m"/>
-  <symbol minX="672" maxX="728" minY="509" maxY="565" name="cricket-m"/>
-  <symbol minX="728" maxX="784" minY="509" maxY="565" name="park-m"/>
-  <symbol minX="784" maxX="840" minY="509" maxY="565" name="bowls-m"/>
-  <symbol minX="840" maxX="896" minY="509" maxY="565" name="subway-newyork-m"/>
-  <symbol minX="896" maxX="952" minY="509" maxY="565" name="bus-m"/>
-  <symbol minX="952" maxX="1008" minY="509" maxY="565" name="convenience-m"/>
-  <symbol minX="1008" maxX="1064" minY="509" maxY="565" name="parking-meter-m"/>
-  <symbol minX="1064" maxX="1120" minY="509" maxY="565" name="subway-m"/>
-  <symbol minX="1120" maxX="1176" minY="509" maxY="565" name="computer-m"/>
-  <symbol minX="1176" maxX="1232" minY="509" maxY="565" name="peak-m"/>
-  <symbol minX="1232" maxX="1288" minY="509" maxY="565" name="subway-entrance-m"/>
+  <symbol minX="1450" maxX="1508" minY="339" maxY="397" name="tomb-l"/>
+  <symbol minX="1508" maxX="1566" minY="339" maxY="397" name="garden_center-l"/>
+  <symbol minX="1566" maxX="1624" minY="339" maxY="397" name="golf-l"/>
+  <symbol minX="1624" maxX="1682" minY="339" maxY="397" name="gate-l"/>
+  <symbol minX="1682" maxX="1740" minY="339" maxY="397" name="gift-l"/>
+  <symbol minX="1740" maxX="1796" minY="339" maxY="395" name="gate-m"/>
+  <symbol minX="1796" maxX="1852" minY="339" maxY="395" name="gift-m"/>
+  <symbol minX="1852" maxX="1908" minY="339" maxY="395" name="garden_center-m"/>
+  <symbol minX="1908" maxX="1964" minY="339" maxY="395" name="golf-m"/>
+  <symbol minX="1964" maxX="2020" minY="339" maxY="395" name="tomb-m"/>
+  <symbol minX="0" maxX="56" minY="397" maxY="453" name="archery-m"/>
+  <symbol minX="56" maxX="112" minY="397" maxY="453" name="greengrocer-m"/>
+  <symbol minX="112" maxX="168" minY="397" maxY="453" name="gallery-m"/>
+  <symbol minX="168" maxX="224" minY="397" maxY="453" name="grocery-m"/>
+  <symbol minX="224" maxX="280" minY="397" maxY="453" name="toll_booth-m"/>
+  <symbol minX="280" maxX="336" minY="397" maxY="453" name="furniture-m"/>
+  <symbol minX="336" maxX="392" minY="397" maxY="453" name="hairdresser-m"/>
+  <symbol minX="392" maxX="448" minY="397" maxY="453" name="tourism-m"/>
+  <symbol minX="448" maxX="504" minY="397" maxY="453" name="funicular-m"/>
+  <symbol minX="504" maxX="560" minY="397" maxY="453" name="fuel-m"/>
+  <symbol minX="560" maxX="616" minY="397" maxY="453" name="hardware-m"/>
+  <symbol minX="616" maxX="672" minY="397" maxY="453" name="townhall-m"/>
+  <symbol minX="672" maxX="728" minY="397" maxY="453" name="helipad-m"/>
+  <symbol minX="728" maxX="784" minY="397" maxY="453" name="fountain-m"/>
+  <symbol minX="784" maxX="840" minY="397" maxY="453" name="florist-m"/>
+  <symbol minX="840" maxX="896" minY="397" maxY="453" name="heliport-m"/>
+  <symbol minX="896" maxX="952" minY="397" maxY="453" name="toilets-m"/>
+  <symbol minX="952" maxX="1008" minY="397" maxY="453" name="fire_station-m"/>
+  <symbol minX="1008" maxX="1064" minY="397" maxY="453" name="historic-ship-m"/>
+  <symbol minX="1064" maxX="1120" minY="397" maxY="453" name="toys-m"/>
+  <symbol minX="1120" maxX="1176" minY="397" maxY="453" name="hospital-m"/>
+  <symbol minX="1176" maxX="1232" minY="397" maxY="453" name="fastfood-m"/>
+  <symbol minX="1232" maxX="1288" minY="397" maxY="453" name="train-m"/>
+  <symbol minX="1288" maxX="1344" minY="397" maxY="453" name="hotel-m"/>
+  <symbol minX="1344" maxX="1400" minY="397" maxY="453" name="theatre-m"/>
+  <symbol minX="1400" maxX="1456" minY="397" maxY="453" name="embassy-m"/>
+  <symbol minX="1456" maxX="1512" minY="397" maxY="453" name="hunting-tower-m"/>
+  <symbol minX="1512" maxX="1568" minY="397" maxY="453" name="electronics-m"/>
+  <symbol minX="1568" maxX="1624" minY="397" maxY="453" name="information-m"/>
+  <symbol minX="1624" maxX="1680" minY="397" maxY="453" name="drugs"/>
+  <symbol minX="1680" maxX="1736" minY="397" maxY="453" name="tram-m"/>
+  <symbol minX="1736" maxX="1792" minY="397" maxY="453" name="jewelry-m"/>
+  <symbol minX="1792" maxX="1848" minY="397" maxY="453" name="drinking-water-m"/>
+  <symbol minX="1848" maxX="1904" minY="397" maxY="453" name="vending-m"/>
+  <symbol minX="1904" maxX="1960" minY="397" maxY="453" name="tennis-m"/>
+  <symbol minX="1960" maxX="2016" minY="397" maxY="453" name="doityourself-m"/>
+  <symbol minX="0" maxX="56" minY="453" maxY="509" name="kiosk-m"/>
+  <symbol minX="56" maxX="112" minY="453" maxY="509" name="dog_park-m"/>
+  <symbol minX="112" maxX="168" minY="453" maxY="509" name="laundry-m"/>
+  <symbol minX="168" maxX="224" minY="453" maxY="509" name="diving-m"/>
+  <symbol minX="224" maxX="280" minY="453" maxY="509" name="library-m"/>
+  <symbol minX="280" maxX="336" minY="453" maxY="509" name="department_store-m"/>
+  <symbol minX="336" maxX="392" minY="453" maxY="509" name="volcano-m"/>
+  <symbol minX="392" maxX="448" minY="453" maxY="509" name="lift_gate-m"/>
+  <symbol minX="448" maxX="504" minY="453" maxY="509" name="curling-m"/>
+  <symbol minX="504" maxX="560" minY="453" maxY="509" name="lighthouse-m"/>
+  <symbol minX="560" maxX="616" minY="453" maxY="509" name="taxi-m"/>
+  <symbol minX="616" maxX="672" minY="453" maxY="509" name="cricket-m"/>
+  <symbol minX="672" maxX="728" minY="453" maxY="509" name="atm-m"/>
+  <symbol minX="728" maxX="784" minY="453" maxY="509" name="convenience-m"/>
+  <symbol minX="784" maxX="840" minY="453" maxY="509" name="computer-m"/>
+  <symbol minX="840" maxX="896" minY="453" maxY="509" name="mail-m"/>
+  <symbol minX="896" maxX="952" minY="453" maxY="509" name="swimming-m"/>
+  <symbol minX="952" maxX="1008" minY="453" maxY="509" name="college-m"/>
+  <symbol minX="1008" maxX="1064" minY="453" maxY="509" name="marketplace-m"/>
+  <symbol minX="1064" maxX="1120" minY="453" maxY="509" name="clothes-m"/>
+  <symbol minX="1120" maxX="1176" minY="453" maxY="509" name="sweets-m"/>
+  <symbol minX="1176" maxX="1232" minY="453" maxY="509" name="waterfall-m"/>
+  <symbol minX="1232" maxX="1288" minY="453" maxY="509" name="military-m"/>
+  <symbol minX="1288" maxX="1344" minY="453" maxY="509" name="cinema-m"/>
+  <symbol minX="1344" maxX="1400" minY="453" maxY="509" name="chemist-m"/>
+  <symbol minX="1400" maxX="1456" minY="453" maxY="509" name="mobile_phone-m"/>
+  <symbol minX="1456" maxX="1512" minY="453" maxY="509" name="cemetery-m"/>
+  <symbol minX="1512" maxX="1568" minY="453" maxY="509" name="monument-m"/>
+  <symbol minX="1568" maxX="1624" minY="453" maxY="509" name="subway-spb-m"/>
+  <symbol minX="1624" maxX="1680" minY="453" maxY="509" name="wayside_cross-m"/>
+  <symbol minX="1680" maxX="1736" minY="453" maxY="509" name="motel-m"/>
+  <symbol minX="1736" maxX="1792" minY="453" maxY="509" name="cave-m"/>
+  <symbol minX="1792" maxX="1848" minY="453" maxY="509" name="museum-m"/>
+  <symbol minX="1848" maxX="1904" minY="453" maxY="509" name="casino-m"/>
+  <symbol minX="1904" maxX="1960" minY="453" maxY="509" name="shop-bicycle-m"/>
+  <symbol minX="1960" maxX="2016" minY="453" maxY="509" name="america-football-m"/>
+  <symbol minX="0" maxX="56" minY="509" maxY="565" name="garden-m"/>
+  <symbol minX="56" maxX="112" minY="509" maxY="565" name="shoes-m"/>
+  <symbol minX="112" maxX="168" minY="509" maxY="565" name="australian-football-m"/>
+  <symbol minX="168" maxX="224" minY="509" maxY="565" name="shop-m copy"/>
+  <symbol minX="224" maxX="280" minY="509" maxY="565" name="caravan_site-m"/>
+  <symbol minX="280" maxX="336" minY="509" maxY="565" name="npark-m"/>
+  <symbol minX="336" maxX="392" minY="509" maxY="565" name="ship-m"/>
+  <symbol minX="392" maxX="448" minY="509" maxY="565" name="car_sharing-m"/>
+  <symbol minX="448" maxX="504" minY="509" maxY="565" name="nparkf-m"/>
+  <symbol minX="504" maxX="560" minY="509" maxY="565" name="bakery-m"/>
+  <symbol minX="560" maxX="616" minY="509" maxY="565" name="wayside_shrine-m"/>
+  <symbol minX="616" maxX="672" minY="509" maxY="565" name="office-m"/>
+  <symbol minX="672" maxX="728" minY="509" maxY="565" name="car-repair-m"/>
+  <symbol minX="728" maxX="784" minY="509" maxY="565" name="campsite-m"/>
+  <symbol minX="784" maxX="840" minY="509" maxY="565" name="optician-m"/>
+  <symbol minX="840" maxX="896" minY="509" maxY="565" name="windmill-m"/>
+  <symbol minX="896" maxX="952" minY="509" maxY="565" name="park-m"/>
+  <symbol minX="952" maxX="1008" minY="509" maxY="565" name="subway-newyork-m"/>
+  <symbol minX="1008" maxX="1064" minY="509" maxY="565" name="shop-m"/>
+  <symbol minX="1064" maxX="1120" minY="509" maxY="565" name="cafe-m"/>
+  <symbol minX="1120" maxX="1176" minY="509" maxY="565" name="cable-car-m"/>
+  <symbol minX="1176" maxX="1232" minY="509" maxY="565" name="parking-meter-m"/>
+  <symbol minX="1232" maxX="1288" minY="509" maxY="565" name="school-m"/>
   <symbol minX="1288" maxX="1344" minY="509" maxY="565" name="butcher-m"/>
-  <symbol minX="1344" maxX="1400" minY="509" maxY="565" name="subway-entrance-2-m"/>
-  <symbol minX="1400" maxX="1456" minY="509" maxY="565" name="sports-m"/>
-  <symbol minX="1456" maxX="1512" minY="509" maxY="565" name="cable-car-m"/>
-  <symbol minX="1512" maxX="1568" minY="509" maxY="565" name="pharmacy-m"/>
-  <symbol minX="1568" maxX="1624" minY="509" maxY="565" name="soccer-m"/>
-  <symbol minX="1624" maxX="1680" minY="509" maxY="565" name="college-m"/>
-  <symbol minX="1680" maxX="1736" minY="509" maxY="565" name="phone-m"/>
-  <symbol minX="1736" maxX="1792" minY="509" maxY="565" name="skiing-m"/>
-  <symbol minX="1792" maxX="1848" minY="509" maxY="565" name="clothes-m"/>
-  <symbol minX="1848" maxX="1904" minY="509" maxY="565" name="picnic-m"/>
-  <symbol minX="1904" maxX="1960" minY="509" maxY="565" name="cafe-m"/>
-  <symbol minX="1960" maxX="2016" minY="509" maxY="565" name="shop-m"/>
-  <symbol minX="0" maxX="56" minY="565" maxY="621" name="pitch-m"/>
-  <symbol minX="56" maxX="112" minY="565" maxY="621" name="shop-m copy"/>
-  <symbol minX="112" maxX="168" minY="565" maxY="621" name="cinema-m"/>
-  <symbol minX="168" maxX="224" minY="565" maxY="621" name="place-of-worship-m"/>
-  <symbol minX="224" maxX="280" minY="565" maxY="621" name="campsite-m"/>
-  <symbol minX="280" maxX="336" minY="565" maxY="621" name="chemist-m"/>
-  <symbol minX="336" maxX="392" minY="565" maxY="621" name="police-m"/>
-  <symbol minX="392" maxX="448" minY="565" maxY="621" name="shop-bicycle-m"/>
-  <symbol minX="448" maxX="504" minY="565" maxY="621" name="shoes-m"/>
-  <symbol minX="504" maxX="560" minY="565" maxY="621" name="postbox-m"/>
-  <symbol minX="560" maxX="616" minY="565" maxY="621" name="cemetery-m"/>
-  <symbol minX="616" maxX="672" minY="565" maxY="621" name="car-repair-m"/>
-  <symbol minX="672" maxX="728" minY="565" maxY="621" name="cave-m"/>
-  <symbol minX="728" maxX="784" minY="565" maxY="621" name="pub-m"/>
-  <symbol minX="784" maxX="840" minY="565" maxY="621" name="ship-m"/>
-  <symbol minX="840" maxX="896" minY="565" maxY="621" name="school-m"/>
-  <symbol minX="896" maxX="952" minY="565" maxY="621" name="car_sharing-m"/>
-  <symbol minX="952" maxX="1008" minY="565" maxY="621" name="recycling-m"/>
-  <symbol minX="1008" maxX="1064" minY="565" maxY="621" name="restaurant-m"/>
-  <symbol minX="1064" maxX="1120" minY="565" maxY="621" name="casino-m"/>
-  <symbol minX="1120" maxX="1176" minY="565" maxY="621" name="remains-m"/>
-  <symbol minX="1176" maxX="1232" minY="565" maxY="621" name="caravan_site-m"/>
-  <symbol minX="1232" maxX="1283" minY="565" maxY="616" name="lightrail-berlin-m"/>
-  <symbol minX="1283" maxX="1334" minY="565" maxY="616" name="speedcam-l"/>
-  <symbol minX="1334" maxX="1385" minY="565" maxY="616" name="subway-berlin-l"/>
-  <symbol minX="1385" maxX="1443" minY="565" maxY="616" name="subway-moscow-l"/>
-  <symbol minX="1443" maxX="1494" minY="565" maxY="616" name="parking-l"/>
-  <symbol minX="1494" maxX="1545" minY="565" maxY="616" name="subway-rome-l"/>
-  <symbol minX="1545" maxX="1592" minY="565" maxY="612" name="no-icon"/>
-  <symbol minX="1592" maxX="1639" minY="565" maxY="612" name="subway-rome-m"/>
-  <symbol minX="1639" maxX="1686" minY="565" maxY="612" name="no-icon-amenity"/>
-  <symbol minX="1686" maxX="1733" minY="565" maxY="612" name="subway-paris-m"/>
-  <symbol minX="1733" maxX="1780" minY="565" maxY="612" name="no-icon-tourism"/>
-  <symbol minX="1780" maxX="1834" minY="565" maxY="612" name="subway-moscow-m"/>
-  <symbol minX="1834" maxX="1881" minY="565" maxY="612" name="no-icon-shop"/>
-  <symbol minX="1881" maxX="1928" minY="565" maxY="612" name="no-icon-leisure"/>
-  <symbol minX="1928" maxX="1975" minY="565" maxY="612" name="subway-berlin-m"/>
-  <symbol minX="1975" maxX="2033" minY="565" maxY="610" name="subway-london-l"/>
-  <symbol minX="0" maxX="45" minY="621" maxY="666" name="airport-s"/>
-  <symbol minX="45" maxX="87" minY="621" maxY="663" name="cinema-s"/>
-  <symbol minX="87" maxX="129" minY="621" maxY="663" name="shop-s copy"/>
-  <symbol minX="129" maxX="171" minY="621" maxY="663" name="shop-s"/>
-  <symbol minX="171" maxX="213" minY="621" maxY="663" name="picnic-s"/>
-  <symbol minX="213" maxX="255" minY="621" maxY="663" name="phone-s"/>
-  <symbol minX="255" maxX="297" minY="621" maxY="663" name="skiing-s"/>
-  <symbol minX="297" maxX="339" minY="621" maxY="663" name="cable-car-s"/>
-  <symbol minX="339" maxX="381" minY="621" maxY="663" name="pharmacy-s"/>
-  <symbol minX="381" maxX="423" minY="621" maxY="663" name="soccer-s"/>
-  <symbol minX="423" maxX="465" minY="621" maxY="663" name="pitch-s"/>
-  <symbol minX="465" maxX="507" minY="621" maxY="663" name="speedcam-m"/>
-  <symbol minX="507" maxX="549" minY="621" maxY="663" name="hotel-s"/>
-  <symbol minX="549" maxX="591" minY="621" maxY="663" name="college-s"/>
-  <symbol minX="591" maxX="633" minY="621" maxY="663" name="golf-s"/>
-  <symbol minX="633" maxX="675" minY="621" maxY="663" name="information-s"/>
-  <symbol minX="675" maxX="717" minY="621" maxY="663" name="fire_station-s"/>
-  <symbol minX="717" maxX="759" minY="621" maxY="663" name="fastfood-s"/>
-  <symbol minX="759" maxX="801" minY="621" maxY="663" name="bar-s"/>
-  <symbol minX="801" maxX="859" minY="621" maxY="663" name="subway-barcelona-m"/>
-  <symbol minX="859" maxX="910" minY="621" maxY="663" name="subway-barcelona-s"/>
-  <symbol minX="910" maxX="952" minY="621" maxY="663" name="cafe-s"/>
-  <symbol minX="952" maxX="994" minY="621" maxY="663" name="place-of-worship-s"/>
-  <symbol minX="994" maxX="1036" minY="621" maxY="663" name="waterfall-s"/>
-  <symbol minX="1036" maxX="1078" minY="621" maxY="663" name="alcohol-s"/>
-  <symbol minX="1078" maxX="1120" minY="621" maxY="663" name="subway-entrance-2-s"/>
-  <symbol minX="1120" maxX="1162" minY="621" maxY="663" name="subway-entrance-arrow"/>
-  <symbol minX="1162" maxX="1204" minY="621" maxY="663" name="kindergarten-s"/>
-  <symbol minX="1204" maxX="1246" minY="621" maxY="663" name="peak-s"/>
-  <symbol minX="1246" maxX="1288" minY="621" maxY="663" name="subway-entrance-s"/>
-  <symbol minX="1288" maxX="1330" minY="621" maxY="663" name="fountain-s"/>
-  <symbol minX="1330" maxX="1372" minY="621" maxY="663" name="volcano-s"/>
-  <symbol minX="1372" maxX="1414" minY="621" maxY="663" name="windmill-s"/>
-  <symbol minX="1414" maxX="1456" minY="621" maxY="663" name="bus-s"/>
-  <symbol minX="1456" maxX="1498" minY="621" maxY="663" name="police-s"/>
-  <symbol minX="1498" maxX="1554" minY="621" maxY="663" name="subway-london-m"/>
-  <symbol minX="1554" maxX="1596" minY="621" maxY="663" name="baseball-s"/>
-  <symbol minX="1596" maxX="1638" minY="621" maxY="663" name="library-s"/>
-  <symbol minX="1638" maxX="1680" minY="621" maxY="663" name="embassy-s"/>
-  <symbol minX="1680" maxX="1738" minY="621" maxY="663" name="subway-madrid-m"/>
-  <symbol minX="1738" maxX="1780" minY="621" maxY="663" name="hospital-s"/>
-  <symbol minX="1780" maxX="1822" minY="621" maxY="663" name="fuel-s"/>
-  <symbol minX="1822" maxX="1864" minY="621" maxY="663" name="garden-s"/>
-  <symbol minX="1864" maxX="1906" minY="621" maxY="663" name="grocery-s"/>
-  <symbol minX="1906" maxX="1948" minY="621" maxY="663" name="campsite-s"/>
-  <symbol minX="1948" maxX="1990" minY="621" maxY="663" name="cemetery-s"/>
-  <symbol minX="1990" maxX="2032" minY="621" maxY="663" name="zoo-s"/>
-  <symbol minX="0" maxX="42" minY="666" maxY="708" name="tram-s"/>
-  <symbol minX="42" maxX="84" minY="666" maxY="708" name="cave-s"/>
-  <symbol minX="84" maxX="126" minY="666" maxY="708" name="subway-newyork-s"/>
-  <symbol minX="126" maxX="168" minY="666" maxY="708" name="america-football-s"/>
-  <symbol minX="168" maxX="210" minY="666" maxY="708" name="park-s"/>
-  <symbol minX="210" maxX="252" minY="666" maxY="708" name="ship-s"/>
-  <symbol minX="252" maxX="294" minY="666" maxY="708" name="lighthouse-s"/>
-  <symbol minX="294" maxX="336" minY="666" maxY="708" name="pub-s"/>
-  <symbol minX="336" maxX="378" minY="666" maxY="708" name="car-repair-s"/>
-  <symbol minX="378" maxX="420" minY="666" maxY="708" name="basketball-s"/>
-  <symbol minX="420" maxX="462" minY="666" maxY="708" name="subway-s"/>
-  <symbol minX="462" maxX="504" minY="666" maxY="708" name="office-s"/>
-  <symbol minX="504" maxX="546" minY="666" maxY="708" name="nparkf-s"/>
-  <symbol minX="546" maxX="588" minY="666" maxY="708" name="subway-spb-s"/>
-  <symbol minX="588" maxX="630" minY="666" maxY="708" name="gallery-s"/>
-  <symbol minX="630" maxX="672" minY="666" maxY="708" name="funicular-s"/>
-  <symbol minX="672" maxX="714" minY="666" maxY="708" name="train-s"/>
-  <symbol minX="714" maxX="756" minY="666" maxY="708" name="atm-s copy 2"/>
-  <symbol minX="756" maxX="798" minY="666" maxY="708" name="atm-s"/>
-  <symbol minX="798" maxX="840" minY="666" maxY="708" name="book-shop-s"/>
-  <symbol minX="840" maxX="882" minY="666" maxY="708" name="npark-s"/>
-  <symbol minX="882" maxX="924" minY="666" maxY="708" name="remains-s"/>
-  <symbol minX="924" maxX="966" minY="666" maxY="708" name="school-s"/>
-  <symbol minX="966" maxX="1008" minY="666" maxY="708" name="swimming-s"/>
-  <symbol minX="1008" maxX="1050" minY="666" maxY="708" name="bicycle-s"/>
-  <symbol minX="1050" maxX="1092" minY="666" maxY="708" name="casino-s"/>
-  <symbol minX="1092" maxX="1134" minY="666" maxY="708" name="mail-s"/>
-  <symbol minX="1134" maxX="1176" minY="666" maxY="708" name="restaurant-s"/>
-  <symbol minX="1176" maxX="1218" minY="666" maxY="708" name="tennis-s"/>
-  <symbol minX="1218" maxX="1260" minY="666" maxY="708" name="drinking-water-s"/>
-  <symbol minX="1260" maxX="1302" minY="666" maxY="708" name="recycling-s"/>
-  <symbol minX="1302" maxX="1344" minY="666" maxY="708" name="theatre-s"/>
-  <symbol minX="1344" maxX="1386" minY="666" maxY="708" name="beer-s"/>
-  <symbol minX="1386" maxX="1428" minY="666" maxY="708" name="museum-s"/>
-  <symbol minX="1428" maxX="1470" minY="666" maxY="708" name="toilets-s"/>
-  <symbol minX="1470" maxX="1512" minY="666" maxY="708" name="helipad-s"/>
-  <symbol minX="1512" maxX="1554" minY="666" maxY="708" name="monument-s"/>
-  <symbol minX="1554" maxX="1596" minY="666" maxY="708" name="heliport-s"/>
-  <symbol minX="1596" maxX="1638" minY="666" maxY="708" name="townhall-s"/>
-  <symbol minX="1638" maxX="1680" minY="666" maxY="708" name="military-s"/>
-  <symbol minX="1680" maxX="1738" minY="666" maxY="708" name="metro-barcelona-m"/>
-  <symbol minX="1738" maxX="1780" minY="666" maxY="708" name="tourism-s"/>
-  <symbol minX="1780" maxX="1822" minY="666" maxY="708" name="bcontrol-s"/>
-  <symbol minX="1822" maxX="1880" minY="666" maxY="707" name="subway-madrid-l"/>
-  <symbol minX="1880" maxX="1938" minY="666" maxY="707" name="subway-barcelona-l"/>
-  <symbol minX="1938" maxX="1978" minY="666" maxY="706" name="route_from"/>
-  <symbol minX="1978" maxX="2016" minY="666" maxY="706" name="s-arrow"/>
-  <symbol minX="0" maxX="40" minY="708" maxY="748" name="parking-m"/>
-  <symbol minX="40" maxX="78" minY="708" maxY="746" name="current-position"/>
-  <symbol minX="78" maxX="129" minY="708" maxY="746" name="metro-barcelona-s"/>
-  <symbol minX="129" maxX="185" minY="708" maxY="746" name="subway-kiev-l"/>
-  <symbol minX="185" maxX="223" minY="708" maxY="746" name="subway-paris-s"/>
-  <symbol minX="223" maxX="261" minY="708" maxY="746" name="lightrail-berlin-s"/>
-  <symbol minX="261" maxX="312" minY="708" maxY="746" name="subway-madrid-s"/>
-  <symbol minX="312" maxX="368" minY="708" maxY="746" name="subway-kiev-m"/>
-  <symbol minX="368" maxX="404" minY="708" maxY="744" name="subway-moscow-s"/>
-  <symbol minX="404" maxX="437" minY="708" maxY="741" name="speedcam-s"/>
-  <symbol minX="437" maxX="470" minY="708" maxY="741" name="parking-s"/>
-  <symbol minX="470" maxX="512" minY="708" maxY="741" name="subway-london-s"/>
-  <symbol minX="512" maxX="550" minY="708" maxY="741" name="bench"/>
-  <symbol minX="550" maxX="583" minY="708" maxY="741" name="star-l"/>
-  <symbol minX="583" maxX="616" minY="708" maxY="741" name="subway-rome-s"/>
-  <symbol minX="616" maxX="649" minY="708" maxY="741" name="subway-berlin-s"/>
-  <symbol minX="649" maxX="682" minY="708" maxY="739" name="peakt-l"/>
-  <symbol minX="682" maxX="713" minY="708" maxY="739" name="survey_point-l"/>
-  <symbol minX="713" maxX="744" minY="708" maxY="739" name="star-m"/>
-  <symbol minX="744" maxX="800" minY="708" maxY="739" name="subway-minsk-l"/>
-  <symbol minX="800" maxX="829" minY="708" maxY="737" name="api-result"/>
-  <symbol minX="829" maxX="876" minY="708" maxY="737" name="subway-kiev-s"/>
-  <symbol minX="876" maxX="904" minY="708" maxY="736" name="search-result"/>
-  <symbol minX="904" maxX="931" minY="708" maxY="735" name="subway-xs"/>
-  <symbol minX="931" maxX="973" minY="708" maxY="735" name="railway-crossing"/>
-  <symbol minX="973" maxX="1000" minY="708" maxY="735" name="star-s"/>
-  <symbol minX="1000" maxX="1027" minY="708" maxY="735" name="subway-newyork-xs"/>
-  <symbol minX="1027" maxX="1074" minY="708" maxY="735" name="subway-minsk-m"/>
-  <symbol minX="1074" maxX="1101" minY="708" maxY="735" name="survey_point-m"/>
-  <symbol minX="1101" maxX="1125" minY="708" maxY="732" name="subway-xs copy"/>
-  <symbol minX="1125" maxX="1167" minY="708" maxY="732" name="subway-minsk-s"/>
-  <symbol minX="1167" maxX="1191" minY="708" maxY="730" name="peakt-m"/>
-  <symbol minX="1191" maxX="1242" minY="708" maxY="730" name="arrow-m"/>
-  <symbol minX="1242" maxX="1264" minY="708" maxY="730" name="survey_point-s"/>
-  <symbol minX="1264" maxX="1284" minY="708" maxY="728" name="entrance-s"/>
-  <symbol minX="1284" maxX="1304" minY="708" maxY="726" name="peakt-s"/>
-  <symbol minX="1304" maxX="1322" minY="708" maxY="726" name="dot-m"/>
-  <symbol minX="1322" maxX="1337" minY="708" maxY="723" name="none"/>
-  <symbol minX="1337" maxX="1375" minY="708" maxY="723" name="arrow-s"/>
-  <symbol minX="1375" maxX="1390" minY="708" maxY="723" name="tree-l"/>
-  <symbol minX="1390" maxX="1403" minY="708" maxY="721" name="dot-s"/>
-  <symbol minX="1403" maxX="1416" minY="708" maxY="721" name="tree-m"/>
-  <symbol minX="1416" maxX="1429" minY="708" maxY="721" name="entrance-xs"/>
-  <symbol minX="1429" maxX="1442" minY="708" maxY="721" name="dot-s-light"/>
-  <symbol minX="1442" maxX="1453" minY="708" maxY="719" name="zero-icon"/>
-  <symbol minX="1453" maxX="1464" minY="708" maxY="719" name="tree-s"/>
+  <symbol minX="1344" maxX="1400" minY="509" maxY="565" name="peak-m"/>
+  <symbol minX="1400" maxX="1456" minY="509" maxY="565" name="bank-2-m"/>
+  <symbol minX="1456" maxX="1512" minY="509" maxY="565" name="subway-m"/>
+  <symbol minX="1512" maxX="1568" minY="509" maxY="565" name="banknote-m"/>
+  <symbol minX="1568" maxX="1624" minY="509" maxY="565" name="zoo-m"/>
+  <symbol minX="1624" maxX="1680" minY="509" maxY="565" name="bus-m"/>
+  <symbol minX="1680" maxX="1736" minY="509" maxY="565" name="pharmacy-m"/>
+  <symbol minX="1736" maxX="1792" minY="509" maxY="565" name="subway-entrance-m"/>
+  <symbol minX="1792" maxX="1848" minY="509" maxY="565" name="bowls-m"/>
+  <symbol minX="1848" maxX="1904" minY="509" maxY="565" name="phone-m"/>
+  <symbol minX="1904" maxX="1960" minY="509" maxY="565" name="boundary_stone-m"/>
+  <symbol minX="1960" maxX="2016" minY="509" maxY="565" name="book-shop-m"/>
+  <symbol minX="0" maxX="56" minY="565" maxY="621" name="picnic-m"/>
+  <symbol minX="56" maxX="112" minY="565" maxY="621" name="subway-entrance-2-m"/>
+  <symbol minX="112" maxX="168" minY="565" maxY="621" name="bicycle-m"/>
+  <symbol minX="168" maxX="224" minY="565" maxY="621" name="pitch-m"/>
+  <symbol minX="224" maxX="280" minY="565" maxY="621" name="skiing-m"/>
+  <symbol minX="280" maxX="336" minY="565" maxY="621" name="restaurant-m"/>
+  <symbol minX="336" maxX="392" minY="565" maxY="621" name="place-of-worship-m"/>
+  <symbol minX="392" maxX="448" minY="565" maxY="621" name="bar-m"/>
+  <symbol minX="448" maxX="504" minY="565" maxY="621" name="beer-m"/>
+  <symbol minX="504" maxX="560" minY="565" maxY="621" name="police-m"/>
+  <symbol minX="560" maxX="616" minY="565" maxY="621" name="sports-m"/>
+  <symbol minX="616" maxX="672" minY="565" maxY="621" name="beauty-m"/>
+  <symbol minX="672" maxX="728" minY="565" maxY="621" name="postbox-m"/>
+  <symbol minX="728" maxX="784" minY="565" maxY="621" name="beach-m"/>
+  <symbol minX="784" maxX="840" minY="565" maxY="621" name="alcohol-m"/>
+  <symbol minX="840" maxX="896" minY="565" maxY="621" name="bcontrol-m"/>
+  <symbol minX="896" maxX="952" minY="565" maxY="621" name="pub-m"/>
+  <symbol minX="952" maxX="1008" minY="565" maxY="621" name="bbq-m"/>
+  <symbol minX="1008" maxX="1064" minY="565" maxY="621" name="baseball-m"/>
+  <symbol minX="1064" maxX="1120" minY="565" maxY="621" name="basketball-m"/>
+  <symbol minX="1120" maxX="1176" minY="565" maxY="621" name="recycling-m"/>
+  <symbol minX="1176" maxX="1232" minY="565" maxY="621" name="soccer-m"/>
+  <symbol minX="1232" maxX="1288" minY="565" maxY="621" name="alpine_hut-m"/>
+  <symbol minX="1288" maxX="1344" minY="565" maxY="621" name="remains-m"/>
+  <symbol minX="1344" maxX="1395" minY="565" maxY="616" name="speedcam-l"/>
+  <symbol minX="1395" maxX="1446" minY="565" maxY="616" name="subway-berlin-l"/>
+  <symbol minX="1446" maxX="1497" minY="565" maxY="616" name="lightrail-berlin-m"/>
+  <symbol minX="1497" maxX="1548" minY="565" maxY="616" name="subway-rome-l"/>
+  <symbol minX="1548" maxX="1599" minY="565" maxY="616" name="parking-l"/>
+  <symbol minX="1599" maxX="1657" minY="565" maxY="616" name="subway-moscow-l"/>
+  <symbol minX="1657" maxX="1711" minY="565" maxY="612" name="subway-moscow-m"/>
+  <symbol minX="1711" maxX="1758" minY="565" maxY="612" name="no-icon-tourism"/>
+  <symbol minX="1758" maxX="1805" minY="565" maxY="612" name="subway-paris-m"/>
+  <symbol minX="1805" maxX="1852" minY="565" maxY="612" name="subway-berlin-m"/>
+  <symbol minX="1852" maxX="1899" minY="565" maxY="612" name="subway-rome-m"/>
+  <symbol minX="1899" maxX="1946" minY="565" maxY="612" name="no-icon"/>
+  <symbol minX="1946" maxX="1993" minY="565" maxY="612" name="no-icon-shop"/>
+  <symbol minX="1993" maxX="2040" minY="565" maxY="612" name="no-icon-leisure"/>
+  <symbol minX="0" maxX="47" minY="621" maxY="668" name="no-icon-amenity"/>
+  <symbol minX="47" maxX="92" minY="621" maxY="666" name="airport-s"/>
+  <symbol minX="92" maxX="150" minY="621" maxY="666" name="subway-london-l"/>
+  <symbol minX="150" maxX="192" minY="621" maxY="663" name="ship-s"/>
+  <symbol minX="192" maxX="234" minY="621" maxY="663" name="school-s"/>
+  <symbol minX="234" maxX="276" minY="621" maxY="663" name="shop-s copy"/>
+  <symbol minX="276" maxX="318" minY="621" maxY="663" name="shop-s"/>
+  <symbol minX="318" maxX="360" minY="621" maxY="663" name="alcohol-s"/>
+  <symbol minX="360" maxX="402" minY="621" maxY="663" name="restaurant-s"/>
+  <symbol minX="402" maxX="444" minY="621" maxY="663" name="skiing-s"/>
+  <symbol minX="444" maxX="486" minY="621" maxY="663" name="remains-s"/>
+  <symbol minX="486" maxX="528" minY="621" maxY="663" name="recycling-s"/>
+  <symbol minX="528" maxX="570" minY="621" maxY="663" name="soccer-s"/>
+  <symbol minX="570" maxX="612" minY="621" maxY="663" name="america-football-s"/>
+  <symbol minX="612" maxX="654" minY="621" maxY="663" name="speedcam-m"/>
+  <symbol minX="654" maxX="696" minY="621" maxY="663" name="atm-s copy 2"/>
+  <symbol minX="696" maxX="738" minY="621" maxY="663" name="pub-s"/>
+  <symbol minX="738" maxX="780" minY="621" maxY="663" name="police-s"/>
+  <symbol minX="780" maxX="822" minY="621" maxY="663" name="atm-s"/>
+  <symbol minX="822" maxX="864" minY="621" maxY="663" name="bar-s"/>
+  <symbol minX="864" maxX="906" minY="621" maxY="663" name="baseball-s"/>
+  <symbol minX="906" maxX="948" minY="621" maxY="663" name="basketball-s"/>
+  <symbol minX="948" maxX="1006" minY="621" maxY="663" name="subway-barcelona-m"/>
+  <symbol minX="1006" maxX="1057" minY="621" maxY="663" name="subway-barcelona-s"/>
+  <symbol minX="1057" maxX="1099" minY="621" maxY="663" name="place-of-worship-s"/>
+  <symbol minX="1099" maxX="1141" minY="621" maxY="663" name="pitch-s"/>
+  <symbol minX="1141" maxX="1183" minY="621" maxY="663" name="bcontrol-s"/>
+  <symbol minX="1183" maxX="1225" minY="621" maxY="663" name="picnic-s"/>
+  <symbol minX="1225" maxX="1267" minY="621" maxY="663" name="subway-entrance-2-s"/>
+  <symbol minX="1267" maxX="1309" minY="621" maxY="663" name="subway-entrance-arrow"/>
+  <symbol minX="1309" maxX="1351" minY="621" maxY="663" name="phone-s"/>
+  <symbol minX="1351" maxX="1393" minY="621" maxY="663" name="pharmacy-s"/>
+  <symbol minX="1393" maxX="1435" minY="621" maxY="663" name="subway-entrance-s"/>
+  <symbol minX="1435" maxX="1477" minY="621" maxY="663" name="beer-s"/>
+  <symbol minX="1477" maxX="1519" minY="621" maxY="663" name="bicycle-s"/>
+  <symbol minX="1519" maxX="1561" minY="621" maxY="663" name="book-shop-s"/>
+  <symbol minX="1561" maxX="1603" minY="621" maxY="663" name="zoo-s"/>
+  <symbol minX="1603" maxX="1645" minY="621" maxY="663" name="bus-s"/>
+  <symbol minX="1645" maxX="1701" minY="621" maxY="663" name="subway-london-m"/>
+  <symbol minX="1701" maxX="1743" minY="621" maxY="663" name="cable-car-s"/>
+  <symbol minX="1743" maxX="1785" minY="621" maxY="663" name="windmill-s"/>
+  <symbol minX="1785" maxX="1827" minY="621" maxY="663" name="cafe-s"/>
+  <symbol minX="1827" maxX="1885" minY="621" maxY="663" name="subway-madrid-m"/>
+  <symbol minX="1885" maxX="1927" minY="621" maxY="663" name="campsite-s"/>
+  <symbol minX="1927" maxX="1969" minY="621" maxY="663" name="car-repair-s"/>
+  <symbol minX="1969" maxX="2011" minY="621" maxY="663" name="casino-s"/>
+  <symbol minX="0" maxX="42" minY="668" maxY="710" name="cave-s"/>
+  <symbol minX="42" maxX="84" minY="668" maxY="710" name="peak-s"/>
+  <symbol minX="84" maxX="126" minY="668" maxY="710" name="cemetery-s"/>
+  <symbol minX="126" maxX="168" minY="668" maxY="710" name="waterfall-s"/>
+  <symbol minX="168" maxX="210" minY="668" maxY="710" name="cinema-s"/>
+  <symbol minX="210" maxX="252" minY="668" maxY="710" name="park-s"/>
+  <symbol minX="252" maxX="294" minY="668" maxY="710" name="subway-newyork-s"/>
+  <symbol minX="294" maxX="336" minY="668" maxY="710" name="college-s"/>
+  <symbol minX="336" maxX="378" minY="668" maxY="710" name="office-s"/>
+  <symbol minX="378" maxX="420" minY="668" maxY="710" name="nparkf-s"/>
+  <symbol minX="420" maxX="462" minY="668" maxY="710" name="volcano-s"/>
+  <symbol minX="462" maxX="504" minY="668" maxY="710" name="npark-s"/>
+  <symbol minX="504" maxX="546" minY="668" maxY="710" name="dentist-s"/>
+  <symbol minX="546" maxX="588" minY="668" maxY="710" name="tram-s"/>
+  <symbol minX="588" maxX="630" minY="668" maxY="710" name="subway-s"/>
+  <symbol minX="630" maxX="672" minY="668" maxY="710" name="museum-s"/>
+  <symbol minX="672" maxX="714" minY="668" maxY="710" name="monument-s"/>
+  <symbol minX="714" maxX="756" minY="668" maxY="710" name="subway-spb-s"/>
+  <symbol minX="756" maxX="798" minY="668" maxY="710" name="drinking-water-s"/>
+  <symbol minX="798" maxX="840" minY="668" maxY="710" name="embassy-s"/>
+  <symbol minX="840" maxX="882" minY="668" maxY="710" name="train-s"/>
+  <symbol minX="882" maxX="924" minY="668" maxY="710" name="fastfood-s"/>
+  <symbol minX="924" maxX="966" minY="668" maxY="710" name="fire_station-s"/>
+  <symbol minX="966" maxX="1008" minY="668" maxY="710" name="military-s"/>
+  <symbol minX="1008" maxX="1050" minY="668" maxY="710" name="townhall-s"/>
+  <symbol minX="1050" maxX="1108" minY="668" maxY="710" name="metro-barcelona-m"/>
+  <symbol minX="1108" maxX="1150" minY="668" maxY="710" name="mail-s"/>
+  <symbol minX="1150" maxX="1192" minY="668" maxY="710" name="swimming-s"/>
+  <symbol minX="1192" maxX="1234" minY="668" maxY="710" name="fountain-s"/>
+  <symbol minX="1234" maxX="1276" minY="668" maxY="710" name="lighthouse-s"/>
+  <symbol minX="1276" maxX="1318" minY="668" maxY="710" name="library-s"/>
+  <symbol minX="1318" maxX="1360" minY="668" maxY="710" name="kindergarten-s"/>
+  <symbol minX="1360" maxX="1402" minY="668" maxY="710" name="tennis-s"/>
+  <symbol minX="1402" maxX="1444" minY="668" maxY="710" name="information-s"/>
+  <symbol minX="1444" maxX="1486" minY="668" maxY="710" name="hotel-s"/>
+  <symbol minX="1486" maxX="1528" minY="668" maxY="710" name="theatre-s"/>
+  <symbol minX="1528" maxX="1570" minY="668" maxY="710" name="hospital-s"/>
+  <symbol minX="1570" maxX="1612" minY="668" maxY="710" name="heliport-s"/>
+  <symbol minX="1612" maxX="1654" minY="668" maxY="710" name="toilets-s"/>
+  <symbol minX="1654" maxX="1696" minY="668" maxY="710" name="helipad-s"/>
+  <symbol minX="1696" maxX="1738" minY="668" maxY="710" name="grocery-s"/>
+  <symbol minX="1738" maxX="1780" minY="668" maxY="710" name="golf-s"/>
+  <symbol minX="1780" maxX="1822" minY="668" maxY="710" name="garden-s"/>
+  <symbol minX="1822" maxX="1864" minY="668" maxY="710" name="gallery-s"/>
+  <symbol minX="1864" maxX="1906" minY="668" maxY="710" name="funicular-s"/>
+  <symbol minX="1906" maxX="1948" minY="668" maxY="710" name="tourism-s"/>
+  <symbol minX="1948" maxX="1990" minY="668" maxY="710" name="fuel-s"/>
+  <symbol minX="1990" maxX="2048" minY="668" maxY="709" name="subway-barcelona-l"/>
+  <symbol minX="0" maxX="58" minY="710" maxY="751" name="subway-madrid-l"/>
+  <symbol minX="58" maxX="96" minY="710" maxY="750" name="s-arrow"/>
+  <symbol minX="96" maxX="136" minY="710" maxY="750" name="route_from"/>
+  <symbol minX="136" maxX="176" minY="710" maxY="750" name="parking-m"/>
+  <symbol minX="176" maxX="227" minY="710" maxY="748" name="subway-madrid-s"/>
+  <symbol minX="227" maxX="265" minY="710" maxY="748" name="current-position"/>
+  <symbol minX="265" maxX="303" minY="710" maxY="748" name="lightrail-berlin-s"/>
+  <symbol minX="303" maxX="354" minY="710" maxY="748" name="metro-barcelona-s"/>
+  <symbol minX="354" maxX="410" minY="710" maxY="748" name="subway-kiev-m"/>
+  <symbol minX="410" maxX="448" minY="710" maxY="748" name="subway-paris-s"/>
+  <symbol minX="448" maxX="504" minY="710" maxY="748" name="subway-kiev-l"/>
+  <symbol minX="504" maxX="540" minY="710" maxY="746" name="subway-moscow-s"/>
+  <symbol minX="540" maxX="582" minY="710" maxY="743" name="subway-london-s"/>
+  <symbol minX="582" maxX="615" minY="710" maxY="743" name="star-l"/>
+  <symbol minX="615" maxX="653" minY="710" maxY="743" name="bench"/>
+  <symbol minX="653" maxX="686" minY="710" maxY="743" name="parking-s"/>
+  <symbol minX="686" maxX="719" minY="710" maxY="743" name="speedcam-s"/>
+  <symbol minX="719" maxX="752" minY="710" maxY="743" name="subway-rome-s"/>
+  <symbol minX="752" maxX="785" minY="710" maxY="743" name="subway-berlin-s"/>
+  <symbol minX="785" maxX="816" minY="710" maxY="741" name="survey_point-l"/>
+  <symbol minX="816" maxX="847" minY="710" maxY="741" name="star-m"/>
+  <symbol minX="847" maxX="903" minY="710" maxY="741" name="subway-minsk-l"/>
+  <symbol minX="903" maxX="936" minY="710" maxY="741" name="peakt-l"/>
+  <symbol minX="936" maxX="983" minY="710" maxY="739" name="subway-kiev-s"/>
+  <symbol minX="983" maxX="1012" minY="710" maxY="739" name="api-result"/>
+  <symbol minX="1012" maxX="1040" minY="710" maxY="738" name="search-result"/>
+  <symbol minX="1040" maxX="1067" minY="710" maxY="737" name="subway-newyork-xs"/>
+  <symbol minX="1067" maxX="1094" minY="710" maxY="737" name="survey_point-m"/>
+  <symbol minX="1094" maxX="1141" minY="710" maxY="737" name="subway-minsk-m"/>
+  <symbol minX="1141" maxX="1183" minY="710" maxY="737" name="railway-crossing"/>
+  <symbol minX="1183" maxX="1210" minY="710" maxY="737" name="star-s"/>
+  <symbol minX="1210" maxX="1237" minY="710" maxY="737" name="subway-xs"/>
+  <symbol minX="1237" maxX="1279" minY="710" maxY="734" name="subway-minsk-s"/>
+  <symbol minX="1279" maxX="1303" minY="710" maxY="734" name="subway-xs copy"/>
+  <symbol minX="1303" maxX="1354" minY="710" maxY="732" name="arrow-m"/>
+  <symbol minX="1354" maxX="1378" minY="710" maxY="732" name="peakt-m"/>
+  <symbol minX="1378" maxX="1400" minY="710" maxY="732" name="survey_point-s"/>
+  <symbol minX="1400" maxX="1420" minY="710" maxY="730" name="entrance-s"/>
+  <symbol minX="1420" maxX="1438" minY="710" maxY="728" name="dot-m"/>
+  <symbol minX="1438" maxX="1458" minY="710" maxY="728" name="peakt-s"/>
+  <symbol minX="1458" maxX="1473" minY="710" maxY="725" name="none"/>
+  <symbol minX="1473" maxX="1511" minY="710" maxY="725" name="arrow-s"/>
+  <symbol minX="1511" maxX="1526" minY="710" maxY="725" name="tree-l"/>
+  <symbol minX="1526" maxX="1539" minY="710" maxY="723" name="tree-m"/>
+  <symbol minX="1539" maxX="1552" minY="710" maxY="723" name="dot-s"/>
+  <symbol minX="1552" maxX="1565" minY="710" maxY="723" name="dot-s-light"/>
+  <symbol minX="1565" maxX="1578" minY="710" maxY="723" name="entrance-xs"/>
+  <symbol minX="1578" maxX="1589" minY="710" maxY="721" name="tree-s"/>
+  <symbol minX="1589" maxX="1600" minY="710" maxY="721" name="zero-icon"/>
  </file>
 </root>
diff --git a/data/resources-hdpi_clear/symbols.png b/data/resources-hdpi_clear/symbols.png
index a5a5428bc8..52ed7fdefe 100644
Binary files a/data/resources-hdpi_clear/symbols.png and b/data/resources-hdpi_clear/symbols.png differ
diff --git a/data/resources-hdpi_clear/symbols.sdf b/data/resources-hdpi_clear/symbols.sdf
index 1ec5a0a276..7e9b691317 100644
--- a/data/resources-hdpi_clear/symbols.sdf
+++ b/data/resources-hdpi_clear/symbols.sdf
@@ -1,463 +1,466 @@
 <!DOCTYPE skin>
 <root>
- <file width="1024" height="512">
+ <file height="512" width="1024">
   <symbol minX="0" maxX="105" minY="0" maxY="105" name="route_to"/>
   <symbol minX="105" maxX="309" minY="0" maxY="100" name="route-arrow"/>
   <symbol minX="309" maxX="397" minY="0" maxY="88" name="compass-image"/>
   <symbol minX="397" maxX="442" minY="0" maxY="57" name="current-position-compas"/>
   <symbol minX="442" maxX="487" minY="0" maxY="57" name="current-routing-compas"/>
   <symbol minX="487" maxX="538" minY="0" maxY="51" name="search-result-active"/>
-  <symbol minX="538" maxX="562" minY="0" maxY="45" name="placemark-green"/>
-  <symbol minX="562" maxX="586" minY="0" maxY="45" name="placemark-brown"/>
-  <symbol minX="586" maxX="610" minY="0" maxY="45" name="placemark-pink"/>
-  <symbol minX="610" maxX="634" minY="0" maxY="45" name="placemark-purple"/>
+  <symbol minX="538" maxX="562" minY="0" maxY="45" name="placemark-pink"/>
+  <symbol minX="562" maxX="586" minY="0" maxY="45" name="placemark-purple"/>
+  <symbol minX="586" maxX="610" minY="0" maxY="45" name="placemark-green"/>
+  <symbol minX="610" maxX="634" minY="0" maxY="45" name="placemark-brown"/>
   <symbol minX="634" maxX="658" minY="0" maxY="45" name="placemark-blue"/>
   <symbol minX="658" maxX="682" minY="0" maxY="45" name="placemark-red"/>
   <symbol minX="682" maxX="706" minY="0" maxY="45" name="placemark-yellow"/>
   <symbol minX="706" maxX="730" minY="0" maxY="45" name="placemark-orange"/>
-  <symbol minX="730" maxX="761" minY="0" maxY="31" name="gate-l"/>
+  <symbol minX="730" maxX="761" minY="0" maxY="31" name="military-l"/>
   <symbol minX="761" maxX="792" minY="0" maxY="31" name="atm-l"/>
-  <symbol minX="792" maxX="823" minY="0" maxY="31" name="shop-l"/>
-  <symbol minX="823" maxX="854" minY="0" maxY="31" name="shop-bicycle-l"/>
+  <symbol minX="792" maxX="823" minY="0" maxY="31" name="airport-l"/>
+  <symbol minX="823" maxX="854" minY="0" maxY="31" name="airport-m"/>
   <symbol minX="854" maxX="885" minY="0" maxY="31" name="australian-football-l"/>
-  <symbol minX="885" maxX="916" minY="0" maxY="31" name="shoes-l"/>
+  <symbol minX="885" maxX="916" minY="0" maxY="31" name="alcohol-l"/>
   <symbol minX="916" maxX="947" minY="0" maxY="31" name="bakery-l"/>
-  <symbol minX="947" maxX="978" minY="0" maxY="31" name="ship-l"/>
+  <symbol minX="947" maxX="978" minY="0" maxY="31" name="alpine_hut-l"/>
   <symbol minX="978" maxX="1008" minY="0" maxY="31" name="bank-l"/>
   <symbol minX="0" maxX="30" minY="105" maxY="136" name="bank-m"/>
   <symbol minX="30" maxX="60" minY="105" maxY="136" name="banknote-l"/>
-  <symbol minX="60" maxX="91" minY="105" maxY="136" name="soccer-l"/>
+  <symbol minX="60" maxX="91" minY="105" maxY="136" name="america-football-l"/>
   <symbol minX="91" maxX="122" minY="105" maxY="136" name="bar-l"/>
-  <symbol minX="122" maxX="153" minY="105" maxY="136" name="school-l"/>
-  <symbol minX="153" maxX="184" minY="105" maxY="136" name="archery-l"/>
+  <symbol minX="122" maxX="153" minY="105" maxY="136" name="archery-l"/>
+  <symbol minX="153" maxX="184" minY="105" maxY="136" name="zoo-l"/>
   <symbol minX="184" maxX="215" minY="105" maxY="136" name="baseball-l"/>
-  <symbol minX="215" maxX="246" minY="105" maxY="136" name="restaurant-l"/>
-  <symbol minX="246" maxX="276" minY="105" maxY="136" name="remains-m"/>
-  <symbol minX="276" maxX="307" minY="105" maxY="136" name="basketball-l"/>
-  <symbol minX="307" maxX="337" minY="105" maxY="136" name="remains-l"/>
-  <symbol minX="337" maxX="368" minY="105" maxY="136" name="america-football-l"/>
-  <symbol minX="368" maxX="399" minY="105" maxY="136" name="bbq-l"/>
-  <symbol minX="399" maxX="430" minY="105" maxY="136" name="sports-l"/>
+  <symbol minX="215" maxX="246" minY="105" maxY="136" name="windmill-l"/>
+  <symbol minX="246" maxX="277" minY="105" maxY="136" name="wayside_shrine-l"/>
+  <symbol minX="277" maxX="308" minY="105" maxY="136" name="basketball-l"/>
+  <symbol minX="308" maxX="339" minY="105" maxY="136" name="wayside_cross-l"/>
+  <symbol minX="339" maxX="369" minY="105" maxY="136" name="waterfall-m"/>
+  <symbol minX="369" maxX="400" minY="105" maxY="136" name="bbq-l"/>
+  <symbol minX="400" maxX="430" minY="105" maxY="136" name="waterfall-l"/>
   <symbol minX="430" maxX="460" minY="105" maxY="136" name="bcontrol-l"/>
   <symbol minX="460" maxX="490" minY="105" maxY="136" name="bcontrol-m"/>
-  <symbol minX="490" maxX="521" minY="105" maxY="136" name="recycling-l"/>
+  <symbol minX="490" maxX="521" minY="105" maxY="136" name="volcano-l"/>
   <symbol minX="521" maxX="552" minY="105" maxY="136" name="beach-l"/>
-  <symbol minX="552" maxX="583" minY="105" maxY="136" name="pub-l"/>
+  <symbol minX="552" maxX="583" minY="105" maxY="136" name="vending-l"/>
   <symbol minX="583" maxX="614" minY="105" maxY="136" name="beauty-l"/>
-  <symbol minX="614" maxX="645" minY="105" maxY="136" name="power-m"/>
+  <symbol minX="614" maxX="645" minY="105" maxY="136" name="tram-l"/>
   <symbol minX="645" maxX="675" minY="105" maxY="136" name="beer-l"/>
   <symbol minX="675" maxX="705" minY="105" maxY="136" name="beer-m"/>
-  <symbol minX="705" maxX="736" minY="105" maxY="136" name="power-l"/>
-  <symbol minX="736" maxX="767" minY="105" maxY="136" name="postbox-l"/>
+  <symbol minX="705" maxX="736" minY="105" maxY="136" name="train-l"/>
+  <symbol minX="736" maxX="767" minY="105" maxY="136" name="toys-l"/>
   <symbol minX="767" maxX="798" minY="105" maxY="136" name="bicycle-l"/>
-  <symbol minX="798" maxX="829" minY="105" maxY="136" name="police-l"/>
-  <symbol minX="829" maxX="860" minY="105" maxY="136" name="alpine_hut-l"/>
+  <symbol minX="798" maxX="829" minY="105" maxY="136" name="townhall-l"/>
+  <symbol minX="829" maxX="860" minY="105" maxY="136" name="tourism-l"/>
   <symbol minX="860" maxX="891" minY="105" maxY="136" name="book-shop-l"/>
-  <symbol minX="891" maxX="922" minY="105" maxY="136" name="subway-entrance-l"/>
-  <symbol minX="922" maxX="953" minY="105" maxY="136" name="place-of-worship-l"/>
+  <symbol minX="891" maxX="922" minY="105" maxY="136" name="tomb-l"/>
+  <symbol minX="922" maxX="953" minY="105" maxY="136" name="toll_booth-l"/>
   <symbol minX="953" maxX="984" minY="105" maxY="136" name="boundary_stone-l"/>
-  <symbol minX="984" maxX="1015" minY="105" maxY="136" name="pitch-l"/>
+  <symbol minX="984" maxX="1015" minY="105" maxY="136" name="toilets-l"/>
   <symbol minX="0" maxX="31" minY="136" maxY="167" name="bowls-l"/>
-  <symbol minX="31" maxX="61" minY="136" maxY="167" name="picnic-m"/>
-  <symbol minX="61" maxX="92" minY="136" maxY="167" name="bus-l"/>
-  <symbol minX="92" maxX="122" minY="136" maxY="167" name="picnic-l"/>
-  <symbol minX="122" maxX="153" minY="136" maxY="167" name="alcohol-l"/>
-  <symbol minX="153" maxX="184" minY="136" maxY="167" name="butcher-l"/>
-  <symbol minX="184" maxX="215" minY="136" maxY="167" name="subway-l"/>
-  <symbol minX="215" maxX="246" minY="136" maxY="167" name="cable-car-l"/>
-  <symbol minX="246" maxX="277" minY="136" maxY="167" name="phone-l"/>
-  <symbol minX="277" maxX="308" minY="136" maxY="167" name="pharmacy-l"/>
-  <symbol minX="308" maxX="339" minY="136" maxY="167" name="cafe-l"/>
-  <symbol minX="339" maxX="370" minY="136" maxY="167" name="subway-newyork-l"/>
-  <symbol minX="370" maxX="401" minY="136" maxY="167" name="subway-paris-l"/>
-  <symbol minX="401" maxX="432" minY="136" maxY="167" name="campsite-l"/>
-  <symbol minX="432" maxX="463" minY="136" maxY="167" name="parking-meter-l"/>
-  <symbol minX="463" maxX="494" minY="136" maxY="167" name="airport-m"/>
-  <symbol minX="494" maxX="524" minY="136" maxY="167" name="car-repair-l"/>
-  <symbol minX="524" maxX="554" minY="136" maxY="167" name="car-repair-m"/>
-  <symbol minX="554" maxX="585" minY="136" maxY="167" name="airport-l"/>
-  <symbol minX="585" maxX="616" minY="136" maxY="167" name="car_sharing-l"/>
-  <symbol minX="616" maxX="647" minY="136" maxY="167" name="park-l"/>
-  <symbol minX="647" maxX="678" minY="136" maxY="167" name="caravan_site-l"/>
-  <symbol minX="678" maxX="709" minY="136" maxY="167" name="optician-l"/>
-  <symbol minX="709" maxX="740" minY="136" maxY="167" name="casino-l"/>
-  <symbol minX="740" maxX="770" minY="136" maxY="167" name="office-m"/>
-  <symbol minX="770" maxX="800" minY="136" maxY="167" name="office-l"/>
-  <symbol minX="800" maxX="831" minY="136" maxY="167" name="cave-l"/>
-  <symbol minX="831" maxX="862" minY="136" maxY="167" name="subway-spb-l"/>
-  <symbol minX="862" maxX="893" minY="136" maxY="167" name="zoo-l"/>
-  <symbol minX="893" maxX="924" minY="136" maxY="167" name="cemetery-l"/>
-  <symbol minX="924" maxX="955" minY="136" maxY="167" name="nparkf-l"/>
-  <symbol minX="955" maxX="986" minY="136" maxY="167" name="npark-l"/>
-  <symbol minX="986" maxX="1017" minY="136" maxY="167" name="chemist-l"/>
-  <symbol minX="0" maxX="31" minY="167" maxY="198" name="sweets-l"/>
-  <symbol minX="31" maxX="62" minY="167" maxY="198" name="cinema-l"/>
-  <symbol minX="62" maxX="93" minY="167" maxY="198" name="museum-l"/>
-  <symbol minX="93" maxX="124" minY="167" maxY="198" name="windmill-l"/>
-  <symbol minX="124" maxX="155" minY="167" maxY="198" name="clothes-l"/>
-  <symbol minX="155" maxX="186" minY="167" maxY="198" name="motel-l"/>
-  <symbol minX="186" maxX="217" minY="167" maxY="198" name="college-l"/>
-  <symbol minX="217" maxX="248" minY="167" maxY="198" name="swimming-l"/>
-  <symbol minX="248" maxX="279" minY="167" maxY="198" name="monument-l"/>
-  <symbol minX="279" maxX="310" minY="167" maxY="198" name="computer-l"/>
-  <symbol minX="310" maxX="341" minY="167" maxY="198" name="mobile_phone-l"/>
-  <symbol minX="341" maxX="372" minY="167" maxY="198" name="convenience-l"/>
-  <symbol minX="372" maxX="403" minY="167" maxY="198" name="military-l"/>
-  <symbol minX="403" maxX="434" minY="167" maxY="198" name="cricket-l"/>
-  <symbol minX="434" maxX="465" minY="167" maxY="198" name="taxi-l"/>
-  <symbol minX="465" maxX="496" minY="167" maxY="198" name="wayside_shrine-l"/>
-  <symbol minX="496" maxX="527" minY="167" maxY="198" name="marketplace-l"/>
-  <symbol minX="527" maxX="558" minY="167" maxY="198" name="wayside_cross-l"/>
-  <symbol minX="558" maxX="589" minY="167" maxY="198" name="curling-l"/>
-  <symbol minX="589" maxX="620" minY="167" maxY="198" name="tennis-l"/>
-  <symbol minX="620" maxX="651" minY="167" maxY="198" name="department_store-l"/>
-  <symbol minX="651" maxX="682" minY="167" maxY="198" name="mail-l"/>
-  <symbol minX="682" maxX="713" minY="167" maxY="198" name="diving-l"/>
-  <symbol minX="713" maxX="744" minY="167" maxY="198" name="lightrail-berlin-l"/>
-  <symbol minX="744" maxX="775" minY="167" maxY="198" name="dog_park-l"/>
-  <symbol minX="775" maxX="806" minY="167" maxY="198" name="theatre-l"/>
-  <symbol minX="806" maxX="837" minY="167" maxY="198" name="doityourself-l"/>
-  <symbol minX="837" maxX="868" minY="167" maxY="198" name="lighthouse-l"/>
-  <symbol minX="868" maxX="899" minY="167" maxY="198" name="lift_gate-l"/>
-  <symbol minX="899" maxX="929" minY="167" maxY="198" name="waterfall-m"/>
-  <symbol minX="929" maxX="959" minY="167" maxY="198" name="waterfall-l"/>
-  <symbol minX="959" maxX="990" minY="167" maxY="198" name="drinking-water-l"/>
-  <symbol minX="990" maxX="1021" minY="167" maxY="198" name="library-l"/>
-  <symbol minX="0" maxX="30" minY="198" maxY="229" name="laundry-m"/>
-  <symbol minX="30" maxX="60" minY="198" maxY="229" name="laundry-l"/>
-  <symbol minX="60" maxX="91" minY="198" maxY="229" name="electronics-l"/>
-  <symbol minX="91" maxX="122" minY="198" maxY="229" name="kiosk-l"/>
-  <symbol minX="122" maxX="153" minY="198" maxY="229" name="embassy-l"/>
-  <symbol minX="153" maxX="184" minY="198" maxY="229" name="toilets-l"/>
-  <symbol minX="184" maxX="215" minY="198" maxY="229" name="volcano-l"/>
-  <symbol minX="215" maxX="246" minY="198" maxY="229" name="kindergarten-m"/>
-  <symbol minX="246" maxX="277" minY="198" maxY="229" name="vending-l"/>
-  <symbol minX="277" maxX="308" minY="198" maxY="229" name="equestrian-l"/>
-  <symbol minX="308" maxX="339" minY="198" maxY="229" name="equestrian-m"/>
-  <symbol minX="339" maxX="370" minY="198" maxY="229" name="kindergarten-l"/>
-  <symbol minX="370" maxX="401" minY="198" maxY="229" name="fastfood-l"/>
-  <symbol minX="401" maxX="432" minY="198" maxY="229" name="jewelry-l"/>
-  <symbol minX="432" maxX="463" minY="198" maxY="229" name="tram-l"/>
-  <symbol minX="463" maxX="494" minY="198" maxY="229" name="fire_station-l"/>
-  <symbol minX="494" maxX="525" minY="198" maxY="229" name="information-l"/>
-  <symbol minX="525" maxX="555" minY="198" maxY="229" name="hunting-tower-m"/>
-  <symbol minX="555" maxX="586" minY="198" maxY="229" name="florist-l"/>
-  <symbol minX="586" maxX="616" minY="198" maxY="229" name="hunting-tower-l"/>
-  <symbol minX="616" maxX="647" minY="198" maxY="229" name="fountain-l"/>
-  <symbol minX="647" maxX="678" minY="198" maxY="229" name="toll_booth-l"/>
-  <symbol minX="678" maxX="709" minY="198" maxY="229" name="train-l"/>
-  <symbol minX="709" maxX="740" minY="198" maxY="229" name="fuel-l"/>
-  <symbol minX="740" maxX="771" minY="198" maxY="229" name="hotel-l"/>
-  <symbol minX="771" maxX="802" minY="198" maxY="229" name="hospital-l"/>
-  <symbol minX="802" maxX="833" minY="198" maxY="229" name="funicular-l"/>
-  <symbol minX="833" maxX="864" minY="198" maxY="229" name="historic-ship-l"/>
-  <symbol minX="864" maxX="895" minY="198" maxY="229" name="toys-l"/>
-  <symbol minX="895" maxX="926" minY="198" maxY="229" name="furniture-l"/>
-  <symbol minX="926" maxX="956" minY="198" maxY="229" name="heliport-m"/>
-  <symbol minX="956" maxX="987" minY="198" maxY="229" name="gallery-l"/>
-  <symbol minX="987" maxX="1017" minY="198" maxY="229" name="heliport-l"/>
-  <symbol minX="0" maxX="31" minY="229" maxY="260" name="tomb-l"/>
-  <symbol minX="31" maxX="62" minY="229" maxY="260" name="garden-l"/>
-  <symbol minX="62" maxX="93" minY="229" maxY="260" name="helipad-l"/>
-  <symbol minX="93" maxX="124" minY="229" maxY="260" name="townhall-l"/>
-  <symbol minX="124" maxX="155" minY="229" maxY="260" name="garden_center-l"/>
-  <symbol minX="155" maxX="186" minY="229" maxY="260" name="hardware-l"/>
-  <symbol minX="186" maxX="217" minY="229" maxY="260" name="hand-m"/>
-  <symbol minX="217" maxX="248" minY="229" maxY="260" name="hand-l"/>
-  <symbol minX="248" maxX="279" minY="229" maxY="260" name="gift-l"/>
-  <symbol minX="279" maxX="310" minY="229" maxY="260" name="hairdresser-l"/>
-  <symbol minX="310" maxX="341" minY="229" maxY="260" name="golf-l"/>
-  <symbol minX="341" maxX="372" minY="229" maxY="260" name="tourism-l"/>
-  <symbol minX="372" maxX="403" minY="229" maxY="260" name="grocery-l"/>
-  <symbol minX="403" maxX="434" minY="229" maxY="260" name="greengrocer-l"/>
-  <symbol minX="434" maxX="465" minY="229" maxY="260" name="skiing-l"/>
-  <symbol minX="465" maxX="495" minY="229" maxY="259" name="tourism-m"/>
-  <symbol minX="495" maxX="525" minY="229" maxY="259" name="grocery-m"/>
-  <symbol minX="525" maxX="555" minY="229" maxY="259" name="golf-m"/>
-  <symbol minX="555" maxX="585" minY="229" maxY="259" name="gift-m"/>
-  <symbol minX="585" maxX="615" minY="229" maxY="259" name="hairdresser-m"/>
-  <symbol minX="615" maxX="645" minY="229" maxY="259" name="gate-m"/>
-  <symbol minX="645" maxX="675" minY="229" maxY="259" name="greengrocer-m"/>
-  <symbol minX="675" maxX="705" minY="229" maxY="259" name="tomb-m"/>
-  <symbol minX="705" maxX="735" minY="229" maxY="259" name="garden_center-m"/>
-  <symbol minX="735" maxX="765" minY="229" maxY="259" name="hardware-m"/>
-  <symbol minX="765" maxX="795" minY="229" maxY="259" name="garden-m"/>
-  <symbol minX="795" maxX="825" minY="229" maxY="259" name="helipad-m"/>
-  <symbol minX="825" maxX="855" minY="229" maxY="259" name="townhall-m"/>
-  <symbol minX="855" maxX="885" minY="229" maxY="259" name="gallery-m"/>
-  <symbol minX="885" maxX="915" minY="229" maxY="259" name="furniture-m"/>
-  <symbol minX="915" maxX="945" minY="229" maxY="259" name="shop-m"/>
-  <symbol minX="945" maxX="975" minY="229" maxY="259" name="funicular-m"/>
-  <symbol minX="975" maxX="1005" minY="229" maxY="259" name="historic-ship-m"/>
-  <symbol minX="0" maxX="30" minY="260" maxY="290" name="toys-m"/>
-  <symbol minX="30" maxX="60" minY="260" maxY="290" name="hospital-m"/>
-  <symbol minX="60" maxX="90" minY="260" maxY="290" name="toll_booth-m"/>
-  <symbol minX="90" maxX="120" minY="260" maxY="290" name="fuel-m"/>
-  <symbol minX="120" maxX="150" minY="260" maxY="290" name="hotel-m"/>
-  <symbol minX="150" maxX="180" minY="260" maxY="290" name="fountain-m"/>
-  <symbol minX="180" maxX="210" minY="260" maxY="290" name="florist-m"/>
-  <symbol minX="210" maxX="240" minY="260" maxY="290" name="train-m"/>
-  <symbol minX="240" maxX="270" minY="260" maxY="290" name="atm-m"/>
-  <symbol minX="270" maxX="300" minY="260" maxY="290" name="fire_station-m"/>
-  <symbol minX="300" maxX="330" minY="260" maxY="290" name="information-m"/>
-  <symbol minX="330" maxX="360" minY="260" maxY="290" name="toilets-m"/>
-  <symbol minX="360" maxX="390" minY="260" maxY="290" name="fastfood-m"/>
-  <symbol minX="390" maxX="420" minY="260" maxY="290" name="jewelry-m"/>
-  <symbol minX="420" maxX="450" minY="260" maxY="290" name="tram-m"/>
-  <symbol minX="450" maxX="480" minY="260" maxY="290" name="vending-m"/>
-  <symbol minX="480" maxX="510" minY="260" maxY="290" name="embassy-m"/>
-  <symbol minX="510" maxX="540" minY="260" maxY="290" name="electronics-m"/>
-  <symbol minX="540" maxX="570" minY="260" maxY="290" name="kiosk-m"/>
-  <symbol minX="570" maxX="600" minY="260" maxY="290" name="drugs"/>
-  <symbol minX="600" maxX="630" minY="260" maxY="290" name="volcano-m"/>
-  <symbol minX="630" maxX="660" minY="260" maxY="290" name="drinking-water-m"/>
-  <symbol minX="660" maxX="690" minY="260" maxY="290" name="library-m"/>
-  <symbol minX="690" maxX="720" minY="260" maxY="290" name="theatre-m"/>
-  <symbol minX="720" maxX="750" minY="260" maxY="290" name="shop-bicycle-m"/>
-  <symbol minX="750" maxX="780" minY="260" maxY="290" name="lift_gate-m"/>
-  <symbol minX="780" maxX="810" minY="260" maxY="290" name="doityourself-m"/>
-  <symbol minX="810" maxX="840" minY="260" maxY="290" name="lighthouse-m"/>
-  <symbol minX="840" maxX="870" minY="260" maxY="290" name="dog_park-m"/>
-  <symbol minX="870" maxX="900" minY="260" maxY="290" name="diving-m"/>
-  <symbol minX="900" maxX="930" minY="260" maxY="290" name="archery-m"/>
-  <symbol minX="930" maxX="960" minY="260" maxY="290" name="tennis-m"/>
-  <symbol minX="960" maxX="990" minY="260" maxY="290" name="department_store-m"/>
-  <symbol minX="990" maxX="1020" minY="260" maxY="290" name="mail-m"/>
-  <symbol minX="0" maxX="30" minY="290" maxY="320" name="curling-m"/>
-  <symbol minX="30" maxX="60" minY="290" maxY="320" name="wayside_cross-m"/>
-  <symbol minX="60" maxX="90" minY="290" maxY="320" name="marketplace-m"/>
-  <symbol minX="90" maxX="120" minY="290" maxY="320" name="taxi-m"/>
-  <symbol minX="120" maxX="150" minY="290" maxY="320" name="cricket-m"/>
-  <symbol minX="150" maxX="180" minY="290" maxY="320" name="convenience-m"/>
-  <symbol minX="180" maxX="210" minY="290" maxY="320" name="military-m"/>
-  <symbol minX="210" maxX="240" minY="290" maxY="320" name="swimming-m"/>
-  <symbol minX="240" maxX="270" minY="290" maxY="320" name="computer-m"/>
-  <symbol minX="270" maxX="300" minY="290" maxY="320" name="mobile_phone-m"/>
-  <symbol minX="300" maxX="330" minY="290" maxY="320" name="wayside_shrine-m"/>
-  <symbol minX="330" maxX="360" minY="290" maxY="320" name="monument-m"/>
-  <symbol minX="360" maxX="390" minY="290" maxY="320" name="college-m"/>
-  <symbol minX="390" maxX="420" minY="290" maxY="320" name="clothes-m"/>
-  <symbol minX="420" maxX="450" minY="290" maxY="320" name="motel-m"/>
-  <symbol minX="450" maxX="480" minY="290" maxY="320" name="cinema-m"/>
-  <symbol minX="480" maxX="510" minY="290" maxY="320" name="museum-m"/>
-  <symbol minX="510" maxX="540" minY="290" maxY="320" name="sweets-m"/>
-  <symbol minX="540" maxX="570" minY="290" maxY="320" name="shoes-m"/>
-  <symbol minX="570" maxX="600" minY="290" maxY="320" name="australian-football-m"/>
-  <symbol minX="600" maxX="630" minY="290" maxY="320" name="skiing-m"/>
-  <symbol minX="630" maxX="660" minY="290" maxY="320" name="ship-m"/>
-  <symbol minX="660" maxX="690" minY="290" maxY="320" name="bakery-m"/>
-  <symbol minX="690" maxX="720" minY="290" maxY="320" name="chemist-m"/>
-  <symbol minX="720" maxX="750" minY="290" maxY="320" name="windmill-m"/>
-  <symbol minX="750" maxX="780" minY="290" maxY="320" name="npark-m"/>
-  <symbol minX="780" maxX="810" minY="290" maxY="320" name="subway-spb-m"/>
-  <symbol minX="810" maxX="840" minY="290" maxY="320" name="cemetery-m"/>
-  <symbol minX="840" maxX="870" minY="290" maxY="320" name="nparkf-m "/>
-  <symbol minX="870" maxX="900" minY="290" maxY="320" name="nparkf-m"/>
-  <symbol minX="900" maxX="930" minY="290" maxY="320" name="cave-m"/>
-  <symbol minX="930" maxX="960" minY="290" maxY="320" name="zoo-m"/>
-  <symbol minX="960" maxX="990" minY="290" maxY="320" name="casino-m"/>
-  <symbol minX="990" maxX="1020" minY="290" maxY="320" name="banknote-m"/>
-  <symbol minX="0" maxX="30" minY="320" maxY="350" name="caravan_site-m"/>
-  <symbol minX="30" maxX="60" minY="320" maxY="350" name="optician-m"/>
-  <symbol minX="60" maxX="90" minY="320" maxY="350" name="car_sharing-m"/>
-  <symbol minX="90" maxX="120" minY="320" maxY="350" name="park-m"/>
-  <symbol minX="120" maxX="150" minY="320" maxY="350" name="school-m"/>
-  <symbol minX="150" maxX="180" minY="320" maxY="350" name="bar-m"/>
-  <symbol minX="180" maxX="210" minY="320" maxY="350" name="soccer-m"/>
-  <symbol minX="210" maxX="240" minY="320" maxY="350" name="campsite-m"/>
-  <symbol minX="240" maxX="270" minY="320" maxY="350" name="parking-meter-m"/>
-  <symbol minX="270" maxX="300" minY="320" maxY="350" name="restaurant-m"/>
-  <symbol minX="300" maxX="330" minY="320" maxY="350" name="baseball-m"/>
-  <symbol minX="330" maxX="360" minY="320" maxY="350" name="subway-newyork-m"/>
-  <symbol minX="360" maxX="390" minY="320" maxY="350" name="cafe-m"/>
-  <symbol minX="390" maxX="420" minY="320" maxY="350" name="america-football-m"/>
-  <symbol minX="420" maxX="450" minY="320" maxY="350" name="basketball-m"/>
-  <symbol minX="450" maxX="480" minY="320" maxY="350" name="subway-m"/>
-  <symbol minX="480" maxX="510" minY="320" maxY="350" name="pharmacy-2-m"/>
-  <symbol minX="510" maxX="540" minY="320" maxY="350" name="bbq-m"/>
-  <symbol minX="540" maxX="570" minY="320" maxY="350" name="pharmacy-m"/>
-  <symbol minX="570" maxX="600" minY="320" maxY="350" name="recycling-m"/>
+  <symbol minX="31" maxX="62" minY="136" maxY="167" name="theatre-l"/>
+  <symbol minX="62" maxX="93" minY="136" maxY="167" name="bus-l"/>
+  <symbol minX="93" maxX="124" minY="136" maxY="167" name="tennis-l"/>
+  <symbol minX="124" maxX="155" minY="136" maxY="167" name="taxi-l"/>
+  <symbol minX="155" maxX="186" minY="136" maxY="167" name="butcher-l"/>
+  <symbol minX="186" maxX="217" minY="136" maxY="167" name="swimming-l"/>
+  <symbol minX="217" maxX="248" minY="136" maxY="167" name="cable-car-l"/>
+  <symbol minX="248" maxX="279" minY="136" maxY="167" name="sweets-l"/>
+  <symbol minX="279" maxX="310" minY="136" maxY="167" name="subway-spb-l"/>
+  <symbol minX="310" maxX="341" minY="136" maxY="167" name="cafe-l"/>
+  <symbol minX="341" maxX="372" minY="136" maxY="167" name="subway-paris-l"/>
+  <symbol minX="372" maxX="403" minY="136" maxY="167" name="subway-newyork-l"/>
+  <symbol minX="403" maxX="434" minY="136" maxY="167" name="campsite-l"/>
+  <symbol minX="434" maxX="465" minY="136" maxY="167" name="subway-l"/>
+  <symbol minX="465" maxX="496" minY="136" maxY="167" name="subway-entrance-l"/>
+  <symbol minX="496" maxX="526" minY="136" maxY="167" name="car-repair-l"/>
+  <symbol minX="526" maxX="556" minY="136" maxY="167" name="car-repair-m"/>
+  <symbol minX="556" maxX="587" minY="136" maxY="167" name="sports-l"/>
+  <symbol minX="587" maxX="618" minY="136" maxY="167" name="car_sharing-l"/>
+  <symbol minX="618" maxX="649" minY="136" maxY="167" name="soccer-l"/>
+  <symbol minX="649" maxX="680" minY="136" maxY="167" name="caravan_site-l"/>
+  <symbol minX="680" maxX="711" minY="136" maxY="167" name="skiing-l"/>
+  <symbol minX="711" maxX="742" minY="136" maxY="167" name="casino-l"/>
+  <symbol minX="742" maxX="773" minY="136" maxY="167" name="shop-l"/>
+  <symbol minX="773" maxX="804" minY="136" maxY="167" name="shop-bicycle-l"/>
+  <symbol minX="804" maxX="835" minY="136" maxY="167" name="cave-l"/>
+  <symbol minX="835" maxX="866" minY="136" maxY="167" name="shoes-l"/>
+  <symbol minX="866" maxX="897" minY="136" maxY="167" name="ship-l"/>
+  <symbol minX="897" maxX="928" minY="136" maxY="167" name="cemetery-l"/>
+  <symbol minX="928" maxX="959" minY="136" maxY="167" name="school-l"/>
+  <symbol minX="959" maxX="990" minY="136" maxY="167" name="restaurant-l"/>
+  <symbol minX="990" maxX="1021" minY="136" maxY="167" name="chemist-l"/>
+  <symbol minX="0" maxX="30" minY="167" maxY="198" name="remains-m"/>
+  <symbol minX="30" maxX="61" minY="167" maxY="198" name="cinema-l"/>
+  <symbol minX="61" maxX="91" minY="167" maxY="198" name="remains-l"/>
+  <symbol minX="91" maxX="122" minY="167" maxY="198" name="recycling-l"/>
+  <symbol minX="122" maxX="153" minY="167" maxY="198" name="clothes-l"/>
+  <symbol minX="153" maxX="184" minY="167" maxY="198" name="pub-l"/>
+  <symbol minX="184" maxX="215" minY="167" maxY="198" name="college-l"/>
+  <symbol minX="215" maxX="246" minY="167" maxY="198" name="power-m"/>
+  <symbol minX="246" maxX="277" minY="167" maxY="198" name="power-l"/>
+  <symbol minX="277" maxX="308" minY="167" maxY="198" name="computer-l"/>
+  <symbol minX="308" maxX="339" minY="167" maxY="198" name="postbox-l"/>
+  <symbol minX="339" maxX="370" minY="167" maxY="198" name="convenience-l"/>
+  <symbol minX="370" maxX="401" minY="167" maxY="198" name="police-l"/>
+  <symbol minX="401" maxX="432" minY="167" maxY="198" name="cricket-l"/>
+  <symbol minX="432" maxX="463" minY="167" maxY="198" name="place-of-worship-l"/>
+  <symbol minX="463" maxX="494" minY="167" maxY="198" name="pitch-l"/>
+  <symbol minX="494" maxX="524" minY="167" maxY="198" name="picnic-m"/>
+  <symbol minX="524" maxX="554" minY="167" maxY="198" name="picnic-l"/>
+  <symbol minX="554" maxX="585" minY="167" maxY="198" name="curling-l"/>
+  <symbol minX="585" maxX="616" minY="167" maxY="198" name="phone-l"/>
+  <symbol minX="616" maxX="647" minY="167" maxY="198" name="dentist-l"/>
+  <symbol minX="647" maxX="678" minY="167" maxY="198" name="dentist-m"/>
+  <symbol minX="678" maxX="709" minY="167" maxY="198" name="pharmacy-l"/>
+  <symbol minX="709" maxX="740" minY="167" maxY="198" name="department_store-l"/>
+  <symbol minX="740" maxX="771" minY="167" maxY="198" name="parking-meter-l"/>
+  <symbol minX="771" maxX="802" minY="167" maxY="198" name="diving-l"/>
+  <symbol minX="802" maxX="833" minY="167" maxY="198" name="park-l"/>
+  <symbol minX="833" maxX="864" minY="167" maxY="198" name="dog_park-l"/>
+  <symbol minX="864" maxX="895" minY="167" maxY="198" name="optician-l"/>
+  <symbol minX="895" maxX="926" minY="167" maxY="198" name="doityourself-l"/>
+  <symbol minX="926" maxX="956" minY="167" maxY="198" name="office-m"/>
+  <symbol minX="956" maxX="986" minY="167" maxY="198" name="office-l"/>
+  <symbol minX="986" maxX="1017" minY="167" maxY="198" name="nparkf-l"/>
+  <symbol minX="0" maxX="31" minY="198" maxY="229" name="npark-l"/>
+  <symbol minX="31" maxX="62" minY="198" maxY="229" name="drinking-water-l"/>
+  <symbol minX="62" maxX="93" minY="198" maxY="229" name="museum-l"/>
+  <symbol minX="93" maxX="124" minY="198" maxY="229" name="motel-l"/>
+  <symbol minX="124" maxX="155" minY="198" maxY="229" name="monument-l"/>
+  <symbol minX="155" maxX="186" minY="198" maxY="229" name="electronics-l"/>
+  <symbol minX="186" maxX="217" minY="198" maxY="229" name="mobile_phone-l"/>
+  <symbol minX="217" maxX="248" minY="198" maxY="229" name="embassy-l"/>
+  <symbol minX="248" maxX="279" minY="198" maxY="229" name="marketplace-l"/>
+  <symbol minX="279" maxX="310" minY="198" maxY="229" name="mail-l"/>
+  <symbol minX="310" maxX="341" minY="198" maxY="229" name="lightrail-berlin-l"/>
+  <symbol minX="341" maxX="372" minY="198" maxY="229" name="lighthouse-l"/>
+  <symbol minX="372" maxX="403" minY="198" maxY="229" name="equestrian-l"/>
+  <symbol minX="403" maxX="434" minY="198" maxY="229" name="equestrian-m"/>
+  <symbol minX="434" maxX="465" minY="198" maxY="229" name="lift_gate-l"/>
+  <symbol minX="465" maxX="496" minY="198" maxY="229" name="fastfood-l"/>
+  <symbol minX="496" maxX="527" minY="198" maxY="229" name="library-l"/>
+  <symbol minX="527" maxX="557" minY="198" maxY="229" name="laundry-m"/>
+  <symbol minX="557" maxX="588" minY="198" maxY="229" name="fire_station-l"/>
+  <symbol minX="588" maxX="618" minY="198" maxY="229" name="laundry-l"/>
+  <symbol minX="618" maxX="649" minY="198" maxY="229" name="kiosk-l"/>
+  <symbol minX="649" maxX="680" minY="198" maxY="229" name="florist-l"/>
+  <symbol minX="680" maxX="711" minY="198" maxY="229" name="kindergarten-m"/>
+  <symbol minX="711" maxX="742" minY="198" maxY="229" name="fountain-l"/>
+  <symbol minX="742" maxX="773" minY="198" maxY="229" name="kindergarten-l"/>
+  <symbol minX="773" maxX="804" minY="198" maxY="229" name="jewelry-l"/>
+  <symbol minX="804" maxX="835" minY="198" maxY="229" name="fuel-l"/>
+  <symbol minX="835" maxX="866" minY="198" maxY="229" name="information-l"/>
+  <symbol minX="866" maxX="896" minY="198" maxY="229" name="hunting-tower-m"/>
+  <symbol minX="896" maxX="927" minY="198" maxY="229" name="funicular-l"/>
+  <symbol minX="927" maxX="957" minY="198" maxY="229" name="hunting-tower-l"/>
+  <symbol minX="957" maxX="988" minY="198" maxY="229" name="hotel-l"/>
+  <symbol minX="988" maxX="1019" minY="198" maxY="229" name="furniture-l"/>
+  <symbol minX="0" maxX="31" minY="229" maxY="260" name="hospital-l"/>
+  <symbol minX="31" maxX="62" minY="229" maxY="260" name="gallery-l"/>
+  <symbol minX="62" maxX="93" minY="229" maxY="260" name="historic-ship-l"/>
+  <symbol minX="93" maxX="123" minY="229" maxY="260" name="heliport-m"/>
+  <symbol minX="123" maxX="154" minY="229" maxY="260" name="garden-l"/>
+  <symbol minX="154" maxX="184" minY="229" maxY="260" name="heliport-l"/>
+  <symbol minX="184" maxX="215" minY="229" maxY="260" name="helipad-l"/>
+  <symbol minX="215" maxX="246" minY="229" maxY="260" name="garden_center-l"/>
+  <symbol minX="246" maxX="277" minY="229" maxY="260" name="hardware-l"/>
+  <symbol minX="277" maxX="308" minY="229" maxY="260" name="gate-l"/>
+  <symbol minX="308" maxX="339" minY="229" maxY="260" name="hand-m"/>
+  <symbol minX="339" maxX="370" minY="229" maxY="260" name="gift-l"/>
+  <symbol minX="370" maxX="401" minY="229" maxY="260" name="hand-l"/>
+  <symbol minX="401" maxX="432" minY="229" maxY="260" name="golf-l"/>
+  <symbol minX="432" maxX="463" minY="229" maxY="260" name="hairdresser-l"/>
+  <symbol minX="463" maxX="494" minY="229" maxY="260" name="grocery-l"/>
+  <symbol minX="494" maxX="525" minY="229" maxY="260" name="greengrocer-l"/>
+  <symbol minX="525" maxX="555" minY="229" maxY="259" name="greengrocer-m"/>
+  <symbol minX="555" maxX="585" minY="229" maxY="259" name="atm-m"/>
+  <symbol minX="585" maxX="615" minY="229" maxY="259" name="grocery-m"/>
+  <symbol minX="615" maxX="645" minY="229" maxY="259" name="shop-m"/>
+  <symbol minX="645" maxX="675" minY="229" maxY="259" name="golf-m"/>
+  <symbol minX="675" maxX="705" minY="229" maxY="259" name="hairdresser-m"/>
+  <symbol minX="705" maxX="735" minY="229" maxY="259" name="gift-m"/>
+  <symbol minX="735" maxX="765" minY="229" maxY="259" name="gate-m"/>
+  <symbol minX="765" maxX="795" minY="229" maxY="259" name="casino-m"/>
+  <symbol minX="795" maxX="825" minY="229" maxY="259" name="garden_center-m"/>
+  <symbol minX="825" maxX="855" minY="229" maxY="259" name="hardware-m"/>
+  <symbol minX="855" maxX="885" minY="229" maxY="259" name="australian-football-m"/>
+  <symbol minX="885" maxX="915" minY="229" maxY="259" name="helipad-m"/>
+  <symbol minX="915" maxX="945" minY="229" maxY="259" name="alcohol-m"/>
+  <symbol minX="945" maxX="975" minY="229" maxY="259" name="garden-m"/>
+  <symbol minX="975" maxX="1005" minY="229" maxY="259" name="bakery-m"/>
+  <symbol minX="0" maxX="30" minY="260" maxY="290" name="shop-bicycle-m"/>
+  <symbol minX="30" maxX="60" minY="260" maxY="290" name="gallery-m"/>
+  <symbol minX="60" maxX="90" minY="260" maxY="290" name="historic-ship-m"/>
+  <symbol minX="90" maxX="120" minY="260" maxY="290" name="furniture-m"/>
+  <symbol minX="120" maxX="150" minY="260" maxY="290" name="hospital-m"/>
+  <symbol minX="150" maxX="180" minY="260" maxY="290" name="alpine_hut-m"/>
+  <symbol minX="180" maxX="210" minY="260" maxY="290" name="banknote-m"/>
+  <symbol minX="210" maxX="240" minY="260" maxY="290" name="hotel-m"/>
+  <symbol minX="240" maxX="270" minY="260" maxY="290" name="america-football-m"/>
+  <symbol minX="270" maxX="300" minY="260" maxY="290" name="funicular-m"/>
+  <symbol minX="300" maxX="330" minY="260" maxY="290" name="bar-m"/>
+  <symbol minX="330" maxX="360" minY="260" maxY="290" name="caravan_site-m"/>
+  <symbol minX="360" maxX="390" minY="260" maxY="290" name="fuel-m"/>
+  <symbol minX="390" maxX="420" minY="260" maxY="290" name="information-m"/>
+  <symbol minX="420" maxX="450" minY="260" maxY="290" name="shoes-m"/>
+  <symbol minX="450" maxX="480" minY="260" maxY="290" name="archery-m"/>
+  <symbol minX="480" maxX="510" minY="260" maxY="290" name="jewelry-m"/>
+  <symbol minX="510" maxX="540" minY="260" maxY="290" name="fountain-m"/>
+  <symbol minX="540" maxX="570" minY="260" maxY="290" name="florist-m"/>
+  <symbol minX="570" maxX="600" minY="260" maxY="290" name="zoo-m"/>
+  <symbol minX="600" maxX="630" minY="260" maxY="290" name="windmill-m"/>
+  <symbol minX="630" maxX="660" minY="260" maxY="290" name="kiosk-m"/>
+  <symbol minX="660" maxX="690" minY="260" maxY="290" name="fire_station-m"/>
+  <symbol minX="690" maxX="720" minY="260" maxY="290" name="baseball-m"/>
+  <symbol minX="720" maxX="750" minY="260" maxY="290" name="fastfood-m"/>
+  <symbol minX="750" maxX="780" minY="260" maxY="290" name="library-m"/>
+  <symbol minX="780" maxX="810" minY="260" maxY="290" name="wayside_shrine-m"/>
+  <symbol minX="810" maxX="840" minY="260" maxY="290" name="wayside_cross-m"/>
+  <symbol minX="840" maxX="870" minY="260" maxY="290" name="lift_gate-m"/>
+  <symbol minX="870" maxX="900" minY="260" maxY="290" name="basketball-m"/>
+  <symbol minX="900" maxX="930" minY="260" maxY="290" name="lighthouse-m"/>
+  <symbol minX="930" maxX="960" minY="260" maxY="290" name="cave-m"/>
+  <symbol minX="960" maxX="990" minY="260" maxY="290" name="bbq-m"/>
+  <symbol minX="990" maxX="1020" minY="260" maxY="290" name="skiing-m"/>
+  <symbol minX="0" maxX="30" minY="290" maxY="320" name="volcano-m"/>
+  <symbol minX="30" maxX="60" minY="290" maxY="320" name="ship-m"/>
+  <symbol minX="60" maxX="90" minY="290" maxY="320" name="mail-m"/>
+  <symbol minX="90" maxX="120" minY="290" maxY="320" name="vending-m"/>
+  <symbol minX="120" maxX="150" minY="290" maxY="320" name="embassy-m"/>
+  <symbol minX="150" maxX="180" minY="290" maxY="320" name="marketplace-m"/>
+  <symbol minX="180" maxX="210" minY="290" maxY="320" name="beach-m"/>
+  <symbol minX="210" maxX="240" minY="290" maxY="320" name="tram-m"/>
+  <symbol minX="240" maxX="270" minY="290" maxY="320" name="beauty-m"/>
+  <symbol minX="270" maxX="300" minY="290" maxY="320" name="military-m"/>
+  <symbol minX="300" maxX="330" minY="290" maxY="320" name="train-m"/>
+  <symbol minX="330" maxX="360" minY="290" maxY="320" name="electronics-m"/>
+  <symbol minX="360" maxX="390" minY="290" maxY="320" name="mobile_phone-m"/>
+  <symbol minX="390" maxX="420" minY="290" maxY="320" name="drugs"/>
+  <symbol minX="420" maxX="450" minY="290" maxY="320" name="monument-m"/>
+  <symbol minX="450" maxX="480" minY="290" maxY="320" name="car_sharing-m"/>
+  <symbol minX="480" maxX="510" minY="290" maxY="320" name="toys-m"/>
+  <symbol minX="510" maxX="540" minY="290" maxY="320" name="motel-m"/>
+  <symbol minX="540" maxX="570" minY="290" maxY="320" name="drinking-water-m"/>
+  <symbol minX="570" maxX="600" minY="290" maxY="320" name="museum-m"/>
+  <symbol minX="600" maxX="630" minY="290" maxY="320" name="townhall-m"/>
+  <symbol minX="630" maxX="660" minY="290" maxY="320" name="soccer-m"/>
+  <symbol minX="660" maxX="690" minY="290" maxY="320" name="school-m"/>
+  <symbol minX="690" maxX="720" minY="290" maxY="320" name="cemetery-m"/>
+  <symbol minX="720" maxX="750" minY="290" maxY="320" name="sports-m"/>
+  <symbol minX="750" maxX="780" minY="290" maxY="320" name="restaurant-m"/>
+  <symbol minX="780" maxX="810" minY="290" maxY="320" name="bicycle-m"/>
+  <symbol minX="810" maxX="840" minY="290" maxY="320" name="tourism-m"/>
+  <symbol minX="840" maxX="870" minY="290" maxY="320" name="npark-m"/>
+  <symbol minX="870" maxX="900" minY="290" maxY="320" name="tomb-m"/>
+  <symbol minX="900" maxX="930" minY="290" maxY="320" name="book-shop-m"/>
+  <symbol minX="930" maxX="960" minY="290" maxY="320" name="nparkf-m "/>
+  <symbol minX="960" maxX="990" minY="290" maxY="320" name="nparkf-m"/>
+  <symbol minX="990" maxX="1020" minY="290" maxY="320" name="toll_booth-m"/>
+  <symbol minX="0" maxX="30" minY="320" maxY="350" name="toilets-m"/>
+  <symbol minX="30" maxX="60" minY="320" maxY="350" name="doityourself-m"/>
+  <symbol minX="60" maxX="90" minY="320" maxY="350" name="chemist-m"/>
+  <symbol minX="90" maxX="120" minY="320" maxY="350" name="dog_park-m"/>
+  <symbol minX="120" maxX="150" minY="320" maxY="350" name="optician-m"/>
+  <symbol minX="150" maxX="180" minY="320" maxY="350" name="diving-m"/>
+  <symbol minX="180" maxX="210" minY="320" maxY="350" name="park-m"/>
+  <symbol minX="210" maxX="240" minY="320" maxY="350" name="boundary_stone-m"/>
+  <symbol minX="240" maxX="270" minY="320" maxY="350" name="cinema-m"/>
+  <symbol minX="270" maxX="300" minY="320" maxY="350" name="theatre-m"/>
+  <symbol minX="300" maxX="330" minY="320" maxY="350" name="department_store-m"/>
+  <symbol minX="330" maxX="360" minY="320" maxY="350" name="parking-meter-m"/>
+  <symbol minX="360" maxX="390" minY="320" maxY="350" name="bowls-m"/>
+  <symbol minX="390" maxX="420" minY="320" maxY="350" name="tennis-m"/>
+  <symbol minX="420" maxX="450" minY="320" maxY="350" name="bus-m"/>
+  <symbol minX="450" maxX="480" minY="320" maxY="350" name="taxi-m"/>
+  <symbol minX="480" maxX="510" minY="320" maxY="350" name="swimming-m"/>
+  <symbol minX="510" maxX="540" minY="320" maxY="350" name="butcher-m"/>
+  <symbol minX="540" maxX="570" minY="320" maxY="350" name="sweets-m"/>
+  <symbol minX="570" maxX="600" minY="320" maxY="350" name="pharmacy-2-m"/>
   <symbol minX="600" maxX="630" minY="320" maxY="350" name="cable-car-m"/>
-  <symbol minX="630" maxX="660" minY="320" maxY="350" name="phone-m"/>
-  <symbol minX="660" maxX="690" minY="320" maxY="350" name="butcher-m"/>
-  <symbol minX="690" maxX="720" minY="320" maxY="350" name="bus-m"/>
-  <symbol minX="720" maxX="750" minY="320" maxY="350" name="bowls-m"/>
-  <symbol minX="750" maxX="780" minY="320" maxY="350" name="sports-m"/>
-  <symbol minX="780" maxX="810" minY="320" maxY="350" name="boundary_stone-m"/>
-  <symbol minX="810" maxX="840" minY="320" maxY="350" name="pitch-m"/>
-  <symbol minX="840" maxX="870" minY="320" maxY="350" name="subway-entrance-m"/>
-  <symbol minX="870" maxX="900" minY="320" maxY="350" name="alcohol-m"/>
-  <symbol minX="900" maxX="930" minY="320" maxY="350" name="place-of-worship-m"/>
-  <symbol minX="930" maxX="960" minY="320" maxY="350" name="book-shop-m"/>
-  <symbol minX="960" maxX="990" minY="320" maxY="350" name="bicycle-m"/>
-  <symbol minX="990" maxX="1020" minY="320" maxY="350" name="police-m"/>
-  <symbol minX="0" maxX="30" minY="350" maxY="380" name="subway-entrance-2-m"/>
-  <symbol minX="30" maxX="60" minY="350" maxY="380" name="alpine_hut-m"/>
-  <symbol minX="60" maxX="90" minY="350" maxY="380" name="postbox-m"/>
-  <symbol minX="90" maxX="120" minY="350" maxY="380" name="pub-m"/>
-  <symbol minX="120" maxX="150" minY="350" maxY="380" name="beauty-m"/>
-  <symbol minX="150" maxX="180" minY="350" maxY="380" name="beach-m"/>
-  <symbol minX="180" maxX="208" minY="350" maxY="378" name="subway-rome-l"/>
-  <symbol minX="208" maxX="236" minY="350" maxY="378" name="lightrail-berlin-m"/>
-  <symbol minX="236" maxX="264" minY="350" maxY="378" name="subway-berlin-l"/>
-  <symbol minX="264" maxX="292" minY="350" maxY="378" name="parking-l"/>
-  <symbol minX="292" maxX="320" minY="350" maxY="378" name="speedcam-l"/>
-  <symbol minX="320" maxX="351" minY="350" maxY="378" name="subway-moscow-l"/>
-  <symbol minX="351" maxX="378" minY="350" maxY="377" name="route_from"/>
-  <symbol minX="378" maxX="409" minY="350" maxY="375" name="subway-london-l"/>
-  <symbol minX="409" maxX="438" minY="350" maxY="375" name="subway-moscow-m"/>
+  <symbol minX="630" maxX="660" minY="320" maxY="350" name="pharmacy-m"/>
+  <symbol minX="660" maxX="690" minY="320" maxY="350" name="subway-spb-m"/>
+  <symbol minX="690" maxX="720" minY="320" maxY="350" name="curling-m"/>
+  <symbol minX="720" maxX="750" minY="320" maxY="350" name="phone-m"/>
+  <symbol minX="750" maxX="780" minY="320" maxY="350" name="recycling-m"/>
+  <symbol minX="780" maxX="810" minY="320" maxY="350" name="subway-entrance-2-m"/>
+  <symbol minX="810" maxX="840" minY="320" maxY="350" name="subway-entrance-m"/>
+  <symbol minX="840" maxX="870" minY="320" maxY="350" name="campsite-m"/>
+  <symbol minX="870" maxX="900" minY="320" maxY="350" name="cafe-m"/>
+  <symbol minX="900" maxX="930" minY="320" maxY="350" name="pitch-m"/>
+  <symbol minX="930" maxX="960" minY="320" maxY="350" name="subway-newyork-m"/>
+  <symbol minX="960" maxX="990" minY="320" maxY="350" name="cricket-m"/>
+  <symbol minX="990" maxX="1020" minY="320" maxY="350" name="place-of-worship-m"/>
+  <symbol minX="0" maxX="30" minY="350" maxY="380" name="pub-m"/>
+  <symbol minX="30" maxX="60" minY="350" maxY="380" name="convenience-m"/>
+  <symbol minX="60" maxX="90" minY="350" maxY="380" name="police-m"/>
+  <symbol minX="90" maxX="120" minY="350" maxY="380" name="clothes-m"/>
+  <symbol minX="120" maxX="150" minY="350" maxY="380" name="computer-m"/>
+  <symbol minX="150" maxX="180" minY="350" maxY="380" name="postbox-m"/>
+  <symbol minX="180" maxX="210" minY="350" maxY="380" name="subway-m"/>
+  <symbol minX="210" maxX="240" minY="350" maxY="380" name="college-m"/>
+  <symbol minX="240" maxX="268" minY="350" maxY="378" name="speedcam-l"/>
+  <symbol minX="268" maxX="299" minY="350" maxY="378" name="subway-moscow-l"/>
+  <symbol minX="299" maxX="327" minY="350" maxY="378" name="lightrail-berlin-m"/>
+  <symbol minX="327" maxX="355" minY="350" maxY="378" name="parking-l"/>
+  <symbol minX="355" maxX="383" minY="350" maxY="378" name="subway-berlin-l"/>
+  <symbol minX="383" maxX="411" minY="350" maxY="378" name="subway-rome-l"/>
+  <symbol minX="411" maxX="438" minY="350" maxY="377" name="route_from"/>
   <symbol minX="438" maxX="463" minY="350" maxY="375" name="subway-berlin-m"/>
-  <symbol minX="463" maxX="488" minY="350" maxY="375" name="current-position"/>
-  <symbol minX="488" maxX="513" minY="350" maxY="375" name="subway-paris-m"/>
-  <symbol minX="513" maxX="538" minY="350" maxY="375" name="no-icon-amenity"/>
-  <symbol minX="538" maxX="563" minY="350" maxY="375" name="no-icon-leisure"/>
-  <symbol minX="563" maxX="588" minY="350" maxY="375" name="no-icon-shop"/>
-  <symbol minX="588" maxX="613" minY="350" maxY="375" name="subway-rome-m"/>
-  <symbol minX="613" maxX="638" minY="350" maxY="375" name="no-icon-tourism"/>
-  <symbol minX="638" maxX="663" minY="350" maxY="375" name="no-icon"/>
-  <symbol minX="663" maxX="686" minY="350" maxY="374" name="office-s"/>
-  <symbol minX="686" maxX="709" minY="350" maxY="374" name="picnic-s"/>
-  <symbol minX="709" maxX="733" minY="350" maxY="374" name="airport-s"/>
-  <symbol minX="733" maxX="756" minY="350" maxY="374" name="bcontrol-s"/>
-  <symbol minX="756" maxX="779" minY="350" maxY="374" name="beer-s"/>
-  <symbol minX="779" maxX="802" minY="350" maxY="374" name="waterfall-s"/>
-  <symbol minX="802" maxX="825" minY="350" maxY="374" name="hunting-tower-s"/>
-  <symbol minX="825" maxX="848" minY="350" maxY="374" name="heliport-s"/>
-  <symbol minX="848" maxX="871" minY="350" maxY="374" name="remains-s"/>
-  <symbol minX="871" maxX="894" minY="350" maxY="373" name="shop-s"/>
-  <symbol minX="894" maxX="917" minY="350" maxY="373" name="ship-s"/>
-  <symbol minX="917" maxX="940" minY="350" maxY="373" name="skiing-s"/>
-  <symbol minX="940" maxX="963" minY="350" maxY="373" name="school-s"/>
-  <symbol minX="963" maxX="986" minY="350" maxY="373" name="alcohol-s"/>
-  <symbol minX="986" maxX="1009" minY="350" maxY="373" name="soccer-s"/>
-  <symbol minX="0" maxX="23" minY="380" maxY="403" name="restaurant-s"/>
-  <symbol minX="23" maxX="46" minY="380" maxY="403" name="speedcam-m"/>
-  <symbol minX="46" maxX="69" minY="380" maxY="403" name="america-football-s"/>
-  <symbol minX="69" maxX="92" minY="380" maxY="403" name="recycling-s"/>
-  <symbol minX="92" maxX="115" minY="380" maxY="403" name="atm-s"/>
-  <symbol minX="115" maxX="138" minY="380" maxY="403" name="bar-s"/>
-  <symbol minX="138" maxX="161" minY="380" maxY="403" name="baseball-s"/>
-  <symbol minX="161" maxX="184" minY="380" maxY="403" name="basketball-s"/>
-  <symbol minX="184" maxX="207" minY="380" maxY="403" name="bicycle-s"/>
-  <symbol minX="207" maxX="230" minY="380" maxY="403" name="book-shop-s"/>
-  <symbol minX="230" maxX="258" minY="380" maxY="403" name="subway-barcelona-s"/>
-  <symbol minX="258" maxX="281" minY="380" maxY="403" name="pub-s"/>
-  <symbol minX="281" maxX="304" minY="380" maxY="403" name="power-s"/>
-  <symbol minX="304" maxX="327" minY="380" maxY="403" name="bus-s"/>
-  <symbol minX="327" maxX="350" minY="380" maxY="403" name="police-s"/>
-  <symbol minX="350" maxX="373" minY="380" maxY="403" name="subway-entrance-2-s"/>
-  <symbol minX="373" maxX="396" minY="380" maxY="403" name="subway-entrance-arrow"/>
-  <symbol minX="396" maxX="419" minY="380" maxY="403" name="place-of-worship-s"/>
-  <symbol minX="419" maxX="442" minY="380" maxY="403" name="pitch-s"/>
-  <symbol minX="442" maxX="465" minY="380" maxY="403" name="subway-entrance-s"/>
-  <symbol minX="465" maxX="488" minY="380" maxY="403" name="cable-car-s"/>
-  <symbol minX="488" maxX="511" minY="380" maxY="403" name="cafe-s"/>
-  <symbol minX="511" maxX="534" minY="380" maxY="403" name="campsite-s"/>
-  <symbol minX="534" maxX="557" minY="380" maxY="403" name="phone-s"/>
-  <symbol minX="557" maxX="580" minY="380" maxY="403" name="pharmacy-s"/>
-  <symbol minX="580" maxX="610" minY="380" maxY="403" name="subway-london-m"/>
-  <symbol minX="610" maxX="633" minY="380" maxY="403" name="car-repair-s"/>
-  <symbol minX="633" maxX="656" minY="380" maxY="403" name="zoo-s"/>
-  <symbol minX="656" maxX="679" minY="380" maxY="403" name="casino-s"/>
-  <symbol minX="679" maxX="702" minY="380" maxY="403" name="cave-s"/>
-  <symbol minX="702" maxX="725" minY="380" maxY="403" name="windmill-s"/>
-  <symbol minX="725" maxX="748" minY="380" maxY="403" name="cemetery-s"/>
-  <symbol minX="748" maxX="771" minY="380" maxY="403" name="cinema-s"/>
-  <symbol minX="771" maxX="794" minY="380" maxY="403" name="college-s"/>
-  <symbol minX="794" maxX="817" minY="380" maxY="403" name="volcano-s"/>
-  <symbol minX="817" maxX="840" minY="380" maxY="403" name="drinking-water-s"/>
-  <symbol minX="840" maxX="863" minY="380" maxY="403" name="embassy-s"/>
-  <symbol minX="863" maxX="886" minY="380" maxY="403" name="tram-s"/>
-  <symbol minX="886" maxX="909" minY="380" maxY="403" name="equestrian-s"/>
-  <symbol minX="909" maxX="932" minY="380" maxY="403" name="subway-newyork-s"/>
-  <symbol minX="932" maxX="955" minY="380" maxY="403" name="fastfood-s"/>
-  <symbol minX="955" maxX="978" minY="380" maxY="403" name="train-s"/>
-  <symbol minX="978" maxX="1001" minY="380" maxY="403" name="fire_station-s"/>
-  <symbol minX="1001" maxX="1024" minY="380" maxY="403" name="fountain-s"/>
+  <symbol minX="463" maxX="488" minY="350" maxY="375" name="subway-rome-m"/>
+  <symbol minX="488" maxX="513" minY="350" maxY="375" name="no-icon-tourism"/>
+  <symbol minX="513" maxX="538" minY="350" maxY="375" name="current-position"/>
+  <symbol minX="538" maxX="563" minY="350" maxY="375" name="subway-paris-m"/>
+  <symbol minX="563" maxX="588" minY="350" maxY="375" name="no-icon"/>
+  <symbol minX="588" maxX="619" minY="350" maxY="375" name="subway-london-l"/>
+  <symbol minX="619" maxX="648" minY="350" maxY="375" name="subway-moscow-m"/>
+  <symbol minX="648" maxX="673" minY="350" maxY="375" name="no-icon-shop"/>
+  <symbol minX="673" maxX="698" minY="350" maxY="375" name="no-icon-leisure"/>
+  <symbol minX="698" maxX="723" minY="350" maxY="375" name="no-icon-amenity"/>
+  <symbol minX="723" maxX="746" minY="350" maxY="374" name="beer-s"/>
+  <symbol minX="746" maxX="769" minY="350" maxY="374" name="bcontrol-s"/>
+  <symbol minX="769" maxX="792" minY="350" maxY="374" name="picnic-s"/>
+  <symbol minX="792" maxX="815" minY="350" maxY="374" name="waterfall-s"/>
+  <symbol minX="815" maxX="838" minY="350" maxY="374" name="remains-s"/>
+  <symbol minX="838" maxX="861" minY="350" maxY="374" name="hunting-tower-s"/>
+  <symbol minX="861" maxX="884" minY="350" maxY="374" name="heliport-s"/>
+  <symbol minX="884" maxX="908" minY="350" maxY="374" name="airport-s"/>
+  <symbol minX="908" maxX="931" minY="350" maxY="374" name="office-s"/>
+  <symbol minX="931" maxX="954" minY="350" maxY="373" name="shop-s"/>
+  <symbol minX="954" maxX="977" minY="350" maxY="373" name="casino-s"/>
+  <symbol minX="977" maxX="1000" minY="350" maxY="373" name="ship-s"/>
+  <symbol minX="1000" maxX="1023" minY="350" maxY="373" name="skiing-s"/>
+  <symbol minX="0" maxX="23" minY="380" maxY="403" name="cave-s"/>
+  <symbol minX="23" maxX="46" minY="380" maxY="403" name="school-s"/>
+  <symbol minX="46" maxX="69" minY="380" maxY="403" name="soccer-s"/>
+  <symbol minX="69" maxX="92" minY="380" maxY="403" name="tram-s"/>
+  <symbol minX="92" maxX="115" minY="380" maxY="403" name="speedcam-m"/>
+  <symbol minX="115" maxX="138" minY="380" maxY="403" name="golf-s"/>
+  <symbol minX="138" maxX="161" minY="380" maxY="403" name="car-repair-s"/>
+  <symbol minX="161" maxX="184" minY="380" maxY="403" name="restaurant-s"/>
+  <symbol minX="184" maxX="207" minY="380" maxY="403" name="atm-s"/>
+  <symbol minX="207" maxX="230" minY="380" maxY="403" name="grocery-s"/>
+  <symbol minX="230" maxX="253" minY="380" maxY="403" name="hand-s"/>
+  <symbol minX="253" maxX="276" minY="380" maxY="403" name="train-s"/>
+  <symbol minX="276" maxX="299" minY="380" maxY="403" name="military-s"/>
+  <symbol minX="299" maxX="327" minY="380" maxY="403" name="subway-barcelona-s"/>
+  <symbol minX="327" maxX="350" minY="380" maxY="403" name="cemetery-s"/>
+  <symbol minX="350" maxX="373" minY="380" maxY="403" name="recycling-s"/>
+  <symbol minX="373" maxX="396" minY="380" maxY="403" name="garden-s"/>
+  <symbol minX="396" maxX="419" minY="380" maxY="403" name="cinema-s"/>
+  <symbol minX="419" maxX="442" minY="380" maxY="403" name="subway-entrance-2-s"/>
+  <symbol minX="442" maxX="465" minY="380" maxY="403" name="subway-entrance-arrow"/>
+  <symbol minX="465" maxX="488" minY="380" maxY="403" name="campsite-s"/>
+  <symbol minX="488" maxX="511" minY="380" maxY="403" name="helipad-s"/>
+  <symbol minX="511" maxX="534" minY="380" maxY="403" name="subway-entrance-s"/>
+  <symbol minX="534" maxX="557" minY="380" maxY="403" name="monument-s"/>
+  <symbol minX="557" maxX="580" minY="380" maxY="403" name="drinking-water-s"/>
+  <symbol minX="580" maxX="603" minY="380" maxY="403" name="alcohol-s"/>
+  <symbol minX="603" maxX="626" minY="380" maxY="403" name="pub-s"/>
+  <symbol minX="626" maxX="649" minY="380" maxY="403" name="power-s"/>
+  <symbol minX="649" maxX="679" minY="380" maxY="403" name="subway-london-m"/>
+  <symbol minX="679" maxX="702" minY="380" maxY="403" name="gallery-s"/>
+  <symbol minX="702" maxX="725" minY="380" maxY="403" name="college-s"/>
+  <symbol minX="725" maxX="748" minY="380" maxY="403" name="mail-s"/>
+  <symbol minX="748" maxX="771" minY="380" maxY="403" name="townhall-s"/>
+  <symbol minX="771" maxX="794" minY="380" maxY="403" name="museum-s"/>
+  <symbol minX="794" maxX="817" minY="380" maxY="403" name="hospital-s"/>
+  <symbol minX="817" maxX="840" minY="380" maxY="403" name="funicular-s"/>
+  <symbol minX="840" maxX="863" minY="380" maxY="403" name="hotel-s"/>
+  <symbol minX="863" maxX="886" minY="380" maxY="403" name="police-s"/>
+  <symbol minX="886" maxX="909" minY="380" maxY="403" name="place-of-worship-s"/>
+  <symbol minX="909" maxX="932" minY="380" maxY="403" name="embassy-s"/>
+  <symbol minX="932" maxX="955" minY="380" maxY="403" name="cafe-s"/>
+  <symbol minX="955" maxX="978" minY="380" maxY="403" name="pitch-s"/>
+  <symbol minX="978" maxX="1001" minY="380" maxY="403" name="subway-newyork-s"/>
+  <symbol minX="1001" maxX="1024" minY="380" maxY="403" name="america-football-s"/>
   <symbol minX="0" maxX="23" minY="403" maxY="426" name="fuel-s"/>
-  <symbol minX="23" maxX="46" minY="403" maxY="426" name="park-s"/>
-  <symbol minX="46" maxX="69" minY="403" maxY="426" name="funicular-s"/>
-  <symbol minX="69" maxX="92" minY="403" maxY="426" name="subway-s"/>
-  <symbol minX="92" maxX="115" minY="403" maxY="426" name="nparkf-s"/>
-  <symbol minX="115" maxX="138" minY="403" maxY="426" name="npark-s"/>
-  <symbol minX="138" maxX="161" minY="403" maxY="426" name="subway-spb-s"/>
-  <symbol minX="161" maxX="184" minY="403" maxY="426" name="townhall-s"/>
-  <symbol minX="184" maxX="207" minY="403" maxY="426" name="gallery-s"/>
-  <symbol minX="207" maxX="230" minY="403" maxY="426" name="garden-s"/>
-  <symbol minX="230" maxX="253" minY="403" maxY="426" name="tourism-s"/>
-  <symbol minX="253" maxX="276" minY="403" maxY="426" name="golf-s"/>
-  <symbol minX="276" maxX="299" minY="403" maxY="426" name="museum-s"/>
-  <symbol minX="299" maxX="322" minY="403" maxY="426" name="monument-s"/>
-  <symbol minX="322" maxX="345" minY="403" maxY="426" name="military-s"/>
-  <symbol minX="345" maxX="368" minY="403" maxY="426" name="swimming-s"/>
-  <symbol minX="368" maxX="391" minY="403" maxY="426" name="grocery-s"/>
-  <symbol minX="391" maxX="414" minY="403" maxY="426" name="hand-s"/>
-  <symbol minX="414" maxX="437" minY="403" maxY="426" name="mail-s"/>
-  <symbol minX="437" maxX="460" minY="403" maxY="426" name="helipad-s"/>
-  <symbol minX="460" maxX="483" minY="403" maxY="426" name="tennis-s"/>
-  <symbol minX="483" maxX="506" minY="403" maxY="426" name="lighthouse-s"/>
-  <symbol minX="506" maxX="529" minY="403" maxY="426" name="library-s"/>
-  <symbol minX="529" maxX="552" minY="403" maxY="426" name="theatre-s"/>
-  <symbol minX="552" maxX="575" minY="403" maxY="426" name="kindergarten-s"/>
-  <symbol minX="575" maxX="598" minY="403" maxY="426" name="information-s"/>
-  <symbol minX="598" maxX="621" minY="403" maxY="426" name="toilets-s"/>
-  <symbol minX="621" maxX="644" minY="403" maxY="426" name="hotel-s"/>
-  <symbol minX="644" maxX="667" minY="403" maxY="426" name="hospital-s"/>
-  <symbol minX="667" maxX="698" minY="403" maxY="425" name="subway-madrid-m"/>
-  <symbol minX="698" maxX="729" minY="403" maxY="425" name="metro-barcelona-m"/>
-  <symbol minX="729" maxX="760" minY="403" maxY="425" name="subway-madrid-l"/>
-  <symbol minX="760" maxX="781" minY="403" maxY="425" name="s-arrow"/>
-  <symbol minX="781" maxX="812" minY="403" maxY="425" name="subway-barcelona-l"/>
-  <symbol minX="812" maxX="843" minY="403" maxY="425" name="subway-barcelona-m"/>
-  <symbol minX="843" maxX="865" minY="403" maxY="425" name="parking-m"/>
-  <symbol minX="865" maxX="886" minY="403" maxY="424" name="lightrail-berlin-s"/>
-  <symbol minX="886" maxX="914" minY="403" maxY="424" name="subway-madrid-s"/>
-  <symbol minX="914" maxX="944" minY="403" maxY="424" name="subway-kiev-l"/>
-  <symbol minX="944" maxX="965" minY="403" maxY="424" name="subway-paris-s"/>
-  <symbol minX="965" maxX="993" minY="403" maxY="424" name="metro-barcelona-s"/>
-  <symbol minX="993" maxX="1014" minY="403" maxY="424" name="peak-l"/>
-  <symbol minX="0" maxX="30" minY="426" maxY="447" name="subway-kiev-m"/>
-  <symbol minX="30" maxX="50" minY="426" maxY="446" name="api-result"/>
-  <symbol minX="50" maxX="70" minY="426" maxY="446" name="subway-moscow-s"/>
-  <symbol minX="70" maxX="89" minY="426" maxY="445" name="search-result"/>
-  <symbol minX="89" maxX="108" minY="426" maxY="445" name="parking-s"/>
-  <symbol minX="108" maxX="127" minY="426" maxY="445" name="speedcam-s"/>
-  <symbol minX="127" maxX="148" minY="426" maxY="445" name="bench"/>
-  <symbol minX="148" maxX="171" minY="426" maxY="445" name="subway-london-s"/>
-  <symbol minX="171" maxX="190" minY="426" maxY="445" name="subway-rome-s"/>
-  <symbol minX="190" maxX="209" minY="426" maxY="445" name="subway-berlin-s"/>
-  <symbol minX="209" maxX="227" minY="426" maxY="444" name="survey_point-l"/>
-  <symbol minX="227" maxX="245" minY="426" maxY="444" name="star-l"/>
-  <symbol minX="245" maxX="264" minY="426" maxY="444" name="peakt-l"/>
-  <symbol minX="264" maxX="294" minY="426" maxY="444" name="subway-minsk-l"/>
-  <symbol minX="294" maxX="310" minY="426" maxY="442" name="star-m"/>
-  <symbol minX="310" maxX="335" minY="426" maxY="442" name="subway-kiev-s"/>
-  <symbol minX="335" maxX="350" minY="426" maxY="441" name="subway-xs"/>
-  <symbol minX="350" maxX="373" minY="426" maxY="441" name="railway-crossing"/>
-  <symbol minX="373" maxX="398" minY="426" maxY="441" name="subway-minsk-m"/>
-  <symbol minX="398" maxX="413" minY="426" maxY="441" name="subway-newyork-xs"/>
-  <symbol minX="413" maxX="429" minY="426" maxY="441" name="peak-m"/>
-  <symbol minX="429" maxX="444" minY="426" maxY="441" name="survey_point-m"/>
-  <symbol minX="444" maxX="458" minY="426" maxY="440" name="star-s"/>
-  <symbol minX="458" maxX="481" minY="426" maxY="440" name="subway-minsk-s"/>
-  <symbol minX="481" maxX="495" minY="426" maxY="440" name="crossing-l"/>
-  <symbol minX="495" maxX="508" minY="426" maxY="439" name="survey_point-s"/>
-  <symbol minX="508" maxX="522" minY="426" maxY="439" name="peakt-m"/>
-  <symbol minX="522" maxX="536" minY="426" maxY="439" name="peak-s"/>
-  <symbol minX="536" maxX="564" minY="426" maxY="439" name="arrow-m"/>
-  <symbol minX="564" maxX="576" minY="426" maxY="438" name="crossing-m"/>
-  <symbol minX="576" maxX="588" minY="426" maxY="438" name="entrance-s"/>
-  <symbol minX="588" maxX="600" minY="426" maxY="437" name="peakt-s"/>
-  <symbol minX="600" maxX="610" minY="426" maxY="436" name="tree-l"/>
-  <symbol minX="610" maxX="620" minY="426" maxY="436" name="none"/>
-  <symbol minX="620" maxX="630" minY="426" maxY="436" name="dot-m"/>
-  <symbol minX="630" maxX="651" minY="426" maxY="436" name="arrow-s"/>
-  <symbol minX="651" maxX="661" minY="426" maxY="436" name="crossing-s"/>
-  <symbol minX="661" maxX="670" minY="426" maxY="435" name="tree-m"/>
-  <symbol minX="670" maxX="679" minY="426" maxY="435" name="entrance-xs"/>
-  <symbol minX="679" maxX="686" minY="426" maxY="433" name="dot-s-light"/>
-  <symbol minX="686" maxX="693" minY="426" maxY="433" name="tree-s"/>
-  <symbol minX="693" maxX="700" minY="426" maxY="433" name="zero-icon"/>
-  <symbol minX="700" maxX="707" minY="426" maxY="433" name="dot-s"/>
+  <symbol minX="23" maxX="46" minY="403" maxY="426" name="information-s"/>
+  <symbol minX="46" maxX="69" minY="403" maxY="426" name="tourism-s"/>
+  <symbol minX="69" maxX="92" minY="403" maxY="426" name="fountain-s"/>
+  <symbol minX="92" maxX="115" minY="403" maxY="426" name="phone-s"/>
+  <symbol minX="115" maxX="138" minY="403" maxY="426" name="bicycle-s"/>
+  <symbol minX="138" maxX="161" minY="403" maxY="426" name="subway-s"/>
+  <symbol minX="161" maxX="184" minY="403" maxY="426" name="cable-car-s"/>
+  <symbol minX="184" maxX="207" minY="403" maxY="426" name="pharmacy-s"/>
+  <symbol minX="207" maxX="230" minY="403" maxY="426" name="subway-spb-s"/>
+  <symbol minX="230" maxX="253" minY="403" maxY="426" name="zoo-s"/>
+  <symbol minX="253" maxX="276" minY="403" maxY="426" name="kindergarten-s"/>
+  <symbol minX="276" maxX="299" minY="403" maxY="426" name="bar-s"/>
+  <symbol minX="299" maxX="322" minY="403" maxY="426" name="windmill-s"/>
+  <symbol minX="322" maxX="345" minY="403" maxY="426" name="dentist-s"/>
+  <symbol minX="345" maxX="368" minY="403" maxY="426" name="fire_station-s"/>
+  <symbol minX="368" maxX="391" minY="403" maxY="426" name="fastfood-s"/>
+  <symbol minX="391" maxX="414" minY="403" maxY="426" name="library-s"/>
+  <symbol minX="414" maxX="437" minY="403" maxY="426" name="swimming-s"/>
+  <symbol minX="437" maxX="460" minY="403" maxY="426" name="bus-s"/>
+  <symbol minX="460" maxX="483" minY="403" maxY="426" name="baseball-s"/>
+  <symbol minX="483" maxX="506" minY="403" maxY="426" name="equestrian-s"/>
+  <symbol minX="506" maxX="529" minY="403" maxY="426" name="npark-s"/>
+  <symbol minX="529" maxX="552" minY="403" maxY="426" name="tennis-s"/>
+  <symbol minX="552" maxX="575" minY="403" maxY="426" name="lighthouse-s"/>
+  <symbol minX="575" maxX="598" minY="403" maxY="426" name="volcano-s"/>
+  <symbol minX="598" maxX="621" minY="403" maxY="426" name="theatre-s"/>
+  <symbol minX="621" maxX="644" minY="403" maxY="426" name="park-s"/>
+  <symbol minX="644" maxX="667" minY="403" maxY="426" name="basketball-s"/>
+  <symbol minX="667" maxX="690" minY="403" maxY="426" name="toilets-s"/>
+  <symbol minX="690" maxX="713" minY="403" maxY="426" name="book-shop-s"/>
+  <symbol minX="713" maxX="736" minY="403" maxY="426" name="nparkf-s"/>
+  <symbol minX="736" maxX="758" minY="403" maxY="425" name="parking-m"/>
+  <symbol minX="758" maxX="779" minY="403" maxY="425" name="s-arrow"/>
+  <symbol minX="779" maxX="810" minY="403" maxY="425" name="metro-barcelona-m"/>
+  <symbol minX="810" maxX="841" minY="403" maxY="425" name="subway-barcelona-l"/>
+  <symbol minX="841" maxX="872" minY="403" maxY="425" name="subway-barcelona-m"/>
+  <symbol minX="872" maxX="903" minY="403" maxY="425" name="subway-madrid-l"/>
+  <symbol minX="903" maxX="934" minY="403" maxY="425" name="subway-madrid-m"/>
+  <symbol minX="934" maxX="962" minY="403" maxY="424" name="subway-madrid-s"/>
+  <symbol minX="962" maxX="983" minY="403" maxY="424" name="peak-l"/>
+  <symbol minX="983" maxX="1013" minY="403" maxY="424" name="subway-kiev-m"/>
+  <symbol minX="0" maxX="30" minY="426" maxY="447" name="subway-kiev-l"/>
+  <symbol minX="30" maxX="51" minY="426" maxY="447" name="subway-paris-s"/>
+  <symbol minX="51" maxX="72" minY="426" maxY="447" name="lightrail-berlin-s"/>
+  <symbol minX="72" maxX="100" minY="426" maxY="447" name="metro-barcelona-s"/>
+  <symbol minX="100" maxX="120" minY="426" maxY="446" name="api-result"/>
+  <symbol minX="120" maxX="140" minY="426" maxY="446" name="subway-moscow-s"/>
+  <symbol minX="140" maxX="159" minY="426" maxY="445" name="search-result"/>
+  <symbol minX="159" maxX="182" minY="426" maxY="445" name="subway-london-s"/>
+  <symbol minX="182" maxX="201" minY="426" maxY="445" name="speedcam-s"/>
+  <symbol minX="201" maxX="220" minY="426" maxY="445" name="subway-rome-s"/>
+  <symbol minX="220" maxX="241" minY="426" maxY="445" name="bench"/>
+  <symbol minX="241" maxX="260" minY="426" maxY="445" name="parking-s"/>
+  <symbol minX="260" maxX="279" minY="426" maxY="445" name="subway-berlin-s"/>
+  <symbol minX="279" maxX="297" minY="426" maxY="444" name="survey_point-l"/>
+  <symbol minX="297" maxX="315" minY="426" maxY="444" name="star-l"/>
+  <symbol minX="315" maxX="334" minY="426" maxY="444" name="peakt-l"/>
+  <symbol minX="334" maxX="364" minY="426" maxY="444" name="subway-minsk-l"/>
+  <symbol minX="364" maxX="389" minY="426" maxY="442" name="subway-kiev-s"/>
+  <symbol minX="389" maxX="405" minY="426" maxY="442" name="star-m"/>
+  <symbol minX="405" maxX="421" minY="426" maxY="441" name="peak-m"/>
+  <symbol minX="421" maxX="436" minY="426" maxY="441" name="subway-xs"/>
+  <symbol minX="436" maxX="461" minY="426" maxY="441" name="subway-minsk-m"/>
+  <symbol minX="461" maxX="484" minY="426" maxY="441" name="railway-crossing"/>
+  <symbol minX="484" maxX="499" minY="426" maxY="441" name="subway-newyork-xs"/>
+  <symbol minX="499" maxX="514" minY="426" maxY="441" name="survey_point-m"/>
+  <symbol minX="514" maxX="528" minY="426" maxY="440" name="star-s"/>
+  <symbol minX="528" maxX="551" minY="426" maxY="440" name="subway-minsk-s"/>
+  <symbol minX="551" maxX="565" minY="426" maxY="440" name="crossing-l"/>
+  <symbol minX="565" maxX="579" minY="426" maxY="439" name="peak-s"/>
+  <symbol minX="579" maxX="607" minY="426" maxY="439" name="arrow-m"/>
+  <symbol minX="607" maxX="621" minY="426" maxY="439" name="peakt-m"/>
+  <symbol minX="621" maxX="634" minY="426" maxY="439" name="survey_point-s"/>
+  <symbol minX="634" maxX="646" minY="426" maxY="438" name="entrance-s"/>
+  <symbol minX="646" maxX="658" minY="426" maxY="438" name="crossing-m"/>
+  <symbol minX="658" maxX="670" minY="426" maxY="437" name="peakt-s"/>
+  <symbol minX="670" maxX="680" minY="426" maxY="436" name="crossing-s"/>
+  <symbol minX="680" maxX="701" minY="426" maxY="436" name="arrow-s"/>
+  <symbol minX="701" maxX="711" minY="426" maxY="436" name="none"/>
+  <symbol minX="711" maxX="721" minY="426" maxY="436" name="dot-m"/>
+  <symbol minX="721" maxX="731" minY="426" maxY="436" name="tree-l"/>
+  <symbol minX="731" maxX="740" minY="426" maxY="435" name="entrance-xs"/>
+  <symbol minX="740" maxX="749" minY="426" maxY="435" name="tree-m"/>
+  <symbol minX="749" maxX="756" minY="426" maxY="433" name="dot-s"/>
+  <symbol minX="756" maxX="763" minY="426" maxY="433" name="dot-s-light"/>
+  <symbol minX="763" maxX="770" minY="426" maxY="433" name="zero-icon"/>
+  <symbol minX="770" maxX="777" minY="426" maxY="433" name="tree-s"/>
  </file>
 </root>
diff --git a/data/resources-hdpi_dark/symbols.png b/data/resources-hdpi_dark/symbols.png
index 0065c38891..949c7fbbb9 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 048bd700b2..3db65c9945 100644
--- a/data/resources-hdpi_dark/symbols.sdf
+++ b/data/resources-hdpi_dark/symbols.sdf
@@ -1,461 +1,464 @@
 <!DOCTYPE skin>
 <root>
- <file height="512" width="1024">
-  <symbol minX="0" maxX="105" minY="0" maxY="105" name="route_to"/>
-  <symbol minX="105" maxX="309" minY="0" maxY="100" name="route-arrow"/>
-  <symbol minX="309" maxX="397" minY="0" maxY="88" name="compass-image"/>
-  <symbol minX="397" maxX="442" minY="0" maxY="57" name="current-position-compas"/>
-  <symbol minX="442" maxX="487" minY="0" maxY="57" name="current-routing-compas"/>
-  <symbol minX="487" maxX="538" minY="0" maxY="51" name="search-result-active"/>
-  <symbol minX="538" maxX="562" minY="0" maxY="45" name="placemark-blue"/>
-  <symbol minX="562" maxX="586" minY="0" maxY="45" name="placemark-yellow"/>
-  <symbol minX="586" maxX="610" minY="0" maxY="45" name="placemark-brown"/>
-  <symbol minX="610" maxX="634" minY="0" maxY="45" name="placemark-red"/>
-  <symbol minX="634" maxX="658" minY="0" maxY="45" name="placemark-purple"/>
-  <symbol minX="658" maxX="682" minY="0" maxY="45" name="placemark-green"/>
-  <symbol minX="682" maxX="706" minY="0" maxY="45" name="placemark-pink"/>
-  <symbol minX="706" maxX="730" minY="0" maxY="45" name="placemark-orange"/>
-  <symbol minX="730" maxX="761" minY="0" maxY="31" name="archery-l"/>
-  <symbol minX="761" maxX="792" minY="0" maxY="31" name="atm-l"/>
-  <symbol minX="792" maxX="823" minY="0" maxY="31" name="america-football-l"/>
-  <symbol minX="823" maxX="854" minY="0" maxY="31" name="alpine_hut-l"/>
-  <symbol minX="854" maxX="885" minY="0" maxY="31" name="alcohol-l"/>
-  <symbol minX="885" maxX="916" minY="0" maxY="31" name="australian-football-l"/>
-  <symbol minX="916" maxX="947" minY="0" maxY="31" name="airport-m"/>
-  <symbol minX="947" maxX="978" minY="0" maxY="31" name="bakery-l"/>
-  <symbol minX="978" maxX="1009" minY="0" maxY="31" name="airport-l"/>
-  <symbol minX="0" maxX="31" minY="105" maxY="136" name="zoo-l"/>
-  <symbol minX="31" maxX="61" minY="105" maxY="136" name="bank-l"/>
-  <symbol minX="61" maxX="91" minY="105" maxY="136" name="bank-m"/>
-  <symbol minX="91" maxX="121" minY="105" maxY="136" name="banknote-l"/>
-  <symbol minX="121" maxX="152" minY="105" maxY="136" name="windmill-l"/>
-  <symbol minX="152" maxX="183" minY="105" maxY="136" name="bar-l"/>
-  <symbol minX="183" maxX="214" minY="105" maxY="136" name="wayside_shrine-l"/>
-  <symbol minX="214" maxX="245" minY="105" maxY="136" name="wayside_cross-l"/>
-  <symbol minX="245" maxX="276" minY="105" maxY="136" name="baseball-l"/>
-  <symbol minX="276" maxX="307" minY="105" maxY="136" name="waterfall-l"/>
-  <symbol minX="307" maxX="338" minY="105" maxY="136" name="volcano-l"/>
-  <symbol minX="338" maxX="369" minY="105" maxY="136" name="basketball-l"/>
-  <symbol minX="369" maxX="400" minY="105" maxY="136" name="vending-l"/>
-  <symbol minX="400" maxX="431" minY="105" maxY="136" name="tram-l"/>
-  <symbol minX="431" maxX="462" minY="105" maxY="136" name="bbq-l"/>
-  <symbol minX="462" maxX="493" minY="105" maxY="136" name="train-l"/>
-  <symbol minX="493" maxX="524" minY="105" maxY="136" name="bcontrol-l"/>
-  <symbol minX="524" maxX="555" minY="105" maxY="136" name="toys-l"/>
-  <symbol minX="555" maxX="586" minY="105" maxY="136" name="townhall-l"/>
-  <symbol minX="586" maxX="617" minY="105" maxY="136" name="beach-l"/>
-  <symbol minX="617" maxX="648" minY="105" maxY="136" name="tourism-l"/>
-  <symbol minX="648" maxX="679" minY="105" maxY="136" name="beauty-l"/>
-  <symbol minX="679" maxX="710" minY="105" maxY="136" name="tomb-l"/>
-  <symbol minX="710" maxX="741" minY="105" maxY="136" name="beer-l"/>
-  <symbol minX="741" maxX="772" minY="105" maxY="136" name="toll_booth-l"/>
-  <symbol minX="772" maxX="803" minY="105" maxY="136" name="toilets-l"/>
-  <symbol minX="803" maxX="834" minY="105" maxY="136" name="theatre-l"/>
-  <symbol minX="834" maxX="865" minY="105" maxY="136" name="bicycle-l"/>
-  <symbol minX="865" maxX="896" minY="105" maxY="136" name="tennis-l"/>
-  <symbol minX="896" maxX="927" minY="105" maxY="136" name="taxi-l"/>
-  <symbol minX="927" maxX="958" minY="105" maxY="136" name="book-shop-l"/>
-  <symbol minX="958" maxX="989" minY="105" maxY="136" name="swimming-l"/>
-  <symbol minX="989" maxX="1020" minY="105" maxY="136" name="sweets-l"/>
-  <symbol minX="0" maxX="31" minY="136" maxY="167" name="boundary_stone-l"/>
-  <symbol minX="31" maxX="62" minY="136" maxY="167" name="subway-spb-l"/>
-  <symbol minX="62" maxX="93" minY="136" maxY="167" name="bowls-l"/>
-  <symbol minX="93" maxX="124" minY="136" maxY="167" name="subway-paris-l"/>
-  <symbol minX="124" maxX="155" minY="136" maxY="167" name="bus-l"/>
-  <symbol minX="155" maxX="186" minY="136" maxY="167" name="subway-newyork-l"/>
-  <symbol minX="186" maxX="217" minY="136" maxY="167" name="subway-l"/>
-  <symbol minX="217" maxX="248" minY="136" maxY="167" name="butcher-l"/>
-  <symbol minX="248" maxX="279" minY="136" maxY="167" name="subway-entrance-l"/>
-  <symbol minX="279" maxX="310" minY="136" maxY="167" name="cable-car-l"/>
-  <symbol minX="310" maxX="341" minY="136" maxY="167" name="sports-l"/>
-  <symbol minX="341" maxX="372" minY="136" maxY="167" name="soccer-l"/>
-  <symbol minX="372" maxX="403" minY="136" maxY="167" name="cafe-l"/>
-  <symbol minX="403" maxX="434" minY="136" maxY="167" name="skiing-l"/>
-  <symbol minX="434" maxX="465" minY="136" maxY="167" name="shop-l"/>
-  <symbol minX="465" maxX="496" minY="136" maxY="167" name="campsite-l"/>
-  <symbol minX="496" maxX="527" minY="136" maxY="167" name="shop-l copy"/>
-  <symbol minX="527" maxX="558" minY="136" maxY="167" name="shop-bicycle-l"/>
-  <symbol minX="558" maxX="589" minY="136" maxY="167" name="car-repair-l"/>
-  <symbol minX="589" maxX="620" minY="136" maxY="167" name="shoes-l"/>
-  <symbol minX="620" maxX="651" minY="136" maxY="167" name="ship-l"/>
-  <symbol minX="651" maxX="682" minY="136" maxY="167" name="car_sharing-l"/>
-  <symbol minX="682" maxX="713" minY="136" maxY="167" name="school-l"/>
-  <symbol minX="713" maxX="744" minY="136" maxY="167" name="caravan_site-l"/>
-  <symbol minX="744" maxX="775" minY="136" maxY="167" name="restaurant-l"/>
-  <symbol minX="775" maxX="806" minY="136" maxY="167" name="casino-l"/>
-  <symbol minX="806" maxX="837" minY="136" maxY="167" name="remains-l"/>
-  <symbol minX="837" maxX="868" minY="136" maxY="167" name="recycling-l"/>
-  <symbol minX="868" maxX="899" minY="136" maxY="167" name="cave-l"/>
-  <symbol minX="899" maxX="930" minY="136" maxY="167" name="pub-l"/>
-  <symbol minX="930" maxX="961" minY="136" maxY="167" name="power-m"/>
-  <symbol minX="961" maxX="992" minY="136" maxY="167" name="cemetery-l"/>
-  <symbol minX="992" maxX="1023" minY="136" maxY="167" name="power-l"/>
-  <symbol minX="0" maxX="31" minY="167" maxY="198" name="postbox-l"/>
-  <symbol minX="31" maxX="62" minY="167" maxY="198" name="chemist-l"/>
-  <symbol minX="62" maxX="93" minY="167" maxY="198" name="police-l"/>
-  <symbol minX="93" maxX="124" minY="167" maxY="198" name="cinema-l"/>
-  <symbol minX="124" maxX="155" minY="167" maxY="198" name="place-of-worship-l"/>
-  <symbol minX="155" maxX="186" minY="167" maxY="198" name="pitch-l"/>
-  <symbol minX="186" maxX="217" minY="167" maxY="198" name="clothes-l"/>
-  <symbol minX="217" maxX="248" minY="167" maxY="198" name="picnic-l"/>
-  <symbol minX="248" maxX="279" minY="167" maxY="198" name="college-l"/>
-  <symbol minX="279" maxX="310" minY="167" maxY="198" name="phone-l"/>
-  <symbol minX="310" maxX="341" minY="167" maxY="198" name="pharmacy-l"/>
-  <symbol minX="341" maxX="372" minY="167" maxY="198" name="computer-l"/>
-  <symbol minX="372" maxX="403" minY="167" maxY="198" name="peak-l"/>
-  <symbol minX="403" maxX="434" minY="167" maxY="198" name="convenience-l"/>
-  <symbol minX="434" maxX="465" minY="167" maxY="198" name="parking-meter-l"/>
-  <symbol minX="465" maxX="496" minY="167" maxY="198" name="cricket-l"/>
-  <symbol minX="496" maxX="527" minY="167" maxY="198" name="park-l"/>
-  <symbol minX="527" maxX="558" minY="167" maxY="198" name="curling-l"/>
-  <symbol minX="558" maxX="589" minY="167" maxY="198" name="optician-l"/>
-  <symbol minX="589" maxX="620" minY="167" maxY="198" name="department_store-l"/>
-  <symbol minX="620" maxX="651" minY="167" maxY="198" name="office-l"/>
-  <symbol minX="651" maxX="682" minY="167" maxY="198" name="diving-l"/>
-  <symbol minX="682" maxX="713" minY="167" maxY="198" name="nparkf-l"/>
-  <symbol minX="713" maxX="744" minY="167" maxY="198" name="dog_park-l"/>
-  <symbol minX="744" maxX="775" minY="167" maxY="198" name="npark-l"/>
-  <symbol minX="775" maxX="806" minY="167" maxY="198" name="doityourself-l"/>
-  <symbol minX="806" maxX="837" minY="167" maxY="198" name="museum-l"/>
-  <symbol minX="837" maxX="868" minY="167" maxY="198" name="motel-l"/>
-  <symbol minX="868" maxX="899" minY="167" maxY="198" name="monument-l"/>
-  <symbol minX="899" maxX="930" minY="167" maxY="198" name="mobile_phone-l"/>
-  <symbol minX="930" maxX="961" minY="167" maxY="198" name="drinking-water-l"/>
-  <symbol minX="961" maxX="992" minY="167" maxY="198" name="military-l"/>
-  <symbol minX="992" maxX="1023" minY="167" maxY="198" name="marketplace-l"/>
-  <symbol minX="0" maxX="31" minY="198" maxY="229" name="mail-l"/>
-  <symbol minX="31" maxX="62" minY="198" maxY="229" name="electronics-l"/>
-  <symbol minX="62" maxX="93" minY="198" maxY="229" name="lightrail-berlin-l"/>
-  <symbol minX="93" maxX="124" minY="198" maxY="229" name="embassy-l"/>
-  <symbol minX="124" maxX="155" minY="198" maxY="229" name="lighthouse-l"/>
-  <symbol minX="155" maxX="186" minY="198" maxY="229" name="lift_gate-l"/>
-  <symbol minX="186" maxX="217" minY="198" maxY="229" name="library-l"/>
-  <symbol minX="217" maxX="248" minY="198" maxY="229" name="laundry-l"/>
-  <symbol minX="248" maxX="279" minY="198" maxY="229" name="equestrian-l"/>
-  <symbol minX="279" maxX="310" minY="198" maxY="229" name="equestrian-m"/>
-  <symbol minX="310" maxX="341" minY="198" maxY="229" name="fastfood-l"/>
-  <symbol minX="341" maxX="372" minY="198" maxY="229" name="kiosk-l"/>
-  <symbol minX="372" maxX="403" minY="198" maxY="229" name="kindergarten-m"/>
-  <symbol minX="403" maxX="434" minY="198" maxY="229" name="fire_station-l"/>
-  <symbol minX="434" maxX="465" minY="198" maxY="229" name="kindergarten-l"/>
-  <symbol minX="465" maxX="496" minY="198" maxY="229" name="jewelry-l"/>
-  <symbol minX="496" maxX="527" minY="198" maxY="229" name="florist-l"/>
-  <symbol minX="527" maxX="558" minY="198" maxY="229" name="information-l"/>
-  <symbol minX="558" maxX="589" minY="198" maxY="229" name="fountain-l"/>
-  <symbol minX="589" maxX="620" minY="198" maxY="229" name="hunting-tower-l"/>
-  <symbol minX="620" maxX="651" minY="198" maxY="229" name="hotel-l"/>
-  <symbol minX="651" maxX="682" minY="198" maxY="229" name="fuel-l copy"/>
-  <symbol minX="682" maxX="713" minY="198" maxY="229" name="fuel-l"/>
-  <symbol minX="713" maxX="744" minY="198" maxY="229" name="hospital-l"/>
-  <symbol minX="744" maxX="775" minY="198" maxY="229" name="historic-ship-l"/>
-  <symbol minX="775" maxX="806" minY="198" maxY="229" name="funicular-l"/>
-  <symbol minX="806" maxX="837" minY="198" maxY="229" name="heliport-l"/>
-  <symbol minX="837" maxX="868" minY="198" maxY="229" name="helipad-l"/>
-  <symbol minX="868" maxX="899" minY="198" maxY="229" name="furniture-l"/>
-  <symbol minX="899" maxX="930" minY="198" maxY="229" name="hardware-l"/>
-  <symbol minX="930" maxX="961" minY="198" maxY="229" name="gallery-l"/>
-  <symbol minX="961" maxX="992" minY="198" maxY="229" name="hand-m"/>
-  <symbol minX="992" maxX="1023" minY="198" maxY="229" name="hand-l"/>
-  <symbol minX="0" maxX="31" minY="229" maxY="260" name="garden-l"/>
-  <symbol minX="31" maxX="62" minY="229" maxY="260" name="hairdresser-l"/>
-  <symbol minX="62" maxX="93" minY="229" maxY="260" name="grocery-l"/>
-  <symbol minX="93" maxX="124" minY="229" maxY="260" name="garden_center-l"/>
-  <symbol minX="124" maxX="155" minY="229" maxY="260" name="greengrocer-l"/>
-  <symbol minX="155" maxX="186" minY="229" maxY="260" name="gate-l"/>
-  <symbol minX="186" maxX="217" minY="229" maxY="260" name="golf-l"/>
-  <symbol minX="217" maxX="248" minY="229" maxY="260" name="gift-l"/>
-  <symbol minX="248" maxX="278" minY="229" maxY="259" name="gift-m"/>
-  <symbol minX="278" maxX="308" minY="229" maxY="259" name="gate-m"/>
-  <symbol minX="308" maxX="338" minY="229" maxY="259" name="golf-m"/>
-  <symbol minX="338" maxX="368" minY="229" maxY="259" name="alcohol-m"/>
-  <symbol minX="368" maxX="398" minY="229" maxY="259" name="garden_center-m"/>
-  <symbol minX="398" maxX="428" minY="229" maxY="259" name="greengrocer-m"/>
-  <symbol minX="428" maxX="458" minY="229" maxY="259" name="alpine_hut-m"/>
-  <symbol minX="458" maxX="488" minY="229" maxY="259" name="grocery-m"/>
-  <symbol minX="488" maxX="518" minY="229" maxY="259" name="america-football-m"/>
-  <symbol minX="518" maxX="548" minY="229" maxY="259" name="garden-m"/>
-  <symbol minX="548" maxX="578" minY="229" maxY="259" name="hairdresser-m"/>
-  <symbol minX="578" maxX="608" minY="229" maxY="259" name="archery-m"/>
-  <symbol minX="608" maxX="638" minY="229" maxY="259" name="gallery-m"/>
-  <symbol minX="638" maxX="668" minY="229" maxY="259" name="furniture-m"/>
-  <symbol minX="668" maxX="698" minY="229" maxY="259" name="hardware-m"/>
-  <symbol minX="698" maxX="728" minY="229" maxY="259" name="atm-m"/>
-  <symbol minX="728" maxX="758" minY="229" maxY="259" name="helipad-m"/>
-  <symbol minX="758" maxX="788" minY="229" maxY="259" name="australian-football-m"/>
-  <symbol minX="788" maxX="818" minY="229" maxY="259" name="funicular-m"/>
-  <symbol minX="818" maxX="848" minY="229" maxY="259" name="heliport-m"/>
-  <symbol minX="848" maxX="878" minY="229" maxY="259" name="bakery-m"/>
-  <symbol minX="878" maxX="908" minY="229" maxY="259" name="zoo-m"/>
-  <symbol minX="908" maxX="938" minY="229" maxY="259" name="historic-ship-m"/>
-  <symbol minX="938" maxX="968" minY="229" maxY="259" name="fuel-m"/>
-  <symbol minX="968" maxX="998" minY="229" maxY="259" name="hospital-m"/>
-  <symbol minX="0" maxX="30" minY="260" maxY="290" name="bank-2-m"/>
-  <symbol minX="30" maxX="60" minY="260" maxY="290" name="windmill-m"/>
-  <symbol minX="60" maxX="90" minY="260" maxY="290" name="hotel-m"/>
-  <symbol minX="90" maxX="120" minY="260" maxY="290" name="banknote-m"/>
-  <symbol minX="120" maxX="150" minY="260" maxY="290" name="fountain-m"/>
-  <symbol minX="150" maxX="180" minY="260" maxY="290" name="hunting-tower-m"/>
-  <symbol minX="180" maxX="210" minY="260" maxY="290" name="florist-m"/>
-  <symbol minX="210" maxX="240" minY="260" maxY="290" name="information-m"/>
-  <symbol minX="240" maxX="270" minY="260" maxY="290" name="wayside_shrine-m"/>
-  <symbol minX="270" maxX="300" minY="260" maxY="290" name="bar-m"/>
-  <symbol minX="300" maxX="330" minY="260" maxY="290" name="jewelry-m"/>
-  <symbol minX="330" maxX="360" minY="260" maxY="290" name="fire_station-m"/>
-  <symbol minX="360" maxX="390" minY="260" maxY="290" name="wayside_cross-m"/>
-  <symbol minX="390" maxX="420" minY="260" maxY="290" name="waterfall-m"/>
-  <symbol minX="420" maxX="450" minY="260" maxY="290" name="fastfood-m"/>
-  <symbol minX="450" maxX="480" minY="260" maxY="290" name="kiosk-m"/>
-  <symbol minX="480" maxX="510" minY="260" maxY="290" name="baseball-m"/>
-  <symbol minX="510" maxX="540" minY="260" maxY="290" name="laundry-m"/>
-  <symbol minX="540" maxX="570" minY="260" maxY="290" name="volcano-m"/>
-  <symbol minX="570" maxX="600" minY="260" maxY="290" name="library-m"/>
-  <symbol minX="600" maxX="630" minY="260" maxY="290" name="vending-m"/>
-  <symbol minX="630" maxX="660" minY="260" maxY="290" name="basketball-m"/>
-  <symbol minX="660" maxX="690" minY="260" maxY="290" name="lift_gate-m"/>
-  <symbol minX="690" maxX="720" minY="260" maxY="290" name="embassy-m"/>
-  <symbol minX="720" maxX="750" minY="260" maxY="290" name="lighthouse-m"/>
-  <symbol minX="750" maxX="780" minY="260" maxY="290" name="tram-m"/>
-  <symbol minX="780" maxX="810" minY="260" maxY="290" name="electronics-m"/>
-  <symbol minX="810" maxX="840" minY="260" maxY="290" name="train-m"/>
-  <symbol minX="840" maxX="870" minY="260" maxY="290" name="bbq-m"/>
-  <symbol minX="870" maxX="900" minY="260" maxY="290" name="drugs"/>
-  <symbol minX="900" maxX="930" minY="260" maxY="290" name="mail-m"/>
-  <symbol minX="930" maxX="960" minY="260" maxY="290" name="toys-m"/>
-  <symbol minX="960" maxX="990" minY="260" maxY="290" name="bcontrol-m"/>
-  <symbol minX="990" maxX="1020" minY="260" maxY="290" name="marketplace-m"/>
-  <symbol minX="0" maxX="30" minY="290" maxY="320" name="townhall-m"/>
-  <symbol minX="30" maxX="60" minY="290" maxY="320" name="tourism-m"/>
-  <symbol minX="60" maxX="90" minY="290" maxY="320" name="drinking-water-m"/>
-  <symbol minX="90" maxX="120" minY="290" maxY="320" name="military-m"/>
-  <symbol minX="120" maxX="150" minY="290" maxY="320" name="beach-m"/>
-  <symbol minX="150" maxX="180" minY="290" maxY="320" name="tomb-m"/>
-  <symbol minX="180" maxX="210" minY="290" maxY="320" name="mobile_phone-m"/>
-  <symbol minX="210" maxX="240" minY="290" maxY="320" name="beauty-m"/>
-  <symbol minX="240" maxX="270" minY="290" maxY="320" name="monument-m"/>
-  <symbol minX="270" maxX="300" minY="290" maxY="320" name="toll_booth-m"/>
-  <symbol minX="300" maxX="330" minY="290" maxY="320" name="beer-m"/>
-  <symbol minX="330" maxX="360" minY="290" maxY="320" name="motel-m"/>
-  <symbol minX="360" maxX="390" minY="290" maxY="320" name="doityourself-m"/>
-  <symbol minX="390" maxX="420" minY="290" maxY="320" name="museum-m"/>
-  <symbol minX="420" maxX="450" minY="290" maxY="320" name="toilets-m"/>
-  <symbol minX="450" maxX="480" minY="290" maxY="320" name="theatre-m"/>
-  <symbol minX="480" maxX="510" minY="290" maxY="320" name="tennis-m"/>
-  <symbol minX="510" maxX="540" minY="290" maxY="320" name="bicycle-m"/>
-  <symbol minX="540" maxX="570" minY="290" maxY="320" name="taxi-m"/>
-  <symbol minX="570" maxX="600" minY="290" maxY="320" name="swimming-m"/>
-  <symbol minX="600" maxX="630" minY="290" maxY="320" name="book-shop-m"/>
-  <symbol minX="630" maxX="660" minY="290" maxY="320" name="dog_park-m"/>
-  <symbol minX="660" maxX="690" minY="290" maxY="320" name="npark-m"/>
-  <symbol minX="690" maxX="720" minY="290" maxY="320" name="sweets-m"/>
-  <symbol minX="720" maxX="750" minY="290" maxY="320" name="diving-m"/>
-  <symbol minX="750" maxX="780" minY="290" maxY="320" name="nparkf-m"/>
-  <symbol minX="780" maxX="810" minY="290" maxY="320" name="subway-spb-m"/>
-  <symbol minX="810" maxX="840" minY="290" maxY="320" name="department_store-m"/>
-  <symbol minX="840" maxX="870" minY="290" maxY="320" name="office-m"/>
-  <symbol minX="870" maxX="900" minY="290" maxY="320" name="boundary_stone-m"/>
-  <symbol minX="900" maxX="930" minY="290" maxY="320" name="curling-m"/>
-  <symbol minX="930" maxX="960" minY="290" maxY="320" name="optician-m"/>
-  <symbol minX="960" maxX="990" minY="290" maxY="320" name="cricket-m"/>
-  <symbol minX="990" maxX="1020" minY="290" maxY="320" name="park-m"/>
-  <symbol minX="0" maxX="30" minY="320" maxY="350" name="bowls-m"/>
-  <symbol minX="30" maxX="60" minY="320" maxY="350" name="subway-newyork-m"/>
-  <symbol minX="60" maxX="90" minY="320" maxY="350" name="bus-m"/>
-  <symbol minX="90" maxX="120" minY="320" maxY="350" name="convenience-m"/>
-  <symbol minX="120" maxX="150" minY="320" maxY="350" name="parking-meter-m"/>
-  <symbol minX="150" maxX="180" minY="320" maxY="350" name="subway-m"/>
-  <symbol minX="180" maxX="210" minY="320" maxY="350" name="computer-m"/>
-  <symbol minX="210" maxX="240" minY="320" maxY="350" name="peak-m"/>
-  <symbol minX="240" maxX="270" minY="320" maxY="350" name="subway-entrance-m"/>
-  <symbol minX="270" maxX="300" minY="320" maxY="350" name="butcher-m"/>
-  <symbol minX="300" maxX="330" minY="320" maxY="350" name="subway-entrance-2-m"/>
-  <symbol minX="330" maxX="360" minY="320" maxY="350" name="sports-m"/>
-  <symbol minX="360" maxX="390" minY="320" maxY="350" name="cable-car-m"/>
-  <symbol minX="390" maxX="420" minY="320" maxY="350" name="pharmacy-m"/>
-  <symbol minX="420" maxX="450" minY="320" maxY="350" name="soccer-m"/>
-  <symbol minX="450" maxX="480" minY="320" maxY="350" name="college-m"/>
-  <symbol minX="480" maxX="510" minY="320" maxY="350" name="phone-m"/>
-  <symbol minX="510" maxX="540" minY="320" maxY="350" name="skiing-m"/>
-  <symbol minX="540" maxX="570" minY="320" maxY="350" name="clothes-m"/>
-  <symbol minX="570" maxX="600" minY="320" maxY="350" name="picnic-m"/>
-  <symbol minX="600" maxX="630" minY="320" maxY="350" name="cafe-m"/>
-  <symbol minX="630" maxX="660" minY="320" maxY="350" name="shop-m"/>
-  <symbol minX="660" maxX="690" minY="320" maxY="350" name="pitch-m"/>
-  <symbol minX="690" maxX="720" minY="320" maxY="350" name="shop-m copy"/>
-  <symbol minX="720" maxX="750" minY="320" maxY="350" name="cinema-m"/>
-  <symbol minX="750" maxX="780" minY="320" maxY="350" name="place-of-worship-m"/>
-  <symbol minX="780" maxX="810" minY="320" maxY="350" name="campsite-m"/>
-  <symbol minX="810" maxX="840" minY="320" maxY="350" name="chemist-m"/>
-  <symbol minX="840" maxX="870" minY="320" maxY="350" name="police-m"/>
-  <symbol minX="870" maxX="900" minY="320" maxY="350" name="shop-bicycle-m"/>
-  <symbol minX="900" maxX="930" minY="320" maxY="350" name="shoes-m"/>
-  <symbol minX="930" maxX="960" minY="320" maxY="350" name="postbox-m"/>
-  <symbol minX="960" maxX="990" minY="320" maxY="350" name="cemetery-m"/>
-  <symbol minX="990" maxX="1020" minY="320" maxY="350" name="car-repair-m"/>
-  <symbol minX="0" maxX="30" minY="350" maxY="380" name="cave-m"/>
-  <symbol minX="30" maxX="60" minY="350" maxY="380" name="pub-m"/>
-  <symbol minX="60" maxX="90" minY="350" maxY="380" name="ship-m"/>
-  <symbol minX="90" maxX="120" minY="350" maxY="380" name="school-m"/>
-  <symbol minX="120" maxX="150" minY="350" maxY="380" name="car_sharing-m"/>
-  <symbol minX="150" maxX="180" minY="350" maxY="380" name="recycling-m"/>
-  <symbol minX="180" maxX="210" minY="350" maxY="380" name="restaurant-m"/>
-  <symbol minX="210" maxX="240" minY="350" maxY="380" name="casino-m"/>
-  <symbol minX="240" maxX="270" minY="350" maxY="380" name="remains-m"/>
-  <symbol minX="270" maxX="300" minY="350" maxY="380" name="caravan_site-m"/>
-  <symbol minX="300" maxX="331" minY="350" maxY="378" name="subway-moscow-l"/>
-  <symbol minX="331" maxX="359" minY="350" maxY="378" name="lightrail-berlin-m"/>
-  <symbol minX="359" maxX="387" minY="350" maxY="378" name="speedcam-l"/>
-  <symbol minX="387" maxX="415" minY="350" maxY="378" name="subway-berlin-l"/>
-  <symbol minX="415" maxX="443" minY="350" maxY="378" name="parking-l"/>
-  <symbol minX="443" maxX="471" minY="350" maxY="378" name="subway-rome-l"/>
-  <symbol minX="471" maxX="498" minY="350" maxY="377" name="route_from"/>
-  <symbol minX="498" maxX="523" minY="350" maxY="375" name="no-icon"/>
-  <symbol minX="523" maxX="548" minY="350" maxY="375" name="subway-rome-m"/>
-  <symbol minX="548" maxX="573" minY="350" maxY="375" name="no-icon-amenity"/>
-  <symbol minX="573" maxX="598" minY="350" maxY="375" name="subway-paris-m"/>
-  <symbol minX="598" maxX="623" minY="350" maxY="375" name="no-icon-shop"/>
-  <symbol minX="623" maxX="652" minY="350" maxY="375" name="subway-moscow-m"/>
-  <symbol minX="652" maxX="677" minY="350" maxY="375" name="current-position"/>
-  <symbol minX="677" maxX="708" minY="350" maxY="375" name="subway-london-l"/>
-  <symbol minX="708" maxX="733" minY="350" maxY="375" name="subway-berlin-m"/>
-  <symbol minX="733" maxX="758" minY="350" maxY="375" name="no-icon-leisure"/>
-  <symbol minX="758" maxX="783" minY="350" maxY="375" name="no-icon-tourism"/>
-  <symbol minX="783" maxX="807" minY="350" maxY="374" name="airport-s"/>
-  <symbol minX="807" maxX="830" minY="350" maxY="373" name="shop-s"/>
-  <symbol minX="830" maxX="853" minY="350" maxY="373" name="picnic-s"/>
-  <symbol minX="853" maxX="876" minY="350" maxY="373" name="phone-s"/>
-  <symbol minX="876" maxX="899" minY="350" maxY="373" name="skiing-s"/>
-  <symbol minX="899" maxX="922" minY="350" maxY="373" name="cable-car-s"/>
-  <symbol minX="922" maxX="945" minY="350" maxY="373" name="pharmacy-s"/>
-  <symbol minX="945" maxX="968" minY="350" maxY="373" name="soccer-s"/>
-  <symbol minX="968" maxX="991" minY="350" maxY="373" name="shop-s copy"/>
-  <symbol minX="991" maxX="1014" minY="350" maxY="373" name="speedcam-m"/>
-  <symbol minX="0" maxX="23" minY="380" maxY="403" name="golf-s"/>
-  <symbol minX="23" maxX="46" minY="380" maxY="403" name="college-s"/>
-  <symbol minX="46" maxX="69" minY="380" maxY="403" name="cinema-s"/>
-  <symbol minX="69" maxX="92" minY="380" maxY="403" name="alcohol-s"/>
-  <symbol minX="92" maxX="115" minY="380" maxY="403" name="garden-s"/>
-  <symbol minX="115" maxX="138" minY="380" maxY="403" name="grocery-s"/>
-  <symbol minX="138" maxX="161" minY="380" maxY="403" name="embassy-s"/>
-  <symbol minX="161" maxX="184" minY="380" maxY="403" name="library-s"/>
-  <symbol minX="184" maxX="212" minY="380" maxY="403" name="subway-barcelona-s"/>
-  <symbol minX="212" maxX="235" minY="380" maxY="403" name="pitch-s"/>
-  <symbol minX="235" maxX="258" minY="380" maxY="403" name="cafe-s"/>
-  <symbol minX="258" maxX="281" minY="380" maxY="403" name="america-football-s"/>
-  <symbol minX="281" maxX="304" minY="380" maxY="403" name="gallery-s"/>
-  <symbol minX="304" maxX="327" minY="380" maxY="403" name="subway-entrance-2-s"/>
-  <symbol minX="327" maxX="350" minY="380" maxY="403" name="subway-entrance-arrow"/>
-  <symbol minX="350" maxX="373" minY="380" maxY="403" name="funicular-s"/>
-  <symbol minX="373" maxX="396" minY="380" maxY="403" name="peak-s"/>
-  <symbol minX="396" maxX="419" minY="380" maxY="403" name="subway-entrance-s"/>
-  <symbol minX="419" maxX="442" minY="380" maxY="403" name="baseball-s"/>
-  <symbol minX="442" maxX="465" minY="380" maxY="403" name="volcano-s"/>
-  <symbol minX="465" maxX="488" minY="380" maxY="403" name="atm-s copy 2"/>
-  <symbol minX="488" maxX="511" minY="380" maxY="403" name="bus-s"/>
-  <symbol minX="511" maxX="534" minY="380" maxY="403" name="place-of-worship-s"/>
-  <symbol minX="534" maxX="564" minY="380" maxY="403" name="subway-london-m"/>
-  <symbol minX="564" maxX="587" minY="380" maxY="403" name="atm-s"/>
-  <symbol minX="587" maxX="610" minY="380" maxY="403" name="police-s"/>
-  <symbol minX="610" maxX="633" minY="380" maxY="403" name="tram-s"/>
-  <symbol minX="633" maxX="656" minY="380" maxY="403" name="lighthouse-s"/>
-  <symbol minX="656" maxX="679" minY="380" maxY="403" name="basketball-s"/>
-  <symbol minX="679" maxX="702" minY="380" maxY="403" name="helipad-s"/>
-  <symbol minX="702" maxX="725" minY="380" maxY="403" name="heliport-s"/>
-  <symbol minX="725" maxX="748" minY="380" maxY="403" name="train-s"/>
-  <symbol minX="748" maxX="771" minY="380" maxY="403" name="remains-s"/>
-  <symbol minX="771" maxX="794" minY="380" maxY="403" name="campsite-s"/>
-  <symbol minX="794" maxX="817" minY="380" maxY="403" name="recycling-s"/>
-  <symbol minX="817" maxX="840" minY="380" maxY="403" name="mail-s"/>
-  <symbol minX="840" maxX="863" minY="380" maxY="403" name="cemetery-s"/>
-  <symbol minX="863" maxX="886" minY="380" maxY="403" name="subway-newyork-s"/>
-  <symbol minX="886" maxX="909" minY="380" maxY="403" name="zoo-s"/>
-  <symbol minX="909" maxX="932" minY="380" maxY="403" name="park-s"/>
-  <symbol minX="932" maxX="955" minY="380" maxY="403" name="cave-s"/>
-  <symbol minX="955" maxX="978" minY="380" maxY="403" name="drinking-water-s"/>
-  <symbol minX="978" maxX="1001" minY="380" maxY="403" name="ship-s"/>
-  <symbol minX="1001" maxX="1024" minY="380" maxY="403" name="pub-s"/>
-  <symbol minX="0" maxX="23" minY="403" maxY="426" name="fuel-s"/>
-  <symbol minX="23" maxX="46" minY="403" maxY="426" name="subway-s"/>
-  <symbol minX="46" maxX="69" minY="403" maxY="426" name="office-s"/>
-  <symbol minX="69" maxX="92" minY="403" maxY="426" name="nparkf-s"/>
-  <symbol minX="92" maxX="115" minY="403" maxY="426" name="subway-spb-s"/>
-  <symbol minX="115" maxX="138" minY="403" maxY="426" name="hospital-s"/>
-  <symbol minX="138" maxX="161" minY="403" maxY="426" name="windmill-s"/>
-  <symbol minX="161" maxX="184" minY="403" maxY="426" name="fountain-s"/>
-  <symbol minX="184" maxX="207" minY="403" maxY="426" name="hotel-s"/>
-  <symbol minX="207" maxX="230" minY="403" maxY="426" name="information-s"/>
-  <symbol minX="230" maxX="253" minY="403" maxY="426" name="book-shop-s"/>
-  <symbol minX="253" maxX="276" minY="403" maxY="426" name="npark-s"/>
-  <symbol minX="276" maxX="299" minY="403" maxY="426" name="fire_station-s"/>
-  <symbol minX="299" maxX="322" minY="403" maxY="426" name="car-repair-s"/>
-  <symbol minX="322" maxX="345" minY="403" maxY="426" name="swimming-s"/>
-  <symbol minX="345" maxX="368" minY="403" maxY="426" name="bicycle-s"/>
-  <symbol minX="368" maxX="391" minY="403" maxY="426" name="school-s"/>
-  <symbol minX="391" maxX="414" minY="403" maxY="426" name="casino-s"/>
-  <symbol minX="414" maxX="437" minY="403" maxY="426" name="townhall-s"/>
-  <symbol minX="437" maxX="460" minY="403" maxY="426" name="tennis-s"/>
-  <symbol minX="460" maxX="483" minY="403" maxY="426" name="fastfood-s"/>
-  <symbol minX="483" maxX="506" minY="403" maxY="426" name="restaurant-s"/>
-  <symbol minX="506" maxX="529" minY="403" maxY="426" name="theatre-s"/>
-  <symbol minX="529" maxX="552" minY="403" maxY="426" name="beer-s"/>
-  <symbol minX="552" maxX="575" minY="403" maxY="426" name="museum-s"/>
-  <symbol minX="575" maxX="598" minY="403" maxY="426" name="toilets-s"/>
-  <symbol minX="598" maxX="621" minY="403" maxY="426" name="bar-s"/>
-  <symbol minX="621" maxX="644" minY="403" maxY="426" name="monument-s"/>
-  <symbol minX="644" maxX="667" minY="403" maxY="426" name="waterfall-s"/>
-  <symbol minX="667" maxX="690" minY="403" maxY="426" name="kindergarten-s"/>
-  <symbol minX="690" maxX="713" minY="403" maxY="426" name="military-s"/>
-  <symbol minX="713" maxX="736" minY="403" maxY="426" name="bcontrol-s"/>
-  <symbol minX="736" maxX="759" minY="403" maxY="426" name="tourism-s"/>
-  <symbol minX="759" maxX="790" minY="403" maxY="425" name="subway-barcelona-l"/>
-  <symbol minX="790" maxX="821" minY="403" maxY="425" name="metro-barcelona-m"/>
-  <symbol minX="821" maxX="842" minY="403" maxY="425" name="s-arrow"/>
-  <symbol minX="842" maxX="873" minY="403" maxY="425" name="subway-barcelona-m"/>
-  <symbol minX="873" maxX="895" minY="403" maxY="425" name="parking-m"/>
-  <symbol minX="895" maxX="926" minY="403" maxY="425" name="subway-madrid-l"/>
-  <symbol minX="926" maxX="957" minY="403" maxY="425" name="subway-madrid-m"/>
-  <symbol minX="957" maxX="985" minY="403" maxY="424" name="metro-barcelona-s"/>
-  <symbol minX="985" maxX="1013" minY="403" maxY="424" name="subway-madrid-s"/>
-  <symbol minX="0" maxX="21" minY="426" maxY="447" name="subway-paris-s"/>
-  <symbol minX="21" maxX="42" minY="426" maxY="447" name="lightrail-berlin-s"/>
-  <symbol minX="42" maxX="72" minY="426" maxY="447" name="subway-kiev-m"/>
-  <symbol minX="72" maxX="102" minY="426" maxY="447" name="subway-kiev-l"/>
-  <symbol minX="102" maxX="122" minY="426" maxY="446" name="subway-moscow-s"/>
-  <symbol minX="122" maxX="142" minY="426" maxY="446" name="api-result"/>
-  <symbol minX="142" maxX="161" minY="426" maxY="445" name="search-result"/>
-  <symbol minX="161" maxX="180" minY="426" maxY="445" name="subway-berlin-s"/>
-  <symbol minX="180" maxX="199" minY="426" maxY="445" name="subway-rome-s"/>
-  <symbol minX="199" maxX="218" minY="426" maxY="445" name="speedcam-s"/>
-  <symbol minX="218" maxX="237" minY="426" maxY="445" name="star-l"/>
-  <symbol minX="237" maxX="260" minY="426" maxY="445" name="subway-london-s"/>
-  <symbol minX="260" maxX="279" minY="426" maxY="445" name="parking-s"/>
-  <symbol minX="279" maxX="300" minY="426" maxY="445" name="bench"/>
-  <symbol minX="300" maxX="318" minY="426" maxY="444" name="survey_point-l"/>
-  <symbol minX="318" maxX="337" minY="426" maxY="444" name="peakt-l"/>
-  <symbol minX="337" maxX="367" minY="426" maxY="444" name="subway-minsk-l"/>
-  <symbol minX="367" maxX="385" minY="426" maxY="444" name="star-m"/>
-  <symbol minX="385" maxX="410" minY="426" maxY="442" name="subway-kiev-s"/>
-  <symbol minX="410" maxX="425" minY="426" maxY="441" name="survey_point-m"/>
-  <symbol minX="425" maxX="440" minY="426" maxY="441" name="subway-xs"/>
-  <symbol minX="440" maxX="455" minY="426" maxY="441" name="star-s"/>
-  <symbol minX="455" maxX="478" minY="426" maxY="441" name="railway-crossing"/>
-  <symbol minX="478" maxX="493" minY="426" maxY="441" name="subway-newyork-xs"/>
-  <symbol minX="493" maxX="518" minY="426" maxY="441" name="subway-minsk-m"/>
-  <symbol minX="518" maxX="541" minY="426" maxY="440" name="subway-minsk-s"/>
-  <symbol minX="541" maxX="555" minY="426" maxY="440" name="subway-xs copy"/>
-  <symbol minX="555" maxX="569" minY="426" maxY="439" name="peakt-m"/>
-  <symbol minX="569" maxX="582" minY="426" maxY="439" name="survey_point-s"/>
-  <symbol minX="582" maxX="610" minY="426" maxY="439" name="arrow-m"/>
-  <symbol minX="610" maxX="622" minY="426" maxY="438" name="entrance-s"/>
-  <symbol minX="622" maxX="633" minY="426" maxY="437" name="dot-m"/>
-  <symbol minX="633" maxX="645" minY="426" maxY="437" name="peakt-s"/>
-  <symbol minX="645" maxX="655" minY="426" maxY="436" name="none"/>
-  <symbol minX="655" maxX="665" minY="426" maxY="436" name="tree-l"/>
-  <symbol minX="665" maxX="686" minY="426" maxY="436" name="arrow-s"/>
-  <symbol minX="686" maxX="695" minY="426" maxY="435" name="dot-s"/>
-  <symbol minX="695" maxX="704" minY="426" maxY="435" name="entrance-xs"/>
-  <symbol minX="704" maxX="713" minY="426" maxY="435" name="dot-s-light"/>
-  <symbol minX="713" maxX="722" minY="426" maxY="435" name="tree-m"/>
-  <symbol minX="722" maxX="729" minY="426" maxY="433" name="tree-s"/>
-  <symbol minX="729" maxX="736" minY="426" maxY="433" name="zero-icon"/>
+ <file width="1024" height="512">
+  <symbol name="route_to" minX="0" maxX="105" minY="0" maxY="105"/>
+  <symbol name="route-arrow" minX="105" maxX="309" minY="0" maxY="100"/>
+  <symbol name="compass-image" minX="309" maxX="397" minY="0" maxY="88"/>
+  <symbol name="current-position-compas" minX="397" maxX="442" minY="0" maxY="57"/>
+  <symbol name="current-routing-compas" minX="442" maxX="487" minY="0" maxY="57"/>
+  <symbol name="search-result-active" minX="487" maxX="538" minY="0" maxY="51"/>
+  <symbol name="placemark-green" minX="538" maxX="562" minY="0" maxY="45"/>
+  <symbol name="placemark-brown" minX="562" maxX="586" minY="0" maxY="45"/>
+  <symbol name="placemark-pink" minX="586" maxX="610" minY="0" maxY="45"/>
+  <symbol name="placemark-purple" minX="610" maxX="634" minY="0" maxY="45"/>
+  <symbol name="placemark-blue" minX="634" maxX="658" minY="0" maxY="45"/>
+  <symbol name="placemark-red" minX="658" maxX="682" minY="0" maxY="45"/>
+  <symbol name="placemark-yellow" minX="682" maxX="706" minY="0" maxY="45"/>
+  <symbol name="placemark-orange" minX="706" maxX="730" minY="0" maxY="45"/>
+  <symbol name="ship-l" minX="730" maxX="761" minY="0" maxY="31"/>
+  <symbol name="atm-l" minX="761" maxX="792" minY="0" maxY="31"/>
+  <symbol name="school-l" minX="792" maxX="823" minY="0" maxY="31"/>
+  <symbol name="skiing-l" minX="823" maxX="854" minY="0" maxY="31"/>
+  <symbol name="archery-l" minX="854" maxX="885" minY="0" maxY="31"/>
+  <symbol name="australian-football-l" minX="885" maxX="916" minY="0" maxY="31"/>
+  <symbol name="soccer-l" minX="916" maxX="947" minY="0" maxY="31"/>
+  <symbol name="bakery-l" minX="947" maxX="978" minY="0" maxY="31"/>
+  <symbol name="restaurant-l" minX="978" maxX="1009" minY="0" maxY="31"/>
+  <symbol name="remains-l" minX="0" maxX="31" minY="105" maxY="136"/>
+  <symbol name="bank-l" minX="31" maxX="61" minY="105" maxY="136"/>
+  <symbol name="bank-m" minX="61" maxX="91" minY="105" maxY="136"/>
+  <symbol name="banknote-l" minX="91" maxX="121" minY="105" maxY="136"/>
+  <symbol name="sports-l" minX="121" maxX="152" minY="105" maxY="136"/>
+  <symbol name="bar-l" minX="152" maxX="183" minY="105" maxY="136"/>
+  <symbol name="recycling-l" minX="183" maxX="214" minY="105" maxY="136"/>
+  <symbol name="shoes-l" minX="214" maxX="245" minY="105" maxY="136"/>
+  <symbol name="baseball-l" minX="245" maxX="276" minY="105" maxY="136"/>
+  <symbol name="pub-l" minX="276" maxX="307" minY="105" maxY="136"/>
+  <symbol name="america-football-l" minX="307" maxX="338" minY="105" maxY="136"/>
+  <symbol name="basketball-l" minX="338" maxX="369" minY="105" maxY="136"/>
+  <symbol name="power-m" minX="369" maxX="400" minY="105" maxY="136"/>
+  <symbol name="shop-bicycle-l" minX="400" maxX="431" minY="105" maxY="136"/>
+  <symbol name="bbq-l" minX="431" maxX="462" minY="105" maxY="136"/>
+  <symbol name="power-l" minX="462" maxX="493" minY="105" maxY="136"/>
+  <symbol name="bcontrol-l" minX="493" maxX="524" minY="105" maxY="136"/>
+  <symbol name="postbox-l" minX="524" maxX="555" minY="105" maxY="136"/>
+  <symbol name="alpine_hut-l" minX="555" maxX="586" minY="105" maxY="136"/>
+  <symbol name="beach-l" minX="586" maxX="617" minY="105" maxY="136"/>
+  <symbol name="police-l" minX="617" maxX="648" minY="105" maxY="136"/>
+  <symbol name="beauty-l" minX="648" maxX="679" minY="105" maxY="136"/>
+  <symbol name="place-of-worship-l" minX="679" maxX="710" minY="105" maxY="136"/>
+  <symbol name="beer-l" minX="710" maxX="741" minY="105" maxY="136"/>
+  <symbol name="subway-entrance-l" minX="741" maxX="772" minY="105" maxY="136"/>
+  <symbol name="shop-l copy" minX="772" maxX="803" minY="105" maxY="136"/>
+  <symbol name="alcohol-l" minX="803" maxX="834" minY="105" maxY="136"/>
+  <symbol name="bicycle-l" minX="834" maxX="865" minY="105" maxY="136"/>
+  <symbol name="pitch-l" minX="865" maxX="896" minY="105" maxY="136"/>
+  <symbol name="shop-l" minX="896" maxX="927" minY="105" maxY="136"/>
+  <symbol name="book-shop-l" minX="927" maxX="958" minY="105" maxY="136"/>
+  <symbol name="picnic-l" minX="958" maxX="989" minY="105" maxY="136"/>
+  <symbol name="subway-l" minX="989" maxX="1020" minY="105" maxY="136"/>
+  <symbol name="boundary_stone-l" minX="0" maxX="31" minY="136" maxY="167"/>
+  <symbol name="phone-l" minX="31" maxX="62" minY="136" maxY="167"/>
+  <symbol name="bowls-l" minX="62" maxX="93" minY="136" maxY="167"/>
+  <symbol name="pharmacy-l" minX="93" maxX="124" minY="136" maxY="167"/>
+  <symbol name="bus-l" minX="124" maxX="155" minY="136" maxY="167"/>
+  <symbol name="subway-newyork-l" minX="155" maxX="186" minY="136" maxY="167"/>
+  <symbol name="airport-m" minX="186" maxX="217" minY="136" maxY="167"/>
+  <symbol name="butcher-l" minX="217" maxX="248" minY="136" maxY="167"/>
+  <symbol name="peak-l" minX="248" maxX="279" minY="136" maxY="167"/>
+  <symbol name="cable-car-l" minX="279" maxX="310" minY="136" maxY="167"/>
+  <symbol name="parking-meter-l" minX="310" maxX="341" minY="136" maxY="167"/>
+  <symbol name="airport-l" minX="341" maxX="372" minY="136" maxY="167"/>
+  <symbol name="cafe-l" minX="372" maxX="403" minY="136" maxY="167"/>
+  <symbol name="subway-paris-l" minX="403" maxX="434" minY="136" maxY="167"/>
+  <symbol name="park-l" minX="434" maxX="465" minY="136" maxY="167"/>
+  <symbol name="campsite-l" minX="465" maxX="496" minY="136" maxY="167"/>
+  <symbol name="optician-l" minX="496" maxX="527" minY="136" maxY="167"/>
+  <symbol name="zoo-l" minX="527" maxX="558" minY="136" maxY="167"/>
+  <symbol name="car-repair-l" minX="558" maxX="589" minY="136" maxY="167"/>
+  <symbol name="office-l" minX="589" maxX="620" minY="136" maxY="167"/>
+  <symbol name="nparkf-l" minX="620" maxX="651" minY="136" maxY="167"/>
+  <symbol name="car_sharing-l" minX="651" maxX="682" minY="136" maxY="167"/>
+  <symbol name="subway-spb-l" minX="682" maxX="713" minY="136" maxY="167"/>
+  <symbol name="caravan_site-l" minX="713" maxX="744" minY="136" maxY="167"/>
+  <symbol name="npark-l" minX="744" maxX="775" minY="136" maxY="167"/>
+  <symbol name="casino-l" minX="775" maxX="806" minY="136" maxY="167"/>
+  <symbol name="sweets-l" minX="806" maxX="837" minY="136" maxY="167"/>
+  <symbol name="windmill-l" minX="837" maxX="868" minY="136" maxY="167"/>
+  <symbol name="cave-l" minX="868" maxX="899" minY="136" maxY="167"/>
+  <symbol name="museum-l" minX="899" maxX="930" minY="136" maxY="167"/>
+  <symbol name="motel-l" minX="930" maxX="961" minY="136" maxY="167"/>
+  <symbol name="cemetery-l" minX="961" maxX="992" minY="136" maxY="167"/>
+  <symbol name="monument-l" minX="992" maxX="1023" minY="136" maxY="167"/>
+  <symbol name="wayside_shrine-l" minX="0" maxX="31" minY="167" maxY="198"/>
+  <symbol name="chemist-l" minX="31" maxX="62" minY="167" maxY="198"/>
+  <symbol name="mobile_phone-l" minX="62" maxX="93" minY="167" maxY="198"/>
+  <symbol name="cinema-l" minX="93" maxX="124" minY="167" maxY="198"/>
+  <symbol name="swimming-l" minX="124" maxX="155" minY="167" maxY="198"/>
+  <symbol name="military-l" minX="155" maxX="186" minY="167" maxY="198"/>
+  <symbol name="clothes-l" minX="186" maxX="217" minY="167" maxY="198"/>
+  <symbol name="taxi-l" minX="217" maxX="248" minY="167" maxY="198"/>
+  <symbol name="college-l" minX="248" maxX="279" minY="167" maxY="198"/>
+  <symbol name="marketplace-l" minX="279" maxX="310" minY="167" maxY="198"/>
+  <symbol name="wayside_cross-l" minX="310" maxX="341" minY="167" maxY="198"/>
+  <symbol name="computer-l" minX="341" maxX="372" minY="167" maxY="198"/>
+  <symbol name="mail-l" minX="372" maxX="403" minY="167" maxY="198"/>
+  <symbol name="convenience-l" minX="403" maxX="434" minY="167" maxY="198"/>
+  <symbol name="tennis-l" minX="434" maxX="465" minY="167" maxY="198"/>
+  <symbol name="cricket-l" minX="465" maxX="496" minY="167" maxY="198"/>
+  <symbol name="lightrail-berlin-l" minX="496" maxX="527" minY="167" maxY="198"/>
+  <symbol name="curling-l" minX="527" maxX="558" minY="167" maxY="198"/>
+  <symbol name="lighthouse-l" minX="558" maxX="589" minY="167" maxY="198"/>
+  <symbol name="dentist-l" minX="589" maxX="620" minY="167" maxY="198"/>
+  <symbol name="dentist-m" minX="620" maxX="651" minY="167" maxY="198"/>
+  <symbol name="lift_gate-l" minX="651" maxX="682" minY="167" maxY="198"/>
+  <symbol name="department_store-l" minX="682" maxX="713" minY="167" maxY="198"/>
+  <symbol name="theatre-l" minX="713" maxX="744" minY="167" maxY="198"/>
+  <symbol name="diving-l" minX="744" maxX="775" minY="167" maxY="198"/>
+  <symbol name="library-l" minX="775" maxX="806" minY="167" maxY="198"/>
+  <symbol name="dog_park-l" minX="806" maxX="837" minY="167" maxY="198"/>
+  <symbol name="laundry-l" minX="837" maxX="868" minY="167" maxY="198"/>
+  <symbol name="doityourself-l" minX="868" maxX="899" minY="167" maxY="198"/>
+  <symbol name="kiosk-l" minX="899" maxX="930" minY="167" maxY="198"/>
+  <symbol name="waterfall-l" minX="930" maxX="961" minY="167" maxY="198"/>
+  <symbol name="kindergarten-m" minX="961" maxX="992" minY="167" maxY="198"/>
+  <symbol name="volcano-l" minX="992" maxX="1023" minY="167" maxY="198"/>
+  <symbol name="drinking-water-l" minX="0" maxX="31" minY="198" maxY="229"/>
+  <symbol name="kindergarten-l" minX="31" maxX="62" minY="198" maxY="229"/>
+  <symbol name="jewelry-l" minX="62" maxX="93" minY="198" maxY="229"/>
+  <symbol name="toilets-l" minX="93" maxX="124" minY="198" maxY="229"/>
+  <symbol name="electronics-l" minX="124" maxX="155" minY="198" maxY="229"/>
+  <symbol name="information-l" minX="155" maxX="186" minY="198" maxY="229"/>
+  <symbol name="embassy-l" minX="186" maxX="217" minY="198" maxY="229"/>
+  <symbol name="hunting-tower-l" minX="217" maxX="248" minY="198" maxY="229"/>
+  <symbol name="vending-l" minX="248" maxX="279" minY="198" maxY="229"/>
+  <symbol name="hotel-l" minX="279" maxX="310" minY="198" maxY="229"/>
+  <symbol name="tram-l" minX="310" maxX="341" minY="198" maxY="229"/>
+  <symbol name="equestrian-l" minX="341" maxX="372" minY="198" maxY="229"/>
+  <symbol name="equestrian-m" minX="372" maxX="403" minY="198" maxY="229"/>
+  <symbol name="fastfood-l" minX="403" maxX="434" minY="198" maxY="229"/>
+  <symbol name="toll_booth-l" minX="434" maxX="465" minY="198" maxY="229"/>
+  <symbol name="hospital-l" minX="465" maxX="496" minY="198" maxY="229"/>
+  <symbol name="fire_station-l" minX="496" maxX="527" minY="198" maxY="229"/>
+  <symbol name="historic-ship-l" minX="527" maxX="558" minY="198" maxY="229"/>
+  <symbol name="train-l" minX="558" maxX="589" minY="198" maxY="229"/>
+  <symbol name="florist-l" minX="589" maxX="620" minY="198" maxY="229"/>
+  <symbol name="heliport-l" minX="620" maxX="651" minY="198" maxY="229"/>
+  <symbol name="fountain-l" minX="651" maxX="682" minY="198" maxY="229"/>
+  <symbol name="tomb-l" minX="682" maxX="713" minY="198" maxY="229"/>
+  <symbol name="helipad-l" minX="713" maxX="744" minY="198" maxY="229"/>
+  <symbol name="fuel-l copy" minX="744" maxX="775" minY="198" maxY="229"/>
+  <symbol name="fuel-l" minX="775" maxX="806" minY="198" maxY="229"/>
+  <symbol name="hardware-l" minX="806" maxX="837" minY="198" maxY="229"/>
+  <symbol name="toys-l" minX="837" maxX="868" minY="198" maxY="229"/>
+  <symbol name="funicular-l" minX="868" maxX="899" minY="198" maxY="229"/>
+  <symbol name="hand-m" minX="899" maxX="930" minY="198" maxY="229"/>
+  <symbol name="hand-l" minX="930" maxX="961" minY="198" maxY="229"/>
+  <symbol name="furniture-l" minX="961" maxX="992" minY="198" maxY="229"/>
+  <symbol name="hairdresser-l" minX="992" maxX="1023" minY="198" maxY="229"/>
+  <symbol name="gallery-l" minX="0" maxX="31" minY="229" maxY="260"/>
+  <symbol name="grocery-l" minX="31" maxX="62" minY="229" maxY="260"/>
+  <symbol name="townhall-l" minX="62" maxX="93" minY="229" maxY="260"/>
+  <symbol name="garden-l" minX="93" maxX="124" minY="229" maxY="260"/>
+  <symbol name="greengrocer-l" minX="124" maxX="155" minY="229" maxY="260"/>
+  <symbol name="tourism-l" minX="155" maxX="186" minY="229" maxY="260"/>
+  <symbol name="garden_center-l" minX="186" maxX="217" minY="229" maxY="260"/>
+  <symbol name="golf-l" minX="217" maxX="248" minY="229" maxY="260"/>
+  <symbol name="gate-l" minX="248" maxX="279" minY="229" maxY="260"/>
+  <symbol name="gift-l" minX="279" maxX="310" minY="229" maxY="260"/>
+  <symbol name="gate-m" minX="310" maxX="340" minY="229" maxY="259"/>
+  <symbol name="gift-m" minX="340" maxX="370" minY="229" maxY="259"/>
+  <symbol name="garden_center-m" minX="370" maxX="400" minY="229" maxY="259"/>
+  <symbol name="golf-m" minX="400" maxX="430" minY="229" maxY="259"/>
+  <symbol name="tourism-m" minX="430" maxX="460" minY="229" maxY="259"/>
+  <symbol name="garden-m" minX="460" maxX="490" minY="229" maxY="259"/>
+  <symbol name="greengrocer-m" minX="490" maxX="520" minY="229" maxY="259"/>
+  <symbol name="gallery-m" minX="520" maxX="550" minY="229" maxY="259"/>
+  <symbol name="grocery-m" minX="550" maxX="580" minY="229" maxY="259"/>
+  <symbol name="tomb-m" minX="580" maxX="610" minY="229" maxY="259"/>
+  <symbol name="furniture-m" minX="610" maxX="640" minY="229" maxY="259"/>
+  <symbol name="hairdresser-m" minX="640" maxX="670" minY="229" maxY="259"/>
+  <symbol name="townhall-m" minX="670" maxX="700" minY="229" maxY="259"/>
+  <symbol name="funicular-m" minX="700" maxX="730" minY="229" maxY="259"/>
+  <symbol name="fuel-m" minX="730" maxX="760" minY="229" maxY="259"/>
+  <symbol name="hardware-m" minX="760" maxX="790" minY="229" maxY="259"/>
+  <symbol name="toys-m" minX="790" maxX="820" minY="229" maxY="259"/>
+  <symbol name="helipad-m" minX="820" maxX="850" minY="229" maxY="259"/>
+  <symbol name="fountain-m" minX="850" maxX="880" minY="229" maxY="259"/>
+  <symbol name="florist-m" minX="880" maxX="910" minY="229" maxY="259"/>
+  <symbol name="heliport-m" minX="910" maxX="940" minY="229" maxY="259"/>
+  <symbol name="toll_booth-m" minX="940" maxX="970" minY="229" maxY="259"/>
+  <symbol name="fire_station-m" minX="970" maxX="1000" minY="229" maxY="259"/>
+  <symbol name="historic-ship-m" minX="0" maxX="30" minY="260" maxY="290"/>
+  <symbol name="train-m" minX="30" maxX="60" minY="260" maxY="290"/>
+  <symbol name="hospital-m" minX="60" maxX="90" minY="260" maxY="290"/>
+  <symbol name="fastfood-m" minX="90" maxX="120" minY="260" maxY="290"/>
+  <symbol name="tram-m" minX="120" maxX="150" minY="260" maxY="290"/>
+  <symbol name="hotel-m" minX="150" maxX="180" minY="260" maxY="290"/>
+  <symbol name="toilets-m" minX="180" maxX="210" minY="260" maxY="290"/>
+  <symbol name="embassy-m" minX="210" maxX="240" minY="260" maxY="290"/>
+  <symbol name="hunting-tower-m" minX="240" maxX="270" minY="260" maxY="290"/>
+  <symbol name="electronics-m" minX="270" maxX="300" minY="260" maxY="290"/>
+  <symbol name="information-m" minX="300" maxX="330" minY="260" maxY="290"/>
+  <symbol name="drugs" minX="330" maxX="360" minY="260" maxY="290"/>
+  <symbol name="vending-m" minX="360" maxX="390" minY="260" maxY="290"/>
+  <symbol name="jewelry-m" minX="390" maxX="420" minY="260" maxY="290"/>
+  <symbol name="drinking-water-m" minX="420" maxX="450" minY="260" maxY="290"/>
+  <symbol name="volcano-m" minX="450" maxX="480" minY="260" maxY="290"/>
+  <symbol name="theatre-m" minX="480" maxX="510" minY="260" maxY="290"/>
+  <symbol name="doityourself-m" minX="510" maxX="540" minY="260" maxY="290"/>
+  <symbol name="kiosk-m" minX="540" maxX="570" minY="260" maxY="290"/>
+  <symbol name="dog_park-m" minX="570" maxX="600" minY="260" maxY="290"/>
+  <symbol name="laundry-m" minX="600" maxX="630" minY="260" maxY="290"/>
+  <symbol name="diving-m" minX="630" maxX="660" minY="260" maxY="290"/>
+  <symbol name="library-m" minX="660" maxX="690" minY="260" maxY="290"/>
+  <symbol name="department_store-m" minX="690" maxX="720" minY="260" maxY="290"/>
+  <symbol name="waterfall-m" minX="720" maxX="750" minY="260" maxY="290"/>
+  <symbol name="lift_gate-m" minX="750" maxX="780" minY="260" maxY="290"/>
+  <symbol name="curling-m" minX="780" maxX="810" minY="260" maxY="290"/>
+  <symbol name="lighthouse-m" minX="810" maxX="840" minY="260" maxY="290"/>
+  <symbol name="tennis-m" minX="840" maxX="870" minY="260" maxY="290"/>
+  <symbol name="cricket-m" minX="870" maxX="900" minY="260" maxY="290"/>
+  <symbol name="shop-m copy" minX="900" maxX="930" minY="260" maxY="290"/>
+  <symbol name="convenience-m" minX="930" maxX="960" minY="260" maxY="290"/>
+  <symbol name="computer-m" minX="960" maxX="990" minY="260" maxY="290"/>
+  <symbol name="mail-m" minX="990" maxX="1020" minY="260" maxY="290"/>
+  <symbol name="taxi-m" minX="0" maxX="30" minY="290" maxY="320"/>
+  <symbol name="college-m" minX="30" maxX="60" minY="290" maxY="320"/>
+  <symbol name="marketplace-m" minX="60" maxX="90" minY="290" maxY="320"/>
+  <symbol name="clothes-m" minX="90" maxX="120" minY="290" maxY="320"/>
+  <symbol name="swimming-m" minX="120" maxX="150" minY="290" maxY="320"/>
+  <symbol name="wayside_cross-m" minX="150" maxX="180" minY="290" maxY="320"/>
+  <symbol name="military-m" minX="180" maxX="210" minY="290" maxY="320"/>
+  <symbol name="cinema-m" minX="210" maxX="240" minY="290" maxY="320"/>
+  <symbol name="chemist-m" minX="240" maxX="270" minY="290" maxY="320"/>
+  <symbol name="mobile_phone-m" minX="270" maxX="300" minY="290" maxY="320"/>
+  <symbol name="cemetery-m" minX="300" maxX="330" minY="290" maxY="320"/>
+  <symbol name="monument-m" minX="330" maxX="360" minY="290" maxY="320"/>
+  <symbol name="sweets-m" minX="360" maxX="390" minY="290" maxY="320"/>
+  <symbol name="wayside_shrine-m" minX="390" maxX="420" minY="290" maxY="320"/>
+  <symbol name="motel-m" minX="420" maxX="450" minY="290" maxY="320"/>
+  <symbol name="cave-m" minX="450" maxX="480" minY="290" maxY="320"/>
+  <symbol name="museum-m" minX="480" maxX="510" minY="290" maxY="320"/>
+  <symbol name="casino-m" minX="510" maxX="540" minY="290" maxY="320"/>
+  <symbol name="alcohol-m" minX="540" maxX="570" minY="290" maxY="320"/>
+  <symbol name="shop-bicycle-m" minX="570" maxX="600" minY="290" maxY="320"/>
+  <symbol name="alpine_hut-m" minX="600" maxX="630" minY="290" maxY="320"/>
+  <symbol name="shop-m" minX="630" maxX="660" minY="290" maxY="320"/>
+  <symbol name="shoes-m" minX="660" maxX="690" minY="290" maxY="320"/>
+  <symbol name="subway-spb-m" minX="690" maxX="720" minY="290" maxY="320"/>
+  <symbol name="caravan_site-m" minX="720" maxX="750" minY="290" maxY="320"/>
+  <symbol name="npark-m" minX="750" maxX="780" minY="290" maxY="320"/>
+  <symbol name="car_sharing-m" minX="780" maxX="810" minY="290" maxY="320"/>
+  <symbol name="windmill-m" minX="810" maxX="840" minY="290" maxY="320"/>
+  <symbol name="nparkf-m" minX="840" maxX="870" minY="290" maxY="320"/>
+  <symbol name="america-football-m" minX="870" maxX="900" minY="290" maxY="320"/>
+  <symbol name="car-repair-m" minX="900" maxX="930" minY="290" maxY="320"/>
+  <symbol name="office-m" minX="930" maxX="960" minY="290" maxY="320"/>
+  <symbol name="archery-m" minX="960" maxX="990" minY="290" maxY="320"/>
+  <symbol name="campsite-m" minX="990" maxX="1020" minY="290" maxY="320"/>
+  <symbol name="optician-m" minX="0" maxX="30" minY="320" maxY="350"/>
+  <symbol name="zoo-m" minX="30" maxX="60" minY="320" maxY="350"/>
+  <symbol name="park-m" minX="60" maxX="90" minY="320" maxY="350"/>
+  <symbol name="ship-m" minX="90" maxX="120" minY="320" maxY="350"/>
+  <symbol name="skiing-m" minX="120" maxX="150" minY="320" maxY="350"/>
+  <symbol name="cafe-m" minX="150" maxX="180" minY="320" maxY="350"/>
+  <symbol name="cable-car-m" minX="180" maxX="210" minY="320" maxY="350"/>
+  <symbol name="parking-meter-m" minX="210" maxX="240" minY="320" maxY="350"/>
+  <symbol name="subway-newyork-m" minX="240" maxX="270" minY="320" maxY="350"/>
+  <symbol name="butcher-m" minX="270" maxX="300" minY="320" maxY="350"/>
+  <symbol name="peak-m" minX="300" maxX="330" minY="320" maxY="350"/>
+  <symbol name="bus-m" minX="330" maxX="360" minY="320" maxY="350"/>
+  <symbol name="school-m" minX="360" maxX="390" minY="320" maxY="350"/>
+  <symbol name="atm-m" minX="390" maxX="420" minY="320" maxY="350"/>
+  <symbol name="subway-m" minX="420" maxX="450" minY="320" maxY="350"/>
+  <symbol name="bowls-m" minX="450" maxX="480" minY="320" maxY="350"/>
+  <symbol name="pharmacy-m" minX="480" maxX="510" minY="320" maxY="350"/>
+  <symbol name="australian-football-m" minX="510" maxX="540" minY="320" maxY="350"/>
+  <symbol name="boundary_stone-m" minX="540" maxX="570" minY="320" maxY="350"/>
+  <symbol name="phone-m" minX="570" maxX="600" minY="320" maxY="350"/>
+  <symbol name="soccer-m" minX="600" maxX="630" minY="320" maxY="350"/>
+  <symbol name="book-shop-m" minX="630" maxX="660" minY="320" maxY="350"/>
+  <symbol name="picnic-m" minX="660" maxX="690" minY="320" maxY="350"/>
+  <symbol name="subway-entrance-m" minX="690" maxX="720" minY="320" maxY="350"/>
+  <symbol name="bicycle-m" minX="720" maxX="750" minY="320" maxY="350"/>
+  <symbol name="pitch-m" minX="750" maxX="780" minY="320" maxY="350"/>
+  <symbol name="beer-m" minX="780" maxX="810" minY="320" maxY="350"/>
+  <symbol name="beauty-m" minX="810" maxX="840" minY="320" maxY="350"/>
+  <symbol name="place-of-worship-m" minX="840" maxX="870" minY="320" maxY="350"/>
+  <symbol name="subway-entrance-2-m" minX="870" maxX="900" minY="320" maxY="350"/>
+  <symbol name="beach-m" minX="900" maxX="930" minY="320" maxY="350"/>
+  <symbol name="police-m" minX="930" maxX="960" minY="320" maxY="350"/>
+  <symbol name="restaurant-m" minX="960" maxX="990" minY="320" maxY="350"/>
+  <symbol name="bcontrol-m" minX="990" maxX="1020" minY="320" maxY="350"/>
+  <symbol name="postbox-m" minX="0" maxX="30" minY="350" maxY="380"/>
+  <symbol name="bbq-m" minX="30" maxX="60" minY="350" maxY="380"/>
+  <symbol name="basketball-m" minX="60" maxX="90" minY="350" maxY="380"/>
+  <symbol name="baseball-m" minX="90" maxX="120" minY="350" maxY="380"/>
+  <symbol name="pub-m" minX="120" maxX="150" minY="350" maxY="380"/>
+  <symbol name="bakery-m" minX="150" maxX="180" minY="350" maxY="380"/>
+  <symbol name="sports-m" minX="180" maxX="210" minY="350" maxY="380"/>
+  <symbol name="bar-m" minX="210" maxX="240" minY="350" maxY="380"/>
+  <symbol name="recycling-m" minX="240" maxX="270" minY="350" maxY="380"/>
+  <symbol name="banknote-m" minX="270" maxX="300" minY="350" maxY="380"/>
+  <symbol name="bank-2-m" minX="300" maxX="330" minY="350" maxY="380"/>
+  <symbol name="remains-m" minX="330" maxX="360" minY="350" maxY="380"/>
+  <symbol name="speedcam-l" minX="360" maxX="388" minY="350" maxY="378"/>
+  <symbol name="subway-berlin-l" minX="388" maxX="416" minY="350" maxY="378"/>
+  <symbol name="lightrail-berlin-m" minX="416" maxX="444" minY="350" maxY="378"/>
+  <symbol name="subway-rome-l" minX="444" maxX="472" minY="350" maxY="378"/>
+  <symbol name="parking-l" minX="472" maxX="500" minY="350" maxY="378"/>
+  <symbol name="subway-moscow-l" minX="500" maxX="531" minY="350" maxY="378"/>
+  <symbol name="route_from" minX="531" maxX="558" minY="350" maxY="377"/>
+  <symbol name="subway-moscow-m" minX="558" maxX="587" minY="350" maxY="375"/>
+  <symbol name="subway-london-l" minX="587" maxX="618" minY="350" maxY="375"/>
+  <symbol name="subway-paris-m" minX="618" maxX="643" minY="350" maxY="375"/>
+  <symbol name="current-position" minX="643" maxX="668" minY="350" maxY="375"/>
+  <symbol name="subway-rome-m" minX="668" maxX="693" minY="350" maxY="375"/>
+  <symbol name="no-icon" minX="693" maxX="718" minY="350" maxY="375"/>
+  <symbol name="no-icon-shop" minX="718" maxX="743" minY="350" maxY="375"/>
+  <symbol name="no-icon-leisure" minX="743" maxX="768" minY="350" maxY="375"/>
+  <symbol name="no-icon-amenity" minX="768" maxX="793" minY="350" maxY="375"/>
+  <symbol name="no-icon-tourism" minX="793" maxX="818" minY="350" maxY="375"/>
+  <symbol name="subway-berlin-m" minX="818" maxX="843" minY="350" maxY="375"/>
+  <symbol name="airport-s" minX="843" maxX="867" minY="350" maxY="374"/>
+  <symbol name="shop-s copy" minX="867" maxX="890" minY="350" maxY="373"/>
+  <symbol name="shop-s" minX="890" maxX="913" minY="350" maxY="373"/>
+  <symbol name="ship-s" minX="913" maxX="936" minY="350" maxY="373"/>
+  <symbol name="school-s" minX="936" maxX="959" minY="350" maxY="373"/>
+  <symbol name="skiing-s" minX="959" maxX="982" minY="350" maxY="373"/>
+  <symbol name="alcohol-s" minX="982" maxX="1005" minY="350" maxY="373"/>
+  <symbol name="restaurant-s" minX="0" maxX="23" minY="380" maxY="403"/>
+  <symbol name="soccer-s" minX="23" maxX="46" minY="380" maxY="403"/>
+  <symbol name="remains-s" minX="46" maxX="69" minY="380" maxY="403"/>
+  <symbol name="speedcam-m" minX="69" maxX="92" minY="380" maxY="403"/>
+  <symbol name="america-football-s" minX="92" maxX="115" minY="380" maxY="403"/>
+  <symbol name="recycling-s" minX="115" maxX="138" minY="380" maxY="403"/>
+  <symbol name="atm-s copy 2" minX="138" maxX="161" minY="380" maxY="403"/>
+  <symbol name="atm-s" minX="161" maxX="184" minY="380" maxY="403"/>
+  <symbol name="bar-s" minX="184" maxX="207" minY="380" maxY="403"/>
+  <symbol name="baseball-s" minX="207" maxX="230" minY="380" maxY="403"/>
+  <symbol name="basketball-s" minX="230" maxX="253" minY="380" maxY="403"/>
+  <symbol name="bcontrol-s" minX="253" maxX="276" minY="380" maxY="403"/>
+  <symbol name="subway-barcelona-s" minX="276" maxX="304" minY="380" maxY="403"/>
+  <symbol name="pub-s" minX="304" maxX="327" minY="380" maxY="403"/>
+  <symbol name="police-s" minX="327" maxX="350" minY="380" maxY="403"/>
+  <symbol name="beer-s" minX="350" maxX="373" minY="380" maxY="403"/>
+  <symbol name="place-of-worship-s" minX="373" maxX="396" minY="380" maxY="403"/>
+  <symbol name="subway-entrance-2-s" minX="396" maxX="419" minY="380" maxY="403"/>
+  <symbol name="subway-entrance-arrow" minX="419" maxX="442" minY="380" maxY="403"/>
+  <symbol name="pitch-s" minX="442" maxX="465" minY="380" maxY="403"/>
+  <symbol name="picnic-s" minX="465" maxX="488" minY="380" maxY="403"/>
+  <symbol name="subway-entrance-s" minX="488" maxX="511" minY="380" maxY="403"/>
+  <symbol name="bicycle-s" minX="511" maxX="534" minY="380" maxY="403"/>
+  <symbol name="book-shop-s" minX="534" maxX="557" minY="380" maxY="403"/>
+  <symbol name="bus-s" minX="557" maxX="580" minY="380" maxY="403"/>
+  <symbol name="phone-s" minX="580" maxX="603" minY="380" maxY="403"/>
+  <symbol name="pharmacy-s" minX="603" maxX="626" minY="380" maxY="403"/>
+  <symbol name="subway-london-m" minX="626" maxX="656" minY="380" maxY="403"/>
+  <symbol name="cable-car-s" minX="656" maxX="679" minY="380" maxY="403"/>
+  <symbol name="zoo-s" minX="679" maxX="702" minY="380" maxY="403"/>
+  <symbol name="cafe-s" minX="702" maxX="725" minY="380" maxY="403"/>
+  <symbol name="campsite-s" minX="725" maxX="748" minY="380" maxY="403"/>
+  <symbol name="windmill-s" minX="748" maxX="771" minY="380" maxY="403"/>
+  <symbol name="car-repair-s" minX="771" maxX="794" minY="380" maxY="403"/>
+  <symbol name="casino-s" minX="794" maxX="817" minY="380" maxY="403"/>
+  <symbol name="cave-s" minX="817" maxX="840" minY="380" maxY="403"/>
+  <symbol name="cemetery-s" minX="840" maxX="863" minY="380" maxY="403"/>
+  <symbol name="cinema-s" minX="863" maxX="886" minY="380" maxY="403"/>
+  <symbol name="college-s" minX="886" maxX="909" minY="380" maxY="403"/>
+  <symbol name="peak-s" minX="909" maxX="932" minY="380" maxY="403"/>
+  <symbol name="waterfall-s" minX="932" maxX="955" minY="380" maxY="403"/>
+  <symbol name="subway-newyork-s" minX="955" maxX="978" minY="380" maxY="403"/>
+  <symbol name="dentist-s" minX="978" maxX="1001" minY="380" maxY="403"/>
+  <symbol name="volcano-s" minX="1001" maxX="1024" minY="380" maxY="403"/>
+  <symbol name="park-s" minX="0" maxX="23" minY="403" maxY="426"/>
+  <symbol name="drinking-water-s" minX="23" maxX="46" minY="403" maxY="426"/>
+  <symbol name="office-s" minX="46" maxX="69" minY="403" maxY="426"/>
+  <symbol name="nparkf-s" minX="69" maxX="92" minY="403" maxY="426"/>
+  <symbol name="embassy-s" minX="92" maxX="115" minY="403" maxY="426"/>
+  <symbol name="subway-s" minX="115" maxX="138" minY="403" maxY="426"/>
+  <symbol name="npark-s" minX="138" maxX="161" minY="403" maxY="426"/>
+  <symbol name="tram-s" minX="161" maxX="184" minY="403" maxY="426"/>
+  <symbol name="subway-spb-s" minX="184" maxX="207" minY="403" maxY="426"/>
+  <symbol name="train-s" minX="207" maxX="230" minY="403" maxY="426"/>
+  <symbol name="fastfood-s" minX="230" maxX="253" minY="403" maxY="426"/>
+  <symbol name="fire_station-s" minX="253" maxX="276" minY="403" maxY="426"/>
+  <symbol name="fountain-s" minX="276" maxX="299" minY="403" maxY="426"/>
+  <symbol name="fuel-s" minX="299" maxX="322" minY="403" maxY="426"/>
+  <symbol name="museum-s" minX="322" maxX="345" minY="403" maxY="426"/>
+  <symbol name="monument-s" minX="345" maxX="368" minY="403" maxY="426"/>
+  <symbol name="military-s" minX="368" maxX="391" minY="403" maxY="426"/>
+  <symbol name="townhall-s" minX="391" maxX="414" minY="403" maxY="426"/>
+  <symbol name="swimming-s" minX="414" maxX="437" minY="403" maxY="426"/>
+  <symbol name="funicular-s" minX="437" maxX="460" minY="403" maxY="426"/>
+  <symbol name="mail-s" minX="460" maxX="483" minY="403" maxY="426"/>
+  <symbol name="gallery-s" minX="483" maxX="506" minY="403" maxY="426"/>
+  <symbol name="lighthouse-s" minX="506" maxX="529" minY="403" maxY="426"/>
+  <symbol name="tennis-s" minX="529" maxX="552" minY="403" maxY="426"/>
+  <symbol name="library-s" minX="552" maxX="575" minY="403" maxY="426"/>
+  <symbol name="kindergarten-s" minX="575" maxX="598" minY="403" maxY="426"/>
+  <symbol name="theatre-s" minX="598" maxX="621" minY="403" maxY="426"/>
+  <symbol name="information-s" minX="621" maxX="644" minY="403" maxY="426"/>
+  <symbol name="hotel-s" minX="644" maxX="667" minY="403" maxY="426"/>
+  <symbol name="toilets-s" minX="667" maxX="690" minY="403" maxY="426"/>
+  <symbol name="hospital-s" minX="690" maxX="713" minY="403" maxY="426"/>
+  <symbol name="heliport-s" minX="713" maxX="736" minY="403" maxY="426"/>
+  <symbol name="helipad-s" minX="736" maxX="759" minY="403" maxY="426"/>
+  <symbol name="grocery-s" minX="759" maxX="782" minY="403" maxY="426"/>
+  <symbol name="golf-s" minX="782" maxX="805" minY="403" maxY="426"/>
+  <symbol name="garden-s" minX="805" maxX="828" minY="403" maxY="426"/>
+  <symbol name="tourism-s" minX="828" maxX="851" minY="403" maxY="426"/>
+  <symbol name="metro-barcelona-m" minX="851" maxX="882" minY="403" maxY="425"/>
+  <symbol name="parking-m" minX="882" maxX="904" minY="403" maxY="425"/>
+  <symbol name="subway-madrid-m" minX="904" maxX="935" minY="403" maxY="425"/>
+  <symbol name="s-arrow" minX="935" maxX="956" minY="403" maxY="425"/>
+  <symbol name="subway-barcelona-l" minX="956" maxX="987" minY="403" maxY="425"/>
+  <symbol name="subway-barcelona-m" minX="987" maxX="1018" minY="403" maxY="425"/>
+  <symbol name="subway-madrid-l" minX="0" maxX="31" minY="426" maxY="448"/>
+  <symbol name="subway-kiev-m" minX="31" maxX="61" minY="426" maxY="447"/>
+  <symbol name="subway-paris-s" minX="61" maxX="82" minY="426" maxY="447"/>
+  <symbol name="subway-kiev-l" minX="82" maxX="112" minY="426" maxY="447"/>
+  <symbol name="metro-barcelona-s" minX="112" maxX="140" minY="426" maxY="447"/>
+  <symbol name="subway-madrid-s" minX="140" maxX="168" minY="426" maxY="447"/>
+  <symbol name="lightrail-berlin-s" minX="168" maxX="189" minY="426" maxY="447"/>
+  <symbol name="subway-moscow-s" minX="189" maxX="209" minY="426" maxY="446"/>
+  <symbol name="api-result" minX="209" maxX="229" minY="426" maxY="446"/>
+  <symbol name="subway-rome-s" minX="229" maxX="248" minY="426" maxY="445"/>
+  <symbol name="star-l" minX="248" maxX="267" minY="426" maxY="445"/>
+  <symbol name="search-result" minX="267" maxX="286" minY="426" maxY="445"/>
+  <symbol name="speedcam-s" minX="286" maxX="305" minY="426" maxY="445"/>
+  <symbol name="subway-london-s" minX="305" maxX="328" minY="426" maxY="445"/>
+  <symbol name="subway-berlin-s" minX="328" maxX="347" minY="426" maxY="445"/>
+  <symbol name="parking-s" minX="347" maxX="366" minY="426" maxY="445"/>
+  <symbol name="bench" minX="366" maxX="387" minY="426" maxY="445"/>
+  <symbol name="peakt-l" minX="387" maxX="406" minY="426" maxY="444"/>
+  <symbol name="survey_point-l" minX="406" maxX="424" minY="426" maxY="444"/>
+  <symbol name="star-m" minX="424" maxX="442" minY="426" maxY="444"/>
+  <symbol name="subway-minsk-l" minX="442" maxX="472" minY="426" maxY="444"/>
+  <symbol name="subway-kiev-s" minX="472" maxX="497" minY="426" maxY="442"/>
+  <symbol name="subway-minsk-m" minX="497" maxX="522" minY="426" maxY="441"/>
+  <symbol name="subway-xs" minX="522" maxX="537" minY="426" maxY="441"/>
+  <symbol name="subway-newyork-xs" minX="537" maxX="552" minY="426" maxY="441"/>
+  <symbol name="star-s" minX="552" maxX="567" minY="426" maxY="441"/>
+  <symbol name="survey_point-m" minX="567" maxX="582" minY="426" maxY="441"/>
+  <symbol name="railway-crossing" minX="582" maxX="605" minY="426" maxY="441"/>
+  <symbol name="subway-minsk-s" minX="605" maxX="628" minY="426" maxY="440"/>
+  <symbol name="subway-xs copy" minX="628" maxX="642" minY="426" maxY="440"/>
+  <symbol name="arrow-m" minX="642" maxX="670" minY="426" maxY="439"/>
+  <symbol name="survey_point-s" minX="670" maxX="683" minY="426" maxY="439"/>
+  <symbol name="peakt-m" minX="683" maxX="697" minY="426" maxY="439"/>
+  <symbol name="entrance-s" minX="697" maxX="709" minY="426" maxY="438"/>
+  <symbol name="peakt-s" minX="709" maxX="721" minY="426" maxY="437"/>
+  <symbol name="dot-m" minX="721" maxX="732" minY="426" maxY="437"/>
+  <symbol name="arrow-s" minX="732" maxX="753" minY="426" maxY="436"/>
+  <symbol name="tree-l" minX="753" maxX="763" minY="426" maxY="436"/>
+  <symbol name="none" minX="763" maxX="773" minY="426" maxY="436"/>
+  <symbol name="dot-s" minX="773" maxX="782" minY="426" maxY="435"/>
+  <symbol name="tree-m" minX="782" maxX="791" minY="426" maxY="435"/>
+  <symbol name="dot-s-light" minX="791" maxX="800" minY="426" maxY="435"/>
+  <symbol name="entrance-xs" minX="800" maxX="809" minY="426" maxY="435"/>
+  <symbol name="zero-icon" minX="809" maxX="816" minY="426" maxY="433"/>
+  <symbol name="tree-s" minX="816" maxX="823" minY="426" maxY="433"/>
  </file>
 </root>
diff --git a/data/resources-ldpi_clear/symbols.png b/data/resources-ldpi_clear/symbols.png
index a2b6b58aa6..6200ccde5b 100644
Binary files a/data/resources-ldpi_clear/symbols.png and b/data/resources-ldpi_clear/symbols.png differ
diff --git a/data/resources-ldpi_clear/symbols.sdf b/data/resources-ldpi_clear/symbols.sdf
index 63f2460210..804743c32f 100644
--- a/data/resources-ldpi_clear/symbols.sdf
+++ b/data/resources-ldpi_clear/symbols.sdf
@@ -1,463 +1,466 @@
 <!DOCTYPE skin>
 <root>
- <file width="512" height="512">
+ <file height="512" width="512">
   <symbol minX="0" maxX="104" minY="0" maxY="52" name="route-arrow"/>
   <symbol minX="104" maxX="152" minY="0" maxY="48" name="route_to"/>
   <symbol minX="152" maxX="192" minY="0" maxY="40" name="compass-image"/>
-  <symbol minX="192" maxX="214" minY="0" maxY="27" name="current-position-compas"/>
-  <symbol minX="214" maxX="236" minY="0" maxY="27" name="current-routing-compas"/>
+  <symbol minX="192" maxX="214" minY="0" maxY="27" name="current-routing-compas"/>
+  <symbol minX="214" maxX="236" minY="0" maxY="27" name="current-position-compas"/>
   <symbol minX="236" maxX="260" minY="0" maxY="24" name="search-result-active"/>
   <symbol minX="260" maxX="282" minY="0" maxY="22" name="alpine_hut-l"/>
-  <symbol minX="282" maxX="304" minY="0" maxY="22" name="shop-bicycle-l"/>
+  <symbol minX="282" maxX="304" minY="0" maxY="22" name="airport-l"/>
   <symbol minX="304" maxX="326" minY="0" maxY="22" name="america-football-l"/>
-  <symbol minX="326" maxX="348" minY="0" maxY="22" name="shoes-l"/>
-  <symbol minX="348" maxX="370" minY="0" maxY="22" name="ship-l"/>
-  <symbol minX="370" maxX="392" minY="0" maxY="22" name="archery-l"/>
-  <symbol minX="392" maxX="414" minY="0" maxY="22" name="skiing-l"/>
-  <symbol minX="414" maxX="436" minY="0" maxY="22" name="alcohol-l"/>
-  <symbol minX="436" maxX="448" minY="0" maxY="22" name="placemark-yellow"/>
-  <symbol minX="448" maxX="470" minY="0" maxY="22" name="atm-l"/>
-  <symbol minX="470" maxX="492" minY="0" maxY="22" name="school-l"/>
-  <symbol minX="492" maxX="504" minY="0" maxY="22" name="placemark-red"/>
-  <symbol minX="0" maxX="22" minY="52" maxY="74" name="australian-football-l"/>
-  <symbol minX="22" maxX="44" minY="52" maxY="74" name="soccer-l"/>
-  <symbol minX="44" maxX="66" minY="52" maxY="74" name="bakery-l"/>
-  <symbol minX="66" maxX="88" minY="52" maxY="74" name="restaurant-l"/>
-  <symbol minX="88" maxX="110" minY="52" maxY="74" name="bank-l"/>
-  <symbol minX="110" maxX="131" minY="52" maxY="74" name="bank-m"/>
-  <symbol minX="131" maxX="153" minY="52" maxY="74" name="banknote-l"/>
-  <symbol minX="153" maxX="174" minY="52" maxY="74" name="remains-m"/>
-  <symbol minX="174" maxX="196" minY="52" maxY="74" name="bar-l"/>
-  <symbol minX="196" maxX="218" minY="52" maxY="74" name="remains-l"/>
-  <symbol minX="218" maxX="230" minY="52" maxY="74" name="placemark-purple"/>
-  <symbol minX="230" maxX="252" minY="52" maxY="74" name="baseball-l"/>
-  <symbol minX="252" maxX="274" minY="52" maxY="74" name="recycling-l"/>
-  <symbol minX="274" maxX="286" minY="52" maxY="74" name="placemark-pink"/>
-  <symbol minX="286" maxX="308" minY="52" maxY="74" name="basketball-l"/>
-  <symbol minX="308" maxX="330" minY="52" maxY="74" name="sports-l"/>
-  <symbol minX="330" maxX="342" minY="52" maxY="74" name="placemark-orange"/>
-  <symbol minX="342" maxX="364" minY="52" maxY="74" name="bbq-l"/>
-  <symbol minX="364" maxX="386" minY="52" maxY="74" name="pub-l"/>
-  <symbol minX="386" maxX="408" minY="52" maxY="74" name="bcontrol-l"/>
-  <symbol minX="408" maxX="429" minY="52" maxY="74" name="bcontrol-m"/>
-  <symbol minX="429" maxX="451" minY="52" maxY="74" name="power-m"/>
-  <symbol minX="451" maxX="473" minY="52" maxY="74" name="beach-l"/>
-  <symbol minX="473" maxX="495" minY="52" maxY="74" name="power-l"/>
-  <symbol minX="0" maxX="22" minY="74" maxY="96" name="beauty-l"/>
-  <symbol minX="22" maxX="44" minY="74" maxY="96" name="postbox-l"/>
-  <symbol minX="44" maxX="66" minY="74" maxY="96" name="beer-l"/>
-  <symbol minX="66" maxX="87" minY="74" maxY="96" name="beer-m"/>
-  <symbol minX="87" maxX="109" minY="74" maxY="96" name="police-l"/>
-  <symbol minX="109" maxX="121" minY="74" maxY="96" name="placemark-green"/>
-  <symbol minX="121" maxX="143" minY="74" maxY="96" name="bicycle-l"/>
-  <symbol minX="143" maxX="165" minY="74" maxY="96" name="place-of-worship-l"/>
-  <symbol minX="165" maxX="177" minY="74" maxY="96" name="placemark-brown"/>
-  <symbol minX="177" maxX="199" minY="74" maxY="96" name="book-shop-l"/>
-  <symbol minX="199" maxX="221" minY="74" maxY="96" name="pitch-l"/>
-  <symbol minX="221" maxX="233" minY="74" maxY="96" name="placemark-blue"/>
-  <symbol minX="233" maxX="255" minY="74" maxY="96" name="boundary_stone-l"/>
-  <symbol minX="255" maxX="276" minY="74" maxY="96" name="picnic-m"/>
-  <symbol minX="276" maxX="298" minY="74" maxY="96" name="bowls-l"/>
-  <symbol minX="298" maxX="320" minY="74" maxY="96" name="picnic-l"/>
-  <symbol minX="320" maxX="342" minY="74" maxY="96" name="bus-l"/>
-  <symbol minX="342" maxX="364" minY="74" maxY="96" name="subway-entrance-l"/>
-  <symbol minX="364" maxX="386" minY="74" maxY="96" name="phone-l"/>
-  <symbol minX="386" maxX="408" minY="74" maxY="96" name="butcher-l"/>
-  <symbol minX="408" maxX="430" minY="74" maxY="96" name="pharmacy-l"/>
-  <symbol minX="430" maxX="452" minY="74" maxY="96" name="cable-car-l"/>
-  <symbol minX="452" maxX="474" minY="74" maxY="96" name="subway-l"/>
-  <symbol minX="474" maxX="496" minY="74" maxY="96" name="airport-m"/>
+  <symbol minX="326" maxX="348" minY="0" maxY="22" name="airport-m"/>
+  <symbol minX="348" maxX="360" minY="0" maxY="22" name="placemark-yellow"/>
+  <symbol minX="360" maxX="382" minY="0" maxY="22" name="archery-l"/>
+  <symbol minX="382" maxX="394" minY="0" maxY="22" name="placemark-red"/>
+  <symbol minX="394" maxX="406" minY="0" maxY="22" name="placemark-purple"/>
+  <symbol minX="406" maxX="418" minY="0" maxY="22" name="placemark-pink"/>
+  <symbol minX="418" maxX="440" minY="0" maxY="22" name="atm-l"/>
+  <symbol minX="440" maxX="452" minY="0" maxY="22" name="placemark-orange"/>
+  <symbol minX="452" maxX="464" minY="0" maxY="22" name="placemark-green"/>
+  <symbol minX="464" maxX="486" minY="0" maxY="22" name="australian-football-l"/>
+  <symbol minX="486" maxX="498" minY="0" maxY="22" name="placemark-brown"/>
+  <symbol minX="0" maxX="22" minY="52" maxY="74" name="bakery-l"/>
+  <symbol minX="22" maxX="34" minY="52" maxY="74" name="placemark-blue"/>
+  <symbol minX="34" maxX="56" minY="52" maxY="74" name="bank-l"/>
+  <symbol minX="56" maxX="77" minY="52" maxY="74" name="bank-m"/>
+  <symbol minX="77" maxX="99" minY="52" maxY="74" name="banknote-l"/>
+  <symbol minX="99" maxX="121" minY="52" maxY="74" name="alcohol-l"/>
+  <symbol minX="121" maxX="143" minY="52" maxY="74" name="bar-l"/>
+  <symbol minX="143" maxX="165" minY="52" maxY="74" name="zoo-l"/>
+  <symbol minX="165" maxX="187" minY="52" maxY="74" name="windmill-l"/>
+  <symbol minX="187" maxX="209" minY="52" maxY="74" name="baseball-l"/>
+  <symbol minX="209" maxX="231" minY="52" maxY="74" name="wayside_shrine-l"/>
+  <symbol minX="231" maxX="253" minY="52" maxY="74" name="wayside_cross-l"/>
+  <symbol minX="253" maxX="275" minY="52" maxY="74" name="basketball-l"/>
+  <symbol minX="275" maxX="296" minY="52" maxY="74" name="waterfall-m"/>
+  <symbol minX="296" maxX="318" minY="52" maxY="74" name="waterfall-l"/>
+  <symbol minX="318" maxX="340" minY="52" maxY="74" name="bbq-l"/>
+  <symbol minX="340" maxX="362" minY="52" maxY="74" name="volcano-l"/>
+  <symbol minX="362" maxX="384" minY="52" maxY="74" name="bcontrol-l"/>
+  <symbol minX="384" maxX="405" minY="52" maxY="74" name="bcontrol-m"/>
+  <symbol minX="405" maxX="427" minY="52" maxY="74" name="vending-l"/>
+  <symbol minX="427" maxX="449" minY="52" maxY="74" name="beach-l"/>
+  <symbol minX="449" maxX="471" minY="52" maxY="74" name="tram-l"/>
+  <symbol minX="471" maxX="493" minY="52" maxY="74" name="beauty-l"/>
+  <symbol minX="0" maxX="22" minY="74" maxY="96" name="train-l"/>
+  <symbol minX="22" maxX="44" minY="74" maxY="96" name="beer-l"/>
+  <symbol minX="44" maxX="65" minY="74" maxY="96" name="beer-m"/>
+  <symbol minX="65" maxX="87" minY="74" maxY="96" name="toys-l"/>
+  <symbol minX="87" maxX="109" minY="74" maxY="96" name="townhall-l"/>
+  <symbol minX="109" maxX="131" minY="74" maxY="96" name="bicycle-l"/>
+  <symbol minX="131" maxX="153" minY="74" maxY="96" name="tourism-l"/>
+  <symbol minX="153" maxX="175" minY="74" maxY="96" name="tomb-l"/>
+  <symbol minX="175" maxX="197" minY="74" maxY="96" name="book-shop-l"/>
+  <symbol minX="197" maxX="219" minY="74" maxY="96" name="toll_booth-l"/>
+  <symbol minX="219" maxX="241" minY="74" maxY="96" name="toilets-l"/>
+  <symbol minX="241" maxX="263" minY="74" maxY="96" name="boundary_stone-l"/>
+  <symbol minX="263" maxX="285" minY="74" maxY="96" name="theatre-l"/>
+  <symbol minX="285" maxX="307" minY="74" maxY="96" name="bowls-l"/>
+  <symbol minX="307" maxX="329" minY="74" maxY="96" name="tennis-l"/>
+  <symbol minX="329" maxX="351" minY="74" maxY="96" name="bus-l"/>
+  <symbol minX="351" maxX="373" minY="74" maxY="96" name="taxi-l"/>
+  <symbol minX="373" maxX="395" minY="74" maxY="96" name="swimming-l"/>
+  <symbol minX="395" maxX="417" minY="74" maxY="96" name="butcher-l"/>
+  <symbol minX="417" maxX="439" minY="74" maxY="96" name="sweets-l"/>
+  <symbol minX="439" maxX="461" minY="74" maxY="96" name="cable-car-l"/>
+  <symbol minX="461" maxX="483" minY="74" maxY="96" name="subway-spb-l"/>
+  <symbol minX="483" maxX="505" minY="74" maxY="96" name="subway-paris-l"/>
   <symbol minX="0" maxX="22" minY="96" maxY="118" name="cafe-l"/>
   <symbol minX="22" maxX="44" minY="96" maxY="118" name="subway-newyork-l"/>
-  <symbol minX="44" maxX="66" minY="96" maxY="118" name="airport-l"/>
+  <symbol minX="44" maxX="66" minY="96" maxY="118" name="subway-l"/>
   <symbol minX="66" maxX="88" minY="96" maxY="118" name="campsite-l"/>
-  <symbol minX="88" maxX="110" minY="96" maxY="118" name="parking-meter-l"/>
-  <symbol minX="110" maxX="132" minY="96" maxY="118" name="subway-paris-l"/>
+  <symbol minX="88" maxX="110" minY="96" maxY="118" name="subway-entrance-l"/>
+  <symbol minX="110" maxX="132" minY="96" maxY="118" name="sports-l"/>
   <symbol minX="132" maxX="154" minY="96" maxY="118" name="car-repair-l"/>
   <symbol minX="154" maxX="175" minY="96" maxY="118" name="car-repair-m"/>
-  <symbol minX="175" maxX="197" minY="96" maxY="118" name="zoo-l"/>
+  <symbol minX="175" maxX="197" minY="96" maxY="118" name="soccer-l"/>
   <symbol minX="197" maxX="219" minY="96" maxY="118" name="car_sharing-l"/>
-  <symbol minX="219" maxX="241" minY="96" maxY="118" name="park-l"/>
+  <symbol minX="219" maxX="241" minY="96" maxY="118" name="skiing-l"/>
   <symbol minX="241" maxX="263" minY="96" maxY="118" name="caravan_site-l"/>
-  <symbol minX="263" maxX="285" minY="96" maxY="118" name="optician-l"/>
+  <symbol minX="263" maxX="285" minY="96" maxY="118" name="shop-l"/>
   <symbol minX="285" maxX="307" minY="96" maxY="118" name="casino-l"/>
-  <symbol minX="307" maxX="328" minY="96" maxY="118" name="office-m"/>
-  <symbol minX="328" maxX="350" minY="96" maxY="118" name="office-l"/>
-  <symbol minX="350" maxX="372" minY="96" maxY="118" name="cave-l"/>
-  <symbol minX="372" maxX="394" minY="96" maxY="118" name="nparkf-l"/>
-  <symbol minX="394" maxX="416" minY="96" maxY="118" name="windmill-l"/>
-  <symbol minX="416" maxX="438" minY="96" maxY="118" name="cemetery-l"/>
-  <symbol minX="438" maxX="460" minY="96" maxY="118" name="npark-l"/>
-  <symbol minX="460" maxX="482" minY="96" maxY="118" name="subway-spb-l"/>
+  <symbol minX="307" maxX="329" minY="96" maxY="118" name="shop-bicycle-l"/>
+  <symbol minX="329" maxX="351" minY="96" maxY="118" name="shoes-l"/>
+  <symbol minX="351" maxX="373" minY="96" maxY="118" name="cave-l"/>
+  <symbol minX="373" maxX="395" minY="96" maxY="118" name="ship-l"/>
+  <symbol minX="395" maxX="417" minY="96" maxY="118" name="school-l"/>
+  <symbol minX="417" maxX="439" minY="96" maxY="118" name="cemetery-l"/>
+  <symbol minX="439" maxX="461" minY="96" maxY="118" name="restaurant-l"/>
+  <symbol minX="461" maxX="482" minY="96" maxY="118" name="remains-m"/>
   <symbol minX="482" maxX="504" minY="96" maxY="118" name="chemist-l"/>
-  <symbol minX="0" maxX="22" minY="118" maxY="140" name="museum-l"/>
+  <symbol minX="0" maxX="22" minY="118" maxY="140" name="remains-l"/>
   <symbol minX="22" maxX="44" minY="118" maxY="140" name="cinema-l"/>
-  <symbol minX="44" maxX="66" minY="118" maxY="140" name="motel-l"/>
-  <symbol minX="66" maxX="88" minY="118" maxY="140" name="wayside_shrine-l"/>
+  <symbol minX="44" maxX="66" minY="118" maxY="140" name="recycling-l"/>
+  <symbol minX="66" maxX="88" minY="118" maxY="140" name="pub-l"/>
   <symbol minX="88" maxX="110" minY="118" maxY="140" name="clothes-l"/>
-  <symbol minX="110" maxX="132" minY="118" maxY="140" name="sweets-l"/>
+  <symbol minX="110" maxX="132" minY="118" maxY="140" name="power-m"/>
   <symbol minX="132" maxX="154" minY="118" maxY="140" name="college-l"/>
-  <symbol minX="154" maxX="176" minY="118" maxY="140" name="monument-l"/>
-  <symbol minX="176" maxX="198" minY="118" maxY="140" name="mobile_phone-l"/>
+  <symbol minX="154" maxX="176" minY="118" maxY="140" name="power-l"/>
+  <symbol minX="176" maxX="198" minY="118" maxY="140" name="postbox-l"/>
   <symbol minX="198" maxX="220" minY="118" maxY="140" name="computer-l"/>
-  <symbol minX="220" maxX="242" minY="118" maxY="140" name="military-l"/>
+  <symbol minX="220" maxX="242" minY="118" maxY="140" name="police-l"/>
   <symbol minX="242" maxX="264" minY="118" maxY="140" name="convenience-l"/>
-  <symbol minX="264" maxX="286" minY="118" maxY="140" name="swimming-l"/>
+  <symbol minX="264" maxX="286" minY="118" maxY="140" name="place-of-worship-l"/>
   <symbol minX="286" maxX="308" minY="118" maxY="140" name="cricket-l"/>
-  <symbol minX="308" maxX="330" minY="118" maxY="140" name="marketplace-l"/>
-  <symbol minX="330" maxX="352" minY="118" maxY="140" name="wayside_cross-l"/>
-  <symbol minX="352" maxX="374" minY="118" maxY="140" name="taxi-l"/>
-  <symbol minX="374" maxX="395" minY="118" maxY="140" name="waterfall-m"/>
+  <symbol minX="308" maxX="330" minY="118" maxY="140" name="pitch-l"/>
+  <symbol minX="330" maxX="351" minY="118" maxY="140" name="picnic-m"/>
+  <symbol minX="351" maxX="373" minY="118" maxY="140" name="picnic-l"/>
+  <symbol minX="373" maxX="395" minY="118" maxY="140" name="phone-l"/>
   <symbol minX="395" maxX="417" minY="118" maxY="140" name="curling-l"/>
-  <symbol minX="417" maxX="439" minY="118" maxY="140" name="mail-l"/>
-  <symbol minX="439" maxX="461" minY="118" maxY="140" name="department_store-l"/>
-  <symbol minX="461" maxX="483" minY="118" maxY="140" name="lightrail-berlin-l"/>
-  <symbol minX="483" maxX="505" minY="118" maxY="140" name="diving-l"/>
-  <symbol minX="0" maxX="22" minY="140" maxY="162" name="tennis-l"/>
-  <symbol minX="22" maxX="44" minY="140" maxY="162" name="dog_park-l"/>
-  <symbol minX="44" maxX="66" minY="140" maxY="162" name="lighthouse-l"/>
-  <symbol minX="66" maxX="88" minY="140" maxY="162" name="doityourself-l"/>
-  <symbol minX="88" maxX="110" minY="140" maxY="162" name="lift_gate-l"/>
-  <symbol minX="110" maxX="132" minY="140" maxY="162" name="waterfall-l"/>
-  <symbol minX="132" maxX="154" minY="140" maxY="162" name="library-l"/>
-  <symbol minX="154" maxX="176" minY="140" maxY="162" name="volcano-l"/>
-  <symbol minX="176" maxX="198" minY="140" maxY="162" name="drinking-water-l"/>
-  <symbol minX="198" maxX="219" minY="140" maxY="162" name="laundry-m"/>
-  <symbol minX="219" maxX="241" minY="140" maxY="162" name="laundry-l"/>
-  <symbol minX="241" maxX="263" minY="140" maxY="162" name="kiosk-l"/>
-  <symbol minX="263" maxX="285" minY="140" maxY="162" name="electronics-l"/>
-  <symbol minX="285" maxX="307" minY="140" maxY="162" name="theatre-l"/>
-  <symbol minX="307" maxX="329" minY="140" maxY="162" name="embassy-l"/>
-  <symbol minX="329" maxX="351" minY="140" maxY="162" name="kindergarten-m"/>
-  <symbol minX="351" maxX="373" minY="140" maxY="162" name="vending-l"/>
-  <symbol minX="373" maxX="395" minY="140" maxY="162" name="kindergarten-l"/>
-  <symbol minX="395" maxX="417" minY="140" maxY="162" name="tram-l"/>
-  <symbol minX="417" maxX="439" minY="140" maxY="162" name="equestrian-l"/>
-  <symbol minX="439" maxX="461" minY="140" maxY="162" name="equestrian-m"/>
-  <symbol minX="461" maxX="483" minY="140" maxY="162" name="jewelry-l"/>
-  <symbol minX="483" maxX="505" minY="140" maxY="162" name="fastfood-l"/>
-  <symbol minX="0" maxX="22" minY="162" maxY="184" name="information-l"/>
-  <symbol minX="22" maxX="44" minY="162" maxY="184" name="train-l"/>
-  <symbol minX="44" maxX="66" minY="162" maxY="184" name="fire_station-l"/>
-  <symbol minX="66" maxX="87" minY="162" maxY="184" name="hunting-tower-m"/>
-  <symbol minX="87" maxX="109" minY="162" maxY="184" name="hunting-tower-l"/>
-  <symbol minX="109" maxX="131" minY="162" maxY="184" name="florist-l"/>
-  <symbol minX="131" maxX="153" minY="162" maxY="184" name="toilets-l"/>
-  <symbol minX="153" maxX="175" minY="162" maxY="184" name="fountain-l"/>
-  <symbol minX="175" maxX="197" minY="162" maxY="184" name="hotel-l"/>
-  <symbol minX="197" maxX="219" minY="162" maxY="184" name="toys-l"/>
-  <symbol minX="219" maxX="241" minY="162" maxY="184" name="fuel-l"/>
-  <symbol minX="241" maxX="263" minY="162" maxY="184" name="hospital-l"/>
-  <symbol minX="263" maxX="285" minY="162" maxY="184" name="historic-ship-l"/>
-  <symbol minX="285" maxX="307" minY="162" maxY="184" name="funicular-l"/>
-  <symbol minX="307" maxX="328" minY="162" maxY="184" name="heliport-m"/>
-  <symbol minX="328" maxX="350" minY="162" maxY="184" name="townhall-l"/>
-  <symbol minX="350" maxX="372" minY="162" maxY="184" name="furniture-l"/>
-  <symbol minX="372" maxX="394" minY="162" maxY="184" name="heliport-l"/>
-  <symbol minX="394" maxX="416" minY="162" maxY="184" name="gallery-l"/>
-  <symbol minX="416" maxX="438" minY="162" maxY="184" name="toll_booth-l"/>
-  <symbol minX="438" maxX="460" minY="162" maxY="184" name="helipad-l"/>
-  <symbol minX="460" maxX="482" minY="162" maxY="184" name="garden-l"/>
-  <symbol minX="482" maxX="504" minY="162" maxY="184" name="hardware-l"/>
-  <symbol minX="0" maxX="22" minY="184" maxY="206" name="tourism-l"/>
-  <symbol minX="22" maxX="44" minY="184" maxY="206" name="garden_center-l"/>
-  <symbol minX="44" maxX="66" minY="184" maxY="206" name="shop-l"/>
-  <symbol minX="66" maxX="88" minY="184" maxY="206" name="gate-l"/>
-  <symbol minX="88" maxX="110" minY="184" maxY="206" name="hand-m"/>
-  <symbol minX="110" maxX="132" minY="184" maxY="206" name="gift-l"/>
-  <symbol minX="132" maxX="154" minY="184" maxY="206" name="hand-l"/>
-  <symbol minX="154" maxX="176" minY="184" maxY="206" name="golf-l"/>
-  <symbol minX="176" maxX="198" minY="184" maxY="206" name="hairdresser-l"/>
-  <symbol minX="198" maxX="220" minY="184" maxY="206" name="tomb-l"/>
-  <symbol minX="220" maxX="242" minY="184" maxY="206" name="greengrocer-l"/>
-  <symbol minX="242" maxX="264" minY="184" maxY="206" name="grocery-l"/>
-  <symbol minX="264" maxX="285" minY="184" maxY="205" name="greengrocer-m"/>
-  <symbol minX="285" maxX="306" minY="184" maxY="205" name="grocery-m"/>
-  <symbol minX="306" maxX="327" minY="184" maxY="205" name="tomb-m"/>
-  <symbol minX="327" maxX="348" minY="184" maxY="205" name="golf-m"/>
-  <symbol minX="348" maxX="369" minY="184" maxY="205" name="hairdresser-m"/>
-  <symbol minX="369" maxX="390" minY="184" maxY="205" name="gift-m"/>
-  <symbol minX="390" maxX="411" minY="184" maxY="205" name="gate-m"/>
-  <symbol minX="411" maxX="432" minY="184" maxY="205" name="toll_booth-m"/>
-  <symbol minX="432" maxX="453" minY="184" maxY="205" name="garden-m"/>
-  <symbol minX="453" maxX="474" minY="184" maxY="205" name="hardware-m"/>
-  <symbol minX="474" maxX="495" minY="184" maxY="205" name="tourism-m"/>
-  <symbol minX="0" maxX="21" minY="206" maxY="227" name="helipad-m"/>
-  <symbol minX="21" maxX="42" minY="206" maxY="227" name="gallery-m"/>
-  <symbol minX="42" maxX="63" minY="206" maxY="227" name="furniture-m"/>
-  <symbol minX="63" maxX="84" minY="206" maxY="227" name="funicular-m"/>
-  <symbol minX="84" maxX="105" minY="206" maxY="227" name="garden_center-m"/>
-  <symbol minX="105" maxX="126" minY="206" maxY="227" name="townhall-m"/>
-  <symbol minX="126" maxX="147" minY="206" maxY="227" name="historic-ship-m"/>
-  <symbol minX="147" maxX="168" minY="206" maxY="227" name="fuel-m"/>
-  <symbol minX="168" maxX="189" minY="206" maxY="227" name="hospital-m"/>
-  <symbol minX="189" maxX="210" minY="206" maxY="227" name="toilets-m"/>
-  <symbol minX="210" maxX="231" minY="206" maxY="227" name="fountain-m"/>
-  <symbol minX="231" maxX="252" minY="206" maxY="227" name="hotel-m"/>
-  <symbol minX="252" maxX="273" minY="206" maxY="227" name="florist-m"/>
-  <symbol minX="273" maxX="294" minY="206" maxY="227" name="toys-m"/>
-  <symbol minX="294" maxX="315" minY="206" maxY="227" name="fire_station-m"/>
-  <symbol minX="315" maxX="336" minY="206" maxY="227" name="shop-bicycle-m"/>
-  <symbol minX="336" maxX="357" minY="206" maxY="227" name="fastfood-m"/>
-  <symbol minX="357" maxX="378" minY="206" maxY="227" name="information-m"/>
-  <symbol minX="378" maxX="399" minY="206" maxY="227" name="theatre-m"/>
-  <symbol minX="399" maxX="420" minY="206" maxY="227" name="train-m"/>
-  <symbol minX="420" maxX="441" minY="206" maxY="227" name="jewelry-m"/>
-  <symbol minX="441" maxX="462" minY="206" maxY="227" name="tram-m"/>
-  <symbol minX="462" maxX="483" minY="206" maxY="227" name="embassy-m"/>
-  <symbol minX="483" maxX="504" minY="206" maxY="227" name="electronics-m"/>
-  <symbol minX="0" maxX="21" minY="227" maxY="248" name="drugs"/>
-  <symbol minX="21" maxX="42" minY="227" maxY="248" name="kiosk-m"/>
-  <symbol minX="42" maxX="63" minY="227" maxY="248" name="vending-m"/>
-  <symbol minX="63" maxX="84" minY="227" maxY="248" name="drinking-water-m"/>
-  <symbol minX="84" maxX="105" minY="227" maxY="248" name="volcano-m"/>
-  <symbol minX="105" maxX="126" minY="227" maxY="248" name="library-m"/>
-  <symbol minX="126" maxX="147" minY="227" maxY="248" name="tennis-m"/>
-  <symbol minX="147" maxX="168" minY="227" maxY="248" name="doityourself-m"/>
-  <symbol minX="168" maxX="189" minY="227" maxY="248" name="lift_gate-m"/>
-  <symbol minX="189" maxX="210" minY="227" maxY="248" name="dog_park-m"/>
-  <symbol minX="210" maxX="231" minY="227" maxY="248" name="lighthouse-m"/>
-  <symbol minX="231" maxX="252" minY="227" maxY="248" name="diving-m"/>
-  <symbol minX="252" maxX="273" minY="227" maxY="248" name="department_store-m"/>
-  <symbol minX="273" maxX="294" minY="227" maxY="248" name="alpine_hut-m"/>
-  <symbol minX="294" maxX="315" minY="227" maxY="248" name="taxi-m"/>
-  <symbol minX="315" maxX="336" minY="227" maxY="248" name="curling-m"/>
-  <symbol minX="336" maxX="357" minY="227" maxY="248" name="mail-m"/>
-  <symbol minX="357" maxX="378" minY="227" maxY="248" name="shoes-m"/>
-  <symbol minX="378" maxX="399" minY="227" maxY="248" name="cricket-m"/>
-  <symbol minX="399" maxX="420" minY="227" maxY="248" name="marketplace-m"/>
-  <symbol minX="420" maxX="441" minY="227" maxY="248" name="swimming-m"/>
-  <symbol minX="441" maxX="462" minY="227" maxY="248" name="convenience-m"/>
-  <symbol minX="462" maxX="483" minY="227" maxY="248" name="computer-m"/>
-  <symbol minX="483" maxX="504" minY="227" maxY="248" name="military-m"/>
-  <symbol minX="0" maxX="21" minY="248" maxY="269" name="sweets-m"/>
-  <symbol minX="21" maxX="42" minY="248" maxY="269" name="wayside_cross-m"/>
-  <symbol minX="42" maxX="63" minY="248" maxY="269" name="mobile_phone-m"/>
-  <symbol minX="63" maxX="84" minY="248" maxY="269" name="college-m"/>
-  <symbol minX="84" maxX="105" minY="248" maxY="269" name="monument-m"/>
-  <symbol minX="105" maxX="126" minY="248" maxY="269" name="clothes-m"/>
-  <symbol minX="126" maxX="147" minY="248" maxY="269" name="cinema-m"/>
-  <symbol minX="147" maxX="168" minY="248" maxY="269" name="motel-m"/>
-  <symbol minX="168" maxX="189" minY="248" maxY="269" name="chemist-m"/>
-  <symbol minX="189" maxX="210" minY="248" maxY="269" name="museum-m"/>
-  <symbol minX="210" maxX="231" minY="248" maxY="269" name="subway-spb-m"/>
-  <symbol minX="231" maxX="252" minY="248" maxY="269" name="america-football-m"/>
-  <symbol minX="252" maxX="273" minY="248" maxY="269" name="shop-m"/>
-  <symbol minX="273" maxX="294" minY="248" maxY="269" name="ship-m"/>
-  <symbol minX="294" maxX="315" minY="248" maxY="269" name="alcohol-m"/>
-  <symbol minX="315" maxX="336" minY="248" maxY="269" name="archery-m"/>
-  <symbol minX="336" maxX="357" minY="248" maxY="269" name="wayside_shrine-m"/>
-  <symbol minX="357" maxX="378" minY="248" maxY="269" name="cemetery-m"/>
-  <symbol minX="378" maxX="399" minY="248" maxY="269" name="npark-m"/>
-  <symbol minX="399" maxX="420" minY="248" maxY="269" name="school-m"/>
-  <symbol minX="420" maxX="441" minY="248" maxY="269" name="cave-m"/>
-  <symbol minX="441" maxX="462" minY="248" maxY="269" name="nparkf-m "/>
-  <symbol minX="462" maxX="483" minY="248" maxY="269" name="nparkf-m"/>
-  <symbol minX="483" maxX="504" minY="248" maxY="269" name="atm-m"/>
-  <symbol minX="0" maxX="21" minY="269" maxY="290" name="windmill-m"/>
-  <symbol minX="21" maxX="42" minY="269" maxY="290" name="casino-m"/>
-  <symbol minX="42" maxX="63" minY="269" maxY="290" name="skiing-m"/>
-  <symbol minX="63" maxX="84" minY="269" maxY="290" name="caravan_site-m"/>
-  <symbol minX="84" maxX="105" minY="269" maxY="290" name="optician-m"/>
-  <symbol minX="105" maxX="126" minY="269" maxY="290" name="car_sharing-m"/>
-  <symbol minX="126" maxX="147" minY="269" maxY="290" name="park-m"/>
-  <symbol minX="147" maxX="168" minY="269" maxY="290" name="australian-football-m"/>
-  <symbol minX="168" maxX="189" minY="269" maxY="290" name="restaurant-m"/>
-  <symbol minX="189" maxX="210" minY="269" maxY="290" name="zoo-m"/>
-  <symbol minX="210" maxX="231" minY="269" maxY="290" name="campsite-m"/>
-  <symbol minX="231" maxX="252" minY="269" maxY="290" name="parking-meter-m"/>
-  <symbol minX="252" maxX="273" minY="269" maxY="290" name="subway-newyork-m"/>
-  <symbol minX="273" maxX="294" minY="269" maxY="290" name="cafe-m"/>
-  <symbol minX="294" maxX="315" minY="269" maxY="290" name="bakery-m"/>
-  <symbol minX="315" maxX="336" minY="269" maxY="290" name="banknote-m"/>
-  <symbol minX="336" maxX="357" minY="269" maxY="290" name="subway-m"/>
-  <symbol minX="357" maxX="378" minY="269" maxY="290" name="bar-m"/>
-  <symbol minX="378" maxX="399" minY="269" maxY="290" name="cable-car-m"/>
-  <symbol minX="399" maxX="420" minY="269" maxY="290" name="pharmacy-2-m"/>
+  <symbol minX="417" maxX="439" minY="118" maxY="140" name="pharmacy-l"/>
+  <symbol minX="439" maxX="461" minY="118" maxY="140" name="dentist-l"/>
+  <symbol minX="461" maxX="483" minY="118" maxY="140" name="dentist-m"/>
+  <symbol minX="483" maxX="505" minY="118" maxY="140" name="parking-meter-l"/>
+  <symbol minX="0" maxX="22" minY="140" maxY="162" name="department_store-l"/>
+  <symbol minX="22" maxX="44" minY="140" maxY="162" name="park-l"/>
+  <symbol minX="44" maxX="66" minY="140" maxY="162" name="diving-l"/>
+  <symbol minX="66" maxX="88" minY="140" maxY="162" name="optician-l"/>
+  <symbol minX="88" maxX="110" minY="140" maxY="162" name="dog_park-l"/>
+  <symbol minX="110" maxX="131" minY="140" maxY="162" name="office-m"/>
+  <symbol minX="131" maxX="153" minY="140" maxY="162" name="doityourself-l"/>
+  <symbol minX="153" maxX="175" minY="140" maxY="162" name="office-l"/>
+  <symbol minX="175" maxX="197" minY="140" maxY="162" name="nparkf-l"/>
+  <symbol minX="197" maxX="219" minY="140" maxY="162" name="npark-l"/>
+  <symbol minX="219" maxX="241" minY="140" maxY="162" name="museum-l"/>
+  <symbol minX="241" maxX="263" minY="140" maxY="162" name="drinking-water-l"/>
+  <symbol minX="263" maxX="285" minY="140" maxY="162" name="motel-l"/>
+  <symbol minX="285" maxX="307" minY="140" maxY="162" name="monument-l"/>
+  <symbol minX="307" maxX="329" minY="140" maxY="162" name="mobile_phone-l"/>
+  <symbol minX="329" maxX="351" minY="140" maxY="162" name="electronics-l"/>
+  <symbol minX="351" maxX="373" minY="140" maxY="162" name="military-l"/>
+  <symbol minX="373" maxX="395" minY="140" maxY="162" name="embassy-l"/>
+  <symbol minX="395" maxX="417" minY="140" maxY="162" name="marketplace-l"/>
+  <symbol minX="417" maxX="439" minY="140" maxY="162" name="mail-l"/>
+  <symbol minX="439" maxX="461" minY="140" maxY="162" name="lightrail-berlin-l"/>
+  <symbol minX="461" maxX="483" minY="140" maxY="162" name="lighthouse-l"/>
+  <symbol minX="483" maxX="505" minY="140" maxY="162" name="equestrian-l"/>
+  <symbol minX="0" maxX="22" minY="162" maxY="184" name="equestrian-m"/>
+  <symbol minX="22" maxX="44" minY="162" maxY="184" name="lift_gate-l"/>
+  <symbol minX="44" maxX="66" minY="162" maxY="184" name="fastfood-l"/>
+  <symbol minX="66" maxX="88" minY="162" maxY="184" name="library-l"/>
+  <symbol minX="88" maxX="109" minY="162" maxY="184" name="laundry-m"/>
+  <symbol minX="109" maxX="131" minY="162" maxY="184" name="fire_station-l"/>
+  <symbol minX="131" maxX="153" minY="162" maxY="184" name="laundry-l"/>
+  <symbol minX="153" maxX="175" minY="162" maxY="184" name="kiosk-l"/>
+  <symbol minX="175" maxX="197" minY="162" maxY="184" name="florist-l"/>
+  <symbol minX="197" maxX="219" minY="162" maxY="184" name="kindergarten-m"/>
+  <symbol minX="219" maxX="241" minY="162" maxY="184" name="fountain-l"/>
+  <symbol minX="241" maxX="263" minY="162" maxY="184" name="kindergarten-l"/>
+  <symbol minX="263" maxX="285" minY="162" maxY="184" name="jewelry-l"/>
+  <symbol minX="285" maxX="307" minY="162" maxY="184" name="fuel-l"/>
+  <symbol minX="307" maxX="329" minY="162" maxY="184" name="information-l"/>
+  <symbol minX="329" maxX="350" minY="162" maxY="184" name="hunting-tower-m"/>
+  <symbol minX="350" maxX="372" minY="162" maxY="184" name="funicular-l"/>
+  <symbol minX="372" maxX="394" minY="162" maxY="184" name="hunting-tower-l"/>
+  <symbol minX="394" maxX="416" minY="162" maxY="184" name="hotel-l"/>
+  <symbol minX="416" maxX="438" minY="162" maxY="184" name="furniture-l"/>
+  <symbol minX="438" maxX="460" minY="162" maxY="184" name="hospital-l"/>
+  <symbol minX="460" maxX="482" minY="162" maxY="184" name="gallery-l"/>
+  <symbol minX="482" maxX="504" minY="162" maxY="184" name="historic-ship-l"/>
+  <symbol minX="0" maxX="21" minY="184" maxY="206" name="heliport-m"/>
+  <symbol minX="21" maxX="43" minY="184" maxY="206" name="garden-l"/>
+  <symbol minX="43" maxX="65" minY="184" maxY="206" name="heliport-l"/>
+  <symbol minX="65" maxX="87" minY="184" maxY="206" name="helipad-l"/>
+  <symbol minX="87" maxX="109" minY="184" maxY="206" name="garden_center-l"/>
+  <symbol minX="109" maxX="131" minY="184" maxY="206" name="hardware-l"/>
+  <symbol minX="131" maxX="153" minY="184" maxY="206" name="gate-l"/>
+  <symbol minX="153" maxX="175" minY="184" maxY="206" name="hand-m"/>
+  <symbol minX="175" maxX="197" minY="184" maxY="206" name="gift-l"/>
+  <symbol minX="197" maxX="219" minY="184" maxY="206" name="hand-l"/>
+  <symbol minX="219" maxX="241" minY="184" maxY="206" name="golf-l"/>
+  <symbol minX="241" maxX="263" minY="184" maxY="206" name="hairdresser-l"/>
+  <symbol minX="263" maxX="285" minY="184" maxY="206" name="grocery-l"/>
+  <symbol minX="285" maxX="307" minY="184" maxY="206" name="greengrocer-l"/>
+  <symbol minX="307" maxX="328" minY="184" maxY="205" name="greengrocer-m"/>
+  <symbol minX="328" maxX="349" minY="184" maxY="205" name="ship-m"/>
+  <symbol minX="349" maxX="370" minY="184" maxY="205" name="grocery-m"/>
+  <symbol minX="370" maxX="391" minY="184" maxY="205" name="alpine_hut-m"/>
+  <symbol minX="391" maxX="412" minY="184" maxY="205" name="golf-m"/>
+  <symbol minX="412" maxX="433" minY="184" maxY="205" name="hairdresser-m"/>
+  <symbol minX="433" maxX="454" minY="184" maxY="205" name="gift-m"/>
+  <symbol minX="454" maxX="475" minY="184" maxY="205" name="gate-m"/>
+  <symbol minX="475" maxX="496" minY="184" maxY="205" name="america-football-m"/>
+  <symbol minX="0" maxX="21" minY="206" maxY="227" name="garden_center-m"/>
+  <symbol minX="21" maxX="42" minY="206" maxY="227" name="hardware-m"/>
+  <symbol minX="42" maxX="63" minY="206" maxY="227" name="shop-bicycle-m"/>
+  <symbol minX="63" maxX="84" minY="206" maxY="227" name="helipad-m"/>
+  <symbol minX="84" maxX="105" minY="206" maxY="227" name="archery-m"/>
+  <symbol minX="105" maxX="126" minY="206" maxY="227" name="garden-m"/>
+  <symbol minX="126" maxX="147" minY="206" maxY="227" name="atm-m"/>
+  <symbol minX="147" maxX="168" minY="206" maxY="227" name="casino-m"/>
+  <symbol minX="168" maxX="189" minY="206" maxY="227" name="gallery-m"/>
+  <symbol minX="189" maxX="210" minY="206" maxY="227" name="historic-ship-m"/>
+  <symbol minX="210" maxX="231" minY="206" maxY="227" name="furniture-m"/>
+  <symbol minX="231" maxX="252" minY="206" maxY="227" name="hospital-m"/>
+  <symbol minX="252" maxX="273" minY="206" maxY="227" name="australian-football-m"/>
+  <symbol minX="273" maxX="294" minY="206" maxY="227" name="bakery-m"/>
+  <symbol minX="294" maxX="315" minY="206" maxY="227" name="hotel-m"/>
+  <symbol minX="315" maxX="336" minY="206" maxY="227" name="banknote-m"/>
+  <symbol minX="336" maxX="357" minY="206" maxY="227" name="funicular-m"/>
+  <symbol minX="357" maxX="378" minY="206" maxY="227" name="alcohol-m"/>
+  <symbol minX="378" maxX="399" minY="206" maxY="227" name="shoes-m"/>
+  <symbol minX="399" maxX="420" minY="206" maxY="227" name="fuel-m"/>
+  <symbol minX="420" maxX="441" minY="206" maxY="227" name="information-m"/>
+  <symbol minX="441" maxX="462" minY="206" maxY="227" name="zoo-m"/>
+  <symbol minX="462" maxX="483" minY="206" maxY="227" name="bar-m"/>
+  <symbol minX="483" maxX="504" minY="206" maxY="227" name="jewelry-m"/>
+  <symbol minX="0" maxX="21" minY="227" maxY="248" name="fountain-m"/>
+  <symbol minX="21" maxX="42" minY="227" maxY="248" name="florist-m"/>
+  <symbol minX="42" maxX="63" minY="227" maxY="248" name="windmill-m"/>
+  <symbol minX="63" maxX="84" minY="227" maxY="248" name="wayside_shrine-m"/>
+  <symbol minX="84" maxX="105" minY="227" maxY="248" name="kiosk-m"/>
+  <symbol minX="105" maxX="126" minY="227" maxY="248" name="fire_station-m"/>
+  <symbol minX="126" maxX="147" minY="227" maxY="248" name="baseball-m"/>
+  <symbol minX="147" maxX="168" minY="227" maxY="248" name="fastfood-m"/>
+  <symbol minX="168" maxX="189" minY="227" maxY="248" name="library-m"/>
+  <symbol minX="189" maxX="210" minY="227" maxY="248" name="wayside_cross-m"/>
+  <symbol minX="210" maxX="231" minY="227" maxY="248" name="caravan_site-m"/>
+  <symbol minX="231" maxX="252" minY="227" maxY="248" name="lift_gate-m"/>
+  <symbol minX="252" maxX="273" minY="227" maxY="248" name="basketball-m"/>
+  <symbol minX="273" maxX="294" minY="227" maxY="248" name="lighthouse-m"/>
+  <symbol minX="294" maxX="315" minY="227" maxY="248" name="volcano-m"/>
+  <symbol minX="315" maxX="336" minY="227" maxY="248" name="bbq-m"/>
+  <symbol minX="336" maxX="357" minY="227" maxY="248" name="shop-m"/>
+  <symbol minX="357" maxX="378" minY="227" maxY="248" name="vending-m"/>
+  <symbol minX="378" maxX="399" minY="227" maxY="248" name="car_sharing-m"/>
+  <symbol minX="399" maxX="420" minY="227" maxY="248" name="mail-m"/>
+  <symbol minX="420" maxX="441" minY="227" maxY="248" name="tram-m"/>
+  <symbol minX="441" maxX="462" minY="227" maxY="248" name="embassy-m"/>
+  <symbol minX="462" maxX="483" minY="227" maxY="248" name="marketplace-m"/>
+  <symbol minX="483" maxX="504" minY="227" maxY="248" name="beach-m"/>
+  <symbol minX="0" maxX="21" minY="248" maxY="269" name="train-m"/>
+  <symbol minX="21" maxX="42" minY="248" maxY="269" name="electronics-m"/>
+  <symbol minX="42" maxX="63" minY="248" maxY="269" name="military-m"/>
+  <symbol minX="63" maxX="84" minY="248" maxY="269" name="beauty-m"/>
+  <symbol minX="84" maxX="105" minY="248" maxY="269" name="drugs"/>
+  <symbol minX="105" maxX="126" minY="248" maxY="269" name="mobile_phone-m"/>
+  <symbol minX="126" maxX="147" minY="248" maxY="269" name="toys-m"/>
+  <symbol minX="147" maxX="168" minY="248" maxY="269" name="monument-m"/>
+  <symbol minX="168" maxX="189" minY="248" maxY="269" name="cave-m"/>
+  <symbol minX="189" maxX="210" minY="248" maxY="269" name="drinking-water-m"/>
+  <symbol minX="210" maxX="231" minY="248" maxY="269" name="motel-m"/>
+  <symbol minX="231" maxX="252" minY="248" maxY="269" name="townhall-m"/>
+  <symbol minX="252" maxX="273" minY="248" maxY="269" name="museum-m"/>
+  <symbol minX="273" maxX="294" minY="248" maxY="269" name="tourism-m"/>
+  <symbol minX="294" maxX="315" minY="248" maxY="269" name="skiing-m"/>
+  <symbol minX="315" maxX="336" minY="248" maxY="269" name="school-m"/>
+  <symbol minX="336" maxX="357" minY="248" maxY="269" name="soccer-m"/>
+  <symbol minX="357" maxX="378" minY="248" maxY="269" name="sports-m"/>
+  <symbol minX="378" maxX="399" minY="248" maxY="269" name="restaurant-m"/>
+  <symbol minX="399" maxX="420" minY="248" maxY="269" name="bicycle-m"/>
+  <symbol minX="420" maxX="441" minY="248" maxY="269" name="tomb-m"/>
+  <symbol minX="441" maxX="462" minY="248" maxY="269" name="npark-m"/>
+  <symbol minX="462" maxX="483" minY="248" maxY="269" name="toll_booth-m"/>
+  <symbol minX="483" maxX="504" minY="248" maxY="269" name="book-shop-m"/>
+  <symbol minX="0" maxX="21" minY="269" maxY="290" name="nparkf-m "/>
+  <symbol minX="21" maxX="42" minY="269" maxY="290" name="nparkf-m"/>
+  <symbol minX="42" maxX="63" minY="269" maxY="290" name="toilets-m"/>
+  <symbol minX="63" maxX="84" minY="269" maxY="290" name="doityourself-m"/>
+  <symbol minX="84" maxX="105" minY="269" maxY="290" name="dog_park-m"/>
+  <symbol minX="105" maxX="126" minY="269" maxY="290" name="cemetery-m"/>
+  <symbol minX="126" maxX="147" minY="269" maxY="290" name="diving-m"/>
+  <symbol minX="147" maxX="168" minY="269" maxY="290" name="optician-m"/>
+  <symbol minX="168" maxX="189" minY="269" maxY="290" name="department_store-m"/>
+  <symbol minX="189" maxX="210" minY="269" maxY="290" name="park-m"/>
+  <symbol minX="210" maxX="231" minY="269" maxY="290" name="theatre-m"/>
+  <symbol minX="231" maxX="252" minY="269" maxY="290" name="chemist-m"/>
+  <symbol minX="252" maxX="273" minY="269" maxY="290" name="boundary_stone-m"/>
+  <symbol minX="273" maxX="294" minY="269" maxY="290" name="tennis-m"/>
+  <symbol minX="294" maxX="315" minY="269" maxY="290" name="parking-meter-m"/>
+  <symbol minX="315" maxX="336" minY="269" maxY="290" name="bowls-m"/>
+  <symbol minX="336" maxX="357" minY="269" maxY="290" name="taxi-m"/>
+  <symbol minX="357" maxX="378" minY="269" maxY="290" name="bus-m"/>
+  <symbol minX="378" maxX="399" minY="269" maxY="290" name="swimming-m"/>
+  <symbol minX="399" maxX="420" minY="269" maxY="290" name="sweets-m"/>
   <symbol minX="420" maxX="441" minY="269" maxY="290" name="butcher-m"/>
-  <symbol minX="441" maxX="462" minY="269" maxY="290" name="pharmacy-m"/>
-  <symbol minX="462" maxX="483" minY="269" maxY="290" name="subway-entrance-m"/>
-  <symbol minX="483" maxX="504" minY="269" maxY="290" name="soccer-m"/>
-  <symbol minX="0" maxX="21" minY="290" maxY="311" name="phone-m"/>
-  <symbol minX="21" maxX="42" minY="290" maxY="311" name="bus-m"/>
-  <symbol minX="42" maxX="63" minY="290" maxY="311" name="bowls-m"/>
-  <symbol minX="63" maxX="84" minY="290" maxY="311" name="boundary_stone-m"/>
-  <symbol minX="84" maxX="105" minY="290" maxY="311" name="recycling-m"/>
-  <symbol minX="105" maxX="126" minY="290" maxY="311" name="book-shop-m"/>
-  <symbol minX="126" maxX="147" minY="290" maxY="311" name="pitch-m"/>
-  <symbol minX="147" maxX="168" minY="290" maxY="311" name="subway-entrance-2-m"/>
-  <symbol minX="168" maxX="189" minY="290" maxY="311" name="bicycle-m"/>
-  <symbol minX="189" maxX="210" minY="290" maxY="311" name="place-of-worship-m"/>
-  <symbol minX="210" maxX="231" minY="290" maxY="311" name="baseball-m"/>
-  <symbol minX="231" maxX="252" minY="290" maxY="311" name="basketball-m"/>
-  <symbol minX="252" maxX="273" minY="290" maxY="311" name="police-m"/>
+  <symbol minX="441" maxX="462" minY="269" maxY="290" name="subway-spb-m"/>
+  <symbol minX="462" maxX="483" minY="269" maxY="290" name="pharmacy-2-m"/>
+  <symbol minX="483" maxX="504" minY="269" maxY="290" name="curling-m"/>
+  <symbol minX="0" maxX="21" minY="290" maxY="311" name="pharmacy-m"/>
+  <symbol minX="21" maxX="42" minY="290" maxY="311" name="cable-car-m"/>
+  <symbol minX="42" maxX="63" minY="290" maxY="311" name="recycling-m"/>
+  <symbol minX="63" maxX="84" minY="290" maxY="311" name="phone-m"/>
+  <symbol minX="84" maxX="105" minY="290" maxY="311" name="cinema-m"/>
+  <symbol minX="105" maxX="126" minY="290" maxY="311" name="subway-entrance-2-m"/>
+  <symbol minX="126" maxX="147" minY="290" maxY="311" name="subway-newyork-m"/>
+  <symbol minX="147" maxX="168" minY="290" maxY="311" name="campsite-m"/>
+  <symbol minX="168" maxX="189" minY="290" maxY="311" name="cricket-m"/>
+  <symbol minX="189" maxX="210" minY="290" maxY="311" name="pitch-m"/>
+  <symbol minX="210" maxX="231" minY="290" maxY="311" name="cafe-m"/>
+  <symbol minX="231" maxX="252" minY="290" maxY="311" name="convenience-m"/>
+  <symbol minX="252" maxX="273" minY="290" maxY="311" name="place-of-worship-m"/>
   <symbol minX="273" maxX="294" minY="290" maxY="311" name="pub-m"/>
-  <symbol minX="294" maxX="315" minY="290" maxY="311" name="beauty-m"/>
-  <symbol minX="315" maxX="336" minY="290" maxY="311" name="postbox-m"/>
-  <symbol minX="336" maxX="357" minY="290" maxY="311" name="beach-m"/>
-  <symbol minX="357" maxX="378" minY="290" maxY="311" name="bbq-m"/>
-  <symbol minX="378" maxX="399" minY="290" maxY="311" name="sports-m"/>
-  <symbol minX="399" maxX="419" minY="290" maxY="310" name="lightrail-berlin-m"/>
-  <symbol minX="419" maxX="439" minY="290" maxY="310" name="subway-berlin-l"/>
-  <symbol minX="439" maxX="459" minY="290" maxY="310" name="subway-rome-l"/>
-  <symbol minX="459" maxX="479" minY="290" maxY="310" name="speedcam-l"/>
-  <symbol minX="479" maxX="499" minY="290" maxY="310" name="parking-l"/>
-  <symbol minX="0" maxX="22" minY="311" maxY="330" name="subway-moscow-l"/>
-  <symbol minX="22" maxX="40" minY="311" maxY="329" name="airport-s"/>
-  <symbol minX="40" maxX="62" minY="311" maxY="329" name="subway-london-l"/>
-  <symbol minX="62" maxX="79" minY="311" maxY="329" name="picnic-s"/>
-  <symbol minX="79" maxX="96" minY="311" maxY="329" name="remains-s"/>
-  <symbol minX="96" maxX="117" minY="311" maxY="329" name="subway-moscow-m"/>
-  <symbol minX="117" maxX="135" minY="311" maxY="329" name="subway-berlin-m"/>
-  <symbol minX="135" maxX="153" minY="311" maxY="329" name="subway-paris-m"/>
-  <symbol minX="153" maxX="170" minY="311" maxY="329" name="office-s"/>
-  <symbol minX="170" maxX="187" minY="311" maxY="329" name="beer-s"/>
-  <symbol minX="187" maxX="205" minY="311" maxY="329" name="subway-rome-m"/>
-  <symbol minX="205" maxX="223" minY="311" maxY="329" name="no-icon"/>
-  <symbol minX="223" maxX="241" minY="311" maxY="329" name="no-icon-tourism"/>
-  <symbol minX="241" maxX="259" minY="311" maxY="329" name="no-icon-shop"/>
-  <symbol minX="259" maxX="277" minY="311" maxY="329" name="no-icon-leisure"/>
-  <symbol minX="277" maxX="295" minY="311" maxY="329" name="no-icon-amenity"/>
-  <symbol minX="295" maxX="312" minY="311" maxY="329" name="waterfall-s"/>
-  <symbol minX="312" maxX="329" minY="311" maxY="329" name="bcontrol-s"/>
-  <symbol minX="329" maxX="346" minY="311" maxY="329" name="hunting-tower-s"/>
-  <symbol minX="346" maxX="363" minY="311" maxY="329" name="heliport-s"/>
-  <symbol minX="363" maxX="380" minY="311" maxY="328" name="ship-s"/>
-  <symbol minX="380" maxX="397" minY="311" maxY="328" name="shop-s"/>
-  <symbol minX="397" maxX="414" minY="311" maxY="328" name="school-s"/>
-  <symbol minX="414" maxX="431" minY="311" maxY="328" name="tourism-s"/>
-  <symbol minX="431" maxX="448" minY="311" maxY="328" name="skiing-s"/>
-  <symbol minX="448" maxX="465" minY="311" maxY="328" name="restaurant-s"/>
-  <symbol minX="465" maxX="482" minY="311" maxY="328" name="recycling-s"/>
-  <symbol minX="482" maxX="499" minY="311" maxY="328" name="soccer-s"/>
-  <symbol minX="0" maxX="17" minY="330" maxY="347" name="alcohol-s"/>
-  <symbol minX="17" maxX="34" minY="330" maxY="347" name="speedcam-m"/>
-  <symbol minX="34" maxX="51" minY="330" maxY="347" name="america-football-s"/>
-  <symbol minX="51" maxX="68" minY="330" maxY="347" name="pub-s"/>
-  <symbol minX="68" maxX="85" minY="330" maxY="347" name="power-s"/>
-  <symbol minX="85" maxX="102" minY="330" maxY="347" name="atm-s"/>
-  <symbol minX="102" maxX="119" minY="330" maxY="347" name="bar-s"/>
-  <symbol minX="119" maxX="136" minY="330" maxY="347" name="baseball-s"/>
-  <symbol minX="136" maxX="153" minY="330" maxY="347" name="gallery-s"/>
-  <symbol minX="153" maxX="170" minY="330" maxY="347" name="garden-s"/>
-  <symbol minX="170" maxX="190" minY="330" maxY="347" name="subway-barcelona-s"/>
-  <symbol minX="190" maxX="207" minY="330" maxY="347" name="police-s"/>
-  <symbol minX="207" maxX="224" minY="330" maxY="347" name="place-of-worship-s"/>
-  <symbol minX="224" maxX="241" minY="330" maxY="347" name="basketball-s"/>
-  <symbol minX="241" maxX="258" minY="330" maxY="347" name="pitch-s"/>
-  <symbol minX="258" maxX="275" minY="330" maxY="347" name="subway-entrance-2-s"/>
-  <symbol minX="275" maxX="292" minY="330" maxY="347" name="subway-entrance-arrow"/>
-  <symbol minX="292" maxX="309" minY="330" maxY="347" name="phone-s"/>
-  <symbol minX="309" maxX="326" minY="330" maxY="347" name="pharmacy-s"/>
-  <symbol minX="326" maxX="343" minY="330" maxY="347" name="subway-entrance-s"/>
-  <symbol minX="343" maxX="360" minY="330" maxY="347" name="bicycle-s"/>
-  <symbol minX="360" maxX="377" minY="330" maxY="347" name="book-shop-s"/>
-  <symbol minX="377" maxX="394" minY="330" maxY="347" name="bus-s"/>
-  <symbol minX="394" maxX="411" minY="330" maxY="347" name="cable-car-s"/>
-  <symbol minX="411" maxX="428" minY="330" maxY="347" name="cafe-s"/>
-  <symbol minX="428" maxX="449" minY="330" maxY="347" name="subway-london-m"/>
-  <symbol minX="449" maxX="466" minY="330" maxY="347" name="zoo-s"/>
-  <symbol minX="466" maxX="483" minY="330" maxY="347" name="campsite-s"/>
-  <symbol minX="483" maxX="500" minY="330" maxY="347" name="golf-s"/>
-  <symbol minX="0" maxX="17" minY="347" maxY="364" name="grocery-s"/>
-  <symbol minX="17" maxX="34" minY="347" maxY="364" name="car-repair-s"/>
-  <symbol minX="34" maxX="51" minY="347" maxY="364" name="windmill-s"/>
-  <symbol minX="51" maxX="68" minY="347" maxY="364" name="casino-s"/>
-  <symbol minX="68" maxX="85" minY="347" maxY="364" name="cave-s"/>
-  <symbol minX="85" maxX="102" minY="347" maxY="364" name="cemetery-s"/>
-  <symbol minX="102" maxX="119" minY="347" maxY="364" name="cinema-s"/>
-  <symbol minX="119" maxX="136" minY="347" maxY="364" name="college-s"/>
-  <symbol minX="136" maxX="153" minY="347" maxY="364" name="volcano-s"/>
-  <symbol minX="153" maxX="170" minY="347" maxY="364" name="drinking-water-s"/>
-  <symbol minX="170" maxX="187" minY="347" maxY="364" name="subway-newyork-s"/>
-  <symbol minX="187" maxX="204" minY="347" maxY="364" name="embassy-s"/>
-  <symbol minX="204" maxX="221" minY="347" maxY="364" name="hand-s"/>
-  <symbol minX="221" maxX="238" minY="347" maxY="364" name="park-s"/>
-  <symbol minX="238" maxX="255" minY="347" maxY="364" name="tram-s"/>
-  <symbol minX="255" maxX="272" minY="347" maxY="364" name="nparkf-s"/>
-  <symbol minX="272" maxX="289" minY="347" maxY="364" name="npark-s"/>
-  <symbol minX="289" maxX="306" minY="347" maxY="364" name="train-s"/>
-  <symbol minX="306" maxX="323" minY="347" maxY="364" name="subway-s"/>
-  <symbol minX="323" maxX="340" minY="347" maxY="364" name="equestrian-s"/>
-  <symbol minX="340" maxX="357" minY="347" maxY="364" name="museum-s"/>
-  <symbol minX="357" maxX="374" minY="347" maxY="364" name="subway-spb-s"/>
-  <symbol minX="374" maxX="391" minY="347" maxY="364" name="fastfood-s"/>
-  <symbol minX="391" maxX="408" minY="347" maxY="364" name="fire_station-s"/>
-  <symbol minX="408" maxX="425" minY="347" maxY="364" name="fountain-s"/>
-  <symbol minX="425" maxX="442" minY="347" maxY="364" name="townhall-s"/>
-  <symbol minX="442" maxX="459" minY="347" maxY="364" name="monument-s"/>
-  <symbol minX="459" maxX="476" minY="347" maxY="364" name="military-s"/>
-  <symbol minX="476" maxX="493" minY="347" maxY="364" name="fuel-s"/>
-  <symbol minX="493" maxX="510" minY="347" maxY="364" name="helipad-s"/>
-  <symbol minX="0" maxX="17" minY="364" maxY="381" name="swimming-s"/>
-  <symbol minX="17" maxX="34" minY="364" maxY="381" name="mail-s"/>
-  <symbol minX="34" maxX="51" minY="364" maxY="381" name="funicular-s"/>
-  <symbol minX="51" maxX="68" minY="364" maxY="381" name="lighthouse-s"/>
-  <symbol minX="68" maxX="85" minY="364" maxY="381" name="library-s"/>
-  <symbol minX="85" maxX="102" minY="364" maxY="381" name="tennis-s"/>
-  <symbol minX="102" maxX="119" minY="364" maxY="381" name="kindergarten-s"/>
-  <symbol minX="119" maxX="136" minY="364" maxY="381" name="information-s"/>
-  <symbol minX="136" maxX="153" minY="364" maxY="381" name="theatre-s"/>
-  <symbol minX="153" maxX="170" minY="364" maxY="381" name="hotel-s"/>
-  <symbol minX="170" maxX="187" minY="364" maxY="381" name="hospital-s"/>
-  <symbol minX="187" maxX="204" minY="364" maxY="381" name="toilets-s"/>
-  <symbol minX="204" maxX="226" minY="364" maxY="380" name="metro-barcelona-m"/>
-  <symbol minX="226" maxX="242" minY="364" maxY="380" name="parking-m"/>
-  <symbol minX="242" maxX="264" minY="364" maxY="380" name="subway-madrid-m"/>
-  <symbol minX="264" maxX="286" minY="364" maxY="380" name="subway-madrid-l"/>
-  <symbol minX="286" maxX="308" minY="364" maxY="380" name="subway-barcelona-m"/>
-  <symbol minX="308" maxX="330" minY="364" maxY="380" name="subway-barcelona-l"/>
-  <symbol minX="330" maxX="345" minY="364" maxY="380" name="s-arrow"/>
-  <symbol minX="345" maxX="360" minY="364" maxY="379" name="lightrail-berlin-s"/>
-  <symbol minX="360" maxX="380" minY="364" maxY="379" name="metro-barcelona-s"/>
-  <symbol minX="380" maxX="395" minY="364" maxY="379" name="peak-l"/>
-  <symbol minX="395" maxX="415" minY="364" maxY="379" name="subway-madrid-s"/>
-  <symbol minX="415" maxX="436" minY="364" maxY="379" name="subway-kiev-m"/>
-  <symbol minX="436" maxX="451" minY="364" maxY="379" name="subway-moscow-s"/>
-  <symbol minX="451" maxX="472" minY="364" maxY="379" name="subway-kiev-l"/>
-  <symbol minX="472" maxX="487" minY="364" maxY="379" name="subway-paris-s"/>
-  <symbol minX="487" maxX="501" minY="364" maxY="378" name="route_from"/>
-  <symbol minX="0" maxX="14" minY="381" maxY="395" name="speedcam-s"/>
-  <symbol minX="14" maxX="28" minY="381" maxY="395" name="subway-rome-s"/>
-  <symbol minX="28" maxX="42" minY="381" maxY="395" name="parking-s"/>
-  <symbol minX="42" maxX="56" minY="381" maxY="395" name="subway-berlin-s"/>
-  <symbol minX="56" maxX="71" minY="381" maxY="395" name="bench"/>
-  <symbol minX="71" maxX="88" minY="381" maxY="395" name="subway-london-s"/>
-  <symbol minX="88" maxX="102" minY="381" maxY="394" name="peakt-l"/>
-  <symbol minX="102" maxX="115" minY="381" maxY="394" name="star-l"/>
-  <symbol minX="115" maxX="128" minY="381" maxY="394" name="survey_point-l"/>
-  <symbol minX="128" maxX="149" minY="381" maxY="394" name="subway-minsk-l"/>
-  <symbol minX="149" maxX="162" minY="381" maxY="394" name="current-position"/>
-  <symbol minX="162" maxX="180" minY="381" maxY="393" name="subway-kiev-s"/>
-  <symbol minX="180" maxX="192" minY="381" maxY="393" name="subway-newyork-xs"/>
-  <symbol minX="192" maxX="204" minY="381" maxY="393" name="star-m"/>
-  <symbol minX="204" maxX="216" minY="381" maxY="393" name="subway-xs"/>
-  <symbol minX="216" maxX="228" minY="381" maxY="393" name="peak-m"/>
-  <symbol minX="228" maxX="240" minY="381" maxY="393" name="survey_point-m"/>
-  <symbol minX="240" maxX="257" minY="381" maxY="393" name="railway-crossing"/>
-  <symbol minX="257" maxX="275" minY="381" maxY="393" name="subway-minsk-m"/>
-  <symbol minX="275" maxX="292" minY="381" maxY="392" name="subway-minsk-s"/>
-  <symbol minX="292" maxX="303" minY="381" maxY="392" name="star-s"/>
-  <symbol minX="303" maxX="314" minY="381" maxY="392" name="api-result"/>
-  <symbol minX="314" maxX="325" minY="381" maxY="392" name="crossing-l"/>
-  <symbol minX="325" maxX="335" minY="381" maxY="391" name="survey_point-s"/>
-  <symbol minX="335" maxX="346" minY="381" maxY="391" name="peak-s"/>
-  <symbol minX="346" maxX="357" minY="381" maxY="391" name="peakt-m"/>
-  <symbol minX="357" maxX="367" minY="381" maxY="391" name="search-result"/>
-  <symbol minX="367" maxX="387" minY="381" maxY="391" name="arrow-m"/>
-  <symbol minX="387" maxX="396" minY="381" maxY="390" name="peakt-s"/>
-  <symbol minX="396" maxX="405" minY="381" maxY="390" name="crossing-m"/>
-  <symbol minX="405" maxX="414" minY="381" maxY="390" name="entrance-s"/>
-  <symbol minX="414" maxX="422" minY="381" maxY="389" name="crossing-s"/>
-  <symbol minX="422" maxX="430" minY="381" maxY="389" name="dot-m"/>
-  <symbol minX="430" maxX="438" minY="381" maxY="389" name="tree-l"/>
-  <symbol minX="438" maxX="446" minY="381" maxY="389" name="none"/>
-  <symbol minX="446" maxX="461" minY="381" maxY="389" name="arrow-s"/>
-  <symbol minX="461" maxX="468" minY="381" maxY="388" name="tree-m"/>
-  <symbol minX="468" maxX="475" minY="381" maxY="388" name="entrance-xs"/>
-  <symbol minX="475" maxX="481" minY="381" maxY="387" name="zero-icon"/>
-  <symbol minX="481" maxX="487" minY="381" maxY="387" name="dot-s"/>
-  <symbol minX="487" maxX="493" minY="381" maxY="387" name="dot-s-light"/>
-  <symbol minX="493" maxX="499" minY="381" maxY="387" name="tree-s"/>
+  <symbol minX="294" maxX="315" minY="290" maxY="311" name="computer-m"/>
+  <symbol minX="315" maxX="336" minY="290" maxY="311" name="police-m"/>
+  <symbol minX="336" maxX="357" minY="290" maxY="311" name="subway-entrance-m"/>
+  <symbol minX="357" maxX="378" minY="290" maxY="311" name="subway-m"/>
+  <symbol minX="378" maxX="399" minY="290" maxY="311" name="postbox-m"/>
+  <symbol minX="399" maxX="420" minY="290" maxY="311" name="college-m"/>
+  <symbol minX="420" maxX="441" minY="290" maxY="311" name="clothes-m"/>
+  <symbol minX="441" maxX="461" minY="290" maxY="310" name="lightrail-berlin-m"/>
+  <symbol minX="461" maxX="481" minY="290" maxY="310" name="speedcam-l"/>
+  <symbol minX="481" maxX="501" minY="290" maxY="310" name="subway-berlin-l"/>
+  <symbol minX="0" maxX="20" minY="311" maxY="331" name="parking-l"/>
+  <symbol minX="20" maxX="40" minY="311" maxY="331" name="subway-rome-l"/>
+  <symbol minX="40" maxX="62" minY="311" maxY="330" name="subway-moscow-l"/>
+  <symbol minX="62" maxX="80" minY="311" maxY="329" name="subway-rome-m"/>
+  <symbol minX="80" maxX="98" minY="311" maxY="329" name="subway-berlin-m"/>
+  <symbol minX="98" maxX="116" minY="311" maxY="329" name="subway-paris-m"/>
+  <symbol minX="116" maxX="133" minY="311" maxY="329" name="picnic-s"/>
+  <symbol minX="133" maxX="150" minY="311" maxY="329" name="remains-s"/>
+  <symbol minX="150" maxX="167" minY="311" maxY="329" name="office-s"/>
+  <symbol minX="167" maxX="185" minY="311" maxY="329" name="no-icon"/>
+  <symbol minX="185" maxX="203" minY="311" maxY="329" name="no-icon-tourism"/>
+  <symbol minX="203" maxX="224" minY="311" maxY="329" name="subway-moscow-m"/>
+  <symbol minX="224" maxX="242" minY="311" maxY="329" name="no-icon-shop"/>
+  <symbol minX="242" maxX="260" minY="311" maxY="329" name="no-icon-leisure"/>
+  <symbol minX="260" maxX="278" minY="311" maxY="329" name="no-icon-amenity"/>
+  <symbol minX="278" maxX="295" minY="311" maxY="329" name="beer-s"/>
+  <symbol minX="295" maxX="312" minY="311" maxY="329" name="bcontrol-s"/>
+  <symbol minX="312" maxX="334" minY="311" maxY="329" name="subway-london-l"/>
+  <symbol minX="334" maxX="351" minY="311" maxY="329" name="waterfall-s"/>
+  <symbol minX="351" maxX="368" minY="311" maxY="329" name="hunting-tower-s"/>
+  <symbol minX="368" maxX="385" minY="311" maxY="329" name="heliport-s"/>
+  <symbol minX="385" maxX="403" minY="311" maxY="329" name="airport-s"/>
+  <symbol minX="403" maxX="420" minY="311" maxY="328" name="casino-s"/>
+  <symbol minX="420" maxX="437" minY="311" maxY="328" name="ship-s"/>
+  <symbol minX="437" maxX="454" minY="311" maxY="328" name="shop-s"/>
+  <symbol minX="454" maxX="471" minY="311" maxY="328" name="golf-s"/>
+  <symbol minX="471" maxX="488" minY="311" maxY="328" name="school-s"/>
+  <symbol minX="488" maxX="505" minY="311" maxY="328" name="skiing-s"/>
+  <symbol minX="0" maxX="17" minY="331" maxY="348" name="car-repair-s"/>
+  <symbol minX="17" maxX="34" minY="331" maxY="348" name="cave-s"/>
+  <symbol minX="34" maxX="51" minY="331" maxY="348" name="soccer-s"/>
+  <symbol minX="51" maxX="68" minY="331" maxY="348" name="basketball-s"/>
+  <symbol minX="68" maxX="85" minY="331" maxY="348" name="speedcam-m"/>
+  <symbol minX="85" maxX="102" minY="331" maxY="348" name="volcano-s"/>
+  <symbol minX="102" maxX="119" minY="331" maxY="348" name="campsite-s"/>
+  <symbol minX="119" maxX="136" minY="331" maxY="348" name="restaurant-s"/>
+  <symbol minX="136" maxX="153" minY="331" maxY="348" name="lighthouse-s"/>
+  <symbol minX="153" maxX="170" minY="331" maxY="348" name="grocery-s"/>
+  <symbol minX="170" maxX="187" minY="331" maxY="348" name="hand-s"/>
+  <symbol minX="187" maxX="204" minY="331" maxY="348" name="equestrian-s"/>
+  <symbol minX="204" maxX="221" minY="331" maxY="348" name="embassy-s"/>
+  <symbol minX="221" maxX="241" minY="331" maxY="348" name="subway-barcelona-s"/>
+  <symbol minX="241" maxX="258" minY="331" maxY="348" name="cemetery-s"/>
+  <symbol minX="258" maxX="275" minY="331" maxY="348" name="recycling-s"/>
+  <symbol minX="275" maxX="292" minY="331" maxY="348" name="baseball-s"/>
+  <symbol minX="292" maxX="309" minY="331" maxY="348" name="library-s"/>
+  <symbol minX="309" maxX="326" minY="331" maxY="348" name="subway-entrance-2-s"/>
+  <symbol minX="326" maxX="343" minY="331" maxY="348" name="subway-entrance-arrow"/>
+  <symbol minX="343" maxX="360" minY="331" maxY="348" name="pub-s"/>
+  <symbol minX="360" maxX="377" minY="331" maxY="348" name="cinema-s"/>
+  <symbol minX="377" maxX="394" minY="331" maxY="348" name="subway-entrance-s"/>
+  <symbol minX="394" maxX="411" minY="331" maxY="348" name="fastfood-s"/>
+  <symbol minX="411" maxX="428" minY="331" maxY="348" name="tram-s"/>
+  <symbol minX="428" maxX="445" minY="331" maxY="348" name="garden-s"/>
+  <symbol minX="445" maxX="462" minY="331" maxY="348" name="cafe-s"/>
+  <symbol minX="462" maxX="479" minY="331" maxY="348" name="power-s"/>
+  <symbol minX="479" maxX="500" minY="331" maxY="348" name="subway-london-m"/>
+  <symbol minX="0" maxX="17" minY="348" maxY="365" name="mail-s"/>
+  <symbol minX="17" maxX="34" minY="348" maxY="365" name="college-s"/>
+  <symbol minX="34" maxX="51" minY="348" maxY="365" name="train-s"/>
+  <symbol minX="51" maxX="68" minY="348" maxY="365" name="military-s"/>
+  <symbol minX="68" maxX="85" minY="348" maxY="365" name="drinking-water-s"/>
+  <symbol minX="85" maxX="102" minY="348" maxY="365" name="monument-s"/>
+  <symbol minX="102" maxX="119" minY="348" maxY="365" name="america-football-s"/>
+  <symbol minX="119" maxX="136" minY="348" maxY="365" name="helipad-s"/>
+  <symbol minX="136" maxX="153" minY="348" maxY="365" name="police-s"/>
+  <symbol minX="153" maxX="170" minY="348" maxY="365" name="place-of-worship-s"/>
+  <symbol minX="170" maxX="187" minY="348" maxY="365" name="townhall-s"/>
+  <symbol minX="187" maxX="204" minY="348" maxY="365" name="pitch-s"/>
+  <symbol minX="204" maxX="221" minY="348" maxY="365" name="gallery-s"/>
+  <symbol minX="221" maxX="238" minY="348" maxY="365" name="subway-newyork-s"/>
+  <symbol minX="238" maxX="255" minY="348" maxY="365" name="atm-s"/>
+  <symbol minX="255" maxX="272" minY="348" maxY="365" name="cable-car-s"/>
+  <symbol minX="272" maxX="289" minY="348" maxY="365" name="hospital-s"/>
+  <symbol minX="289" maxX="306" minY="348" maxY="365" name="fire_station-s"/>
+  <symbol minX="306" maxX="323" minY="348" maxY="365" name="phone-s"/>
+  <symbol minX="323" maxX="340" minY="348" maxY="365" name="funicular-s"/>
+  <symbol minX="340" maxX="357" minY="348" maxY="365" name="tourism-s"/>
+  <symbol minX="357" maxX="374" minY="348" maxY="365" name="subway-s"/>
+  <symbol minX="374" maxX="391" minY="348" maxY="365" name="pharmacy-s"/>
+  <symbol minX="391" maxX="408" minY="348" maxY="365" name="hotel-s"/>
+  <symbol minX="408" maxX="425" minY="348" maxY="365" name="subway-spb-s"/>
+  <symbol minX="425" maxX="442" minY="348" maxY="365" name="museum-s"/>
+  <symbol minX="442" maxX="459" minY="348" maxY="365" name="bar-s"/>
+  <symbol minX="459" maxX="476" minY="348" maxY="365" name="fuel-s"/>
+  <symbol minX="476" maxX="493" minY="348" maxY="365" name="alcohol-s"/>
+  <symbol minX="493" maxX="510" minY="348" maxY="365" name="zoo-s"/>
+  <symbol minX="0" maxX="17" minY="365" maxY="382" name="kindergarten-s"/>
+  <symbol minX="17" maxX="34" minY="365" maxY="382" name="bus-s"/>
+  <symbol minX="34" maxX="51" minY="365" maxY="382" name="information-s"/>
+  <symbol minX="51" maxX="68" minY="365" maxY="382" name="swimming-s"/>
+  <symbol minX="68" maxX="85" minY="365" maxY="382" name="fountain-s"/>
+  <symbol minX="85" maxX="102" minY="365" maxY="382" name="bicycle-s"/>
+  <symbol minX="102" maxX="119" minY="365" maxY="382" name="npark-s"/>
+  <symbol minX="119" maxX="136" minY="365" maxY="382" name="dentist-s"/>
+  <symbol minX="136" maxX="153" minY="365" maxY="382" name="tennis-s"/>
+  <symbol minX="153" maxX="170" minY="365" maxY="382" name="windmill-s"/>
+  <symbol minX="170" maxX="187" minY="365" maxY="382" name="park-s"/>
+  <symbol minX="187" maxX="204" minY="365" maxY="382" name="theatre-s"/>
+  <symbol minX="204" maxX="221" minY="365" maxY="382" name="book-shop-s"/>
+  <symbol minX="221" maxX="238" minY="365" maxY="382" name="nparkf-s"/>
+  <symbol minX="238" maxX="255" minY="365" maxY="382" name="toilets-s"/>
+  <symbol minX="255" maxX="271" minY="365" maxY="381" name="parking-m"/>
+  <symbol minX="271" maxX="293" minY="365" maxY="381" name="subway-barcelona-l"/>
+  <symbol minX="293" maxX="315" minY="365" maxY="381" name="subway-barcelona-m"/>
+  <symbol minX="315" maxX="337" minY="365" maxY="381" name="metro-barcelona-m"/>
+  <symbol minX="337" maxX="359" minY="365" maxY="381" name="subway-madrid-l"/>
+  <symbol minX="359" maxX="374" minY="365" maxY="381" name="s-arrow"/>
+  <symbol minX="374" maxX="396" minY="365" maxY="381" name="subway-madrid-m"/>
+  <symbol minX="396" maxX="417" minY="365" maxY="380" name="subway-kiev-m"/>
+  <symbol minX="417" maxX="432" minY="365" maxY="380" name="subway-paris-s"/>
+  <symbol minX="432" maxX="447" minY="365" maxY="380" name="subway-moscow-s"/>
+  <symbol minX="447" maxX="462" minY="365" maxY="380" name="lightrail-berlin-s"/>
+  <symbol minX="462" maxX="482" minY="365" maxY="380" name="subway-madrid-s"/>
+  <symbol minX="482" maxX="497" minY="365" maxY="380" name="peak-l"/>
+  <symbol minX="0" maxX="21" minY="382" maxY="397" name="subway-kiev-l"/>
+  <symbol minX="21" maxX="41" minY="382" maxY="397" name="metro-barcelona-s"/>
+  <symbol minX="41" maxX="55" minY="382" maxY="396" name="subway-rome-s"/>
+  <symbol minX="55" maxX="72" minY="382" maxY="396" name="subway-london-s"/>
+  <symbol minX="72" maxX="86" minY="382" maxY="396" name="speedcam-s"/>
+  <symbol minX="86" maxX="100" minY="382" maxY="396" name="parking-s"/>
+  <symbol minX="100" maxX="114" minY="382" maxY="396" name="route_from"/>
+  <symbol minX="114" maxX="128" minY="382" maxY="396" name="subway-berlin-s"/>
+  <symbol minX="128" maxX="143" minY="382" maxY="396" name="bench"/>
+  <symbol minX="143" maxX="164" minY="382" maxY="395" name="subway-minsk-l"/>
+  <symbol minX="164" maxX="177" minY="382" maxY="395" name="current-position"/>
+  <symbol minX="177" maxX="190" minY="382" maxY="395" name="star-l"/>
+  <symbol minX="190" maxX="203" minY="382" maxY="395" name="survey_point-l"/>
+  <symbol minX="203" maxX="217" minY="382" maxY="395" name="peakt-l"/>
+  <symbol minX="217" maxX="229" minY="382" maxY="394" name="peak-m"/>
+  <symbol minX="229" maxX="241" minY="382" maxY="394" name="subway-xs"/>
+  <symbol minX="241" maxX="253" minY="382" maxY="394" name="star-m"/>
+  <symbol minX="253" maxX="265" minY="382" maxY="394" name="survey_point-m"/>
+  <symbol minX="265" maxX="282" minY="382" maxY="394" name="railway-crossing"/>
+  <symbol minX="282" maxX="300" minY="382" maxY="394" name="subway-kiev-s"/>
+  <symbol minX="300" maxX="318" minY="382" maxY="394" name="subway-minsk-m"/>
+  <symbol minX="318" maxX="330" minY="382" maxY="394" name="subway-newyork-xs"/>
+  <symbol minX="330" maxX="341" minY="382" maxY="393" name="crossing-l"/>
+  <symbol minX="341" maxX="358" minY="382" maxY="393" name="subway-minsk-s"/>
+  <symbol minX="358" maxX="369" minY="382" maxY="393" name="star-s"/>
+  <symbol minX="369" maxX="380" minY="382" maxY="393" name="api-result"/>
+  <symbol minX="380" maxX="391" minY="382" maxY="392" name="peakt-m"/>
+  <symbol minX="391" maxX="402" minY="382" maxY="392" name="peak-s"/>
+  <symbol minX="402" maxX="412" minY="382" maxY="392" name="survey_point-s"/>
+  <symbol minX="412" maxX="432" minY="382" maxY="392" name="arrow-m"/>
+  <symbol minX="432" maxX="442" minY="382" maxY="392" name="search-result"/>
+  <symbol minX="442" maxX="451" minY="382" maxY="391" name="peakt-s"/>
+  <symbol minX="451" maxX="460" minY="382" maxY="391" name="entrance-s"/>
+  <symbol minX="460" maxX="469" minY="382" maxY="391" name="crossing-m"/>
+  <symbol minX="469" maxX="484" minY="382" maxY="390" name="arrow-s"/>
+  <symbol minX="484" maxX="492" minY="382" maxY="390" name="dot-m"/>
+  <symbol minX="492" maxX="500" minY="382" maxY="390" name="crossing-s"/>
+  <symbol minX="500" maxX="508" minY="382" maxY="390" name="none"/>
+  <symbol minX="0" maxX="8" minY="397" maxY="405" name="tree-l"/>
+  <symbol minX="8" maxX="15" minY="397" maxY="404" name="entrance-xs"/>
+  <symbol minX="15" maxX="22" minY="397" maxY="404" name="tree-m"/>
+  <symbol minX="22" maxX="28" minY="397" maxY="403" name="dot-s"/>
+  <symbol minX="28" maxX="34" minY="397" maxY="403" name="zero-icon"/>
+  <symbol minX="34" maxX="40" minY="397" maxY="403" name="tree-s"/>
+  <symbol minX="40" maxX="46" minY="397" maxY="403" name="dot-s-light"/>
  </file>
 </root>
diff --git a/data/resources-ldpi_dark/symbols.png b/data/resources-ldpi_dark/symbols.png
index 7f6e2bcc79..2cab9c576d 100644
Binary files a/data/resources-ldpi_dark/symbols.png and b/data/resources-ldpi_dark/symbols.png differ
diff --git a/data/resources-ldpi_dark/symbols.sdf b/data/resources-ldpi_dark/symbols.sdf
index 70b6585c5f..db27eb31ea 100644
--- a/data/resources-ldpi_dark/symbols.sdf
+++ b/data/resources-ldpi_dark/symbols.sdf
@@ -8,454 +8,457 @@
   <symbol minX="214" maxX="236" minY="0" maxY="27" name="current-routing-compas"/>
   <symbol minX="236" maxX="260" minY="0" maxY="24" name="search-result-active"/>
   <symbol minX="260" maxX="282" minY="0" maxY="22" name="alpine_hut-l"/>
-  <symbol minX="282" maxX="294" minY="0" maxY="22" name="placemark-yellow"/>
-  <symbol minX="294" maxX="316" minY="0" maxY="22" name="america-football-l"/>
-  <symbol minX="316" maxX="328" minY="0" maxY="22" name="placemark-red"/>
-  <symbol minX="328" maxX="340" minY="0" maxY="22" name="placemark-purple"/>
-  <symbol minX="340" maxX="362" minY="0" maxY="22" name="archery-l"/>
-  <symbol minX="362" maxX="374" minY="0" maxY="22" name="placemark-pink"/>
-  <symbol minX="374" maxX="386" minY="0" maxY="22" name="placemark-orange"/>
-  <symbol minX="386" maxX="398" minY="0" maxY="22" name="placemark-green"/>
-  <symbol minX="398" maxX="420" minY="0" maxY="22" name="atm-l"/>
-  <symbol minX="420" maxX="432" minY="0" maxY="22" name="placemark-brown"/>
-  <symbol minX="432" maxX="444" minY="0" maxY="22" name="placemark-blue"/>
-  <symbol minX="444" maxX="466" minY="0" maxY="22" name="alcohol-l"/>
-  <symbol minX="466" maxX="488" minY="0" maxY="22" name="australian-football-l"/>
-  <symbol minX="488" maxX="510" minY="0" maxY="22" name="airport-m"/>
-  <symbol minX="0" maxX="22" minY="52" maxY="74" name="bakery-l"/>
-  <symbol minX="22" maxX="44" minY="52" maxY="74" name="airport-l"/>
-  <symbol minX="44" maxX="66" minY="52" maxY="74" name="zoo-l"/>
-  <symbol minX="66" maxX="88" minY="52" maxY="74" name="bank-l"/>
-  <symbol minX="88" maxX="109" minY="52" maxY="74" name="bank-m"/>
-  <symbol minX="109" maxX="131" minY="52" maxY="74" name="banknote-l"/>
-  <symbol minX="131" maxX="153" minY="52" maxY="74" name="windmill-l"/>
-  <symbol minX="153" maxX="175" minY="52" maxY="74" name="bar-l"/>
-  <symbol minX="175" maxX="197" minY="52" maxY="74" name="wayside_shrine-l"/>
-  <symbol minX="197" maxX="219" minY="52" maxY="74" name="wayside_cross-l"/>
-  <symbol minX="219" maxX="241" minY="52" maxY="74" name="baseball-l"/>
-  <symbol minX="241" maxX="263" minY="52" maxY="74" name="waterfall-l"/>
-  <symbol minX="263" maxX="285" minY="52" maxY="74" name="volcano-l"/>
-  <symbol minX="285" maxX="307" minY="52" maxY="74" name="basketball-l"/>
-  <symbol minX="307" maxX="329" minY="52" maxY="74" name="vending-l"/>
-  <symbol minX="329" maxX="351" minY="52" maxY="74" name="tram-l"/>
-  <symbol minX="351" maxX="373" minY="52" maxY="74" name="bbq-l"/>
-  <symbol minX="373" maxX="395" minY="52" maxY="74" name="train-l"/>
-  <symbol minX="395" maxX="417" minY="52" maxY="74" name="bcontrol-l"/>
-  <symbol minX="417" maxX="439" minY="52" maxY="74" name="toys-l"/>
-  <symbol minX="439" maxX="461" minY="52" maxY="74" name="townhall-l"/>
-  <symbol minX="461" maxX="483" minY="52" maxY="74" name="beach-l"/>
-  <symbol minX="483" maxX="505" minY="52" maxY="74" name="tourism-l"/>
-  <symbol minX="0" maxX="22" minY="74" maxY="96" name="beauty-l"/>
-  <symbol minX="22" maxX="44" minY="74" maxY="96" name="tomb-l"/>
-  <symbol minX="44" maxX="66" minY="74" maxY="96" name="beer-l"/>
-  <symbol minX="66" maxX="88" minY="74" maxY="96" name="toll_booth-l"/>
-  <symbol minX="88" maxX="110" minY="74" maxY="96" name="toilets-l"/>
-  <symbol minX="110" maxX="132" minY="74" maxY="96" name="theatre-l"/>
-  <symbol minX="132" maxX="154" minY="74" maxY="96" name="bicycle-l"/>
-  <symbol minX="154" maxX="176" minY="74" maxY="96" name="tennis-l"/>
-  <symbol minX="176" maxX="198" minY="74" maxY="96" name="taxi-l"/>
-  <symbol minX="198" maxX="220" minY="74" maxY="96" name="book-shop-l"/>
-  <symbol minX="220" maxX="242" minY="74" maxY="96" name="swimming-l"/>
-  <symbol minX="242" maxX="264" minY="74" maxY="96" name="sweets-l"/>
-  <symbol minX="264" maxX="286" minY="74" maxY="96" name="boundary_stone-l"/>
-  <symbol minX="286" maxX="308" minY="74" maxY="96" name="subway-spb-l"/>
-  <symbol minX="308" maxX="330" minY="74" maxY="96" name="bowls-l"/>
-  <symbol minX="330" maxX="352" minY="74" maxY="96" name="subway-paris-l"/>
-  <symbol minX="352" maxX="374" minY="74" maxY="96" name="bus-l"/>
-  <symbol minX="374" maxX="396" minY="74" maxY="96" name="subway-newyork-l"/>
-  <symbol minX="396" maxX="418" minY="74" maxY="96" name="subway-l"/>
-  <symbol minX="418" maxX="440" minY="74" maxY="96" name="butcher-l"/>
-  <symbol minX="440" maxX="462" minY="74" maxY="96" name="subway-entrance-l"/>
-  <symbol minX="462" maxX="484" minY="74" maxY="96" name="cable-car-l"/>
-  <symbol minX="484" maxX="506" minY="74" maxY="96" name="sports-l"/>
-  <symbol minX="0" maxX="22" minY="96" maxY="118" name="soccer-l"/>
-  <symbol minX="22" maxX="44" minY="96" maxY="118" name="cafe-l"/>
-  <symbol minX="44" maxX="66" minY="96" maxY="118" name="skiing-l"/>
-  <symbol minX="66" maxX="88" minY="96" maxY="118" name="shop-l"/>
-  <symbol minX="88" maxX="110" minY="96" maxY="118" name="campsite-l"/>
-  <symbol minX="110" maxX="132" minY="96" maxY="118" name="shop-l copy"/>
-  <symbol minX="132" maxX="154" minY="96" maxY="118" name="shop-bicycle-l"/>
-  <symbol minX="154" maxX="176" minY="96" maxY="118" name="car-repair-l"/>
-  <symbol minX="176" maxX="198" minY="96" maxY="118" name="shoes-l"/>
-  <symbol minX="198" maxX="220" minY="96" maxY="118" name="ship-l"/>
-  <symbol minX="220" maxX="242" minY="96" maxY="118" name="car_sharing-l"/>
-  <symbol minX="242" maxX="264" minY="96" maxY="118" name="school-l"/>
-  <symbol minX="264" maxX="286" minY="96" maxY="118" name="caravan_site-l"/>
-  <symbol minX="286" maxX="308" minY="96" maxY="118" name="restaurant-l"/>
-  <symbol minX="308" maxX="330" minY="96" maxY="118" name="casino-l"/>
-  <symbol minX="330" maxX="352" minY="96" maxY="118" name="remains-l"/>
-  <symbol minX="352" maxX="374" minY="96" maxY="118" name="recycling-l"/>
-  <symbol minX="374" maxX="396" minY="96" maxY="118" name="cave-l"/>
-  <symbol minX="396" maxX="418" minY="96" maxY="118" name="pub-l"/>
-  <symbol minX="418" maxX="440" minY="96" maxY="118" name="power-m"/>
-  <symbol minX="440" maxX="462" minY="96" maxY="118" name="cemetery-l"/>
-  <symbol minX="462" maxX="484" minY="96" maxY="118" name="power-l"/>
-  <symbol minX="484" maxX="506" minY="96" maxY="118" name="postbox-l"/>
-  <symbol minX="0" maxX="22" minY="118" maxY="140" name="chemist-l"/>
-  <symbol minX="22" maxX="44" minY="118" maxY="140" name="police-l"/>
-  <symbol minX="44" maxX="66" minY="118" maxY="140" name="cinema-l"/>
-  <symbol minX="66" maxX="88" minY="118" maxY="140" name="place-of-worship-l"/>
-  <symbol minX="88" maxX="110" minY="118" maxY="140" name="pitch-l"/>
-  <symbol minX="110" maxX="132" minY="118" maxY="140" name="clothes-l"/>
-  <symbol minX="132" maxX="154" minY="118" maxY="140" name="picnic-l"/>
-  <symbol minX="154" maxX="176" minY="118" maxY="140" name="college-l"/>
-  <symbol minX="176" maxX="198" minY="118" maxY="140" name="phone-l"/>
-  <symbol minX="198" maxX="220" minY="118" maxY="140" name="pharmacy-l"/>
-  <symbol minX="220" maxX="242" minY="118" maxY="140" name="computer-l"/>
-  <symbol minX="242" maxX="264" minY="118" maxY="140" name="peak-l"/>
-  <symbol minX="264" maxX="286" minY="118" maxY="140" name="convenience-l"/>
-  <symbol minX="286" maxX="308" minY="118" maxY="140" name="parking-meter-l"/>
-  <symbol minX="308" maxX="330" minY="118" maxY="140" name="cricket-l"/>
-  <symbol minX="330" maxX="352" minY="118" maxY="140" name="park-l"/>
-  <symbol minX="352" maxX="374" minY="118" maxY="140" name="curling-l"/>
-  <symbol minX="374" maxX="396" minY="118" maxY="140" name="optician-l"/>
-  <symbol minX="396" maxX="418" minY="118" maxY="140" name="department_store-l"/>
-  <symbol minX="418" maxX="440" minY="118" maxY="140" name="office-l"/>
-  <symbol minX="440" maxX="462" minY="118" maxY="140" name="diving-l"/>
-  <symbol minX="462" maxX="484" minY="118" maxY="140" name="nparkf-l"/>
-  <symbol minX="484" maxX="506" minY="118" maxY="140" name="dog_park-l"/>
-  <symbol minX="0" maxX="22" minY="140" maxY="162" name="npark-l"/>
-  <symbol minX="22" maxX="44" minY="140" maxY="162" name="doityourself-l"/>
-  <symbol minX="44" maxX="66" minY="140" maxY="162" name="museum-l"/>
-  <symbol minX="66" maxX="88" minY="140" maxY="162" name="motel-l"/>
-  <symbol minX="88" maxX="110" minY="140" maxY="162" name="monument-l"/>
-  <symbol minX="110" maxX="132" minY="140" maxY="162" name="mobile_phone-l"/>
-  <symbol minX="132" maxX="154" minY="140" maxY="162" name="drinking-water-l"/>
-  <symbol minX="154" maxX="176" minY="140" maxY="162" name="military-l"/>
-  <symbol minX="176" maxX="198" minY="140" maxY="162" name="marketplace-l"/>
-  <symbol minX="198" maxX="220" minY="140" maxY="162" name="mail-l"/>
-  <symbol minX="220" maxX="242" minY="140" maxY="162" name="electronics-l"/>
-  <symbol minX="242" maxX="264" minY="140" maxY="162" name="lightrail-berlin-l"/>
-  <symbol minX="264" maxX="286" minY="140" maxY="162" name="embassy-l"/>
-  <symbol minX="286" maxX="308" minY="140" maxY="162" name="lighthouse-l"/>
-  <symbol minX="308" maxX="330" minY="140" maxY="162" name="lift_gate-l"/>
-  <symbol minX="330" maxX="352" minY="140" maxY="162" name="library-l"/>
-  <symbol minX="352" maxX="374" minY="140" maxY="162" name="laundry-l"/>
-  <symbol minX="374" maxX="396" minY="140" maxY="162" name="equestrian-l"/>
-  <symbol minX="396" maxX="418" minY="140" maxY="162" name="equestrian-m"/>
-  <symbol minX="418" maxX="440" minY="140" maxY="162" name="fastfood-l"/>
-  <symbol minX="440" maxX="462" minY="140" maxY="162" name="kiosk-l"/>
-  <symbol minX="462" maxX="484" minY="140" maxY="162" name="kindergarten-m"/>
-  <symbol minX="484" maxX="506" minY="140" maxY="162" name="fire_station-l"/>
-  <symbol minX="0" maxX="22" minY="162" maxY="184" name="kindergarten-l"/>
-  <symbol minX="22" maxX="44" minY="162" maxY="184" name="jewelry-l"/>
-  <symbol minX="44" maxX="66" minY="162" maxY="184" name="florist-l"/>
-  <symbol minX="66" maxX="88" minY="162" maxY="184" name="information-l"/>
-  <symbol minX="88" maxX="110" minY="162" maxY="184" name="fountain-l"/>
-  <symbol minX="110" maxX="132" minY="162" maxY="184" name="hunting-tower-l"/>
-  <symbol minX="132" maxX="154" minY="162" maxY="184" name="hotel-l"/>
-  <symbol minX="154" maxX="176" minY="162" maxY="184" name="fuel-l copy"/>
-  <symbol minX="176" maxX="198" minY="162" maxY="184" name="fuel-l"/>
-  <symbol minX="198" maxX="220" minY="162" maxY="184" name="hospital-l"/>
-  <symbol minX="220" maxX="242" minY="162" maxY="184" name="historic-ship-l"/>
-  <symbol minX="242" maxX="264" minY="162" maxY="184" name="funicular-l"/>
-  <symbol minX="264" maxX="286" minY="162" maxY="184" name="heliport-l"/>
-  <symbol minX="286" maxX="308" minY="162" maxY="184" name="helipad-l"/>
-  <symbol minX="308" maxX="330" minY="162" maxY="184" name="furniture-l"/>
-  <symbol minX="330" maxX="352" minY="162" maxY="184" name="hardware-l"/>
-  <symbol minX="352" maxX="374" minY="162" maxY="184" name="gallery-l"/>
-  <symbol minX="374" maxX="396" minY="162" maxY="184" name="hand-m"/>
-  <symbol minX="396" maxX="418" minY="162" maxY="184" name="hand-l"/>
-  <symbol minX="418" maxX="440" minY="162" maxY="184" name="garden-l"/>
-  <symbol minX="440" maxX="462" minY="162" maxY="184" name="hairdresser-l"/>
+  <symbol minX="282" maxX="304" minY="0" maxY="22" name="gate-l"/>
+  <symbol minX="304" maxX="326" minY="0" maxY="22" name="america-football-l"/>
+  <symbol minX="326" maxX="348" minY="0" maxY="22" name="shop-l copy"/>
+  <symbol minX="348" maxX="370" minY="0" maxY="22" name="shop-bicycle-l"/>
+  <symbol minX="370" maxX="392" minY="0" maxY="22" name="archery-l"/>
+  <symbol minX="392" maxX="414" minY="0" maxY="22" name="shoes-l"/>
+  <symbol minX="414" maxX="436" minY="0" maxY="22" name="alcohol-l"/>
+  <symbol minX="436" maxX="448" minY="0" maxY="22" name="placemark-yellow"/>
+  <symbol minX="448" maxX="470" minY="0" maxY="22" name="atm-l"/>
+  <symbol minX="470" maxX="492" minY="0" maxY="22" name="ship-l"/>
+  <symbol minX="492" maxX="504" minY="0" maxY="22" name="placemark-red"/>
+  <symbol minX="0" maxX="12" minY="52" maxY="74" name="placemark-purple"/>
+  <symbol minX="12" maxX="34" minY="52" maxY="74" name="australian-football-l"/>
+  <symbol minX="34" maxX="56" minY="52" maxY="74" name="school-l"/>
+  <symbol minX="56" maxX="78" minY="52" maxY="74" name="bakery-l"/>
+  <symbol minX="78" maxX="100" minY="52" maxY="74" name="skiing-l"/>
+  <symbol minX="100" maxX="122" minY="52" maxY="74" name="restaurant-l"/>
+  <symbol minX="122" maxX="144" minY="52" maxY="74" name="bank-l"/>
+  <symbol minX="144" maxX="165" minY="52" maxY="74" name="bank-m"/>
+  <symbol minX="165" maxX="187" minY="52" maxY="74" name="banknote-l"/>
+  <symbol minX="187" maxX="209" minY="52" maxY="74" name="soccer-l"/>
+  <symbol minX="209" maxX="231" minY="52" maxY="74" name="bar-l"/>
+  <symbol minX="231" maxX="253" minY="52" maxY="74" name="remains-l"/>
+  <symbol minX="253" maxX="265" minY="52" maxY="74" name="placemark-pink"/>
+  <symbol minX="265" maxX="287" minY="52" maxY="74" name="baseball-l"/>
+  <symbol minX="287" maxX="309" minY="52" maxY="74" name="recycling-l"/>
+  <symbol minX="309" maxX="321" minY="52" maxY="74" name="placemark-orange"/>
+  <symbol minX="321" maxX="343" minY="52" maxY="74" name="basketball-l"/>
+  <symbol minX="343" maxX="365" minY="52" maxY="74" name="sports-l"/>
+  <symbol minX="365" maxX="377" minY="52" maxY="74" name="placemark-green"/>
+  <symbol minX="377" maxX="399" minY="52" maxY="74" name="bbq-l"/>
+  <symbol minX="399" maxX="421" minY="52" maxY="74" name="pub-l"/>
+  <symbol minX="421" maxX="443" minY="52" maxY="74" name="bcontrol-l"/>
+  <symbol minX="443" maxX="465" minY="52" maxY="74" name="power-m"/>
+  <symbol minX="465" maxX="477" minY="52" maxY="74" name="placemark-brown"/>
+  <symbol minX="477" maxX="499" minY="52" maxY="74" name="beach-l"/>
+  <symbol minX="0" maxX="22" minY="74" maxY="96" name="power-l"/>
+  <symbol minX="22" maxX="44" minY="74" maxY="96" name="beauty-l"/>
+  <symbol minX="44" maxX="66" minY="74" maxY="96" name="postbox-l"/>
+  <symbol minX="66" maxX="88" minY="74" maxY="96" name="beer-l"/>
+  <symbol minX="88" maxX="110" minY="74" maxY="96" name="police-l"/>
+  <symbol minX="110" maxX="122" minY="74" maxY="96" name="placemark-blue"/>
+  <symbol minX="122" maxX="144" minY="74" maxY="96" name="place-of-worship-l"/>
+  <symbol minX="144" maxX="166" minY="74" maxY="96" name="bicycle-l"/>
+  <symbol minX="166" maxX="188" minY="74" maxY="96" name="pitch-l"/>
+  <symbol minX="188" maxX="210" minY="74" maxY="96" name="airport-m"/>
+  <symbol minX="210" maxX="232" minY="74" maxY="96" name="book-shop-l"/>
+  <symbol minX="232" maxX="254" minY="74" maxY="96" name="picnic-l"/>
+  <symbol minX="254" maxX="276" minY="74" maxY="96" name="airport-l"/>
+  <symbol minX="276" maxX="298" minY="74" maxY="96" name="boundary_stone-l"/>
+  <symbol minX="298" maxX="320" minY="74" maxY="96" name="subway-entrance-l"/>
+  <symbol minX="320" maxX="342" minY="74" maxY="96" name="bowls-l"/>
+  <symbol minX="342" maxX="364" minY="74" maxY="96" name="phone-l"/>
+  <symbol minX="364" maxX="386" minY="74" maxY="96" name="bus-l"/>
+  <symbol minX="386" maxX="408" minY="74" maxY="96" name="pharmacy-l"/>
+  <symbol minX="408" maxX="430" minY="74" maxY="96" name="subway-l"/>
+  <symbol minX="430" maxX="452" minY="74" maxY="96" name="butcher-l"/>
+  <symbol minX="452" maxX="474" minY="74" maxY="96" name="peak-l"/>
+  <symbol minX="474" maxX="496" minY="74" maxY="96" name="cable-car-l"/>
+  <symbol minX="0" maxX="22" minY="96" maxY="118" name="parking-meter-l"/>
+  <symbol minX="22" maxX="44" minY="96" maxY="118" name="zoo-l"/>
+  <symbol minX="44" maxX="66" minY="96" maxY="118" name="cafe-l"/>
+  <symbol minX="66" maxX="88" minY="96" maxY="118" name="subway-newyork-l"/>
+  <symbol minX="88" maxX="110" minY="96" maxY="118" name="park-l"/>
+  <symbol minX="110" maxX="132" minY="96" maxY="118" name="campsite-l"/>
+  <symbol minX="132" maxX="154" minY="96" maxY="118" name="optician-l"/>
+  <symbol minX="154" maxX="176" minY="96" maxY="118" name="windmill-l"/>
+  <symbol minX="176" maxX="198" minY="96" maxY="118" name="car-repair-l"/>
+  <symbol minX="198" maxX="220" minY="96" maxY="118" name="subway-paris-l"/>
+  <symbol minX="220" maxX="242" minY="96" maxY="118" name="office-l"/>
+  <symbol minX="242" maxX="264" minY="96" maxY="118" name="car_sharing-l"/>
+  <symbol minX="264" maxX="286" minY="96" maxY="118" name="nparkf-l"/>
+  <symbol minX="286" maxX="308" minY="96" maxY="118" name="caravan_site-l"/>
+  <symbol minX="308" maxX="330" minY="96" maxY="118" name="npark-l"/>
+  <symbol minX="330" maxX="352" minY="96" maxY="118" name="casino-l"/>
+  <symbol minX="352" maxX="374" minY="96" maxY="118" name="subway-spb-l"/>
+  <symbol minX="374" maxX="396" minY="96" maxY="118" name="wayside_shrine-l"/>
+  <symbol minX="396" maxX="418" minY="96" maxY="118" name="cave-l"/>
+  <symbol minX="418" maxX="440" minY="96" maxY="118" name="museum-l"/>
+  <symbol minX="440" maxX="462" minY="96" maxY="118" name="motel-l"/>
+  <symbol minX="462" maxX="484" minY="96" maxY="118" name="cemetery-l"/>
+  <symbol minX="484" maxX="506" minY="96" maxY="118" name="monument-l"/>
+  <symbol minX="0" maxX="22" minY="118" maxY="140" name="wayside_cross-l"/>
+  <symbol minX="22" maxX="44" minY="118" maxY="140" name="chemist-l"/>
+  <symbol minX="44" maxX="66" minY="118" maxY="140" name="mobile_phone-l"/>
+  <symbol minX="66" maxX="88" minY="118" maxY="140" name="cinema-l"/>
+  <symbol minX="88" maxX="110" minY="118" maxY="140" name="sweets-l"/>
+  <symbol minX="110" maxX="132" minY="118" maxY="140" name="military-l"/>
+  <symbol minX="132" maxX="154" minY="118" maxY="140" name="clothes-l"/>
+  <symbol minX="154" maxX="176" minY="118" maxY="140" name="swimming-l"/>
+  <symbol minX="176" maxX="198" minY="118" maxY="140" name="college-l"/>
+  <symbol minX="198" maxX="220" minY="118" maxY="140" name="marketplace-l"/>
+  <symbol minX="220" maxX="242" minY="118" maxY="140" name="waterfall-l"/>
+  <symbol minX="242" maxX="264" minY="118" maxY="140" name="computer-l"/>
+  <symbol minX="264" maxX="286" minY="118" maxY="140" name="mail-l"/>
+  <symbol minX="286" maxX="308" minY="118" maxY="140" name="convenience-l"/>
+  <symbol minX="308" maxX="330" minY="118" maxY="140" name="taxi-l"/>
+  <symbol minX="330" maxX="352" minY="118" maxY="140" name="cricket-l"/>
+  <symbol minX="352" maxX="374" minY="118" maxY="140" name="lightrail-berlin-l"/>
+  <symbol minX="374" maxX="396" minY="118" maxY="140" name="curling-l"/>
+  <symbol minX="396" maxX="418" minY="118" maxY="140" name="lighthouse-l"/>
+  <symbol minX="418" maxX="440" minY="118" maxY="140" name="dentist-l"/>
+  <symbol minX="440" maxX="462" minY="118" maxY="140" name="dentist-m"/>
+  <symbol minX="462" maxX="484" minY="118" maxY="140" name="lift_gate-l"/>
+  <symbol minX="484" maxX="506" minY="118" maxY="140" name="department_store-l"/>
+  <symbol minX="0" maxX="22" minY="140" maxY="162" name="tennis-l"/>
+  <symbol minX="22" maxX="44" minY="140" maxY="162" name="diving-l"/>
+  <symbol minX="44" maxX="66" minY="140" maxY="162" name="library-l"/>
+  <symbol minX="66" maxX="88" minY="140" maxY="162" name="dog_park-l"/>
+  <symbol minX="88" maxX="110" minY="140" maxY="162" name="laundry-l"/>
+  <symbol minX="110" maxX="132" minY="140" maxY="162" name="doityourself-l"/>
+  <symbol minX="132" maxX="154" minY="140" maxY="162" name="kiosk-l"/>
+  <symbol minX="154" maxX="176" minY="140" maxY="162" name="volcano-l"/>
+  <symbol minX="176" maxX="198" minY="140" maxY="162" name="kindergarten-m"/>
+  <symbol minX="198" maxX="220" minY="140" maxY="162" name="vending-l"/>
+  <symbol minX="220" maxX="242" minY="140" maxY="162" name="drinking-water-l"/>
+  <symbol minX="242" maxX="264" minY="140" maxY="162" name="kindergarten-l"/>
+  <symbol minX="264" maxX="286" minY="140" maxY="162" name="jewelry-l"/>
+  <symbol minX="286" maxX="308" minY="140" maxY="162" name="theatre-l"/>
+  <symbol minX="308" maxX="330" minY="140" maxY="162" name="electronics-l"/>
+  <symbol minX="330" maxX="352" minY="140" maxY="162" name="information-l"/>
+  <symbol minX="352" maxX="374" minY="140" maxY="162" name="embassy-l"/>
+  <symbol minX="374" maxX="396" minY="140" maxY="162" name="hunting-tower-l"/>
+  <symbol minX="396" maxX="418" minY="140" maxY="162" name="tram-l"/>
+  <symbol minX="418" maxX="440" minY="140" maxY="162" name="hotel-l"/>
+  <symbol minX="440" maxX="462" minY="140" maxY="162" name="train-l"/>
+  <symbol minX="462" maxX="484" minY="140" maxY="162" name="equestrian-l"/>
+  <symbol minX="484" maxX="506" minY="140" maxY="162" name="equestrian-m"/>
+  <symbol minX="0" maxX="22" minY="162" maxY="184" name="fastfood-l"/>
+  <symbol minX="22" maxX="44" minY="162" maxY="184" name="toilets-l"/>
+  <symbol minX="44" maxX="66" minY="162" maxY="184" name="hospital-l"/>
+  <symbol minX="66" maxX="88" minY="162" maxY="184" name="fire_station-l"/>
+  <symbol minX="88" maxX="110" minY="162" maxY="184" name="historic-ship-l"/>
+  <symbol minX="110" maxX="132" minY="162" maxY="184" name="toys-l"/>
+  <symbol minX="132" maxX="154" minY="162" maxY="184" name="florist-l"/>
+  <symbol minX="154" maxX="176" minY="162" maxY="184" name="heliport-l"/>
+  <symbol minX="176" maxX="198" minY="162" maxY="184" name="fountain-l"/>
+  <symbol minX="198" maxX="220" minY="162" maxY="184" name="toll_booth-l"/>
+  <symbol minX="220" maxX="242" minY="162" maxY="184" name="helipad-l"/>
+  <symbol minX="242" maxX="264" minY="162" maxY="184" name="fuel-l copy"/>
+  <symbol minX="264" maxX="286" minY="162" maxY="184" name="fuel-l"/>
+  <symbol minX="286" maxX="308" minY="162" maxY="184" name="hardware-l"/>
+  <symbol minX="308" maxX="330" minY="162" maxY="184" name="townhall-l"/>
+  <symbol minX="330" maxX="352" minY="162" maxY="184" name="funicular-l"/>
+  <symbol minX="352" maxX="374" minY="162" maxY="184" name="hand-m"/>
+  <symbol minX="374" maxX="396" minY="162" maxY="184" name="hand-l"/>
+  <symbol minX="396" maxX="418" minY="162" maxY="184" name="furniture-l"/>
+  <symbol minX="418" maxX="440" minY="162" maxY="184" name="hairdresser-l"/>
+  <symbol minX="440" maxX="462" minY="162" maxY="184" name="gallery-l"/>
   <symbol minX="462" maxX="484" minY="162" maxY="184" name="grocery-l"/>
-  <symbol minX="484" maxX="506" minY="162" maxY="184" name="garden_center-l"/>
-  <symbol minX="0" maxX="22" minY="184" maxY="206" name="greengrocer-l"/>
-  <symbol minX="22" maxX="44" minY="184" maxY="206" name="gate-l"/>
-  <symbol minX="44" maxX="66" minY="184" maxY="206" name="golf-l"/>
-  <symbol minX="66" maxX="88" minY="184" maxY="206" name="gift-l"/>
-  <symbol minX="88" maxX="109" minY="184" maxY="205" name="gift-m"/>
-  <symbol minX="109" maxX="130" minY="184" maxY="205" name="gate-m"/>
-  <symbol minX="130" maxX="151" minY="184" maxY="205" name="golf-m"/>
-  <symbol minX="151" maxX="172" minY="184" maxY="205" name="alcohol-m"/>
-  <symbol minX="172" maxX="193" minY="184" maxY="205" name="garden_center-m"/>
-  <symbol minX="193" maxX="214" minY="184" maxY="205" name="greengrocer-m"/>
-  <symbol minX="214" maxX="235" minY="184" maxY="205" name="alpine_hut-m"/>
-  <symbol minX="235" maxX="256" minY="184" maxY="205" name="grocery-m"/>
-  <symbol minX="256" maxX="277" minY="184" maxY="205" name="america-football-m"/>
-  <symbol minX="277" maxX="298" minY="184" maxY="205" name="garden-m"/>
-  <symbol minX="298" maxX="319" minY="184" maxY="205" name="hairdresser-m"/>
-  <symbol minX="319" maxX="340" minY="184" maxY="205" name="archery-m"/>
-  <symbol minX="340" maxX="361" minY="184" maxY="205" name="gallery-m"/>
-  <symbol minX="361" maxX="382" minY="184" maxY="205" name="furniture-m"/>
-  <symbol minX="382" maxX="403" minY="184" maxY="205" name="hardware-m"/>
-  <symbol minX="403" maxX="424" minY="184" maxY="205" name="atm-m"/>
-  <symbol minX="424" maxX="445" minY="184" maxY="205" name="helipad-m"/>
-  <symbol minX="445" maxX="466" minY="184" maxY="205" name="australian-football-m"/>
-  <symbol minX="466" maxX="487" minY="184" maxY="205" name="funicular-m"/>
-  <symbol minX="487" maxX="508" minY="184" maxY="205" name="heliport-m"/>
-  <symbol minX="0" maxX="21" minY="206" maxY="227" name="bakery-m"/>
-  <symbol minX="21" maxX="42" minY="206" maxY="227" name="zoo-m"/>
-  <symbol minX="42" maxX="63" minY="206" maxY="227" name="historic-ship-m"/>
-  <symbol minX="63" maxX="84" minY="206" maxY="227" name="fuel-m"/>
-  <symbol minX="84" maxX="105" minY="206" maxY="227" name="hospital-m"/>
-  <symbol minX="105" maxX="126" minY="206" maxY="227" name="bank-2-m"/>
-  <symbol minX="126" maxX="147" minY="206" maxY="227" name="windmill-m"/>
-  <symbol minX="147" maxX="168" minY="206" maxY="227" name="hotel-m"/>
-  <symbol minX="168" maxX="189" minY="206" maxY="227" name="banknote-m"/>
-  <symbol minX="189" maxX="210" minY="206" maxY="227" name="fountain-m"/>
-  <symbol minX="210" maxX="231" minY="206" maxY="227" name="hunting-tower-m"/>
-  <symbol minX="231" maxX="252" minY="206" maxY="227" name="florist-m"/>
-  <symbol minX="252" maxX="273" minY="206" maxY="227" name="information-m"/>
-  <symbol minX="273" maxX="294" minY="206" maxY="227" name="wayside_shrine-m"/>
-  <symbol minX="294" maxX="315" minY="206" maxY="227" name="bar-m"/>
-  <symbol minX="315" maxX="336" minY="206" maxY="227" name="jewelry-m"/>
-  <symbol minX="336" maxX="357" minY="206" maxY="227" name="fire_station-m"/>
-  <symbol minX="357" maxX="378" minY="206" maxY="227" name="wayside_cross-m"/>
-  <symbol minX="378" maxX="399" minY="206" maxY="227" name="waterfall-m"/>
-  <symbol minX="399" maxX="420" minY="206" maxY="227" name="fastfood-m"/>
-  <symbol minX="420" maxX="441" minY="206" maxY="227" name="kiosk-m"/>
-  <symbol minX="441" maxX="462" minY="206" maxY="227" name="baseball-m"/>
-  <symbol minX="462" maxX="483" minY="206" maxY="227" name="laundry-m"/>
-  <symbol minX="483" maxX="504" minY="206" maxY="227" name="volcano-m"/>
-  <symbol minX="0" maxX="21" minY="227" maxY="248" name="library-m"/>
-  <symbol minX="21" maxX="42" minY="227" maxY="248" name="vending-m"/>
-  <symbol minX="42" maxX="63" minY="227" maxY="248" name="basketball-m"/>
-  <symbol minX="63" maxX="84" minY="227" maxY="248" name="lift_gate-m"/>
-  <symbol minX="84" maxX="105" minY="227" maxY="248" name="embassy-m"/>
-  <symbol minX="105" maxX="126" minY="227" maxY="248" name="lighthouse-m"/>
-  <symbol minX="126" maxX="147" minY="227" maxY="248" name="tram-m"/>
-  <symbol minX="147" maxX="168" minY="227" maxY="248" name="electronics-m"/>
-  <symbol minX="168" maxX="189" minY="227" maxY="248" name="train-m"/>
-  <symbol minX="189" maxX="210" minY="227" maxY="248" name="bbq-m"/>
-  <symbol minX="210" maxX="231" minY="227" maxY="248" name="drugs"/>
-  <symbol minX="231" maxX="252" minY="227" maxY="248" name="mail-m"/>
-  <symbol minX="252" maxX="273" minY="227" maxY="248" name="toys-m"/>
-  <symbol minX="273" maxX="294" minY="227" maxY="248" name="bcontrol-m"/>
-  <symbol minX="294" maxX="315" minY="227" maxY="248" name="marketplace-m"/>
-  <symbol minX="315" maxX="336" minY="227" maxY="248" name="townhall-m"/>
-  <symbol minX="336" maxX="357" minY="227" maxY="248" name="tourism-m"/>
-  <symbol minX="357" maxX="378" minY="227" maxY="248" name="drinking-water-m"/>
-  <symbol minX="378" maxX="399" minY="227" maxY="248" name="military-m"/>
-  <symbol minX="399" maxX="420" minY="227" maxY="248" name="beach-m"/>
-  <symbol minX="420" maxX="441" minY="227" maxY="248" name="tomb-m"/>
-  <symbol minX="441" maxX="462" minY="227" maxY="248" name="mobile_phone-m"/>
-  <symbol minX="462" maxX="483" minY="227" maxY="248" name="beauty-m"/>
-  <symbol minX="483" maxX="504" minY="227" maxY="248" name="monument-m"/>
-  <symbol minX="0" maxX="21" minY="248" maxY="269" name="toll_booth-m"/>
-  <symbol minX="21" maxX="42" minY="248" maxY="269" name="beer-m"/>
-  <symbol minX="42" maxX="63" minY="248" maxY="269" name="motel-m"/>
-  <symbol minX="63" maxX="84" minY="248" maxY="269" name="doityourself-m"/>
-  <symbol minX="84" maxX="105" minY="248" maxY="269" name="museum-m"/>
-  <symbol minX="105" maxX="126" minY="248" maxY="269" name="toilets-m"/>
-  <symbol minX="126" maxX="147" minY="248" maxY="269" name="theatre-m"/>
-  <symbol minX="147" maxX="168" minY="248" maxY="269" name="tennis-m"/>
-  <symbol minX="168" maxX="189" minY="248" maxY="269" name="bicycle-m"/>
-  <symbol minX="189" maxX="210" minY="248" maxY="269" name="taxi-m"/>
-  <symbol minX="210" maxX="231" minY="248" maxY="269" name="swimming-m"/>
-  <symbol minX="231" maxX="252" minY="248" maxY="269" name="book-shop-m"/>
-  <symbol minX="252" maxX="273" minY="248" maxY="269" name="dog_park-m"/>
-  <symbol minX="273" maxX="294" minY="248" maxY="269" name="npark-m"/>
-  <symbol minX="294" maxX="315" minY="248" maxY="269" name="sweets-m"/>
-  <symbol minX="315" maxX="336" minY="248" maxY="269" name="diving-m"/>
-  <symbol minX="336" maxX="357" minY="248" maxY="269" name="nparkf-m"/>
-  <symbol minX="357" maxX="378" minY="248" maxY="269" name="subway-spb-m"/>
-  <symbol minX="378" maxX="399" minY="248" maxY="269" name="department_store-m"/>
-  <symbol minX="399" maxX="420" minY="248" maxY="269" name="office-m"/>
-  <symbol minX="420" maxX="441" minY="248" maxY="269" name="boundary_stone-m"/>
-  <symbol minX="441" maxX="462" minY="248" maxY="269" name="curling-m"/>
-  <symbol minX="462" maxX="483" minY="248" maxY="269" name="optician-m"/>
-  <symbol minX="483" maxX="504" minY="248" maxY="269" name="cricket-m"/>
-  <symbol minX="0" maxX="21" minY="269" maxY="290" name="park-m"/>
-  <symbol minX="21" maxX="42" minY="269" maxY="290" name="bowls-m"/>
-  <symbol minX="42" maxX="63" minY="269" maxY="290" name="subway-newyork-m"/>
-  <symbol minX="63" maxX="84" minY="269" maxY="290" name="bus-m"/>
-  <symbol minX="84" maxX="105" minY="269" maxY="290" name="convenience-m"/>
-  <symbol minX="105" maxX="126" minY="269" maxY="290" name="parking-meter-m"/>
-  <symbol minX="126" maxX="147" minY="269" maxY="290" name="subway-m"/>
-  <symbol minX="147" maxX="168" minY="269" maxY="290" name="computer-m"/>
-  <symbol minX="168" maxX="189" minY="269" maxY="290" name="peak-m"/>
-  <symbol minX="189" maxX="210" minY="269" maxY="290" name="subway-entrance-m"/>
-  <symbol minX="210" maxX="231" minY="269" maxY="290" name="butcher-m"/>
-  <symbol minX="231" maxX="252" minY="269" maxY="290" name="subway-entrance-2-m"/>
-  <symbol minX="252" maxX="273" minY="269" maxY="290" name="sports-m"/>
-  <symbol minX="273" maxX="294" minY="269" maxY="290" name="cable-car-m"/>
-  <symbol minX="294" maxX="315" minY="269" maxY="290" name="pharmacy-m"/>
-  <symbol minX="315" maxX="336" minY="269" maxY="290" name="soccer-m"/>
-  <symbol minX="336" maxX="357" minY="269" maxY="290" name="college-m"/>
-  <symbol minX="357" maxX="378" minY="269" maxY="290" name="phone-m"/>
-  <symbol minX="378" maxX="399" minY="269" maxY="290" name="skiing-m"/>
-  <symbol minX="399" maxX="420" minY="269" maxY="290" name="clothes-m"/>
-  <symbol minX="420" maxX="441" minY="269" maxY="290" name="picnic-m"/>
-  <symbol minX="441" maxX="462" minY="269" maxY="290" name="cafe-m"/>
-  <symbol minX="462" maxX="483" minY="269" maxY="290" name="shop-m"/>
-  <symbol minX="483" maxX="504" minY="269" maxY="290" name="pitch-m"/>
-  <symbol minX="0" maxX="21" minY="290" maxY="311" name="shop-m copy"/>
-  <symbol minX="21" maxX="42" minY="290" maxY="311" name="cinema-m"/>
-  <symbol minX="42" maxX="63" minY="290" maxY="311" name="place-of-worship-m"/>
-  <symbol minX="63" maxX="84" minY="290" maxY="311" name="campsite-m"/>
-  <symbol minX="84" maxX="105" minY="290" maxY="311" name="chemist-m"/>
-  <symbol minX="105" maxX="126" minY="290" maxY="311" name="police-m"/>
-  <symbol minX="126" maxX="147" minY="290" maxY="311" name="shop-bicycle-m"/>
-  <symbol minX="147" maxX="168" minY="290" maxY="311" name="shoes-m"/>
-  <symbol minX="168" maxX="189" minY="290" maxY="311" name="postbox-m"/>
-  <symbol minX="189" maxX="210" minY="290" maxY="311" name="cemetery-m"/>
-  <symbol minX="210" maxX="231" minY="290" maxY="311" name="car-repair-m"/>
-  <symbol minX="231" maxX="252" minY="290" maxY="311" name="cave-m"/>
-  <symbol minX="252" maxX="273" minY="290" maxY="311" name="pub-m"/>
-  <symbol minX="273" maxX="294" minY="290" maxY="311" name="ship-m"/>
-  <symbol minX="294" maxX="315" minY="290" maxY="311" name="school-m"/>
-  <symbol minX="315" maxX="336" minY="290" maxY="311" name="car_sharing-m"/>
-  <symbol minX="336" maxX="357" minY="290" maxY="311" name="recycling-m"/>
-  <symbol minX="357" maxX="378" minY="290" maxY="311" name="restaurant-m"/>
-  <symbol minX="378" maxX="399" minY="290" maxY="311" name="casino-m"/>
-  <symbol minX="399" maxX="420" minY="290" maxY="311" name="remains-m"/>
-  <symbol minX="420" maxX="441" minY="290" maxY="311" name="caravan_site-m"/>
-  <symbol minX="441" maxX="461" minY="290" maxY="310" name="lightrail-berlin-m"/>
-  <symbol minX="461" maxX="481" minY="290" maxY="310" name="speedcam-l"/>
-  <symbol minX="481" maxX="501" minY="290" maxY="310" name="subway-berlin-l"/>
-  <symbol minX="0" maxX="20" minY="311" maxY="331" name="parking-l"/>
-  <symbol minX="20" maxX="40" minY="311" maxY="331" name="subway-rome-l"/>
-  <symbol minX="40" maxX="62" minY="311" maxY="330" name="subway-moscow-l"/>
-  <symbol minX="62" maxX="80" minY="311" maxY="329" name="no-icon"/>
-  <symbol minX="80" maxX="98" minY="311" maxY="329" name="subway-rome-m"/>
-  <symbol minX="98" maxX="116" minY="311" maxY="329" name="no-icon-tourism"/>
-  <symbol minX="116" maxX="134" minY="311" maxY="329" name="subway-paris-m"/>
-  <symbol minX="134" maxX="152" minY="311" maxY="329" name="no-icon-shop"/>
-  <symbol minX="152" maxX="173" minY="311" maxY="329" name="subway-moscow-m"/>
-  <symbol minX="173" maxX="191" minY="311" maxY="329" name="airport-s"/>
-  <symbol minX="191" maxX="213" minY="311" maxY="329" name="subway-london-l"/>
-  <symbol minX="213" maxX="231" minY="311" maxY="329" name="subway-berlin-m"/>
-  <symbol minX="231" maxX="249" minY="311" maxY="329" name="no-icon-leisure"/>
-  <symbol minX="249" maxX="267" minY="311" maxY="329" name="no-icon-amenity"/>
-  <symbol minX="267" maxX="284" minY="311" maxY="328" name="cinema-s"/>
-  <symbol minX="284" maxX="301" minY="311" maxY="328" name="shop-s copy"/>
-  <symbol minX="301" maxX="318" minY="311" maxY="328" name="shop-s"/>
-  <symbol minX="318" maxX="335" minY="311" maxY="328" name="picnic-s"/>
-  <symbol minX="335" maxX="352" minY="311" maxY="328" name="phone-s"/>
-  <symbol minX="352" maxX="369" minY="311" maxY="328" name="skiing-s"/>
-  <symbol minX="369" maxX="386" minY="311" maxY="328" name="cable-car-s"/>
-  <symbol minX="386" maxX="403" minY="311" maxY="328" name="pharmacy-s"/>
-  <symbol minX="403" maxX="420" minY="311" maxY="328" name="soccer-s"/>
-  <symbol minX="420" maxX="437" minY="311" maxY="328" name="pitch-s"/>
-  <symbol minX="437" maxX="454" minY="311" maxY="328" name="speedcam-m"/>
-  <symbol minX="454" maxX="471" minY="311" maxY="328" name="fire_station-s"/>
-  <symbol minX="471" maxX="488" minY="311" maxY="328" name="college-s"/>
-  <symbol minX="488" maxX="505" minY="311" maxY="328" name="golf-s"/>
-  <symbol minX="0" maxX="17" minY="331" maxY="348" name="fastfood-s"/>
-  <symbol minX="17" maxX="34" minY="331" maxY="348" name="bar-s"/>
-  <symbol minX="34" maxX="51" minY="331" maxY="348" name="waterfall-s"/>
-  <symbol minX="51" maxX="68" minY="331" maxY="348" name="kindergarten-s"/>
-  <symbol minX="68" maxX="85" minY="331" maxY="348" name="information-s"/>
-  <symbol minX="85" maxX="105" minY="331" maxY="348" name="subway-barcelona-s"/>
-  <symbol minX="105" maxX="122" minY="331" maxY="348" name="cafe-s"/>
-  <symbol minX="122" maxX="139" minY="331" maxY="348" name="place-of-worship-s"/>
-  <symbol minX="139" maxX="156" minY="331" maxY="348" name="volcano-s"/>
-  <symbol minX="156" maxX="173" minY="331" maxY="348" name="alcohol-s"/>
-  <symbol minX="173" maxX="190" minY="331" maxY="348" name="subway-entrance-2-s"/>
-  <symbol minX="190" maxX="207" minY="331" maxY="348" name="subway-entrance-arrow"/>
-  <symbol minX="207" maxX="224" minY="331" maxY="348" name="hotel-s"/>
-  <symbol minX="224" maxX="241" minY="331" maxY="348" name="peak-s"/>
-  <symbol minX="241" maxX="258" minY="331" maxY="348" name="subway-entrance-s"/>
-  <symbol minX="258" maxX="275" minY="331" maxY="348" name="baseball-s"/>
-  <symbol minX="275" maxX="292" minY="331" maxY="348" name="library-s"/>
-  <symbol minX="292" maxX="309" minY="331" maxY="348" name="garden-s"/>
-  <symbol minX="309" maxX="326" minY="331" maxY="348" name="bus-s"/>
-  <symbol minX="326" maxX="343" minY="331" maxY="348" name="police-s"/>
-  <symbol minX="343" maxX="364" minY="331" maxY="348" name="subway-london-m"/>
-  <symbol minX="364" maxX="381" minY="331" maxY="348" name="embassy-s"/>
-  <symbol minX="381" maxX="398" minY="331" maxY="348" name="fountain-s"/>
-  <symbol minX="398" maxX="415" minY="331" maxY="348" name="windmill-s"/>
-  <symbol minX="415" maxX="432" minY="331" maxY="348" name="hospital-s"/>
-  <symbol minX="432" maxX="449" minY="331" maxY="348" name="tram-s"/>
-  <symbol minX="449" maxX="466" minY="331" maxY="348" name="lighthouse-s"/>
-  <symbol minX="466" maxX="483" minY="331" maxY="348" name="grocery-s"/>
-  <symbol minX="483" maxX="500" minY="331" maxY="348" name="america-football-s"/>
-  <symbol minX="0" maxX="17" minY="348" maxY="365" name="campsite-s"/>
-  <symbol minX="17" maxX="34" minY="348" maxY="365" name="cemetery-s"/>
-  <symbol minX="34" maxX="51" minY="348" maxY="365" name="basketball-s"/>
-  <symbol minX="51" maxX="68" minY="348" maxY="365" name="train-s"/>
-  <symbol minX="68" maxX="85" minY="348" maxY="365" name="cave-s"/>
-  <symbol minX="85" maxX="102" minY="348" maxY="365" name="subway-newyork-s"/>
-  <symbol minX="102" maxX="119" minY="348" maxY="365" name="gallery-s"/>
-  <symbol minX="119" maxX="136" minY="348" maxY="365" name="park-s"/>
-  <symbol minX="136" maxX="153" minY="348" maxY="365" name="ship-s"/>
-  <symbol minX="153" maxX="170" minY="348" maxY="365" name="remains-s"/>
-  <symbol minX="170" maxX="187" minY="348" maxY="365" name="pub-s"/>
-  <symbol minX="187" maxX="204" minY="348" maxY="365" name="car-repair-s"/>
-  <symbol minX="204" maxX="221" minY="348" maxY="365" name="mail-s"/>
-  <symbol minX="221" maxX="238" minY="348" maxY="365" name="subway-s"/>
-  <symbol minX="238" maxX="255" minY="348" maxY="365" name="office-s"/>
-  <symbol minX="255" maxX="272" minY="348" maxY="365" name="nparkf-s"/>
-  <symbol minX="272" maxX="289" minY="348" maxY="365" name="subway-spb-s"/>
-  <symbol minX="289" maxX="306" minY="348" maxY="365" name="funicular-s"/>
-  <symbol minX="306" maxX="323" minY="348" maxY="365" name="atm-s copy 2"/>
-  <symbol minX="323" maxX="340" minY="348" maxY="365" name="drinking-water-s"/>
-  <symbol minX="340" maxX="357" minY="348" maxY="365" name="atm-s"/>
-  <symbol minX="357" maxX="374" minY="348" maxY="365" name="townhall-s"/>
-  <symbol minX="374" maxX="391" minY="348" maxY="365" name="book-shop-s"/>
-  <symbol minX="391" maxX="408" minY="348" maxY="365" name="npark-s"/>
-  <symbol minX="408" maxX="425" minY="348" maxY="365" name="helipad-s"/>
-  <symbol minX="425" maxX="442" minY="348" maxY="365" name="school-s"/>
-  <symbol minX="442" maxX="459" minY="348" maxY="365" name="swimming-s"/>
-  <symbol minX="459" maxX="476" minY="348" maxY="365" name="bicycle-s"/>
-  <symbol minX="476" maxX="493" minY="348" maxY="365" name="casino-s"/>
-  <symbol minX="493" maxX="510" minY="348" maxY="365" name="bcontrol-s"/>
-  <symbol minX="0" maxX="17" minY="365" maxY="382" name="restaurant-s"/>
-  <symbol minX="17" maxX="34" minY="365" maxY="382" name="tennis-s"/>
-  <symbol minX="34" maxX="51" minY="365" maxY="382" name="tourism-s"/>
-  <symbol minX="51" maxX="68" minY="365" maxY="382" name="recycling-s"/>
-  <symbol minX="68" maxX="85" minY="365" maxY="382" name="theatre-s"/>
-  <symbol minX="85" maxX="102" minY="365" maxY="382" name="beer-s"/>
-  <symbol minX="102" maxX="119" minY="365" maxY="382" name="museum-s"/>
-  <symbol minX="119" maxX="136" minY="365" maxY="382" name="toilets-s"/>
-  <symbol minX="136" maxX="153" minY="365" maxY="382" name="heliport-s"/>
-  <symbol minX="153" maxX="170" minY="365" maxY="382" name="monument-s"/>
-  <symbol minX="170" maxX="187" minY="365" maxY="382" name="zoo-s"/>
-  <symbol minX="187" maxX="204" minY="365" maxY="382" name="fuel-s"/>
-  <symbol minX="204" maxX="221" minY="365" maxY="382" name="military-s"/>
-  <symbol minX="221" maxX="243" minY="365" maxY="381" name="subway-madrid-m"/>
-  <symbol minX="243" maxX="265" minY="365" maxY="381" name="subway-barcelona-l"/>
-  <symbol minX="265" maxX="280" minY="365" maxY="381" name="s-arrow"/>
-  <symbol minX="280" maxX="302" minY="365" maxY="381" name="metro-barcelona-m"/>
-  <symbol minX="302" maxX="324" minY="365" maxY="381" name="subway-barcelona-m"/>
-  <symbol minX="324" maxX="346" minY="365" maxY="381" name="subway-madrid-l"/>
-  <symbol minX="346" maxX="362" minY="365" maxY="381" name="parking-m"/>
-  <symbol minX="362" maxX="377" minY="365" maxY="380" name="lightrail-berlin-s"/>
-  <symbol minX="377" maxX="392" minY="365" maxY="380" name="subway-paris-s"/>
-  <symbol minX="392" maxX="413" minY="365" maxY="380" name="subway-kiev-l"/>
-  <symbol minX="413" maxX="428" minY="365" maxY="380" name="subway-moscow-s"/>
-  <symbol minX="428" maxX="449" minY="365" maxY="380" name="subway-kiev-m"/>
-  <symbol minX="449" maxX="469" minY="365" maxY="380" name="subway-madrid-s"/>
-  <symbol minX="469" maxX="489" minY="365" maxY="380" name="metro-barcelona-s"/>
-  <symbol minX="489" maxX="503" minY="365" maxY="379" name="subway-berlin-s"/>
-  <symbol minX="0" maxX="14" minY="382" maxY="396" name="parking-s"/>
-  <symbol minX="14" maxX="31" minY="382" maxY="396" name="subway-london-s"/>
-  <symbol minX="31" maxX="45" minY="382" maxY="396" name="star-l"/>
-  <symbol minX="45" maxX="59" minY="382" maxY="396" name="subway-rome-s"/>
-  <symbol minX="59" maxX="73" minY="382" maxY="396" name="route_from"/>
-  <symbol minX="73" maxX="87" minY="382" maxY="396" name="speedcam-s"/>
-  <symbol minX="87" maxX="102" minY="382" maxY="396" name="bench"/>
-  <symbol minX="102" maxX="115" minY="382" maxY="395" name="current-position"/>
-  <symbol minX="115" maxX="129" minY="382" maxY="395" name="peakt-l"/>
-  <symbol minX="129" maxX="142" minY="382" maxY="395" name="star-m"/>
-  <symbol minX="142" maxX="163" minY="382" maxY="395" name="subway-minsk-l"/>
-  <symbol minX="163" maxX="176" minY="382" maxY="395" name="survey_point-l"/>
-  <symbol minX="176" maxX="188" minY="382" maxY="394" name="subway-xs"/>
-  <symbol minX="188" maxX="200" minY="382" maxY="394" name="survey_point-m"/>
-  <symbol minX="200" maxX="217" minY="382" maxY="394" name="railway-crossing"/>
-  <symbol minX="217" maxX="229" minY="382" maxY="394" name="star-s"/>
-  <symbol minX="229" maxX="241" minY="382" maxY="394" name="subway-newyork-xs"/>
-  <symbol minX="241" maxX="259" minY="382" maxY="394" name="subway-kiev-s"/>
-  <symbol minX="259" maxX="277" minY="382" maxY="394" name="subway-minsk-m"/>
-  <symbol minX="277" maxX="288" minY="382" maxY="393" name="subway-xs copy"/>
-  <symbol minX="288" maxX="299" minY="382" maxY="393" name="api-result"/>
-  <symbol minX="299" maxX="316" minY="382" maxY="393" name="subway-minsk-s"/>
-  <symbol minX="316" maxX="327" minY="382" maxY="392" name="peakt-m"/>
-  <symbol minX="327" maxX="347" minY="382" maxY="392" name="arrow-m"/>
-  <symbol minX="347" maxX="357" minY="382" maxY="392" name="survey_point-s"/>
-  <symbol minX="357" maxX="367" minY="382" maxY="392" name="search-result"/>
-  <symbol minX="367" maxX="376" minY="382" maxY="391" name="entrance-s"/>
-  <symbol minX="376" maxX="385" minY="382" maxY="391" name="peakt-s"/>
-  <symbol minX="385" maxX="394" minY="382" maxY="391" name="dot-m"/>
-  <symbol minX="394" maxX="402" minY="382" maxY="390" name="none"/>
-  <symbol minX="402" maxX="417" minY="382" maxY="390" name="arrow-s"/>
-  <symbol minX="417" maxX="425" minY="382" maxY="390" name="tree-l"/>
-  <symbol minX="425" maxX="432" minY="382" maxY="389" name="dot-s"/>
-  <symbol minX="432" maxX="439" minY="382" maxY="389" name="tree-m"/>
-  <symbol minX="439" maxX="446" minY="382" maxY="389" name="dot-s-light"/>
-  <symbol minX="446" maxX="453" minY="382" maxY="389" name="entrance-xs"/>
-  <symbol minX="453" maxX="459" minY="382" maxY="388" name="zero-icon"/>
-  <symbol minX="459" maxX="465" minY="382" maxY="388" name="tree-s"/>
+  <symbol minX="484" maxX="506" minY="162" maxY="184" name="tourism-l"/>
+  <symbol minX="0" maxX="22" minY="184" maxY="206" name="garden-l"/>
+  <symbol minX="22" maxX="44" minY="184" maxY="206" name="shop-l"/>
+  <symbol minX="44" maxX="66" minY="184" maxY="206" name="greengrocer-l"/>
+  <symbol minX="66" maxX="88" minY="184" maxY="206" name="garden_center-l"/>
+  <symbol minX="88" maxX="110" minY="184" maxY="206" name="tomb-l"/>
+  <symbol minX="110" maxX="132" minY="184" maxY="206" name="golf-l"/>
+  <symbol minX="132" maxX="154" minY="184" maxY="206" name="gift-l"/>
+  <symbol minX="154" maxX="175" minY="184" maxY="205" name="gate-m"/>
+  <symbol minX="175" maxX="196" minY="184" maxY="205" name="gift-m"/>
+  <symbol minX="196" maxX="217" minY="184" maxY="205" name="alpine_hut-m"/>
+  <symbol minX="217" maxX="238" minY="184" maxY="205" name="golf-m"/>
+  <symbol minX="238" maxX="259" minY="184" maxY="205" name="garden_center-m"/>
+  <symbol minX="259" maxX="280" minY="184" maxY="205" name="tomb-m"/>
+  <symbol minX="280" maxX="301" minY="184" maxY="205" name="greengrocer-m"/>
+  <symbol minX="301" maxX="322" minY="184" maxY="205" name="gallery-m"/>
+  <symbol minX="322" maxX="343" minY="184" maxY="205" name="grocery-m"/>
+  <symbol minX="343" maxX="364" minY="184" maxY="205" name="toll_booth-m"/>
+  <symbol minX="364" maxX="385" minY="184" maxY="205" name="furniture-m"/>
+  <symbol minX="385" maxX="406" minY="184" maxY="205" name="hairdresser-m"/>
+  <symbol minX="406" maxX="427" minY="184" maxY="205" name="tourism-m"/>
+  <symbol minX="427" maxX="448" minY="184" maxY="205" name="funicular-m"/>
+  <symbol minX="448" maxX="469" minY="184" maxY="205" name="fuel-m"/>
+  <symbol minX="469" maxX="490" minY="184" maxY="205" name="hardware-m"/>
+  <symbol minX="490" maxX="511" minY="184" maxY="205" name="townhall-m"/>
+  <symbol minX="0" maxX="21" minY="206" maxY="227" name="helipad-m"/>
+  <symbol minX="21" maxX="42" minY="206" maxY="227" name="fountain-m"/>
+  <symbol minX="42" maxX="63" minY="206" maxY="227" name="florist-m"/>
+  <symbol minX="63" maxX="84" minY="206" maxY="227" name="heliport-m"/>
+  <symbol minX="84" maxX="105" minY="206" maxY="227" name="toilets-m"/>
+  <symbol minX="105" maxX="126" minY="206" maxY="227" name="fire_station-m"/>
+  <symbol minX="126" maxX="147" minY="206" maxY="227" name="historic-ship-m"/>
+  <symbol minX="147" maxX="168" minY="206" maxY="227" name="toys-m"/>
+  <symbol minX="168" maxX="189" minY="206" maxY="227" name="hospital-m"/>
+  <symbol minX="189" maxX="210" minY="206" maxY="227" name="fastfood-m"/>
+  <symbol minX="210" maxX="231" minY="206" maxY="227" name="train-m"/>
+  <symbol minX="231" maxX="252" minY="206" maxY="227" name="hotel-m"/>
+  <symbol minX="252" maxX="273" minY="206" maxY="227" name="theatre-m"/>
+  <symbol minX="273" maxX="294" minY="206" maxY="227" name="embassy-m"/>
+  <symbol minX="294" maxX="315" minY="206" maxY="227" name="hunting-tower-m"/>
+  <symbol minX="315" maxX="336" minY="206" maxY="227" name="electronics-m"/>
+  <symbol minX="336" maxX="357" minY="206" maxY="227" name="information-m"/>
+  <symbol minX="357" maxX="378" minY="206" maxY="227" name="drugs"/>
+  <symbol minX="378" maxX="399" minY="206" maxY="227" name="tram-m"/>
+  <symbol minX="399" maxX="420" minY="206" maxY="227" name="jewelry-m"/>
+  <symbol minX="420" maxX="441" minY="206" maxY="227" name="drinking-water-m"/>
+  <symbol minX="441" maxX="462" minY="206" maxY="227" name="vending-m"/>
+  <symbol minX="462" maxX="483" minY="206" maxY="227" name="tennis-m"/>
+  <symbol minX="483" maxX="504" minY="206" maxY="227" name="doityourself-m"/>
+  <symbol minX="0" maxX="21" minY="227" maxY="248" name="kiosk-m"/>
+  <symbol minX="21" maxX="42" minY="227" maxY="248" name="dog_park-m"/>
+  <symbol minX="42" maxX="63" minY="227" maxY="248" name="laundry-m"/>
+  <symbol minX="63" maxX="84" minY="227" maxY="248" name="diving-m"/>
+  <symbol minX="84" maxX="105" minY="227" maxY="248" name="library-m"/>
+  <symbol minX="105" maxX="126" minY="227" maxY="248" name="department_store-m"/>
+  <symbol minX="126" maxX="147" minY="227" maxY="248" name="volcano-m"/>
+  <symbol minX="147" maxX="168" minY="227" maxY="248" name="lift_gate-m"/>
+  <symbol minX="168" maxX="189" minY="227" maxY="248" name="curling-m"/>
+  <symbol minX="189" maxX="210" minY="227" maxY="248" name="lighthouse-m"/>
+  <symbol minX="210" maxX="231" minY="227" maxY="248" name="taxi-m"/>
+  <symbol minX="231" maxX="252" minY="227" maxY="248" name="cricket-m"/>
+  <symbol minX="252" maxX="273" minY="227" maxY="248" name="america-football-m"/>
+  <symbol minX="273" maxX="294" minY="227" maxY="248" name="convenience-m"/>
+  <symbol minX="294" maxX="315" minY="227" maxY="248" name="computer-m"/>
+  <symbol minX="315" maxX="336" minY="227" maxY="248" name="mail-m"/>
+  <symbol minX="336" maxX="357" minY="227" maxY="248" name="swimming-m"/>
+  <symbol minX="357" maxX="378" minY="227" maxY="248" name="college-m"/>
+  <symbol minX="378" maxX="399" minY="227" maxY="248" name="marketplace-m"/>
+  <symbol minX="399" maxX="420" minY="227" maxY="248" name="clothes-m"/>
+  <symbol minX="420" maxX="441" minY="227" maxY="248" name="sweets-m"/>
+  <symbol minX="441" maxX="462" minY="227" maxY="248" name="waterfall-m"/>
+  <symbol minX="462" maxX="483" minY="227" maxY="248" name="military-m"/>
+  <symbol minX="483" maxX="504" minY="227" maxY="248" name="cinema-m"/>
+  <symbol minX="0" maxX="21" minY="248" maxY="269" name="chemist-m"/>
+  <symbol minX="21" maxX="42" minY="248" maxY="269" name="mobile_phone-m"/>
+  <symbol minX="42" maxX="63" minY="248" maxY="269" name="cemetery-m"/>
+  <symbol minX="63" maxX="84" minY="248" maxY="269" name="monument-m"/>
+  <symbol minX="84" maxX="105" minY="248" maxY="269" name="subway-spb-m"/>
+  <symbol minX="105" maxX="126" minY="248" maxY="269" name="wayside_cross-m"/>
+  <symbol minX="126" maxX="147" minY="248" maxY="269" name="motel-m"/>
+  <symbol minX="147" maxX="168" minY="248" maxY="269" name="cave-m"/>
+  <symbol minX="168" maxX="189" minY="248" maxY="269" name="museum-m"/>
+  <symbol minX="189" maxX="210" minY="248" maxY="269" name="casino-m"/>
+  <symbol minX="210" maxX="231" minY="248" maxY="269" name="shop-bicycle-m"/>
+  <symbol minX="231" maxX="252" minY="248" maxY="269" name="alcohol-m"/>
+  <symbol minX="252" maxX="273" minY="248" maxY="269" name="garden-m"/>
+  <symbol minX="273" maxX="294" minY="248" maxY="269" name="shoes-m"/>
+  <symbol minX="294" maxX="315" minY="248" maxY="269" name="archery-m"/>
+  <symbol minX="315" maxX="336" minY="248" maxY="269" name="shop-m copy"/>
+  <symbol minX="336" maxX="357" minY="248" maxY="269" name="caravan_site-m"/>
+  <symbol minX="357" maxX="378" minY="248" maxY="269" name="npark-m"/>
+  <symbol minX="378" maxX="399" minY="248" maxY="269" name="ship-m"/>
+  <symbol minX="399" maxX="420" minY="248" maxY="269" name="car_sharing-m"/>
+  <symbol minX="420" maxX="441" minY="248" maxY="269" name="nparkf-m"/>
+  <symbol minX="441" maxX="462" minY="248" maxY="269" name="atm-m"/>
+  <symbol minX="462" maxX="483" minY="248" maxY="269" name="wayside_shrine-m"/>
+  <symbol minX="483" maxX="504" minY="248" maxY="269" name="office-m"/>
+  <symbol minX="0" maxX="21" minY="269" maxY="290" name="car-repair-m"/>
+  <symbol minX="21" maxX="42" minY="269" maxY="290" name="campsite-m"/>
+  <symbol minX="42" maxX="63" minY="269" maxY="290" name="optician-m"/>
+  <symbol minX="63" maxX="84" minY="269" maxY="290" name="windmill-m"/>
+  <symbol minX="84" maxX="105" minY="269" maxY="290" name="park-m"/>
+  <symbol minX="105" maxX="126" minY="269" maxY="290" name="subway-newyork-m"/>
+  <symbol minX="126" maxX="147" minY="269" maxY="290" name="shop-m"/>
+  <symbol minX="147" maxX="168" minY="269" maxY="290" name="cafe-m"/>
+  <symbol minX="168" maxX="189" minY="269" maxY="290" name="cable-car-m"/>
+  <symbol minX="189" maxX="210" minY="269" maxY="290" name="parking-meter-m"/>
+  <symbol minX="210" maxX="231" minY="269" maxY="290" name="school-m"/>
+  <symbol minX="231" maxX="252" minY="269" maxY="290" name="butcher-m"/>
+  <symbol minX="252" maxX="273" minY="269" maxY="290" name="peak-m"/>
+  <symbol minX="273" maxX="294" minY="269" maxY="290" name="australian-football-m"/>
+  <symbol minX="294" maxX="315" minY="269" maxY="290" name="subway-m"/>
+  <symbol minX="315" maxX="336" minY="269" maxY="290" name="bakery-m"/>
+  <symbol minX="336" maxX="357" minY="269" maxY="290" name="zoo-m"/>
+  <symbol minX="357" maxX="378" minY="269" maxY="290" name="bus-m"/>
+  <symbol minX="378" maxX="399" minY="269" maxY="290" name="pharmacy-m"/>
+  <symbol minX="399" maxX="420" minY="269" maxY="290" name="subway-entrance-m"/>
+  <symbol minX="420" maxX="441" minY="269" maxY="290" name="bowls-m"/>
+  <symbol minX="441" maxX="462" minY="269" maxY="290" name="phone-m"/>
+  <symbol minX="462" maxX="483" minY="269" maxY="290" name="boundary_stone-m"/>
+  <symbol minX="483" maxX="504" minY="269" maxY="290" name="book-shop-m"/>
+  <symbol minX="0" maxX="21" minY="290" maxY="311" name="picnic-m"/>
+  <symbol minX="21" maxX="42" minY="290" maxY="311" name="subway-entrance-2-m"/>
+  <symbol minX="42" maxX="63" minY="290" maxY="311" name="bicycle-m"/>
+  <symbol minX="63" maxX="84" minY="290" maxY="311" name="pitch-m"/>
+  <symbol minX="84" maxX="105" minY="290" maxY="311" name="skiing-m"/>
+  <symbol minX="105" maxX="126" minY="290" maxY="311" name="restaurant-m"/>
+  <symbol minX="126" maxX="147" minY="290" maxY="311" name="place-of-worship-m"/>
+  <symbol minX="147" maxX="168" minY="290" maxY="311" name="bank-2-m"/>
+  <symbol minX="168" maxX="189" minY="290" maxY="311" name="beer-m"/>
+  <symbol minX="189" maxX="210" minY="290" maxY="311" name="police-m"/>
+  <symbol minX="210" maxX="231" minY="290" maxY="311" name="sports-m"/>
+  <symbol minX="231" maxX="252" minY="290" maxY="311" name="beauty-m"/>
+  <symbol minX="252" maxX="273" minY="290" maxY="311" name="postbox-m"/>
+  <symbol minX="273" maxX="294" minY="290" maxY="311" name="beach-m"/>
+  <symbol minX="294" maxX="315" minY="290" maxY="311" name="bcontrol-m"/>
+  <symbol minX="315" maxX="336" minY="290" maxY="311" name="bbq-m"/>
+  <symbol minX="336" maxX="357" minY="290" maxY="311" name="pub-m"/>
+  <symbol minX="357" maxX="378" minY="290" maxY="311" name="basketball-m"/>
+  <symbol minX="378" maxX="399" minY="290" maxY="311" name="banknote-m"/>
+  <symbol minX="399" maxX="420" minY="290" maxY="311" name="baseball-m"/>
+  <symbol minX="420" maxX="441" minY="290" maxY="311" name="recycling-m"/>
+  <symbol minX="441" maxX="462" minY="290" maxY="311" name="soccer-m"/>
+  <symbol minX="462" maxX="483" minY="290" maxY="311" name="bar-m"/>
+  <symbol minX="483" maxX="504" minY="290" maxY="311" name="remains-m"/>
+  <symbol minX="0" maxX="20" minY="311" maxY="331" name="speedcam-l"/>
+  <symbol minX="20" maxX="40" minY="311" maxY="331" name="subway-berlin-l"/>
+  <symbol minX="40" maxX="60" minY="311" maxY="331" name="lightrail-berlin-m"/>
+  <symbol minX="60" maxX="80" minY="311" maxY="331" name="subway-rome-l"/>
+  <symbol minX="80" maxX="100" minY="311" maxY="331" name="parking-l"/>
+  <symbol minX="100" maxX="122" minY="311" maxY="330" name="subway-moscow-l"/>
+  <symbol minX="122" maxX="143" minY="311" maxY="329" name="subway-moscow-m"/>
+  <symbol minX="143" maxX="165" minY="311" maxY="329" name="subway-london-l"/>
+  <symbol minX="165" maxX="183" minY="311" maxY="329" name="subway-paris-m"/>
+  <symbol minX="183" maxX="201" minY="311" maxY="329" name="subway-berlin-m"/>
+  <symbol minX="201" maxX="219" minY="311" maxY="329" name="subway-rome-m"/>
+  <symbol minX="219" maxX="237" minY="311" maxY="329" name="no-icon"/>
+  <symbol minX="237" maxX="255" minY="311" maxY="329" name="no-icon-tourism"/>
+  <symbol minX="255" maxX="273" minY="311" maxY="329" name="no-icon-leisure"/>
+  <symbol minX="273" maxX="291" minY="311" maxY="329" name="no-icon-amenity"/>
+  <symbol minX="291" maxX="309" minY="311" maxY="329" name="airport-s"/>
+  <symbol minX="309" maxX="327" minY="311" maxY="329" name="no-icon-shop"/>
+  <symbol minX="327" maxX="344" minY="311" maxY="328" name="ship-s"/>
+  <symbol minX="344" maxX="361" minY="311" maxY="328" name="school-s"/>
+  <symbol minX="361" maxX="378" minY="311" maxY="328" name="shop-s copy"/>
+  <symbol minX="378" maxX="395" minY="311" maxY="328" name="shop-s"/>
+  <symbol minX="395" maxX="412" minY="311" maxY="328" name="alcohol-s"/>
+  <symbol minX="412" maxX="429" minY="311" maxY="328" name="restaurant-s"/>
+  <symbol minX="429" maxX="446" minY="311" maxY="328" name="skiing-s"/>
+  <symbol minX="446" maxX="463" minY="311" maxY="328" name="remains-s"/>
+  <symbol minX="463" maxX="480" minY="311" maxY="328" name="recycling-s"/>
+  <symbol minX="480" maxX="497" minY="311" maxY="328" name="soccer-s"/>
+  <symbol minX="0" maxX="17" minY="331" maxY="348" name="america-football-s"/>
+  <symbol minX="17" maxX="34" minY="331" maxY="348" name="speedcam-m"/>
+  <symbol minX="34" maxX="51" minY="331" maxY="348" name="atm-s copy 2"/>
+  <symbol minX="51" maxX="68" minY="331" maxY="348" name="pub-s"/>
+  <symbol minX="68" maxX="85" minY="331" maxY="348" name="police-s"/>
+  <symbol minX="85" maxX="102" minY="331" maxY="348" name="atm-s"/>
+  <symbol minX="102" maxX="119" minY="331" maxY="348" name="bar-s"/>
+  <symbol minX="119" maxX="136" minY="331" maxY="348" name="baseball-s"/>
+  <symbol minX="136" maxX="153" minY="331" maxY="348" name="basketball-s"/>
+  <symbol minX="153" maxX="170" minY="331" maxY="348" name="bcontrol-s"/>
+  <symbol minX="170" maxX="190" minY="331" maxY="348" name="subway-barcelona-s"/>
+  <symbol minX="190" maxX="207" minY="331" maxY="348" name="place-of-worship-s"/>
+  <symbol minX="207" maxX="224" minY="331" maxY="348" name="pitch-s"/>
+  <symbol minX="224" maxX="241" minY="331" maxY="348" name="beer-s"/>
+  <symbol minX="241" maxX="258" minY="331" maxY="348" name="picnic-s"/>
+  <symbol minX="258" maxX="275" minY="331" maxY="348" name="subway-entrance-2-s"/>
+  <symbol minX="275" maxX="292" minY="331" maxY="348" name="subway-entrance-arrow"/>
+  <symbol minX="292" maxX="309" minY="331" maxY="348" name="phone-s"/>
+  <symbol minX="309" maxX="326" minY="331" maxY="348" name="pharmacy-s"/>
+  <symbol minX="326" maxX="343" minY="331" maxY="348" name="subway-entrance-s"/>
+  <symbol minX="343" maxX="360" minY="331" maxY="348" name="bicycle-s"/>
+  <symbol minX="360" maxX="377" minY="331" maxY="348" name="book-shop-s"/>
+  <symbol minX="377" maxX="394" minY="331" maxY="348" name="zoo-s"/>
+  <symbol minX="394" maxX="411" minY="331" maxY="348" name="bus-s"/>
+  <symbol minX="411" maxX="428" minY="331" maxY="348" name="cable-car-s"/>
+  <symbol minX="428" maxX="449" minY="331" maxY="348" name="subway-london-m"/>
+  <symbol minX="449" maxX="466" minY="331" maxY="348" name="windmill-s"/>
+  <symbol minX="466" maxX="483" minY="331" maxY="348" name="cafe-s"/>
+  <symbol minX="483" maxX="500" minY="331" maxY="348" name="campsite-s"/>
+  <symbol minX="0" maxX="17" minY="348" maxY="365" name="car-repair-s"/>
+  <symbol minX="17" maxX="34" minY="348" maxY="365" name="casino-s"/>
+  <symbol minX="34" maxX="51" minY="348" maxY="365" name="cave-s"/>
+  <symbol minX="51" maxX="68" minY="348" maxY="365" name="cemetery-s"/>
+  <symbol minX="68" maxX="85" minY="348" maxY="365" name="waterfall-s"/>
+  <symbol minX="85" maxX="102" minY="348" maxY="365" name="peak-s"/>
+  <symbol minX="102" maxX="119" minY="348" maxY="365" name="cinema-s"/>
+  <symbol minX="119" maxX="136" minY="348" maxY="365" name="college-s"/>
+  <symbol minX="136" maxX="153" minY="348" maxY="365" name="volcano-s"/>
+  <symbol minX="153" maxX="170" minY="348" maxY="365" name="park-s"/>
+  <symbol minX="170" maxX="187" minY="348" maxY="365" name="subway-newyork-s"/>
+  <symbol minX="187" maxX="204" minY="348" maxY="365" name="dentist-s"/>
+  <symbol minX="204" maxX="221" minY="348" maxY="365" name="office-s"/>
+  <symbol minX="221" maxX="238" minY="348" maxY="365" name="nparkf-s"/>
+  <symbol minX="238" maxX="255" minY="348" maxY="365" name="tram-s"/>
+  <symbol minX="255" maxX="272" minY="348" maxY="365" name="npark-s"/>
+  <symbol minX="272" maxX="289" minY="348" maxY="365" name="drinking-water-s"/>
+  <symbol minX="289" maxX="306" minY="348" maxY="365" name="embassy-s"/>
+  <symbol minX="306" maxX="323" minY="348" maxY="365" name="subway-s"/>
+  <symbol minX="323" maxX="340" minY="348" maxY="365" name="museum-s"/>
+  <symbol minX="340" maxX="357" minY="348" maxY="365" name="monument-s"/>
+  <symbol minX="357" maxX="374" minY="348" maxY="365" name="subway-spb-s"/>
+  <symbol minX="374" maxX="391" minY="348" maxY="365" name="train-s"/>
+  <symbol minX="391" maxX="408" minY="348" maxY="365" name="fastfood-s"/>
+  <symbol minX="408" maxX="425" minY="348" maxY="365" name="fire_station-s"/>
+  <symbol minX="425" maxX="442" minY="348" maxY="365" name="townhall-s"/>
+  <symbol minX="442" maxX="459" minY="348" maxY="365" name="fountain-s"/>
+  <symbol minX="459" maxX="476" minY="348" maxY="365" name="military-s"/>
+  <symbol minX="476" maxX="493" minY="348" maxY="365" name="fuel-s"/>
+  <symbol minX="493" maxX="510" minY="348" maxY="365" name="tourism-s"/>
+  <symbol minX="0" maxX="17" minY="365" maxY="382" name="mail-s"/>
+  <symbol minX="17" maxX="34" minY="365" maxY="382" name="swimming-s"/>
+  <symbol minX="34" maxX="51" minY="365" maxY="382" name="funicular-s"/>
+  <symbol minX="51" maxX="68" minY="365" maxY="382" name="lighthouse-s"/>
+  <symbol minX="68" maxX="85" minY="365" maxY="382" name="library-s"/>
+  <symbol minX="85" maxX="102" minY="365" maxY="382" name="kindergarten-s"/>
+  <symbol minX="102" maxX="119" minY="365" maxY="382" name="tennis-s"/>
+  <symbol minX="119" maxX="136" minY="365" maxY="382" name="information-s"/>
+  <symbol minX="136" maxX="153" minY="365" maxY="382" name="hotel-s"/>
+  <symbol minX="153" maxX="170" minY="365" maxY="382" name="theatre-s"/>
+  <symbol minX="170" maxX="187" minY="365" maxY="382" name="hospital-s"/>
+  <symbol minX="187" maxX="204" minY="365" maxY="382" name="heliport-s"/>
+  <symbol minX="204" maxX="221" minY="365" maxY="382" name="toilets-s"/>
+  <symbol minX="221" maxX="238" minY="365" maxY="382" name="helipad-s"/>
+  <symbol minX="238" maxX="255" minY="365" maxY="382" name="grocery-s"/>
+  <symbol minX="255" maxX="272" minY="365" maxY="382" name="golf-s"/>
+  <symbol minX="272" maxX="289" minY="365" maxY="382" name="garden-s"/>
+  <symbol minX="289" maxX="306" minY="365" maxY="382" name="gallery-s"/>
+  <symbol minX="306" maxX="321" minY="365" maxY="381" name="s-arrow"/>
+  <symbol minX="321" maxX="343" minY="365" maxY="381" name="metro-barcelona-m"/>
+  <symbol minX="343" maxX="365" minY="365" maxY="381" name="subway-barcelona-l"/>
+  <symbol minX="365" maxX="387" minY="365" maxY="381" name="subway-barcelona-m"/>
+  <symbol minX="387" maxX="409" minY="365" maxY="381" name="subway-madrid-l"/>
+  <symbol minX="409" maxX="431" minY="365" maxY="381" name="subway-madrid-m"/>
+  <symbol minX="431" maxX="447" minY="365" maxY="381" name="parking-m"/>
+  <symbol minX="447" maxX="467" minY="365" maxY="380" name="subway-madrid-s"/>
+  <symbol minX="467" maxX="488" minY="365" maxY="380" name="subway-kiev-m"/>
+  <symbol minX="488" maxX="509" minY="365" maxY="380" name="subway-kiev-l"/>
+  <symbol minX="0" maxX="20" minY="382" maxY="397" name="metro-barcelona-s"/>
+  <symbol minX="20" maxX="35" minY="382" maxY="397" name="lightrail-berlin-s"/>
+  <symbol minX="35" maxX="50" minY="382" maxY="397" name="subway-paris-s"/>
+  <symbol minX="50" maxX="65" minY="382" maxY="397" name="subway-moscow-s"/>
+  <symbol minX="65" maxX="79" minY="382" maxY="396" name="route_from"/>
+  <symbol minX="79" maxX="93" minY="382" maxY="396" name="speedcam-s"/>
+  <symbol minX="93" maxX="107" minY="382" maxY="396" name="star-l"/>
+  <symbol minX="107" maxX="121" minY="382" maxY="396" name="parking-s"/>
+  <symbol minX="121" maxX="136" minY="382" maxY="396" name="bench"/>
+  <symbol minX="136" maxX="150" minY="382" maxY="396" name="subway-berlin-s"/>
+  <symbol minX="150" maxX="164" minY="382" maxY="396" name="subway-rome-s"/>
+  <symbol minX="164" maxX="181" minY="382" maxY="396" name="subway-london-s"/>
+  <symbol minX="181" maxX="195" minY="382" maxY="395" name="peakt-l"/>
+  <symbol minX="195" maxX="208" minY="382" maxY="395" name="current-position"/>
+  <symbol minX="208" maxX="221" minY="382" maxY="395" name="star-m"/>
+  <symbol minX="221" maxX="242" minY="382" maxY="395" name="subway-minsk-l"/>
+  <symbol minX="242" maxX="255" minY="382" maxY="395" name="survey_point-l"/>
+  <symbol minX="255" maxX="267" minY="382" maxY="394" name="subway-xs"/>
+  <symbol minX="267" maxX="279" minY="382" maxY="394" name="survey_point-m"/>
+  <symbol minX="279" maxX="297" minY="382" maxY="394" name="subway-minsk-m"/>
+  <symbol minX="297" maxX="309" minY="382" maxY="394" name="subway-newyork-xs"/>
+  <symbol minX="309" maxX="321" minY="382" maxY="394" name="star-s"/>
+  <symbol minX="321" maxX="338" minY="382" maxY="394" name="railway-crossing"/>
+  <symbol minX="338" maxX="356" minY="382" maxY="394" name="subway-kiev-s"/>
+  <symbol minX="356" maxX="367" minY="382" maxY="393" name="subway-xs copy"/>
+  <symbol minX="367" maxX="378" minY="382" maxY="393" name="api-result"/>
+  <symbol minX="378" maxX="395" minY="382" maxY="393" name="subway-minsk-s"/>
+  <symbol minX="395" maxX="405" minY="382" maxY="392" name="search-result"/>
+  <symbol minX="405" maxX="416" minY="382" maxY="392" name="peakt-m"/>
+  <symbol minX="416" maxX="436" minY="382" maxY="392" name="arrow-m"/>
+  <symbol minX="436" maxX="446" minY="382" maxY="392" name="survey_point-s"/>
+  <symbol minX="446" maxX="455" minY="382" maxY="391" name="peakt-s"/>
+  <symbol minX="455" maxX="464" minY="382" maxY="391" name="dot-m"/>
+  <symbol minX="464" maxX="473" minY="382" maxY="391" name="entrance-s"/>
+  <symbol minX="473" maxX="488" minY="382" maxY="390" name="arrow-s"/>
+  <symbol minX="488" maxX="496" minY="382" maxY="390" name="none"/>
+  <symbol minX="496" maxX="504" minY="382" maxY="390" name="tree-l"/>
+  <symbol minX="504" maxX="511" minY="382" maxY="389" name="entrance-xs"/>
+  <symbol minX="0" maxX="7" minY="397" maxY="404" name="tree-m"/>
+  <symbol minX="7" maxX="14" minY="397" maxY="404" name="dot-s-light"/>
+  <symbol minX="14" maxX="21" minY="397" maxY="404" name="dot-s"/>
+  <symbol minX="21" maxX="27" minY="397" maxY="403" name="zero-icon"/>
+  <symbol minX="27" maxX="33" minY="397" maxY="403" name="tree-s"/>
  </file>
 </root>
diff --git a/data/resources-mdpi_clear/symbols.png b/data/resources-mdpi_clear/symbols.png
index 1694daa99f..d55abf2cdd 100644
Binary files a/data/resources-mdpi_clear/symbols.png and b/data/resources-mdpi_clear/symbols.png differ
diff --git a/data/resources-mdpi_clear/symbols.sdf b/data/resources-mdpi_clear/symbols.sdf
index 93374ac22e..4f953dc50a 100644
--- a/data/resources-mdpi_clear/symbols.sdf
+++ b/data/resources-mdpi_clear/symbols.sdf
@@ -18,70 +18,70 @@
   <symbol minX="0" maxX="22" minY="71" maxY="100" name="watch-search-result"/>
   <symbol minX="22" maxX="46" minY="71" maxY="97" name="watch-my-direction"/>
   <symbol minX="46" maxX="68" minY="71" maxY="93" name="airport-l"/>
-  <symbol minX="68" maxX="90" minY="71" maxY="93" name="mobile_phone-l"/>
+  <symbol minX="68" maxX="90" minY="71" maxY="93" name="museum-l"/>
   <symbol minX="90" maxX="112" minY="71" maxY="93" name="australian-football-l"/>
   <symbol minX="112" maxX="134" minY="71" maxY="93" name="skiing-l"/>
   <symbol minX="134" maxX="156" minY="71" maxY="93" name="bakery-l"/>
-  <symbol minX="156" maxX="178" minY="71" maxY="93" name="shop-l"/>
+  <symbol minX="156" maxX="178" minY="71" maxY="93" name="soccer-l"/>
   <symbol minX="178" maxX="200" minY="71" maxY="93" name="bank-l"/>
   <symbol minX="200" maxX="221" minY="71" maxY="93" name="bank-m"/>
   <symbol minX="221" maxX="243" minY="71" maxY="93" name="banknote-l"/>
-  <symbol minX="243" maxX="265" minY="71" maxY="93" name="shop-bicycle-l"/>
+  <symbol minX="243" maxX="265" minY="71" maxY="93" name="shop-l"/>
   <symbol minX="265" maxX="287" minY="71" maxY="93" name="bar-l"/>
-  <symbol minX="287" maxX="309" minY="71" maxY="93" name="shoes-l"/>
-  <symbol minX="309" maxX="331" minY="71" maxY="93" name="ship-l"/>
+  <symbol minX="287" maxX="309" minY="71" maxY="93" name="shop-bicycle-l"/>
+  <symbol minX="309" maxX="331" minY="71" maxY="93" name="shoes-l"/>
   <symbol minX="331" maxX="353" minY="71" maxY="93" name="baseball-l"/>
-  <symbol minX="353" maxX="375" minY="71" maxY="93" name="sports-l"/>
+  <symbol minX="353" maxX="375" minY="71" maxY="93" name="ship-l"/>
   <symbol minX="375" maxX="397" minY="71" maxY="93" name="airport-m"/>
   <symbol minX="397" maxX="419" minY="71" maxY="93" name="basketball-l"/>
   <symbol minX="419" maxX="441" minY="71" maxY="93" name="school-l"/>
-  <symbol minX="441" maxX="463" minY="71" maxY="93" name="restaurant-l"/>
+  <symbol minX="441" maxX="463" minY="71" maxY="93" name="sports-l"/>
   <symbol minX="463" maxX="485" minY="71" maxY="93" name="bbq-l"/>
-  <symbol minX="485" maxX="506" minY="71" maxY="93" name="remains-m"/>
+  <symbol minX="485" maxX="507" minY="71" maxY="93" name="restaurant-l"/>
   <symbol minX="0" maxX="22" minY="100" maxY="122" name="bcontrol-l"/>
   <symbol minX="22" maxX="43" minY="100" maxY="122" name="bcontrol-m"/>
-  <symbol minX="43" maxX="65" minY="100" maxY="122" name="remains-l"/>
-  <symbol minX="65" maxX="87" minY="100" maxY="122" name="beach-l"/>
-  <symbol minX="87" maxX="109" minY="100" maxY="122" name="recycling-l"/>
-  <symbol minX="109" maxX="131" minY="100" maxY="122" name="beauty-l"/>
-  <symbol minX="131" maxX="153" minY="100" maxY="122" name="subway-entrance-l"/>
-  <symbol minX="153" maxX="175" minY="100" maxY="122" name="beer-l"/>
-  <symbol minX="175" maxX="196" minY="100" maxY="122" name="beer-m"/>
-  <symbol minX="196" maxX="218" minY="100" maxY="122" name="pub-l"/>
-  <symbol minX="218" maxX="240" minY="100" maxY="122" name="alcohol-l"/>
-  <symbol minX="240" maxX="262" minY="100" maxY="122" name="bicycle-l"/>
-  <symbol minX="262" maxX="284" minY="100" maxY="122" name="power-m"/>
-  <symbol minX="284" maxX="306" minY="100" maxY="122" name="power-l"/>
-  <symbol minX="306" maxX="328" minY="100" maxY="122" name="book-shop-l"/>
-  <symbol minX="328" maxX="350" minY="100" maxY="122" name="postbox-l"/>
-  <symbol minX="350" maxX="372" minY="100" maxY="122" name="subway-l"/>
-  <symbol minX="372" maxX="394" minY="100" maxY="122" name="boundary_stone-l"/>
-  <symbol minX="394" maxX="416" minY="100" maxY="122" name="police-l"/>
-  <symbol minX="416" maxX="438" minY="100" maxY="122" name="bowls-l"/>
-  <symbol minX="438" maxX="460" minY="100" maxY="122" name="place-of-worship-l"/>
-  <symbol minX="460" maxX="482" minY="100" maxY="122" name="bus-l"/>
-  <symbol minX="482" maxX="504" minY="100" maxY="122" name="pitch-l"/>
+  <symbol minX="43" maxX="64" minY="100" maxY="122" name="remains-m"/>
+  <symbol minX="64" maxX="86" minY="100" maxY="122" name="beach-l"/>
+  <symbol minX="86" maxX="108" minY="100" maxY="122" name="remains-l"/>
+  <symbol minX="108" maxX="130" minY="100" maxY="122" name="beauty-l"/>
+  <symbol minX="130" maxX="152" minY="100" maxY="122" name="recycling-l"/>
+  <symbol minX="152" maxX="174" minY="100" maxY="122" name="beer-l"/>
+  <symbol minX="174" maxX="195" minY="100" maxY="122" name="beer-m"/>
+  <symbol minX="195" maxX="217" minY="100" maxY="122" name="pub-l"/>
+  <symbol minX="217" maxX="239" minY="100" maxY="122" name="alcohol-l"/>
+  <symbol minX="239" maxX="261" minY="100" maxY="122" name="bicycle-l"/>
+  <symbol minX="261" maxX="283" minY="100" maxY="122" name="subway-entrance-l"/>
+  <symbol minX="283" maxX="305" minY="100" maxY="122" name="power-m"/>
+  <symbol minX="305" maxX="327" minY="100" maxY="122" name="book-shop-l"/>
+  <symbol minX="327" maxX="349" minY="100" maxY="122" name="power-l"/>
+  <symbol minX="349" maxX="371" minY="100" maxY="122" name="postbox-l"/>
+  <symbol minX="371" maxX="393" minY="100" maxY="122" name="boundary_stone-l"/>
+  <symbol minX="393" maxX="415" minY="100" maxY="122" name="police-l"/>
+  <symbol minX="415" maxX="437" minY="100" maxY="122" name="bowls-l"/>
+  <symbol minX="437" maxX="459" minY="100" maxY="122" name="subway-l"/>
+  <symbol minX="459" maxX="481" minY="100" maxY="122" name="bus-l"/>
+  <symbol minX="481" maxX="503" minY="100" maxY="122" name="place-of-worship-l"/>
   <symbol minX="0" maxX="22" minY="122" maxY="144" name="alpine_hut-l"/>
   <symbol minX="22" maxX="44" minY="122" maxY="144" name="butcher-l"/>
-  <symbol minX="44" maxX="65" minY="122" maxY="144" name="picnic-m"/>
-  <symbol minX="65" maxX="87" minY="122" maxY="144" name="cable-car-l"/>
-  <symbol minX="87" maxX="109" minY="122" maxY="144" name="picnic-l"/>
-  <symbol minX="109" maxX="131" minY="122" maxY="144" name="phone-l"/>
+  <symbol minX="44" maxX="66" minY="122" maxY="144" name="pitch-l"/>
+  <symbol minX="66" maxX="88" minY="122" maxY="144" name="cable-car-l"/>
+  <symbol minX="88" maxX="109" minY="122" maxY="144" name="picnic-m"/>
+  <symbol minX="109" maxX="131" minY="122" maxY="144" name="picnic-l"/>
   <symbol minX="131" maxX="153" minY="122" maxY="144" name="cafe-l"/>
-  <symbol minX="153" maxX="175" minY="122" maxY="144" name="pharmacy-l"/>
+  <symbol minX="153" maxX="175" minY="122" maxY="144" name="phone-l"/>
   <symbol minX="175" maxX="197" minY="122" maxY="144" name="america-football-l"/>
   <symbol minX="197" maxX="219" minY="122" maxY="144" name="campsite-l"/>
-  <symbol minX="219" maxX="241" minY="122" maxY="144" name="subway-newyork-l"/>
-  <symbol minX="241" maxX="263" minY="122" maxY="144" name="subway-paris-l"/>
+  <symbol minX="219" maxX="241" minY="122" maxY="144" name="pharmacy-l"/>
+  <symbol minX="241" maxX="263" minY="122" maxY="144" name="subway-newyork-l"/>
   <symbol minX="263" maxX="285" minY="122" maxY="144" name="car-repair-l"/>
   <symbol minX="285" maxX="306" minY="122" maxY="144" name="car-repair-m"/>
   <symbol minX="306" maxX="328" minY="122" maxY="144" name="archery-l"/>
   <symbol minX="328" maxX="350" minY="122" maxY="144" name="car_sharing-l"/>
-  <symbol minX="350" maxX="372" minY="122" maxY="144" name="subway-spb-l"/>
+  <symbol minX="350" maxX="372" minY="122" maxY="144" name="subway-paris-l"/>
   <symbol minX="372" maxX="394" minY="122" maxY="144" name="caravan_site-l"/>
   <symbol minX="394" maxX="416" minY="122" maxY="144" name="parking-meter-l"/>
   <symbol minX="416" maxX="438" minY="122" maxY="144" name="casino-l"/>
-  <symbol minX="438" maxX="460" minY="122" maxY="144" name="sweets-l"/>
+  <symbol minX="438" maxX="460" minY="122" maxY="144" name="subway-spb-l"/>
   <symbol minX="460" maxX="482" minY="122" maxY="144" name="park-l"/>
   <symbol minX="482" maxX="504" minY="122" maxY="144" name="cave-l"/>
   <symbol minX="0" maxX="22" minY="144" maxY="166" name="optician-l"/>
@@ -90,377 +90,380 @@
   <symbol minX="65" maxX="87" minY="144" maxY="166" name="office-l"/>
   <symbol minX="87" maxX="109" minY="144" maxY="166" name="atm-l"/>
   <symbol minX="109" maxX="131" minY="144" maxY="166" name="chemist-l"/>
-  <symbol minX="131" maxX="153" minY="144" maxY="166" name="nparkf-l"/>
+  <symbol minX="131" maxX="153" minY="144" maxY="166" name="sweets-l"/>
   <symbol minX="153" maxX="175" minY="144" maxY="166" name="cinema-l"/>
-  <symbol minX="175" maxX="197" minY="144" maxY="166" name="swimming-l"/>
+  <symbol minX="175" maxX="197" minY="144" maxY="166" name="nparkf-l"/>
   <symbol minX="197" maxX="219" minY="144" maxY="166" name="npark-l"/>
   <symbol minX="219" maxX="241" minY="144" maxY="166" name="clothes-l"/>
-  <symbol minX="241" maxX="263" minY="144" maxY="166" name="taxi-l"/>
+  <symbol minX="241" maxX="263" minY="144" maxY="166" name="swimming-l"/>
   <symbol minX="263" maxX="285" minY="144" maxY="166" name="college-l"/>
-  <symbol minX="285" maxX="307" minY="144" maxY="166" name="museum-l"/>
+  <symbol minX="285" maxX="307" minY="144" maxY="166" name="taxi-l"/>
   <symbol minX="307" maxX="329" minY="144" maxY="166" name="zoo-l"/>
   <symbol minX="329" maxX="351" minY="144" maxY="166" name="computer-l"/>
   <symbol minX="351" maxX="373" minY="144" maxY="166" name="motel-l"/>
   <symbol minX="373" maxX="395" minY="144" maxY="166" name="convenience-l"/>
   <symbol minX="395" maxX="417" minY="144" maxY="166" name="monument-l"/>
   <symbol minX="417" maxX="439" minY="144" maxY="166" name="cricket-l"/>
-  <symbol minX="439" maxX="461" minY="144" maxY="166" name="tennis-l"/>
+  <symbol minX="439" maxX="461" minY="144" maxY="166" name="mobile_phone-l"/>
   <symbol minX="461" maxX="483" minY="144" maxY="166" name="military-l"/>
   <symbol minX="483" maxX="505" minY="144" maxY="166" name="windmill-l"/>
-  <symbol minX="0" maxX="22" minY="166" maxY="188" name="theatre-l"/>
+  <symbol minX="0" maxX="22" minY="166" maxY="188" name="tennis-l"/>
   <symbol minX="22" maxX="44" minY="166" maxY="188" name="curling-l"/>
   <symbol minX="44" maxX="66" minY="166" maxY="188" name="marketplace-l"/>
-  <symbol minX="66" maxX="88" minY="166" maxY="188" name="department_store-l"/>
-  <symbol minX="88" maxX="110" minY="166" maxY="188" name="mail-l"/>
-  <symbol minX="110" maxX="132" minY="166" maxY="188" name="diving-l"/>
-  <symbol minX="132" maxX="154" minY="166" maxY="188" name="toilets-l"/>
-  <symbol minX="154" maxX="176" minY="166" maxY="188" name="dog_park-l"/>
-  <symbol minX="176" maxX="198" minY="166" maxY="188" name="lightrail-berlin-l"/>
-  <symbol minX="198" maxX="220" minY="166" maxY="188" name="doityourself-l"/>
-  <symbol minX="220" maxX="242" minY="166" maxY="188" name="lighthouse-l"/>
-  <symbol minX="242" maxX="264" minY="166" maxY="188" name="wayside_shrine-l"/>
-  <symbol minX="264" maxX="286" minY="166" maxY="188" name="lift_gate-l"/>
-  <symbol minX="286" maxX="308" minY="166" maxY="188" name="wayside_cross-l"/>
-  <symbol minX="308" maxX="330" minY="166" maxY="188" name="drinking-water-l"/>
-  <symbol minX="330" maxX="352" minY="166" maxY="188" name="toll_booth-l"/>
-  <symbol minX="352" maxX="374" minY="166" maxY="188" name="library-l"/>
-  <symbol minX="374" maxX="395" minY="166" maxY="188" name="laundry-m"/>
-  <symbol minX="395" maxX="417" minY="166" maxY="188" name="electronics-l"/>
-  <symbol minX="417" maxX="439" minY="166" maxY="188" name="laundry-l"/>
-  <symbol minX="439" maxX="461" minY="166" maxY="188" name="embassy-l"/>
-  <symbol minX="461" maxX="483" minY="166" maxY="188" name="kiosk-l"/>
-  <symbol minX="483" maxX="504" minY="166" maxY="188" name="waterfall-m"/>
-  <symbol minX="0" maxX="22" minY="188" maxY="210" name="waterfall-l"/>
-  <symbol minX="22" maxX="44" minY="188" maxY="210" name="kindergarten-m"/>
-  <symbol minX="44" maxX="66" minY="188" maxY="210" name="equestrian-l"/>
-  <symbol minX="66" maxX="88" minY="188" maxY="210" name="equestrian-m"/>
+  <symbol minX="66" maxX="88" minY="166" maxY="188" name="dentist-l"/>
+  <symbol minX="88" maxX="110" minY="166" maxY="188" name="dentist-m"/>
+  <symbol minX="110" maxX="132" minY="166" maxY="188" name="wayside_shrine-l"/>
+  <symbol minX="132" maxX="154" minY="166" maxY="188" name="department_store-l"/>
+  <symbol minX="154" maxX="176" minY="166" maxY="188" name="theatre-l"/>
+  <symbol minX="176" maxX="198" minY="166" maxY="188" name="diving-l"/>
+  <symbol minX="198" maxX="220" minY="166" maxY="188" name="mail-l"/>
+  <symbol minX="220" maxX="242" minY="166" maxY="188" name="dog_park-l"/>
+  <symbol minX="242" maxX="264" minY="166" maxY="188" name="lightrail-berlin-l"/>
+  <symbol minX="264" maxX="286" minY="166" maxY="188" name="doityourself-l"/>
+  <symbol minX="286" maxX="308" minY="166" maxY="188" name="toilets-l"/>
+  <symbol minX="308" maxX="330" minY="166" maxY="188" name="lighthouse-l"/>
+  <symbol minX="330" maxX="352" minY="166" maxY="188" name="wayside_cross-l"/>
+  <symbol minX="352" maxX="374" minY="166" maxY="188" name="lift_gate-l"/>
+  <symbol minX="374" maxX="396" minY="166" maxY="188" name="drinking-water-l"/>
+  <symbol minX="396" maxX="418" minY="166" maxY="188" name="library-l"/>
+  <symbol minX="418" maxX="439" minY="166" maxY="188" name="waterfall-m"/>
+  <symbol minX="439" maxX="460" minY="166" maxY="188" name="laundry-m"/>
+  <symbol minX="460" maxX="482" minY="166" maxY="188" name="electronics-l"/>
+  <symbol minX="482" maxX="504" minY="166" maxY="188" name="laundry-l"/>
+  <symbol minX="0" maxX="22" minY="188" maxY="210" name="embassy-l"/>
+  <symbol minX="22" maxX="44" minY="188" maxY="210" name="kiosk-l"/>
+  <symbol minX="44" maxX="66" minY="188" maxY="210" name="waterfall-l"/>
+  <symbol minX="66" maxX="88" minY="188" maxY="210" name="toll_booth-l"/>
   <symbol minX="88" maxX="110" minY="188" maxY="210" name="volcano-l"/>
-  <symbol minX="110" maxX="132" minY="188" maxY="210" name="fastfood-l"/>
-  <symbol minX="132" maxX="154" minY="188" maxY="210" name="kindergarten-l"/>
-  <symbol minX="154" maxX="176" minY="188" maxY="210" name="jewelry-l"/>
-  <symbol minX="176" maxX="198" minY="188" maxY="210" name="fire_station-l"/>
-  <symbol minX="198" maxX="220" minY="188" maxY="210" name="tomb-l"/>
+  <symbol minX="110" maxX="132" minY="188" maxY="210" name="equestrian-l"/>
+  <symbol minX="132" maxX="154" minY="188" maxY="210" name="equestrian-m"/>
+  <symbol minX="154" maxX="176" minY="188" maxY="210" name="kindergarten-m"/>
+  <symbol minX="176" maxX="198" minY="188" maxY="210" name="fastfood-l"/>
+  <symbol minX="198" maxX="220" minY="188" maxY="210" name="kindergarten-l"/>
   <symbol minX="220" maxX="242" minY="188" maxY="210" name="vending-l"/>
-  <symbol minX="242" maxX="264" minY="188" maxY="210" name="florist-l"/>
-  <symbol minX="264" maxX="286" minY="188" maxY="210" name="information-l"/>
-  <symbol minX="286" maxX="308" minY="188" maxY="210" name="fountain-l"/>
-  <symbol minX="308" maxX="329" minY="188" maxY="210" name="hunting-tower-m"/>
-  <symbol minX="329" maxX="351" minY="188" maxY="210" name="hunting-tower-l"/>
-  <symbol minX="351" maxX="373" minY="188" maxY="210" name="fuel-l"/>
-  <symbol minX="373" maxX="395" minY="188" maxY="210" name="hotel-l"/>
+  <symbol minX="242" maxX="264" minY="188" maxY="210" name="fire_station-l"/>
+  <symbol minX="264" maxX="286" minY="188" maxY="210" name="jewelry-l"/>
+  <symbol minX="286" maxX="308" minY="188" maxY="210" name="information-l"/>
+  <symbol minX="308" maxX="330" minY="188" maxY="210" name="florist-l"/>
+  <symbol minX="330" maxX="351" minY="188" maxY="210" name="hunting-tower-m"/>
+  <symbol minX="351" maxX="373" minY="188" maxY="210" name="fountain-l"/>
+  <symbol minX="373" maxX="395" minY="188" maxY="210" name="hunting-tower-l"/>
   <symbol minX="395" maxX="417" minY="188" maxY="210" name="tram-l"/>
-  <symbol minX="417" maxX="439" minY="188" maxY="210" name="funicular-l"/>
-  <symbol minX="439" maxX="461" minY="188" maxY="210" name="tourism-l"/>
-  <symbol minX="461" maxX="483" minY="188" maxY="210" name="hospital-l"/>
-  <symbol minX="483" maxX="505" minY="188" maxY="210" name="furniture-l"/>
-  <symbol minX="0" maxX="22" minY="210" maxY="232" name="historic-ship-l"/>
-  <symbol minX="22" maxX="44" minY="210" maxY="232" name="gallery-l"/>
-  <symbol minX="44" maxX="65" minY="210" maxY="232" name="heliport-m"/>
-  <symbol minX="65" maxX="87" minY="210" maxY="232" name="train-l"/>
-  <symbol minX="87" maxX="109" minY="210" maxY="232" name="garden-l"/>
-  <symbol minX="109" maxX="131" minY="210" maxY="232" name="heliport-l"/>
-  <symbol minX="131" maxX="153" minY="210" maxY="232" name="helipad-l"/>
-  <symbol minX="153" maxX="175" minY="210" maxY="232" name="garden_center-l"/>
-  <symbol minX="175" maxX="197" minY="210" maxY="232" name="hardware-l"/>
-  <symbol minX="197" maxX="219" minY="210" maxY="232" name="gate-l"/>
-  <symbol minX="219" maxX="241" minY="210" maxY="232" name="townhall-l"/>
-  <symbol minX="241" maxX="263" minY="210" maxY="232" name="gift-l"/>
-  <symbol minX="263" maxX="285" minY="210" maxY="232" name="hand-m"/>
-  <symbol minX="285" maxX="307" minY="210" maxY="232" name="golf-l"/>
-  <symbol minX="307" maxX="329" minY="210" maxY="232" name="hand-l"/>
-  <symbol minX="329" maxX="351" minY="210" maxY="232" name="toys-l"/>
-  <symbol minX="351" maxX="373" minY="210" maxY="232" name="greengrocer-l"/>
-  <symbol minX="373" maxX="395" minY="210" maxY="232" name="hairdresser-l"/>
-  <symbol minX="395" maxX="417" minY="210" maxY="232" name="grocery-l"/>
-  <symbol minX="417" maxX="439" minY="210" maxY="232" name="soccer-l"/>
-  <symbol minX="439" maxX="460" minY="210" maxY="231" name="townhall-m"/>
-  <symbol minX="460" maxX="481" minY="210" maxY="231" name="greengrocer-m"/>
-  <symbol minX="481" maxX="502" minY="210" maxY="231" name="hairdresser-m"/>
-  <symbol minX="0" maxX="21" minY="232" maxY="253" name="golf-m"/>
-  <symbol minX="21" maxX="42" minY="232" maxY="253" name="gift-m"/>
-  <symbol minX="42" maxX="63" minY="232" maxY="253" name="gate-m"/>
-  <symbol minX="63" maxX="84" minY="232" maxY="253" name="garden_center-m"/>
-  <symbol minX="84" maxX="105" minY="232" maxY="253" name="hardware-m"/>
-  <symbol minX="105" maxX="126" minY="232" maxY="253" name="toys-m"/>
-  <symbol minX="126" maxX="147" minY="232" maxY="253" name="helipad-m"/>
-  <symbol minX="147" maxX="168" minY="232" maxY="253" name="tourism-m"/>
-  <symbol minX="168" maxX="189" minY="232" maxY="253" name="garden-m"/>
-  <symbol minX="189" maxX="210" minY="232" maxY="253" name="gallery-m"/>
-  <symbol minX="210" maxX="231" minY="232" maxY="253" name="grocery-m"/>
-  <symbol minX="231" maxX="252" minY="232" maxY="253" name="furniture-m"/>
-  <symbol minX="252" maxX="273" minY="232" maxY="253" name="historic-ship-m"/>
-  <symbol minX="273" maxX="294" minY="232" maxY="253" name="train-m"/>
-  <symbol minX="294" maxX="315" minY="232" maxY="253" name="hospital-m"/>
-  <symbol minX="315" maxX="336" minY="232" maxY="253" name="funicular-m"/>
-  <symbol minX="336" maxX="357" minY="232" maxY="253" name="fuel-m"/>
-  <symbol minX="357" maxX="378" minY="232" maxY="253" name="hotel-m"/>
+  <symbol minX="417" maxX="439" minY="188" maxY="210" name="fuel-l"/>
+  <symbol minX="439" maxX="461" minY="188" maxY="210" name="tomb-l"/>
+  <symbol minX="461" maxX="483" minY="188" maxY="210" name="hotel-l"/>
+  <symbol minX="483" maxX="505" minY="188" maxY="210" name="funicular-l"/>
+  <symbol minX="0" maxX="22" minY="210" maxY="232" name="hospital-l"/>
+  <symbol minX="22" maxX="44" minY="210" maxY="232" name="train-l"/>
+  <symbol minX="44" maxX="66" minY="210" maxY="232" name="furniture-l"/>
+  <symbol minX="66" maxX="88" minY="210" maxY="232" name="historic-ship-l"/>
+  <symbol minX="88" maxX="110" minY="210" maxY="232" name="gallery-l"/>
+  <symbol minX="110" maxX="131" minY="210" maxY="232" name="heliport-m"/>
+  <symbol minX="131" maxX="153" minY="210" maxY="232" name="heliport-l"/>
+  <symbol minX="153" maxX="175" minY="210" maxY="232" name="garden-l"/>
+  <symbol minX="175" maxX="197" minY="210" maxY="232" name="tourism-l"/>
+  <symbol minX="197" maxX="219" minY="210" maxY="232" name="toys-l"/>
+  <symbol minX="219" maxX="241" minY="210" maxY="232" name="garden_center-l"/>
+  <symbol minX="241" maxX="263" minY="210" maxY="232" name="helipad-l"/>
+  <symbol minX="263" maxX="285" minY="210" maxY="232" name="gate-l"/>
+  <symbol minX="285" maxX="307" minY="210" maxY="232" name="hardware-l"/>
+  <symbol minX="307" maxX="329" minY="210" maxY="232" name="gift-l"/>
+  <symbol minX="329" maxX="351" minY="210" maxY="232" name="hand-m"/>
+  <symbol minX="351" maxX="373" minY="210" maxY="232" name="golf-l"/>
+  <symbol minX="373" maxX="395" minY="210" maxY="232" name="hand-l"/>
+  <symbol minX="395" maxX="417" minY="210" maxY="232" name="hairdresser-l"/>
+  <symbol minX="417" maxX="439" minY="210" maxY="232" name="greengrocer-l"/>
+  <symbol minX="439" maxX="461" minY="210" maxY="232" name="townhall-l"/>
+  <symbol minX="461" maxX="483" minY="210" maxY="232" name="grocery-l"/>
+  <symbol minX="483" maxX="504" minY="210" maxY="231" name="grocery-m"/>
+  <symbol minX="0" maxX="21" minY="232" maxY="253" name="greengrocer-m"/>
+  <symbol minX="21" maxX="42" minY="232" maxY="253" name="townhall-m"/>
+  <symbol minX="42" maxX="63" minY="232" maxY="253" name="hairdresser-m"/>
+  <symbol minX="63" maxX="84" minY="232" maxY="253" name="golf-m"/>
+  <symbol minX="84" maxX="105" minY="232" maxY="253" name="gift-m"/>
+  <symbol minX="105" maxX="126" minY="232" maxY="253" name="tourism-m"/>
+  <symbol minX="126" maxX="147" minY="232" maxY="253" name="gate-m"/>
+  <symbol minX="147" maxX="168" minY="232" maxY="253" name="hardware-m"/>
+  <symbol minX="168" maxX="189" minY="232" maxY="253" name="garden_center-m"/>
+  <symbol minX="189" maxX="210" minY="232" maxY="253" name="helipad-m"/>
+  <symbol minX="210" maxX="231" minY="232" maxY="253" name="garden-m"/>
+  <symbol minX="231" maxX="252" minY="232" maxY="253" name="toys-m"/>
+  <symbol minX="252" maxX="273" minY="232" maxY="253" name="gallery-m"/>
+  <symbol minX="273" maxX="294" minY="232" maxY="253" name="skiing-m"/>
+  <symbol minX="294" maxX="315" minY="232" maxY="253" name="furniture-m"/>
+  <symbol minX="315" maxX="336" minY="232" maxY="253" name="historic-ship-m"/>
+  <symbol minX="336" maxX="357" minY="232" maxY="253" name="funicular-m"/>
+  <symbol minX="357" maxX="378" minY="232" maxY="253" name="hospital-m"/>
   <symbol minX="378" maxX="399" minY="232" maxY="253" name="tomb-m"/>
-  <symbol minX="399" maxX="420" minY="232" maxY="253" name="tram-m"/>
-  <symbol minX="420" maxX="441" minY="232" maxY="253" name="fountain-m"/>
-  <symbol minX="441" maxX="462" minY="232" maxY="253" name="skiing-m"/>
-  <symbol minX="462" maxX="483" minY="232" maxY="253" name="florist-m"/>
-  <symbol minX="483" maxX="504" minY="232" maxY="253" name="information-m"/>
-  <symbol minX="0" maxX="21" minY="253" maxY="274" name="fire_station-m"/>
-  <symbol minX="21" maxX="42" minY="253" maxY="274" name="vending-m"/>
-  <symbol minX="42" maxX="63" minY="253" maxY="274" name="jewelry-m"/>
-  <symbol minX="63" maxX="84" minY="253" maxY="274" name="fastfood-m"/>
-  <symbol minX="84" maxX="105" minY="253" maxY="274" name="volcano-m"/>
-  <symbol minX="105" maxX="126" minY="253" maxY="274" name="toll_booth-m"/>
-  <symbol minX="126" maxX="147" minY="253" maxY="274" name="embassy-m"/>
-  <symbol minX="147" maxX="168" minY="253" maxY="274" name="kiosk-m"/>
-  <symbol minX="168" maxX="189" minY="253" maxY="274" name="electronics-m"/>
-  <symbol minX="189" maxX="210" minY="253" maxY="274" name="drugs"/>
-  <symbol minX="210" maxX="231" minY="253" maxY="274" name="australian-football-m"/>
-  <symbol minX="231" maxX="252" minY="253" maxY="274" name="library-m"/>
-  <symbol minX="252" maxX="273" minY="253" maxY="274" name="drinking-water-m"/>
-  <symbol minX="273" maxX="294" minY="253" maxY="274" name="wayside_cross-m"/>
-  <symbol minX="294" maxX="315" minY="253" maxY="274" name="lift_gate-m"/>
-  <symbol minX="315" maxX="336" minY="253" maxY="274" name="doityourself-m"/>
-  <symbol minX="336" maxX="357" minY="253" maxY="274" name="lighthouse-m"/>
-  <symbol minX="357" maxX="378" minY="253" maxY="274" name="toilets-m"/>
-  <symbol minX="378" maxX="399" minY="253" maxY="274" name="dog_park-m"/>
-  <symbol minX="399" maxX="420" minY="253" maxY="274" name="soccer-m"/>
-  <symbol minX="420" maxX="441" minY="253" maxY="274" name="diving-m"/>
-  <symbol minX="441" maxX="462" minY="253" maxY="274" name="department_store-m"/>
-  <symbol minX="462" maxX="483" minY="253" maxY="274" name="mail-m"/>
+  <symbol minX="399" maxX="420" minY="232" maxY="253" name="train-m"/>
+  <symbol minX="420" maxX="441" minY="232" maxY="253" name="hotel-m"/>
+  <symbol minX="441" maxX="462" minY="232" maxY="253" name="fuel-m"/>
+  <symbol minX="462" maxX="483" minY="232" maxY="253" name="fountain-m"/>
+  <symbol minX="483" maxX="504" minY="232" maxY="253" name="florist-m"/>
+  <symbol minX="0" maxX="21" minY="253" maxY="274" name="australian-football-m"/>
+  <symbol minX="21" maxX="42" minY="253" maxY="274" name="tram-m"/>
+  <symbol minX="42" maxX="63" minY="253" maxY="274" name="information-m"/>
+  <symbol minX="63" maxX="84" minY="253" maxY="274" name="toll_booth-m"/>
+  <symbol minX="84" maxX="105" minY="253" maxY="274" name="fire_station-m"/>
+  <symbol minX="105" maxX="126" minY="253" maxY="274" name="jewelry-m"/>
+  <symbol minX="126" maxX="147" minY="253" maxY="274" name="fastfood-m"/>
+  <symbol minX="147" maxX="168" minY="253" maxY="274" name="vending-m"/>
+  <symbol minX="168" maxX="189" minY="253" maxY="274" name="volcano-m"/>
+  <symbol minX="189" maxX="210" minY="253" maxY="274" name="embassy-m"/>
+  <symbol minX="210" maxX="231" minY="253" maxY="274" name="kiosk-m"/>
+  <symbol minX="231" maxX="252" minY="253" maxY="274" name="electronics-m"/>
+  <symbol minX="252" maxX="273" minY="253" maxY="274" name="drugs"/>
+  <symbol minX="273" maxX="294" minY="253" maxY="274" name="drinking-water-m"/>
+  <symbol minX="294" maxX="315" minY="253" maxY="274" name="library-m"/>
+  <symbol minX="315" maxX="336" minY="253" maxY="274" name="toilets-m"/>
+  <symbol minX="336" maxX="357" minY="253" maxY="274" name="bakery-m"/>
+  <symbol minX="357" maxX="378" minY="253" maxY="274" name="lift_gate-m"/>
+  <symbol minX="378" maxX="399" minY="253" maxY="274" name="wayside_cross-m"/>
+  <symbol minX="399" maxX="420" minY="253" maxY="274" name="lighthouse-m"/>
+  <symbol minX="420" maxX="441" minY="253" maxY="274" name="doityourself-m"/>
+  <symbol minX="441" maxX="462" minY="253" maxY="274" name="dog_park-m"/>
+  <symbol minX="462" maxX="483" minY="253" maxY="274" name="shop-m"/>
   <symbol minX="483" maxX="504" minY="253" maxY="274" name="theatre-m"/>
-  <symbol minX="0" maxX="21" minY="274" maxY="295" name="curling-m"/>
-  <symbol minX="21" maxX="42" minY="274" maxY="295" name="marketplace-m"/>
-  <symbol minX="42" maxX="63" minY="274" maxY="295" name="wayside_shrine-m"/>
-  <symbol minX="63" maxX="84" minY="274" maxY="295" name="tennis-m"/>
-  <symbol minX="84" maxX="105" minY="274" maxY="295" name="windmill-m"/>
-  <symbol minX="105" maxX="126" minY="274" maxY="295" name="military-m"/>
-  <symbol minX="126" maxX="147" minY="274" maxY="295" name="cricket-m"/>
-  <symbol minX="147" maxX="168" minY="274" maxY="295" name="atm-m"/>
-  <symbol minX="168" maxX="189" minY="274" maxY="295" name="mobile_phone-m"/>
-  <symbol minX="189" maxX="210" minY="274" maxY="295" name="convenience-m"/>
-  <symbol minX="210" maxX="231" minY="274" maxY="295" name="monument-m"/>
-  <symbol minX="231" maxX="252" minY="274" maxY="295" name="taxi-m"/>
-  <symbol minX="252" maxX="273" minY="274" maxY="295" name="computer-m"/>
-  <symbol minX="273" maxX="294" minY="274" maxY="295" name="motel-m"/>
-  <symbol minX="294" maxX="315" minY="274" maxY="295" name="college-m"/>
-  <symbol minX="315" maxX="336" minY="274" maxY="295" name="museum-m"/>
-  <symbol minX="336" maxX="357" minY="274" maxY="295" name="clothes-m"/>
-  <symbol minX="357" maxX="378" minY="274" maxY="295" name="shop-m"/>
-  <symbol minX="378" maxX="399" minY="274" maxY="295" name="bakery-m"/>
-  <symbol minX="399" maxX="420" minY="274" maxY="295" name="shop-bicycle-m"/>
+  <symbol minX="0" maxX="21" minY="274" maxY="295" name="diving-m"/>
+  <symbol minX="21" maxX="42" minY="274" maxY="295" name="mail-m"/>
+  <symbol minX="42" maxX="63" minY="274" maxY="295" name="department_store-m"/>
+  <symbol minX="63" maxX="84" minY="274" maxY="295" name="curling-m"/>
+  <symbol minX="84" maxX="105" minY="274" maxY="295" name="marketplace-m"/>
+  <symbol minX="105" maxX="126" minY="274" maxY="295" name="tennis-m"/>
+  <symbol minX="126" maxX="147" minY="274" maxY="295" name="wayside_shrine-m"/>
+  <symbol minX="147" maxX="168" minY="274" maxY="295" name="windmill-m"/>
+  <symbol minX="168" maxX="189" minY="274" maxY="295" name="military-m"/>
+  <symbol minX="189" maxX="210" minY="274" maxY="295" name="atm-m"/>
+  <symbol minX="210" maxX="231" minY="274" maxY="295" name="cricket-m"/>
+  <symbol minX="231" maxX="252" minY="274" maxY="295" name="mobile_phone-m"/>
+  <symbol minX="252" maxX="273" minY="274" maxY="295" name="convenience-m"/>
+  <symbol minX="273" maxX="294" minY="274" maxY="295" name="monument-m"/>
+  <symbol minX="294" maxX="315" minY="274" maxY="295" name="taxi-m"/>
+  <symbol minX="315" maxX="336" minY="274" maxY="295" name="computer-m"/>
+  <symbol minX="336" maxX="357" minY="274" maxY="295" name="motel-m"/>
+  <symbol minX="357" maxX="378" minY="274" maxY="295" name="college-m"/>
+  <symbol minX="378" maxX="399" minY="274" maxY="295" name="museum-m"/>
+  <symbol minX="399" maxX="420" minY="274" maxY="295" name="swimming-m"/>
   <symbol minX="420" maxX="441" minY="274" maxY="295" name="banknote-m"/>
-  <symbol minX="441" maxX="462" minY="274" maxY="295" name="shoes-m"/>
-  <symbol minX="462" maxX="483" minY="274" maxY="295" name="swimming-m"/>
-  <symbol minX="483" maxX="504" minY="274" maxY="295" name="zoo-m"/>
-  <symbol minX="0" maxX="21" minY="295" maxY="316" name="npark-m"/>
-  <symbol minX="21" maxX="42" minY="295" maxY="316" name="cinema-m"/>
-  <symbol minX="42" maxX="63" minY="295" maxY="316" name="chemist-m"/>
-  <symbol minX="63" maxX="84" minY="295" maxY="316" name="nparkf-m "/>
-  <symbol minX="84" maxX="105" minY="295" maxY="316" name="nparkf-m"/>
-  <symbol minX="105" maxX="126" minY="295" maxY="316" name="sweets-m"/>
-  <symbol minX="126" maxX="147" minY="295" maxY="316" name="cemetery-m"/>
-  <symbol minX="147" maxX="168" minY="295" maxY="316" name="bar-m"/>
-  <symbol minX="168" maxX="189" minY="295" maxY="316" name="ship-m"/>
-  <symbol minX="189" maxX="210" minY="295" maxY="316" name="cave-m"/>
-  <symbol minX="210" maxX="231" minY="295" maxY="316" name="optician-m"/>
-  <symbol minX="231" maxX="252" minY="295" maxY="316" name="archery-m"/>
-  <symbol minX="252" maxX="273" minY="295" maxY="316" name="park-m"/>
-  <symbol minX="273" maxX="294" minY="295" maxY="316" name="casino-m"/>
-  <symbol minX="294" maxX="315" minY="295" maxY="316" name="baseball-m"/>
-  <symbol minX="315" maxX="336" minY="295" maxY="316" name="subway-spb-m"/>
-  <symbol minX="336" maxX="357" minY="295" maxY="316" name="caravan_site-m"/>
-  <symbol minX="357" maxX="378" minY="295" maxY="316" name="parking-meter-m"/>
-  <symbol minX="378" maxX="399" minY="295" maxY="316" name="car_sharing-m"/>
-  <symbol minX="399" maxX="420" minY="295" maxY="316" name="school-m"/>
-  <symbol minX="420" maxX="441" minY="295" maxY="316" name="basketball-m"/>
-  <symbol minX="441" maxX="462" minY="295" maxY="316" name="sports-m"/>
-  <symbol minX="462" maxX="483" minY="295" maxY="316" name="america-football-m"/>
-  <symbol minX="483" maxX="504" minY="295" maxY="316" name="subway-newyork-m"/>
-  <symbol minX="0" maxX="21" minY="316" maxY="337" name="campsite-m"/>
-  <symbol minX="21" maxX="42" minY="316" maxY="337" name="pharmacy-2-m"/>
-  <symbol minX="42" maxX="63" minY="316" maxY="337" name="cafe-m"/>
-  <symbol minX="63" maxX="84" minY="316" maxY="337" name="pharmacy-m"/>
-  <symbol minX="84" maxX="105" minY="316" maxY="337" name="restaurant-m"/>
-  <symbol minX="105" maxX="126" minY="316" maxY="337" name="alpine_hut-m"/>
-  <symbol minX="126" maxX="147" minY="316" maxY="337" name="phone-m"/>
-  <symbol minX="147" maxX="168" minY="316" maxY="337" name="bbq-m"/>
-  <symbol minX="168" maxX="189" minY="316" maxY="337" name="cable-car-m"/>
-  <symbol minX="189" maxX="210" minY="316" maxY="337" name="butcher-m"/>
-  <symbol minX="210" maxX="231" minY="316" maxY="337" name="recycling-m"/>
-  <symbol minX="231" maxX="252" minY="316" maxY="337" name="bus-m"/>
-  <symbol minX="252" maxX="273" minY="316" maxY="337" name="pitch-m"/>
-  <symbol minX="273" maxX="294" minY="316" maxY="337" name="subway-m"/>
-  <symbol minX="294" maxX="315" minY="316" maxY="337" name="bowls-m"/>
-  <symbol minX="315" maxX="336" minY="316" maxY="337" name="place-of-worship-m"/>
-  <symbol minX="336" maxX="357" minY="316" maxY="337" name="beach-m"/>
-  <symbol minX="357" maxX="378" minY="316" maxY="337" name="boundary_stone-m"/>
-  <symbol minX="378" maxX="399" minY="316" maxY="337" name="police-m"/>
-  <symbol minX="399" maxX="420" minY="316" maxY="337" name="alcohol-m"/>
-  <symbol minX="420" maxX="441" minY="316" maxY="337" name="book-shop-m"/>
-  <symbol minX="441" maxX="462" minY="316" maxY="337" name="postbox-m"/>
-  <symbol minX="462" maxX="483" minY="316" maxY="337" name="subway-entrance-2-m"/>
-  <symbol minX="483" maxX="504" minY="316" maxY="337" name="bicycle-m"/>
-  <symbol minX="0" maxX="21" minY="337" maxY="358" name="subway-entrance-m"/>
-  <symbol minX="21" maxX="42" minY="337" maxY="358" name="beauty-m"/>
-  <symbol minX="42" maxX="63" minY="337" maxY="358" name="pub-m"/>
-  <symbol minX="63" maxX="83" minY="337" maxY="357" name="parking-l"/>
-  <symbol minX="83" maxX="103" minY="337" maxY="357" name="subway-berlin-l"/>
-  <symbol minX="103" maxX="123" minY="337" maxY="357" name="lightrail-berlin-m"/>
-  <symbol minX="123" maxX="143" minY="337" maxY="357" name="speedcam-l"/>
-  <symbol minX="143" maxX="163" minY="337" maxY="357" name="watch-my-position"/>
-  <symbol minX="163" maxX="183" minY="337" maxY="357" name="subway-rome-l"/>
-  <symbol minX="183" maxX="205" minY="337" maxY="356" name="subway-moscow-l"/>
-  <symbol minX="205" maxX="224" minY="337" maxY="356" name="route_from"/>
-  <symbol minX="224" maxX="242" minY="337" maxY="355" name="airport-s"/>
-  <symbol minX="242" maxX="263" minY="337" maxY="355" name="subway-moscow-m"/>
-  <symbol minX="263" maxX="280" minY="337" maxY="355" name="remains-s"/>
-  <symbol minX="280" maxX="298" minY="337" maxY="355" name="subway-paris-m"/>
-  <symbol minX="298" maxX="315" minY="337" maxY="355" name="bcontrol-s"/>
-  <symbol minX="315" maxX="333" minY="337" maxY="355" name="subway-rome-m"/>
-  <symbol minX="333" maxX="350" minY="337" maxY="355" name="beer-s"/>
-  <symbol minX="350" maxX="368" minY="337" maxY="355" name="subway-berlin-m"/>
-  <symbol minX="368" maxX="385" minY="337" maxY="355" name="office-s"/>
-  <symbol minX="385" maxX="402" minY="337" maxY="355" name="picnic-s"/>
-  <symbol minX="402" maxX="420" minY="337" maxY="355" name="current-position"/>
-  <symbol minX="420" maxX="438" minY="337" maxY="355" name="no-icon"/>
-  <symbol minX="438" maxX="456" minY="337" maxY="355" name="no-icon-tourism"/>
-  <symbol minX="456" maxX="474" minY="337" maxY="355" name="no-icon-shop"/>
-  <symbol minX="474" maxX="492" minY="337" maxY="355" name="no-icon-leisure"/>
-  <symbol minX="492" maxX="510" minY="337" maxY="355" name="no-icon-amenity"/>
-  <symbol minX="0" maxX="22" minY="358" maxY="376" name="subway-london-l"/>
-  <symbol minX="22" maxX="39" minY="358" maxY="376" name="waterfall-s"/>
-  <symbol minX="39" maxX="56" minY="358" maxY="376" name="hunting-tower-s"/>
-  <symbol minX="56" maxX="73" minY="358" maxY="376" name="heliport-s"/>
-  <symbol minX="73" maxX="90" minY="358" maxY="375" name="skiing-s"/>
-  <symbol minX="90" maxX="107" minY="358" maxY="375" name="shop-s"/>
-  <symbol minX="107" maxX="124" minY="358" maxY="375" name="soccer-s"/>
-  <symbol minX="124" maxX="141" minY="358" maxY="375" name="ship-s"/>
-  <symbol minX="141" maxX="158" minY="358" maxY="375" name="speedcam-m"/>
-  <symbol minX="158" maxX="175" minY="358" maxY="375" name="bar-s"/>
-  <symbol minX="175" maxX="192" minY="358" maxY="375" name="school-s"/>
-  <symbol minX="192" maxX="209" minY="358" maxY="375" name="baseball-s"/>
-  <symbol minX="209" maxX="226" minY="358" maxY="375" name="basketball-s"/>
-  <symbol minX="226" maxX="243" minY="358" maxY="375" name="bicycle-s"/>
-  <symbol minX="243" maxX="260" minY="358" maxY="375" name="book-shop-s"/>
-  <symbol minX="260" maxX="277" minY="358" maxY="375" name="alcohol-s"/>
-  <symbol minX="277" maxX="294" minY="358" maxY="375" name="bus-s"/>
-  <symbol minX="294" maxX="314" minY="358" maxY="375" name="subway-barcelona-s"/>
-  <symbol minX="314" maxX="331" minY="358" maxY="375" name="restaurant-s"/>
-  <symbol minX="331" maxX="348" minY="358" maxY="375" name="recycling-s"/>
-  <symbol minX="348" maxX="365" minY="358" maxY="375" name="cable-car-s"/>
-  <symbol minX="365" maxX="382" minY="358" maxY="375" name="cafe-s"/>
-  <symbol minX="382" maxX="399" minY="358" maxY="375" name="subway-entrance-2-s"/>
-  <symbol minX="399" maxX="416" minY="358" maxY="375" name="subway-entrance-arrow"/>
-  <symbol minX="416" maxX="433" minY="358" maxY="375" name="pub-s"/>
-  <symbol minX="433" maxX="450" minY="358" maxY="375" name="power-s"/>
-  <symbol minX="450" maxX="467" minY="358" maxY="375" name="subway-entrance-s"/>
-  <symbol minX="467" maxX="484" minY="358" maxY="375" name="campsite-s"/>
-  <symbol minX="484" maxX="501" minY="358" maxY="375" name="america-football-s"/>
-  <symbol minX="0" maxX="17" minY="376" maxY="393" name="car-repair-s"/>
-  <symbol minX="17" maxX="34" minY="376" maxY="393" name="police-s"/>
-  <symbol minX="34" maxX="51" minY="376" maxY="393" name="place-of-worship-s"/>
-  <symbol minX="51" maxX="72" minY="376" maxY="393" name="subway-london-m"/>
-  <symbol minX="72" maxX="89" minY="376" maxY="393" name="casino-s"/>
-  <symbol minX="89" maxX="106" minY="376" maxY="393" name="pitch-s"/>
-  <symbol minX="106" maxX="123" minY="376" maxY="393" name="cave-s"/>
-  <symbol minX="123" maxX="140" minY="376" maxY="393" name="cemetery-s"/>
-  <symbol minX="140" maxX="157" minY="376" maxY="393" name="zoo-s"/>
-  <symbol minX="157" maxX="174" minY="376" maxY="393" name="cinema-s"/>
-  <symbol minX="174" maxX="191" minY="376" maxY="393" name="college-s"/>
-  <symbol minX="191" maxX="208" minY="376" maxY="393" name="windmill-s"/>
-  <symbol minX="208" maxX="225" minY="376" maxY="393" name="phone-s"/>
-  <symbol minX="225" maxX="242" minY="376" maxY="393" name="pharmacy-s"/>
-  <symbol minX="242" maxX="259" minY="376" maxY="393" name="drinking-water-s"/>
-  <symbol minX="259" maxX="276" minY="376" maxY="393" name="embassy-s"/>
-  <symbol minX="276" maxX="293" minY="376" maxY="393" name="volcano-s"/>
-  <symbol minX="293" maxX="310" minY="376" maxY="393" name="subway-newyork-s"/>
-  <symbol minX="310" maxX="327" minY="376" maxY="393" name="equestrian-s"/>
-  <symbol minX="327" maxX="344" minY="376" maxY="393" name="fastfood-s"/>
-  <symbol minX="344" maxX="361" minY="376" maxY="393" name="fire_station-s"/>
-  <symbol minX="361" maxX="378" minY="376" maxY="393" name="tram-s"/>
-  <symbol minX="378" maxX="395" minY="376" maxY="393" name="fountain-s"/>
-  <symbol minX="395" maxX="412" minY="376" maxY="393" name="fuel-s"/>
-  <symbol minX="412" maxX="429" minY="376" maxY="393" name="train-s"/>
-  <symbol minX="429" maxX="446" minY="376" maxY="393" name="subway-s"/>
-  <symbol minX="446" maxX="463" minY="376" maxY="393" name="funicular-s"/>
-  <symbol minX="463" maxX="480" minY="376" maxY="393" name="gallery-s"/>
-  <symbol minX="480" maxX="497" minY="376" maxY="393" name="subway-spb-s"/>
-  <symbol minX="0" maxX="17" minY="393" maxY="410" name="garden-s"/>
-  <symbol minX="17" maxX="34" minY="393" maxY="410" name="golf-s"/>
-  <symbol minX="34" maxX="51" minY="393" maxY="410" name="townhall-s"/>
-  <symbol minX="51" maxX="68" minY="393" maxY="410" name="grocery-s"/>
-  <symbol minX="68" maxX="85" minY="393" maxY="410" name="park-s"/>
-  <symbol minX="85" maxX="102" minY="393" maxY="410" name="nparkf-s"/>
-  <symbol minX="102" maxX="119" minY="393" maxY="410" name="npark-s"/>
-  <symbol minX="119" maxX="136" minY="393" maxY="410" name="hand-s"/>
-  <symbol minX="136" maxX="153" minY="393" maxY="410" name="swimming-s"/>
-  <symbol minX="153" maxX="170" minY="393" maxY="410" name="atm-s"/>
-  <symbol minX="170" maxX="187" minY="393" maxY="410" name="monument-s"/>
-  <symbol minX="187" maxX="204" minY="393" maxY="410" name="military-s"/>
-  <symbol minX="204" maxX="221" minY="393" maxY="410" name="tourism-s"/>
-  <symbol minX="221" maxX="238" minY="393" maxY="410" name="tennis-s"/>
-  <symbol minX="238" maxX="255" minY="393" maxY="410" name="museum-s"/>
-  <symbol minX="255" maxX="272" minY="393" maxY="410" name="mail-s"/>
-  <symbol minX="272" maxX="289" minY="393" maxY="410" name="theatre-s"/>
-  <symbol minX="289" maxX="306" minY="393" maxY="410" name="helipad-s"/>
-  <symbol minX="306" maxX="323" minY="393" maxY="410" name="lighthouse-s"/>
-  <symbol minX="323" maxX="340" minY="393" maxY="410" name="toilets-s"/>
-  <symbol minX="340" maxX="357" minY="393" maxY="410" name="library-s"/>
-  <symbol minX="357" maxX="374" minY="393" maxY="410" name="kindergarten-s"/>
-  <symbol minX="374" maxX="391" minY="393" maxY="410" name="information-s"/>
-  <symbol minX="391" maxX="408" minY="393" maxY="410" name="hotel-s"/>
-  <symbol minX="408" maxX="425" minY="393" maxY="410" name="hospital-s"/>
-  <symbol minX="425" maxX="447" minY="393" maxY="409" name="metro-barcelona-m"/>
-  <symbol minX="447" maxX="462" minY="393" maxY="409" name="s-arrow"/>
-  <symbol minX="462" maxX="484" minY="393" maxY="409" name="subway-barcelona-l"/>
-  <symbol minX="484" maxX="506" minY="393" maxY="409" name="subway-barcelona-m"/>
-  <symbol minX="0" maxX="22" minY="410" maxY="426" name="subway-madrid-l"/>
+  <symbol minX="441" maxX="462" minY="274" maxY="295" name="shop-bicycle-m"/>
+  <symbol minX="462" maxX="483" minY="274" maxY="295" name="bar-m"/>
+  <symbol minX="483" maxX="504" minY="274" maxY="295" name="shoes-m"/>
+  <symbol minX="0" maxX="21" minY="295" maxY="316" name="soccer-m"/>
+  <symbol minX="21" maxX="42" minY="295" maxY="316" name="clothes-m"/>
+  <symbol minX="42" maxX="63" minY="295" maxY="316" name="zoo-m"/>
+  <symbol minX="63" maxX="84" minY="295" maxY="316" name="npark-m"/>
+  <symbol minX="84" maxX="105" minY="295" maxY="316" name="sweets-m"/>
+  <symbol minX="105" maxX="126" minY="295" maxY="316" name="cinema-m"/>
+  <symbol minX="126" maxX="147" minY="295" maxY="316" name="nparkf-m "/>
+  <symbol minX="147" maxX="168" minY="295" maxY="316" name="nparkf-m"/>
+  <symbol minX="168" maxX="189" minY="295" maxY="316" name="chemist-m"/>
+  <symbol minX="189" maxX="210" minY="295" maxY="316" name="cemetery-m"/>
+  <symbol minX="210" maxX="231" minY="295" maxY="316" name="ship-m"/>
+  <symbol minX="231" maxX="252" minY="295" maxY="316" name="baseball-m"/>
+  <symbol minX="252" maxX="273" minY="295" maxY="316" name="cave-m"/>
+  <symbol minX="273" maxX="294" minY="295" maxY="316" name="optician-m"/>
+  <symbol minX="294" maxX="315" minY="295" maxY="316" name="archery-m"/>
+  <symbol minX="315" maxX="336" minY="295" maxY="316" name="park-m"/>
+  <symbol minX="336" maxX="357" minY="295" maxY="316" name="subway-spb-m"/>
+  <symbol minX="357" maxX="378" minY="295" maxY="316" name="school-m"/>
+  <symbol minX="378" maxX="399" minY="295" maxY="316" name="casino-m"/>
+  <symbol minX="399" maxX="420" minY="295" maxY="316" name="caravan_site-m"/>
+  <symbol minX="420" maxX="441" minY="295" maxY="316" name="parking-meter-m"/>
+  <symbol minX="441" maxX="462" minY="295" maxY="316" name="basketball-m"/>
+  <symbol minX="462" maxX="483" minY="295" maxY="316" name="sports-m"/>
+  <symbol minX="483" maxX="504" minY="295" maxY="316" name="restaurant-m"/>
+  <symbol minX="0" maxX="21" minY="316" maxY="337" name="car_sharing-m"/>
+  <symbol minX="21" maxX="42" minY="316" maxY="337" name="subway-newyork-m"/>
+  <symbol minX="42" maxX="63" minY="316" maxY="337" name="america-football-m"/>
+  <symbol minX="63" maxX="84" minY="316" maxY="337" name="bbq-m"/>
+  <symbol minX="84" maxX="105" minY="316" maxY="337" name="pharmacy-2-m"/>
+  <symbol minX="105" maxX="126" minY="316" maxY="337" name="campsite-m"/>
+  <symbol minX="126" maxX="147" minY="316" maxY="337" name="pharmacy-m"/>
+  <symbol minX="147" maxX="168" minY="316" maxY="337" name="beach-m"/>
+  <symbol minX="168" maxX="189" minY="316" maxY="337" name="cafe-m"/>
+  <symbol minX="189" maxX="210" minY="316" maxY="337" name="phone-m"/>
+  <symbol minX="210" maxX="231" minY="316" maxY="337" name="subway-m"/>
+  <symbol minX="231" maxX="252" minY="316" maxY="337" name="alpine_hut-m"/>
+  <symbol minX="252" maxX="273" minY="316" maxY="337" name="cable-car-m"/>
+  <symbol minX="273" maxX="294" minY="316" maxY="337" name="recycling-m"/>
+  <symbol minX="294" maxX="315" minY="316" maxY="337" name="butcher-m"/>
+  <symbol minX="315" maxX="336" minY="316" maxY="337" name="pitch-m"/>
+  <symbol minX="336" maxX="357" minY="316" maxY="337" name="beauty-m"/>
+  <symbol minX="357" maxX="378" minY="316" maxY="337" name="bus-m"/>
+  <symbol minX="378" maxX="399" minY="316" maxY="337" name="place-of-worship-m"/>
+  <symbol minX="399" maxX="420" minY="316" maxY="337" name="bowls-m"/>
+  <symbol minX="420" maxX="441" minY="316" maxY="337" name="boundary_stone-m"/>
+  <symbol minX="441" maxX="462" minY="316" maxY="337" name="police-m"/>
+  <symbol minX="462" maxX="483" minY="316" maxY="337" name="subway-entrance-m"/>
+  <symbol minX="483" maxX="504" minY="316" maxY="337" name="alcohol-m"/>
+  <symbol minX="0" maxX="21" minY="337" maxY="358" name="postbox-m"/>
+  <symbol minX="21" maxX="42" minY="337" maxY="358" name="book-shop-m"/>
+  <symbol minX="42" maxX="63" minY="337" maxY="358" name="subway-entrance-2-m"/>
+  <symbol minX="63" maxX="84" minY="337" maxY="358" name="bicycle-m"/>
+  <symbol minX="84" maxX="105" minY="337" maxY="358" name="pub-m"/>
+  <symbol minX="105" maxX="125" minY="337" maxY="357" name="parking-l"/>
+  <symbol minX="125" maxX="145" minY="337" maxY="357" name="subway-rome-l"/>
+  <symbol minX="145" maxX="165" minY="337" maxY="357" name="lightrail-berlin-m"/>
+  <symbol minX="165" maxX="185" minY="337" maxY="357" name="watch-my-position"/>
+  <symbol minX="185" maxX="205" minY="337" maxY="357" name="speedcam-l"/>
+  <symbol minX="205" maxX="225" minY="337" maxY="357" name="subway-berlin-l"/>
+  <symbol minX="225" maxX="247" minY="337" maxY="356" name="subway-moscow-l"/>
+  <symbol minX="247" maxX="266" minY="337" maxY="356" name="route_from"/>
+  <symbol minX="266" maxX="283" minY="337" maxY="355" name="remains-s"/>
+  <symbol minX="283" maxX="304" minY="337" maxY="355" name="subway-moscow-m"/>
+  <symbol minX="304" maxX="322" minY="337" maxY="355" name="subway-paris-m"/>
+  <symbol minX="322" maxX="339" minY="337" maxY="355" name="bcontrol-s"/>
+  <symbol minX="339" maxX="357" minY="337" maxY="355" name="airport-s"/>
+  <symbol minX="357" maxX="375" minY="337" maxY="355" name="subway-rome-m"/>
+  <symbol minX="375" maxX="392" minY="337" maxY="355" name="beer-s"/>
+  <symbol minX="392" maxX="409" minY="337" maxY="355" name="picnic-s"/>
+  <symbol minX="409" maxX="426" minY="337" maxY="355" name="office-s"/>
+  <symbol minX="426" maxX="444" minY="337" maxY="355" name="current-position"/>
+  <symbol minX="444" maxX="462" minY="337" maxY="355" name="no-icon"/>
+  <symbol minX="462" maxX="484" minY="337" maxY="355" name="subway-london-l"/>
+  <symbol minX="484" maxX="502" minY="337" maxY="355" name="no-icon-tourism"/>
+  <symbol minX="0" maxX="18" minY="358" maxY="376" name="no-icon-shop"/>
+  <symbol minX="18" maxX="36" minY="358" maxY="376" name="no-icon-leisure"/>
+  <symbol minX="36" maxX="54" minY="358" maxY="376" name="no-icon-amenity"/>
+  <symbol minX="54" maxX="72" minY="358" maxY="376" name="subway-berlin-m"/>
+  <symbol minX="72" maxX="89" minY="358" maxY="376" name="waterfall-s"/>
+  <symbol minX="89" maxX="106" minY="358" maxY="376" name="hunting-tower-s"/>
+  <symbol minX="106" maxX="123" minY="358" maxY="376" name="heliport-s"/>
+  <symbol minX="123" maxX="140" minY="358" maxY="375" name="skiing-s"/>
+  <symbol minX="140" maxX="157" minY="358" maxY="375" name="shop-s"/>
+  <symbol minX="157" maxX="174" minY="358" maxY="375" name="ship-s"/>
+  <symbol minX="174" maxX="191" minY="358" maxY="375" name="soccer-s"/>
+  <symbol minX="191" maxX="208" minY="358" maxY="375" name="school-s"/>
+  <symbol minX="208" maxX="225" minY="358" maxY="375" name="speedcam-m"/>
+  <symbol minX="225" maxX="242" minY="358" maxY="375" name="military-s"/>
+  <symbol minX="242" maxX="259" minY="358" maxY="375" name="bar-s"/>
+  <symbol minX="259" maxX="276" minY="358" maxY="375" name="restaurant-s"/>
+  <symbol minX="276" maxX="293" minY="358" maxY="375" name="baseball-s"/>
+  <symbol minX="293" maxX="310" minY="358" maxY="375" name="basketball-s"/>
+  <symbol minX="310" maxX="327" minY="358" maxY="375" name="bicycle-s"/>
+  <symbol minX="327" maxX="344" minY="358" maxY="375" name="book-shop-s"/>
+  <symbol minX="344" maxX="361" minY="358" maxY="375" name="alcohol-s"/>
+  <symbol minX="361" maxX="381" minY="358" maxY="375" name="subway-barcelona-s"/>
+  <symbol minX="381" maxX="398" minY="358" maxY="375" name="recycling-s"/>
+  <symbol minX="398" maxX="415" minY="358" maxY="375" name="bus-s"/>
+  <symbol minX="415" maxX="432" minY="358" maxY="375" name="cable-car-s"/>
+  <symbol minX="432" maxX="449" minY="358" maxY="375" name="pub-s"/>
+  <symbol minX="449" maxX="466" minY="358" maxY="375" name="subway-entrance-2-s"/>
+  <symbol minX="466" maxX="483" minY="358" maxY="375" name="subway-entrance-arrow"/>
+  <symbol minX="483" maxX="500" minY="358" maxY="375" name="power-s"/>
+  <symbol minX="0" maxX="17" minY="376" maxY="393" name="police-s"/>
+  <symbol minX="17" maxX="34" minY="376" maxY="393" name="subway-entrance-s"/>
+  <symbol minX="34" maxX="51" minY="376" maxY="393" name="cafe-s"/>
+  <symbol minX="51" maxX="68" minY="376" maxY="393" name="campsite-s"/>
+  <symbol minX="68" maxX="85" minY="376" maxY="393" name="america-football-s"/>
+  <symbol minX="85" maxX="102" minY="376" maxY="393" name="place-of-worship-s"/>
+  <symbol minX="102" maxX="119" minY="376" maxY="393" name="pitch-s"/>
+  <symbol minX="119" maxX="140" minY="376" maxY="393" name="subway-london-m"/>
+  <symbol minX="140" maxX="157" minY="376" maxY="393" name="car-repair-s"/>
+  <symbol minX="157" maxX="174" minY="376" maxY="393" name="phone-s"/>
+  <symbol minX="174" maxX="191" minY="376" maxY="393" name="casino-s"/>
+  <symbol minX="191" maxX="208" minY="376" maxY="393" name="cave-s"/>
+  <symbol minX="208" maxX="225" minY="376" maxY="393" name="cemetery-s"/>
+  <symbol minX="225" maxX="242" minY="376" maxY="393" name="zoo-s"/>
+  <symbol minX="242" maxX="259" minY="376" maxY="393" name="cinema-s"/>
+  <symbol minX="259" maxX="276" minY="376" maxY="393" name="college-s"/>
+  <symbol minX="276" maxX="293" minY="376" maxY="393" name="pharmacy-s"/>
+  <symbol minX="293" maxX="310" minY="376" maxY="393" name="windmill-s"/>
+  <symbol minX="310" maxX="327" minY="376" maxY="393" name="dentist-s"/>
+  <symbol minX="327" maxX="344" minY="376" maxY="393" name="drinking-water-s"/>
+  <symbol minX="344" maxX="361" minY="376" maxY="393" name="embassy-s"/>
+  <symbol minX="361" maxX="378" minY="376" maxY="393" name="subway-newyork-s"/>
+  <symbol minX="378" maxX="395" minY="376" maxY="393" name="volcano-s"/>
+  <symbol minX="395" maxX="412" minY="376" maxY="393" name="equestrian-s"/>
+  <symbol minX="412" maxX="429" minY="376" maxY="393" name="fastfood-s"/>
+  <symbol minX="429" maxX="446" minY="376" maxY="393" name="tram-s"/>
+  <symbol minX="446" maxX="463" minY="376" maxY="393" name="fire_station-s"/>
+  <symbol minX="463" maxX="480" minY="376" maxY="393" name="fountain-s"/>
+  <symbol minX="480" maxX="497" minY="376" maxY="393" name="train-s"/>
+  <symbol minX="0" maxX="17" minY="393" maxY="410" name="subway-s"/>
+  <symbol minX="17" maxX="34" minY="393" maxY="410" name="fuel-s"/>
+  <symbol minX="34" maxX="51" minY="393" maxY="410" name="park-s"/>
+  <symbol minX="51" maxX="68" minY="393" maxY="410" name="subway-spb-s"/>
+  <symbol minX="68" maxX="85" minY="393" maxY="410" name="funicular-s"/>
+  <symbol minX="85" maxX="102" minY="393" maxY="410" name="gallery-s"/>
+  <symbol minX="102" maxX="119" minY="393" maxY="410" name="garden-s"/>
+  <symbol minX="119" maxX="136" minY="393" maxY="410" name="townhall-s"/>
+  <symbol minX="136" maxX="153" minY="393" maxY="410" name="nparkf-s"/>
+  <symbol minX="153" maxX="170" minY="393" maxY="410" name="npark-s"/>
+  <symbol minX="170" maxX="187" minY="393" maxY="410" name="golf-s"/>
+  <symbol minX="187" maxX="204" minY="393" maxY="410" name="museum-s"/>
+  <symbol minX="204" maxX="221" minY="393" maxY="410" name="swimming-s"/>
+  <symbol minX="221" maxX="238" minY="393" maxY="410" name="atm-s"/>
+  <symbol minX="238" maxX="255" minY="393" maxY="410" name="monument-s"/>
+  <symbol minX="255" maxX="272" minY="393" maxY="410" name="grocery-s"/>
+  <symbol minX="272" maxX="289" minY="393" maxY="410" name="tourism-s"/>
+  <symbol minX="289" maxX="306" minY="393" maxY="410" name="tennis-s"/>
+  <symbol minX="306" maxX="323" minY="393" maxY="410" name="mail-s"/>
+  <symbol minX="323" maxX="340" minY="393" maxY="410" name="hand-s"/>
+  <symbol minX="340" maxX="357" minY="393" maxY="410" name="theatre-s"/>
+  <symbol minX="357" maxX="374" minY="393" maxY="410" name="lighthouse-s"/>
+  <symbol minX="374" maxX="391" minY="393" maxY="410" name="library-s"/>
+  <symbol minX="391" maxX="408" minY="393" maxY="410" name="toilets-s"/>
+  <symbol minX="408" maxX="425" minY="393" maxY="410" name="kindergarten-s"/>
+  <symbol minX="425" maxX="442" minY="393" maxY="410" name="information-s"/>
+  <symbol minX="442" maxX="459" minY="393" maxY="410" name="hotel-s"/>
+  <symbol minX="459" maxX="476" minY="393" maxY="410" name="hospital-s"/>
+  <symbol minX="476" maxX="493" minY="393" maxY="410" name="helipad-s"/>
+  <symbol minX="493" maxX="509" minY="393" maxY="409" name="parking-m"/>
+  <symbol minX="0" maxX="22" minY="410" maxY="426" name="metro-barcelona-m"/>
   <symbol minX="22" maxX="44" minY="410" maxY="426" name="subway-madrid-m"/>
-  <symbol minX="44" maxX="60" minY="410" maxY="426" name="parking-m"/>
-  <symbol minX="60" maxX="75" minY="410" maxY="425" name="lightrail-berlin-s"/>
-  <symbol minX="75" maxX="95" minY="410" maxY="425" name="subway-madrid-s"/>
-  <symbol minX="95" maxX="116" minY="410" maxY="425" name="subway-kiev-m"/>
-  <symbol minX="116" maxX="131" minY="410" maxY="425" name="peak-l"/>
-  <symbol minX="131" maxX="152" minY="410" maxY="425" name="subway-kiev-l"/>
-  <symbol minX="152" maxX="167" minY="410" maxY="425" name="subway-paris-s"/>
-  <symbol minX="167" maxX="187" minY="410" maxY="425" name="metro-barcelona-s"/>
-  <symbol minX="187" maxX="202" minY="410" maxY="425" name="api-result"/>
-  <symbol minX="202" maxX="217" minY="410" maxY="425" name="subway-moscow-s"/>
-  <symbol minX="217" maxX="232" minY="410" maxY="424" name="bench"/>
-  <symbol minX="232" maxX="246" minY="410" maxY="424" name="search-result"/>
-  <symbol minX="246" maxX="260" minY="410" maxY="424" name="subway-berlin-s"/>
-  <symbol minX="260" maxX="274" minY="410" maxY="424" name="speedcam-s"/>
-  <symbol minX="274" maxX="288" minY="410" maxY="424" name="subway-rome-s"/>
-  <symbol minX="288" maxX="305" minY="410" maxY="424" name="subway-london-s"/>
-  <symbol minX="305" maxX="319" minY="410" maxY="424" name="parking-s"/>
-  <symbol minX="319" maxX="332" minY="410" maxY="423" name="survey_point-l"/>
-  <symbol minX="332" maxX="346" minY="410" maxY="423" name="peakt-l"/>
-  <symbol minX="346" maxX="359" minY="410" maxY="423" name="star-l"/>
-  <symbol minX="359" maxX="380" minY="410" maxY="423" name="subway-minsk-l"/>
-  <symbol minX="380" maxX="398" minY="410" maxY="422" name="subway-minsk-m"/>
-  <symbol minX="398" maxX="410" minY="410" maxY="422" name="subway-xs"/>
-  <symbol minX="410" maxX="428" minY="410" maxY="422" name="subway-kiev-s"/>
-  <symbol minX="428" maxX="445" minY="410" maxY="422" name="railway-crossing"/>
-  <symbol minX="445" maxX="457" minY="410" maxY="422" name="peak-m"/>
-  <symbol minX="457" maxX="469" minY="410" maxY="422" name="star-m"/>
-  <symbol minX="469" maxX="481" minY="410" maxY="422" name="survey_point-m"/>
-  <symbol minX="481" maxX="493" minY="410" maxY="422" name="subway-newyork-xs"/>
-  <symbol minX="493" maxX="510" minY="410" maxY="421" name="subway-minsk-s"/>
-  <symbol minX="0" maxX="11" minY="426" maxY="437" name="crossing-l"/>
-  <symbol minX="11" maxX="22" minY="426" maxY="437" name="star-s"/>
-  <symbol minX="22" maxX="33" minY="426" maxY="436" name="peakt-m"/>
-  <symbol minX="33" maxX="53" minY="426" maxY="436" name="arrow-m"/>
-  <symbol minX="53" maxX="64" minY="426" maxY="436" name="peak-s"/>
-  <symbol minX="64" maxX="74" minY="426" maxY="436" name="survey_point-s"/>
-  <symbol minX="74" maxX="83" minY="426" maxY="435" name="crossing-m"/>
-  <symbol minX="83" maxX="92" minY="426" maxY="435" name="entrance-s"/>
-  <symbol minX="92" maxX="101" minY="426" maxY="435" name="peakt-s"/>
-  <symbol minX="101" maxX="109" minY="426" maxY="434" name="none"/>
-  <symbol minX="109" maxX="124" minY="426" maxY="434" name="arrow-s"/>
-  <symbol minX="124" maxX="132" minY="426" maxY="434" name="dot-m"/>
-  <symbol minX="132" maxX="140" minY="426" maxY="434" name="tree-l"/>
-  <symbol minX="140" maxX="148" minY="426" maxY="434" name="crossing-s"/>
-  <symbol minX="148" maxX="155" minY="426" maxY="433" name="entrance-xs"/>
-  <symbol minX="155" maxX="162" minY="426" maxY="433" name="tree-m"/>
-  <symbol minX="162" maxX="168" minY="426" maxY="432" name="dot-s"/>
-  <symbol minX="168" maxX="174" minY="426" maxY="432" name="dot-s-light"/>
-  <symbol minX="174" maxX="180" minY="426" maxY="432" name="zero-icon"/>
-  <symbol minX="180" maxX="186" minY="426" maxY="432" name="tree-s"/>
+  <symbol minX="44" maxX="59" minY="410" maxY="426" name="s-arrow"/>
+  <symbol minX="59" maxX="81" minY="410" maxY="426" name="subway-barcelona-l"/>
+  <symbol minX="81" maxX="103" minY="410" maxY="426" name="subway-barcelona-m"/>
+  <symbol minX="103" maxX="125" minY="410" maxY="426" name="subway-madrid-l"/>
+  <symbol minX="125" maxX="146" minY="410" maxY="425" name="subway-kiev-m"/>
+  <symbol minX="146" maxX="161" minY="410" maxY="425" name="lightrail-berlin-s"/>
+  <symbol minX="161" maxX="182" minY="410" maxY="425" name="subway-kiev-l"/>
+  <symbol minX="182" maxX="202" minY="410" maxY="425" name="metro-barcelona-s"/>
+  <symbol minX="202" maxX="217" minY="410" maxY="425" name="peak-l"/>
+  <symbol minX="217" maxX="232" minY="410" maxY="425" name="subway-paris-s"/>
+  <symbol minX="232" maxX="252" minY="410" maxY="425" name="subway-madrid-s"/>
+  <symbol minX="252" maxX="267" minY="410" maxY="425" name="api-result"/>
+  <symbol minX="267" maxX="282" minY="410" maxY="425" name="subway-moscow-s"/>
+  <symbol minX="282" maxX="296" minY="410" maxY="424" name="speedcam-s"/>
+  <symbol minX="296" maxX="313" minY="410" maxY="424" name="subway-london-s"/>
+  <symbol minX="313" maxX="327" minY="410" maxY="424" name="subway-berlin-s"/>
+  <symbol minX="327" maxX="341" minY="410" maxY="424" name="search-result"/>
+  <symbol minX="341" maxX="355" minY="410" maxY="424" name="parking-s"/>
+  <symbol minX="355" maxX="370" minY="410" maxY="424" name="bench"/>
+  <symbol minX="370" maxX="384" minY="410" maxY="424" name="subway-rome-s"/>
+  <symbol minX="384" maxX="405" minY="410" maxY="423" name="subway-minsk-l"/>
+  <symbol minX="405" maxX="419" minY="410" maxY="423" name="peakt-l"/>
+  <symbol minX="419" maxX="432" minY="410" maxY="423" name="survey_point-l"/>
+  <symbol minX="432" maxX="445" minY="410" maxY="423" name="star-l"/>
+  <symbol minX="445" maxX="457" minY="410" maxY="422" name="survey_point-m"/>
+  <symbol minX="457" maxX="469" minY="410" maxY="422" name="peak-m"/>
+  <symbol minX="469" maxX="481" minY="410" maxY="422" name="subway-xs"/>
+  <symbol minX="481" maxX="498" minY="410" maxY="422" name="railway-crossing"/>
+  <symbol minX="498" maxX="510" minY="410" maxY="422" name="star-m"/>
+  <symbol minX="0" maxX="12" minY="426" maxY="438" name="subway-newyork-xs"/>
+  <symbol minX="12" maxX="30" minY="426" maxY="438" name="subway-minsk-m"/>
+  <symbol minX="30" maxX="48" minY="426" maxY="438" name="subway-kiev-s"/>
+  <symbol minX="48" maxX="65" minY="426" maxY="437" name="subway-minsk-s"/>
+  <symbol minX="65" maxX="76" minY="426" maxY="437" name="crossing-l"/>
+  <symbol minX="76" maxX="87" minY="426" maxY="437" name="star-s"/>
+  <symbol minX="87" maxX="97" minY="426" maxY="436" name="survey_point-s"/>
+  <symbol minX="97" maxX="117" minY="426" maxY="436" name="arrow-m"/>
+  <symbol minX="117" maxX="128" minY="426" maxY="436" name="peakt-m"/>
+  <symbol minX="128" maxX="139" minY="426" maxY="436" name="peak-s"/>
+  <symbol minX="139" maxX="148" minY="426" maxY="435" name="crossing-m"/>
+  <symbol minX="148" maxX="157" minY="426" maxY="435" name="entrance-s"/>
+  <symbol minX="157" maxX="166" minY="426" maxY="435" name="peakt-s"/>
+  <symbol minX="166" maxX="174" minY="426" maxY="434" name="dot-m"/>
+  <symbol minX="174" maxX="182" minY="426" maxY="434" name="tree-l"/>
+  <symbol minX="182" maxX="190" minY="426" maxY="434" name="crossing-s"/>
+  <symbol minX="190" maxX="198" minY="426" maxY="434" name="none"/>
+  <symbol minX="198" maxX="213" minY="426" maxY="434" name="arrow-s"/>
+  <symbol minX="213" maxX="220" minY="426" maxY="433" name="tree-m"/>
+  <symbol minX="220" maxX="227" minY="426" maxY="433" name="entrance-xs"/>
+  <symbol minX="227" maxX="233" minY="426" maxY="432" name="dot-s-light"/>
+  <symbol minX="233" maxX="239" minY="426" maxY="432" name="zero-icon"/>
+  <symbol minX="239" maxX="245" minY="426" maxY="432" name="tree-s"/>
+  <symbol minX="245" maxX="251" minY="426" maxY="432" name="dot-s"/>
  </file>
 </root>
diff --git a/data/resources-mdpi_dark/symbols.png b/data/resources-mdpi_dark/symbols.png
index e58ea9d363..467b79c490 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 fce5360b66..289f8a44d5 100644
--- a/data/resources-mdpi_dark/symbols.sdf
+++ b/data/resources-mdpi_dark/symbols.sdf
@@ -1,6 +1,6 @@
 <!DOCTYPE skin>
 <root>
- <file width="512" height="512">
+ <file height="512" width="512">
   <symbol minX="0" maxX="71" minY="0" maxY="71" name="route_to"/>
   <symbol minX="71" maxX="208" minY="0" maxY="68" name="route-arrow"/>
   <symbol minX="208" maxX="268" minY="0" maxY="60" name="compass-image"/>
@@ -18,447 +18,450 @@
   <symbol minX="0" maxX="22" minY="71" maxY="100" name="watch-search-result"/>
   <symbol minX="22" maxX="46" minY="71" maxY="97" name="watch-my-direction"/>
   <symbol minX="46" maxX="68" minY="71" maxY="93" name="airport-l"/>
-  <symbol minX="68" maxX="90" minY="71" maxY="93" name="monument-l"/>
-  <symbol minX="90" maxX="112" minY="71" maxY="93" name="ship-l"/>
+  <symbol minX="68" maxX="90" minY="71" maxY="93" name="greengrocer-l"/>
+  <symbol minX="90" maxX="112" minY="71" maxY="93" name="soccer-l"/>
   <symbol minX="112" maxX="134" minY="71" maxY="93" name="australian-football-l"/>
-  <symbol minX="134" maxX="156" minY="71" maxY="93" name="school-l"/>
+  <symbol minX="134" maxX="156" minY="71" maxY="93" name="shop-l"/>
   <symbol minX="156" maxX="178" minY="71" maxY="93" name="bakery-l"/>
-  <symbol minX="178" maxX="200" minY="71" maxY="93" name="shop-bicycle-l"/>
-  <symbol minX="200" maxX="222" minY="71" maxY="93" name="restaurant-l"/>
+  <symbol minX="178" maxX="200" minY="71" maxY="93" name="shop-l copy"/>
+  <symbol minX="200" maxX="222" minY="71" maxY="93" name="shop-bicycle-l"/>
   <symbol minX="222" maxX="244" minY="71" maxY="93" name="bank-l"/>
   <symbol minX="244" maxX="265" minY="71" maxY="93" name="bank-m"/>
   <symbol minX="265" maxX="287" minY="71" maxY="93" name="banknote-l"/>
-  <symbol minX="287" maxX="309" minY="71" maxY="93" name="shop-l copy"/>
+  <symbol minX="287" maxX="309" minY="71" maxY="93" name="shoes-l"/>
   <symbol minX="309" maxX="331" minY="71" maxY="93" name="bar-l"/>
-  <symbol minX="331" maxX="353" minY="71" maxY="93" name="remains-l"/>
+  <symbol minX="331" maxX="353" minY="71" maxY="93" name="ship-l"/>
   <symbol minX="353" maxX="375" minY="71" maxY="93" name="airport-m"/>
   <symbol minX="375" maxX="397" minY="71" maxY="93" name="baseball-l"/>
-  <symbol minX="397" maxX="419" minY="71" maxY="93" name="shop-l"/>
-  <symbol minX="419" maxX="441" minY="71" maxY="93" name="alcohol-l"/>
+  <symbol minX="397" maxX="419" minY="71" maxY="93" name="school-l"/>
+  <symbol minX="419" maxX="441" minY="71" maxY="93" name="sports-l"/>
   <symbol minX="441" maxX="463" minY="71" maxY="93" name="basketball-l"/>
-  <symbol minX="463" maxX="485" minY="71" maxY="93" name="recycling-l"/>
-  <symbol minX="485" maxX="507" minY="71" maxY="93" name="pub-l"/>
+  <symbol minX="463" maxX="485" minY="71" maxY="93" name="restaurant-l"/>
+  <symbol minX="485" maxX="507" minY="71" maxY="93" name="alcohol-l"/>
   <symbol minX="0" maxX="22" minY="100" maxY="122" name="bbq-l"/>
-  <symbol minX="22" maxX="44" minY="100" maxY="122" name="power-m"/>
+  <symbol minX="22" maxX="44" minY="100" maxY="122" name="remains-l"/>
   <symbol minX="44" maxX="66" minY="100" maxY="122" name="bcontrol-l"/>
-  <symbol minX="66" maxX="88" minY="100" maxY="122" name="power-l"/>
-  <symbol minX="88" maxX="110" minY="100" maxY="122" name="postbox-l"/>
+  <symbol minX="66" maxX="88" minY="100" maxY="122" name="recycling-l"/>
+  <symbol minX="88" maxX="110" minY="100" maxY="122" name="subway-entrance-l"/>
   <symbol minX="110" maxX="132" minY="100" maxY="122" name="beach-l"/>
-  <symbol minX="132" maxX="154" minY="100" maxY="122" name="skiing-l"/>
+  <symbol minX="132" maxX="154" minY="100" maxY="122" name="pub-l"/>
   <symbol minX="154" maxX="176" minY="100" maxY="122" name="beauty-l"/>
-  <symbol minX="176" maxX="198" minY="100" maxY="122" name="police-l"/>
+  <symbol minX="176" maxX="198" minY="100" maxY="122" name="power-m"/>
   <symbol minX="198" maxX="220" minY="100" maxY="122" name="beer-l"/>
-  <symbol minX="220" maxX="242" minY="100" maxY="122" name="place-of-worship-l"/>
-  <symbol minX="242" maxX="264" minY="100" maxY="122" name="alpine_hut-l"/>
-  <symbol minX="264" maxX="286" minY="100" maxY="122" name="soccer-l"/>
+  <symbol minX="220" maxX="242" minY="100" maxY="122" name="power-l"/>
+  <symbol minX="242" maxX="264" minY="100" maxY="122" name="postbox-l"/>
+  <symbol minX="264" maxX="286" minY="100" maxY="122" name="alpine_hut-l"/>
   <symbol minX="286" maxX="308" minY="100" maxY="122" name="bicycle-l"/>
-  <symbol minX="308" maxX="330" minY="100" maxY="122" name="pitch-l"/>
-  <symbol minX="330" maxX="352" minY="100" maxY="122" name="america-football-l"/>
+  <symbol minX="308" maxX="330" minY="100" maxY="122" name="police-l"/>
+  <symbol minX="330" maxX="352" minY="100" maxY="122" name="subway-l"/>
   <symbol minX="352" maxX="374" minY="100" maxY="122" name="book-shop-l"/>
-  <symbol minX="374" maxX="396" minY="100" maxY="122" name="picnic-l"/>
-  <symbol minX="396" maxX="418" minY="100" maxY="122" name="phone-l"/>
+  <symbol minX="374" maxX="396" minY="100" maxY="122" name="place-of-worship-l"/>
+  <symbol minX="396" maxX="418" minY="100" maxY="122" name="america-football-l"/>
   <symbol minX="418" maxX="440" minY="100" maxY="122" name="boundary_stone-l"/>
-  <symbol minX="440" maxX="462" minY="100" maxY="122" name="sports-l"/>
+  <symbol minX="440" maxX="462" minY="100" maxY="122" name="pitch-l"/>
   <symbol minX="462" maxX="484" minY="100" maxY="122" name="bowls-l"/>
-  <symbol minX="484" maxX="506" minY="100" maxY="122" name="pharmacy-l"/>
+  <symbol minX="484" maxX="506" minY="100" maxY="122" name="picnic-l"/>
   <symbol minX="0" maxX="22" minY="122" maxY="144" name="bus-l"/>
-  <symbol minX="22" maxX="44" minY="122" maxY="144" name="subway-entrance-l"/>
-  <symbol minX="44" maxX="66" minY="122" maxY="144" name="archery-l"/>
+  <symbol minX="22" maxX="44" minY="122" maxY="144" name="phone-l"/>
+  <symbol minX="44" maxX="66" minY="122" maxY="144" name="pharmacy-l"/>
   <symbol minX="66" maxX="88" minY="122" maxY="144" name="butcher-l"/>
-  <symbol minX="88" maxX="110" minY="122" maxY="144" name="peak-l"/>
+  <symbol minX="88" maxX="110" minY="122" maxY="144" name="subway-newyork-l"/>
   <symbol minX="110" maxX="132" minY="122" maxY="144" name="cable-car-l"/>
-  <symbol minX="132" maxX="154" minY="122" maxY="144" name="parking-meter-l"/>
-  <symbol minX="154" maxX="176" minY="122" maxY="144" name="subway-l"/>
+  <symbol minX="132" maxX="154" minY="122" maxY="144" name="subway-paris-l"/>
+  <symbol minX="154" maxX="176" minY="122" maxY="144" name="archery-l"/>
   <symbol minX="176" maxX="198" minY="122" maxY="144" name="cafe-l"/>
-  <symbol minX="198" maxX="220" minY="122" maxY="144" name="park-l"/>
-  <symbol minX="220" maxX="242" minY="122" maxY="144" name="atm-l"/>
+  <symbol minX="198" maxX="220" minY="122" maxY="144" name="peak-l"/>
+  <symbol minX="220" maxX="242" minY="122" maxY="144" name="parking-meter-l"/>
   <symbol minX="242" maxX="264" minY="122" maxY="144" name="campsite-l"/>
-  <symbol minX="264" maxX="286" minY="122" maxY="144" name="optician-l"/>
-  <symbol minX="286" maxX="308" minY="122" maxY="144" name="office-l"/>
+  <symbol minX="264" maxX="286" minY="122" maxY="144" name="subway-spb-l"/>
+  <symbol minX="286" maxX="308" minY="122" maxY="144" name="park-l"/>
   <symbol minX="308" maxX="330" minY="122" maxY="144" name="car-repair-l"/>
-  <symbol minX="330" maxX="352" minY="122" maxY="144" name="subway-newyork-l"/>
-  <symbol minX="352" maxX="374" minY="122" maxY="144" name="zoo-l"/>
+  <symbol minX="330" maxX="352" minY="122" maxY="144" name="optician-l"/>
+  <symbol minX="352" maxX="374" minY="122" maxY="144" name="atm-l"/>
   <symbol minX="374" maxX="396" minY="122" maxY="144" name="car_sharing-l"/>
-  <symbol minX="396" maxX="418" minY="122" maxY="144" name="nparkf-l"/>
+  <symbol minX="396" maxX="418" minY="122" maxY="144" name="office-l"/>
   <symbol minX="418" maxX="440" minY="122" maxY="144" name="caravan_site-l"/>
-  <symbol minX="440" maxX="462" minY="122" maxY="144" name="npark-l"/>
+  <symbol minX="440" maxX="462" minY="122" maxY="144" name="sweets-l"/>
   <symbol minX="462" maxX="484" minY="122" maxY="144" name="casino-l"/>
-  <symbol minX="484" maxX="506" minY="122" maxY="144" name="subway-paris-l"/>
-  <symbol minX="0" maxX="22" minY="144" maxY="166" name="subway-spb-l"/>
+  <symbol minX="484" maxX="506" minY="122" maxY="144" name="nparkf-l"/>
+  <symbol minX="0" maxX="22" minY="144" maxY="166" name="npark-l"/>
   <symbol minX="22" maxX="44" minY="144" maxY="166" name="cave-l"/>
-  <symbol minX="44" maxX="66" minY="144" maxY="166" name="sweets-l"/>
-  <symbol minX="66" maxX="88" minY="144" maxY="166" name="windmill-l"/>
+  <symbol minX="44" maxX="66" minY="144" maxY="166" name="swimming-l"/>
+  <symbol minX="66" maxX="88" minY="144" maxY="166" name="zoo-l"/>
   <symbol minX="88" maxX="110" minY="144" maxY="166" name="cemetery-l"/>
-  <symbol minX="110" maxX="132" minY="144" maxY="166" name="swimming-l"/>
-  <symbol minX="132" maxX="154" minY="144" maxY="166" name="museum-l"/>
+  <symbol minX="110" maxX="132" minY="144" maxY="166" name="museum-l"/>
+  <symbol minX="132" maxX="154" minY="144" maxY="166" name="motel-l"/>
   <symbol minX="154" maxX="176" minY="144" maxY="166" name="chemist-l"/>
-  <symbol minX="176" maxX="198" minY="144" maxY="166" name="motel-l"/>
+  <symbol minX="176" maxX="198" minY="144" maxY="166" name="taxi-l"/>
   <symbol minX="198" maxX="220" minY="144" maxY="166" name="cinema-l"/>
-  <symbol minX="220" maxX="242" minY="144" maxY="166" name="mobile_phone-l"/>
-  <symbol minX="242" maxX="264" minY="144" maxY="166" name="wayside_shrine-l"/>
+  <symbol minX="220" maxX="242" minY="144" maxY="166" name="monument-l"/>
+  <symbol minX="242" maxX="264" minY="144" maxY="166" name="windmill-l"/>
   <symbol minX="264" maxX="286" minY="144" maxY="166" name="clothes-l"/>
-  <symbol minX="286" maxX="308" minY="144" maxY="166" name="taxi-l"/>
+  <symbol minX="286" maxX="308" minY="144" maxY="166" name="mobile_phone-l"/>
   <symbol minX="308" maxX="330" minY="144" maxY="166" name="college-l"/>
   <symbol minX="330" maxX="352" minY="144" maxY="166" name="military-l"/>
   <symbol minX="352" maxX="374" minY="144" maxY="166" name="tennis-l"/>
   <symbol minX="374" maxX="396" minY="144" maxY="166" name="computer-l"/>
   <symbol minX="396" maxX="418" minY="144" maxY="166" name="marketplace-l"/>
   <symbol minX="418" maxX="440" minY="144" maxY="166" name="convenience-l"/>
-  <symbol minX="440" maxX="462" minY="144" maxY="166" name="mail-l"/>
+  <symbol minX="440" maxX="462" minY="144" maxY="166" name="theatre-l"/>
   <symbol minX="462" maxX="484" minY="144" maxY="166" name="cricket-l"/>
-  <symbol minX="484" maxX="506" minY="144" maxY="166" name="theatre-l"/>
+  <symbol minX="484" maxX="506" minY="144" maxY="166" name="mail-l"/>
   <symbol minX="0" maxX="22" minY="166" maxY="188" name="curling-l"/>
   <symbol minX="22" maxX="44" minY="166" maxY="188" name="lightrail-berlin-l"/>
-  <symbol minX="44" maxX="66" minY="166" maxY="188" name="department_store-l"/>
-  <symbol minX="66" maxX="88" minY="166" maxY="188" name="lighthouse-l"/>
-  <symbol minX="88" maxX="110" minY="166" maxY="188" name="diving-l"/>
-  <symbol minX="110" maxX="132" minY="166" maxY="188" name="lift_gate-l"/>
-  <symbol minX="132" maxX="154" minY="166" maxY="188" name="dog_park-l"/>
-  <symbol minX="154" maxX="176" minY="166" maxY="188" name="toilets-l"/>
-  <symbol minX="176" maxX="198" minY="166" maxY="188" name="doityourself-l"/>
-  <symbol minX="198" maxX="220" minY="166" maxY="188" name="library-l"/>
-  <symbol minX="220" maxX="242" minY="166" maxY="188" name="wayside_cross-l"/>
-  <symbol minX="242" maxX="264" minY="166" maxY="188" name="laundry-l"/>
-  <symbol minX="264" maxX="286" minY="166" maxY="188" name="waterfall-l"/>
-  <symbol minX="286" maxX="308" minY="166" maxY="188" name="drinking-water-l"/>
-  <symbol minX="308" maxX="330" minY="166" maxY="188" name="kiosk-l"/>
-  <symbol minX="330" maxX="352" minY="166" maxY="188" name="kindergarten-m"/>
-  <symbol minX="352" maxX="374" minY="166" maxY="188" name="kindergarten-l"/>
-  <symbol minX="374" maxX="396" minY="166" maxY="188" name="electronics-l"/>
-  <symbol minX="396" maxX="418" minY="166" maxY="188" name="jewelry-l"/>
-  <symbol minX="418" maxX="440" minY="166" maxY="188" name="embassy-l"/>
-  <symbol minX="440" maxX="462" minY="166" maxY="188" name="toll_booth-l"/>
-  <symbol minX="462" maxX="484" minY="166" maxY="188" name="volcano-l"/>
-  <symbol minX="484" maxX="506" minY="166" maxY="188" name="information-l"/>
-  <symbol minX="0" maxX="22" minY="188" maxY="210" name="vending-l"/>
-  <symbol minX="22" maxX="44" minY="188" maxY="210" name="equestrian-l"/>
-  <symbol minX="44" maxX="66" minY="188" maxY="210" name="equestrian-m"/>
-  <symbol minX="66" maxX="88" minY="188" maxY="210" name="fastfood-l"/>
-  <symbol minX="88" maxX="110" minY="188" maxY="210" name="hunting-tower-l"/>
-  <symbol minX="110" maxX="132" minY="188" maxY="210" name="hotel-l"/>
-  <symbol minX="132" maxX="154" minY="188" maxY="210" name="fire_station-l"/>
+  <symbol minX="44" maxX="66" minY="166" maxY="188" name="dentist-l"/>
+  <symbol minX="66" maxX="88" minY="166" maxY="188" name="dentist-m"/>
+  <symbol minX="88" maxX="110" minY="166" maxY="188" name="wayside_shrine-l"/>
+  <symbol minX="110" maxX="132" minY="166" maxY="188" name="department_store-l"/>
+  <symbol minX="132" maxX="154" minY="166" maxY="188" name="toilets-l"/>
+  <symbol minX="154" maxX="176" minY="166" maxY="188" name="diving-l"/>
+  <symbol minX="176" maxX="198" minY="166" maxY="188" name="lighthouse-l"/>
+  <symbol minX="198" maxX="220" minY="166" maxY="188" name="dog_park-l"/>
+  <symbol minX="220" maxX="242" minY="166" maxY="188" name="lift_gate-l"/>
+  <symbol minX="242" maxX="264" minY="166" maxY="188" name="doityourself-l"/>
+  <symbol minX="264" maxX="286" minY="166" maxY="188" name="library-l"/>
+  <symbol minX="286" maxX="308" minY="166" maxY="188" name="laundry-l"/>
+  <symbol minX="308" maxX="330" minY="166" maxY="188" name="wayside_cross-l"/>
+  <symbol minX="330" maxX="352" minY="166" maxY="188" name="kiosk-l"/>
+  <symbol minX="352" maxX="374" minY="166" maxY="188" name="drinking-water-l"/>
+  <symbol minX="374" maxX="396" minY="166" maxY="188" name="toll_booth-l"/>
+  <symbol minX="396" maxX="418" minY="166" maxY="188" name="waterfall-l"/>
+  <symbol minX="418" maxX="440" minY="166" maxY="188" name="kindergarten-m"/>
+  <symbol minX="440" maxX="462" minY="166" maxY="188" name="electronics-l"/>
+  <symbol minX="462" maxX="484" minY="166" maxY="188" name="kindergarten-l"/>
+  <symbol minX="484" maxX="506" minY="166" maxY="188" name="embassy-l"/>
+  <symbol minX="0" maxX="22" minY="188" maxY="210" name="jewelry-l"/>
+  <symbol minX="22" maxX="44" minY="188" maxY="210" name="information-l"/>
+  <symbol minX="44" maxX="66" minY="188" maxY="210" name="volcano-l"/>
+  <symbol minX="66" maxX="88" minY="188" maxY="210" name="hunting-tower-l"/>
+  <symbol minX="88" maxX="110" minY="188" maxY="210" name="equestrian-l"/>
+  <symbol minX="110" maxX="132" minY="188" maxY="210" name="equestrian-m"/>
+  <symbol minX="132" maxX="154" minY="188" maxY="210" name="fastfood-l"/>
   <symbol minX="154" maxX="176" minY="188" maxY="210" name="tomb-l"/>
-  <symbol minX="176" maxX="198" minY="188" maxY="210" name="tram-l"/>
-  <symbol minX="198" maxX="220" minY="188" maxY="210" name="florist-l"/>
-  <symbol minX="220" maxX="242" minY="188" maxY="210" name="hospital-l"/>
-  <symbol minX="242" maxX="264" minY="188" maxY="210" name="fountain-l"/>
-  <symbol minX="264" maxX="286" minY="188" maxY="210" name="historic-ship-l"/>
-  <symbol minX="286" maxX="308" minY="188" maxY="210" name="heliport-l"/>
-  <symbol minX="308" maxX="330" minY="188" maxY="210" name="fuel-l copy"/>
-  <symbol minX="330" maxX="352" minY="188" maxY="210" name="fuel-l"/>
-  <symbol minX="352" maxX="374" minY="188" maxY="210" name="tourism-l"/>
-  <symbol minX="374" maxX="396" minY="188" maxY="210" name="train-l"/>
-  <symbol minX="396" maxX="418" minY="188" maxY="210" name="funicular-l"/>
-  <symbol minX="418" maxX="440" minY="188" maxY="210" name="helipad-l"/>
-  <symbol minX="440" maxX="462" minY="188" maxY="210" name="hardware-l"/>
-  <symbol minX="462" maxX="484" minY="188" maxY="210" name="furniture-l"/>
-  <symbol minX="484" maxX="506" minY="188" maxY="210" name="hand-m"/>
-  <symbol minX="0" maxX="22" minY="210" maxY="232" name="gallery-l"/>
-  <symbol minX="22" maxX="44" minY="210" maxY="232" name="hand-l"/>
-  <symbol minX="44" maxX="66" minY="210" maxY="232" name="toys-l"/>
-  <symbol minX="66" maxX="88" minY="210" maxY="232" name="garden-l"/>
-  <symbol minX="88" maxX="110" minY="210" maxY="232" name="hairdresser-l"/>
-  <symbol minX="110" maxX="132" minY="210" maxY="232" name="grocery-l"/>
-  <symbol minX="132" maxX="154" minY="210" maxY="232" name="garden_center-l"/>
-  <symbol minX="154" maxX="176" minY="210" maxY="232" name="greengrocer-l"/>
-  <symbol minX="176" maxX="198" minY="210" maxY="232" name="gate-l"/>
-  <symbol minX="198" maxX="220" minY="210" maxY="232" name="townhall-l"/>
-  <symbol minX="220" maxX="242" minY="210" maxY="232" name="gift-l"/>
-  <symbol minX="242" maxX="264" minY="210" maxY="232" name="shoes-l"/>
-  <symbol minX="264" maxX="286" minY="210" maxY="232" name="golf-l"/>
-  <symbol minX="286" maxX="307" minY="210" maxY="231" name="golf-m"/>
-  <symbol minX="307" maxX="328" minY="210" maxY="231" name="gate-m"/>
-  <symbol minX="328" maxX="349" minY="210" maxY="231" name="garden_center-m"/>
-  <symbol minX="349" maxX="370" minY="210" maxY="231" name="greengrocer-m"/>
-  <symbol minX="370" maxX="391" minY="210" maxY="231" name="townhall-m"/>
-  <symbol minX="391" maxX="412" minY="210" maxY="231" name="grocery-m"/>
-  <symbol minX="412" maxX="433" minY="210" maxY="231" name="tourism-m"/>
-  <symbol minX="433" maxX="454" minY="210" maxY="231" name="garden-m"/>
-  <symbol minX="454" maxX="475" minY="210" maxY="231" name="hairdresser-m"/>
-  <symbol minX="475" maxX="496" minY="210" maxY="231" name="gallery-m"/>
-  <symbol minX="0" maxX="21" minY="232" maxY="253" name="furniture-m"/>
-  <symbol minX="21" maxX="42" minY="232" maxY="253" name="toys-m"/>
-  <symbol minX="42" maxX="63" minY="232" maxY="253" name="hardware-m"/>
-  <symbol minX="63" maxX="84" minY="232" maxY="253" name="funicular-m"/>
-  <symbol minX="84" maxX="105" minY="232" maxY="253" name="helipad-m"/>
-  <symbol minX="105" maxX="126" minY="232" maxY="253" name="fuel-m"/>
+  <symbol minX="176" maxX="198" minY="188" maxY="210" name="vending-l"/>
+  <symbol minX="198" maxX="220" minY="188" maxY="210" name="fire_station-l"/>
+  <symbol minX="220" maxX="242" minY="188" maxY="210" name="hotel-l"/>
+  <symbol minX="242" maxX="264" minY="188" maxY="210" name="hospital-l"/>
+  <symbol minX="264" maxX="286" minY="188" maxY="210" name="florist-l"/>
+  <symbol minX="286" maxX="308" minY="188" maxY="210" name="historic-ship-l"/>
+  <symbol minX="308" maxX="330" minY="188" maxY="210" name="fountain-l"/>
+  <symbol minX="330" maxX="352" minY="188" maxY="210" name="tourism-l"/>
+  <symbol minX="352" maxX="374" minY="188" maxY="210" name="tram-l"/>
+  <symbol minX="374" maxX="396" minY="188" maxY="210" name="fuel-l copy"/>
+  <symbol minX="396" maxX="418" minY="188" maxY="210" name="fuel-l"/>
+  <symbol minX="418" maxX="440" minY="188" maxY="210" name="heliport-l"/>
+  <symbol minX="440" maxX="462" minY="188" maxY="210" name="helipad-l"/>
+  <symbol minX="462" maxX="484" minY="188" maxY="210" name="funicular-l"/>
+  <symbol minX="484" maxX="506" minY="188" maxY="210" name="hardware-l"/>
+  <symbol minX="0" maxX="22" minY="210" maxY="232" name="train-l"/>
+  <symbol minX="22" maxX="44" minY="210" maxY="232" name="furniture-l"/>
+  <symbol minX="44" maxX="66" minY="210" maxY="232" name="hand-m"/>
+  <symbol minX="66" maxX="88" minY="210" maxY="232" name="gallery-l"/>
+  <symbol minX="88" maxX="110" minY="210" maxY="232" name="hand-l"/>
+  <symbol minX="110" maxX="132" minY="210" maxY="232" name="hairdresser-l"/>
+  <symbol minX="132" maxX="154" minY="210" maxY="232" name="garden-l"/>
+  <symbol minX="154" maxX="176" minY="210" maxY="232" name="townhall-l"/>
+  <symbol minX="176" maxX="198" minY="210" maxY="232" name="toys-l"/>
+  <symbol minX="198" maxX="220" minY="210" maxY="232" name="garden_center-l"/>
+  <symbol minX="220" maxX="242" minY="210" maxY="232" name="grocery-l"/>
+  <symbol minX="242" maxX="264" minY="210" maxY="232" name="gate-l"/>
+  <symbol minX="264" maxX="286" minY="210" maxY="232" name="skiing-l"/>
+  <symbol minX="286" maxX="308" minY="210" maxY="232" name="gift-l"/>
+  <symbol minX="308" maxX="330" minY="210" maxY="232" name="golf-l"/>
+  <symbol minX="330" maxX="351" minY="210" maxY="231" name="gift-m"/>
+  <symbol minX="351" maxX="372" minY="210" maxY="231" name="golf-m"/>
+  <symbol minX="372" maxX="393" minY="210" maxY="231" name="townhall-m"/>
+  <symbol minX="393" maxX="414" minY="210" maxY="231" name="gate-m"/>
+  <symbol minX="414" maxX="435" minY="210" maxY="231" name="greengrocer-m"/>
+  <symbol minX="435" maxX="456" minY="210" maxY="231" name="garden_center-m"/>
+  <symbol minX="456" maxX="477" minY="210" maxY="231" name="grocery-m"/>
+  <symbol minX="477" maxX="498" minY="210" maxY="231" name="garden-m"/>
+  <symbol minX="0" maxX="21" minY="232" maxY="253" name="toys-m"/>
+  <symbol minX="21" maxX="42" minY="232" maxY="253" name="hairdresser-m"/>
+  <symbol minX="42" maxX="63" minY="232" maxY="253" name="gallery-m"/>
+  <symbol minX="63" maxX="84" minY="232" maxY="253" name="furniture-m"/>
+  <symbol minX="84" maxX="105" minY="232" maxY="253" name="funicular-m"/>
+  <symbol minX="105" maxX="126" minY="232" maxY="253" name="hardware-m"/>
   <symbol minX="126" maxX="147" minY="232" maxY="253" name="train-m"/>
-  <symbol minX="147" maxX="168" minY="232" maxY="253" name="heliport-m"/>
-  <symbol minX="168" maxX="189" minY="232" maxY="253" name="tomb-m"/>
-  <symbol minX="189" maxX="210" minY="232" maxY="253" name="fountain-m"/>
-  <symbol minX="210" maxX="231" minY="232" maxY="253" name="historic-ship-m"/>
-  <symbol minX="231" maxX="252" minY="232" maxY="253" name="florist-m"/>
-  <symbol minX="252" maxX="273" minY="232" maxY="253" name="hospital-m"/>
-  <symbol minX="273" maxX="294" minY="232" maxY="253" name="fire_station-m"/>
+  <symbol minX="147" maxX="168" minY="232" maxY="253" name="helipad-m"/>
+  <symbol minX="168" maxX="189" minY="232" maxY="253" name="tourism-m"/>
+  <symbol minX="189" maxX="210" minY="232" maxY="253" name="fuel-m"/>
+  <symbol minX="210" maxX="231" minY="232" maxY="253" name="heliport-m"/>
+  <symbol minX="231" maxX="252" minY="232" maxY="253" name="fountain-m"/>
+  <symbol minX="252" maxX="273" minY="232" maxY="253" name="florist-m"/>
+  <symbol minX="273" maxX="294" minY="232" maxY="253" name="historic-ship-m"/>
   <symbol minX="294" maxX="315" minY="232" maxY="253" name="tram-m"/>
-  <symbol minX="315" maxX="336" minY="232" maxY="253" name="hotel-m"/>
-  <symbol minX="336" maxX="357" minY="232" maxY="253" name="toll_booth-m"/>
-  <symbol minX="357" maxX="378" minY="232" maxY="253" name="fastfood-m"/>
-  <symbol minX="378" maxX="399" minY="232" maxY="253" name="hunting-tower-m"/>
-  <symbol minX="399" maxX="420" minY="232" maxY="253" name="vending-m"/>
-  <symbol minX="420" maxX="441" minY="232" maxY="253" name="information-m"/>
-  <symbol minX="441" maxX="462" minY="232" maxY="253" name="embassy-m"/>
-  <symbol minX="462" maxX="483" minY="232" maxY="253" name="electronics-m"/>
-  <symbol minX="483" maxX="504" minY="232" maxY="253" name="jewelry-m"/>
-  <symbol minX="0" maxX="21" minY="253" maxY="274" name="drugs"/>
-  <symbol minX="21" maxX="42" minY="253" maxY="274" name="volcano-m"/>
-  <symbol minX="42" maxX="63" minY="253" maxY="274" name="toilets-m"/>
-  <symbol minX="63" maxX="84" minY="253" maxY="274" name="drinking-water-m"/>
-  <symbol minX="84" maxX="105" minY="253" maxY="274" name="kiosk-m"/>
-  <symbol minX="105" maxX="126" minY="253" maxY="274" name="waterfall-m"/>
-  <symbol minX="126" maxX="147" minY="253" maxY="274" name="laundry-m"/>
-  <symbol minX="147" maxX="168" minY="253" maxY="274" name="doityourself-m"/>
-  <symbol minX="168" maxX="189" minY="253" maxY="274" name="library-m"/>
-  <symbol minX="189" maxX="210" minY="253" maxY="274" name="dog_park-m"/>
-  <symbol minX="210" maxX="231" minY="253" maxY="274" name="diving-m"/>
-  <symbol minX="231" maxX="252" minY="253" maxY="274" name="lift_gate-m"/>
-  <symbol minX="252" maxX="273" minY="253" maxY="274" name="department_store-m"/>
-  <symbol minX="273" maxX="294" minY="253" maxY="274" name="lighthouse-m"/>
-  <symbol minX="294" maxX="315" minY="253" maxY="274" name="theatre-m"/>
-  <symbol minX="315" maxX="336" minY="253" maxY="274" name="curling-m"/>
-  <symbol minX="336" maxX="357" minY="253" maxY="274" name="gift-m"/>
-  <symbol minX="357" maxX="378" minY="253" maxY="274" name="cricket-m"/>
-  <symbol minX="378" maxX="399" minY="253" maxY="274" name="convenience-m"/>
-  <symbol minX="399" maxX="420" minY="253" maxY="274" name="mail-m"/>
-  <symbol minX="420" maxX="441" minY="253" maxY="274" name="tennis-m"/>
-  <symbol minX="441" maxX="462" minY="253" maxY="274" name="computer-m"/>
-  <symbol minX="462" maxX="483" minY="253" maxY="274" name="marketplace-m"/>
-  <symbol minX="483" maxX="504" minY="253" maxY="274" name="wayside_cross-m"/>
-  <symbol minX="0" maxX="21" minY="274" maxY="295" name="taxi-m"/>
-  <symbol minX="21" maxX="42" minY="274" maxY="295" name="college-m"/>
-  <symbol minX="42" maxX="63" minY="274" maxY="295" name="military-m"/>
-  <symbol minX="63" maxX="84" minY="274" maxY="295" name="clothes-m"/>
-  <symbol minX="84" maxX="105" minY="274" maxY="295" name="cinema-m"/>
-  <symbol minX="105" maxX="126" minY="274" maxY="295" name="mobile_phone-m"/>
-  <symbol minX="126" maxX="147" minY="274" maxY="295" name="atm-m"/>
-  <symbol minX="147" maxX="168" minY="274" maxY="295" name="monument-m"/>
-  <symbol minX="168" maxX="189" minY="274" maxY="295" name="swimming-m"/>
-  <symbol minX="189" maxX="210" minY="274" maxY="295" name="chemist-m"/>
-  <symbol minX="210" maxX="231" minY="274" maxY="295" name="motel-m"/>
-  <symbol minX="231" maxX="252" minY="274" maxY="295" name="wayside_shrine-m"/>
-  <symbol minX="252" maxX="273" minY="274" maxY="295" name="museum-m"/>
-  <symbol minX="273" maxX="294" minY="274" maxY="295" name="cemetery-m"/>
-  <symbol minX="294" maxX="315" minY="274" maxY="295" name="sweets-m"/>
-  <symbol minX="315" maxX="336" minY="274" maxY="295" name="cave-m"/>
-  <symbol minX="336" maxX="357" minY="274" maxY="295" name="subway-spb-m"/>
-  <symbol minX="357" maxX="378" minY="274" maxY="295" name="windmill-m"/>
-  <symbol minX="378" maxX="399" minY="274" maxY="295" name="ship-m"/>
-  <symbol minX="399" maxX="420" minY="274" maxY="295" name="casino-m"/>
-  <symbol minX="420" maxX="441" minY="274" maxY="295" name="caravan_site-m"/>
-  <symbol minX="441" maxX="462" minY="274" maxY="295" name="npark-m"/>
-  <symbol minX="462" maxX="483" minY="274" maxY="295" name="subway-newyork-m"/>
-  <symbol minX="483" maxX="504" minY="274" maxY="295" name="car_sharing-m"/>
-  <symbol minX="0" maxX="21" minY="295" maxY="316" name="nparkf-m"/>
-  <symbol minX="21" maxX="42" minY="295" maxY="316" name="car-repair-m"/>
-  <symbol minX="42" maxX="63" minY="295" maxY="316" name="zoo-m"/>
-  <symbol minX="63" maxX="84" minY="295" maxY="316" name="office-m"/>
-  <symbol minX="84" maxX="105" minY="295" maxY="316" name="shoes-m"/>
-  <symbol minX="105" maxX="126" minY="295" maxY="316" name="campsite-m"/>
-  <symbol minX="126" maxX="147" minY="295" maxY="316" name="optician-m"/>
-  <symbol minX="147" maxX="168" minY="295" maxY="316" name="cafe-m"/>
-  <symbol minX="168" maxX="189" minY="295" maxY="316" name="park-m"/>
-  <symbol minX="189" maxX="210" minY="295" maxY="316" name="subway-m"/>
-  <symbol minX="210" maxX="231" minY="295" maxY="316" name="school-m"/>
-  <symbol minX="231" maxX="252" minY="295" maxY="316" name="archery-m"/>
-  <symbol minX="252" maxX="273" minY="295" maxY="316" name="cable-car-m"/>
-  <symbol minX="273" maxX="294" minY="295" maxY="316" name="parking-meter-m"/>
-  <symbol minX="294" maxX="315" minY="295" maxY="316" name="subway-entrance-m"/>
-  <symbol minX="315" maxX="336" minY="295" maxY="316" name="butcher-m"/>
-  <symbol minX="336" maxX="357" minY="295" maxY="316" name="peak-m"/>
-  <symbol minX="357" maxX="378" minY="295" maxY="316" name="bus-m"/>
-  <symbol minX="378" maxX="399" minY="295" maxY="316" name="subway-entrance-2-m"/>
-  <symbol minX="399" maxX="420" minY="295" maxY="316" name="australian-football-m"/>
-  <symbol minX="420" maxX="441" minY="295" maxY="316" name="sports-m"/>
-  <symbol minX="441" maxX="462" minY="295" maxY="316" name="bowls-m"/>
-  <symbol minX="462" maxX="483" minY="295" maxY="316" name="pharmacy-m"/>
-  <symbol minX="483" maxX="504" minY="295" maxY="316" name="boundary_stone-m"/>
+  <symbol minX="315" maxX="336" minY="232" maxY="253" name="hospital-m"/>
+  <symbol minX="336" maxX="357" minY="232" maxY="253" name="tomb-m"/>
+  <symbol minX="357" maxX="378" minY="232" maxY="253" name="fire_station-m"/>
+  <symbol minX="378" maxX="399" minY="232" maxY="253" name="hotel-m"/>
+  <symbol minX="399" maxX="420" minY="232" maxY="253" name="fastfood-m"/>
+  <symbol minX="420" maxX="441" minY="232" maxY="253" name="vending-m"/>
+  <symbol minX="441" maxX="462" minY="232" maxY="253" name="hunting-tower-m"/>
+  <symbol minX="462" maxX="483" minY="232" maxY="253" name="volcano-m"/>
+  <symbol minX="483" maxX="504" minY="232" maxY="253" name="information-m"/>
+  <symbol minX="0" maxX="21" minY="253" maxY="274" name="toll_booth-m"/>
+  <symbol minX="21" maxX="42" minY="253" maxY="274" name="embassy-m"/>
+  <symbol minX="42" maxX="63" minY="253" maxY="274" name="jewelry-m"/>
+  <symbol minX="63" maxX="84" minY="253" maxY="274" name="electronics-m"/>
+  <symbol minX="84" maxX="105" minY="253" maxY="274" name="drugs"/>
+  <symbol minX="105" maxX="126" minY="253" maxY="274" name="drinking-water-m"/>
+  <symbol minX="126" maxX="147" minY="253" maxY="274" name="waterfall-m"/>
+  <symbol minX="147" maxX="168" minY="253" maxY="274" name="kiosk-m"/>
+  <symbol minX="168" maxX="189" minY="253" maxY="274" name="wayside_cross-m"/>
+  <symbol minX="189" maxX="210" minY="253" maxY="274" name="laundry-m"/>
+  <symbol minX="210" maxX="231" minY="253" maxY="274" name="doityourself-m"/>
+  <symbol minX="231" maxX="252" minY="253" maxY="274" name="library-m"/>
+  <symbol minX="252" maxX="273" minY="253" maxY="274" name="toilets-m"/>
+  <symbol minX="273" maxX="294" minY="253" maxY="274" name="dog_park-m"/>
+  <symbol minX="294" maxX="315" minY="253" maxY="274" name="lift_gate-m"/>
+  <symbol minX="315" maxX="336" minY="253" maxY="274" name="diving-m"/>
+  <symbol minX="336" maxX="357" minY="253" maxY="274" name="lighthouse-m"/>
+  <symbol minX="357" maxX="378" minY="253" maxY="274" name="department_store-m"/>
+  <symbol minX="378" maxX="399" minY="253" maxY="274" name="curling-m"/>
+  <symbol minX="399" maxX="420" minY="253" maxY="274" name="mobile_phone-m"/>
+  <symbol minX="420" maxX="441" minY="253" maxY="274" name="theatre-m"/>
+  <symbol minX="441" maxX="462" minY="253" maxY="274" name="cricket-m"/>
+  <symbol minX="462" maxX="483" minY="253" maxY="274" name="mail-m"/>
+  <symbol minX="483" maxX="504" minY="253" maxY="274" name="convenience-m"/>
+  <symbol minX="0" maxX="21" minY="274" maxY="295" name="computer-m"/>
+  <symbol minX="21" maxX="42" minY="274" maxY="295" name="marketplace-m"/>
+  <symbol minX="42" maxX="63" minY="274" maxY="295" name="tennis-m"/>
+  <symbol minX="63" maxX="84" minY="274" maxY="295" name="wayside_shrine-m"/>
+  <symbol minX="84" maxX="105" minY="274" maxY="295" name="college-m"/>
+  <symbol minX="105" maxX="126" minY="274" maxY="295" name="military-m"/>
+  <symbol minX="126" maxX="147" minY="274" maxY="295" name="taxi-m"/>
+  <symbol minX="147" maxX="168" minY="274" maxY="295" name="clothes-m"/>
+  <symbol minX="168" maxX="189" minY="274" maxY="295" name="atm-m"/>
+  <symbol minX="189" maxX="210" minY="274" maxY="295" name="cinema-m"/>
+  <symbol minX="210" maxX="231" minY="274" maxY="295" name="monument-m"/>
+  <symbol minX="231" maxX="252" minY="274" maxY="295" name="chemist-m"/>
+  <symbol minX="252" maxX="273" minY="274" maxY="295" name="windmill-m"/>
+  <symbol minX="273" maxX="294" minY="274" maxY="295" name="motel-m"/>
+  <symbol minX="294" maxX="315" minY="274" maxY="295" name="cemetery-m"/>
+  <symbol minX="315" maxX="336" minY="274" maxY="295" name="museum-m"/>
+  <symbol minX="336" maxX="357" minY="274" maxY="295" name="swimming-m"/>
+  <symbol minX="357" maxX="378" minY="274" maxY="295" name="skiing-m"/>
+  <symbol minX="378" maxX="399" minY="274" maxY="295" name="shop-m"/>
+  <symbol minX="399" maxX="420" minY="274" maxY="295" name="shop-m copy"/>
+  <symbol minX="420" maxX="441" minY="274" maxY="295" name="australian-football-m"/>
+  <symbol minX="441" maxX="462" minY="274" maxY="295" name="bakery-m"/>
+  <symbol minX="462" maxX="483" minY="274" maxY="295" name="cave-m"/>
+  <symbol minX="483" maxX="504" minY="274" maxY="295" name="zoo-m"/>
+  <symbol minX="0" maxX="21" minY="295" maxY="316" name="npark-m"/>
+  <symbol minX="21" maxX="42" minY="295" maxY="316" name="sweets-m"/>
+  <symbol minX="42" maxX="63" minY="295" maxY="316" name="casino-m"/>
+  <symbol minX="63" maxX="84" minY="295" maxY="316" name="nparkf-m"/>
+  <symbol minX="84" maxX="105" minY="295" maxY="316" name="caravan_site-m"/>
+  <symbol minX="105" maxX="126" minY="295" maxY="316" name="car_sharing-m"/>
+  <symbol minX="126" maxX="147" minY="295" maxY="316" name="office-m"/>
+  <symbol minX="147" maxX="168" minY="295" maxY="316" name="subway-spb-m"/>
+  <symbol minX="168" maxX="189" minY="295" maxY="316" name="car-repair-m"/>
+  <symbol minX="189" maxX="210" minY="295" maxY="316" name="optician-m"/>
+  <symbol minX="210" maxX="231" minY="295" maxY="316" name="shop-bicycle-m"/>
+  <symbol minX="231" maxX="252" minY="295" maxY="316" name="park-m"/>
+  <symbol minX="252" maxX="273" minY="295" maxY="316" name="campsite-m"/>
+  <symbol minX="273" maxX="294" minY="295" maxY="316" name="bank-2-m"/>
+  <symbol minX="294" maxX="315" minY="295" maxY="316" name="shoes-m"/>
+  <symbol minX="315" maxX="336" minY="295" maxY="316" name="archery-m"/>
+  <symbol minX="336" maxX="357" minY="295" maxY="316" name="parking-meter-m"/>
+  <symbol minX="357" maxX="378" minY="295" maxY="316" name="banknote-m"/>
+  <symbol minX="378" maxX="399" minY="295" maxY="316" name="cafe-m"/>
+  <symbol minX="399" maxX="420" minY="295" maxY="316" name="peak-m"/>
+  <symbol minX="420" maxX="441" minY="295" maxY="316" name="soccer-m"/>
+  <symbol minX="441" maxX="462" minY="295" maxY="316" name="cable-car-m"/>
+  <symbol minX="462" maxX="483" minY="295" maxY="316" name="subway-newyork-m"/>
+  <symbol minX="483" maxX="504" minY="295" maxY="316" name="butcher-m"/>
   <symbol minX="0" maxX="21" minY="316" maxY="337" name="america-football-m"/>
-  <symbol minX="21" maxX="42" minY="316" maxY="337" name="phone-m"/>
-  <symbol minX="42" maxX="63" minY="316" maxY="337" name="bakery-m"/>
-  <symbol minX="63" maxX="84" minY="316" maxY="337" name="book-shop-m"/>
-  <symbol minX="84" maxX="105" minY="316" maxY="337" name="picnic-m"/>
-  <symbol minX="105" maxX="126" minY="316" maxY="337" name="soccer-m"/>
-  <symbol minX="126" maxX="147" minY="316" maxY="337" name="bicycle-m"/>
-  <symbol minX="147" maxX="168" minY="316" maxY="337" name="pitch-m"/>
-  <symbol minX="168" maxX="189" minY="316" maxY="337" name="alpine_hut-m"/>
-  <symbol minX="189" maxX="210" minY="316" maxY="337" name="beer-m"/>
-  <symbol minX="210" maxX="231" minY="316" maxY="337" name="place-of-worship-m"/>
-  <symbol minX="231" maxX="252" minY="316" maxY="337" name="skiing-m"/>
-  <symbol minX="252" maxX="273" minY="316" maxY="337" name="beauty-m"/>
-  <symbol minX="273" maxX="294" minY="316" maxY="337" name="police-m"/>
-  <symbol minX="294" maxX="315" minY="316" maxY="337" name="beach-m"/>
-  <symbol minX="315" maxX="336" minY="316" maxY="337" name="alcohol-m"/>
-  <symbol minX="336" maxX="357" minY="316" maxY="337" name="postbox-m"/>
-  <symbol minX="357" maxX="378" minY="316" maxY="337" name="bcontrol-m"/>
-  <symbol minX="378" maxX="399" minY="316" maxY="337" name="bbq-m"/>
-  <symbol minX="399" maxX="420" minY="316" maxY="337" name="shop-bicycle-m"/>
-  <symbol minX="420" maxX="441" minY="316" maxY="337" name="pub-m"/>
-  <symbol minX="441" maxX="462" minY="316" maxY="337" name="shop-m"/>
-  <symbol minX="462" maxX="483" minY="316" maxY="337" name="shop-m copy"/>
-  <symbol minX="483" maxX="504" minY="316" maxY="337" name="basketball-m"/>
-  <symbol minX="0" maxX="21" minY="337" maxY="358" name="recycling-m"/>
-  <symbol minX="21" maxX="42" minY="337" maxY="358" name="baseball-m"/>
-  <symbol minX="42" maxX="63" minY="337" maxY="358" name="bar-m"/>
-  <symbol minX="63" maxX="84" minY="337" maxY="358" name="remains-m"/>
-  <symbol minX="84" maxX="105" minY="337" maxY="358" name="banknote-m"/>
-  <symbol minX="105" maxX="126" minY="337" maxY="358" name="bank-2-m"/>
-  <symbol minX="126" maxX="147" minY="337" maxY="358" name="restaurant-m"/>
-  <symbol minX="147" maxX="167" minY="337" maxY="357" name="lightrail-berlin-m"/>
-  <symbol minX="167" maxX="187" minY="337" maxY="357" name="speedcam-l"/>
-  <symbol minX="187" maxX="207" minY="337" maxY="357" name="subway-berlin-l"/>
-  <symbol minX="207" maxX="227" minY="337" maxY="357" name="parking-l"/>
-  <symbol minX="227" maxX="247" minY="337" maxY="357" name="subway-rome-l"/>
-  <symbol minX="247" maxX="267" minY="337" maxY="357" name="watch-my-position"/>
-  <symbol minX="267" maxX="286" minY="337" maxY="356" name="route_from"/>
-  <symbol minX="286" maxX="308" minY="337" maxY="356" name="subway-moscow-l"/>
-  <symbol minX="308" maxX="326" minY="337" maxY="355" name="no-icon-leisure"/>
-  <symbol minX="326" maxX="344" minY="337" maxY="355" name="airport-s"/>
-  <symbol minX="344" maxX="362" minY="337" maxY="355" name="current-position"/>
-  <symbol minX="362" maxX="380" minY="337" maxY="355" name="no-icon-amenity"/>
-  <symbol minX="380" maxX="398" minY="337" maxY="355" name="no-icon-shop"/>
-  <symbol minX="398" maxX="416" minY="337" maxY="355" name="no-icon-tourism"/>
-  <symbol minX="416" maxX="434" minY="337" maxY="355" name="subway-rome-m"/>
-  <symbol minX="434" maxX="452" minY="337" maxY="355" name="no-icon"/>
-  <symbol minX="452" maxX="470" minY="337" maxY="355" name="subway-paris-m"/>
-  <symbol minX="470" maxX="491" minY="337" maxY="355" name="subway-moscow-m"/>
-  <symbol minX="0" maxX="22" minY="358" maxY="376" name="subway-london-l"/>
-  <symbol minX="22" maxX="40" minY="358" maxY="376" name="subway-berlin-m"/>
-  <symbol minX="40" maxX="57" minY="358" maxY="375" name="skiing-s"/>
-  <symbol minX="57" maxX="74" minY="358" maxY="375" name="pitch-s"/>
-  <symbol minX="74" maxX="91" minY="358" maxY="375" name="picnic-s"/>
-  <symbol minX="91" maxX="108" minY="358" maxY="375" name="soccer-s"/>
-  <symbol minX="108" maxX="125" minY="358" maxY="375" name="phone-s"/>
-  <symbol minX="125" maxX="142" minY="358" maxY="375" name="speedcam-m"/>
-  <symbol minX="142" maxX="159" minY="358" maxY="375" name="atm-s copy 2"/>
-  <symbol minX="159" maxX="176" minY="358" maxY="375" name="pharmacy-s"/>
-  <symbol minX="176" maxX="193" minY="358" maxY="375" name="atm-s"/>
-  <symbol minX="193" maxX="210" minY="358" maxY="375" name="bar-s"/>
-  <symbol minX="210" maxX="227" minY="358" maxY="375" name="school-s"/>
-  <symbol minX="227" maxX="244" minY="358" maxY="375" name="baseball-s"/>
-  <symbol minX="244" maxX="261" minY="358" maxY="375" name="basketball-s"/>
-  <symbol minX="261" maxX="278" minY="358" maxY="375" name="bcontrol-s"/>
-  <symbol minX="278" maxX="298" minY="358" maxY="375" name="subway-barcelona-s"/>
-  <symbol minX="298" maxX="315" minY="358" maxY="375" name="alcohol-s"/>
-  <symbol minX="315" maxX="332" minY="358" maxY="375" name="place-of-worship-s"/>
-  <symbol minX="332" maxX="349" minY="358" maxY="375" name="beer-s"/>
-  <symbol minX="349" maxX="366" minY="358" maxY="375" name="bicycle-s"/>
-  <symbol minX="366" maxX="383" minY="358" maxY="375" name="subway-entrance-2-s"/>
-  <symbol minX="383" maxX="400" minY="358" maxY="375" name="subway-entrance-arrow"/>
-  <symbol minX="400" maxX="417" minY="358" maxY="375" name="peak-s"/>
-  <symbol minX="417" maxX="434" minY="358" maxY="375" name="book-shop-s"/>
-  <symbol minX="434" maxX="451" minY="358" maxY="375" name="subway-entrance-s"/>
-  <symbol minX="451" maxX="468" minY="358" maxY="375" name="america-football-s"/>
-  <symbol minX="468" maxX="485" minY="358" maxY="375" name="bus-s"/>
-  <symbol minX="485" maxX="502" minY="358" maxY="375" name="cable-car-s"/>
-  <symbol minX="0" maxX="17" minY="376" maxY="393" name="cafe-s"/>
-  <symbol minX="17" maxX="34" minY="376" maxY="393" name="police-s"/>
-  <symbol minX="34" maxX="55" minY="376" maxY="393" name="subway-london-m"/>
-  <symbol minX="55" maxX="72" minY="376" maxY="393" name="zoo-s"/>
-  <symbol minX="72" maxX="89" minY="376" maxY="393" name="park-s"/>
-  <symbol minX="89" maxX="106" minY="376" maxY="393" name="campsite-s"/>
-  <symbol minX="106" maxX="123" minY="376" maxY="393" name="car-repair-s"/>
-  <symbol minX="123" maxX="140" minY="376" maxY="393" name="windmill-s"/>
-  <symbol minX="140" maxX="157" minY="376" maxY="393" name="casino-s"/>
-  <symbol minX="157" maxX="174" minY="376" maxY="393" name="cave-s"/>
-  <symbol minX="174" maxX="191" minY="376" maxY="393" name="cemetery-s"/>
-  <symbol minX="191" maxX="208" minY="376" maxY="393" name="office-s"/>
-  <symbol minX="208" maxX="225" minY="376" maxY="393" name="shop-s"/>
-  <symbol minX="225" maxX="242" minY="376" maxY="393" name="cinema-s"/>
-  <symbol minX="242" maxX="259" minY="376" maxY="393" name="nparkf-s"/>
-  <symbol minX="259" maxX="276" minY="376" maxY="393" name="npark-s"/>
-  <symbol minX="276" maxX="293" minY="376" maxY="393" name="subway-newyork-s"/>
-  <symbol minX="293" maxX="310" minY="376" maxY="393" name="college-s"/>
-  <symbol minX="310" maxX="327" minY="376" maxY="393" name="waterfall-s"/>
-  <symbol minX="327" maxX="344" minY="376" maxY="393" name="shop-s copy"/>
-  <symbol minX="344" maxX="361" minY="376" maxY="393" name="volcano-s"/>
-  <symbol minX="361" maxX="378" minY="376" maxY="393" name="pub-s"/>
-  <symbol minX="378" maxX="395" minY="376" maxY="393" name="drinking-water-s"/>
-  <symbol minX="395" maxX="412" minY="376" maxY="393" name="embassy-s"/>
-  <symbol minX="412" maxX="429" minY="376" maxY="393" name="subway-s"/>
-  <symbol minX="429" maxX="446" minY="376" maxY="393" name="recycling-s"/>
-  <symbol minX="446" maxX="463" minY="376" maxY="393" name="remains-s"/>
-  <symbol minX="463" maxX="480" minY="376" maxY="393" name="subway-spb-s"/>
-  <symbol minX="480" maxX="497" minY="376" maxY="393" name="tram-s"/>
-  <symbol minX="0" maxX="17" minY="393" maxY="410" name="fastfood-s"/>
-  <symbol minX="17" maxX="34" minY="393" maxY="410" name="fire_station-s"/>
-  <symbol minX="34" maxX="51" minY="393" maxY="410" name="train-s"/>
-  <symbol minX="51" maxX="68" minY="393" maxY="410" name="fountain-s"/>
-  <symbol minX="68" maxX="85" minY="393" maxY="410" name="ship-s"/>
-  <symbol minX="85" maxX="102" minY="393" maxY="410" name="restaurant-s"/>
-  <symbol minX="102" maxX="119" minY="393" maxY="410" name="museum-s"/>
-  <symbol minX="119" maxX="136" minY="393" maxY="410" name="monument-s"/>
-  <symbol minX="136" maxX="153" minY="393" maxY="410" name="swimming-s"/>
-  <symbol minX="153" maxX="170" minY="393" maxY="410" name="military-s"/>
-  <symbol minX="170" maxX="187" minY="393" maxY="410" name="fuel-s"/>
-  <symbol minX="187" maxX="204" minY="393" maxY="410" name="funicular-s"/>
-  <symbol minX="204" maxX="221" minY="393" maxY="410" name="mail-s"/>
-  <symbol minX="221" maxX="238" minY="393" maxY="410" name="tennis-s"/>
+  <symbol minX="21" maxX="42" minY="316" maxY="337" name="pharmacy-m"/>
+  <symbol minX="42" maxX="63" minY="316" maxY="337" name="ship-m"/>
+  <symbol minX="63" maxX="84" minY="316" maxY="337" name="bus-m"/>
+  <symbol minX="84" maxX="105" minY="316" maxY="337" name="phone-m"/>
+  <symbol minX="105" maxX="126" minY="316" maxY="337" name="bar-m"/>
+  <symbol minX="126" maxX="147" minY="316" maxY="337" name="bowls-m"/>
+  <symbol minX="147" maxX="168" minY="316" maxY="337" name="picnic-m"/>
+  <symbol minX="168" maxX="189" minY="316" maxY="337" name="subway-m"/>
+  <symbol minX="189" maxX="210" minY="316" maxY="337" name="boundary_stone-m"/>
+  <symbol minX="210" maxX="231" minY="316" maxY="337" name="pitch-m"/>
+  <symbol minX="231" maxX="252" minY="316" maxY="337" name="school-m"/>
+  <symbol minX="252" maxX="273" minY="316" maxY="337" name="book-shop-m"/>
+  <symbol minX="273" maxX="294" minY="316" maxY="337" name="place-of-worship-m"/>
+  <symbol minX="294" maxX="315" minY="316" maxY="337" name="alpine_hut-m"/>
+  <symbol minX="315" maxX="336" minY="316" maxY="337" name="bicycle-m"/>
+  <symbol minX="336" maxX="357" minY="316" maxY="337" name="police-m"/>
+  <symbol minX="357" maxX="378" minY="316" maxY="337" name="subway-entrance-m"/>
+  <symbol minX="378" maxX="399" minY="316" maxY="337" name="alcohol-m"/>
+  <symbol minX="399" maxX="420" minY="316" maxY="337" name="postbox-m"/>
+  <symbol minX="420" maxX="441" minY="316" maxY="337" name="beer-m"/>
+  <symbol minX="441" maxX="462" minY="316" maxY="337" name="beauty-m"/>
+  <symbol minX="462" maxX="483" minY="316" maxY="337" name="beach-m"/>
+  <symbol minX="483" maxX="504" minY="316" maxY="337" name="pub-m"/>
+  <symbol minX="0" maxX="21" minY="337" maxY="358" name="baseball-m"/>
+  <symbol minX="21" maxX="42" minY="337" maxY="358" name="subway-entrance-2-m"/>
+  <symbol minX="42" maxX="63" minY="337" maxY="358" name="bcontrol-m"/>
+  <symbol minX="63" maxX="84" minY="337" maxY="358" name="recycling-m"/>
+  <symbol minX="84" maxX="105" minY="337" maxY="358" name="sports-m"/>
+  <symbol minX="105" maxX="126" minY="337" maxY="358" name="bbq-m"/>
+  <symbol minX="126" maxX="147" minY="337" maxY="358" name="remains-m"/>
+  <symbol minX="147" maxX="168" minY="337" maxY="358" name="restaurant-m"/>
+  <symbol minX="168" maxX="189" minY="337" maxY="358" name="basketball-m"/>
+  <symbol minX="189" maxX="209" minY="337" maxY="357" name="subway-berlin-l"/>
+  <symbol minX="209" maxX="229" minY="337" maxY="357" name="watch-my-position"/>
+  <symbol minX="229" maxX="249" minY="337" maxY="357" name="parking-l"/>
+  <symbol minX="249" maxX="269" minY="337" maxY="357" name="lightrail-berlin-m"/>
+  <symbol minX="269" maxX="289" minY="337" maxY="357" name="subway-rome-l"/>
+  <symbol minX="289" maxX="309" minY="337" maxY="357" name="speedcam-l"/>
+  <symbol minX="309" maxX="331" minY="337" maxY="356" name="subway-moscow-l"/>
+  <symbol minX="331" maxX="350" minY="337" maxY="356" name="route_from"/>
+  <symbol minX="350" maxX="368" minY="337" maxY="355" name="subway-paris-m"/>
+  <symbol minX="368" maxX="390" minY="337" maxY="355" name="subway-london-l"/>
+  <symbol minX="390" maxX="411" minY="337" maxY="355" name="subway-moscow-m"/>
+  <symbol minX="411" maxX="429" minY="337" maxY="355" name="airport-s"/>
+  <symbol minX="429" maxX="447" minY="337" maxY="355" name="current-position"/>
+  <symbol minX="447" maxX="465" minY="337" maxY="355" name="no-icon"/>
+  <symbol minX="465" maxX="483" minY="337" maxY="355" name="no-icon-tourism"/>
+  <symbol minX="483" maxX="501" minY="337" maxY="355" name="no-icon-shop"/>
+  <symbol minX="0" maxX="18" minY="358" maxY="376" name="no-icon-leisure"/>
+  <symbol minX="18" maxX="36" minY="358" maxY="376" name="subway-berlin-m"/>
+  <symbol minX="36" maxX="54" minY="358" maxY="376" name="no-icon-amenity"/>
+  <symbol minX="54" maxX="72" minY="358" maxY="376" name="subway-rome-m"/>
+  <symbol minX="72" maxX="89" minY="358" maxY="375" name="shop-s"/>
+  <symbol minX="89" maxX="106" minY="358" maxY="375" name="skiing-s"/>
+  <symbol minX="106" maxX="123" minY="358" maxY="375" name="shop-s copy"/>
+  <symbol minX="123" maxX="140" minY="358" maxY="375" name="ship-s"/>
+  <symbol minX="140" maxX="157" minY="358" maxY="375" name="soccer-s"/>
+  <symbol minX="157" maxX="174" minY="358" maxY="375" name="school-s"/>
+  <symbol minX="174" maxX="191" minY="358" maxY="375" name="speedcam-m"/>
+  <symbol minX="191" maxX="208" minY="358" maxY="375" name="atm-s"/>
+  <symbol minX="208" maxX="225" minY="358" maxY="375" name="bar-s"/>
+  <symbol minX="225" maxX="242" minY="358" maxY="375" name="restaurant-s"/>
+  <symbol minX="242" maxX="259" minY="358" maxY="375" name="baseball-s"/>
+  <symbol minX="259" maxX="276" minY="358" maxY="375" name="basketball-s"/>
+  <symbol minX="276" maxX="293" minY="358" maxY="375" name="bcontrol-s"/>
+  <symbol minX="293" maxX="310" minY="358" maxY="375" name="beer-s"/>
+  <symbol minX="310" maxX="327" minY="358" maxY="375" name="alcohol-s"/>
+  <symbol minX="327" maxX="347" minY="358" maxY="375" name="subway-barcelona-s"/>
+  <symbol minX="347" maxX="364" minY="358" maxY="375" name="remains-s"/>
+  <symbol minX="364" maxX="381" minY="358" maxY="375" name="recycling-s"/>
+  <symbol minX="381" maxX="398" minY="358" maxY="375" name="bicycle-s"/>
+  <symbol minX="398" maxX="415" minY="358" maxY="375" name="book-shop-s"/>
+  <symbol minX="415" maxX="432" minY="358" maxY="375" name="subway-entrance-2-s"/>
+  <symbol minX="432" maxX="449" minY="358" maxY="375" name="subway-entrance-arrow"/>
+  <symbol minX="449" maxX="466" minY="358" maxY="375" name="pub-s"/>
+  <symbol minX="466" maxX="483" minY="358" maxY="375" name="police-s"/>
+  <symbol minX="483" maxX="500" minY="358" maxY="375" name="subway-entrance-s"/>
+  <symbol minX="0" maxX="17" minY="376" maxY="393" name="bus-s"/>
+  <symbol minX="17" maxX="34" minY="376" maxY="393" name="america-football-s"/>
+  <symbol minX="34" maxX="51" minY="376" maxY="393" name="cable-car-s"/>
+  <symbol minX="51" maxX="68" minY="376" maxY="393" name="place-of-worship-s"/>
+  <symbol minX="68" maxX="85" minY="376" maxY="393" name="pitch-s"/>
+  <symbol minX="85" maxX="106" minY="376" maxY="393" name="subway-london-m"/>
+  <symbol minX="106" maxX="123" minY="376" maxY="393" name="cafe-s"/>
+  <symbol minX="123" maxX="140" minY="376" maxY="393" name="picnic-s"/>
+  <symbol minX="140" maxX="157" minY="376" maxY="393" name="campsite-s"/>
+  <symbol minX="157" maxX="174" minY="376" maxY="393" name="car-repair-s"/>
+  <symbol minX="174" maxX="191" minY="376" maxY="393" name="zoo-s"/>
+  <symbol minX="191" maxX="208" minY="376" maxY="393" name="casino-s"/>
+  <symbol minX="208" maxX="225" minY="376" maxY="393" name="cave-s"/>
+  <symbol minX="225" maxX="242" minY="376" maxY="393" name="windmill-s"/>
+  <symbol minX="242" maxX="259" minY="376" maxY="393" name="phone-s"/>
+  <symbol minX="259" maxX="276" minY="376" maxY="393" name="pharmacy-s"/>
+  <symbol minX="276" maxX="293" minY="376" maxY="393" name="cemetery-s"/>
+  <symbol minX="293" maxX="310" minY="376" maxY="393" name="cinema-s"/>
+  <symbol minX="310" maxX="327" minY="376" maxY="393" name="college-s"/>
+  <symbol minX="327" maxX="344" minY="376" maxY="393" name="subway-newyork-s"/>
+  <symbol minX="344" maxX="361" minY="376" maxY="393" name="dentist-s"/>
+  <symbol minX="361" maxX="378" minY="376" maxY="393" name="waterfall-s"/>
+  <symbol minX="378" maxX="395" minY="376" maxY="393" name="peak-s"/>
+  <symbol minX="395" maxX="412" minY="376" maxY="393" name="drinking-water-s"/>
+  <symbol minX="412" maxX="429" minY="376" maxY="393" name="volcano-s"/>
+  <symbol minX="429" maxX="446" minY="376" maxY="393" name="embassy-s"/>
+  <symbol minX="446" maxX="463" minY="376" maxY="393" name="fastfood-s"/>
+  <symbol minX="463" maxX="480" minY="376" maxY="393" name="subway-s"/>
+  <symbol minX="480" maxX="497" minY="376" maxY="393" name="park-s"/>
+  <symbol minX="0" maxX="17" minY="393" maxY="410" name="office-s"/>
+  <symbol minX="17" maxX="34" minY="393" maxY="410" name="subway-spb-s"/>
+  <symbol minX="34" maxX="51" minY="393" maxY="410" name="tram-s"/>
+  <symbol minX="51" maxX="68" minY="393" maxY="410" name="fire_station-s"/>
+  <symbol minX="68" maxX="85" minY="393" maxY="410" name="fountain-s"/>
+  <symbol minX="85" maxX="102" minY="393" maxY="410" name="train-s"/>
+  <symbol minX="102" maxX="119" minY="393" maxY="410" name="fuel-s"/>
+  <symbol minX="119" maxX="136" minY="393" maxY="410" name="nparkf-s"/>
+  <symbol minX="136" maxX="153" minY="393" maxY="410" name="npark-s"/>
+  <symbol minX="153" maxX="170" minY="393" maxY="410" name="funicular-s"/>
+  <symbol minX="170" maxX="187" minY="393" maxY="410" name="atm-s copy 2"/>
+  <symbol minX="187" maxX="204" minY="393" maxY="410" name="swimming-s"/>
+  <symbol minX="204" maxX="221" minY="393" maxY="410" name="monument-s"/>
+  <symbol minX="221" maxX="238" minY="393" maxY="410" name="military-s"/>
   <symbol minX="238" maxX="255" minY="393" maxY="410" name="gallery-s"/>
-  <symbol minX="255" maxX="272" minY="393" maxY="410" name="lighthouse-s"/>
-  <symbol minX="272" maxX="289" minY="393" maxY="410" name="theatre-s"/>
-  <symbol minX="289" maxX="306" minY="393" maxY="410" name="library-s"/>
-  <symbol minX="306" maxX="323" minY="393" maxY="410" name="kindergarten-s"/>
-  <symbol minX="323" maxX="340" minY="393" maxY="410" name="toilets-s"/>
-  <symbol minX="340" maxX="357" minY="393" maxY="410" name="information-s"/>
-  <symbol minX="357" maxX="374" minY="393" maxY="410" name="hotel-s"/>
-  <symbol minX="374" maxX="391" minY="393" maxY="410" name="hospital-s"/>
-  <symbol minX="391" maxX="408" minY="393" maxY="410" name="heliport-s"/>
-  <symbol minX="408" maxX="425" minY="393" maxY="410" name="helipad-s"/>
-  <symbol minX="425" maxX="442" minY="393" maxY="410" name="grocery-s"/>
-  <symbol minX="442" maxX="459" minY="393" maxY="410" name="tourism-s"/>
-  <symbol minX="459" maxX="476" minY="393" maxY="410" name="golf-s"/>
-  <symbol minX="476" maxX="493" minY="393" maxY="410" name="garden-s"/>
-  <symbol minX="493" maxX="510" minY="393" maxY="410" name="townhall-s"/>
-  <symbol minX="0" maxX="22" minY="410" maxY="426" name="subway-barcelona-l"/>
-  <symbol minX="22" maxX="44" minY="410" maxY="426" name="metro-barcelona-m"/>
-  <symbol minX="44" maxX="66" minY="410" maxY="426" name="subway-barcelona-m"/>
-  <symbol minX="66" maxX="81" minY="410" maxY="426" name="s-arrow"/>
-  <symbol minX="81" maxX="97" minY="410" maxY="426" name="parking-m"/>
-  <symbol minX="97" maxX="119" minY="410" maxY="426" name="subway-madrid-l"/>
-  <symbol minX="119" maxX="141" minY="410" maxY="426" name="subway-madrid-m"/>
-  <symbol minX="141" maxX="161" minY="410" maxY="425" name="subway-madrid-s"/>
-  <symbol minX="161" maxX="176" minY="410" maxY="425" name="lightrail-berlin-s"/>
-  <symbol minX="176" maxX="196" minY="410" maxY="425" name="metro-barcelona-s"/>
-  <symbol minX="196" maxX="217" minY="410" maxY="425" name="subway-kiev-l"/>
-  <symbol minX="217" maxX="238" minY="410" maxY="425" name="subway-kiev-m"/>
-  <symbol minX="238" maxX="253" minY="410" maxY="425" name="api-result"/>
-  <symbol minX="253" maxX="268" minY="410" maxY="425" name="subway-moscow-s"/>
-  <symbol minX="268" maxX="283" minY="410" maxY="425" name="subway-paris-s"/>
-  <symbol minX="283" maxX="297" minY="410" maxY="424" name="speedcam-s"/>
-  <symbol minX="297" maxX="311" minY="410" maxY="424" name="subway-berlin-s"/>
-  <symbol minX="311" maxX="326" minY="410" maxY="424" name="bench"/>
-  <symbol minX="326" maxX="340" minY="410" maxY="424" name="star-l"/>
-  <symbol minX="340" maxX="354" minY="410" maxY="424" name="search-result"/>
-  <symbol minX="354" maxX="368" minY="410" maxY="424" name="parking-s"/>
-  <symbol minX="368" maxX="382" minY="410" maxY="424" name="subway-rome-s"/>
-  <symbol minX="382" maxX="399" minY="410" maxY="424" name="subway-london-s"/>
-  <symbol minX="399" maxX="412" minY="410" maxY="423" name="star-m"/>
-  <symbol minX="412" maxX="433" minY="410" maxY="423" name="subway-minsk-l"/>
-  <symbol minX="433" maxX="446" minY="410" maxY="423" name="survey_point-l"/>
-  <symbol minX="446" maxX="460" minY="410" maxY="423" name="peakt-l"/>
-  <symbol minX="460" maxX="472" minY="410" maxY="422" name="subway-xs"/>
-  <symbol minX="472" maxX="490" minY="410" maxY="422" name="subway-kiev-s"/>
-  <symbol minX="490" maxX="507" minY="410" maxY="422" name="railway-crossing"/>
-  <symbol minX="0" maxX="12" minY="426" maxY="438" name="subway-newyork-xs"/>
-  <symbol minX="12" maxX="24" minY="426" maxY="438" name="survey_point-m"/>
-  <symbol minX="24" maxX="42" minY="426" maxY="438" name="subway-minsk-m"/>
-  <symbol minX="42" maxX="54" minY="426" maxY="438" name="star-s"/>
-  <symbol minX="54" maxX="65" minY="426" maxY="437" name="subway-xs copy"/>
-  <symbol minX="65" maxX="82" minY="426" maxY="437" name="subway-minsk-s"/>
-  <symbol minX="82" maxX="102" minY="426" maxY="436" name="arrow-m"/>
-  <symbol minX="102" maxX="113" minY="426" maxY="436" name="peakt-m"/>
-  <symbol minX="113" maxX="123" minY="426" maxY="436" name="survey_point-s"/>
-  <symbol minX="123" maxX="132" minY="426" maxY="435" name="dot-m"/>
-  <symbol minX="132" maxX="141" minY="426" maxY="435" name="peakt-s"/>
-  <symbol minX="141" maxX="150" minY="426" maxY="435" name="entrance-s"/>
-  <symbol minX="150" maxX="158" minY="426" maxY="434" name="tree-l"/>
-  <symbol minX="158" maxX="166" minY="426" maxY="434" name="none"/>
-  <symbol minX="166" maxX="181" minY="426" maxY="434" name="arrow-s"/>
-  <symbol minX="181" maxX="188" minY="426" maxY="433" name="dot-s"/>
-  <symbol minX="188" maxX="195" minY="426" maxY="433" name="entrance-xs"/>
-  <symbol minX="195" maxX="202" minY="426" maxY="433" name="tree-m"/>
-  <symbol minX="202" maxX="209" minY="426" maxY="433" name="dot-s-light"/>
-  <symbol minX="209" maxX="215" minY="426" maxY="432" name="tree-s"/>
-  <symbol minX="215" maxX="221" minY="426" maxY="432" name="zero-icon"/>
+  <symbol minX="255" maxX="272" minY="393" maxY="410" name="museum-s"/>
+  <symbol minX="272" maxX="289" minY="393" maxY="410" name="tennis-s"/>
+  <symbol minX="289" maxX="306" minY="393" maxY="410" name="mail-s"/>
+  <symbol minX="306" maxX="323" minY="393" maxY="410" name="garden-s"/>
+  <symbol minX="323" maxX="340" minY="393" maxY="410" name="theatre-s"/>
+  <symbol minX="340" maxX="357" minY="393" maxY="410" name="lighthouse-s"/>
+  <symbol minX="357" maxX="374" minY="393" maxY="410" name="library-s"/>
+  <symbol minX="374" maxX="391" minY="393" maxY="410" name="toilets-s"/>
+  <symbol minX="391" maxX="408" minY="393" maxY="410" name="kindergarten-s"/>
+  <symbol minX="408" maxX="425" minY="393" maxY="410" name="information-s"/>
+  <symbol minX="425" maxX="442" minY="393" maxY="410" name="hotel-s"/>
+  <symbol minX="442" maxX="459" minY="393" maxY="410" name="hospital-s"/>
+  <symbol minX="459" maxX="476" minY="393" maxY="410" name="heliport-s"/>
+  <symbol minX="476" maxX="493" minY="393" maxY="410" name="helipad-s"/>
+  <symbol minX="493" maxX="510" minY="393" maxY="410" name="tourism-s"/>
+  <symbol minX="0" maxX="17" minY="410" maxY="427" name="grocery-s"/>
+  <symbol minX="17" maxX="34" minY="410" maxY="427" name="golf-s"/>
+  <symbol minX="34" maxX="51" minY="410" maxY="427" name="townhall-s"/>
+  <symbol minX="51" maxX="73" minY="410" maxY="426" name="metro-barcelona-m"/>
+  <symbol minX="73" maxX="88" minY="410" maxY="426" name="s-arrow"/>
+  <symbol minX="88" maxX="110" minY="410" maxY="426" name="subway-barcelona-l"/>
+  <symbol minX="110" maxX="132" minY="410" maxY="426" name="subway-barcelona-m"/>
+  <symbol minX="132" maxX="154" minY="410" maxY="426" name="subway-madrid-l"/>
+  <symbol minX="154" maxX="176" minY="410" maxY="426" name="subway-madrid-m"/>
+  <symbol minX="176" maxX="192" minY="410" maxY="426" name="parking-m"/>
+  <symbol minX="192" maxX="207" minY="410" maxY="425" name="lightrail-berlin-s"/>
+  <symbol minX="207" maxX="227" minY="410" maxY="425" name="subway-madrid-s"/>
+  <symbol minX="227" maxX="248" minY="410" maxY="425" name="subway-kiev-l"/>
+  <symbol minX="248" maxX="268" minY="410" maxY="425" name="metro-barcelona-s"/>
+  <symbol minX="268" maxX="283" minY="410" maxY="425" name="subway-moscow-s"/>
+  <symbol minX="283" maxX="298" minY="410" maxY="425" name="api-result"/>
+  <symbol minX="298" maxX="319" minY="410" maxY="425" name="subway-kiev-m"/>
+  <symbol minX="319" maxX="334" minY="410" maxY="425" name="subway-paris-s"/>
+  <symbol minX="334" maxX="348" minY="410" maxY="424" name="parking-s"/>
+  <symbol minX="348" maxX="365" minY="410" maxY="424" name="subway-london-s"/>
+  <symbol minX="365" maxX="379" minY="410" maxY="424" name="star-l"/>
+  <symbol minX="379" maxX="393" minY="410" maxY="424" name="speedcam-s"/>
+  <symbol minX="393" maxX="407" minY="410" maxY="424" name="subway-rome-s"/>
+  <symbol minX="407" maxX="422" minY="410" maxY="424" name="bench"/>
+  <symbol minX="422" maxX="436" minY="410" maxY="424" name="search-result"/>
+  <symbol minX="436" maxX="450" minY="410" maxY="424" name="subway-berlin-s"/>
+  <symbol minX="450" maxX="471" minY="410" maxY="423" name="subway-minsk-l"/>
+  <symbol minX="471" maxX="484" minY="410" maxY="423" name="survey_point-l"/>
+  <symbol minX="484" maxX="498" minY="410" maxY="423" name="peakt-l"/>
+  <symbol minX="498" maxX="511" minY="410" maxY="423" name="star-m"/>
+  <symbol minX="0" maxX="18" minY="427" maxY="439" name="subway-minsk-m"/>
+  <symbol minX="18" maxX="35" minY="427" maxY="439" name="railway-crossing"/>
+  <symbol minX="35" maxX="53" minY="427" maxY="439" name="subway-kiev-s"/>
+  <symbol minX="53" maxX="65" minY="427" maxY="439" name="subway-newyork-xs"/>
+  <symbol minX="65" maxX="77" minY="427" maxY="439" name="star-s"/>
+  <symbol minX="77" maxX="89" minY="427" maxY="439" name="subway-xs"/>
+  <symbol minX="89" maxX="101" minY="427" maxY="439" name="survey_point-m"/>
+  <symbol minX="101" maxX="118" minY="427" maxY="438" name="subway-minsk-s"/>
+  <symbol minX="118" maxX="129" minY="427" maxY="438" name="subway-xs copy"/>
+  <symbol minX="129" maxX="149" minY="427" maxY="437" name="arrow-m"/>
+  <symbol minX="149" maxX="159" minY="427" maxY="437" name="survey_point-s"/>
+  <symbol minX="159" maxX="170" minY="427" maxY="437" name="peakt-m"/>
+  <symbol minX="170" maxX="179" minY="427" maxY="436" name="peakt-s"/>
+  <symbol minX="179" maxX="188" minY="427" maxY="436" name="entrance-s"/>
+  <symbol minX="188" maxX="197" minY="427" maxY="436" name="dot-m"/>
+  <symbol minX="197" maxX="205" minY="427" maxY="435" name="none"/>
+  <symbol minX="205" maxX="213" minY="427" maxY="435" name="tree-l"/>
+  <symbol minX="213" maxX="228" minY="427" maxY="435" name="arrow-s"/>
+  <symbol minX="228" maxX="235" minY="427" maxY="434" name="dot-s"/>
+  <symbol minX="235" maxX="242" minY="427" maxY="434" name="dot-s-light"/>
+  <symbol minX="242" maxX="249" minY="427" maxY="434" name="entrance-xs"/>
+  <symbol minX="249" maxX="256" minY="427" maxY="434" name="tree-m"/>
+  <symbol minX="256" maxX="262" minY="427" maxY="433" name="tree-s"/>
+  <symbol minX="262" maxX="268" minY="427" maxY="433" name="zero-icon"/>
  </file>
 </root>
diff --git a/data/resources-xhdpi_clear/symbols.png b/data/resources-xhdpi_clear/symbols.png
index daacfa0479..8fcf60c04b 100644
Binary files a/data/resources-xhdpi_clear/symbols.png and b/data/resources-xhdpi_clear/symbols.png differ
diff --git a/data/resources-xhdpi_clear/symbols.sdf b/data/resources-xhdpi_clear/symbols.sdf
index b9a8b356e9..3205503714 100644
--- a/data/resources-xhdpi_clear/symbols.sdf
+++ b/data/resources-xhdpi_clear/symbols.sdf
@@ -1,466 +1,469 @@
 <!DOCTYPE skin>
 <root>
- <file width="1024" height="1024">
-  <symbol minX="0" maxX="138" minY="0" maxY="138" name="route_to"/>
-  <symbol minX="138" maxX="408" minY="0" maxY="132" name="route-arrow"/>
-  <symbol minX="408" maxX="524" minY="0" maxY="116" name="compass-image"/>
-  <symbol minX="524" maxX="582" minY="0" maxY="79" name="watch-search-result"/>
-  <symbol minX="582" maxX="640" minY="0" maxY="74" name="current-position-compas"/>
-  <symbol minX="640" maxX="698" minY="0" maxY="74" name="current-routing-compas"/>
-  <symbol minX="698" maxX="762" minY="0" maxY="70" name="watch-my-direction"/>
-  <symbol minX="762" maxX="828" minY="0" maxY="66" name="search-result-active"/>
-  <symbol minX="828" maxX="858" minY="0" maxY="58" name="placemark-red"/>
-  <symbol minX="858" maxX="888" minY="0" maxY="58" name="placemark-pink"/>
-  <symbol minX="888" maxX="918" minY="0" maxY="58" name="placemark-orange"/>
-  <symbol minX="918" maxX="948" minY="0" maxY="58" name="placemark-green"/>
-  <symbol minX="948" maxX="978" minY="0" maxY="58" name="placemark-brown"/>
-  <symbol minX="978" maxX="1008" minY="0" maxY="58" name="placemark-blue"/>
-  <symbol minX="0" maxX="30" minY="138" maxY="196" name="placemark-yellow"/>
-  <symbol minX="30" maxX="60" minY="138" maxY="196" name="placemark-purple"/>
-  <symbol minX="60" maxX="112" minY="138" maxY="190" name="watch-my-position"/>
-  <symbol minX="112" maxX="152" minY="138" maxY="178" name="airport-l"/>
-  <symbol minX="152" maxX="192" minY="138" maxY="178" name="australian-football-l"/>
-  <symbol minX="192" maxX="232" minY="138" maxY="178" name="airport-m"/>
-  <symbol minX="232" maxX="272" minY="138" maxY="178" name="bakery-l"/>
-  <symbol minX="272" maxX="312" minY="138" maxY="178" name="alcohol-l"/>
-  <symbol minX="312" maxX="352" minY="138" maxY="178" name="bank-l"/>
-  <symbol minX="352" maxX="391" minY="138" maxY="178" name="bank-m"/>
-  <symbol minX="391" maxX="431" minY="138" maxY="178" name="banknote-l"/>
-  <symbol minX="431" maxX="471" minY="138" maxY="178" name="alpine_hut-l"/>
-  <symbol minX="471" maxX="511" minY="138" maxY="178" name="bar-l"/>
-  <symbol minX="511" maxX="551" minY="138" maxY="178" name="america-football-l"/>
-  <symbol minX="551" maxX="591" minY="138" maxY="178" name="archery-l"/>
-  <symbol minX="591" maxX="631" minY="138" maxY="178" name="baseball-l"/>
-  <symbol minX="631" maxX="671" minY="138" maxY="178" name="atm-l"/>
-  <symbol minX="671" maxX="711" minY="138" maxY="178" name="zoo-l"/>
-  <symbol minX="711" maxX="751" minY="138" maxY="178" name="basketball-l"/>
-  <symbol minX="751" maxX="791" minY="138" maxY="178" name="windmill-l"/>
-  <symbol minX="791" maxX="831" minY="138" maxY="178" name="wayside_shrine-l"/>
-  <symbol minX="831" maxX="871" minY="138" maxY="178" name="bbq-l"/>
-  <symbol minX="871" maxX="911" minY="138" maxY="178" name="wayside_cross-l"/>
-  <symbol minX="911" maxX="951" minY="138" maxY="178" name="bcontrol-l"/>
-  <symbol minX="951" maxX="990" minY="138" maxY="178" name="bcontrol-m"/>
-  <symbol minX="0" maxX="39" minY="196" maxY="236" name="waterfall-m"/>
-  <symbol minX="39" maxX="79" minY="196" maxY="236" name="beach-l"/>
-  <symbol minX="79" maxX="119" minY="196" maxY="236" name="waterfall-l"/>
-  <symbol minX="119" maxX="159" minY="196" maxY="236" name="beauty-l"/>
-  <symbol minX="159" maxX="199" minY="196" maxY="236" name="volcano-l"/>
-  <symbol minX="199" maxX="239" minY="196" maxY="236" name="beer-l"/>
-  <symbol minX="239" maxX="278" minY="196" maxY="236" name="beer-m"/>
-  <symbol minX="278" maxX="318" minY="196" maxY="236" name="vending-l"/>
-  <symbol minX="318" maxX="358" minY="196" maxY="236" name="tram-l"/>
-  <symbol minX="358" maxX="398" minY="196" maxY="236" name="bicycle-l"/>
-  <symbol minX="398" maxX="438" minY="196" maxY="236" name="train-l"/>
-  <symbol minX="438" maxX="478" minY="196" maxY="236" name="toys-l"/>
-  <symbol minX="478" maxX="518" minY="196" maxY="236" name="book-shop-l"/>
-  <symbol minX="518" maxX="558" minY="196" maxY="236" name="townhall-l"/>
-  <symbol minX="558" maxX="598" minY="196" maxY="236" name="tourism-l"/>
-  <symbol minX="598" maxX="638" minY="196" maxY="236" name="boundary_stone-l"/>
-  <symbol minX="638" maxX="678" minY="196" maxY="236" name="tomb-l"/>
-  <symbol minX="678" maxX="718" minY="196" maxY="236" name="bowls-l"/>
-  <symbol minX="718" maxX="758" minY="196" maxY="236" name="toll_booth-l"/>
-  <symbol minX="758" maxX="798" minY="196" maxY="236" name="bus-l"/>
-  <symbol minX="798" maxX="838" minY="196" maxY="236" name="toilets-l"/>
-  <symbol minX="838" maxX="878" minY="196" maxY="236" name="theatre-l"/>
-  <symbol minX="878" maxX="918" minY="196" maxY="236" name="butcher-l"/>
-  <symbol minX="918" maxX="958" minY="196" maxY="236" name="tennis-l"/>
-  <symbol minX="958" maxX="998" minY="196" maxY="236" name="cable-car-l"/>
-  <symbol minX="0" maxX="40" minY="236" maxY="276" name="taxi-l"/>
-  <symbol minX="40" maxX="80" minY="236" maxY="276" name="swimming-l"/>
-  <symbol minX="80" maxX="120" minY="236" maxY="276" name="cafe-l"/>
-  <symbol minX="120" maxX="160" minY="236" maxY="276" name="sweets-l"/>
-  <symbol minX="160" maxX="200" minY="236" maxY="276" name="subway-spb-l"/>
-  <symbol minX="200" maxX="240" minY="236" maxY="276" name="campsite-l"/>
-  <symbol minX="240" maxX="280" minY="236" maxY="276" name="subway-paris-l"/>
-  <symbol minX="280" maxX="320" minY="236" maxY="276" name="subway-newyork-l"/>
-  <symbol minX="320" maxX="360" minY="236" maxY="276" name="car-repair-l"/>
-  <symbol minX="360" maxX="399" minY="236" maxY="276" name="car-repair-m"/>
-  <symbol minX="399" maxX="439" minY="236" maxY="276" name="subway-l"/>
-  <symbol minX="439" maxX="479" minY="236" maxY="276" name="car_sharing-l"/>
-  <symbol minX="479" maxX="519" minY="236" maxY="276" name="subway-entrance-l"/>
-  <symbol minX="519" maxX="559" minY="236" maxY="276" name="caravan_site-l"/>
-  <symbol minX="559" maxX="599" minY="236" maxY="276" name="sports-l"/>
-  <symbol minX="599" maxX="639" minY="236" maxY="276" name="casino-l"/>
-  <symbol minX="639" maxX="679" minY="236" maxY="276" name="soccer-l"/>
-  <symbol minX="679" maxX="719" minY="236" maxY="276" name="skiing-l"/>
-  <symbol minX="719" maxX="759" minY="236" maxY="276" name="cave-l"/>
-  <symbol minX="759" maxX="799" minY="236" maxY="276" name="shop-l"/>
-  <symbol minX="799" maxX="839" minY="236" maxY="276" name="shop-bicycle-l"/>
-  <symbol minX="839" maxX="879" minY="236" maxY="276" name="cemetery-l"/>
-  <symbol minX="879" maxX="919" minY="236" maxY="276" name="shoes-l"/>
-  <symbol minX="919" maxX="959" minY="236" maxY="276" name="ship-l"/>
-  <symbol minX="959" maxX="999" minY="236" maxY="276" name="chemist-l"/>
-  <symbol minX="0" maxX="40" minY="276" maxY="316" name="school-l"/>
-  <symbol minX="40" maxX="80" minY="276" maxY="316" name="cinema-l"/>
-  <symbol minX="80" maxX="120" minY="276" maxY="316" name="restaurant-l"/>
-  <symbol minX="120" maxX="159" minY="276" maxY="316" name="remains-m"/>
-  <symbol minX="159" maxX="199" minY="276" maxY="316" name="clothes-l"/>
-  <symbol minX="199" maxX="239" minY="276" maxY="316" name="remains-l"/>
-  <symbol minX="239" maxX="279" minY="276" maxY="316" name="college-l"/>
-  <symbol minX="279" maxX="319" minY="276" maxY="316" name="recycling-l"/>
-  <symbol minX="319" maxX="359" minY="276" maxY="316" name="pub-l"/>
-  <symbol minX="359" maxX="399" minY="276" maxY="316" name="computer-l"/>
-  <symbol minX="399" maxX="439" minY="276" maxY="316" name="power-m"/>
-  <symbol minX="439" maxX="479" minY="276" maxY="316" name="convenience-l"/>
-  <symbol minX="479" maxX="519" minY="276" maxY="316" name="power-l"/>
-  <symbol minX="519" maxX="559" minY="276" maxY="316" name="cricket-l"/>
-  <symbol minX="559" maxX="599" minY="276" maxY="316" name="postbox-l"/>
-  <symbol minX="599" maxX="639" minY="276" maxY="316" name="police-l"/>
-  <symbol minX="639" maxX="679" minY="276" maxY="316" name="place-of-worship-l"/>
-  <symbol minX="679" maxX="719" minY="276" maxY="316" name="pitch-l"/>
-  <symbol minX="719" maxX="759" minY="276" maxY="316" name="curling-l"/>
-  <symbol minX="759" maxX="798" minY="276" maxY="316" name="picnic-m"/>
-  <symbol minX="798" maxX="838" minY="276" maxY="316" name="department_store-l"/>
-  <symbol minX="838" maxX="878" minY="276" maxY="316" name="picnic-l"/>
-  <symbol minX="878" maxX="918" minY="276" maxY="316" name="diving-l"/>
-  <symbol minX="918" maxX="958" minY="276" maxY="316" name="phone-l"/>
-  <symbol minX="958" maxX="998" minY="276" maxY="316" name="dog_park-l"/>
-  <symbol minX="0" maxX="40" minY="316" maxY="356" name="pharmacy-l"/>
-  <symbol minX="40" maxX="80" minY="316" maxY="356" name="doityourself-l"/>
-  <symbol minX="80" maxX="120" minY="316" maxY="356" name="parking-meter-l"/>
-  <symbol minX="120" maxX="160" minY="316" maxY="356" name="park-l"/>
-  <symbol minX="160" maxX="200" minY="316" maxY="356" name="optician-l"/>
-  <symbol minX="200" maxX="239" minY="316" maxY="356" name="office-m"/>
-  <symbol minX="239" maxX="279" minY="316" maxY="356" name="drinking-water-l"/>
-  <symbol minX="279" maxX="319" minY="316" maxY="356" name="office-l"/>
-  <symbol minX="319" maxX="359" minY="316" maxY="356" name="nparkf-l"/>
-  <symbol minX="359" maxX="399" minY="316" maxY="356" name="npark-l"/>
-  <symbol minX="399" maxX="439" minY="316" maxY="356" name="electronics-l"/>
-  <symbol minX="439" maxX="479" minY="316" maxY="356" name="mobile_phone-l"/>
-  <symbol minX="479" maxX="519" minY="316" maxY="356" name="embassy-l"/>
-  <symbol minX="519" maxX="559" minY="316" maxY="356" name="museum-l"/>
-  <symbol minX="559" maxX="599" minY="316" maxY="356" name="motel-l"/>
-  <symbol minX="599" maxX="639" minY="316" maxY="356" name="monument-l"/>
-  <symbol minX="639" maxX="679" minY="316" maxY="356" name="military-l"/>
-  <symbol minX="679" maxX="719" minY="316" maxY="356" name="equestrian-l"/>
-  <symbol minX="719" maxX="759" minY="316" maxY="356" name="equestrian-m"/>
-  <symbol minX="759" maxX="799" minY="316" maxY="356" name="marketplace-l"/>
-  <symbol minX="799" maxX="839" minY="316" maxY="356" name="fastfood-l"/>
-  <symbol minX="839" maxX="879" minY="316" maxY="356" name="mail-l"/>
-  <symbol minX="879" maxX="919" minY="316" maxY="356" name="lightrail-berlin-l"/>
-  <symbol minX="919" maxX="959" minY="316" maxY="356" name="fire_station-l"/>
-  <symbol minX="959" maxX="999" minY="316" maxY="356" name="lighthouse-l"/>
-  <symbol minX="0" maxX="40" minY="356" maxY="396" name="lift_gate-l"/>
-  <symbol minX="40" maxX="80" minY="356" maxY="396" name="florist-l"/>
-  <symbol minX="80" maxX="120" minY="356" maxY="396" name="library-l"/>
-  <symbol minX="120" maxX="160" minY="356" maxY="396" name="fountain-l"/>
-  <symbol minX="160" maxX="199" minY="356" maxY="396" name="laundry-m"/>
-  <symbol minX="199" maxX="239" minY="356" maxY="396" name="laundry-l"/>
-  <symbol minX="239" maxX="279" minY="356" maxY="396" name="fuel-l"/>
-  <symbol minX="279" maxX="319" minY="356" maxY="396" name="kiosk-l"/>
-  <symbol minX="319" maxX="359" minY="356" maxY="396" name="kindergarten-m"/>
-  <symbol minX="359" maxX="399" minY="356" maxY="396" name="funicular-l"/>
-  <symbol minX="399" maxX="439" minY="356" maxY="396" name="kindergarten-l"/>
-  <symbol minX="439" maxX="479" minY="356" maxY="396" name="jewelry-l"/>
-  <symbol minX="479" maxX="519" minY="356" maxY="396" name="furniture-l"/>
-  <symbol minX="519" maxX="559" minY="356" maxY="396" name="information-l"/>
-  <symbol minX="559" maxX="599" minY="356" maxY="396" name="gallery-l"/>
-  <symbol minX="599" maxX="638" minY="356" maxY="396" name="hunting-tower-m"/>
-  <symbol minX="638" maxX="678" minY="356" maxY="396" name="hunting-tower-l"/>
-  <symbol minX="678" maxX="718" minY="356" maxY="396" name="garden-l"/>
-  <symbol minX="718" maxX="758" minY="356" maxY="396" name="hotel-l"/>
-  <symbol minX="758" maxX="798" minY="356" maxY="396" name="hospital-l"/>
-  <symbol minX="798" maxX="838" minY="356" maxY="396" name="garden_center-l"/>
-  <symbol minX="838" maxX="878" minY="356" maxY="396" name="historic-ship-l"/>
-  <symbol minX="878" maxX="918" minY="356" maxY="396" name="gate-l"/>
-  <symbol minX="918" maxX="957" minY="356" maxY="396" name="heliport-m"/>
-  <symbol minX="957" maxX="997" minY="356" maxY="396" name="gift-l"/>
-  <symbol minX="0" maxX="40" minY="396" maxY="436" name="heliport-l"/>
-  <symbol minX="40" maxX="80" minY="396" maxY="436" name="golf-l"/>
-  <symbol minX="80" maxX="120" minY="396" maxY="436" name="helipad-l"/>
-  <symbol minX="120" maxX="160" minY="396" maxY="436" name="hardware-l"/>
-  <symbol minX="160" maxX="200" minY="396" maxY="436" name="greengrocer-l"/>
-  <symbol minX="200" maxX="240" minY="396" maxY="436" name="hand-m"/>
-  <symbol minX="240" maxX="280" minY="396" maxY="436" name="grocery-l"/>
-  <symbol minX="280" maxX="320" minY="396" maxY="436" name="hand-l"/>
-  <symbol minX="320" maxX="360" minY="396" maxY="436" name="hairdresser-l"/>
-  <symbol minX="360" maxX="399" minY="396" maxY="435" name="shoes-m"/>
-  <symbol minX="399" maxX="438" minY="396" maxY="435" name="hairdresser-m"/>
-  <symbol minX="438" maxX="477" minY="396" maxY="435" name="grocery-m"/>
-  <symbol minX="477" maxX="516" minY="396" maxY="435" name="greengrocer-m"/>
-  <symbol minX="516" maxX="555" minY="396" maxY="435" name="australian-football-m"/>
-  <symbol minX="555" maxX="594" minY="396" maxY="435" name="casino-m"/>
-  <symbol minX="594" maxX="633" minY="396" maxY="435" name="hardware-m"/>
-  <symbol minX="633" maxX="672" minY="396" maxY="435" name="golf-m"/>
-  <symbol minX="672" maxX="711" minY="396" maxY="435" name="helipad-m"/>
-  <symbol minX="711" maxX="750" minY="396" maxY="435" name="bakery-m"/>
-  <symbol minX="750" maxX="789" minY="396" maxY="435" name="gift-m"/>
-  <symbol minX="789" maxX="828" minY="396" maxY="435" name="gate-m"/>
-  <symbol minX="828" maxX="867" minY="396" maxY="435" name="skiing-m"/>
-  <symbol minX="867" maxX="906" minY="396" maxY="435" name="garden_center-m"/>
-  <symbol minX="906" maxX="945" minY="396" maxY="435" name="historic-ship-m"/>
-  <symbol minX="945" maxX="984" minY="396" maxY="435" name="alcohol-m"/>
-  <symbol minX="984" maxX="1023" minY="396" maxY="435" name="hospital-m"/>
-  <symbol minX="0" maxX="39" minY="436" maxY="475" name="soccer-m"/>
-  <symbol minX="39" maxX="78" minY="436" maxY="475" name="garden-m"/>
-  <symbol minX="78" maxX="117" minY="436" maxY="475" name="hotel-m"/>
-  <symbol minX="117" maxX="156" minY="436" maxY="475" name="banknote-m"/>
-  <symbol minX="156" maxX="195" minY="436" maxY="475" name="alpine_hut-m"/>
-  <symbol minX="195" maxX="234" minY="436" maxY="475" name="gallery-m"/>
-  <symbol minX="234" maxX="273" minY="436" maxY="475" name="shop-m"/>
-  <symbol minX="273" maxX="312" minY="436" maxY="475" name="furniture-m"/>
-  <symbol minX="312" maxX="351" minY="436" maxY="475" name="information-m"/>
-  <symbol minX="351" maxX="390" minY="436" maxY="475" name="bar-m"/>
-  <symbol minX="390" maxX="429" minY="436" maxY="475" name="america-football-m"/>
-  <symbol minX="429" maxX="468" minY="436" maxY="475" name="jewelry-m"/>
-  <symbol minX="468" maxX="507" minY="436" maxY="475" name="funicular-m"/>
-  <symbol minX="507" maxX="546" minY="436" maxY="475" name="archery-m"/>
-  <symbol minX="546" maxX="585" minY="436" maxY="475" name="cave-m"/>
-  <symbol minX="585" maxX="624" minY="436" maxY="475" name="fuel-m"/>
-  <symbol minX="624" maxX="663" minY="436" maxY="475" name="kiosk-m"/>
-  <symbol minX="663" maxX="702" minY="436" maxY="475" name="baseball-m"/>
-  <symbol minX="702" maxX="741" minY="436" maxY="475" name="fountain-m"/>
-  <symbol minX="741" maxX="780" minY="436" maxY="475" name="florist-m"/>
-  <symbol minX="780" maxX="819" minY="436" maxY="475" name="library-m"/>
-  <symbol minX="819" maxX="858" minY="436" maxY="475" name="atm-m"/>
-  <symbol minX="858" maxX="897" minY="436" maxY="475" name="zoo-m"/>
-  <symbol minX="897" maxX="936" minY="436" maxY="475" name="lift_gate-m"/>
-  <symbol minX="936" maxX="975" minY="436" maxY="475" name="fire_station-m"/>
-  <symbol minX="975" maxX="1014" minY="436" maxY="475" name="lighthouse-m"/>
-  <symbol minX="0" maxX="39" minY="475" maxY="514" name="windmill-m"/>
-  <symbol minX="39" maxX="78" minY="475" maxY="514" name="basketball-m"/>
-  <symbol minX="78" maxX="117" minY="475" maxY="514" name="shop-bicycle-m"/>
-  <symbol minX="117" maxX="156" minY="475" maxY="514" name="wayside_shrine-m"/>
-  <symbol minX="156" maxX="195" minY="475" maxY="514" name="fastfood-m"/>
-  <symbol minX="195" maxX="234" minY="475" maxY="514" name="mail-m"/>
-  <symbol minX="234" maxX="273" minY="475" maxY="514" name="wayside_cross-m"/>
-  <symbol minX="273" maxX="312" minY="475" maxY="514" name="bbq-m"/>
-  <symbol minX="312" maxX="351" minY="475" maxY="514" name="marketplace-m"/>
-  <symbol minX="351" maxX="390" minY="475" maxY="514" name="caravan_site-m"/>
-  <symbol minX="390" maxX="429" minY="475" maxY="514" name="sports-m"/>
-  <symbol minX="429" maxX="468" minY="475" maxY="514" name="beach-m"/>
-  <symbol minX="468" maxX="507" minY="475" maxY="514" name="military-m"/>
-  <symbol minX="507" maxX="546" minY="475" maxY="514" name="volcano-m"/>
-  <symbol minX="546" maxX="585" minY="475" maxY="514" name="beauty-m"/>
-  <symbol minX="585" maxX="624" minY="475" maxY="514" name="mobile_phone-m"/>
-  <symbol minX="624" maxX="663" minY="475" maxY="514" name="vending-m"/>
-  <symbol minX="663" maxX="702" minY="475" maxY="514" name="monument-m"/>
-  <symbol minX="702" maxX="741" minY="475" maxY="514" name="cemetery-m"/>
-  <symbol minX="741" maxX="780" minY="475" maxY="514" name="tram-m"/>
-  <symbol minX="780" maxX="819" minY="475" maxY="514" name="motel-m"/>
-  <symbol minX="819" maxX="858" minY="475" maxY="514" name="embassy-m"/>
-  <symbol minX="858" maxX="897" minY="475" maxY="514" name="museum-m"/>
-  <symbol minX="897" maxX="936" minY="475" maxY="514" name="electronics-m"/>
-  <symbol minX="936" maxX="975" minY="475" maxY="514" name="ship-m"/>
-  <symbol minX="975" maxX="1014" minY="475" maxY="514" name="subway-entrance-2-m"/>
-  <symbol minX="0" maxX="39" minY="514" maxY="553" name="school-m"/>
-  <symbol minX="39" maxX="78" minY="514" maxY="553" name="chemist-m"/>
-  <symbol minX="78" maxX="117" minY="514" maxY="553" name="car_sharing-m"/>
-  <symbol minX="117" maxX="156" minY="514" maxY="553" name="train-m"/>
-  <symbol minX="156" maxX="195" minY="514" maxY="553" name="drugs"/>
-  <symbol minX="195" maxX="234" minY="514" maxY="553" name="npark-m"/>
-  <symbol minX="234" maxX="273" minY="514" maxY="553" name="bicycle-m"/>
-  <symbol minX="273" maxX="312" minY="514" maxY="553" name="toys-m"/>
-  <symbol minX="312" maxX="351" minY="514" maxY="553" name="nparkf-m "/>
-  <symbol minX="351" maxX="390" minY="514" maxY="553" name="nparkf-m"/>
-  <symbol minX="390" maxX="429" minY="514" maxY="553" name="townhall-m"/>
-  <symbol minX="429" maxX="468" minY="514" maxY="553" name="drinking-water-m"/>
-  <symbol minX="468" maxX="507" minY="514" maxY="553" name="book-shop-m"/>
-  <symbol minX="507" maxX="546" minY="514" maxY="553" name="subway-entrance-m"/>
-  <symbol minX="546" maxX="585" minY="514" maxY="553" name="tourism-m"/>
-  <symbol minX="585" maxX="624" minY="514" maxY="553" name="optician-m"/>
-  <symbol minX="624" maxX="663" minY="514" maxY="553" name="tomb-m"/>
-  <symbol minX="663" maxX="702" minY="514" maxY="553" name="park-m"/>
-  <symbol minX="702" maxX="741" minY="514" maxY="553" name="boundary_stone-m"/>
-  <symbol minX="741" maxX="780" minY="514" maxY="553" name="restaurant-m"/>
-  <symbol minX="780" maxX="819" minY="514" maxY="553" name="toll_booth-m"/>
-  <symbol minX="819" maxX="858" minY="514" maxY="553" name="doityourself-m"/>
-  <symbol minX="858" maxX="897" minY="514" maxY="553" name="parking-meter-m"/>
-  <symbol minX="897" maxX="936" minY="514" maxY="553" name="bowls-m"/>
-  <symbol minX="936" maxX="975" minY="514" maxY="553" name="toilets-m"/>
-  <symbol minX="975" maxX="1014" minY="514" maxY="553" name="bus-m"/>
-  <symbol minX="0" maxX="39" minY="553" maxY="592" name="theatre-m"/>
-  <symbol minX="39" maxX="78" minY="553" maxY="592" name="tennis-m"/>
-  <symbol minX="78" maxX="117" minY="553" maxY="592" name="butcher-m"/>
-  <symbol minX="117" maxX="156" minY="553" maxY="592" name="taxi-m"/>
-  <symbol minX="156" maxX="195" minY="553" maxY="592" name="pharmacy-2-m"/>
-  <symbol minX="195" maxX="234" minY="553" maxY="592" name="dog_park-m"/>
-  <symbol minX="234" maxX="273" minY="553" maxY="592" name="pharmacy-m"/>
-  <symbol minX="273" maxX="312" minY="553" maxY="592" name="cable-car-m"/>
-  <symbol minX="312" maxX="351" minY="553" maxY="592" name="diving-m"/>
-  <symbol minX="351" maxX="390" minY="553" maxY="592" name="phone-m"/>
-  <symbol minX="390" maxX="429" minY="553" maxY="592" name="swimming-m"/>
-  <symbol minX="429" maxX="468" minY="553" maxY="592" name="department_store-m"/>
-  <symbol minX="468" maxX="507" minY="553" maxY="592" name="curling-m"/>
-  <symbol minX="507" maxX="546" minY="553" maxY="592" name="cinema-m"/>
-  <symbol minX="546" maxX="585" minY="553" maxY="592" name="sweets-m"/>
-  <symbol minX="585" maxX="624" minY="553" maxY="592" name="pitch-m"/>
-  <symbol minX="624" maxX="663" minY="553" maxY="592" name="cafe-m"/>
-  <symbol minX="663" maxX="702" minY="553" maxY="592" name="subway-spb-m"/>
-  <symbol minX="702" maxX="741" minY="553" maxY="592" name="place-of-worship-m"/>
-  <symbol minX="741" maxX="780" minY="553" maxY="592" name="clothes-m"/>
-  <symbol minX="780" maxX="819" minY="553" maxY="592" name="subway-m"/>
-  <symbol minX="819" maxX="858" minY="553" maxY="592" name="police-m"/>
-  <symbol minX="858" maxX="897" minY="553" maxY="592" name="recycling-m"/>
-  <symbol minX="897" maxX="936" minY="553" maxY="592" name="cricket-m"/>
-  <symbol minX="936" maxX="975" minY="553" maxY="592" name="postbox-m"/>
-  <symbol minX="975" maxX="1014" minY="553" maxY="592" name="convenience-m"/>
-  <symbol minX="0" maxX="39" minY="592" maxY="631" name="computer-m"/>
-  <symbol minX="39" maxX="78" minY="592" maxY="631" name="campsite-m"/>
-  <symbol minX="78" maxX="117" minY="592" maxY="631" name="subway-newyork-m"/>
-  <symbol minX="117" maxX="156" minY="592" maxY="631" name="pub-m"/>
-  <symbol minX="156" maxX="195" minY="592" maxY="631" name="college-m"/>
-  <symbol minX="195" maxX="235" minY="592" maxY="628" name="subway-moscow-l"/>
-  <symbol minX="235" maxX="271" minY="592" maxY="628" name="parking-l"/>
-  <symbol minX="271" maxX="307" minY="592" maxY="628" name="speedcam-l"/>
-  <symbol minX="307" maxX="343" minY="592" maxY="628" name="subway-rome-l"/>
-  <symbol minX="343" maxX="379" minY="592" maxY="628" name="lightrail-berlin-m"/>
-  <symbol minX="379" maxX="415" minY="592" maxY="628" name="subway-berlin-l"/>
-  <symbol minX="415" maxX="449" minY="592" maxY="626" name="route_from"/>
-  <symbol minX="449" maxX="482" minY="592" maxY="625" name="no-icon-leisure"/>
-  <symbol minX="482" maxX="519" minY="592" maxY="625" name="subway-moscow-m"/>
-  <symbol minX="519" maxX="552" minY="592" maxY="625" name="subway-paris-m"/>
-  <symbol minX="552" maxX="585" minY="592" maxY="625" name="no-icon"/>
-  <symbol minX="585" maxX="618" minY="592" maxY="625" name="no-icon-tourism"/>
-  <symbol minX="618" maxX="651" minY="592" maxY="625" name="no-icon-shop"/>
-  <symbol minX="651" maxX="684" minY="592" maxY="625" name="subway-rome-m"/>
-  <symbol minX="684" maxX="717" minY="592" maxY="625" name="subway-berlin-m"/>
-  <symbol minX="717" maxX="750" minY="592" maxY="625" name="no-icon-amenity"/>
-  <symbol minX="750" maxX="790" minY="592" maxY="624" name="subway-london-l"/>
-  <symbol minX="790" maxX="822" minY="592" maxY="624" name="current-position"/>
-  <symbol minX="822" maxX="852" minY="592" maxY="623" name="bcontrol-s"/>
-  <symbol minX="852" maxX="882" minY="592" maxY="623" name="waterfall-s"/>
-  <symbol minX="882" maxX="912" minY="592" maxY="623" name="beer-s"/>
-  <symbol minX="912" maxX="942" minY="592" maxY="623" name="picnic-s"/>
-  <symbol minX="942" maxX="972" minY="592" maxY="623" name="hunting-tower-s"/>
-  <symbol minX="972" maxX="1002" minY="592" maxY="623" name="office-s"/>
-  <symbol minX="0" maxX="30" minY="631" maxY="662" name="remains-s"/>
-  <symbol minX="30" maxX="60" minY="631" maxY="662" name="heliport-s"/>
-  <symbol minX="60" maxX="91" minY="631" maxY="662" name="airport-s"/>
-  <symbol minX="91" maxX="121" minY="631" maxY="661" name="skiing-s"/>
-  <symbol minX="121" maxX="151" minY="631" maxY="661" name="casino-s"/>
-  <symbol minX="151" maxX="181" minY="631" maxY="661" name="soccer-s"/>
-  <symbol minX="181" maxX="211" minY="631" maxY="661" name="shop-s"/>
-  <symbol minX="211" maxX="241" minY="631" maxY="661" name="speedcam-m"/>
-  <symbol minX="241" maxX="271" minY="631" maxY="661" name="museum-s"/>
-  <symbol minX="271" maxX="301" minY="631" maxY="661" name="cave-s"/>
-  <symbol minX="301" maxX="331" minY="631" maxY="661" name="grocery-s"/>
-  <symbol minX="331" maxX="361" minY="631" maxY="661" name="hand-s"/>
-  <symbol minX="361" maxX="391" minY="631" maxY="661" name="golf-s"/>
-  <symbol minX="391" maxX="421" minY="631" maxY="661" name="helipad-s"/>
-  <symbol minX="421" maxX="451" minY="631" maxY="661" name="garden-s"/>
-  <symbol minX="451" maxX="481" minY="631" maxY="661" name="hospital-s"/>
-  <symbol minX="481" maxX="517" minY="631" maxY="661" name="subway-barcelona-s"/>
-  <symbol minX="517" maxX="547" minY="631" maxY="661" name="ship-s"/>
-  <symbol minX="547" maxX="577" minY="631" maxY="661" name="cemetery-s"/>
-  <symbol minX="577" maxX="607" minY="631" maxY="661" name="alcohol-s"/>
-  <symbol minX="607" maxX="637" minY="631" maxY="661" name="school-s"/>
-  <symbol minX="637" maxX="667" minY="631" maxY="661" name="subway-entrance-2-s"/>
-  <symbol minX="667" maxX="697" minY="631" maxY="661" name="subway-entrance-arrow"/>
-  <symbol minX="697" maxX="727" minY="631" maxY="661" name="hotel-s"/>
-  <symbol minX="727" maxX="757" minY="631" maxY="661" name="restaurant-s"/>
-  <symbol minX="757" maxX="787" minY="631" maxY="661" name="subway-entrance-s"/>
-  <symbol minX="787" maxX="817" minY="631" maxY="661" name="gallery-s"/>
-  <symbol minX="817" maxX="847" minY="631" maxY="661" name="information-s"/>
-  <symbol minX="847" maxX="877" minY="631" maxY="661" name="funicular-s"/>
-  <symbol minX="877" maxX="907" minY="631" maxY="661" name="car-repair-s"/>
-  <symbol minX="907" maxX="937" minY="631" maxY="661" name="cinema-s"/>
-  <symbol minX="937" maxX="976" minY="631" maxY="661" name="subway-london-m"/>
-  <symbol minX="976" maxX="1006" minY="631" maxY="661" name="america-football-s"/>
-  <symbol minX="0" maxX="30" minY="662" maxY="692" name="recycling-s"/>
-  <symbol minX="30" maxX="60" minY="662" maxY="692" name="bar-s"/>
-  <symbol minX="60" maxX="90" minY="662" maxY="692" name="fuel-s"/>
-  <symbol minX="90" maxX="120" minY="662" maxY="692" name="kindergarten-s"/>
-  <symbol minX="120" maxX="150" minY="662" maxY="692" name="fountain-s"/>
-  <symbol minX="150" maxX="180" minY="662" maxY="692" name="library-s"/>
-  <symbol minX="180" maxX="210" minY="662" maxY="692" name="zoo-s"/>
-  <symbol minX="210" maxX="240" minY="662" maxY="692" name="fire_station-s"/>
-  <symbol minX="240" maxX="270" minY="662" maxY="692" name="pub-s"/>
-  <symbol minX="270" maxX="300" minY="662" maxY="692" name="baseball-s"/>
-  <symbol minX="300" maxX="330" minY="662" maxY="692" name="campsite-s"/>
-  <symbol minX="330" maxX="360" minY="662" maxY="692" name="college-s"/>
-  <symbol minX="360" maxX="390" minY="662" maxY="692" name="subway-newyork-s"/>
-  <symbol minX="390" maxX="420" minY="662" maxY="692" name="windmill-s"/>
-  <symbol minX="420" maxX="450" minY="662" maxY="692" name="power-s"/>
-  <symbol minX="450" maxX="480" minY="662" maxY="692" name="police-s"/>
-  <symbol minX="480" maxX="510" minY="662" maxY="692" name="lighthouse-s"/>
-  <symbol minX="510" maxX="540" minY="662" maxY="692" name="fastfood-s"/>
-  <symbol minX="540" maxX="570" minY="662" maxY="692" name="place-of-worship-s"/>
-  <symbol minX="570" maxX="600" minY="662" maxY="692" name="basketball-s"/>
-  <symbol minX="600" maxX="630" minY="662" maxY="692" name="subway-s"/>
-  <symbol minX="630" maxX="660" minY="662" maxY="692" name="cafe-s"/>
-  <symbol minX="660" maxX="690" minY="662" maxY="692" name="mail-s"/>
-  <symbol minX="690" maxX="720" minY="662" maxY="692" name="subway-spb-s"/>
-  <symbol minX="720" maxX="750" minY="662" maxY="692" name="equestrian-s"/>
-  <symbol minX="750" maxX="780" minY="662" maxY="692" name="volcano-s"/>
-  <symbol minX="780" maxX="810" minY="662" maxY="692" name="military-s"/>
-  <symbol minX="810" maxX="840" minY="662" maxY="692" name="atm-s"/>
-  <symbol minX="840" maxX="870" minY="662" maxY="692" name="pitch-s"/>
-  <symbol minX="870" maxX="900" minY="662" maxY="692" name="monument-s"/>
-  <symbol minX="900" maxX="930" minY="662" maxY="692" name="cable-car-s"/>
-  <symbol minX="930" maxX="960" minY="662" maxY="692" name="phone-s"/>
-  <symbol minX="960" maxX="990" minY="662" maxY="692" name="swimming-s"/>
-  <symbol minX="990" maxX="1020" minY="662" maxY="692" name="pharmacy-s"/>
-  <symbol minX="0" maxX="30" minY="692" maxY="722" name="tram-s"/>
-  <symbol minX="30" maxX="60" minY="692" maxY="722" name="embassy-s"/>
-  <symbol minX="60" maxX="90" minY="692" maxY="722" name="train-s"/>
-  <symbol minX="90" maxX="120" minY="692" maxY="722" name="tennis-s"/>
-  <symbol minX="120" maxX="150" minY="692" maxY="722" name="bus-s"/>
-  <symbol minX="150" maxX="180" minY="692" maxY="722" name="npark-s"/>
-  <symbol minX="180" maxX="210" minY="692" maxY="722" name="theatre-s"/>
-  <symbol minX="210" maxX="240" minY="692" maxY="722" name="drinking-water-s"/>
-  <symbol minX="240" maxX="270" minY="692" maxY="722" name="bicycle-s"/>
-  <symbol minX="270" maxX="300" minY="692" maxY="722" name="toilets-s"/>
-  <symbol minX="300" maxX="330" minY="692" maxY="722" name="townhall-s"/>
-  <symbol minX="330" maxX="360" minY="692" maxY="722" name="nparkf-s"/>
-  <symbol minX="360" maxX="390" minY="692" maxY="722" name="park-s"/>
-  <symbol minX="390" maxX="420" minY="692" maxY="722" name="tourism-s"/>
-  <symbol minX="420" maxX="450" minY="692" maxY="722" name="book-shop-s"/>
-  <symbol minX="450" maxX="490" minY="692" maxY="721" name="subway-barcelona-l"/>
-  <symbol minX="490" maxX="530" minY="692" maxY="721" name="subway-madrid-m"/>
-  <symbol minX="530" maxX="570" minY="692" maxY="721" name="subway-madrid-l"/>
-  <symbol minX="570" maxX="610" minY="692" maxY="721" name="metro-barcelona-m"/>
-  <symbol minX="610" maxX="650" minY="692" maxY="721" name="subway-barcelona-m"/>
-  <symbol minX="650" maxX="677" minY="692" maxY="720" name="s-arrow"/>
-  <symbol minX="677" maxX="705" minY="692" maxY="720" name="parking-m"/>
-  <symbol minX="705" maxX="741" minY="692" maxY="719" name="subway-madrid-s"/>
-  <symbol minX="741" maxX="780" minY="692" maxY="719" name="subway-kiev-m"/>
-  <symbol minX="780" maxX="816" minY="692" maxY="719" name="metro-barcelona-s"/>
-  <symbol minX="816" maxX="843" minY="692" maxY="719" name="peak-l"/>
-  <symbol minX="843" maxX="870" minY="692" maxY="719" name="lightrail-berlin-s"/>
-  <symbol minX="870" maxX="897" minY="692" maxY="719" name="subway-paris-s"/>
-  <symbol minX="897" maxX="936" minY="692" maxY="719" name="subway-kiev-l"/>
-  <symbol minX="936" maxX="961" minY="692" maxY="717" name="subway-moscow-s"/>
-  <symbol minX="961" maxX="986" minY="692" maxY="717" name="api-result"/>
-  <symbol minX="986" maxX="1010" minY="692" maxY="716" name="speedcam-s"/>
-  <symbol minX="0" maxX="24" minY="722" maxY="746" name="subway-rome-s"/>
-  <symbol minX="24" maxX="48" minY="722" maxY="746" name="subway-berlin-s"/>
-  <symbol minX="48" maxX="72" minY="722" maxY="746" name="parking-s"/>
-  <symbol minX="72" maxX="102" minY="722" maxY="746" name="subway-london-s"/>
-  <symbol minX="102" maxX="129" minY="722" maxY="746" name="bench"/>
-  <symbol minX="129" maxX="153" minY="722" maxY="746" name="search-result"/>
-  <symbol minX="153" maxX="177" minY="722" maxY="744" name="peakt-l"/>
-  <symbol minX="177" maxX="199" minY="722" maxY="744" name="star-l"/>
-  <symbol minX="199" maxX="238" minY="722" maxY="744" name="subway-minsk-l"/>
-  <symbol minX="238" maxX="260" minY="722" maxY="744" name="survey_point-l"/>
-  <symbol minX="260" maxX="281" minY="722" maxY="743" name="star-m"/>
-  <symbol minX="281" maxX="314" minY="722" maxY="743" name="subway-kiev-s"/>
-  <symbol minX="314" maxX="333" minY="722" maxY="741" name="survey_point-m"/>
-  <symbol minX="333" maxX="352" minY="722" maxY="741" name="subway-newyork-xs"/>
-  <symbol minX="352" maxX="373" minY="722" maxY="741" name="peak-m"/>
-  <symbol minX="373" maxX="392" minY="722" maxY="741" name="subway-xs"/>
-  <symbol minX="392" maxX="422" minY="722" maxY="741" name="railway-crossing"/>
-  <symbol minX="422" maxX="455" minY="722" maxY="741" name="subway-minsk-m"/>
-  <symbol minX="455" maxX="485" minY="722" maxY="740" name="subway-minsk-s"/>
-  <symbol minX="485" maxX="503" minY="722" maxY="740" name="star-s"/>
-  <symbol minX="503" maxX="521" minY="722" maxY="740" name="crossing-l"/>
-  <symbol minX="521" maxX="557" minY="722" maxY="738" name="arrow-m"/>
-  <symbol minX="557" maxX="575" minY="722" maxY="738" name="peakt-m"/>
-  <symbol minX="575" maxX="591" minY="722" maxY="738" name="survey_point-s"/>
-  <symbol minX="591" maxX="609" minY="722" maxY="738" name="peak-s"/>
-  <symbol minX="609" maxX="624" minY="722" maxY="737" name="crossing-m"/>
-  <symbol minX="624" maxX="639" minY="722" maxY="737" name="entrance-s"/>
-  <symbol minX="639" maxX="654" minY="722" maxY="735" name="peakt-s"/>
-  <symbol minX="654" maxX="666" minY="722" maxY="734" name="dot-m"/>
-  <symbol minX="666" maxX="678" minY="722" maxY="734" name="crossing-s"/>
-  <symbol minX="678" maxX="690" minY="722" maxY="734" name="tree-l"/>
-  <symbol minX="690" maxX="717" minY="722" maxY="734" name="arrow-s"/>
-  <symbol minX="717" maxX="729" minY="722" maxY="734" name="none"/>
-  <symbol minX="729" maxX="739" minY="722" maxY="732" name="entrance-xs"/>
-  <symbol minX="739" maxX="749" minY="722" maxY="732" name="tree-m"/>
-  <symbol minX="749" maxX="758" minY="722" maxY="731" name="zero-icon"/>
-  <symbol minX="758" maxX="767" minY="722" maxY="731" name="dot-s"/>
-  <symbol minX="767" maxX="776" minY="722" maxY="731" name="tree-s"/>
-  <symbol minX="776" maxX="785" minY="722" maxY="731" name="dot-s-light"/>
+ <file height="1024" width="1024">
+  <symbol minY="0" maxY="138" name="route_to" minX="0" maxX="138"/>
+  <symbol minY="0" maxY="132" name="route-arrow" minX="138" maxX="408"/>
+  <symbol minY="0" maxY="116" name="compass-image" minX="408" maxX="524"/>
+  <symbol minY="0" maxY="79" name="watch-search-result" minX="524" maxX="582"/>
+  <symbol minY="0" maxY="74" name="current-position-compas" minX="582" maxX="640"/>
+  <symbol minY="0" maxY="74" name="current-routing-compas" minX="640" maxX="698"/>
+  <symbol minY="0" maxY="70" name="watch-my-direction" minX="698" maxX="762"/>
+  <symbol minY="0" maxY="66" name="search-result-active" minX="762" maxX="828"/>
+  <symbol minY="0" maxY="58" name="placemark-red" minX="828" maxX="858"/>
+  <symbol minY="0" maxY="58" name="placemark-pink" minX="858" maxX="888"/>
+  <symbol minY="0" maxY="58" name="placemark-orange" minX="888" maxX="918"/>
+  <symbol minY="0" maxY="58" name="placemark-green" minX="918" maxX="948"/>
+  <symbol minY="0" maxY="58" name="placemark-brown" minX="948" maxX="978"/>
+  <symbol minY="0" maxY="58" name="placemark-blue" minX="978" maxX="1008"/>
+  <symbol minY="138" maxY="196" name="placemark-yellow" minX="0" maxX="30"/>
+  <symbol minY="138" maxY="196" name="placemark-purple" minX="30" maxX="60"/>
+  <symbol minY="138" maxY="190" name="watch-my-position" minX="60" maxX="112"/>
+  <symbol minY="138" maxY="178" name="airport-l" minX="112" maxX="152"/>
+  <symbol minY="138" maxY="178" name="australian-football-l" minX="152" maxX="192"/>
+  <symbol minY="138" maxY="178" name="airport-m" minX="192" maxX="232"/>
+  <symbol minY="138" maxY="178" name="bakery-l" minX="232" maxX="272"/>
+  <symbol minY="138" maxY="178" name="alcohol-l" minX="272" maxX="312"/>
+  <symbol minY="138" maxY="178" name="bank-l" minX="312" maxX="352"/>
+  <symbol minY="138" maxY="178" name="bank-m" minX="352" maxX="391"/>
+  <symbol minY="138" maxY="178" name="banknote-l" minX="391" maxX="431"/>
+  <symbol minY="138" maxY="178" name="alpine_hut-l" minX="431" maxX="471"/>
+  <symbol minY="138" maxY="178" name="bar-l" minX="471" maxX="511"/>
+  <symbol minY="138" maxY="178" name="america-football-l" minX="511" maxX="551"/>
+  <symbol minY="138" maxY="178" name="archery-l" minX="551" maxX="591"/>
+  <symbol minY="138" maxY="178" name="baseball-l" minX="591" maxX="631"/>
+  <symbol minY="138" maxY="178" name="atm-l" minX="631" maxX="671"/>
+  <symbol minY="138" maxY="178" name="zoo-l" minX="671" maxX="711"/>
+  <symbol minY="138" maxY="178" name="basketball-l" minX="711" maxX="751"/>
+  <symbol minY="138" maxY="178" name="windmill-l" minX="751" maxX="791"/>
+  <symbol minY="138" maxY="178" name="wayside_shrine-l" minX="791" maxX="831"/>
+  <symbol minY="138" maxY="178" name="bbq-l" minX="831" maxX="871"/>
+  <symbol minY="138" maxY="178" name="wayside_cross-l" minX="871" maxX="911"/>
+  <symbol minY="138" maxY="178" name="bcontrol-l" minX="911" maxX="951"/>
+  <symbol minY="138" maxY="178" name="bcontrol-m" minX="951" maxX="990"/>
+  <symbol minY="196" maxY="236" name="waterfall-m" minX="0" maxX="39"/>
+  <symbol minY="196" maxY="236" name="beach-l" minX="39" maxX="79"/>
+  <symbol minY="196" maxY="236" name="waterfall-l" minX="79" maxX="119"/>
+  <symbol minY="196" maxY="236" name="beauty-l" minX="119" maxX="159"/>
+  <symbol minY="196" maxY="236" name="volcano-l" minX="159" maxX="199"/>
+  <symbol minY="196" maxY="236" name="beer-l" minX="199" maxX="239"/>
+  <symbol minY="196" maxY="236" name="beer-m" minX="239" maxX="278"/>
+  <symbol minY="196" maxY="236" name="vending-l" minX="278" maxX="318"/>
+  <symbol minY="196" maxY="236" name="tram-l" minX="318" maxX="358"/>
+  <symbol minY="196" maxY="236" name="bicycle-l" minX="358" maxX="398"/>
+  <symbol minY="196" maxY="236" name="train-l" minX="398" maxX="438"/>
+  <symbol minY="196" maxY="236" name="toys-l" minX="438" maxX="478"/>
+  <symbol minY="196" maxY="236" name="book-shop-l" minX="478" maxX="518"/>
+  <symbol minY="196" maxY="236" name="townhall-l" minX="518" maxX="558"/>
+  <symbol minY="196" maxY="236" name="tourism-l" minX="558" maxX="598"/>
+  <symbol minY="196" maxY="236" name="boundary_stone-l" minX="598" maxX="638"/>
+  <symbol minY="196" maxY="236" name="tomb-l" minX="638" maxX="678"/>
+  <symbol minY="196" maxY="236" name="bowls-l" minX="678" maxX="718"/>
+  <symbol minY="196" maxY="236" name="toll_booth-l" minX="718" maxX="758"/>
+  <symbol minY="196" maxY="236" name="bus-l" minX="758" maxX="798"/>
+  <symbol minY="196" maxY="236" name="toilets-l" minX="798" maxX="838"/>
+  <symbol minY="196" maxY="236" name="theatre-l" minX="838" maxX="878"/>
+  <symbol minY="196" maxY="236" name="butcher-l" minX="878" maxX="918"/>
+  <symbol minY="196" maxY="236" name="tennis-l" minX="918" maxX="958"/>
+  <symbol minY="196" maxY="236" name="cable-car-l" minX="958" maxX="998"/>
+  <symbol minY="236" maxY="276" name="taxi-l" minX="0" maxX="40"/>
+  <symbol minY="236" maxY="276" name="swimming-l" minX="40" maxX="80"/>
+  <symbol minY="236" maxY="276" name="cafe-l" minX="80" maxX="120"/>
+  <symbol minY="236" maxY="276" name="sweets-l" minX="120" maxX="160"/>
+  <symbol minY="236" maxY="276" name="subway-spb-l" minX="160" maxX="200"/>
+  <symbol minY="236" maxY="276" name="campsite-l" minX="200" maxX="240"/>
+  <symbol minY="236" maxY="276" name="subway-paris-l" minX="240" maxX="280"/>
+  <symbol minY="236" maxY="276" name="subway-newyork-l" minX="280" maxX="320"/>
+  <symbol minY="236" maxY="276" name="car-repair-l" minX="320" maxX="360"/>
+  <symbol minY="236" maxY="276" name="car-repair-m" minX="360" maxX="399"/>
+  <symbol minY="236" maxY="276" name="subway-l" minX="399" maxX="439"/>
+  <symbol minY="236" maxY="276" name="car_sharing-l" minX="439" maxX="479"/>
+  <symbol minY="236" maxY="276" name="subway-entrance-l" minX="479" maxX="519"/>
+  <symbol minY="236" maxY="276" name="caravan_site-l" minX="519" maxX="559"/>
+  <symbol minY="236" maxY="276" name="sports-l" minX="559" maxX="599"/>
+  <symbol minY="236" maxY="276" name="casino-l" minX="599" maxX="639"/>
+  <symbol minY="236" maxY="276" name="soccer-l" minX="639" maxX="679"/>
+  <symbol minY="236" maxY="276" name="skiing-l" minX="679" maxX="719"/>
+  <symbol minY="236" maxY="276" name="cave-l" minX="719" maxX="759"/>
+  <symbol minY="236" maxY="276" name="shop-l" minX="759" maxX="799"/>
+  <symbol minY="236" maxY="276" name="shop-bicycle-l" minX="799" maxX="839"/>
+  <symbol minY="236" maxY="276" name="cemetery-l" minX="839" maxX="879"/>
+  <symbol minY="236" maxY="276" name="shoes-l" minX="879" maxX="919"/>
+  <symbol minY="236" maxY="276" name="ship-l" minX="919" maxX="959"/>
+  <symbol minY="236" maxY="276" name="chemist-l" minX="959" maxX="999"/>
+  <symbol minY="276" maxY="316" name="school-l" minX="0" maxX="40"/>
+  <symbol minY="276" maxY="316" name="cinema-l" minX="40" maxX="80"/>
+  <symbol minY="276" maxY="316" name="restaurant-l" minX="80" maxX="120"/>
+  <symbol minY="276" maxY="316" name="remains-m" minX="120" maxX="159"/>
+  <symbol minY="276" maxY="316" name="clothes-l" minX="159" maxX="199"/>
+  <symbol minY="276" maxY="316" name="remains-l" minX="199" maxX="239"/>
+  <symbol minY="276" maxY="316" name="college-l" minX="239" maxX="279"/>
+  <symbol minY="276" maxY="316" name="recycling-l" minX="279" maxX="319"/>
+  <symbol minY="276" maxY="316" name="pub-l" minX="319" maxX="359"/>
+  <symbol minY="276" maxY="316" name="computer-l" minX="359" maxX="399"/>
+  <symbol minY="276" maxY="316" name="power-m" minX="399" maxX="439"/>
+  <symbol minY="276" maxY="316" name="convenience-l" minX="439" maxX="479"/>
+  <symbol minY="276" maxY="316" name="power-l" minX="479" maxX="519"/>
+  <symbol minY="276" maxY="316" name="cricket-l" minX="519" maxX="559"/>
+  <symbol minY="276" maxY="316" name="postbox-l" minX="559" maxX="599"/>
+  <symbol minY="276" maxY="316" name="police-l" minX="599" maxX="639"/>
+  <symbol minY="276" maxY="316" name="place-of-worship-l" minX="639" maxX="679"/>
+  <symbol minY="276" maxY="316" name="pitch-l" minX="679" maxX="719"/>
+  <symbol minY="276" maxY="316" name="curling-l" minX="719" maxX="759"/>
+  <symbol minY="276" maxY="316" name="picnic-m" minX="759" maxX="798"/>
+  <symbol minY="276" maxY="316" name="dentist-l" minX="798" maxX="838"/>
+  <symbol minY="276" maxY="316" name="dentist-m" minX="838" maxX="878"/>
+  <symbol minY="276" maxY="316" name="picnic-l" minX="878" maxX="918"/>
+  <symbol minY="276" maxY="316" name="department_store-l" minX="918" maxX="958"/>
+  <symbol minY="276" maxY="316" name="phone-l" minX="958" maxX="998"/>
+  <symbol minY="316" maxY="356" name="diving-l" minX="0" maxX="40"/>
+  <symbol minY="316" maxY="356" name="pharmacy-l" minX="40" maxX="80"/>
+  <symbol minY="316" maxY="356" name="dog_park-l" minX="80" maxX="120"/>
+  <symbol minY="316" maxY="356" name="parking-meter-l" minX="120" maxX="160"/>
+  <symbol minY="316" maxY="356" name="doityourself-l" minX="160" maxX="200"/>
+  <symbol minY="316" maxY="356" name="park-l" minX="200" maxX="240"/>
+  <symbol minY="316" maxY="356" name="optician-l" minX="240" maxX="280"/>
+  <symbol minY="316" maxY="356" name="office-m" minX="280" maxX="319"/>
+  <symbol minY="316" maxY="356" name="office-l" minX="319" maxX="359"/>
+  <symbol minY="316" maxY="356" name="drinking-water-l" minX="359" maxX="399"/>
+  <symbol minY="316" maxY="356" name="nparkf-l" minX="399" maxX="439"/>
+  <symbol minY="316" maxY="356" name="npark-l" minX="439" maxX="479"/>
+  <symbol minY="316" maxY="356" name="museum-l" minX="479" maxX="519"/>
+  <symbol minY="316" maxY="356" name="electronics-l" minX="519" maxX="559"/>
+  <symbol minY="316" maxY="356" name="motel-l" minX="559" maxX="599"/>
+  <symbol minY="316" maxY="356" name="embassy-l" minX="599" maxX="639"/>
+  <symbol minY="316" maxY="356" name="monument-l" minX="639" maxX="679"/>
+  <symbol minY="316" maxY="356" name="mobile_phone-l" minX="679" maxX="719"/>
+  <symbol minY="316" maxY="356" name="military-l" minX="719" maxX="759"/>
+  <symbol minY="316" maxY="356" name="marketplace-l" minX="759" maxX="799"/>
+  <symbol minY="316" maxY="356" name="equestrian-l" minX="799" maxX="839"/>
+  <symbol minY="316" maxY="356" name="equestrian-m" minX="839" maxX="879"/>
+  <symbol minY="316" maxY="356" name="mail-l" minX="879" maxX="919"/>
+  <symbol minY="316" maxY="356" name="fastfood-l" minX="919" maxX="959"/>
+  <symbol minY="316" maxY="356" name="lightrail-berlin-l" minX="959" maxX="999"/>
+  <symbol minY="356" maxY="396" name="lighthouse-l" minX="0" maxX="40"/>
+  <symbol minY="356" maxY="396" name="fire_station-l" minX="40" maxX="80"/>
+  <symbol minY="356" maxY="396" name="lift_gate-l" minX="80" maxX="120"/>
+  <symbol minY="356" maxY="396" name="library-l" minX="120" maxX="160"/>
+  <symbol minY="356" maxY="396" name="florist-l" minX="160" maxX="200"/>
+  <symbol minY="356" maxY="396" name="laundry-m" minX="200" maxX="239"/>
+  <symbol minY="356" maxY="396" name="fountain-l" minX="239" maxX="279"/>
+  <symbol minY="356" maxY="396" name="laundry-l" minX="279" maxX="319"/>
+  <symbol minY="356" maxY="396" name="kiosk-l" minX="319" maxX="359"/>
+  <symbol minY="356" maxY="396" name="fuel-l" minX="359" maxX="399"/>
+  <symbol minY="356" maxY="396" name="kindergarten-m" minX="399" maxX="439"/>
+  <symbol minY="356" maxY="396" name="kindergarten-l" minX="439" maxX="479"/>
+  <symbol minY="356" maxY="396" name="funicular-l" minX="479" maxX="519"/>
+  <symbol minY="356" maxY="396" name="jewelry-l" minX="519" maxX="559"/>
+  <symbol minY="356" maxY="396" name="information-l" minX="559" maxX="599"/>
+  <symbol minY="356" maxY="396" name="furniture-l" minX="599" maxX="639"/>
+  <symbol minY="356" maxY="396" name="hunting-tower-m" minX="639" maxX="678"/>
+  <symbol minY="356" maxY="396" name="gallery-l" minX="678" maxX="718"/>
+  <symbol minY="356" maxY="396" name="hunting-tower-l" minX="718" maxX="758"/>
+  <symbol minY="356" maxY="396" name="hotel-l" minX="758" maxX="798"/>
+  <symbol minY="356" maxY="396" name="garden-l" minX="798" maxX="838"/>
+  <symbol minY="356" maxY="396" name="hospital-l" minX="838" maxX="878"/>
+  <symbol minY="356" maxY="396" name="historic-ship-l" minX="878" maxX="918"/>
+  <symbol minY="356" maxY="396" name="garden_center-l" minX="918" maxX="958"/>
+  <symbol minY="356" maxY="396" name="heliport-m" minX="958" maxX="997"/>
+  <symbol minY="396" maxY="436" name="gate-l" minX="0" maxX="40"/>
+  <symbol minY="396" maxY="436" name="heliport-l" minX="40" maxX="80"/>
+  <symbol minY="396" maxY="436" name="gift-l" minX="80" maxX="120"/>
+  <symbol minY="396" maxY="436" name="helipad-l" minX="120" maxX="160"/>
+  <symbol minY="396" maxY="436" name="golf-l" minX="160" maxX="200"/>
+  <symbol minY="396" maxY="436" name="hardware-l" minX="200" maxX="240"/>
+  <symbol minY="396" maxY="436" name="hand-m" minX="240" maxX="280"/>
+  <symbol minY="396" maxY="436" name="greengrocer-l" minX="280" maxX="320"/>
+  <symbol minY="396" maxY="436" name="hand-l" minX="320" maxX="360"/>
+  <symbol minY="396" maxY="436" name="grocery-l" minX="360" maxX="400"/>
+  <symbol minY="396" maxY="436" name="hairdresser-l" minX="400" maxX="440"/>
+  <symbol minY="396" maxY="435" name="museum-m" minX="440" maxX="479"/>
+  <symbol minY="396" maxY="435" name="grocery-m" minX="479" maxX="518"/>
+  <symbol minY="396" maxY="435" name="hairdresser-m" minX="518" maxX="557"/>
+  <symbol minY="396" maxY="435" name="greengrocer-m" minX="557" maxX="596"/>
+  <symbol minY="396" maxY="435" name="australian-football-m" minX="596" maxX="635"/>
+  <symbol minY="396" maxY="435" name="bakery-m" minX="635" maxX="674"/>
+  <symbol minY="396" maxY="435" name="golf-m" minX="674" maxX="713"/>
+  <symbol minY="396" maxY="435" name="hardware-m" minX="713" maxX="752"/>
+  <symbol minY="396" maxY="435" name="gift-m" minX="752" maxX="791"/>
+  <symbol minY="396" maxY="435" name="helipad-m" minX="791" maxX="830"/>
+  <symbol minY="396" maxY="435" name="alcohol-m" minX="830" maxX="869"/>
+  <symbol minY="396" maxY="435" name="gate-m" minX="869" maxX="908"/>
+  <symbol minY="396" maxY="435" name="garden_center-m" minX="908" maxX="947"/>
+  <symbol minY="396" maxY="435" name="banknote-m" minX="947" maxX="986"/>
+  <symbol minY="436" maxY="475" name="alpine_hut-m" minX="0" maxX="39"/>
+  <symbol minY="436" maxY="475" name="historic-ship-m" minX="39" maxX="78"/>
+  <symbol minY="436" maxY="475" name="garden-m" minX="78" maxX="117"/>
+  <symbol minY="436" maxY="475" name="hospital-m" minX="117" maxX="156"/>
+  <symbol minY="436" maxY="475" name="bar-m" minX="156" maxX="195"/>
+  <symbol minY="436" maxY="475" name="america-football-m" minX="195" maxX="234"/>
+  <symbol minY="436" maxY="475" name="hotel-m" minX="234" maxX="273"/>
+  <symbol minY="436" maxY="475" name="archery-m" minX="273" maxX="312"/>
+  <symbol minY="436" maxY="475" name="gallery-m" minX="312" maxX="351"/>
+  <symbol minY="436" maxY="475" name="furniture-m" minX="351" maxX="390"/>
+  <symbol minY="436" maxY="475" name="baseball-m" minX="390" maxX="429"/>
+  <symbol minY="436" maxY="475" name="atm-m" minX="429" maxX="468"/>
+  <symbol minY="436" maxY="475" name="information-m" minX="468" maxX="507"/>
+  <symbol minY="436" maxY="475" name="zoo-m" minX="507" maxX="546"/>
+  <symbol minY="436" maxY="475" name="funicular-m" minX="546" maxX="585"/>
+  <symbol minY="436" maxY="475" name="jewelry-m" minX="585" maxX="624"/>
+  <symbol minY="436" maxY="475" name="windmill-m" minX="624" maxX="663"/>
+  <symbol minY="436" maxY="475" name="fuel-m" minX="663" maxX="702"/>
+  <symbol minY="436" maxY="475" name="basketball-m" minX="702" maxX="741"/>
+  <symbol minY="436" maxY="475" name="wayside_shrine-m" minX="741" maxX="780"/>
+  <symbol minY="436" maxY="475" name="kiosk-m" minX="780" maxX="819"/>
+  <symbol minY="436" maxY="475" name="fountain-m" minX="819" maxX="858"/>
+  <symbol minY="436" maxY="475" name="florist-m" minX="858" maxX="897"/>
+  <symbol minY="436" maxY="475" name="wayside_cross-m" minX="897" maxX="936"/>
+  <symbol minY="436" maxY="475" name="library-m" minX="936" maxX="975"/>
+  <symbol minY="436" maxY="475" name="bbq-m" minX="975" maxX="1014"/>
+  <symbol minY="475" maxY="514" name="fire_station-m" minX="0" maxX="39"/>
+  <symbol minY="475" maxY="514" name="lift_gate-m" minX="39" maxX="78"/>
+  <symbol minY="475" maxY="514" name="beach-m" minX="78" maxX="117"/>
+  <symbol minY="475" maxY="514" name="lighthouse-m" minX="117" maxX="156"/>
+  <symbol minY="475" maxY="514" name="volcano-m" minX="156" maxX="195"/>
+  <symbol minY="475" maxY="514" name="fastfood-m" minX="195" maxX="234"/>
+  <symbol minY="475" maxY="514" name="beauty-m" minX="234" maxX="273"/>
+  <symbol minY="475" maxY="514" name="vending-m" minX="273" maxX="312"/>
+  <symbol minY="475" maxY="514" name="tram-m" minX="312" maxX="351"/>
+  <symbol minY="475" maxY="514" name="mail-m" minX="351" maxX="390"/>
+  <symbol minY="475" maxY="514" name="train-m" minX="390" maxX="429"/>
+  <symbol minY="475" maxY="514" name="bicycle-m" minX="429" maxX="468"/>
+  <symbol minY="475" maxY="514" name="marketplace-m" minX="468" maxX="507"/>
+  <symbol minY="475" maxY="514" name="toys-m" minX="507" maxX="546"/>
+  <symbol minY="475" maxY="514" name="townhall-m" minX="546" maxX="585"/>
+  <symbol minY="475" maxY="514" name="book-shop-m" minX="585" maxX="624"/>
+  <symbol minY="475" maxY="514" name="military-m" minX="624" maxX="663"/>
+  <symbol minY="475" maxY="514" name="tourism-m" minX="663" maxX="702"/>
+  <symbol minY="475" maxY="514" name="tomb-m" minX="702" maxX="741"/>
+  <symbol minY="475" maxY="514" name="mobile_phone-m" minX="741" maxX="780"/>
+  <symbol minY="475" maxY="514" name="embassy-m" minX="780" maxX="819"/>
+  <symbol minY="475" maxY="514" name="monument-m" minX="819" maxX="858"/>
+  <symbol minY="475" maxY="514" name="boundary_stone-m" minX="858" maxX="897"/>
+  <symbol minY="475" maxY="514" name="electronics-m" minX="897" maxX="936"/>
+  <symbol minY="475" maxY="514" name="motel-m" minX="936" maxX="975"/>
+  <symbol minY="475" maxY="514" name="drugs" minX="975" maxX="1014"/>
+  <symbol minY="514" maxY="553" name="toll_booth-m" minX="0" maxX="39"/>
+  <symbol minY="514" maxY="553" name="bowls-m" minX="39" maxX="78"/>
+  <symbol minY="514" maxY="553" name="toilets-m" minX="78" maxX="117"/>
+  <symbol minY="514" maxY="553" name="bus-m" minX="117" maxX="156"/>
+  <symbol minY="514" maxY="553" name="theatre-m" minX="156" maxX="195"/>
+  <symbol minY="514" maxY="553" name="tennis-m" minX="195" maxX="234"/>
+  <symbol minY="514" maxY="553" name="butcher-m" minX="234" maxX="273"/>
+  <symbol minY="514" maxY="553" name="taxi-m" minX="273" maxX="312"/>
+  <symbol minY="514" maxY="553" name="cable-car-m" minX="312" maxX="351"/>
+  <symbol minY="514" maxY="553" name="npark-m" minX="351" maxX="390"/>
+  <symbol minY="514" maxY="553" name="swimming-m" minX="390" maxX="429"/>
+  <symbol minY="514" maxY="553" name="drinking-water-m" minX="429" maxX="468"/>
+  <symbol minY="514" maxY="553" name="nparkf-m " minX="468" maxX="507"/>
+  <symbol minY="514" maxY="553" name="nparkf-m" minX="507" maxX="546"/>
+  <symbol minY="514" maxY="553" name="sweets-m" minX="546" maxX="585"/>
+  <symbol minY="514" maxY="553" name="cafe-m" minX="585" maxX="624"/>
+  <symbol minY="514" maxY="553" name="subway-spb-m" minX="624" maxX="663"/>
+  <symbol minY="514" maxY="553" name="campsite-m" minX="663" maxX="702"/>
+  <symbol minY="514" maxY="553" name="subway-newyork-m" minX="702" maxX="741"/>
+  <symbol minY="514" maxY="553" name="optician-m" minX="741" maxX="780"/>
+  <symbol minY="514" maxY="553" name="doityourself-m" minX="780" maxX="819"/>
+  <symbol minY="514" maxY="553" name="park-m" minX="819" maxX="858"/>
+  <symbol minY="514" maxY="553" name="subway-m" minX="858" maxX="897"/>
+  <symbol minY="514" maxY="553" name="subway-entrance-m" minX="897" maxX="936"/>
+  <symbol minY="514" maxY="553" name="car_sharing-m" minX="936" maxX="975"/>
+  <symbol minY="514" maxY="553" name="dog_park-m" minX="975" maxX="1014"/>
+  <symbol minY="553" maxY="592" name="parking-meter-m" minX="0" maxX="39"/>
+  <symbol minY="553" maxY="592" name="subway-entrance-2-m" minX="39" maxX="78"/>
+  <symbol minY="553" maxY="592" name="sports-m" minX="78" maxX="117"/>
+  <symbol minY="553" maxY="592" name="caravan_site-m" minX="117" maxX="156"/>
+  <symbol minY="553" maxY="592" name="soccer-m" minX="156" maxX="195"/>
+  <symbol minY="553" maxY="592" name="casino-m" minX="195" maxX="234"/>
+  <symbol minY="553" maxY="592" name="skiing-m" minX="234" maxX="273"/>
+  <symbol minY="553" maxY="592" name="shop-m" minX="273" maxX="312"/>
+  <symbol minY="553" maxY="592" name="pharmacy-2-m" minX="312" maxX="351"/>
+  <symbol minY="553" maxY="592" name="diving-m" minX="351" maxX="390"/>
+  <symbol minY="553" maxY="592" name="pharmacy-m" minX="390" maxX="429"/>
+  <symbol minY="553" maxY="592" name="cave-m" minX="429" maxX="468"/>
+  <symbol minY="553" maxY="592" name="department_store-m" minX="468" maxX="507"/>
+  <symbol minY="553" maxY="592" name="phone-m" minX="507" maxX="546"/>
+  <symbol minY="553" maxY="592" name="shop-bicycle-m" minX="546" maxX="585"/>
+  <symbol minY="553" maxY="592" name="shoes-m" minX="585" maxX="624"/>
+  <symbol minY="553" maxY="592" name="curling-m" minX="624" maxX="663"/>
+  <symbol minY="553" maxY="592" name="cemetery-m" minX="663" maxX="702"/>
+  <symbol minY="553" maxY="592" name="ship-m" minX="702" maxX="741"/>
+  <symbol minY="553" maxY="592" name="pitch-m" minX="741" maxX="780"/>
+  <symbol minY="553" maxY="592" name="school-m" minX="780" maxX="819"/>
+  <symbol minY="553" maxY="592" name="chemist-m" minX="819" maxX="858"/>
+  <symbol minY="553" maxY="592" name="place-of-worship-m" minX="858" maxX="897"/>
+  <symbol minY="553" maxY="592" name="restaurant-m" minX="897" maxX="936"/>
+  <symbol minY="553" maxY="592" name="cinema-m" minX="936" maxX="975"/>
+  <symbol minY="553" maxY="592" name="police-m" minX="975" maxX="1014"/>
+  <symbol minY="592" maxY="631" name="clothes-m" minX="0" maxX="39"/>
+  <symbol minY="592" maxY="631" name="cricket-m" minX="39" maxX="78"/>
+  <symbol minY="592" maxY="631" name="postbox-m" minX="78" maxX="117"/>
+  <symbol minY="592" maxY="631" name="convenience-m" minX="117" maxX="156"/>
+  <symbol minY="592" maxY="631" name="computer-m" minX="156" maxX="195"/>
+  <symbol minY="592" maxY="631" name="recycling-m" minX="195" maxX="234"/>
+  <symbol minY="592" maxY="631" name="college-m" minX="234" maxX="273"/>
+  <symbol minY="592" maxY="631" name="pub-m" minX="273" maxX="312"/>
+  <symbol minY="592" maxY="628" name="speedcam-l" minX="312" maxX="348"/>
+  <symbol minY="592" maxY="628" name="lightrail-berlin-m" minX="348" maxX="384"/>
+  <symbol minY="592" maxY="628" name="subway-berlin-l" minX="384" maxX="420"/>
+  <symbol minY="592" maxY="628" name="parking-l" minX="420" maxX="456"/>
+  <symbol minY="592" maxY="628" name="subway-moscow-l" minX="456" maxX="496"/>
+  <symbol minY="592" maxY="628" name="subway-rome-l" minX="496" maxX="532"/>
+  <symbol minY="592" maxY="626" name="route_from" minX="532" maxX="566"/>
+  <symbol minY="592" maxY="625" name="no-icon-tourism" minX="566" maxX="599"/>
+  <symbol minY="592" maxY="625" name="subway-paris-m" minX="599" maxX="632"/>
+  <symbol minY="592" maxY="625" name="subway-berlin-m" minX="632" maxX="665"/>
+  <symbol minY="592" maxY="625" name="no-icon-amenity" minX="665" maxX="698"/>
+  <symbol minY="592" maxY="625" name="no-icon-leisure" minX="698" maxX="731"/>
+  <symbol minY="592" maxY="625" name="no-icon-shop" minX="731" maxX="764"/>
+  <symbol minY="592" maxY="625" name="subway-moscow-m" minX="764" maxX="801"/>
+  <symbol minY="592" maxY="625" name="no-icon" minX="801" maxX="834"/>
+  <symbol minY="592" maxY="625" name="subway-rome-m" minX="834" maxX="867"/>
+  <symbol minY="592" maxY="624" name="subway-london-l" minX="867" maxX="907"/>
+  <symbol minY="592" maxY="624" name="current-position" minX="907" maxX="939"/>
+  <symbol minY="592" maxY="623" name="picnic-s" minX="939" maxX="969"/>
+  <symbol minY="592" maxY="623" name="office-s" minX="969" maxX="999"/>
+  <symbol minY="631" maxY="662" name="bcontrol-s" minX="0" maxX="30"/>
+  <symbol minY="631" maxY="662" name="hunting-tower-s" minX="30" maxX="60"/>
+  <symbol minY="631" maxY="662" name="waterfall-s" minX="60" maxX="90"/>
+  <symbol minY="631" maxY="662" name="remains-s" minX="90" maxX="120"/>
+  <symbol minY="631" maxY="662" name="beer-s" minX="120" maxX="150"/>
+  <symbol minY="631" maxY="662" name="heliport-s" minX="150" maxX="180"/>
+  <symbol minY="631" maxY="662" name="airport-s" minX="180" maxX="211"/>
+  <symbol minY="631" maxY="661" name="skiing-s" minX="211" maxX="241"/>
+  <symbol minY="631" maxY="661" name="tennis-s" minX="241" maxX="271"/>
+  <symbol minY="631" maxY="661" name="golf-s" minX="271" maxX="301"/>
+  <symbol minY="631" maxY="661" name="soccer-s" minX="301" maxX="331"/>
+  <symbol minY="631" maxY="661" name="pub-s" minX="331" maxX="361"/>
+  <symbol minY="631" maxY="661" name="speedcam-m" minX="361" maxX="391"/>
+  <symbol minY="631" maxY="661" name="hand-s" minX="391" maxX="421"/>
+  <symbol minY="631" maxY="661" name="helipad-s" minX="421" maxX="451"/>
+  <symbol minY="631" maxY="661" name="alcohol-s" minX="451" maxX="481"/>
+  <symbol minY="631" maxY="661" name="college-s" minX="481" maxX="511"/>
+  <symbol minY="631" maxY="661" name="garden-s" minX="511" maxX="541"/>
+  <symbol minY="631" maxY="661" name="hospital-s" minX="541" maxX="571"/>
+  <symbol minY="631" maxY="661" name="gallery-s" minX="571" maxX="601"/>
+  <symbol minY="631" maxY="661" name="america-football-s" minX="601" maxX="631"/>
+  <symbol minY="631" maxY="661" name="subway-barcelona-s" minX="631" maxX="667"/>
+  <symbol minY="631" maxY="661" name="casino-s" minX="667" maxX="697"/>
+  <symbol minY="631" maxY="661" name="shop-s" minX="697" maxX="727"/>
+  <symbol minY="631" maxY="661" name="bar-s" minX="727" maxX="757"/>
+  <symbol minY="631" maxY="661" name="hotel-s" minX="757" maxX="787"/>
+  <symbol minY="631" maxY="661" name="subway-entrance-2-s" minX="787" maxX="817"/>
+  <symbol minY="631" maxY="661" name="subway-entrance-arrow" minX="817" maxX="847"/>
+  <symbol minY="631" maxY="661" name="power-s" minX="847" maxX="877"/>
+  <symbol minY="631" maxY="661" name="recycling-s" minX="877" maxX="907"/>
+  <symbol minY="631" maxY="661" name="subway-entrance-s" minX="907" maxX="937"/>
+  <symbol minY="631" maxY="661" name="funicular-s" minX="937" maxX="967"/>
+  <symbol minY="631" maxY="661" name="zoo-s" minX="967" maxX="997"/>
+  <symbol minY="662" maxY="692" name="information-s" minX="0" maxX="30"/>
+  <symbol minY="662" maxY="692" name="car-repair-s" minX="30" maxX="60"/>
+  <symbol minY="662" maxY="692" name="pharmacy-s" minX="60" maxX="90"/>
+  <symbol minY="662" maxY="692" name="subway-london-m" minX="90" maxX="129"/>
+  <symbol minY="662" maxY="692" name="baseball-s" minX="129" maxX="159"/>
+  <symbol minY="662" maxY="692" name="park-s" minX="159" maxX="189"/>
+  <symbol minY="662" maxY="692" name="windmill-s" minX="189" maxX="219"/>
+  <symbol minY="662" maxY="692" name="fuel-s" minX="219" maxX="249"/>
+  <symbol minY="662" maxY="692" name="kindergarten-s" minX="249" maxX="279"/>
+  <symbol minY="662" maxY="692" name="fountain-s" minX="279" maxX="309"/>
+  <symbol minY="662" maxY="692" name="basketball-s" minX="309" maxX="339"/>
+  <symbol minY="662" maxY="692" name="fire_station-s" minX="339" maxX="369"/>
+  <symbol minY="662" maxY="692" name="phone-s" minX="369" maxX="399"/>
+  <symbol minY="662" maxY="692" name="cave-s" minX="399" maxX="429"/>
+  <symbol minY="662" maxY="692" name="library-s" minX="429" maxX="459"/>
+  <symbol minY="662" maxY="692" name="campsite-s" minX="459" maxX="489"/>
+  <symbol minY="662" maxY="692" name="police-s" minX="489" maxX="519"/>
+  <symbol minY="662" maxY="692" name="subway-newyork-s" minX="519" maxX="549"/>
+  <symbol minY="662" maxY="692" name="cinema-s" minX="549" maxX="579"/>
+  <symbol minY="662" maxY="692" name="dentist-s" minX="579" maxX="609"/>
+  <symbol minY="662" maxY="692" name="ship-s" minX="609" maxX="639"/>
+  <symbol minY="662" maxY="692" name="fastfood-s" minX="639" maxX="669"/>
+  <symbol minY="662" maxY="692" name="volcano-s" minX="669" maxX="699"/>
+  <symbol minY="662" maxY="692" name="cemetery-s" minX="699" maxX="729"/>
+  <symbol minY="662" maxY="692" name="lighthouse-s" minX="729" maxX="759"/>
+  <symbol minY="662" maxY="692" name="subway-s" minX="759" maxX="789"/>
+  <symbol minY="662" maxY="692" name="cafe-s" minX="789" maxX="819"/>
+  <symbol minY="662" maxY="692" name="place-of-worship-s" minX="819" maxX="849"/>
+  <symbol minY="662" maxY="692" name="subway-spb-s" minX="849" maxX="879"/>
+  <symbol minY="662" maxY="692" name="tram-s" minX="879" maxX="909"/>
+  <symbol minY="662" maxY="692" name="equestrian-s" minX="909" maxX="939"/>
+  <symbol minY="662" maxY="692" name="train-s" minX="939" maxX="969"/>
+  <symbol minY="662" maxY="692" name="mail-s" minX="969" maxX="999"/>
+  <symbol minY="692" maxY="722" name="bicycle-s" minX="0" maxX="30"/>
+  <symbol minY="692" maxY="722" name="nparkf-s" minX="30" maxX="60"/>
+  <symbol minY="692" maxY="722" name="cable-car-s" minX="60" maxX="90"/>
+  <symbol minY="692" maxY="722" name="npark-s" minX="90" maxX="120"/>
+  <symbol minY="692" maxY="722" name="swimming-s" minX="120" maxX="150"/>
+  <symbol minY="692" maxY="722" name="drinking-water-s" minX="150" maxX="180"/>
+  <symbol minY="692" maxY="722" name="townhall-s" minX="180" maxX="210"/>
+  <symbol minY="692" maxY="722" name="school-s" minX="210" maxX="240"/>
+  <symbol minY="692" maxY="722" name="pitch-s" minX="240" maxX="270"/>
+  <symbol minY="692" maxY="722" name="military-s" minX="270" maxX="300"/>
+  <symbol minY="692" maxY="722" name="bus-s" minX="300" maxX="330"/>
+  <symbol minY="692" maxY="722" name="tourism-s" minX="330" maxX="360"/>
+  <symbol minY="692" maxY="722" name="theatre-s" minX="360" maxX="390"/>
+  <symbol minY="692" maxY="722" name="atm-s" minX="390" maxX="420"/>
+  <symbol minY="692" maxY="722" name="restaurant-s" minX="420" maxX="450"/>
+  <symbol minY="692" maxY="722" name="toilets-s" minX="450" maxX="480"/>
+  <symbol minY="692" maxY="722" name="museum-s" minX="480" maxX="510"/>
+  <symbol minY="692" maxY="722" name="grocery-s" minX="510" maxX="540"/>
+  <symbol minY="692" maxY="722" name="monument-s" minX="540" maxX="570"/>
+  <symbol minY="692" maxY="722" name="embassy-s" minX="570" maxX="600"/>
+  <symbol minY="692" maxY="722" name="book-shop-s" minX="600" maxX="630"/>
+  <symbol minY="692" maxY="721" name="metro-barcelona-m" minX="630" maxX="670"/>
+  <symbol minY="692" maxY="721" name="subway-barcelona-l" minX="670" maxX="710"/>
+  <symbol minY="692" maxY="721" name="subway-barcelona-m" minX="710" maxX="750"/>
+  <symbol minY="692" maxY="721" name="subway-madrid-m" minX="750" maxX="790"/>
+  <symbol minY="692" maxY="721" name="subway-madrid-l" minX="790" maxX="830"/>
+  <symbol minY="692" maxY="720" name="s-arrow" minX="830" maxX="857"/>
+  <symbol minY="692" maxY="720" name="parking-m" minX="857" maxX="885"/>
+  <symbol minY="692" maxY="719" name="subway-madrid-s" minX="885" maxX="921"/>
+  <symbol minY="692" maxY="719" name="metro-barcelona-s" minX="921" maxX="957"/>
+  <symbol minY="692" maxY="719" name="subway-paris-s" minX="957" maxX="984"/>
+  <symbol minY="692" maxY="719" name="subway-kiev-m" minX="984" maxX="1023"/>
+  <symbol minY="722" maxY="749" name="lightrail-berlin-s" minX="0" maxX="27"/>
+  <symbol minY="722" maxY="749" name="peak-l" minX="27" maxX="54"/>
+  <symbol minY="722" maxY="749" name="subway-kiev-l" minX="54" maxX="93"/>
+  <symbol minY="722" maxY="747" name="subway-moscow-s" minX="93" maxX="118"/>
+  <symbol minY="722" maxY="747" name="api-result" minX="118" maxX="143"/>
+  <symbol minY="722" maxY="746" name="subway-berlin-s" minX="143" maxX="167"/>
+  <symbol minY="722" maxY="746" name="speedcam-s" minX="167" maxX="191"/>
+  <symbol minY="722" maxY="746" name="parking-s" minX="191" maxX="215"/>
+  <symbol minY="722" maxY="746" name="subway-rome-s" minX="215" maxX="239"/>
+  <symbol minY="722" maxY="746" name="bench" minX="239" maxX="266"/>
+  <symbol minY="722" maxY="746" name="search-result" minX="266" maxX="290"/>
+  <symbol minY="722" maxY="746" name="subway-london-s" minX="290" maxX="320"/>
+  <symbol minY="722" maxY="744" name="peakt-l" minX="320" maxX="344"/>
+  <symbol minY="722" maxY="744" name="star-l" minX="344" maxX="366"/>
+  <symbol minY="722" maxY="744" name="subway-minsk-l" minX="366" maxX="405"/>
+  <symbol minY="722" maxY="744" name="survey_point-l" minX="405" maxX="427"/>
+  <symbol minY="722" maxY="743" name="star-m" minX="427" maxX="448"/>
+  <symbol minY="722" maxY="743" name="subway-kiev-s" minX="448" maxX="481"/>
+  <symbol minY="722" maxY="741" name="survey_point-m" minX="481" maxX="500"/>
+  <symbol minY="722" maxY="741" name="peak-m" minX="500" maxX="521"/>
+  <symbol minY="722" maxY="741" name="railway-crossing" minX="521" maxX="551"/>
+  <symbol minY="722" maxY="741" name="subway-xs" minX="551" maxX="570"/>
+  <symbol minY="722" maxY="741" name="subway-minsk-m" minX="570" maxX="603"/>
+  <symbol minY="722" maxY="741" name="subway-newyork-xs" minX="603" maxX="622"/>
+  <symbol minY="722" maxY="740" name="crossing-l" minX="622" maxX="640"/>
+  <symbol minY="722" maxY="740" name="subway-minsk-s" minX="640" maxX="670"/>
+  <symbol minY="722" maxY="740" name="star-s" minX="670" maxX="688"/>
+  <symbol minY="722" maxY="738" name="arrow-m" minX="688" maxX="724"/>
+  <symbol minY="722" maxY="738" name="survey_point-s" minX="724" maxX="740"/>
+  <symbol minY="722" maxY="738" name="peak-s" minX="740" maxX="758"/>
+  <symbol minY="722" maxY="738" name="peakt-m" minX="758" maxX="776"/>
+  <symbol minY="722" maxY="737" name="entrance-s" minX="776" maxX="791"/>
+  <symbol minY="722" maxY="737" name="crossing-m" minX="791" maxX="806"/>
+  <symbol minY="722" maxY="735" name="peakt-s" minX="806" maxX="821"/>
+  <symbol minY="722" maxY="734" name="tree-l" minX="821" maxX="833"/>
+  <symbol minY="722" maxY="734" name="crossing-s" minX="833" maxX="845"/>
+  <symbol minY="722" maxY="734" name="arrow-s" minX="845" maxX="872"/>
+  <symbol minY="722" maxY="734" name="dot-m" minX="872" maxX="884"/>
+  <symbol minY="722" maxY="734" name="none" minX="884" maxX="896"/>
+  <symbol minY="722" maxY="732" name="tree-m" minX="896" maxX="906"/>
+  <symbol minY="722" maxY="732" name="entrance-xs" minX="906" maxX="916"/>
+  <symbol minY="722" maxY="731" name="dot-s-light" minX="916" maxX="925"/>
+  <symbol minY="722" maxY="731" name="zero-icon" minX="925" maxX="934"/>
+  <symbol minY="722" maxY="731" name="tree-s" minX="934" maxX="943"/>
+  <symbol minY="722" maxY="731" name="dot-s" minX="943" maxX="952"/>
  </file>
 </root>
diff --git a/data/resources-xhdpi_dark/symbols.png b/data/resources-xhdpi_dark/symbols.png
index 2bba3d723c..2206ec4e86 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 46d61fb836..08a664a082 100644
--- a/data/resources-xhdpi_dark/symbols.sdf
+++ b/data/resources-xhdpi_dark/symbols.sdf
@@ -1,464 +1,467 @@
 <!DOCTYPE skin>
 <root>
  <file width="1024" height="1024">
-  <symbol minX="0" maxX="138" minY="0" maxY="138" name="route_to"/>
-  <symbol minX="138" maxX="408" minY="0" maxY="132" name="route-arrow"/>
-  <symbol minX="408" maxX="524" minY="0" maxY="116" name="compass-image"/>
-  <symbol minX="524" maxX="582" minY="0" maxY="79" name="watch-search-result"/>
-  <symbol minX="582" maxX="640" minY="0" maxY="74" name="current-position-compas"/>
-  <symbol minX="640" maxX="698" minY="0" maxY="74" name="current-routing-compas"/>
-  <symbol minX="698" maxX="762" minY="0" maxY="70" name="watch-my-direction"/>
-  <symbol minX="762" maxX="828" minY="0" maxY="66" name="search-result-active"/>
-  <symbol minX="828" maxX="858" minY="0" maxY="58" name="placemark-red"/>
-  <symbol minX="858" maxX="888" minY="0" maxY="58" name="placemark-pink"/>
-  <symbol minX="888" maxX="918" minY="0" maxY="58" name="placemark-orange"/>
-  <symbol minX="918" maxX="948" minY="0" maxY="58" name="placemark-green"/>
-  <symbol minX="948" maxX="978" minY="0" maxY="58" name="placemark-brown"/>
-  <symbol minX="978" maxX="1008" minY="0" maxY="58" name="placemark-blue"/>
-  <symbol minX="0" maxX="30" minY="138" maxY="196" name="placemark-yellow"/>
-  <symbol minX="30" maxX="60" minY="138" maxY="196" name="placemark-purple"/>
-  <symbol minX="60" maxX="112" minY="138" maxY="190" name="watch-my-position"/>
-  <symbol minX="112" maxX="152" minY="138" maxY="178" name="airport-l"/>
-  <symbol minX="152" maxX="192" minY="138" maxY="178" name="monument-l"/>
-  <symbol minX="192" maxX="232" minY="138" maxY="178" name="australian-football-l"/>
-  <symbol minX="232" maxX="272" minY="138" maxY="178" name="shoes-l"/>
-  <symbol minX="272" maxX="312" minY="138" maxY="178" name="bakery-l"/>
-  <symbol minX="312" maxX="352" minY="138" maxY="178" name="ship-l"/>
-  <symbol minX="352" maxX="392" minY="138" maxY="178" name="school-l"/>
-  <symbol minX="392" maxX="432" minY="138" maxY="178" name="bank-l"/>
-  <symbol minX="432" maxX="471" minY="138" maxY="178" name="bank-m"/>
-  <symbol minX="471" maxX="511" minY="138" maxY="178" name="banknote-l"/>
-  <symbol minX="511" maxX="551" minY="138" maxY="178" name="shop-bicycle-l"/>
-  <symbol minX="551" maxX="591" minY="138" maxY="178" name="bar-l"/>
-  <symbol minX="591" maxX="631" minY="138" maxY="178" name="restaurant-l"/>
-  <symbol minX="631" maxX="671" minY="138" maxY="178" name="airport-m"/>
-  <symbol minX="671" maxX="711" minY="138" maxY="178" name="baseball-l"/>
-  <symbol minX="711" maxX="751" minY="138" maxY="178" name="shop-l copy"/>
-  <symbol minX="751" maxX="791" minY="138" maxY="178" name="alcohol-l"/>
-  <symbol minX="791" maxX="831" minY="138" maxY="178" name="basketball-l"/>
-  <symbol minX="831" maxX="871" minY="138" maxY="178" name="remains-l"/>
-  <symbol minX="871" maxX="911" minY="138" maxY="178" name="shop-l"/>
-  <symbol minX="911" maxX="951" minY="138" maxY="178" name="bbq-l"/>
-  <symbol minX="951" maxX="991" minY="138" maxY="178" name="recycling-l"/>
-  <symbol minX="0" maxX="40" minY="196" maxY="236" name="bcontrol-l"/>
-  <symbol minX="40" maxX="80" minY="196" maxY="236" name="pub-l"/>
-  <symbol minX="80" maxX="120" minY="196" maxY="236" name="power-m"/>
-  <symbol minX="120" maxX="160" minY="196" maxY="236" name="beach-l"/>
-  <symbol minX="160" maxX="200" minY="196" maxY="236" name="power-l"/>
-  <symbol minX="200" maxX="240" minY="196" maxY="236" name="beauty-l"/>
-  <symbol minX="240" maxX="280" minY="196" maxY="236" name="postbox-l"/>
-  <symbol minX="280" maxX="320" minY="196" maxY="236" name="beer-l"/>
-  <symbol minX="320" maxX="360" minY="196" maxY="236" name="skiing-l"/>
-  <symbol minX="360" maxX="400" minY="196" maxY="236" name="alpine_hut-l"/>
-  <symbol minX="400" maxX="440" minY="196" maxY="236" name="police-l"/>
-  <symbol minX="440" maxX="480" minY="196" maxY="236" name="bicycle-l"/>
-  <symbol minX="480" maxX="520" minY="196" maxY="236" name="place-of-worship-l"/>
-  <symbol minX="520" maxX="560" minY="196" maxY="236" name="america-football-l"/>
-  <symbol minX="560" maxX="600" minY="196" maxY="236" name="book-shop-l"/>
-  <symbol minX="600" maxX="640" minY="196" maxY="236" name="soccer-l"/>
-  <symbol minX="640" maxX="680" minY="196" maxY="236" name="pitch-l"/>
-  <symbol minX="680" maxX="720" minY="196" maxY="236" name="boundary_stone-l"/>
-  <symbol minX="720" maxX="760" minY="196" maxY="236" name="picnic-l"/>
-  <symbol minX="760" maxX="800" minY="196" maxY="236" name="bowls-l"/>
-  <symbol minX="800" maxX="840" minY="196" maxY="236" name="phone-l"/>
-  <symbol minX="840" maxX="880" minY="196" maxY="236" name="bus-l"/>
-  <symbol minX="880" maxX="920" minY="196" maxY="236" name="sports-l"/>
-  <symbol minX="920" maxX="960" minY="196" maxY="236" name="archery-l"/>
-  <symbol minX="960" maxX="1000" minY="196" maxY="236" name="butcher-l"/>
-  <symbol minX="0" maxX="40" minY="236" maxY="276" name="pharmacy-l"/>
-  <symbol minX="40" maxX="80" minY="236" maxY="276" name="cable-car-l"/>
-  <symbol minX="80" maxX="120" minY="236" maxY="276" name="subway-entrance-l"/>
-  <symbol minX="120" maxX="160" minY="236" maxY="276" name="peak-l"/>
-  <symbol minX="160" maxX="200" minY="236" maxY="276" name="cafe-l"/>
-  <symbol minX="200" maxX="240" minY="236" maxY="276" name="parking-meter-l"/>
-  <symbol minX="240" maxX="280" minY="236" maxY="276" name="atm-l"/>
-  <symbol minX="280" maxX="320" minY="236" maxY="276" name="campsite-l"/>
-  <symbol minX="320" maxX="360" minY="236" maxY="276" name="subway-l"/>
-  <symbol minX="360" maxX="400" minY="236" maxY="276" name="park-l"/>
-  <symbol minX="400" maxX="440" minY="236" maxY="276" name="car-repair-l"/>
-  <symbol minX="440" maxX="480" minY="236" maxY="276" name="optician-l"/>
-  <symbol minX="480" maxX="520" minY="236" maxY="276" name="office-l"/>
-  <symbol minX="520" maxX="560" minY="236" maxY="276" name="car_sharing-l"/>
-  <symbol minX="560" maxX="600" minY="236" maxY="276" name="subway-newyork-l"/>
-  <symbol minX="600" maxX="640" minY="236" maxY="276" name="caravan_site-l"/>
-  <symbol minX="640" maxX="680" minY="236" maxY="276" name="nparkf-l"/>
-  <symbol minX="680" maxX="720" minY="236" maxY="276" name="casino-l"/>
-  <symbol minX="720" maxX="760" minY="236" maxY="276" name="npark-l"/>
-  <symbol minX="760" maxX="800" minY="236" maxY="276" name="zoo-l"/>
-  <symbol minX="800" maxX="840" minY="236" maxY="276" name="cave-l"/>
-  <symbol minX="840" maxX="880" minY="236" maxY="276" name="subway-paris-l"/>
-  <symbol minX="880" maxX="920" minY="236" maxY="276" name="subway-spb-l"/>
-  <symbol minX="920" maxX="960" minY="236" maxY="276" name="cemetery-l"/>
-  <symbol minX="960" maxX="1000" minY="236" maxY="276" name="sweets-l"/>
-  <symbol minX="0" maxX="40" minY="276" maxY="316" name="windmill-l"/>
-  <symbol minX="40" maxX="80" minY="276" maxY="316" name="chemist-l"/>
-  <symbol minX="80" maxX="120" minY="276" maxY="316" name="swimming-l"/>
-  <symbol minX="120" maxX="160" minY="276" maxY="316" name="cinema-l"/>
-  <symbol minX="160" maxX="200" minY="276" maxY="316" name="museum-l"/>
-  <symbol minX="200" maxX="240" minY="276" maxY="316" name="motel-l"/>
-  <symbol minX="240" maxX="280" minY="276" maxY="316" name="clothes-l"/>
-  <symbol minX="280" maxX="320" minY="276" maxY="316" name="taxi-l"/>
-  <symbol minX="320" maxX="360" minY="276" maxY="316" name="college-l"/>
-  <symbol minX="360" maxX="400" minY="276" maxY="316" name="mobile_phone-l"/>
-  <symbol minX="400" maxX="440" minY="276" maxY="316" name="wayside_shrine-l"/>
-  <symbol minX="440" maxX="480" minY="276" maxY="316" name="computer-l"/>
-  <symbol minX="480" maxX="520" minY="276" maxY="316" name="military-l"/>
-  <symbol minX="520" maxX="560" minY="276" maxY="316" name="convenience-l"/>
-  <symbol minX="560" maxX="600" minY="276" maxY="316" name="tennis-l"/>
-  <symbol minX="600" maxX="640" minY="276" maxY="316" name="cricket-l"/>
-  <symbol minX="640" maxX="680" minY="276" maxY="316" name="marketplace-l"/>
-  <symbol minX="680" maxX="720" minY="276" maxY="316" name="curling-l"/>
-  <symbol minX="720" maxX="760" minY="276" maxY="316" name="theatre-l"/>
-  <symbol minX="760" maxX="800" minY="276" maxY="316" name="department_store-l"/>
-  <symbol minX="800" maxX="840" minY="276" maxY="316" name="mail-l"/>
-  <symbol minX="840" maxX="880" minY="276" maxY="316" name="diving-l"/>
-  <symbol minX="880" maxX="920" minY="276" maxY="316" name="lightrail-berlin-l"/>
-  <symbol minX="920" maxX="960" minY="276" maxY="316" name="dog_park-l"/>
-  <symbol minX="960" maxX="1000" minY="276" maxY="316" name="toilets-l"/>
-  <symbol minX="0" maxX="40" minY="316" maxY="356" name="doityourself-l"/>
-  <symbol minX="40" maxX="80" minY="316" maxY="356" name="lighthouse-l"/>
-  <symbol minX="80" maxX="120" minY="316" maxY="356" name="lift_gate-l"/>
-  <symbol minX="120" maxX="160" minY="316" maxY="356" name="wayside_cross-l"/>
-  <symbol minX="160" maxX="200" minY="316" maxY="356" name="library-l"/>
-  <symbol minX="200" maxX="240" minY="316" maxY="356" name="drinking-water-l"/>
-  <symbol minX="240" maxX="280" minY="316" maxY="356" name="laundry-l"/>
-  <symbol minX="280" maxX="320" minY="316" maxY="356" name="waterfall-l"/>
-  <symbol minX="320" maxX="360" minY="316" maxY="356" name="kiosk-l"/>
-  <symbol minX="360" maxX="400" minY="316" maxY="356" name="electronics-l"/>
-  <symbol minX="400" maxX="440" minY="316" maxY="356" name="toll_booth-l"/>
-  <symbol minX="440" maxX="480" minY="316" maxY="356" name="embassy-l"/>
-  <symbol minX="480" maxX="520" minY="316" maxY="356" name="kindergarten-m"/>
-  <symbol minX="520" maxX="560" minY="316" maxY="356" name="kindergarten-l"/>
-  <symbol minX="560" maxX="600" minY="316" maxY="356" name="volcano-l"/>
-  <symbol minX="600" maxX="640" minY="316" maxY="356" name="jewelry-l"/>
-  <symbol minX="640" maxX="680" minY="316" maxY="356" name="equestrian-l"/>
-  <symbol minX="680" maxX="720" minY="316" maxY="356" name="equestrian-m"/>
-  <symbol minX="720" maxX="760" minY="316" maxY="356" name="fastfood-l"/>
-  <symbol minX="760" maxX="800" minY="316" maxY="356" name="information-l"/>
-  <symbol minX="800" maxX="840" minY="316" maxY="356" name="vending-l"/>
-  <symbol minX="840" maxX="880" minY="316" maxY="356" name="fire_station-l"/>
-  <symbol minX="880" maxX="920" minY="316" maxY="356" name="hunting-tower-l"/>
-  <symbol minX="920" maxX="960" minY="316" maxY="356" name="tomb-l"/>
-  <symbol minX="960" maxX="1000" minY="316" maxY="356" name="florist-l"/>
-  <symbol minX="0" maxX="40" minY="356" maxY="396" name="hotel-l"/>
-  <symbol minX="40" maxX="80" minY="356" maxY="396" name="fountain-l"/>
-  <symbol minX="80" maxX="120" minY="356" maxY="396" name="hospital-l"/>
-  <symbol minX="120" maxX="160" minY="356" maxY="396" name="tram-l"/>
-  <symbol minX="160" maxX="200" minY="356" maxY="396" name="fuel-l copy"/>
-  <symbol minX="200" maxX="240" minY="356" maxY="396" name="fuel-l"/>
-  <symbol minX="240" maxX="280" minY="356" maxY="396" name="historic-ship-l"/>
-  <symbol minX="280" maxX="320" minY="356" maxY="396" name="tourism-l"/>
-  <symbol minX="320" maxX="360" minY="356" maxY="396" name="funicular-l"/>
-  <symbol minX="360" maxX="400" minY="356" maxY="396" name="heliport-l"/>
-  <symbol minX="400" maxX="440" minY="356" maxY="396" name="train-l"/>
-  <symbol minX="440" maxX="480" minY="356" maxY="396" name="furniture-l"/>
-  <symbol minX="480" maxX="520" minY="356" maxY="396" name="helipad-l"/>
-  <symbol minX="520" maxX="560" minY="356" maxY="396" name="gallery-l"/>
-  <symbol minX="560" maxX="600" minY="356" maxY="396" name="hardware-l"/>
-  <symbol minX="600" maxX="640" minY="356" maxY="396" name="hand-m"/>
-  <symbol minX="640" maxX="680" minY="356" maxY="396" name="garden-l"/>
-  <symbol minX="680" maxX="720" minY="356" maxY="396" name="hand-l"/>
-  <symbol minX="720" maxX="760" minY="356" maxY="396" name="toys-l"/>
-  <symbol minX="760" maxX="800" minY="356" maxY="396" name="garden_center-l"/>
-  <symbol minX="800" maxX="840" minY="356" maxY="396" name="hairdresser-l"/>
-  <symbol minX="840" maxX="880" minY="356" maxY="396" name="gate-l"/>
-  <symbol minX="880" maxX="920" minY="356" maxY="396" name="townhall-l"/>
-  <symbol minX="920" maxX="960" minY="356" maxY="396" name="gift-l"/>
-  <symbol minX="960" maxX="1000" minY="356" maxY="396" name="grocery-l"/>
-  <symbol minX="0" maxX="40" minY="396" maxY="436" name="golf-l"/>
-  <symbol minX="40" maxX="80" minY="396" maxY="436" name="greengrocer-l"/>
-  <symbol minX="80" maxX="119" minY="396" maxY="435" name="townhall-m"/>
-  <symbol minX="119" maxX="158" minY="396" maxY="435" name="golf-m"/>
-  <symbol minX="158" maxX="197" minY="396" maxY="435" name="greengrocer-m"/>
-  <symbol minX="197" maxX="236" minY="396" maxY="435" name="gift-m"/>
-  <symbol minX="236" maxX="275" minY="396" maxY="435" name="grocery-m"/>
-  <symbol minX="275" maxX="314" minY="396" maxY="435" name="gate-m"/>
-  <symbol minX="314" maxX="353" minY="396" maxY="435" name="garden_center-m"/>
-  <symbol minX="353" maxX="392" minY="396" maxY="435" name="hairdresser-m"/>
-  <symbol minX="392" maxX="431" minY="396" maxY="435" name="garden-m"/>
-  <symbol minX="431" maxX="470" minY="396" maxY="435" name="toys-m"/>
-  <symbol minX="470" maxX="509" minY="396" maxY="435" name="gallery-m"/>
-  <symbol minX="509" maxX="548" minY="396" maxY="435" name="hardware-m"/>
-  <symbol minX="548" maxX="587" minY="396" maxY="435" name="furniture-m"/>
-  <symbol minX="587" maxX="626" minY="396" maxY="435" name="helipad-m"/>
-  <symbol minX="626" maxX="665" minY="396" maxY="435" name="tourism-m"/>
-  <symbol minX="665" maxX="704" minY="396" maxY="435" name="funicular-m"/>
-  <symbol minX="704" maxX="743" minY="396" maxY="435" name="heliport-m"/>
-  <symbol minX="743" maxX="782" minY="396" maxY="435" name="train-m"/>
-  <symbol minX="782" maxX="821" minY="396" maxY="435" name="fuel-m"/>
-  <symbol minX="821" maxX="860" minY="396" maxY="435" name="historic-ship-m"/>
-  <symbol minX="860" maxX="899" minY="396" maxY="435" name="fountain-m"/>
-  <symbol minX="899" maxX="938" minY="396" maxY="435" name="hospital-m"/>
-  <symbol minX="938" maxX="977" minY="396" maxY="435" name="tomb-m"/>
-  <symbol minX="977" maxX="1016" minY="396" maxY="435" name="florist-m"/>
-  <symbol minX="0" maxX="39" minY="436" maxY="475" name="hotel-m"/>
-  <symbol minX="39" maxX="78" minY="436" maxY="475" name="tram-m"/>
-  <symbol minX="78" maxX="117" minY="436" maxY="475" name="fire_station-m"/>
-  <symbol minX="117" maxX="156" minY="436" maxY="475" name="hunting-tower-m"/>
-  <symbol minX="156" maxX="195" minY="436" maxY="475" name="fastfood-m"/>
-  <symbol minX="195" maxX="234" minY="436" maxY="475" name="information-m"/>
-  <symbol minX="234" maxX="273" minY="436" maxY="475" name="toll_booth-m"/>
-  <symbol minX="273" maxX="312" minY="436" maxY="475" name="vending-m"/>
-  <symbol minX="312" maxX="351" minY="436" maxY="475" name="jewelry-m"/>
-  <symbol minX="351" maxX="390" minY="436" maxY="475" name="volcano-m"/>
-  <symbol minX="390" maxX="429" minY="436" maxY="475" name="embassy-m"/>
-  <symbol minX="429" maxX="468" minY="436" maxY="475" name="electronics-m"/>
-  <symbol minX="468" maxX="507" minY="436" maxY="475" name="drugs"/>
-  <symbol minX="507" maxX="546" minY="436" maxY="475" name="kiosk-m"/>
-  <symbol minX="546" maxX="585" minY="436" maxY="475" name="drinking-water-m"/>
-  <symbol minX="585" maxX="624" minY="436" maxY="475" name="laundry-m"/>
-  <symbol minX="624" maxX="663" minY="436" maxY="475" name="waterfall-m"/>
-  <symbol minX="663" maxX="702" minY="436" maxY="475" name="library-m"/>
-  <symbol minX="702" maxX="741" minY="436" maxY="475" name="toilets-m"/>
-  <symbol minX="741" maxX="780" minY="436" maxY="475" name="wayside_cross-m"/>
-  <symbol minX="780" maxX="819" minY="436" maxY="475" name="lift_gate-m"/>
-  <symbol minX="819" maxX="858" minY="436" maxY="475" name="doityourself-m"/>
-  <symbol minX="858" maxX="897" minY="436" maxY="475" name="lighthouse-m"/>
-  <symbol minX="897" maxX="936" minY="436" maxY="475" name="dog_park-m"/>
-  <symbol minX="936" maxX="975" minY="436" maxY="475" name="diving-m"/>
-  <symbol minX="975" maxX="1014" minY="436" maxY="475" name="australian-football-m"/>
-  <symbol minX="0" maxX="39" minY="475" maxY="514" name="theatre-m"/>
-  <symbol minX="39" maxX="78" minY="475" maxY="514" name="department_store-m"/>
-  <symbol minX="78" maxX="117" minY="475" maxY="514" name="mail-m"/>
-  <symbol minX="117" maxX="156" minY="475" maxY="514" name="curling-m"/>
-  <symbol minX="156" maxX="195" minY="475" maxY="514" name="cricket-m"/>
-  <symbol minX="195" maxX="234" minY="475" maxY="514" name="marketplace-m"/>
-  <symbol minX="234" maxX="273" minY="475" maxY="514" name="tennis-m"/>
-  <symbol minX="273" maxX="312" minY="475" maxY="514" name="convenience-m"/>
-  <symbol minX="312" maxX="351" minY="475" maxY="514" name="computer-m"/>
-  <symbol minX="351" maxX="390" minY="475" maxY="514" name="military-m"/>
-  <symbol minX="390" maxX="429" minY="475" maxY="514" name="taxi-m"/>
-  <symbol minX="429" maxX="468" minY="475" maxY="514" name="college-m"/>
-  <symbol minX="468" maxX="507" minY="475" maxY="514" name="mobile_phone-m"/>
-  <symbol minX="507" maxX="546" minY="475" maxY="514" name="clothes-m"/>
-  <symbol minX="546" maxX="585" minY="475" maxY="514" name="monument-m"/>
-  <symbol minX="585" maxX="624" minY="475" maxY="514" name="swimming-m"/>
-  <symbol minX="624" maxX="663" minY="475" maxY="514" name="wayside_shrine-m"/>
-  <symbol minX="663" maxX="702" minY="475" maxY="514" name="motel-m"/>
-  <symbol minX="702" maxX="741" minY="475" maxY="514" name="cinema-m"/>
-  <symbol minX="741" maxX="780" minY="475" maxY="514" name="museum-m"/>
-  <symbol minX="780" maxX="819" minY="475" maxY="514" name="chemist-m"/>
-  <symbol minX="819" maxX="858" minY="475" maxY="514" name="sweets-m"/>
-  <symbol minX="858" maxX="897" minY="475" maxY="514" name="cemetery-m"/>
-  <symbol minX="897" maxX="936" minY="475" maxY="514" name="subway-spb-m"/>
-  <symbol minX="936" maxX="975" minY="475" maxY="514" name="windmill-m"/>
-  <symbol minX="975" maxX="1014" minY="475" maxY="514" name="ship-m"/>
-  <symbol minX="0" maxX="39" minY="514" maxY="553" name="cave-m"/>
-  <symbol minX="39" maxX="78" minY="514" maxY="553" name="casino-m"/>
-  <symbol minX="78" maxX="117" minY="514" maxY="553" name="npark-m"/>
-  <symbol minX="117" maxX="156" minY="514" maxY="553" name="subway-newyork-m"/>
-  <symbol minX="156" maxX="195" minY="514" maxY="553" name="caravan_site-m"/>
-  <symbol minX="195" maxX="234" minY="514" maxY="553" name="nparkf-m"/>
-  <symbol minX="234" maxX="273" minY="514" maxY="553" name="car_sharing-m"/>
-  <symbol minX="273" maxX="312" minY="514" maxY="553" name="zoo-m"/>
-  <symbol minX="312" maxX="351" minY="514" maxY="553" name="office-m"/>
-  <symbol minX="351" maxX="390" minY="514" maxY="553" name="bakery-m"/>
-  <symbol minX="390" maxX="429" minY="514" maxY="553" name="car-repair-m"/>
-  <symbol minX="429" maxX="468" minY="514" maxY="553" name="optician-m"/>
-  <symbol minX="468" maxX="507" minY="514" maxY="553" name="atm-m"/>
-  <symbol minX="507" maxX="546" minY="514" maxY="553" name="park-m"/>
-  <symbol minX="546" maxX="585" minY="514" maxY="553" name="subway-m"/>
-  <symbol minX="585" maxX="624" minY="514" maxY="553" name="shoes-m"/>
-  <symbol minX="624" maxX="663" minY="514" maxY="553" name="campsite-m"/>
-  <symbol minX="663" maxX="702" minY="514" maxY="553" name="cafe-m"/>
-  <symbol minX="702" maxX="741" minY="514" maxY="553" name="parking-meter-m"/>
-  <symbol minX="741" maxX="780" minY="514" maxY="553" name="subway-entrance-m"/>
-  <symbol minX="780" maxX="819" minY="514" maxY="553" name="archery-m"/>
-  <symbol minX="819" maxX="858" minY="514" maxY="553" name="peak-m"/>
-  <symbol minX="858" maxX="897" minY="514" maxY="553" name="cable-car-m"/>
-  <symbol minX="897" maxX="936" minY="514" maxY="553" name="subway-entrance-2-m"/>
-  <symbol minX="936" maxX="975" minY="514" maxY="553" name="school-m"/>
-  <symbol minX="975" maxX="1014" minY="514" maxY="553" name="sports-m"/>
-  <symbol minX="0" maxX="39" minY="553" maxY="592" name="butcher-m"/>
-  <symbol minX="39" maxX="78" minY="553" maxY="592" name="pharmacy-m"/>
-  <symbol minX="78" maxX="117" minY="553" maxY="592" name="bus-m"/>
-  <symbol minX="117" maxX="156" minY="553" maxY="592" name="bowls-m"/>
-  <symbol minX="156" maxX="195" minY="553" maxY="592" name="phone-m"/>
-  <symbol minX="195" maxX="234" minY="553" maxY="592" name="bank-2-m"/>
-  <symbol minX="234" maxX="273" minY="553" maxY="592" name="boundary_stone-m"/>
-  <symbol minX="273" maxX="312" minY="553" maxY="592" name="picnic-m"/>
-  <symbol minX="312" maxX="351" minY="553" maxY="592" name="soccer-m"/>
-  <symbol minX="351" maxX="390" minY="553" maxY="592" name="america-football-m"/>
-  <symbol minX="390" maxX="429" minY="553" maxY="592" name="pitch-m"/>
-  <symbol minX="429" maxX="468" minY="553" maxY="592" name="book-shop-m"/>
-  <symbol minX="468" maxX="507" minY="553" maxY="592" name="bicycle-m"/>
-  <symbol minX="507" maxX="546" minY="553" maxY="592" name="place-of-worship-m"/>
-  <symbol minX="546" maxX="585" minY="553" maxY="592" name="skiing-m"/>
-  <symbol minX="585" maxX="624" minY="553" maxY="592" name="alpine_hut-m"/>
-  <symbol minX="624" maxX="663" minY="553" maxY="592" name="police-m"/>
-  <symbol minX="663" maxX="702" minY="553" maxY="592" name="beer-m"/>
-  <symbol minX="702" maxX="741" minY="553" maxY="592" name="beauty-m"/>
-  <symbol minX="741" maxX="780" minY="553" maxY="592" name="postbox-m"/>
-  <symbol minX="780" maxX="819" minY="553" maxY="592" name="beach-m"/>
-  <symbol minX="819" maxX="858" minY="553" maxY="592" name="banknote-m"/>
-  <symbol minX="858" maxX="897" minY="553" maxY="592" name="bcontrol-m"/>
-  <symbol minX="897" maxX="936" minY="553" maxY="592" name="pub-m"/>
-  <symbol minX="936" maxX="975" minY="553" maxY="592" name="shop-m"/>
-  <symbol minX="975" maxX="1014" minY="553" maxY="592" name="shop-m copy"/>
-  <symbol minX="0" maxX="39" minY="592" maxY="631" name="bbq-m"/>
-  <symbol minX="39" maxX="78" minY="592" maxY="631" name="recycling-m"/>
-  <symbol minX="78" maxX="117" minY="592" maxY="631" name="alcohol-m"/>
-  <symbol minX="117" maxX="156" minY="592" maxY="631" name="basketball-m"/>
-  <symbol minX="156" maxX="195" minY="592" maxY="631" name="remains-m"/>
-  <symbol minX="195" maxX="234" minY="592" maxY="631" name="baseball-m"/>
-  <symbol minX="234" maxX="273" minY="592" maxY="631" name="bar-m"/>
-  <symbol minX="273" maxX="312" minY="592" maxY="631" name="restaurant-m"/>
-  <symbol minX="312" maxX="351" minY="592" maxY="631" name="shop-bicycle-m"/>
-  <symbol minX="351" maxX="387" minY="592" maxY="628" name="parking-l"/>
-  <symbol minX="387" maxX="423" minY="592" maxY="628" name="speedcam-l"/>
-  <symbol minX="423" maxX="459" minY="592" maxY="628" name="subway-berlin-l"/>
-  <symbol minX="459" maxX="495" minY="592" maxY="628" name="lightrail-berlin-m"/>
-  <symbol minX="495" maxX="535" minY="592" maxY="628" name="subway-moscow-l"/>
-  <symbol minX="535" maxX="571" minY="592" maxY="628" name="subway-rome-l"/>
-  <symbol minX="571" maxX="605" minY="592" maxY="626" name="route_from"/>
-  <symbol minX="605" maxX="638" minY="592" maxY="625" name="no-icon-leisure"/>
-  <symbol minX="638" maxX="671" minY="592" maxY="625" name="subway-rome-m"/>
-  <symbol minX="671" maxX="708" minY="592" maxY="625" name="subway-moscow-m"/>
-  <symbol minX="708" maxX="741" minY="592" maxY="625" name="no-icon-amenity"/>
-  <symbol minX="741" maxX="774" minY="592" maxY="625" name="no-icon-shop"/>
-  <symbol minX="774" maxX="807" minY="592" maxY="625" name="no-icon-tourism"/>
-  <symbol minX="807" maxX="840" minY="592" maxY="625" name="subway-berlin-m"/>
-  <symbol minX="840" maxX="873" minY="592" maxY="625" name="no-icon"/>
-  <symbol minX="873" maxX="906" minY="592" maxY="625" name="subway-paris-m"/>
-  <symbol minX="906" maxX="938" minY="592" maxY="624" name="current-position"/>
-  <symbol minX="938" maxX="978" minY="592" maxY="624" name="subway-london-l"/>
-  <symbol minX="978" maxX="1009" minY="592" maxY="623" name="airport-s"/>
-  <symbol minX="0" maxX="30" minY="631" maxY="661" name="skiing-s"/>
-  <symbol minX="30" maxX="60" minY="631" maxY="661" name="pitch-s"/>
-  <symbol minX="60" maxX="90" minY="631" maxY="661" name="picnic-s"/>
-  <symbol minX="90" maxX="120" minY="631" maxY="661" name="soccer-s"/>
-  <symbol minX="120" maxX="150" minY="631" maxY="661" name="phone-s"/>
-  <symbol minX="150" maxX="180" minY="631" maxY="661" name="speedcam-m"/>
-  <symbol minX="180" maxX="210" minY="631" maxY="661" name="atm-s"/>
-  <symbol minX="210" maxX="240" minY="631" maxY="661" name="pharmacy-s"/>
-  <symbol minX="240" maxX="270" minY="631" maxY="661" name="bar-s"/>
-  <symbol minX="270" maxX="300" minY="631" maxY="661" name="school-s"/>
-  <symbol minX="300" maxX="330" minY="631" maxY="661" name="baseball-s"/>
-  <symbol minX="330" maxX="360" minY="631" maxY="661" name="basketball-s"/>
-  <symbol minX="360" maxX="390" minY="631" maxY="661" name="bcontrol-s"/>
-  <symbol minX="390" maxX="420" minY="631" maxY="661" name="alcohol-s"/>
-  <symbol minX="420" maxX="456" minY="631" maxY="661" name="subway-barcelona-s"/>
-  <symbol minX="456" maxX="486" minY="631" maxY="661" name="beer-s"/>
-  <symbol minX="486" maxX="516" minY="631" maxY="661" name="place-of-worship-s"/>
-  <symbol minX="516" maxX="546" minY="631" maxY="661" name="bicycle-s"/>
-  <symbol minX="546" maxX="576" minY="631" maxY="661" name="book-shop-s"/>
-  <symbol minX="576" maxX="606" minY="631" maxY="661" name="subway-entrance-2-s"/>
-  <symbol minX="606" maxX="636" minY="631" maxY="661" name="subway-entrance-arrow"/>
-  <symbol minX="636" maxX="666" minY="631" maxY="661" name="peak-s"/>
-  <symbol minX="666" maxX="696" minY="631" maxY="661" name="america-football-s"/>
-  <symbol minX="696" maxX="726" minY="631" maxY="661" name="subway-entrance-s"/>
-  <symbol minX="726" maxX="756" minY="631" maxY="661" name="bus-s"/>
-  <symbol minX="756" maxX="786" minY="631" maxY="661" name="cable-car-s"/>
-  <symbol minX="786" maxX="816" minY="631" maxY="661" name="cafe-s"/>
-  <symbol minX="816" maxX="846" minY="631" maxY="661" name="campsite-s"/>
-  <symbol minX="846" maxX="876" minY="631" maxY="661" name="police-s"/>
-  <symbol minX="876" maxX="915" minY="631" maxY="661" name="subway-london-m"/>
-  <symbol minX="915" maxX="945" minY="631" maxY="661" name="zoo-s"/>
-  <symbol minX="945" maxX="975" minY="631" maxY="661" name="park-s"/>
-  <symbol minX="975" maxX="1005" minY="631" maxY="661" name="car-repair-s"/>
-  <symbol minX="0" maxX="30" minY="661" maxY="691" name="casino-s"/>
-  <symbol minX="30" maxX="60" minY="661" maxY="691" name="windmill-s"/>
-  <symbol minX="60" maxX="90" minY="661" maxY="691" name="cave-s"/>
-  <symbol minX="90" maxX="120" minY="661" maxY="691" name="cemetery-s"/>
-  <symbol minX="120" maxX="150" minY="661" maxY="691" name="cinema-s"/>
-  <symbol minX="150" maxX="180" minY="661" maxY="691" name="office-s"/>
-  <symbol minX="180" maxX="210" minY="661" maxY="691" name="shop-s"/>
-  <symbol minX="210" maxX="240" minY="661" maxY="691" name="college-s"/>
-  <symbol minX="240" maxX="270" minY="661" maxY="691" name="nparkf-s"/>
-  <symbol minX="270" maxX="300" minY="661" maxY="691" name="npark-s"/>
-  <symbol minX="300" maxX="330" minY="661" maxY="691" name="subway-newyork-s"/>
-  <symbol minX="330" maxX="360" minY="661" maxY="691" name="waterfall-s"/>
-  <symbol minX="360" maxX="390" minY="661" maxY="691" name="drinking-water-s"/>
-  <symbol minX="390" maxX="420" minY="661" maxY="691" name="shop-s copy"/>
-  <symbol minX="420" maxX="450" minY="661" maxY="691" name="volcano-s"/>
-  <symbol minX="450" maxX="480" minY="661" maxY="691" name="pub-s"/>
-  <symbol minX="480" maxX="510" minY="661" maxY="691" name="embassy-s"/>
-  <symbol minX="510" maxX="540" minY="661" maxY="691" name="fastfood-s"/>
-  <symbol minX="540" maxX="570" minY="661" maxY="691" name="subway-s"/>
-  <symbol minX="570" maxX="600" minY="661" maxY="691" name="recycling-s"/>
-  <symbol minX="600" maxX="630" minY="661" maxY="691" name="remains-s"/>
-  <symbol minX="630" maxX="660" minY="661" maxY="691" name="subway-spb-s"/>
-  <symbol minX="660" maxX="690" minY="661" maxY="691" name="tram-s"/>
-  <symbol minX="690" maxX="720" minY="661" maxY="691" name="fire_station-s"/>
-  <symbol minX="720" maxX="750" minY="661" maxY="691" name="fountain-s"/>
-  <symbol minX="750" maxX="780" minY="661" maxY="691" name="train-s"/>
-  <symbol minX="780" maxX="810" minY="661" maxY="691" name="fuel-s"/>
-  <symbol minX="810" maxX="840" minY="661" maxY="691" name="ship-s"/>
-  <symbol minX="840" maxX="870" minY="661" maxY="691" name="restaurant-s"/>
-  <symbol minX="870" maxX="900" minY="661" maxY="691" name="museum-s"/>
-  <symbol minX="900" maxX="930" minY="661" maxY="691" name="monument-s"/>
-  <symbol minX="930" maxX="960" minY="661" maxY="691" name="swimming-s"/>
-  <symbol minX="960" maxX="990" minY="661" maxY="691" name="atm-s copy 2"/>
-  <symbol minX="990" maxX="1020" minY="661" maxY="691" name="military-s"/>
-  <symbol minX="0" maxX="30" minY="691" maxY="721" name="funicular-s"/>
-  <symbol minX="30" maxX="60" minY="691" maxY="721" name="gallery-s"/>
-  <symbol minX="60" maxX="90" minY="691" maxY="721" name="tennis-s"/>
-  <symbol minX="90" maxX="120" minY="691" maxY="721" name="mail-s"/>
-  <symbol minX="120" maxX="150" minY="691" maxY="721" name="garden-s"/>
-  <symbol minX="150" maxX="180" minY="691" maxY="721" name="theatre-s"/>
-  <symbol minX="180" maxX="210" minY="691" maxY="721" name="lighthouse-s"/>
-  <symbol minX="210" maxX="240" minY="691" maxY="721" name="library-s"/>
-  <symbol minX="240" maxX="270" minY="691" maxY="721" name="toilets-s"/>
-  <symbol minX="270" maxX="300" minY="691" maxY="721" name="kindergarten-s"/>
-  <symbol minX="300" maxX="330" minY="691" maxY="721" name="information-s"/>
-  <symbol minX="330" maxX="360" minY="691" maxY="721" name="hotel-s"/>
-  <symbol minX="360" maxX="390" minY="691" maxY="721" name="hospital-s"/>
-  <symbol minX="390" maxX="420" minY="691" maxY="721" name="heliport-s"/>
-  <symbol minX="420" maxX="450" minY="691" maxY="721" name="helipad-s"/>
-  <symbol minX="450" maxX="480" minY="691" maxY="721" name="tourism-s"/>
-  <symbol minX="480" maxX="510" minY="691" maxY="721" name="grocery-s"/>
-  <symbol minX="510" maxX="540" minY="691" maxY="721" name="golf-s"/>
-  <symbol minX="540" maxX="570" minY="691" maxY="721" name="townhall-s"/>
-  <symbol minX="570" maxX="610" minY="691" maxY="720" name="subway-barcelona-l"/>
-  <symbol minX="610" maxX="650" minY="691" maxY="720" name="metro-barcelona-m"/>
-  <symbol minX="650" maxX="690" minY="691" maxY="720" name="subway-barcelona-m"/>
-  <symbol minX="690" maxX="730" minY="691" maxY="720" name="subway-madrid-m"/>
-  <symbol minX="730" maxX="770" minY="691" maxY="720" name="subway-madrid-l"/>
-  <symbol minX="770" maxX="798" minY="691" maxY="719" name="parking-m"/>
-  <symbol minX="798" maxX="825" minY="691" maxY="719" name="s-arrow"/>
-  <symbol minX="825" maxX="861" minY="691" maxY="718" name="subway-madrid-s"/>
-  <symbol minX="861" maxX="888" minY="691" maxY="718" name="lightrail-berlin-s"/>
-  <symbol minX="888" maxX="924" minY="691" maxY="718" name="metro-barcelona-s"/>
-  <symbol minX="924" maxX="963" minY="691" maxY="718" name="subway-kiev-l"/>
-  <symbol minX="963" maxX="1002" minY="691" maxY="718" name="subway-kiev-m"/>
-  <symbol minX="0" maxX="27" minY="721" maxY="748" name="subway-paris-s"/>
-  <symbol minX="27" maxX="52" minY="721" maxY="746" name="subway-moscow-s"/>
-  <symbol minX="52" maxX="77" minY="721" maxY="746" name="api-result"/>
-  <symbol minX="77" maxX="101" minY="721" maxY="745" name="speedcam-s"/>
-  <symbol minX="101" maxX="128" minY="721" maxY="745" name="bench"/>
-  <symbol minX="128" maxX="152" minY="721" maxY="745" name="subway-berlin-s"/>
-  <symbol minX="152" maxX="176" minY="721" maxY="745" name="search-result"/>
-  <symbol minX="176" maxX="200" minY="721" maxY="745" name="star-l"/>
-  <symbol minX="200" maxX="224" minY="721" maxY="745" name="parking-s"/>
-  <symbol minX="224" maxX="248" minY="721" maxY="745" name="subway-rome-s"/>
-  <symbol minX="248" maxX="278" minY="721" maxY="745" name="subway-london-s"/>
-  <symbol minX="278" maxX="317" minY="721" maxY="743" name="subway-minsk-l"/>
-  <symbol minX="317" maxX="339" minY="721" maxY="743" name="star-m"/>
-  <symbol minX="339" maxX="363" minY="721" maxY="743" name="peakt-l"/>
-  <symbol minX="363" maxX="385" minY="721" maxY="743" name="survey_point-l"/>
-  <symbol minX="385" maxX="418" minY="721" maxY="742" name="subway-kiev-s"/>
-  <symbol minX="418" maxX="437" minY="721" maxY="740" name="subway-xs"/>
-  <symbol minX="437" maxX="467" minY="721" maxY="740" name="railway-crossing"/>
-  <symbol minX="467" maxX="486" minY="721" maxY="740" name="subway-newyork-xs"/>
-  <symbol minX="486" maxX="505" minY="721" maxY="740" name="survey_point-m"/>
-  <symbol minX="505" maxX="538" minY="721" maxY="740" name="subway-minsk-m"/>
-  <symbol minX="538" maxX="557" minY="721" maxY="740" name="star-s"/>
-  <symbol minX="557" maxX="587" minY="721" maxY="739" name="subway-minsk-s"/>
-  <symbol minX="587" maxX="605" minY="721" maxY="739" name="subway-xs copy"/>
-  <symbol minX="605" maxX="641" minY="721" maxY="737" name="arrow-m"/>
-  <symbol minX="641" maxX="659" minY="721" maxY="737" name="peakt-m"/>
-  <symbol minX="659" maxX="675" minY="721" maxY="737" name="survey_point-s"/>
-  <symbol minX="675" maxX="690" minY="721" maxY="736" name="entrance-s"/>
-  <symbol minX="690" maxX="703" minY="721" maxY="734" name="dot-m"/>
-  <symbol minX="703" maxX="718" minY="721" maxY="734" name="peakt-s"/>
-  <symbol minX="718" maxX="730" minY="721" maxY="733" name="none"/>
-  <symbol minX="730" maxX="742" minY="721" maxY="733" name="tree-l"/>
-  <symbol minX="742" maxX="769" minY="721" maxY="733" name="arrow-s"/>
-  <symbol minX="769" maxX="779" minY="721" maxY="731" name="tree-m"/>
-  <symbol minX="779" maxX="789" minY="721" maxY="731" name="entrance-xs"/>
-  <symbol minX="789" maxX="799" minY="721" maxY="731" name="dot-s-light"/>
-  <symbol minX="799" maxX="809" minY="721" maxY="731" name="dot-s"/>
-  <symbol minX="809" maxX="818" minY="721" maxY="730" name="tree-s"/>
-  <symbol minX="818" maxX="827" minY="721" maxY="730" name="zero-icon"/>
+  <symbol minY="0" maxY="138" name="route_to" minX="0" maxX="138"/>
+  <symbol minY="0" maxY="132" name="route-arrow" minX="138" maxX="408"/>
+  <symbol minY="0" maxY="116" name="compass-image" minX="408" maxX="524"/>
+  <symbol minY="0" maxY="79" name="watch-search-result" minX="524" maxX="582"/>
+  <symbol minY="0" maxY="74" name="current-position-compas" minX="582" maxX="640"/>
+  <symbol minY="0" maxY="74" name="current-routing-compas" minX="640" maxX="698"/>
+  <symbol minY="0" maxY="70" name="watch-my-direction" minX="698" maxX="762"/>
+  <symbol minY="0" maxY="66" name="search-result-active" minX="762" maxX="828"/>
+  <symbol minY="0" maxY="58" name="placemark-red" minX="828" maxX="858"/>
+  <symbol minY="0" maxY="58" name="placemark-pink" minX="858" maxX="888"/>
+  <symbol minY="0" maxY="58" name="placemark-orange" minX="888" maxX="918"/>
+  <symbol minY="0" maxY="58" name="placemark-green" minX="918" maxX="948"/>
+  <symbol minY="0" maxY="58" name="placemark-brown" minX="948" maxX="978"/>
+  <symbol minY="0" maxY="58" name="placemark-blue" minX="978" maxX="1008"/>
+  <symbol minY="138" maxY="196" name="placemark-yellow" minX="0" maxX="30"/>
+  <symbol minY="138" maxY="196" name="placemark-purple" minX="30" maxX="60"/>
+  <symbol minY="138" maxY="190" name="watch-my-position" minX="60" maxX="112"/>
+  <symbol minY="138" maxY="178" name="airport-l" minX="112" maxX="152"/>
+  <symbol minY="138" maxY="178" name="gift-l" minX="152" maxX="192"/>
+  <symbol minY="138" maxY="178" name="australian-football-l" minX="192" maxX="232"/>
+  <symbol minY="138" maxY="178" name="ship-l" minX="232" maxX="272"/>
+  <symbol minY="138" maxY="178" name="bakery-l" minX="272" maxX="312"/>
+  <symbol minY="138" maxY="178" name="shoes-l" minX="312" maxX="352"/>
+  <symbol minY="138" maxY="178" name="school-l" minX="352" maxX="392"/>
+  <symbol minY="138" maxY="178" name="bank-l" minX="392" maxX="432"/>
+  <symbol minY="138" maxY="178" name="bank-m" minX="432" maxX="471"/>
+  <symbol minY="138" maxY="178" name="banknote-l" minX="471" maxX="511"/>
+  <symbol minY="138" maxY="178" name="shop-bicycle-l" minX="511" maxX="551"/>
+  <symbol minY="138" maxY="178" name="bar-l" minX="551" maxX="591"/>
+  <symbol minY="138" maxY="178" name="restaurant-l" minX="591" maxX="631"/>
+  <symbol minY="138" maxY="178" name="airport-m" minX="631" maxX="671"/>
+  <symbol minY="138" maxY="178" name="baseball-l" minX="671" maxX="711"/>
+  <symbol minY="138" maxY="178" name="remains-l" minX="711" maxX="751"/>
+  <symbol minY="138" maxY="178" name="alcohol-l" minX="751" maxX="791"/>
+  <symbol minY="138" maxY="178" name="basketball-l" minX="791" maxX="831"/>
+  <symbol minY="138" maxY="178" name="shop-l copy" minX="831" maxX="871"/>
+  <symbol minY="138" maxY="178" name="recycling-l" minX="871" maxX="911"/>
+  <symbol minY="138" maxY="178" name="bbq-l" minX="911" maxX="951"/>
+  <symbol minY="138" maxY="178" name="shop-l" minX="951" maxX="991"/>
+  <symbol minY="196" maxY="236" name="bcontrol-l" minX="0" maxX="40"/>
+  <symbol minY="196" maxY="236" name="pub-l" minX="40" maxX="80"/>
+  <symbol minY="196" maxY="236" name="power-m" minX="80" maxX="120"/>
+  <symbol minY="196" maxY="236" name="beach-l" minX="120" maxX="160"/>
+  <symbol minY="196" maxY="236" name="power-l" minX="160" maxX="200"/>
+  <symbol minY="196" maxY="236" name="beauty-l" minX="200" maxX="240"/>
+  <symbol minY="196" maxY="236" name="postbox-l" minX="240" maxX="280"/>
+  <symbol minY="196" maxY="236" name="beer-l" minX="280" maxX="320"/>
+  <symbol minY="196" maxY="236" name="police-l" minX="320" maxX="360"/>
+  <symbol minY="196" maxY="236" name="alpine_hut-l" minX="360" maxX="400"/>
+  <symbol minY="196" maxY="236" name="skiing-l" minX="400" maxX="440"/>
+  <symbol minY="196" maxY="236" name="bicycle-l" minX="440" maxX="480"/>
+  <symbol minY="196" maxY="236" name="place-of-worship-l" minX="480" maxX="520"/>
+  <symbol minY="196" maxY="236" name="america-football-l" minX="520" maxX="560"/>
+  <symbol minY="196" maxY="236" name="book-shop-l" minX="560" maxX="600"/>
+  <symbol minY="196" maxY="236" name="pitch-l" minX="600" maxX="640"/>
+  <symbol minY="196" maxY="236" name="soccer-l" minX="640" maxX="680"/>
+  <symbol minY="196" maxY="236" name="boundary_stone-l" minX="680" maxX="720"/>
+  <symbol minY="196" maxY="236" name="picnic-l" minX="720" maxX="760"/>
+  <symbol minY="196" maxY="236" name="bowls-l" minX="760" maxX="800"/>
+  <symbol minY="196" maxY="236" name="phone-l" minX="800" maxX="840"/>
+  <symbol minY="196" maxY="236" name="bus-l" minX="840" maxX="880"/>
+  <symbol minY="196" maxY="236" name="pharmacy-l" minX="880" maxX="920"/>
+  <symbol minY="196" maxY="236" name="archery-l" minX="920" maxX="960"/>
+  <symbol minY="196" maxY="236" name="butcher-l" minX="960" maxX="1000"/>
+  <symbol minY="236" maxY="276" name="sports-l" minX="0" maxX="40"/>
+  <symbol minY="236" maxY="276" name="cable-car-l" minX="40" maxX="80"/>
+  <symbol minY="236" maxY="276" name="peak-l" minX="80" maxX="120"/>
+  <symbol minY="236" maxY="276" name="subway-entrance-l" minX="120" maxX="160"/>
+  <symbol minY="236" maxY="276" name="cafe-l" minX="160" maxX="200"/>
+  <symbol minY="236" maxY="276" name="parking-meter-l" minX="200" maxX="240"/>
+  <symbol minY="236" maxY="276" name="atm-l" minX="240" maxX="280"/>
+  <symbol minY="236" maxY="276" name="campsite-l" minX="280" maxX="320"/>
+  <symbol minY="236" maxY="276" name="subway-l" minX="320" maxX="360"/>
+  <symbol minY="236" maxY="276" name="park-l" minX="360" maxX="400"/>
+  <symbol minY="236" maxY="276" name="car-repair-l" minX="400" maxX="440"/>
+  <symbol minY="236" maxY="276" name="optician-l" minX="440" maxX="480"/>
+  <symbol minY="236" maxY="276" name="office-l" minX="480" maxX="520"/>
+  <symbol minY="236" maxY="276" name="car_sharing-l" minX="520" maxX="560"/>
+  <symbol minY="236" maxY="276" name="nparkf-l" minX="560" maxX="600"/>
+  <symbol minY="236" maxY="276" name="caravan_site-l" minX="600" maxX="640"/>
+  <symbol minY="236" maxY="276" name="subway-newyork-l" minX="640" maxX="680"/>
+  <symbol minY="236" maxY="276" name="casino-l" minX="680" maxX="720"/>
+  <symbol minY="236" maxY="276" name="npark-l" minX="720" maxX="760"/>
+  <symbol minY="236" maxY="276" name="zoo-l" minX="760" maxX="800"/>
+  <symbol minY="236" maxY="276" name="cave-l" minX="800" maxX="840"/>
+  <symbol minY="236" maxY="276" name="subway-paris-l" minX="840" maxX="880"/>
+  <symbol minY="236" maxY="276" name="subway-spb-l" minX="880" maxX="920"/>
+  <symbol minY="236" maxY="276" name="cemetery-l" minX="920" maxX="960"/>
+  <symbol minY="236" maxY="276" name="sweets-l" minX="960" maxX="1000"/>
+  <symbol minY="276" maxY="316" name="windmill-l" minX="0" maxX="40"/>
+  <symbol minY="276" maxY="316" name="chemist-l" minX="40" maxX="80"/>
+  <symbol minY="276" maxY="316" name="museum-l" minX="80" maxX="120"/>
+  <symbol minY="276" maxY="316" name="cinema-l" minX="120" maxX="160"/>
+  <symbol minY="276" maxY="316" name="motel-l" minX="160" maxX="200"/>
+  <symbol minY="276" maxY="316" name="swimming-l" minX="200" maxX="240"/>
+  <symbol minY="276" maxY="316" name="clothes-l" minX="240" maxX="280"/>
+  <symbol minY="276" maxY="316" name="monument-l" minX="280" maxX="320"/>
+  <symbol minY="276" maxY="316" name="college-l" minX="320" maxX="360"/>
+  <symbol minY="276" maxY="316" name="mobile_phone-l" minX="360" maxX="400"/>
+  <symbol minY="276" maxY="316" name="wayside_shrine-l" minX="400" maxX="440"/>
+  <symbol minY="276" maxY="316" name="computer-l" minX="440" maxX="480"/>
+  <symbol minY="276" maxY="316" name="taxi-l" minX="480" maxX="520"/>
+  <symbol minY="276" maxY="316" name="convenience-l" minX="520" maxX="560"/>
+  <symbol minY="276" maxY="316" name="military-l" minX="560" maxX="600"/>
+  <symbol minY="276" maxY="316" name="cricket-l" minX="600" maxX="640"/>
+  <symbol minY="276" maxY="316" name="tennis-l" minX="640" maxX="680"/>
+  <symbol minY="276" maxY="316" name="curling-l" minX="680" maxX="720"/>
+  <symbol minY="276" maxY="316" name="marketplace-l" minX="720" maxX="760"/>
+  <symbol minY="276" maxY="316" name="dentist-l" minX="760" maxX="800"/>
+  <symbol minY="276" maxY="316" name="dentist-m" minX="800" maxX="840"/>
+  <symbol minY="276" maxY="316" name="mail-l" minX="840" maxX="880"/>
+  <symbol minY="276" maxY="316" name="department_store-l" minX="880" maxX="920"/>
+  <symbol minY="276" maxY="316" name="theatre-l" minX="920" maxX="960"/>
+  <symbol minY="276" maxY="316" name="diving-l" minX="960" maxX="1000"/>
+  <symbol minY="316" maxY="356" name="lightrail-berlin-l" minX="0" maxX="40"/>
+  <symbol minY="316" maxY="356" name="dog_park-l" minX="40" maxX="80"/>
+  <symbol minY="316" maxY="356" name="lighthouse-l" minX="80" maxX="120"/>
+  <symbol minY="316" maxY="356" name="doityourself-l" minX="120" maxX="160"/>
+  <symbol minY="316" maxY="356" name="lift_gate-l" minX="160" maxX="200"/>
+  <symbol minY="316" maxY="356" name="wayside_cross-l" minX="200" maxX="240"/>
+  <symbol minY="316" maxY="356" name="toilets-l" minX="240" maxX="280"/>
+  <symbol minY="316" maxY="356" name="waterfall-l" minX="280" maxX="320"/>
+  <symbol minY="316" maxY="356" name="drinking-water-l" minX="320" maxX="360"/>
+  <symbol minY="316" maxY="356" name="library-l" minX="360" maxX="400"/>
+  <symbol minY="316" maxY="356" name="laundry-l" minX="400" maxX="440"/>
+  <symbol minY="316" maxY="356" name="kiosk-l" minX="440" maxX="480"/>
+  <symbol minY="316" maxY="356" name="electronics-l" minX="480" maxX="520"/>
+  <symbol minY="316" maxY="356" name="kindergarten-m" minX="520" maxX="560"/>
+  <symbol minY="316" maxY="356" name="embassy-l" minX="560" maxX="600"/>
+  <symbol minY="316" maxY="356" name="kindergarten-l" minX="600" maxX="640"/>
+  <symbol minY="316" maxY="356" name="volcano-l" minX="640" maxX="680"/>
+  <symbol minY="316" maxY="356" name="jewelry-l" minX="680" maxX="720"/>
+  <symbol minY="316" maxY="356" name="vending-l" minX="720" maxX="760"/>
+  <symbol minY="316" maxY="356" name="equestrian-l" minX="760" maxX="800"/>
+  <symbol minY="316" maxY="356" name="equestrian-m" minX="800" maxX="840"/>
+  <symbol minY="316" maxY="356" name="fastfood-l" minX="840" maxX="880"/>
+  <symbol minY="316" maxY="356" name="toll_booth-l" minX="880" maxX="920"/>
+  <symbol minY="316" maxY="356" name="information-l" minX="920" maxX="960"/>
+  <symbol minY="316" maxY="356" name="fire_station-l" minX="960" maxX="1000"/>
+  <symbol minY="356" maxY="396" name="hunting-tower-l" minX="0" maxX="40"/>
+  <symbol minY="356" maxY="396" name="tram-l" minX="40" maxX="80"/>
+  <symbol minY="356" maxY="396" name="florist-l" minX="80" maxX="120"/>
+  <symbol minY="356" maxY="396" name="hotel-l" minX="120" maxX="160"/>
+  <symbol minY="356" maxY="396" name="fountain-l" minX="160" maxX="200"/>
+  <symbol minY="356" maxY="396" name="tomb-l" minX="200" maxX="240"/>
+  <symbol minY="356" maxY="396" name="hospital-l" minX="240" maxX="280"/>
+  <symbol minY="356" maxY="396" name="fuel-l copy" minX="280" maxX="320"/>
+  <symbol minY="356" maxY="396" name="fuel-l" minX="320" maxX="360"/>
+  <symbol minY="356" maxY="396" name="historic-ship-l" minX="360" maxX="400"/>
+  <symbol minY="356" maxY="396" name="train-l" minX="400" maxX="440"/>
+  <symbol minY="356" maxY="396" name="funicular-l" minX="440" maxX="480"/>
+  <symbol minY="356" maxY="396" name="heliport-l" minX="480" maxX="520"/>
+  <symbol minY="356" maxY="396" name="tourism-l" minX="520" maxX="560"/>
+  <symbol minY="356" maxY="396" name="furniture-l" minX="560" maxX="600"/>
+  <symbol minY="356" maxY="396" name="helipad-l" minX="600" maxX="640"/>
+  <symbol minY="356" maxY="396" name="gallery-l" minX="640" maxX="680"/>
+  <symbol minY="356" maxY="396" name="hardware-l" minX="680" maxX="720"/>
+  <symbol minY="356" maxY="396" name="toys-l" minX="720" maxX="760"/>
+  <symbol minY="356" maxY="396" name="garden-l" minX="760" maxX="800"/>
+  <symbol minY="356" maxY="396" name="hand-m" minX="800" maxX="840"/>
+  <symbol minY="356" maxY="396" name="hand-l" minX="840" maxX="880"/>
+  <symbol minY="356" maxY="396" name="garden_center-l" minX="880" maxX="920"/>
+  <symbol minY="356" maxY="396" name="hairdresser-l" minX="920" maxX="960"/>
+  <symbol minY="356" maxY="396" name="gate-l" minX="960" maxX="1000"/>
+  <symbol minY="396" maxY="436" name="grocery-l" minX="0" maxX="40"/>
+  <symbol minY="396" maxY="436" name="greengrocer-l" minX="40" maxX="80"/>
+  <symbol minY="396" maxY="436" name="townhall-l" minX="80" maxX="120"/>
+  <symbol minY="396" maxY="436" name="golf-l" minX="120" maxX="160"/>
+  <symbol minY="396" maxY="435" name="golf-m" minX="160" maxX="199"/>
+  <symbol minY="396" maxY="435" name="gift-m" minX="199" maxX="238"/>
+  <symbol minY="396" maxY="435" name="mobile_phone-m" minX="238" maxX="277"/>
+  <symbol minY="396" maxY="435" name="greengrocer-m" minX="277" maxX="316"/>
+  <symbol minY="396" maxY="435" name="gate-m" minX="316" maxX="355"/>
+  <symbol minY="396" maxY="435" name="grocery-m" minX="355" maxX="394"/>
+  <symbol minY="396" maxY="435" name="tourism-m" minX="394" maxX="433"/>
+  <symbol minY="396" maxY="435" name="garden_center-m" minX="433" maxX="472"/>
+  <symbol minY="396" maxY="435" name="hairdresser-m" minX="472" maxX="511"/>
+  <symbol minY="396" maxY="435" name="townhall-m" minX="511" maxX="550"/>
+  <symbol minY="396" maxY="435" name="garden-m" minX="550" maxX="589"/>
+  <symbol minY="396" maxY="435" name="gallery-m" minX="589" maxX="628"/>
+  <symbol minY="396" maxY="435" name="hardware-m" minX="628" maxX="667"/>
+  <symbol minY="396" maxY="435" name="furniture-m" minX="667" maxX="706"/>
+  <symbol minY="396" maxY="435" name="helipad-m" minX="706" maxX="745"/>
+  <symbol minY="396" maxY="435" name="toys-m" minX="745" maxX="784"/>
+  <symbol minY="396" maxY="435" name="funicular-m" minX="784" maxX="823"/>
+  <symbol minY="396" maxY="435" name="heliport-m" minX="823" maxX="862"/>
+  <symbol minY="396" maxY="435" name="tomb-m" minX="862" maxX="901"/>
+  <symbol minY="396" maxY="435" name="fuel-m" minX="901" maxX="940"/>
+  <symbol minY="396" maxY="435" name="historic-ship-m" minX="940" maxX="979"/>
+  <symbol minY="396" maxY="435" name="train-m" minX="979" maxX="1018"/>
+  <symbol minY="436" maxY="475" name="hospital-m" minX="0" maxX="39"/>
+  <symbol minY="436" maxY="475" name="fountain-m" minX="39" maxX="78"/>
+  <symbol minY="436" maxY="475" name="florist-m" minX="78" maxX="117"/>
+  <symbol minY="436" maxY="475" name="hotel-m" minX="117" maxX="156"/>
+  <symbol minY="436" maxY="475" name="toll_booth-m" minX="156" maxX="195"/>
+  <symbol minY="436" maxY="475" name="fire_station-m" minX="195" maxX="234"/>
+  <symbol minY="436" maxY="475" name="hunting-tower-m" minX="234" maxX="273"/>
+  <symbol minY="436" maxY="475" name="tram-m" minX="273" maxX="312"/>
+  <symbol minY="436" maxY="475" name="information-m" minX="312" maxX="351"/>
+  <symbol minY="436" maxY="475" name="fastfood-m" minX="351" maxX="390"/>
+  <symbol minY="436" maxY="475" name="vending-m" minX="390" maxX="429"/>
+  <symbol minY="436" maxY="475" name="jewelry-m" minX="429" maxX="468"/>
+  <symbol minY="436" maxY="475" name="embassy-m" minX="468" maxX="507"/>
+  <symbol minY="436" maxY="475" name="electronics-m" minX="507" maxX="546"/>
+  <symbol minY="436" maxY="475" name="toilets-m" minX="546" maxX="585"/>
+  <symbol minY="436" maxY="475" name="drugs" minX="585" maxX="624"/>
+  <symbol minY="436" maxY="475" name="kiosk-m" minX="624" maxX="663"/>
+  <symbol minY="436" maxY="475" name="volcano-m" minX="663" maxX="702"/>
+  <symbol minY="436" maxY="475" name="laundry-m" minX="702" maxX="741"/>
+  <symbol minY="436" maxY="475" name="drinking-water-m" minX="741" maxX="780"/>
+  <symbol minY="436" maxY="475" name="library-m" minX="780" maxX="819"/>
+  <symbol minY="436" maxY="475" name="waterfall-m" minX="819" maxX="858"/>
+  <symbol minY="436" maxY="475" name="doityourself-m" minX="858" maxX="897"/>
+  <symbol minY="436" maxY="475" name="lift_gate-m" minX="897" maxX="936"/>
+  <symbol minY="436" maxY="475" name="dog_park-m" minX="936" maxX="975"/>
+  <symbol minY="436" maxY="475" name="lighthouse-m" minX="975" maxX="1014"/>
+  <symbol minY="475" maxY="514" name="theatre-m" minX="0" maxX="39"/>
+  <symbol minY="475" maxY="514" name="diving-m" minX="39" maxX="78"/>
+  <symbol minY="475" maxY="514" name="ship-m" minX="78" maxX="117"/>
+  <symbol minY="475" maxY="514" name="department_store-m" minX="117" maxX="156"/>
+  <symbol minY="475" maxY="514" name="wayside_cross-m" minX="156" maxX="195"/>
+  <symbol minY="475" maxY="514" name="mail-m" minX="195" maxX="234"/>
+  <symbol minY="475" maxY="514" name="tennis-m" minX="234" maxX="273"/>
+  <symbol minY="475" maxY="514" name="curling-m" minX="273" maxX="312"/>
+  <symbol minY="475" maxY="514" name="marketplace-m" minX="312" maxX="351"/>
+  <symbol minY="475" maxY="514" name="cricket-m" minX="351" maxX="390"/>
+  <symbol minY="475" maxY="514" name="taxi-m" minX="390" maxX="429"/>
+  <symbol minY="475" maxY="514" name="convenience-m" minX="429" maxX="468"/>
+  <symbol minY="475" maxY="514" name="military-m" minX="468" maxX="507"/>
+  <symbol minY="475" maxY="514" name="computer-m" minX="507" maxX="546"/>
+  <symbol minY="475" maxY="514" name="college-m" minX="546" maxX="585"/>
+  <symbol minY="475" maxY="514" name="swimming-m" minX="585" maxX="624"/>
+  <symbol minY="475" maxY="514" name="clothes-m" minX="624" maxX="663"/>
+  <symbol minY="475" maxY="514" name="monument-m" minX="663" maxX="702"/>
+  <symbol minY="475" maxY="514" name="wayside_shrine-m" minX="702" maxX="741"/>
+  <symbol minY="475" maxY="514" name="cinema-m" minX="741" maxX="780"/>
+  <symbol minY="475" maxY="514" name="motel-m" minX="780" maxX="819"/>
+  <symbol minY="475" maxY="514" name="chemist-m" minX="819" maxX="858"/>
+  <symbol minY="475" maxY="514" name="museum-m" minX="858" maxX="897"/>
+  <symbol minY="475" maxY="514" name="sweets-m" minX="897" maxX="936"/>
+  <symbol minY="475" maxY="514" name="cemetery-m" minX="936" maxX="975"/>
+  <symbol minY="475" maxY="514" name="subway-spb-m" minX="975" maxX="1014"/>
+  <symbol minY="514" maxY="553" name="windmill-m" minX="0" maxX="39"/>
+  <symbol minY="514" maxY="553" name="australian-football-m" minX="39" maxX="78"/>
+  <symbol minY="514" maxY="553" name="cave-m" minX="78" maxX="117"/>
+  <symbol minY="514" maxY="553" name="subway-newyork-m" minX="117" maxX="156"/>
+  <symbol minY="514" maxY="553" name="casino-m" minX="156" maxX="195"/>
+  <symbol minY="514" maxY="553" name="npark-m" minX="195" maxX="234"/>
+  <symbol minY="514" maxY="553" name="caravan_site-m" minX="234" maxX="273"/>
+  <symbol minY="514" maxY="553" name="car_sharing-m" minX="273" maxX="312"/>
+  <symbol minY="514" maxY="553" name="nparkf-m" minX="312" maxX="351"/>
+  <symbol minY="514" maxY="553" name="bakery-m" minX="351" maxX="390"/>
+  <symbol minY="514" maxY="553" name="zoo-m" minX="390" maxX="429"/>
+  <symbol minY="514" maxY="553" name="office-m" minX="429" maxX="468"/>
+  <symbol minY="514" maxY="553" name="subway-m" minX="468" maxX="507"/>
+  <symbol minY="514" maxY="553" name="car-repair-m" minX="507" maxX="546"/>
+  <symbol minY="514" maxY="553" name="optician-m" minX="546" maxX="585"/>
+  <symbol minY="514" maxY="553" name="atm-m" minX="585" maxX="624"/>
+  <symbol minY="514" maxY="553" name="park-m" minX="624" maxX="663"/>
+  <symbol minY="514" maxY="553" name="campsite-m" minX="663" maxX="702"/>
+  <symbol minY="514" maxY="553" name="school-m" minX="702" maxX="741"/>
+  <symbol minY="514" maxY="553" name="subway-entrance-m" minX="741" maxX="780"/>
+  <symbol minY="514" maxY="553" name="cafe-m" minX="780" maxX="819"/>
+  <symbol minY="514" maxY="553" name="parking-meter-m" minX="819" maxX="858"/>
+  <symbol minY="514" maxY="553" name="archery-m" minX="858" maxX="897"/>
+  <symbol minY="514" maxY="553" name="cable-car-m" minX="897" maxX="936"/>
+  <symbol minY="514" maxY="553" name="peak-m" minX="936" maxX="975"/>
+  <symbol minY="514" maxY="553" name="subway-entrance-2-m" minX="975" maxX="1014"/>
+  <symbol minY="553" maxY="592" name="bank-2-m" minX="0" maxX="39"/>
+  <symbol minY="553" maxY="592" name="sports-m" minX="39" maxX="78"/>
+  <symbol minY="553" maxY="592" name="butcher-m" minX="78" maxX="117"/>
+  <symbol minY="553" maxY="592" name="bus-m" minX="117" maxX="156"/>
+  <symbol minY="553" maxY="592" name="pharmacy-m" minX="156" maxX="195"/>
+  <symbol minY="553" maxY="592" name="shoes-m" minX="195" maxX="234"/>
+  <symbol minY="553" maxY="592" name="bowls-m" minX="234" maxX="273"/>
+  <symbol minY="553" maxY="592" name="phone-m" minX="273" maxX="312"/>
+  <symbol minY="553" maxY="592" name="soccer-m" minX="312" maxX="351"/>
+  <symbol minY="553" maxY="592" name="boundary_stone-m" minX="351" maxX="390"/>
+  <symbol minY="553" maxY="592" name="picnic-m" minX="390" maxX="429"/>
+  <symbol minY="553" maxY="592" name="america-football-m" minX="429" maxX="468"/>
+  <symbol minY="553" maxY="592" name="book-shop-m" minX="468" maxX="507"/>
+  <symbol minY="553" maxY="592" name="pitch-m" minX="507" maxX="546"/>
+  <symbol minY="553" maxY="592" name="skiing-m" minX="546" maxX="585"/>
+  <symbol minY="553" maxY="592" name="bicycle-m" minX="585" maxX="624"/>
+  <symbol minY="553" maxY="592" name="place-of-worship-m" minX="624" maxX="663"/>
+  <symbol minY="553" maxY="592" name="alpine_hut-m" minX="663" maxX="702"/>
+  <symbol minY="553" maxY="592" name="beer-m" minX="702" maxX="741"/>
+  <symbol minY="553" maxY="592" name="police-m" minX="741" maxX="780"/>
+  <symbol minY="553" maxY="592" name="shop-m" minX="780" maxX="819"/>
+  <symbol minY="553" maxY="592" name="beauty-m" minX="819" maxX="858"/>
+  <symbol minY="553" maxY="592" name="postbox-m" minX="858" maxX="897"/>
+  <symbol minY="553" maxY="592" name="beach-m" minX="897" maxX="936"/>
+  <symbol minY="553" maxY="592" name="banknote-m" minX="936" maxX="975"/>
+  <symbol minY="553" maxY="592" name="bcontrol-m" minX="975" maxX="1014"/>
+  <symbol minY="592" maxY="631" name="pub-m" minX="0" maxX="39"/>
+  <symbol minY="592" maxY="631" name="shop-m copy" minX="39" maxX="78"/>
+  <symbol minY="592" maxY="631" name="bbq-m" minX="78" maxX="117"/>
+  <symbol minY="592" maxY="631" name="alcohol-m" minX="117" maxX="156"/>
+  <symbol minY="592" maxY="631" name="recycling-m" minX="156" maxX="195"/>
+  <symbol minY="592" maxY="631" name="basketball-m" minX="195" maxX="234"/>
+  <symbol minY="592" maxY="631" name="baseball-m" minX="234" maxX="273"/>
+  <symbol minY="592" maxY="631" name="remains-m" minX="273" maxX="312"/>
+  <symbol minY="592" maxY="631" name="shop-bicycle-m" minX="312" maxX="351"/>
+  <symbol minY="592" maxY="631" name="bar-m" minX="351" maxX="390"/>
+  <symbol minY="592" maxY="631" name="restaurant-m" minX="390" maxX="429"/>
+  <symbol minY="592" maxY="628" name="parking-l" minX="429" maxX="465"/>
+  <symbol minY="592" maxY="628" name="speedcam-l" minX="465" maxX="501"/>
+  <symbol minY="592" maxY="628" name="subway-berlin-l" minX="501" maxX="537"/>
+  <symbol minY="592" maxY="628" name="lightrail-berlin-m" minX="537" maxX="573"/>
+  <symbol minY="592" maxY="628" name="subway-moscow-l" minX="573" maxX="613"/>
+  <symbol minY="592" maxY="628" name="subway-rome-l" minX="613" maxX="649"/>
+  <symbol minY="592" maxY="626" name="route_from" minX="649" maxX="683"/>
+  <symbol minY="592" maxY="625" name="no-icon-amenity" minX="683" maxX="716"/>
+  <symbol minY="592" maxY="625" name="no-icon-tourism" minX="716" maxX="749"/>
+  <symbol minY="592" maxY="625" name="subway-moscow-m" minX="749" maxX="786"/>
+  <symbol minY="592" maxY="625" name="no-icon-leisure" minX="786" maxX="819"/>
+  <symbol minY="592" maxY="625" name="no-icon-shop" minX="819" maxX="852"/>
+  <symbol minY="592" maxY="625" name="subway-rome-m" minX="852" maxX="885"/>
+  <symbol minY="592" maxY="625" name="subway-berlin-m" minX="885" maxX="918"/>
+  <symbol minY="592" maxY="625" name="subway-paris-m" minX="918" maxX="951"/>
+  <symbol minY="592" maxY="625" name="no-icon" minX="951" maxX="984"/>
+  <symbol minY="592" maxY="624" name="current-position" minX="984" maxX="1016"/>
+  <symbol minY="631" maxY="663" name="subway-london-l" minX="0" maxX="40"/>
+  <symbol minY="631" maxY="662" name="airport-s" minX="40" maxX="71"/>
+  <symbol minY="631" maxY="661" name="pitch-s" minX="71" maxX="101"/>
+  <symbol minY="631" maxY="661" name="skiing-s" minX="101" maxX="131"/>
+  <symbol minY="631" maxY="661" name="picnic-s" minX="131" maxX="161"/>
+  <symbol minY="631" maxY="661" name="phone-s" minX="161" maxX="191"/>
+  <symbol minY="631" maxY="661" name="soccer-s" minX="191" maxX="221"/>
+  <symbol minY="631" maxY="661" name="pharmacy-s" minX="221" maxX="251"/>
+  <symbol minY="631" maxY="661" name="speedcam-m" minX="251" maxX="281"/>
+  <symbol minY="631" maxY="661" name="atm-s" minX="281" maxX="311"/>
+  <symbol minY="631" maxY="661" name="bar-s" minX="311" maxX="341"/>
+  <symbol minY="631" maxY="661" name="school-s" minX="341" maxX="371"/>
+  <symbol minY="631" maxY="661" name="baseball-s" minX="371" maxX="401"/>
+  <symbol minY="631" maxY="661" name="basketball-s" minX="401" maxX="431"/>
+  <symbol minY="631" maxY="661" name="bcontrol-s" minX="431" maxX="461"/>
+  <symbol minY="631" maxY="661" name="alcohol-s" minX="461" maxX="491"/>
+  <symbol minY="631" maxY="661" name="beer-s" minX="491" maxX="521"/>
+  <symbol minY="631" maxY="661" name="subway-barcelona-s" minX="521" maxX="557"/>
+  <symbol minY="631" maxY="661" name="bicycle-s" minX="557" maxX="587"/>
+  <symbol minY="631" maxY="661" name="place-of-worship-s" minX="587" maxX="617"/>
+  <symbol minY="631" maxY="661" name="book-shop-s" minX="617" maxX="647"/>
+  <symbol minY="631" maxY="661" name="peak-s" minX="647" maxX="677"/>
+  <symbol minY="631" maxY="661" name="subway-entrance-2-s" minX="677" maxX="707"/>
+  <symbol minY="631" maxY="661" name="subway-entrance-arrow" minX="707" maxX="737"/>
+  <symbol minY="631" maxY="661" name="america-football-s" minX="737" maxX="767"/>
+  <symbol minY="631" maxY="661" name="bus-s" minX="767" maxX="797"/>
+  <symbol minY="631" maxY="661" name="subway-entrance-s" minX="797" maxX="827"/>
+  <symbol minY="631" maxY="661" name="cable-car-s" minX="827" maxX="857"/>
+  <symbol minY="631" maxY="661" name="cafe-s" minX="857" maxX="887"/>
+  <symbol minY="631" maxY="661" name="campsite-s" minX="887" maxX="917"/>
+  <symbol minY="631" maxY="661" name="park-s" minX="917" maxX="947"/>
+  <symbol minY="631" maxY="661" name="shop-s" minX="947" maxX="977"/>
+  <symbol minY="631" maxY="661" name="subway-london-m" minX="977" maxX="1016"/>
+  <symbol minY="663" maxY="693" name="zoo-s" minX="0" maxX="30"/>
+  <symbol minY="663" maxY="693" name="office-s" minX="30" maxX="60"/>
+  <symbol minY="663" maxY="693" name="car-repair-s" minX="60" maxX="90"/>
+  <symbol minY="663" maxY="693" name="casino-s" minX="90" maxX="120"/>
+  <symbol minY="663" maxY="693" name="windmill-s" minX="120" maxX="150"/>
+  <symbol minY="663" maxY="693" name="cave-s" minX="150" maxX="180"/>
+  <symbol minY="663" maxY="693" name="cemetery-s" minX="180" maxX="210"/>
+  <symbol minY="663" maxY="693" name="cinema-s" minX="210" maxX="240"/>
+  <symbol minY="663" maxY="693" name="nparkf-s" minX="240" maxX="270"/>
+  <symbol minY="663" maxY="693" name="shop-s copy" minX="270" maxX="300"/>
+  <symbol minY="663" maxY="693" name="college-s" minX="300" maxX="330"/>
+  <symbol minY="663" maxY="693" name="npark-s" minX="330" maxX="360"/>
+  <symbol minY="663" maxY="693" name="dentist-s" minX="360" maxX="390"/>
+  <symbol minY="663" maxY="693" name="subway-newyork-s" minX="390" maxX="420"/>
+  <symbol minY="663" maxY="693" name="waterfall-s" minX="420" maxX="450"/>
+  <symbol minY="663" maxY="693" name="police-s" minX="450" maxX="480"/>
+  <symbol minY="663" maxY="693" name="pub-s" minX="480" maxX="510"/>
+  <symbol minY="663" maxY="693" name="volcano-s" minX="510" maxX="540"/>
+  <symbol minY="663" maxY="693" name="drinking-water-s" minX="540" maxX="570"/>
+  <symbol minY="663" maxY="693" name="recycling-s" minX="570" maxX="600"/>
+  <symbol minY="663" maxY="693" name="embassy-s" minX="600" maxX="630"/>
+  <symbol minY="663" maxY="693" name="subway-s" minX="630" maxX="660"/>
+  <symbol minY="663" maxY="693" name="remains-s" minX="660" maxX="690"/>
+  <symbol minY="663" maxY="693" name="restaurant-s" minX="690" maxX="720"/>
+  <symbol minY="663" maxY="693" name="subway-spb-s" minX="720" maxX="750"/>
+  <symbol minY="663" maxY="693" name="tram-s" minX="750" maxX="780"/>
+  <symbol minY="663" maxY="693" name="fastfood-s" minX="780" maxX="810"/>
+  <symbol minY="663" maxY="693" name="fire_station-s" minX="810" maxX="840"/>
+  <symbol minY="663" maxY="693" name="train-s" minX="840" maxX="870"/>
+  <symbol minY="663" maxY="693" name="fountain-s" minX="870" maxX="900"/>
+  <symbol minY="663" maxY="693" name="ship-s" minX="900" maxX="930"/>
+  <symbol minY="663" maxY="693" name="museum-s" minX="930" maxX="960"/>
+  <symbol minY="663" maxY="693" name="monument-s" minX="960" maxX="990"/>
+  <symbol minY="663" maxY="693" name="atm-s copy 2" minX="990" maxX="1020"/>
+  <symbol minY="693" maxY="723" name="swimming-s" minX="0" maxX="30"/>
+  <symbol minY="693" maxY="723" name="military-s" minX="30" maxX="60"/>
+  <symbol minY="693" maxY="723" name="fuel-s" minX="60" maxX="90"/>
+  <symbol minY="693" maxY="723" name="funicular-s" minX="90" maxX="120"/>
+  <symbol minY="693" maxY="723" name="mail-s" minX="120" maxX="150"/>
+  <symbol minY="693" maxY="723" name="tennis-s" minX="150" maxX="180"/>
+  <symbol minY="693" maxY="723" name="gallery-s" minX="180" maxX="210"/>
+  <symbol minY="693" maxY="723" name="lighthouse-s" minX="210" maxX="240"/>
+  <symbol minY="693" maxY="723" name="theatre-s" minX="240" maxX="270"/>
+  <symbol minY="693" maxY="723" name="library-s" minX="270" maxX="300"/>
+  <symbol minY="693" maxY="723" name="kindergarten-s" minX="300" maxX="330"/>
+  <symbol minY="693" maxY="723" name="toilets-s" minX="330" maxX="360"/>
+  <symbol minY="693" maxY="723" name="information-s" minX="360" maxX="390"/>
+  <symbol minY="693" maxY="723" name="hotel-s" minX="390" maxX="420"/>
+  <symbol minY="693" maxY="723" name="hospital-s" minX="420" maxX="450"/>
+  <symbol minY="693" maxY="723" name="heliport-s" minX="450" maxX="480"/>
+  <symbol minY="693" maxY="723" name="helipad-s" minX="480" maxX="510"/>
+  <symbol minY="693" maxY="723" name="grocery-s" minX="510" maxX="540"/>
+  <symbol minY="693" maxY="723" name="tourism-s" minX="540" maxX="570"/>
+  <symbol minY="693" maxY="723" name="golf-s" minX="570" maxX="600"/>
+  <symbol minY="693" maxY="723" name="garden-s" minX="600" maxX="630"/>
+  <symbol minY="693" maxY="723" name="townhall-s" minX="630" maxX="660"/>
+  <symbol minY="693" maxY="722" name="subway-barcelona-l" minX="660" maxX="700"/>
+  <symbol minY="693" maxY="722" name="metro-barcelona-m" minX="700" maxX="740"/>
+  <symbol minY="693" maxY="722" name="subway-barcelona-m" minX="740" maxX="780"/>
+  <symbol minY="693" maxY="722" name="subway-madrid-m" minX="780" maxX="820"/>
+  <symbol minY="693" maxY="722" name="subway-madrid-l" minX="820" maxX="860"/>
+  <symbol minY="693" maxY="721" name="s-arrow" minX="860" maxX="887"/>
+  <symbol minY="693" maxY="721" name="parking-m" minX="887" maxX="915"/>
+  <symbol minY="693" maxY="720" name="subway-madrid-s" minX="915" maxX="951"/>
+  <symbol minY="693" maxY="720" name="lightrail-berlin-s" minX="951" maxX="978"/>
+  <symbol minY="693" maxY="720" name="metro-barcelona-s" minX="978" maxX="1014"/>
+  <symbol minY="723" maxY="750" name="subway-kiev-l" minX="0" maxX="39"/>
+  <symbol minY="723" maxY="750" name="subway-kiev-m" minX="39" maxX="78"/>
+  <symbol minY="723" maxY="750" name="subway-paris-s" minX="78" maxX="105"/>
+  <symbol minY="723" maxY="748" name="subway-moscow-s" minX="105" maxX="130"/>
+  <symbol minY="723" maxY="748" name="api-result" minX="130" maxX="155"/>
+  <symbol minY="723" maxY="747" name="speedcam-s" minX="155" maxX="179"/>
+  <symbol minY="723" maxY="747" name="bench" minX="179" maxX="206"/>
+  <symbol minY="723" maxY="747" name="search-result" minX="206" maxX="230"/>
+  <symbol minY="723" maxY="747" name="subway-berlin-s" minX="230" maxX="254"/>
+  <symbol minY="723" maxY="747" name="parking-s" minX="254" maxX="278"/>
+  <symbol minY="723" maxY="747" name="subway-london-s" minX="278" maxX="308"/>
+  <symbol minY="723" maxY="747" name="subway-rome-s" minX="308" maxX="332"/>
+  <symbol minY="723" maxY="747" name="star-l" minX="332" maxX="356"/>
+  <symbol minY="723" maxY="745" name="star-m" minX="356" maxX="378"/>
+  <symbol minY="723" maxY="745" name="subway-minsk-l" minX="378" maxX="417"/>
+  <symbol minY="723" maxY="745" name="peakt-l" minX="417" maxX="441"/>
+  <symbol minY="723" maxY="745" name="survey_point-l" minX="441" maxX="463"/>
+  <symbol minY="723" maxY="744" name="subway-kiev-s" minX="463" maxX="496"/>
+  <symbol minY="723" maxY="742" name="subway-xs" minX="496" maxX="515"/>
+  <symbol minY="723" maxY="742" name="survey_point-m" minX="515" maxX="534"/>
+  <symbol minY="723" maxY="742" name="subway-newyork-xs" minX="534" maxX="553"/>
+  <symbol minY="723" maxY="742" name="railway-crossing" minX="553" maxX="583"/>
+  <symbol minY="723" maxY="742" name="subway-minsk-m" minX="583" maxX="616"/>
+  <symbol minY="723" maxY="742" name="star-s" minX="616" maxX="635"/>
+  <symbol minY="723" maxY="741" name="subway-minsk-s" minX="635" maxX="665"/>
+  <symbol minY="723" maxY="741" name="subway-xs copy" minX="665" maxX="683"/>
+  <symbol minY="723" maxY="739" name="peakt-m" minX="683" maxX="701"/>
+  <symbol minY="723" maxY="739" name="survey_point-s" minX="701" maxX="717"/>
+  <symbol minY="723" maxY="739" name="arrow-m" minX="717" maxX="753"/>
+  <symbol minY="723" maxY="738" name="entrance-s" minX="753" maxX="768"/>
+  <symbol minY="723" maxY="736" name="peakt-s" minX="768" maxX="783"/>
+  <symbol minY="723" maxY="736" name="dot-m" minX="783" maxX="796"/>
+  <symbol minY="723" maxY="735" name="tree-l" minX="796" maxX="808"/>
+  <symbol minY="723" maxY="735" name="arrow-s" minX="808" maxX="835"/>
+  <symbol minY="723" maxY="735" name="none" minX="835" maxX="847"/>
+  <symbol minY="723" maxY="733" name="dot-s" minX="847" maxX="857"/>
+  <symbol minY="723" maxY="733" name="tree-m" minX="857" maxX="867"/>
+  <symbol minY="723" maxY="733" name="entrance-xs" minX="867" maxX="877"/>
+  <symbol minY="723" maxY="733" name="dot-s-light" minX="877" maxX="887"/>
+  <symbol minY="723" maxY="732" name="tree-s" minX="887" maxX="896"/>
+  <symbol minY="723" maxY="732" name="zero-icon" minX="896" maxX="905"/>
  </file>
 </root>
diff --git a/data/resources-xxhdpi_clear/symbols.png b/data/resources-xxhdpi_clear/symbols.png
index 8d5a5141ed..a5c3769a4c 100644
Binary files a/data/resources-xxhdpi_clear/symbols.png and b/data/resources-xxhdpi_clear/symbols.png differ
diff --git a/data/resources-xxhdpi_clear/symbols.sdf b/data/resources-xxhdpi_clear/symbols.sdf
index 08fdef8b59..32db798fe1 100644
--- a/data/resources-xxhdpi_clear/symbols.sdf
+++ b/data/resources-xxhdpi_clear/symbols.sdf
@@ -1,466 +1,469 @@
 <!DOCTYPE skin>
 <root>
  <file height="1024" width="2048">
-  <symbol name="route_to" minX="0" maxX="205" minY="0" maxY="205"/>
-  <symbol name="route-arrow" minX="205" maxX="609" minY="0" maxY="196"/>
-  <symbol name="compass-image" minX="609" maxX="781" minY="0" maxY="172"/>
-  <symbol name="watch-search-result" minX="781" maxX="893" minY="0" maxY="154"/>
-  <symbol name="watch-my-direction" minX="893" maxX="1017" minY="0" maxY="136"/>
-  <symbol name="current-position-compas" minX="1017" maxX="1102" minY="0" maxY="109"/>
-  <symbol name="current-routing-compas" minX="1102" maxX="1187" minY="0" maxY="109"/>
-  <symbol name="watch-my-position" minX="1187" maxX="1287" minY="0" maxY="100"/>
-  <symbol name="search-result-active" minX="1287" maxX="1384" minY="0" maxY="97"/>
-  <symbol name="placemark-pink" minX="1384" maxX="1427" minY="0" maxY="85"/>
-  <symbol name="placemark-orange" minX="1427" maxX="1470" minY="0" maxY="85"/>
-  <symbol name="placemark-green" minX="1470" maxX="1513" minY="0" maxY="85"/>
-  <symbol name="placemark-brown" minX="1513" maxX="1556" minY="0" maxY="85"/>
-  <symbol name="placemark-blue" minX="1556" maxX="1599" minY="0" maxY="85"/>
-  <symbol name="placemark-red" minX="1599" maxX="1642" minY="0" maxY="85"/>
-  <symbol name="placemark-yellow" minX="1642" maxX="1685" minY="0" maxY="85"/>
-  <symbol name="placemark-purple" minX="1685" maxX="1728" minY="0" maxY="85"/>
-  <symbol name="airport-l" minX="1728" maxX="1786" minY="0" maxY="58"/>
-  <symbol name="australian-football-l" minX="1786" maxX="1844" minY="0" maxY="58"/>
-  <symbol name="airport-m" minX="1844" maxX="1902" minY="0" maxY="58"/>
-  <symbol name="bakery-l" minX="1902" maxX="1960" minY="0" maxY="58"/>
-  <symbol name="alcohol-l" minX="1960" maxX="2018" minY="0" maxY="58"/>
-  <symbol name="bank-l" minX="0" maxX="57" minY="205" maxY="263"/>
-  <symbol name="bank-m" minX="57" maxX="113" minY="205" maxY="263"/>
-  <symbol name="banknote-l" minX="113" maxX="170" minY="205" maxY="263"/>
-  <symbol name="alpine_hut-l" minX="170" maxX="228" minY="205" maxY="263"/>
-  <symbol name="bar-l" minX="228" maxX="286" minY="205" maxY="263"/>
-  <symbol name="america-football-l" minX="286" maxX="344" minY="205" maxY="263"/>
-  <symbol name="archery-l" minX="344" maxX="402" minY="205" maxY="263"/>
-  <symbol name="baseball-l" minX="402" maxX="460" minY="205" maxY="263"/>
-  <symbol name="atm-l" minX="460" maxX="518" minY="205" maxY="263"/>
-  <symbol name="zoo-l" minX="518" maxX="576" minY="205" maxY="263"/>
-  <symbol name="basketball-l" minX="576" maxX="634" minY="205" maxY="263"/>
-  <symbol name="windmill-l" minX="634" maxX="692" minY="205" maxY="263"/>
-  <symbol name="wayside_shrine-l" minX="692" maxX="750" minY="205" maxY="263"/>
-  <symbol name="bbq-l" minX="750" maxX="808" minY="205" maxY="263"/>
-  <symbol name="wayside_cross-l" minX="808" maxX="866" minY="205" maxY="263"/>
-  <symbol name="bcontrol-l" minX="866" maxX="923" minY="205" maxY="263"/>
-  <symbol name="bcontrol-m" minX="923" maxX="979" minY="205" maxY="263"/>
-  <symbol name="waterfall-m" minX="979" maxX="1035" minY="205" maxY="263"/>
-  <symbol name="beach-l" minX="1035" maxX="1093" minY="205" maxY="263"/>
-  <symbol name="waterfall-l" minX="1093" maxX="1150" minY="205" maxY="263"/>
-  <symbol name="beauty-l" minX="1150" maxX="1208" minY="205" maxY="263"/>
-  <symbol name="volcano-l" minX="1208" maxX="1266" minY="205" maxY="263"/>
-  <symbol name="beer-l" minX="1266" maxX="1323" minY="205" maxY="263"/>
-  <symbol name="beer-m" minX="1323" maxX="1379" minY="205" maxY="263"/>
-  <symbol name="vending-l" minX="1379" maxX="1437" minY="205" maxY="263"/>
-  <symbol name="tram-l" minX="1437" maxX="1495" minY="205" maxY="263"/>
-  <symbol name="bicycle-l" minX="1495" maxX="1553" minY="205" maxY="263"/>
-  <symbol name="train-l" minX="1553" maxX="1611" minY="205" maxY="263"/>
-  <symbol name="toys-l" minX="1611" maxX="1669" minY="205" maxY="263"/>
-  <symbol name="book-shop-l" minX="1669" maxX="1727" minY="205" maxY="263"/>
-  <symbol name="townhall-l" minX="1727" maxX="1785" minY="205" maxY="263"/>
-  <symbol name="tourism-l" minX="1785" maxX="1843" minY="205" maxY="263"/>
-  <symbol name="boundary_stone-l" minX="1843" maxX="1901" minY="205" maxY="263"/>
-  <symbol name="tomb-l" minX="1901" maxX="1959" minY="205" maxY="263"/>
-  <symbol name="bowls-l" minX="1959" maxX="2017" minY="205" maxY="263"/>
-  <symbol name="toll_booth-l" minX="0" maxX="58" minY="263" maxY="321"/>
-  <symbol name="bus-l" minX="58" maxX="116" minY="263" maxY="321"/>
-  <symbol name="toilets-l" minX="116" maxX="174" minY="263" maxY="321"/>
-  <symbol name="theatre-l" minX="174" maxX="232" minY="263" maxY="321"/>
-  <symbol name="butcher-l" minX="232" maxX="290" minY="263" maxY="321"/>
-  <symbol name="tennis-l" minX="290" maxX="348" minY="263" maxY="321"/>
-  <symbol name="cable-car-l" minX="348" maxX="406" minY="263" maxY="321"/>
-  <symbol name="taxi-l" minX="406" maxX="464" minY="263" maxY="321"/>
-  <symbol name="swimming-l" minX="464" maxX="522" minY="263" maxY="321"/>
-  <symbol name="cafe-l" minX="522" maxX="580" minY="263" maxY="321"/>
-  <symbol name="sweets-l" minX="580" maxX="638" minY="263" maxY="321"/>
-  <symbol name="subway-spb-l" minX="638" maxX="696" minY="263" maxY="321"/>
-  <symbol name="campsite-l" minX="696" maxX="754" minY="263" maxY="321"/>
-  <symbol name="subway-paris-l" minX="754" maxX="812" minY="263" maxY="321"/>
-  <symbol name="subway-newyork-l" minX="812" maxX="870" minY="263" maxY="321"/>
-  <symbol name="car-repair-l" minX="870" maxX="927" minY="263" maxY="321"/>
-  <symbol name="car-repair-m" minX="927" maxX="983" minY="263" maxY="321"/>
-  <symbol name="subway-l" minX="983" maxX="1041" minY="263" maxY="321"/>
-  <symbol name="car_sharing-l" minX="1041" maxX="1099" minY="263" maxY="321"/>
-  <symbol name="subway-entrance-l" minX="1099" maxX="1157" minY="263" maxY="321"/>
-  <symbol name="caravan_site-l" minX="1157" maxX="1215" minY="263" maxY="321"/>
-  <symbol name="sports-l" minX="1215" maxX="1273" minY="263" maxY="321"/>
-  <symbol name="casino-l" minX="1273" maxX="1331" minY="263" maxY="321"/>
-  <symbol name="soccer-l" minX="1331" maxX="1389" minY="263" maxY="321"/>
-  <symbol name="skiing-l" minX="1389" maxX="1447" minY="263" maxY="321"/>
-  <symbol name="cave-l" minX="1447" maxX="1505" minY="263" maxY="321"/>
-  <symbol name="shop-l" minX="1505" maxX="1563" minY="263" maxY="321"/>
-  <symbol name="shop-bicycle-l" minX="1563" maxX="1621" minY="263" maxY="321"/>
-  <symbol name="cemetery-l" minX="1621" maxX="1679" minY="263" maxY="321"/>
-  <symbol name="shoes-l" minX="1679" maxX="1737" minY="263" maxY="321"/>
-  <symbol name="ship-l" minX="1737" maxX="1795" minY="263" maxY="321"/>
-  <symbol name="chemist-l" minX="1795" maxX="1853" minY="263" maxY="321"/>
-  <symbol name="school-l" minX="1853" maxX="1911" minY="263" maxY="321"/>
-  <symbol name="cinema-l" minX="1911" maxX="1969" minY="263" maxY="321"/>
-  <symbol name="restaurant-l" minX="1969" maxX="2027" minY="263" maxY="321"/>
-  <symbol name="remains-m" minX="0" maxX="56" minY="321" maxY="379"/>
-  <symbol name="clothes-l" minX="56" maxX="114" minY="321" maxY="379"/>
-  <symbol name="remains-l" minX="114" maxX="171" minY="321" maxY="379"/>
-  <symbol name="college-l" minX="171" maxX="229" minY="321" maxY="379"/>
-  <symbol name="recycling-l" minX="229" maxX="287" minY="321" maxY="379"/>
-  <symbol name="pub-l" minX="287" maxX="345" minY="321" maxY="379"/>
-  <symbol name="computer-l" minX="345" maxX="403" minY="321" maxY="379"/>
-  <symbol name="power-m" minX="403" maxX="461" minY="321" maxY="379"/>
-  <symbol name="convenience-l" minX="461" maxX="519" minY="321" maxY="379"/>
-  <symbol name="power-l" minX="519" maxX="577" minY="321" maxY="379"/>
-  <symbol name="cricket-l" minX="577" maxX="635" minY="321" maxY="379"/>
-  <symbol name="postbox-l" minX="635" maxX="693" minY="321" maxY="379"/>
-  <symbol name="police-l" minX="693" maxX="751" minY="321" maxY="379"/>
-  <symbol name="place-of-worship-l" minX="751" maxX="809" minY="321" maxY="379"/>
-  <symbol name="pitch-l" minX="809" maxX="867" minY="321" maxY="379"/>
-  <symbol name="curling-l" minX="867" maxX="925" minY="321" maxY="379"/>
-  <symbol name="picnic-m" minX="925" maxX="981" minY="321" maxY="379"/>
-  <symbol name="department_store-l" minX="981" maxX="1039" minY="321" maxY="379"/>
-  <symbol name="picnic-l" minX="1039" maxX="1096" minY="321" maxY="379"/>
-  <symbol name="diving-l" minX="1096" maxX="1154" minY="321" maxY="379"/>
-  <symbol name="phone-l" minX="1154" maxX="1212" minY="321" maxY="379"/>
-  <symbol name="dog_park-l" minX="1212" maxX="1270" minY="321" maxY="379"/>
-  <symbol name="pharmacy-l" minX="1270" maxX="1328" minY="321" maxY="379"/>
-  <symbol name="doityourself-l" minX="1328" maxX="1386" minY="321" maxY="379"/>
-  <symbol name="parking-meter-l" minX="1386" maxX="1444" minY="321" maxY="379"/>
-  <symbol name="park-l" minX="1444" maxX="1502" minY="321" maxY="379"/>
-  <symbol name="optician-l" minX="1502" maxX="1560" minY="321" maxY="379"/>
-  <symbol name="office-m" minX="1560" maxX="1616" minY="321" maxY="379"/>
-  <symbol name="drinking-water-l" minX="1616" maxX="1674" minY="321" maxY="379"/>
-  <symbol name="office-l" minX="1674" maxX="1731" minY="321" maxY="379"/>
-  <symbol name="nparkf-l" minX="1731" maxX="1789" minY="321" maxY="379"/>
-  <symbol name="npark-l" minX="1789" maxX="1847" minY="321" maxY="379"/>
-  <symbol name="electronics-l" minX="1847" maxX="1905" minY="321" maxY="379"/>
-  <symbol name="mobile_phone-l" minX="1905" maxX="1963" minY="321" maxY="379"/>
-  <symbol name="embassy-l" minX="1963" maxX="2021" minY="321" maxY="379"/>
-  <symbol name="museum-l" minX="0" maxX="58" minY="379" maxY="437"/>
-  <symbol name="motel-l" minX="58" maxX="116" minY="379" maxY="437"/>
-  <symbol name="monument-l" minX="116" maxX="174" minY="379" maxY="437"/>
-  <symbol name="military-l" minX="174" maxX="232" minY="379" maxY="437"/>
-  <symbol name="equestrian-l" minX="232" maxX="290" minY="379" maxY="437"/>
-  <symbol name="equestrian-m" minX="290" maxX="348" minY="379" maxY="437"/>
-  <symbol name="marketplace-l" minX="348" maxX="406" minY="379" maxY="437"/>
-  <symbol name="fastfood-l" minX="406" maxX="464" minY="379" maxY="437"/>
-  <symbol name="mail-l" minX="464" maxX="522" minY="379" maxY="437"/>
-  <symbol name="lightrail-berlin-l" minX="522" maxX="580" minY="379" maxY="437"/>
-  <symbol name="fire_station-l" minX="580" maxX="638" minY="379" maxY="437"/>
-  <symbol name="lighthouse-l" minX="638" maxX="696" minY="379" maxY="437"/>
-  <symbol name="lift_gate-l" minX="696" maxX="754" minY="379" maxY="437"/>
-  <symbol name="florist-l" minX="754" maxX="812" minY="379" maxY="437"/>
-  <symbol name="library-l" minX="812" maxX="870" minY="379" maxY="437"/>
-  <symbol name="fountain-l" minX="870" maxX="928" minY="379" maxY="437"/>
-  <symbol name="laundry-m" minX="928" maxX="984" minY="379" maxY="437"/>
-  <symbol name="laundry-l" minX="984" maxX="1041" minY="379" maxY="437"/>
-  <symbol name="fuel-l" minX="1041" maxX="1099" minY="379" maxY="437"/>
-  <symbol name="kiosk-l" minX="1099" maxX="1157" minY="379" maxY="437"/>
-  <symbol name="kindergarten-m" minX="1157" maxX="1215" minY="379" maxY="437"/>
-  <symbol name="funicular-l" minX="1215" maxX="1273" minY="379" maxY="437"/>
-  <symbol name="kindergarten-l" minX="1273" maxX="1331" minY="379" maxY="437"/>
-  <symbol name="jewelry-l" minX="1331" maxX="1389" minY="379" maxY="437"/>
-  <symbol name="furniture-l" minX="1389" maxX="1447" minY="379" maxY="437"/>
-  <symbol name="information-l" minX="1447" maxX="1505" minY="379" maxY="437"/>
-  <symbol name="gallery-l" minX="1505" maxX="1563" minY="379" maxY="437"/>
-  <symbol name="hunting-tower-m" minX="1563" maxX="1619" minY="379" maxY="437"/>
-  <symbol name="hunting-tower-l" minX="1619" maxX="1676" minY="379" maxY="437"/>
-  <symbol name="garden-l" minX="1676" maxX="1734" minY="379" maxY="437"/>
-  <symbol name="hotel-l" minX="1734" maxX="1792" minY="379" maxY="437"/>
-  <symbol name="hospital-l" minX="1792" maxX="1850" minY="379" maxY="437"/>
-  <symbol name="garden_center-l" minX="1850" maxX="1908" minY="379" maxY="437"/>
-  <symbol name="historic-ship-l" minX="1908" maxX="1966" minY="379" maxY="437"/>
-  <symbol name="gate-l" minX="1966" maxX="2024" minY="379" maxY="437"/>
-  <symbol name="heliport-m" minX="0" maxX="56" minY="437" maxY="495"/>
-  <symbol name="gift-l" minX="56" maxX="114" minY="437" maxY="495"/>
-  <symbol name="heliport-l" minX="114" maxX="171" minY="437" maxY="495"/>
-  <symbol name="golf-l" minX="171" maxX="229" minY="437" maxY="495"/>
-  <symbol name="helipad-l" minX="229" maxX="287" minY="437" maxY="495"/>
-  <symbol name="hardware-l" minX="287" maxX="345" minY="437" maxY="495"/>
-  <symbol name="greengrocer-l" minX="345" maxX="403" minY="437" maxY="495"/>
-  <symbol name="hand-m" minX="403" maxX="461" minY="437" maxY="495"/>
-  <symbol name="grocery-l" minX="461" maxX="519" minY="437" maxY="495"/>
-  <symbol name="hand-l" minX="519" maxX="577" minY="437" maxY="495"/>
-  <symbol name="hairdresser-l" minX="577" maxX="635" minY="437" maxY="495"/>
-  <symbol name="shoes-m" minX="635" maxX="691" minY="437" maxY="493"/>
-  <symbol name="hairdresser-m" minX="691" maxX="747" minY="437" maxY="493"/>
-  <symbol name="grocery-m" minX="747" maxX="803" minY="437" maxY="493"/>
-  <symbol name="greengrocer-m" minX="803" maxX="859" minY="437" maxY="493"/>
-  <symbol name="australian-football-m" minX="859" maxX="915" minY="437" maxY="493"/>
-  <symbol name="casino-m" minX="915" maxX="971" minY="437" maxY="493"/>
-  <symbol name="hardware-m" minX="971" maxX="1027" minY="437" maxY="493"/>
-  <symbol name="golf-m" minX="1027" maxX="1083" minY="437" maxY="493"/>
-  <symbol name="helipad-m" minX="1083" maxX="1139" minY="437" maxY="493"/>
-  <symbol name="bakery-m" minX="1139" maxX="1195" minY="437" maxY="493"/>
-  <symbol name="gift-m" minX="1195" maxX="1251" minY="437" maxY="493"/>
-  <symbol name="gate-m" minX="1251" maxX="1307" minY="437" maxY="493"/>
-  <symbol name="skiing-m" minX="1307" maxX="1363" minY="437" maxY="493"/>
-  <symbol name="garden_center-m" minX="1363" maxX="1419" minY="437" maxY="493"/>
-  <symbol name="historic-ship-m" minX="1419" maxX="1475" minY="437" maxY="493"/>
-  <symbol name="alcohol-m" minX="1475" maxX="1531" minY="437" maxY="493"/>
-  <symbol name="hospital-m" minX="1531" maxX="1587" minY="437" maxY="493"/>
-  <symbol name="soccer-m" minX="1587" maxX="1643" minY="437" maxY="493"/>
-  <symbol name="garden-m" minX="1643" maxX="1699" minY="437" maxY="493"/>
-  <symbol name="hotel-m" minX="1699" maxX="1755" minY="437" maxY="493"/>
-  <symbol name="banknote-m" minX="1755" maxX="1811" minY="437" maxY="493"/>
-  <symbol name="alpine_hut-m" minX="1811" maxX="1867" minY="437" maxY="493"/>
-  <symbol name="gallery-m" minX="1867" maxX="1923" minY="437" maxY="493"/>
-  <symbol name="shop-m" minX="1923" maxX="1979" minY="437" maxY="493"/>
-  <symbol name="furniture-m" minX="1979" maxX="2035" minY="437" maxY="493"/>
-  <symbol name="information-m" minX="0" maxX="56" minY="495" maxY="551"/>
-  <symbol name="bar-m" minX="56" maxX="112" minY="495" maxY="551"/>
-  <symbol name="america-football-m" minX="112" maxX="168" minY="495" maxY="551"/>
-  <symbol name="jewelry-m" minX="168" maxX="224" minY="495" maxY="551"/>
-  <symbol name="funicular-m" minX="224" maxX="280" minY="495" maxY="551"/>
-  <symbol name="archery-m" minX="280" maxX="336" minY="495" maxY="551"/>
-  <symbol name="cave-m" minX="336" maxX="392" minY="495" maxY="551"/>
-  <symbol name="fuel-m" minX="392" maxX="448" minY="495" maxY="551"/>
-  <symbol name="kiosk-m" minX="448" maxX="504" minY="495" maxY="551"/>
-  <symbol name="baseball-m" minX="504" maxX="560" minY="495" maxY="551"/>
-  <symbol name="fountain-m" minX="560" maxX="616" minY="495" maxY="551"/>
-  <symbol name="florist-m" minX="616" maxX="672" minY="495" maxY="551"/>
-  <symbol name="library-m" minX="672" maxX="728" minY="495" maxY="551"/>
-  <symbol name="atm-m" minX="728" maxX="784" minY="495" maxY="551"/>
-  <symbol name="zoo-m" minX="784" maxX="840" minY="495" maxY="551"/>
-  <symbol name="lift_gate-m" minX="840" maxX="896" minY="495" maxY="551"/>
-  <symbol name="fire_station-m" minX="896" maxX="952" minY="495" maxY="551"/>
-  <symbol name="lighthouse-m" minX="952" maxX="1008" minY="495" maxY="551"/>
-  <symbol name="windmill-m" minX="1008" maxX="1064" minY="495" maxY="551"/>
-  <symbol name="basketball-m" minX="1064" maxX="1120" minY="495" maxY="551"/>
-  <symbol name="shop-bicycle-m" minX="1120" maxX="1176" minY="495" maxY="551"/>
-  <symbol name="wayside_shrine-m" minX="1176" maxX="1232" minY="495" maxY="551"/>
-  <symbol name="fastfood-m" minX="1232" maxX="1288" minY="495" maxY="551"/>
-  <symbol name="mail-m" minX="1288" maxX="1344" minY="495" maxY="551"/>
-  <symbol name="wayside_cross-m" minX="1344" maxX="1400" minY="495" maxY="551"/>
-  <symbol name="bbq-m" minX="1400" maxX="1456" minY="495" maxY="551"/>
-  <symbol name="marketplace-m" minX="1456" maxX="1512" minY="495" maxY="551"/>
-  <symbol name="caravan_site-m" minX="1512" maxX="1568" minY="495" maxY="551"/>
-  <symbol name="sports-m" minX="1568" maxX="1624" minY="495" maxY="551"/>
-  <symbol name="beach-m" minX="1624" maxX="1680" minY="495" maxY="551"/>
-  <symbol name="military-m" minX="1680" maxX="1736" minY="495" maxY="551"/>
-  <symbol name="volcano-m" minX="1736" maxX="1792" minY="495" maxY="551"/>
-  <symbol name="beauty-m" minX="1792" maxX="1848" minY="495" maxY="551"/>
-  <symbol name="mobile_phone-m" minX="1848" maxX="1904" minY="495" maxY="551"/>
-  <symbol name="vending-m" minX="1904" maxX="1960" minY="495" maxY="551"/>
-  <symbol name="monument-m" minX="1960" maxX="2016" minY="495" maxY="551"/>
-  <symbol name="cemetery-m" minX="0" maxX="56" minY="551" maxY="607"/>
-  <symbol name="tram-m" minX="56" maxX="112" minY="551" maxY="607"/>
-  <symbol name="motel-m" minX="112" maxX="168" minY="551" maxY="607"/>
-  <symbol name="embassy-m" minX="168" maxX="224" minY="551" maxY="607"/>
-  <symbol name="museum-m" minX="224" maxX="280" minY="551" maxY="607"/>
-  <symbol name="electronics-m" minX="280" maxX="336" minY="551" maxY="607"/>
-  <symbol name="ship-m" minX="336" maxX="392" minY="551" maxY="607"/>
-  <symbol name="subway-entrance-2-m" minX="392" maxX="448" minY="551" maxY="607"/>
-  <symbol name="school-m" minX="448" maxX="504" minY="551" maxY="607"/>
-  <symbol name="chemist-m" minX="504" maxX="560" minY="551" maxY="607"/>
-  <symbol name="car_sharing-m" minX="560" maxX="616" minY="551" maxY="607"/>
-  <symbol name="train-m" minX="616" maxX="672" minY="551" maxY="607"/>
-  <symbol name="drugs" minX="672" maxX="728" minY="551" maxY="607"/>
-  <symbol name="npark-m" minX="728" maxX="784" minY="551" maxY="607"/>
-  <symbol name="bicycle-m" minX="784" maxX="840" minY="551" maxY="607"/>
-  <symbol name="toys-m" minX="840" maxX="896" minY="551" maxY="607"/>
-  <symbol name="nparkf-m " minX="896" maxX="952" minY="551" maxY="607"/>
-  <symbol name="nparkf-m" minX="952" maxX="1008" minY="551" maxY="607"/>
-  <symbol name="townhall-m" minX="1008" maxX="1064" minY="551" maxY="607"/>
-  <symbol name="drinking-water-m" minX="1064" maxX="1120" minY="551" maxY="607"/>
-  <symbol name="book-shop-m" minX="1120" maxX="1176" minY="551" maxY="607"/>
-  <symbol name="subway-entrance-m" minX="1176" maxX="1232" minY="551" maxY="607"/>
-  <symbol name="tourism-m" minX="1232" maxX="1288" minY="551" maxY="607"/>
-  <symbol name="optician-m" minX="1288" maxX="1344" minY="551" maxY="607"/>
-  <symbol name="tomb-m" minX="1344" maxX="1400" minY="551" maxY="607"/>
-  <symbol name="park-m" minX="1400" maxX="1456" minY="551" maxY="607"/>
-  <symbol name="boundary_stone-m" minX="1456" maxX="1512" minY="551" maxY="607"/>
-  <symbol name="restaurant-m" minX="1512" maxX="1568" minY="551" maxY="607"/>
-  <symbol name="toll_booth-m" minX="1568" maxX="1624" minY="551" maxY="607"/>
-  <symbol name="doityourself-m" minX="1624" maxX="1680" minY="551" maxY="607"/>
-  <symbol name="parking-meter-m" minX="1680" maxX="1736" minY="551" maxY="607"/>
-  <symbol name="bowls-m" minX="1736" maxX="1792" minY="551" maxY="607"/>
-  <symbol name="toilets-m" minX="1792" maxX="1848" minY="551" maxY="607"/>
-  <symbol name="bus-m" minX="1848" maxX="1904" minY="551" maxY="607"/>
-  <symbol name="theatre-m" minX="1904" maxX="1960" minY="551" maxY="607"/>
-  <symbol name="tennis-m" minX="1960" maxX="2016" minY="551" maxY="607"/>
-  <symbol name="butcher-m" minX="0" maxX="56" minY="607" maxY="663"/>
-  <symbol name="taxi-m" minX="56" maxX="112" minY="607" maxY="663"/>
-  <symbol name="pharmacy-2-m" minX="112" maxX="168" minY="607" maxY="663"/>
-  <symbol name="dog_park-m" minX="168" maxX="224" minY="607" maxY="663"/>
-  <symbol name="pharmacy-m" minX="224" maxX="280" minY="607" maxY="663"/>
-  <symbol name="cable-car-m" minX="280" maxX="336" minY="607" maxY="663"/>
-  <symbol name="diving-m" minX="336" maxX="392" minY="607" maxY="663"/>
-  <symbol name="phone-m" minX="392" maxX="448" minY="607" maxY="663"/>
-  <symbol name="swimming-m" minX="448" maxX="504" minY="607" maxY="663"/>
-  <symbol name="department_store-m" minX="504" maxX="560" minY="607" maxY="663"/>
-  <symbol name="curling-m" minX="560" maxX="616" minY="607" maxY="663"/>
-  <symbol name="cinema-m" minX="616" maxX="672" minY="607" maxY="663"/>
-  <symbol name="sweets-m" minX="672" maxX="728" minY="607" maxY="663"/>
-  <symbol name="pitch-m" minX="728" maxX="784" minY="607" maxY="663"/>
-  <symbol name="cafe-m" minX="784" maxX="840" minY="607" maxY="663"/>
-  <symbol name="subway-spb-m" minX="840" maxX="896" minY="607" maxY="663"/>
-  <symbol name="place-of-worship-m" minX="896" maxX="952" minY="607" maxY="663"/>
-  <symbol name="clothes-m" minX="952" maxX="1008" minY="607" maxY="663"/>
-  <symbol name="subway-m" minX="1008" maxX="1064" minY="607" maxY="663"/>
-  <symbol name="police-m" minX="1064" maxX="1120" minY="607" maxY="663"/>
-  <symbol name="recycling-m" minX="1120" maxX="1176" minY="607" maxY="663"/>
-  <symbol name="cricket-m" minX="1176" maxX="1232" minY="607" maxY="663"/>
-  <symbol name="postbox-m" minX="1232" maxX="1288" minY="607" maxY="663"/>
-  <symbol name="convenience-m" minX="1288" maxX="1344" minY="607" maxY="663"/>
-  <symbol name="computer-m" minX="1344" maxX="1400" minY="607" maxY="663"/>
-  <symbol name="campsite-m" minX="1400" maxX="1456" minY="607" maxY="663"/>
-  <symbol name="subway-newyork-m" minX="1456" maxX="1512" minY="607" maxY="663"/>
-  <symbol name="pub-m" minX="1512" maxX="1568" minY="607" maxY="663"/>
-  <symbol name="college-m" minX="1568" maxX="1624" minY="607" maxY="663"/>
-  <symbol name="subway-moscow-l" minX="1624" maxX="1682" minY="607" maxY="658"/>
-  <symbol name="parking-l" minX="1682" maxX="1733" minY="607" maxY="658"/>
-  <symbol name="speedcam-l" minX="1733" maxX="1784" minY="607" maxY="658"/>
-  <symbol name="subway-rome-l" minX="1784" maxX="1835" minY="607" maxY="658"/>
-  <symbol name="lightrail-berlin-m" minX="1835" maxX="1886" minY="607" maxY="658"/>
-  <symbol name="subway-berlin-l" minX="1886" maxX="1937" minY="607" maxY="658"/>
-  <symbol name="route_from" minX="1937" maxX="1986" minY="607" maxY="656"/>
-  <symbol name="no-icon-leisure" minX="1986" maxX="2033" minY="607" maxY="654"/>
-  <symbol name="subway-moscow-m" minX="0" maxX="54" minY="663" maxY="710"/>
-  <symbol name="subway-paris-m" minX="54" maxX="101" minY="663" maxY="710"/>
-  <symbol name="no-icon" minX="101" maxX="148" minY="663" maxY="710"/>
-  <symbol name="no-icon-tourism" minX="148" maxX="195" minY="663" maxY="710"/>
-  <symbol name="no-icon-shop" minX="195" maxX="242" minY="663" maxY="710"/>
-  <symbol name="subway-rome-m" minX="242" maxX="289" minY="663" maxY="710"/>
-  <symbol name="subway-berlin-m" minX="289" maxX="336" minY="663" maxY="710"/>
-  <symbol name="no-icon-amenity" minX="336" maxX="383" minY="663" maxY="710"/>
-  <symbol name="current-position" minX="383" maxX="429" minY="663" maxY="709"/>
-  <symbol name="beer-s" minX="429" maxX="471" minY="663" maxY="708"/>
-  <symbol name="bcontrol-s" minX="471" maxX="513" minY="663" maxY="708"/>
-  <symbol name="waterfall-s" minX="513" maxX="555" minY="663" maxY="708"/>
-  <symbol name="subway-london-l" minX="555" maxX="613" minY="663" maxY="708"/>
-  <symbol name="picnic-s" minX="613" maxX="655" minY="663" maxY="708"/>
-  <symbol name="hunting-tower-s" minX="655" maxX="697" minY="663" maxY="708"/>
-  <symbol name="office-s" minX="697" maxX="739" minY="663" maxY="708"/>
-  <symbol name="remains-s" minX="739" maxX="781" minY="663" maxY="708"/>
-  <symbol name="heliport-s" minX="781" maxX="823" minY="663" maxY="708"/>
-  <symbol name="airport-s" minX="823" maxX="868" minY="663" maxY="708"/>
-  <symbol name="skiing-s" minX="868" maxX="910" minY="663" maxY="705"/>
-  <symbol name="casino-s" minX="910" maxX="952" minY="663" maxY="705"/>
-  <symbol name="soccer-s" minX="952" maxX="994" minY="663" maxY="705"/>
-  <symbol name="shop-s" minX="994" maxX="1036" minY="663" maxY="705"/>
-  <symbol name="speedcam-m" minX="1036" maxX="1078" minY="663" maxY="705"/>
-  <symbol name="museum-s" minX="1078" maxX="1120" minY="663" maxY="705"/>
-  <symbol name="cave-s" minX="1120" maxX="1162" minY="663" maxY="705"/>
-  <symbol name="grocery-s" minX="1162" maxX="1204" minY="663" maxY="705"/>
-  <symbol name="hand-s" minX="1204" maxX="1246" minY="663" maxY="705"/>
-  <symbol name="golf-s" minX="1246" maxX="1288" minY="663" maxY="705"/>
-  <symbol name="helipad-s" minX="1288" maxX="1330" minY="663" maxY="705"/>
-  <symbol name="garden-s" minX="1330" maxX="1372" minY="663" maxY="705"/>
-  <symbol name="subway-barcelona-m" minX="1372" maxX="1430" minY="663" maxY="705"/>
-  <symbol name="subway-barcelona-s" minX="1430" maxX="1481" minY="663" maxY="705"/>
-  <symbol name="ship-s" minX="1481" maxX="1523" minY="663" maxY="705"/>
-  <symbol name="cemetery-s" minX="1523" maxX="1565" minY="663" maxY="705"/>
-  <symbol name="hospital-s" minX="1565" maxX="1607" minY="663" maxY="705"/>
-  <symbol name="school-s" minX="1607" maxX="1649" minY="663" maxY="705"/>
-  <symbol name="subway-entrance-2-s" minX="1649" maxX="1691" minY="663" maxY="705"/>
-  <symbol name="subway-entrance-arrow" minX="1691" maxX="1733" minY="663" maxY="705"/>
-  <symbol name="alcohol-s" minX="1733" maxX="1775" minY="663" maxY="705"/>
-  <symbol name="restaurant-s" minX="1775" maxX="1817" minY="663" maxY="705"/>
-  <symbol name="subway-entrance-s" minX="1817" maxX="1859" minY="663" maxY="705"/>
-  <symbol name="hotel-s" minX="1859" maxX="1901" minY="663" maxY="705"/>
-  <symbol name="gallery-s" minX="1901" maxX="1943" minY="663" maxY="705"/>
-  <symbol name="information-s" minX="1943" maxX="1985" minY="663" maxY="705"/>
-  <symbol name="car-repair-s" minX="1985" maxX="2027" minY="663" maxY="705"/>
-  <symbol name="cinema-s" minX="0" maxX="42" minY="710" maxY="752"/>
-  <symbol name="subway-london-m" minX="42" maxX="98" minY="710" maxY="752"/>
-  <symbol name="funicular-s" minX="98" maxX="140" minY="710" maxY="752"/>
-  <symbol name="recycling-s" minX="140" maxX="182" minY="710" maxY="752"/>
-  <symbol name="america-football-s" minX="182" maxX="224" minY="710" maxY="752"/>
-  <symbol name="subway-madrid-m" minX="224" maxX="282" minY="710" maxY="752"/>
-  <symbol name="bar-s" minX="282" maxX="324" minY="710" maxY="752"/>
-  <symbol name="fuel-s" minX="324" maxX="366" minY="710" maxY="752"/>
-  <symbol name="kindergarten-s" minX="366" maxX="408" minY="710" maxY="752"/>
-  <symbol name="fountain-s" minX="408" maxX="450" minY="710" maxY="752"/>
-  <symbol name="library-s" minX="450" maxX="492" minY="710" maxY="752"/>
-  <symbol name="pub-s" minX="492" maxX="534" minY="710" maxY="752"/>
-  <symbol name="zoo-s" minX="534" maxX="576" minY="710" maxY="752"/>
-  <symbol name="campsite-s" minX="576" maxX="618" minY="710" maxY="752"/>
-  <symbol name="college-s" minX="618" maxX="660" minY="710" maxY="752"/>
-  <symbol name="subway-newyork-s" minX="660" maxX="702" minY="710" maxY="752"/>
-  <symbol name="fire_station-s" minX="702" maxX="744" minY="710" maxY="752"/>
-  <symbol name="power-s" minX="744" maxX="786" minY="710" maxY="752"/>
-  <symbol name="police-s" minX="786" maxX="828" minY="710" maxY="752"/>
-  <symbol name="baseball-s" minX="828" maxX="870" minY="710" maxY="752"/>
-  <symbol name="windmill-s" minX="870" maxX="912" minY="710" maxY="752"/>
-  <symbol name="place-of-worship-s" minX="912" maxX="954" minY="710" maxY="752"/>
-  <symbol name="lighthouse-s" minX="954" maxX="996" minY="710" maxY="752"/>
-  <symbol name="subway-s" minX="996" maxX="1038" minY="710" maxY="752"/>
-  <symbol name="cafe-s" minX="1038" maxX="1080" minY="710" maxY="752"/>
-  <symbol name="fastfood-s" minX="1080" maxX="1122" minY="710" maxY="752"/>
-  <symbol name="subway-spb-s" minX="1122" maxX="1164" minY="710" maxY="752"/>
-  <symbol name="basketball-s" minX="1164" maxX="1206" minY="710" maxY="752"/>
-  <symbol name="mail-s" minX="1206" maxX="1248" minY="710" maxY="752"/>
-  <symbol name="equestrian-s" minX="1248" maxX="1290" minY="710" maxY="752"/>
-  <symbol name="metro-barcelona-m" minX="1290" maxX="1348" minY="710" maxY="752"/>
-  <symbol name="pitch-s" minX="1348" maxX="1390" minY="710" maxY="752"/>
-  <symbol name="volcano-s" minX="1390" maxX="1432" minY="710" maxY="752"/>
-  <symbol name="cable-car-s" minX="1432" maxX="1474" minY="710" maxY="752"/>
-  <symbol name="phone-s" minX="1474" maxX="1516" minY="710" maxY="752"/>
-  <symbol name="swimming-s" minX="1516" maxX="1558" minY="710" maxY="752"/>
-  <symbol name="pharmacy-s" minX="1558" maxX="1600" minY="710" maxY="752"/>
-  <symbol name="military-s" minX="1600" maxX="1642" minY="710" maxY="752"/>
-  <symbol name="atm-s" minX="1642" maxX="1684" minY="710" maxY="752"/>
-  <symbol name="monument-s" minX="1684" maxX="1726" minY="710" maxY="752"/>
-  <symbol name="tennis-s" minX="1726" maxX="1768" minY="710" maxY="752"/>
-  <symbol name="bus-s" minX="1768" maxX="1810" minY="710" maxY="752"/>
-  <symbol name="tram-s" minX="1810" maxX="1852" minY="710" maxY="752"/>
-  <symbol name="theatre-s" minX="1852" maxX="1894" minY="710" maxY="752"/>
-  <symbol name="embassy-s" minX="1894" maxX="1936" minY="710" maxY="752"/>
-  <symbol name="train-s" minX="1936" maxX="1978" minY="710" maxY="752"/>
-  <symbol name="toilets-s" minX="1978" maxX="2020" minY="710" maxY="752"/>
-  <symbol name="npark-s" minX="0" maxX="42" minY="752" maxY="794"/>
-  <symbol name="drinking-water-s" minX="42" maxX="84" minY="752" maxY="794"/>
-  <symbol name="park-s" minX="84" maxX="126" minY="752" maxY="794"/>
-  <symbol name="bicycle-s" minX="126" maxX="168" minY="752" maxY="794"/>
-  <symbol name="book-shop-s" minX="168" maxX="210" minY="752" maxY="794"/>
-  <symbol name="townhall-s" minX="210" maxX="252" minY="752" maxY="794"/>
-  <symbol name="tourism-s" minX="252" maxX="294" minY="752" maxY="794"/>
-  <symbol name="nparkf-s" minX="294" maxX="336" minY="752" maxY="794"/>
-  <symbol name="subway-madrid-l" minX="336" maxX="394" minY="752" maxY="793"/>
-  <symbol name="subway-barcelona-l" minX="394" maxX="452" minY="752" maxY="793"/>
-  <symbol name="s-arrow" minX="452" maxX="490" minY="752" maxY="792"/>
-  <symbol name="parking-m" minX="490" maxX="530" minY="752" maxY="792"/>
-  <symbol name="subway-kiev-l" minX="530" maxX="586" minY="752" maxY="790"/>
-  <symbol name="subway-kiev-m" minX="586" maxX="642" minY="752" maxY="790"/>
-  <symbol name="peak-l" minX="642" maxX="680" minY="752" maxY="790"/>
-  <symbol name="metro-barcelona-s" minX="680" maxX="731" minY="752" maxY="790"/>
-  <symbol name="subway-madrid-s" minX="731" maxX="782" minY="752" maxY="790"/>
-  <symbol name="lightrail-berlin-s" minX="782" maxX="820" minY="752" maxY="790"/>
-  <symbol name="subway-paris-s" minX="820" maxX="858" minY="752" maxY="790"/>
-  <symbol name="subway-moscow-s" minX="858" maxX="894" minY="752" maxY="788"/>
-  <symbol name="api-result" minX="894" maxX="930" minY="752" maxY="788"/>
-  <symbol name="search-result" minX="930" maxX="964" minY="752" maxY="786"/>
-  <symbol name="speedcam-s" minX="964" maxX="997" minY="752" maxY="785"/>
-  <symbol name="parking-s" minX="997" maxX="1030" minY="752" maxY="785"/>
-  <symbol name="subway-berlin-s" minX="1030" maxX="1063" minY="752" maxY="785"/>
-  <symbol name="subway-london-s" minX="1063" maxX="1105" minY="752" maxY="785"/>
-  <symbol name="subway-rome-s" minX="1105" maxX="1138" minY="752" maxY="785"/>
-  <symbol name="bench" minX="1138" maxX="1176" minY="752" maxY="785"/>
-  <symbol name="subway-minsk-l" minX="1176" maxX="1232" minY="752" maxY="783"/>
-  <symbol name="peakt-l" minX="1232" maxX="1265" minY="752" maxY="783"/>
-  <symbol name="survey_point-l" minX="1265" maxX="1296" minY="752" maxY="783"/>
-  <symbol name="star-l" minX="1296" maxX="1327" minY="752" maxY="783"/>
-  <symbol name="star-m" minX="1327" maxX="1356" minY="752" maxY="781"/>
-  <symbol name="subway-kiev-s" minX="1356" maxX="1403" minY="752" maxY="781"/>
-  <symbol name="subway-minsk-m" minX="1403" maxX="1450" minY="752" maxY="779"/>
-  <symbol name="peak-m" minX="1450" maxX="1479" minY="752" maxY="779"/>
-  <symbol name="subway-xs" minX="1479" maxX="1506" minY="752" maxY="779"/>
-  <symbol name="survey_point-m" minX="1506" maxX="1533" minY="752" maxY="779"/>
-  <symbol name="subway-newyork-xs" minX="1533" maxX="1560" minY="752" maxY="779"/>
-  <symbol name="railway-crossing" minX="1560" maxX="1602" minY="752" maxY="779"/>
-  <symbol name="star-s" minX="1602" maxX="1626" minY="752" maxY="776"/>
-  <symbol name="crossing-l" minX="1626" maxX="1650" minY="752" maxY="776"/>
-  <symbol name="subway-minsk-s" minX="1650" maxX="1692" minY="752" maxY="776"/>
-  <symbol name="peakt-m" minX="1692" maxX="1716" minY="752" maxY="774"/>
-  <symbol name="arrow-m" minX="1716" maxX="1767" minY="752" maxY="774"/>
-  <symbol name="peak-s" minX="1767" maxX="1791" minY="752" maxY="774"/>
-  <symbol name="survey_point-s" minX="1791" maxX="1813" minY="752" maxY="774"/>
-  <symbol name="crossing-m" minX="1813" maxX="1833" minY="752" maxY="772"/>
-  <symbol name="entrance-s" minX="1833" maxX="1853" minY="752" maxY="772"/>
-  <symbol name="peakt-s" minX="1853" maxX="1873" minY="752" maxY="770"/>
-  <symbol name="arrow-s" minX="1873" maxX="1911" minY="752" maxY="767"/>
-  <symbol name="none" minX="1911" maxX="1926" minY="752" maxY="767"/>
-  <symbol name="tree-l" minX="1926" maxX="1941" minY="752" maxY="767"/>
-  <symbol name="dot-m" minX="1941" maxX="1956" minY="752" maxY="767"/>
-  <symbol name="crossing-s" minX="1956" maxX="1971" minY="752" maxY="767"/>
-  <symbol name="tree-m" minX="1971" maxX="1984" minY="752" maxY="765"/>
-  <symbol name="entrance-xs" minX="1984" maxX="1997" minY="752" maxY="765"/>
-  <symbol name="dot-s-light" minX="1997" maxX="2008" minY="752" maxY="763"/>
-  <symbol name="tree-s" minX="2008" maxX="2019" minY="752" maxY="763"/>
-  <symbol name="zero-icon" minX="2019" maxX="2030" minY="752" maxY="763"/>
-  <symbol name="dot-s" minX="2030" maxX="2041" minY="752" maxY="763"/>
+  <symbol minX="0" maxX="205" minY="0" maxY="205" name="route_to"/>
+  <symbol minX="205" maxX="609" minY="0" maxY="196" name="route-arrow"/>
+  <symbol minX="609" maxX="781" minY="0" maxY="172" name="compass-image"/>
+  <symbol minX="781" maxX="893" minY="0" maxY="154" name="watch-search-result"/>
+  <symbol minX="893" maxX="1017" minY="0" maxY="136" name="watch-my-direction"/>
+  <symbol minX="1017" maxX="1102" minY="0" maxY="109" name="current-position-compas"/>
+  <symbol minX="1102" maxX="1187" minY="0" maxY="109" name="current-routing-compas"/>
+  <symbol minX="1187" maxX="1287" minY="0" maxY="100" name="watch-my-position"/>
+  <symbol minX="1287" maxX="1384" minY="0" maxY="97" name="search-result-active"/>
+  <symbol minX="1384" maxX="1427" minY="0" maxY="85" name="placemark-pink"/>
+  <symbol minX="1427" maxX="1470" minY="0" maxY="85" name="placemark-orange"/>
+  <symbol minX="1470" maxX="1513" minY="0" maxY="85" name="placemark-green"/>
+  <symbol minX="1513" maxX="1556" minY="0" maxY="85" name="placemark-brown"/>
+  <symbol minX="1556" maxX="1599" minY="0" maxY="85" name="placemark-blue"/>
+  <symbol minX="1599" maxX="1642" minY="0" maxY="85" name="placemark-red"/>
+  <symbol minX="1642" maxX="1685" minY="0" maxY="85" name="placemark-yellow"/>
+  <symbol minX="1685" maxX="1728" minY="0" maxY="85" name="placemark-purple"/>
+  <symbol minX="1728" maxX="1786" minY="0" maxY="58" name="airport-l"/>
+  <symbol minX="1786" maxX="1844" minY="0" maxY="58" name="australian-football-l"/>
+  <symbol minX="1844" maxX="1902" minY="0" maxY="58" name="airport-m"/>
+  <symbol minX="1902" maxX="1960" minY="0" maxY="58" name="bakery-l"/>
+  <symbol minX="1960" maxX="2018" minY="0" maxY="58" name="alcohol-l"/>
+  <symbol minX="0" maxX="57" minY="205" maxY="263" name="bank-l"/>
+  <symbol minX="57" maxX="113" minY="205" maxY="263" name="bank-m"/>
+  <symbol minX="113" maxX="170" minY="205" maxY="263" name="banknote-l"/>
+  <symbol minX="170" maxX="228" minY="205" maxY="263" name="alpine_hut-l"/>
+  <symbol minX="228" maxX="286" minY="205" maxY="263" name="bar-l"/>
+  <symbol minX="286" maxX="344" minY="205" maxY="263" name="america-football-l"/>
+  <symbol minX="344" maxX="402" minY="205" maxY="263" name="archery-l"/>
+  <symbol minX="402" maxX="460" minY="205" maxY="263" name="baseball-l"/>
+  <symbol minX="460" maxX="518" minY="205" maxY="263" name="atm-l"/>
+  <symbol minX="518" maxX="576" minY="205" maxY="263" name="zoo-l"/>
+  <symbol minX="576" maxX="634" minY="205" maxY="263" name="basketball-l"/>
+  <symbol minX="634" maxX="692" minY="205" maxY="263" name="windmill-l"/>
+  <symbol minX="692" maxX="750" minY="205" maxY="263" name="wayside_shrine-l"/>
+  <symbol minX="750" maxX="808" minY="205" maxY="263" name="bbq-l"/>
+  <symbol minX="808" maxX="866" minY="205" maxY="263" name="wayside_cross-l"/>
+  <symbol minX="866" maxX="923" minY="205" maxY="263" name="bcontrol-l"/>
+  <symbol minX="923" maxX="979" minY="205" maxY="263" name="bcontrol-m"/>
+  <symbol minX="979" maxX="1035" minY="205" maxY="263" name="waterfall-m"/>
+  <symbol minX="1035" maxX="1093" minY="205" maxY="263" name="beach-l"/>
+  <symbol minX="1093" maxX="1150" minY="205" maxY="263" name="waterfall-l"/>
+  <symbol minX="1150" maxX="1208" minY="205" maxY="263" name="beauty-l"/>
+  <symbol minX="1208" maxX="1266" minY="205" maxY="263" name="volcano-l"/>
+  <symbol minX="1266" maxX="1323" minY="205" maxY="263" name="beer-l"/>
+  <symbol minX="1323" maxX="1379" minY="205" maxY="263" name="beer-m"/>
+  <symbol minX="1379" maxX="1437" minY="205" maxY="263" name="vending-l"/>
+  <symbol minX="1437" maxX="1495" minY="205" maxY="263" name="tram-l"/>
+  <symbol minX="1495" maxX="1553" minY="205" maxY="263" name="bicycle-l"/>
+  <symbol minX="1553" maxX="1611" minY="205" maxY="263" name="train-l"/>
+  <symbol minX="1611" maxX="1669" minY="205" maxY="263" name="toys-l"/>
+  <symbol minX="1669" maxX="1727" minY="205" maxY="263" name="book-shop-l"/>
+  <symbol minX="1727" maxX="1785" minY="205" maxY="263" name="townhall-l"/>
+  <symbol minX="1785" maxX="1843" minY="205" maxY="263" name="tourism-l"/>
+  <symbol minX="1843" maxX="1901" minY="205" maxY="263" name="boundary_stone-l"/>
+  <symbol minX="1901" maxX="1959" minY="205" maxY="263" name="tomb-l"/>
+  <symbol minX="1959" maxX="2017" minY="205" maxY="263" name="bowls-l"/>
+  <symbol minX="0" maxX="58" minY="263" maxY="321" name="toll_booth-l"/>
+  <symbol minX="58" maxX="116" minY="263" maxY="321" name="bus-l"/>
+  <symbol minX="116" maxX="174" minY="263" maxY="321" name="toilets-l"/>
+  <symbol minX="174" maxX="232" minY="263" maxY="321" name="theatre-l"/>
+  <symbol minX="232" maxX="290" minY="263" maxY="321" name="butcher-l"/>
+  <symbol minX="290" maxX="348" minY="263" maxY="321" name="tennis-l"/>
+  <symbol minX="348" maxX="406" minY="263" maxY="321" name="cable-car-l"/>
+  <symbol minX="406" maxX="464" minY="263" maxY="321" name="taxi-l"/>
+  <symbol minX="464" maxX="522" minY="263" maxY="321" name="swimming-l"/>
+  <symbol minX="522" maxX="580" minY="263" maxY="321" name="cafe-l"/>
+  <symbol minX="580" maxX="638" minY="263" maxY="321" name="sweets-l"/>
+  <symbol minX="638" maxX="696" minY="263" maxY="321" name="subway-spb-l"/>
+  <symbol minX="696" maxX="754" minY="263" maxY="321" name="campsite-l"/>
+  <symbol minX="754" maxX="812" minY="263" maxY="321" name="subway-paris-l"/>
+  <symbol minX="812" maxX="870" minY="263" maxY="321" name="subway-newyork-l"/>
+  <symbol minX="870" maxX="927" minY="263" maxY="321" name="car-repair-l"/>
+  <symbol minX="927" maxX="983" minY="263" maxY="321" name="car-repair-m"/>
+  <symbol minX="983" maxX="1041" minY="263" maxY="321" name="subway-l"/>
+  <symbol minX="1041" maxX="1099" minY="263" maxY="321" name="car_sharing-l"/>
+  <symbol minX="1099" maxX="1157" minY="263" maxY="321" name="subway-entrance-l"/>
+  <symbol minX="1157" maxX="1215" minY="263" maxY="321" name="caravan_site-l"/>
+  <symbol minX="1215" maxX="1273" minY="263" maxY="321" name="sports-l"/>
+  <symbol minX="1273" maxX="1331" minY="263" maxY="321" name="casino-l"/>
+  <symbol minX="1331" maxX="1389" minY="263" maxY="321" name="soccer-l"/>
+  <symbol minX="1389" maxX="1447" minY="263" maxY="321" name="skiing-l"/>
+  <symbol minX="1447" maxX="1505" minY="263" maxY="321" name="cave-l"/>
+  <symbol minX="1505" maxX="1563" minY="263" maxY="321" name="shop-l"/>
+  <symbol minX="1563" maxX="1621" minY="263" maxY="321" name="shop-bicycle-l"/>
+  <symbol minX="1621" maxX="1679" minY="263" maxY="321" name="cemetery-l"/>
+  <symbol minX="1679" maxX="1737" minY="263" maxY="321" name="shoes-l"/>
+  <symbol minX="1737" maxX="1795" minY="263" maxY="321" name="ship-l"/>
+  <symbol minX="1795" maxX="1853" minY="263" maxY="321" name="chemist-l"/>
+  <symbol minX="1853" maxX="1911" minY="263" maxY="321" name="school-l"/>
+  <symbol minX="1911" maxX="1969" minY="263" maxY="321" name="cinema-l"/>
+  <symbol minX="1969" maxX="2027" minY="263" maxY="321" name="restaurant-l"/>
+  <symbol minX="0" maxX="56" minY="321" maxY="379" name="remains-m"/>
+  <symbol minX="56" maxX="114" minY="321" maxY="379" name="clothes-l"/>
+  <symbol minX="114" maxX="171" minY="321" maxY="379" name="remains-l"/>
+  <symbol minX="171" maxX="229" minY="321" maxY="379" name="college-l"/>
+  <symbol minX="229" maxX="287" minY="321" maxY="379" name="recycling-l"/>
+  <symbol minX="287" maxX="345" minY="321" maxY="379" name="pub-l"/>
+  <symbol minX="345" maxX="403" minY="321" maxY="379" name="computer-l"/>
+  <symbol minX="403" maxX="461" minY="321" maxY="379" name="power-m"/>
+  <symbol minX="461" maxX="519" minY="321" maxY="379" name="convenience-l"/>
+  <symbol minX="519" maxX="577" minY="321" maxY="379" name="power-l"/>
+  <symbol minX="577" maxX="635" minY="321" maxY="379" name="cricket-l"/>
+  <symbol minX="635" maxX="693" minY="321" maxY="379" name="postbox-l"/>
+  <symbol minX="693" maxX="751" minY="321" maxY="379" name="police-l"/>
+  <symbol minX="751" maxX="809" minY="321" maxY="379" name="place-of-worship-l"/>
+  <symbol minX="809" maxX="867" minY="321" maxY="379" name="pitch-l"/>
+  <symbol minX="867" maxX="925" minY="321" maxY="379" name="curling-l"/>
+  <symbol minX="925" maxX="981" minY="321" maxY="379" name="picnic-m"/>
+  <symbol minX="981" maxX="1039" minY="321" maxY="379" name="dentist-l"/>
+  <symbol minX="1039" maxX="1097" minY="321" maxY="379" name="dentist-m"/>
+  <symbol minX="1097" maxX="1154" minY="321" maxY="379" name="picnic-l"/>
+  <symbol minX="1154" maxX="1212" minY="321" maxY="379" name="department_store-l"/>
+  <symbol minX="1212" maxX="1270" minY="321" maxY="379" name="phone-l"/>
+  <symbol minX="1270" maxX="1328" minY="321" maxY="379" name="diving-l"/>
+  <symbol minX="1328" maxX="1386" minY="321" maxY="379" name="pharmacy-l"/>
+  <symbol minX="1386" maxX="1444" minY="321" maxY="379" name="dog_park-l"/>
+  <symbol minX="1444" maxX="1502" minY="321" maxY="379" name="parking-meter-l"/>
+  <symbol minX="1502" maxX="1560" minY="321" maxY="379" name="doityourself-l"/>
+  <symbol minX="1560" maxX="1618" minY="321" maxY="379" name="park-l"/>
+  <symbol minX="1618" maxX="1676" minY="321" maxY="379" name="optician-l"/>
+  <symbol minX="1676" maxX="1732" minY="321" maxY="379" name="office-m"/>
+  <symbol minX="1732" maxX="1789" minY="321" maxY="379" name="office-l"/>
+  <symbol minX="1789" maxX="1847" minY="321" maxY="379" name="drinking-water-l"/>
+  <symbol minX="1847" maxX="1905" minY="321" maxY="379" name="nparkf-l"/>
+  <symbol minX="1905" maxX="1963" minY="321" maxY="379" name="npark-l"/>
+  <symbol minX="1963" maxX="2021" minY="321" maxY="379" name="museum-l"/>
+  <symbol minX="0" maxX="58" minY="379" maxY="437" name="electronics-l"/>
+  <symbol minX="58" maxX="116" minY="379" maxY="437" name="motel-l"/>
+  <symbol minX="116" maxX="174" minY="379" maxY="437" name="embassy-l"/>
+  <symbol minX="174" maxX="232" minY="379" maxY="437" name="monument-l"/>
+  <symbol minX="232" maxX="290" minY="379" maxY="437" name="mobile_phone-l"/>
+  <symbol minX="290" maxX="348" minY="379" maxY="437" name="military-l"/>
+  <symbol minX="348" maxX="406" minY="379" maxY="437" name="marketplace-l"/>
+  <symbol minX="406" maxX="464" minY="379" maxY="437" name="equestrian-l"/>
+  <symbol minX="464" maxX="522" minY="379" maxY="437" name="equestrian-m"/>
+  <symbol minX="522" maxX="580" minY="379" maxY="437" name="mail-l"/>
+  <symbol minX="580" maxX="638" minY="379" maxY="437" name="fastfood-l"/>
+  <symbol minX="638" maxX="696" minY="379" maxY="437" name="lightrail-berlin-l"/>
+  <symbol minX="696" maxX="754" minY="379" maxY="437" name="lighthouse-l"/>
+  <symbol minX="754" maxX="812" minY="379" maxY="437" name="fire_station-l"/>
+  <symbol minX="812" maxX="870" minY="379" maxY="437" name="lift_gate-l"/>
+  <symbol minX="870" maxX="928" minY="379" maxY="437" name="library-l"/>
+  <symbol minX="928" maxX="986" minY="379" maxY="437" name="florist-l"/>
+  <symbol minX="986" maxX="1042" minY="379" maxY="437" name="laundry-m"/>
+  <symbol minX="1042" maxX="1100" minY="379" maxY="437" name="fountain-l"/>
+  <symbol minX="1100" maxX="1157" minY="379" maxY="437" name="laundry-l"/>
+  <symbol minX="1157" maxX="1215" minY="379" maxY="437" name="kiosk-l"/>
+  <symbol minX="1215" maxX="1273" minY="379" maxY="437" name="fuel-l"/>
+  <symbol minX="1273" maxX="1331" minY="379" maxY="437" name="kindergarten-m"/>
+  <symbol minX="1331" maxX="1389" minY="379" maxY="437" name="kindergarten-l"/>
+  <symbol minX="1389" maxX="1447" minY="379" maxY="437" name="funicular-l"/>
+  <symbol minX="1447" maxX="1505" minY="379" maxY="437" name="jewelry-l"/>
+  <symbol minX="1505" maxX="1563" minY="379" maxY="437" name="information-l"/>
+  <symbol minX="1563" maxX="1621" minY="379" maxY="437" name="furniture-l"/>
+  <symbol minX="1621" maxX="1677" minY="379" maxY="437" name="hunting-tower-m"/>
+  <symbol minX="1677" maxX="1735" minY="379" maxY="437" name="gallery-l"/>
+  <symbol minX="1735" maxX="1792" minY="379" maxY="437" name="hunting-tower-l"/>
+  <symbol minX="1792" maxX="1850" minY="379" maxY="437" name="hotel-l"/>
+  <symbol minX="1850" maxX="1908" minY="379" maxY="437" name="garden-l"/>
+  <symbol minX="1908" maxX="1966" minY="379" maxY="437" name="hospital-l"/>
+  <symbol minX="1966" maxX="2024" minY="379" maxY="437" name="historic-ship-l"/>
+  <symbol minX="0" maxX="58" minY="437" maxY="495" name="garden_center-l"/>
+  <symbol minX="58" maxX="114" minY="437" maxY="495" name="heliport-m"/>
+  <symbol minX="114" maxX="172" minY="437" maxY="495" name="gate-l"/>
+  <symbol minX="172" maxX="229" minY="437" maxY="495" name="heliport-l"/>
+  <symbol minX="229" maxX="287" minY="437" maxY="495" name="gift-l"/>
+  <symbol minX="287" maxX="345" minY="437" maxY="495" name="helipad-l"/>
+  <symbol minX="345" maxX="403" minY="437" maxY="495" name="golf-l"/>
+  <symbol minX="403" maxX="461" minY="437" maxY="495" name="hardware-l"/>
+  <symbol minX="461" maxX="519" minY="437" maxY="495" name="hand-m"/>
+  <symbol minX="519" maxX="577" minY="437" maxY="495" name="greengrocer-l"/>
+  <symbol minX="577" maxX="635" minY="437" maxY="495" name="hand-l"/>
+  <symbol minX="635" maxX="693" minY="437" maxY="495" name="grocery-l"/>
+  <symbol minX="693" maxX="751" minY="437" maxY="495" name="hairdresser-l"/>
+  <symbol minX="751" maxX="807" minY="437" maxY="493" name="museum-m"/>
+  <symbol minX="807" maxX="863" minY="437" maxY="493" name="grocery-m"/>
+  <symbol minX="863" maxX="919" minY="437" maxY="493" name="hairdresser-m"/>
+  <symbol minX="919" maxX="975" minY="437" maxY="493" name="greengrocer-m"/>
+  <symbol minX="975" maxX="1031" minY="437" maxY="493" name="australian-football-m"/>
+  <symbol minX="1031" maxX="1087" minY="437" maxY="493" name="bakery-m"/>
+  <symbol minX="1087" maxX="1143" minY="437" maxY="493" name="golf-m"/>
+  <symbol minX="1143" maxX="1199" minY="437" maxY="493" name="hardware-m"/>
+  <symbol minX="1199" maxX="1255" minY="437" maxY="493" name="gift-m"/>
+  <symbol minX="1255" maxX="1311" minY="437" maxY="493" name="helipad-m"/>
+  <symbol minX="1311" maxX="1367" minY="437" maxY="493" name="alcohol-m"/>
+  <symbol minX="1367" maxX="1423" minY="437" maxY="493" name="gate-m"/>
+  <symbol minX="1423" maxX="1479" minY="437" maxY="493" name="garden_center-m"/>
+  <symbol minX="1479" maxX="1535" minY="437" maxY="493" name="banknote-m"/>
+  <symbol minX="1535" maxX="1591" minY="437" maxY="493" name="alpine_hut-m"/>
+  <symbol minX="1591" maxX="1647" minY="437" maxY="493" name="historic-ship-m"/>
+  <symbol minX="1647" maxX="1703" minY="437" maxY="493" name="garden-m"/>
+  <symbol minX="1703" maxX="1759" minY="437" maxY="493" name="hospital-m"/>
+  <symbol minX="1759" maxX="1815" minY="437" maxY="493" name="bar-m"/>
+  <symbol minX="1815" maxX="1871" minY="437" maxY="493" name="america-football-m"/>
+  <symbol minX="1871" maxX="1927" minY="437" maxY="493" name="hotel-m"/>
+  <symbol minX="1927" maxX="1983" minY="437" maxY="493" name="archery-m"/>
+  <symbol minX="1983" maxX="2039" minY="437" maxY="493" name="gallery-m"/>
+  <symbol minX="0" maxX="56" minY="495" maxY="551" name="furniture-m"/>
+  <symbol minX="56" maxX="112" minY="495" maxY="551" name="baseball-m"/>
+  <symbol minX="112" maxX="168" minY="495" maxY="551" name="atm-m"/>
+  <symbol minX="168" maxX="224" minY="495" maxY="551" name="information-m"/>
+  <symbol minX="224" maxX="280" minY="495" maxY="551" name="zoo-m"/>
+  <symbol minX="280" maxX="336" minY="495" maxY="551" name="funicular-m"/>
+  <symbol minX="336" maxX="392" minY="495" maxY="551" name="jewelry-m"/>
+  <symbol minX="392" maxX="448" minY="495" maxY="551" name="windmill-m"/>
+  <symbol minX="448" maxX="504" minY="495" maxY="551" name="fuel-m"/>
+  <symbol minX="504" maxX="560" minY="495" maxY="551" name="basketball-m"/>
+  <symbol minX="560" maxX="616" minY="495" maxY="551" name="wayside_shrine-m"/>
+  <symbol minX="616" maxX="672" minY="495" maxY="551" name="kiosk-m"/>
+  <symbol minX="672" maxX="728" minY="495" maxY="551" name="fountain-m"/>
+  <symbol minX="728" maxX="784" minY="495" maxY="551" name="florist-m"/>
+  <symbol minX="784" maxX="840" minY="495" maxY="551" name="wayside_cross-m"/>
+  <symbol minX="840" maxX="896" minY="495" maxY="551" name="library-m"/>
+  <symbol minX="896" maxX="952" minY="495" maxY="551" name="bbq-m"/>
+  <symbol minX="952" maxX="1008" minY="495" maxY="551" name="fire_station-m"/>
+  <symbol minX="1008" maxX="1064" minY="495" maxY="551" name="lift_gate-m"/>
+  <symbol minX="1064" maxX="1120" minY="495" maxY="551" name="beach-m"/>
+  <symbol minX="1120" maxX="1176" minY="495" maxY="551" name="lighthouse-m"/>
+  <symbol minX="1176" maxX="1232" minY="495" maxY="551" name="volcano-m"/>
+  <symbol minX="1232" maxX="1288" minY="495" maxY="551" name="fastfood-m"/>
+  <symbol minX="1288" maxX="1344" minY="495" maxY="551" name="beauty-m"/>
+  <symbol minX="1344" maxX="1400" minY="495" maxY="551" name="vending-m"/>
+  <symbol minX="1400" maxX="1456" minY="495" maxY="551" name="tram-m"/>
+  <symbol minX="1456" maxX="1512" minY="495" maxY="551" name="mail-m"/>
+  <symbol minX="1512" maxX="1568" minY="495" maxY="551" name="train-m"/>
+  <symbol minX="1568" maxX="1624" minY="495" maxY="551" name="bicycle-m"/>
+  <symbol minX="1624" maxX="1680" minY="495" maxY="551" name="marketplace-m"/>
+  <symbol minX="1680" maxX="1736" minY="495" maxY="551" name="toys-m"/>
+  <symbol minX="1736" maxX="1792" minY="495" maxY="551" name="townhall-m"/>
+  <symbol minX="1792" maxX="1848" minY="495" maxY="551" name="book-shop-m"/>
+  <symbol minX="1848" maxX="1904" minY="495" maxY="551" name="military-m"/>
+  <symbol minX="1904" maxX="1960" minY="495" maxY="551" name="tourism-m"/>
+  <symbol minX="1960" maxX="2016" minY="495" maxY="551" name="tomb-m"/>
+  <symbol minX="0" maxX="56" minY="551" maxY="607" name="mobile_phone-m"/>
+  <symbol minX="56" maxX="112" minY="551" maxY="607" name="embassy-m"/>
+  <symbol minX="112" maxX="168" minY="551" maxY="607" name="monument-m"/>
+  <symbol minX="168" maxX="224" minY="551" maxY="607" name="boundary_stone-m"/>
+  <symbol minX="224" maxX="280" minY="551" maxY="607" name="electronics-m"/>
+  <symbol minX="280" maxX="336" minY="551" maxY="607" name="motel-m"/>
+  <symbol minX="336" maxX="392" minY="551" maxY="607" name="drugs"/>
+  <symbol minX="392" maxX="448" minY="551" maxY="607" name="toll_booth-m"/>
+  <symbol minX="448" maxX="504" minY="551" maxY="607" name="bowls-m"/>
+  <symbol minX="504" maxX="560" minY="551" maxY="607" name="toilets-m"/>
+  <symbol minX="560" maxX="616" minY="551" maxY="607" name="bus-m"/>
+  <symbol minX="616" maxX="672" minY="551" maxY="607" name="theatre-m"/>
+  <symbol minX="672" maxX="728" minY="551" maxY="607" name="tennis-m"/>
+  <symbol minX="728" maxX="784" minY="551" maxY="607" name="butcher-m"/>
+  <symbol minX="784" maxX="840" minY="551" maxY="607" name="taxi-m"/>
+  <symbol minX="840" maxX="896" minY="551" maxY="607" name="cable-car-m"/>
+  <symbol minX="896" maxX="952" minY="551" maxY="607" name="npark-m"/>
+  <symbol minX="952" maxX="1008" minY="551" maxY="607" name="swimming-m"/>
+  <symbol minX="1008" maxX="1064" minY="551" maxY="607" name="drinking-water-m"/>
+  <symbol minX="1064" maxX="1120" minY="551" maxY="607" name="nparkf-m "/>
+  <symbol minX="1120" maxX="1176" minY="551" maxY="607" name="nparkf-m"/>
+  <symbol minX="1176" maxX="1232" minY="551" maxY="607" name="sweets-m"/>
+  <symbol minX="1232" maxX="1288" minY="551" maxY="607" name="cafe-m"/>
+  <symbol minX="1288" maxX="1344" minY="551" maxY="607" name="subway-spb-m"/>
+  <symbol minX="1344" maxX="1400" minY="551" maxY="607" name="campsite-m"/>
+  <symbol minX="1400" maxX="1456" minY="551" maxY="607" name="subway-newyork-m"/>
+  <symbol minX="1456" maxX="1512" minY="551" maxY="607" name="optician-m"/>
+  <symbol minX="1512" maxX="1568" minY="551" maxY="607" name="doityourself-m"/>
+  <symbol minX="1568" maxX="1624" minY="551" maxY="607" name="park-m"/>
+  <symbol minX="1624" maxX="1680" minY="551" maxY="607" name="subway-m"/>
+  <symbol minX="1680" maxX="1736" minY="551" maxY="607" name="subway-entrance-m"/>
+  <symbol minX="1736" maxX="1792" minY="551" maxY="607" name="car_sharing-m"/>
+  <symbol minX="1792" maxX="1848" minY="551" maxY="607" name="dog_park-m"/>
+  <symbol minX="1848" maxX="1904" minY="551" maxY="607" name="parking-meter-m"/>
+  <symbol minX="1904" maxX="1960" minY="551" maxY="607" name="subway-entrance-2-m"/>
+  <symbol minX="1960" maxX="2016" minY="551" maxY="607" name="sports-m"/>
+  <symbol minX="0" maxX="56" minY="607" maxY="663" name="caravan_site-m"/>
+  <symbol minX="56" maxX="112" minY="607" maxY="663" name="soccer-m"/>
+  <symbol minX="112" maxX="168" minY="607" maxY="663" name="casino-m"/>
+  <symbol minX="168" maxX="224" minY="607" maxY="663" name="skiing-m"/>
+  <symbol minX="224" maxX="280" minY="607" maxY="663" name="shop-m"/>
+  <symbol minX="280" maxX="336" minY="607" maxY="663" name="pharmacy-2-m"/>
+  <symbol minX="336" maxX="392" minY="607" maxY="663" name="diving-m"/>
+  <symbol minX="392" maxX="448" minY="607" maxY="663" name="pharmacy-m"/>
+  <symbol minX="448" maxX="504" minY="607" maxY="663" name="cave-m"/>
+  <symbol minX="504" maxX="560" minY="607" maxY="663" name="department_store-m"/>
+  <symbol minX="560" maxX="616" minY="607" maxY="663" name="phone-m"/>
+  <symbol minX="616" maxX="672" minY="607" maxY="663" name="shop-bicycle-m"/>
+  <symbol minX="672" maxX="728" minY="607" maxY="663" name="shoes-m"/>
+  <symbol minX="728" maxX="784" minY="607" maxY="663" name="curling-m"/>
+  <symbol minX="784" maxX="840" minY="607" maxY="663" name="cemetery-m"/>
+  <symbol minX="840" maxX="896" minY="607" maxY="663" name="ship-m"/>
+  <symbol minX="896" maxX="952" minY="607" maxY="663" name="pitch-m"/>
+  <symbol minX="952" maxX="1008" minY="607" maxY="663" name="school-m"/>
+  <symbol minX="1008" maxX="1064" minY="607" maxY="663" name="chemist-m"/>
+  <symbol minX="1064" maxX="1120" minY="607" maxY="663" name="place-of-worship-m"/>
+  <symbol minX="1120" maxX="1176" minY="607" maxY="663" name="restaurant-m"/>
+  <symbol minX="1176" maxX="1232" minY="607" maxY="663" name="cinema-m"/>
+  <symbol minX="1232" maxX="1288" minY="607" maxY="663" name="police-m"/>
+  <symbol minX="1288" maxX="1344" minY="607" maxY="663" name="clothes-m"/>
+  <symbol minX="1344" maxX="1400" minY="607" maxY="663" name="cricket-m"/>
+  <symbol minX="1400" maxX="1456" minY="607" maxY="663" name="postbox-m"/>
+  <symbol minX="1456" maxX="1512" minY="607" maxY="663" name="convenience-m"/>
+  <symbol minX="1512" maxX="1568" minY="607" maxY="663" name="computer-m"/>
+  <symbol minX="1568" maxX="1624" minY="607" maxY="663" name="recycling-m"/>
+  <symbol minX="1624" maxX="1680" minY="607" maxY="663" name="college-m"/>
+  <symbol minX="1680" maxX="1736" minY="607" maxY="663" name="pub-m"/>
+  <symbol minX="1736" maxX="1787" minY="607" maxY="658" name="speedcam-l"/>
+  <symbol minX="1787" maxX="1838" minY="607" maxY="658" name="lightrail-berlin-m"/>
+  <symbol minX="1838" maxX="1889" minY="607" maxY="658" name="subway-berlin-l"/>
+  <symbol minX="1889" maxX="1940" minY="607" maxY="658" name="parking-l"/>
+  <symbol minX="1940" maxX="1998" minY="607" maxY="658" name="subway-moscow-l"/>
+  <symbol minX="0" maxX="51" minY="663" maxY="714" name="subway-rome-l"/>
+  <symbol minX="51" maxX="100" minY="663" maxY="712" name="route_from"/>
+  <symbol minX="100" maxX="147" minY="663" maxY="710" name="no-icon-tourism"/>
+  <symbol minX="147" maxX="194" minY="663" maxY="710" name="subway-paris-m"/>
+  <symbol minX="194" maxX="241" minY="663" maxY="710" name="subway-berlin-m"/>
+  <symbol minX="241" maxX="288" minY="663" maxY="710" name="no-icon-amenity"/>
+  <symbol minX="288" maxX="335" minY="663" maxY="710" name="no-icon-leisure"/>
+  <symbol minX="335" maxX="382" minY="663" maxY="710" name="no-icon-shop"/>
+  <symbol minX="382" maxX="436" minY="663" maxY="710" name="subway-moscow-m"/>
+  <symbol minX="436" maxX="483" minY="663" maxY="710" name="no-icon"/>
+  <symbol minX="483" maxX="530" minY="663" maxY="710" name="subway-rome-m"/>
+  <symbol minX="530" maxX="576" minY="663" maxY="709" name="current-position"/>
+  <symbol minX="576" maxX="618" minY="663" maxY="708" name="bcontrol-s"/>
+  <symbol minX="618" maxX="660" minY="663" maxY="708" name="picnic-s"/>
+  <symbol minX="660" maxX="702" minY="663" maxY="708" name="office-s"/>
+  <symbol minX="702" maxX="744" minY="663" maxY="708" name="waterfall-s"/>
+  <symbol minX="744" maxX="786" minY="663" maxY="708" name="hunting-tower-s"/>
+  <symbol minX="786" maxX="844" minY="663" maxY="708" name="subway-london-l"/>
+  <symbol minX="844" maxX="886" minY="663" maxY="708" name="remains-s"/>
+  <symbol minX="886" maxX="928" minY="663" maxY="708" name="beer-s"/>
+  <symbol minX="928" maxX="970" minY="663" maxY="708" name="heliport-s"/>
+  <symbol minX="970" maxX="1015" minY="663" maxY="708" name="airport-s"/>
+  <symbol minX="1015" maxX="1057" minY="663" maxY="705" name="skiing-s"/>
+  <symbol minX="1057" maxX="1099" minY="663" maxY="705" name="tennis-s"/>
+  <symbol minX="1099" maxX="1141" minY="663" maxY="705" name="golf-s"/>
+  <symbol minX="1141" maxX="1183" minY="663" maxY="705" name="soccer-s"/>
+  <symbol minX="1183" maxX="1225" minY="663" maxY="705" name="pub-s"/>
+  <symbol minX="1225" maxX="1267" minY="663" maxY="705" name="speedcam-m"/>
+  <symbol minX="1267" maxX="1309" minY="663" maxY="705" name="hand-s"/>
+  <symbol minX="1309" maxX="1351" minY="663" maxY="705" name="helipad-s"/>
+  <symbol minX="1351" maxX="1393" minY="663" maxY="705" name="alcohol-s"/>
+  <symbol minX="1393" maxX="1435" minY="663" maxY="705" name="college-s"/>
+  <symbol minX="1435" maxX="1477" minY="663" maxY="705" name="garden-s"/>
+  <symbol minX="1477" maxX="1519" minY="663" maxY="705" name="hospital-s"/>
+  <symbol minX="1519" maxX="1561" minY="663" maxY="705" name="gallery-s"/>
+  <symbol minX="1561" maxX="1619" minY="663" maxY="705" name="subway-barcelona-m"/>
+  <symbol minX="1619" maxX="1670" minY="663" maxY="705" name="subway-barcelona-s"/>
+  <symbol minX="1670" maxX="1712" minY="663" maxY="705" name="casino-s"/>
+  <symbol minX="1712" maxX="1754" minY="663" maxY="705" name="shop-s"/>
+  <symbol minX="1754" maxX="1796" minY="663" maxY="705" name="america-football-s"/>
+  <symbol minX="1796" maxX="1838" minY="663" maxY="705" name="bar-s"/>
+  <symbol minX="1838" maxX="1880" minY="663" maxY="705" name="subway-entrance-2-s"/>
+  <symbol minX="1880" maxX="1922" minY="663" maxY="705" name="subway-entrance-arrow"/>
+  <symbol minX="1922" maxX="1964" minY="663" maxY="705" name="hotel-s"/>
+  <symbol minX="1964" maxX="2006" minY="663" maxY="705" name="power-s"/>
+  <symbol minX="2006" maxX="2048" minY="663" maxY="705" name="subway-entrance-s"/>
+  <symbol minX="0" maxX="42" minY="714" maxY="756" name="recycling-s"/>
+  <symbol minX="42" maxX="84" minY="714" maxY="756" name="funicular-s"/>
+  <symbol minX="84" maxX="126" minY="714" maxY="756" name="zoo-s"/>
+  <symbol minX="126" maxX="168" minY="714" maxY="756" name="car-repair-s"/>
+  <symbol minX="168" maxX="210" minY="714" maxY="756" name="pharmacy-s"/>
+  <symbol minX="210" maxX="266" minY="714" maxY="756" name="subway-london-m"/>
+  <symbol minX="266" maxX="308" minY="714" maxY="756" name="information-s"/>
+  <symbol minX="308" maxX="350" minY="714" maxY="756" name="park-s"/>
+  <symbol minX="350" maxX="392" minY="714" maxY="756" name="baseball-s"/>
+  <symbol minX="392" maxX="450" minY="714" maxY="756" name="subway-madrid-m"/>
+  <symbol minX="450" maxX="492" minY="714" maxY="756" name="windmill-s"/>
+  <symbol minX="492" maxX="534" minY="714" maxY="756" name="fuel-s"/>
+  <symbol minX="534" maxX="576" minY="714" maxY="756" name="kindergarten-s"/>
+  <symbol minX="576" maxX="618" minY="714" maxY="756" name="fountain-s"/>
+  <symbol minX="618" maxX="660" minY="714" maxY="756" name="phone-s"/>
+  <symbol minX="660" maxX="702" minY="714" maxY="756" name="cave-s"/>
+  <symbol minX="702" maxX="744" minY="714" maxY="756" name="basketball-s"/>
+  <symbol minX="744" maxX="786" minY="714" maxY="756" name="campsite-s"/>
+  <symbol minX="786" maxX="828" minY="714" maxY="756" name="fire_station-s"/>
+  <symbol minX="828" maxX="870" minY="714" maxY="756" name="subway-newyork-s"/>
+  <symbol minX="870" maxX="912" minY="714" maxY="756" name="library-s"/>
+  <symbol minX="912" maxX="954" minY="714" maxY="756" name="dentist-s"/>
+  <symbol minX="954" maxX="996" minY="714" maxY="756" name="ship-s"/>
+  <symbol minX="996" maxX="1038" minY="714" maxY="756" name="police-s"/>
+  <symbol minX="1038" maxX="1080" minY="714" maxY="756" name="cinema-s"/>
+  <symbol minX="1080" maxX="1122" minY="714" maxY="756" name="cemetery-s"/>
+  <symbol minX="1122" maxX="1164" minY="714" maxY="756" name="fastfood-s"/>
+  <symbol minX="1164" maxX="1206" minY="714" maxY="756" name="subway-s"/>
+  <symbol minX="1206" maxX="1248" minY="714" maxY="756" name="cafe-s"/>
+  <symbol minX="1248" maxX="1290" minY="714" maxY="756" name="volcano-s"/>
+  <symbol minX="1290" maxX="1332" minY="714" maxY="756" name="subway-spb-s"/>
+  <symbol minX="1332" maxX="1374" minY="714" maxY="756" name="lighthouse-s"/>
+  <symbol minX="1374" maxX="1416" minY="714" maxY="756" name="place-of-worship-s"/>
+  <symbol minX="1416" maxX="1458" minY="714" maxY="756" name="tram-s"/>
+  <symbol minX="1458" maxX="1500" minY="714" maxY="756" name="equestrian-s"/>
+  <symbol minX="1500" maxX="1542" minY="714" maxY="756" name="train-s"/>
+  <symbol minX="1542" maxX="1584" minY="714" maxY="756" name="nparkf-s"/>
+  <symbol minX="1584" maxX="1626" minY="714" maxY="756" name="cable-car-s"/>
+  <symbol minX="1626" maxX="1668" minY="714" maxY="756" name="npark-s"/>
+  <symbol minX="1668" maxX="1710" minY="714" maxY="756" name="swimming-s"/>
+  <symbol minX="1710" maxX="1752" minY="714" maxY="756" name="drinking-water-s"/>
+  <symbol minX="1752" maxX="1794" minY="714" maxY="756" name="mail-s"/>
+  <symbol minX="1794" maxX="1836" minY="714" maxY="756" name="school-s"/>
+  <symbol minX="1836" maxX="1878" minY="714" maxY="756" name="pitch-s"/>
+  <symbol minX="1878" maxX="1920" minY="714" maxY="756" name="military-s"/>
+  <symbol minX="1920" maxX="1962" minY="714" maxY="756" name="bus-s"/>
+  <symbol minX="1962" maxX="2020" minY="714" maxY="756" name="metro-barcelona-m"/>
+  <symbol minX="0" maxX="42" minY="756" maxY="798" name="theatre-s"/>
+  <symbol minX="42" maxX="84" minY="756" maxY="798" name="bicycle-s"/>
+  <symbol minX="84" maxX="126" minY="756" maxY="798" name="restaurant-s"/>
+  <symbol minX="126" maxX="168" minY="756" maxY="798" name="toilets-s"/>
+  <symbol minX="168" maxX="210" minY="756" maxY="798" name="museum-s"/>
+  <symbol minX="210" maxX="252" minY="756" maxY="798" name="grocery-s"/>
+  <symbol minX="252" maxX="294" minY="756" maxY="798" name="monument-s"/>
+  <symbol minX="294" maxX="336" minY="756" maxY="798" name="embassy-s"/>
+  <symbol minX="336" maxX="378" minY="756" maxY="798" name="book-shop-s"/>
+  <symbol minX="378" maxX="420" minY="756" maxY="798" name="atm-s"/>
+  <symbol minX="420" maxX="462" minY="756" maxY="798" name="tourism-s"/>
+  <symbol minX="462" maxX="504" minY="756" maxY="798" name="townhall-s"/>
+  <symbol minX="504" maxX="562" minY="756" maxY="797" name="subway-madrid-l"/>
+  <symbol minX="562" maxX="620" minY="756" maxY="797" name="subway-barcelona-l"/>
+  <symbol minX="620" maxX="660" minY="756" maxY="796" name="parking-m"/>
+  <symbol minX="660" maxX="698" minY="756" maxY="796" name="s-arrow"/>
+  <symbol minX="698" maxX="736" minY="756" maxY="794" name="peak-l"/>
+  <symbol minX="736" maxX="774" minY="756" maxY="794" name="subway-paris-s"/>
+  <symbol minX="774" maxX="825" minY="756" maxY="794" name="subway-madrid-s"/>
+  <symbol minX="825" maxX="876" minY="756" maxY="794" name="metro-barcelona-s"/>
+  <symbol minX="876" maxX="914" minY="756" maxY="794" name="lightrail-berlin-s"/>
+  <symbol minX="914" maxX="970" minY="756" maxY="794" name="subway-kiev-m"/>
+  <symbol minX="970" maxX="1026" minY="756" maxY="794" name="subway-kiev-l"/>
+  <symbol minX="1026" maxX="1062" minY="756" maxY="792" name="api-result"/>
+  <symbol minX="1062" maxX="1098" minY="756" maxY="792" name="subway-moscow-s"/>
+  <symbol minX="1098" maxX="1132" minY="756" maxY="790" name="search-result"/>
+  <symbol minX="1132" maxX="1165" minY="756" maxY="789" name="parking-s"/>
+  <symbol minX="1165" maxX="1203" minY="756" maxY="789" name="bench"/>
+  <symbol minX="1203" maxX="1236" minY="756" maxY="789" name="subway-berlin-s"/>
+  <symbol minX="1236" maxX="1278" minY="756" maxY="789" name="subway-london-s"/>
+  <symbol minX="1278" maxX="1311" minY="756" maxY="789" name="subway-rome-s"/>
+  <symbol minX="1311" maxX="1344" minY="756" maxY="789" name="speedcam-s"/>
+  <symbol minX="1344" maxX="1400" minY="756" maxY="787" name="subway-minsk-l"/>
+  <symbol minX="1400" maxX="1433" minY="756" maxY="787" name="peakt-l"/>
+  <symbol minX="1433" maxX="1464" minY="756" maxY="787" name="star-l"/>
+  <symbol minX="1464" maxX="1495" minY="756" maxY="787" name="survey_point-l"/>
+  <symbol minX="1495" maxX="1524" minY="756" maxY="785" name="star-m"/>
+  <symbol minX="1524" maxX="1571" minY="756" maxY="785" name="subway-kiev-s"/>
+  <symbol minX="1571" maxX="1598" minY="756" maxY="783" name="subway-newyork-xs"/>
+  <symbol minX="1598" maxX="1625" minY="756" maxY="783" name="subway-xs"/>
+  <symbol minX="1625" maxX="1654" minY="756" maxY="783" name="peak-m"/>
+  <symbol minX="1654" maxX="1696" minY="756" maxY="783" name="railway-crossing"/>
+  <symbol minX="1696" maxX="1743" minY="756" maxY="783" name="subway-minsk-m"/>
+  <symbol minX="1743" maxX="1770" minY="756" maxY="783" name="survey_point-m"/>
+  <symbol minX="1770" maxX="1794" minY="756" maxY="780" name="crossing-l"/>
+  <symbol minX="1794" maxX="1818" minY="756" maxY="780" name="star-s"/>
+  <symbol minX="1818" maxX="1860" minY="756" maxY="780" name="subway-minsk-s"/>
+  <symbol minX="1860" maxX="1911" minY="756" maxY="778" name="arrow-m"/>
+  <symbol minX="1911" maxX="1935" minY="756" maxY="778" name="peak-s"/>
+  <symbol minX="1935" maxX="1959" minY="756" maxY="778" name="peakt-m"/>
+  <symbol minX="1959" maxX="1981" minY="756" maxY="778" name="survey_point-s"/>
+  <symbol minX="1981" maxX="2001" minY="756" maxY="776" name="entrance-s"/>
+  <symbol minX="2001" maxX="2021" minY="756" maxY="776" name="crossing-m"/>
+  <symbol minX="2021" maxX="2041" minY="756" maxY="774" name="peakt-s"/>
+  <symbol minX="0" maxX="15" minY="798" maxY="813" name="dot-m"/>
+  <symbol minX="15" maxX="30" minY="798" maxY="813" name="none"/>
+  <symbol minX="30" maxX="68" minY="798" maxY="813" name="arrow-s"/>
+  <symbol minX="68" maxX="83" minY="798" maxY="813" name="crossing-s"/>
+  <symbol minX="83" maxX="98" minY="798" maxY="813" name="tree-l"/>
+  <symbol minX="98" maxX="111" minY="798" maxY="811" name="tree-m"/>
+  <symbol minX="111" maxX="124" minY="798" maxY="811" name="entrance-xs"/>
+  <symbol minX="124" maxX="135" minY="798" maxY="809" name="dot-s-light"/>
+  <symbol minX="135" maxX="146" minY="798" maxY="809" name="zero-icon"/>
+  <symbol minX="146" maxX="157" minY="798" maxY="809" name="tree-s"/>
+  <symbol minX="157" maxX="168" minY="798" maxY="809" name="dot-s"/>
  </file>
 </root>
diff --git a/data/resources-xxhdpi_dark/symbols.png b/data/resources-xxhdpi_dark/symbols.png
index bc5be3fd19..ff5509c1e1 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 f78eeaac46..c49235b946 100644
--- a/data/resources-xxhdpi_dark/symbols.sdf
+++ b/data/resources-xxhdpi_dark/symbols.sdf
@@ -19,11 +19,11 @@
   <symbol minX="1642" maxX="1685" minY="0" maxY="85" name="placemark-yellow"/>
   <symbol minX="1685" maxX="1728" minY="0" maxY="85" name="placemark-purple"/>
   <symbol minX="1728" maxX="1786" minY="0" maxY="58" name="airport-l"/>
-  <symbol minX="1786" maxX="1844" minY="0" maxY="58" name="monument-l"/>
+  <symbol minX="1786" maxX="1844" minY="0" maxY="58" name="gift-l"/>
   <symbol minX="1844" maxX="1902" minY="0" maxY="58" name="australian-football-l"/>
-  <symbol minX="1902" maxX="1960" minY="0" maxY="58" name="shoes-l"/>
+  <symbol minX="1902" maxX="1960" minY="0" maxY="58" name="ship-l"/>
   <symbol minX="1960" maxX="2018" minY="0" maxY="58" name="bakery-l"/>
-  <symbol minX="0" maxX="58" minY="205" maxY="263" name="ship-l"/>
+  <symbol minX="0" maxX="58" minY="205" maxY="263" name="shoes-l"/>
   <symbol minX="58" maxX="116" minY="205" maxY="263" name="school-l"/>
   <symbol minX="116" maxX="173" minY="205" maxY="263" name="bank-l"/>
   <symbol minX="173" maxX="229" minY="205" maxY="263" name="bank-m"/>
@@ -33,13 +33,13 @@
   <symbol minX="402" maxX="460" minY="205" maxY="263" name="restaurant-l"/>
   <symbol minX="460" maxX="518" minY="205" maxY="263" name="airport-m"/>
   <symbol minX="518" maxX="576" minY="205" maxY="263" name="baseball-l"/>
-  <symbol minX="576" maxX="634" minY="205" maxY="263" name="shop-l copy"/>
+  <symbol minX="576" maxX="634" minY="205" maxY="263" name="remains-l"/>
   <symbol minX="634" maxX="692" minY="205" maxY="263" name="alcohol-l"/>
   <symbol minX="692" maxX="750" minY="205" maxY="263" name="basketball-l"/>
-  <symbol minX="750" maxX="808" minY="205" maxY="263" name="remains-l"/>
-  <symbol minX="808" maxX="866" minY="205" maxY="263" name="shop-l"/>
+  <symbol minX="750" maxX="808" minY="205" maxY="263" name="shop-l copy"/>
+  <symbol minX="808" maxX="866" minY="205" maxY="263" name="recycling-l"/>
   <symbol minX="866" maxX="924" minY="205" maxY="263" name="bbq-l"/>
-  <symbol minX="924" maxX="982" minY="205" maxY="263" name="recycling-l"/>
+  <symbol minX="924" maxX="982" minY="205" maxY="263" name="shop-l"/>
   <symbol minX="982" maxX="1040" minY="205" maxY="263" name="bcontrol-l"/>
   <symbol minX="1040" maxX="1098" minY="205" maxY="263" name="pub-l"/>
   <symbol minX="1098" maxX="1156" minY="205" maxY="263" name="power-m"/>
@@ -48,27 +48,27 @@
   <symbol minX="1272" maxX="1330" minY="205" maxY="263" name="beauty-l"/>
   <symbol minX="1330" maxX="1388" minY="205" maxY="263" name="postbox-l"/>
   <symbol minX="1388" maxX="1446" minY="205" maxY="263" name="beer-l"/>
-  <symbol minX="1446" maxX="1504" minY="205" maxY="263" name="skiing-l"/>
+  <symbol minX="1446" maxX="1504" minY="205" maxY="263" name="police-l"/>
   <symbol minX="1504" maxX="1562" minY="205" maxY="263" name="alpine_hut-l"/>
-  <symbol minX="1562" maxX="1620" minY="205" maxY="263" name="police-l"/>
+  <symbol minX="1562" maxX="1620" minY="205" maxY="263" name="skiing-l"/>
   <symbol minX="1620" maxX="1678" minY="205" maxY="263" name="bicycle-l"/>
   <symbol minX="1678" maxX="1736" minY="205" maxY="263" name="place-of-worship-l"/>
   <symbol minX="1736" maxX="1794" minY="205" maxY="263" name="america-football-l"/>
   <symbol minX="1794" maxX="1852" minY="205" maxY="263" name="book-shop-l"/>
-  <symbol minX="1852" maxX="1910" minY="205" maxY="263" name="soccer-l"/>
-  <symbol minX="1910" maxX="1968" minY="205" maxY="263" name="pitch-l"/>
+  <symbol minX="1852" maxX="1910" minY="205" maxY="263" name="pitch-l"/>
+  <symbol minX="1910" maxX="1968" minY="205" maxY="263" name="soccer-l"/>
   <symbol minX="1968" maxX="2026" minY="205" maxY="263" name="boundary_stone-l"/>
   <symbol minX="0" maxX="58" minY="263" maxY="321" name="picnic-l"/>
   <symbol minX="58" maxX="116" minY="263" maxY="321" name="bowls-l"/>
   <symbol minX="116" maxX="174" minY="263" maxY="321" name="phone-l"/>
   <symbol minX="174" maxX="232" minY="263" maxY="321" name="bus-l"/>
-  <symbol minX="232" maxX="290" minY="263" maxY="321" name="sports-l"/>
+  <symbol minX="232" maxX="290" minY="263" maxY="321" name="pharmacy-l"/>
   <symbol minX="290" maxX="348" minY="263" maxY="321" name="archery-l"/>
   <symbol minX="348" maxX="406" minY="263" maxY="321" name="butcher-l"/>
-  <symbol minX="406" maxX="464" minY="263" maxY="321" name="pharmacy-l"/>
+  <symbol minX="406" maxX="464" minY="263" maxY="321" name="sports-l"/>
   <symbol minX="464" maxX="522" minY="263" maxY="321" name="cable-car-l"/>
-  <symbol minX="522" maxX="580" minY="263" maxY="321" name="subway-entrance-l"/>
-  <symbol minX="580" maxX="638" minY="263" maxY="321" name="peak-l"/>
+  <symbol minX="522" maxX="580" minY="263" maxY="321" name="peak-l"/>
+  <symbol minX="580" maxX="638" minY="263" maxY="321" name="subway-entrance-l"/>
   <symbol minX="638" maxX="696" minY="263" maxY="321" name="cafe-l"/>
   <symbol minX="696" maxX="754" minY="263" maxY="321" name="parking-meter-l"/>
   <symbol minX="754" maxX="812" minY="263" maxY="321" name="atm-l"/>
@@ -79,9 +79,9 @@
   <symbol minX="1044" maxX="1102" minY="263" maxY="321" name="optician-l"/>
   <symbol minX="1102" maxX="1160" minY="263" maxY="321" name="office-l"/>
   <symbol minX="1160" maxX="1218" minY="263" maxY="321" name="car_sharing-l"/>
-  <symbol minX="1218" maxX="1276" minY="263" maxY="321" name="subway-newyork-l"/>
+  <symbol minX="1218" maxX="1276" minY="263" maxY="321" name="nparkf-l"/>
   <symbol minX="1276" maxX="1334" minY="263" maxY="321" name="caravan_site-l"/>
-  <symbol minX="1334" maxX="1392" minY="263" maxY="321" name="nparkf-l"/>
+  <symbol minX="1334" maxX="1392" minY="263" maxY="321" name="subway-newyork-l"/>
   <symbol minX="1392" maxX="1450" minY="263" maxY="321" name="casino-l"/>
   <symbol minX="1450" maxX="1508" minY="263" maxY="321" name="npark-l"/>
   <symbol minX="1508" maxX="1566" minY="263" maxY="321" name="zoo-l"/>
@@ -92,373 +92,376 @@
   <symbol minX="1798" maxX="1856" minY="263" maxY="321" name="sweets-l"/>
   <symbol minX="1856" maxX="1914" minY="263" maxY="321" name="windmill-l"/>
   <symbol minX="1914" maxX="1972" minY="263" maxY="321" name="chemist-l"/>
-  <symbol minX="1972" maxX="2030" minY="263" maxY="321" name="swimming-l"/>
+  <symbol minX="1972" maxX="2030" minY="263" maxY="321" name="museum-l"/>
   <symbol minX="0" maxX="58" minY="321" maxY="379" name="cinema-l"/>
-  <symbol minX="58" maxX="116" minY="321" maxY="379" name="museum-l"/>
-  <symbol minX="116" maxX="174" minY="321" maxY="379" name="motel-l"/>
+  <symbol minX="58" maxX="116" minY="321" maxY="379" name="motel-l"/>
+  <symbol minX="116" maxX="174" minY="321" maxY="379" name="swimming-l"/>
   <symbol minX="174" maxX="232" minY="321" maxY="379" name="clothes-l"/>
-  <symbol minX="232" maxX="290" minY="321" maxY="379" name="taxi-l"/>
+  <symbol minX="232" maxX="290" minY="321" maxY="379" name="monument-l"/>
   <symbol minX="290" maxX="348" minY="321" maxY="379" name="college-l"/>
   <symbol minX="348" maxX="406" minY="321" maxY="379" name="mobile_phone-l"/>
   <symbol minX="406" maxX="464" minY="321" maxY="379" name="wayside_shrine-l"/>
   <symbol minX="464" maxX="522" minY="321" maxY="379" name="computer-l"/>
-  <symbol minX="522" maxX="580" minY="321" maxY="379" name="military-l"/>
+  <symbol minX="522" maxX="580" minY="321" maxY="379" name="taxi-l"/>
   <symbol minX="580" maxX="638" minY="321" maxY="379" name="convenience-l"/>
-  <symbol minX="638" maxX="696" minY="321" maxY="379" name="tennis-l"/>
+  <symbol minX="638" maxX="696" minY="321" maxY="379" name="military-l"/>
   <symbol minX="696" maxX="754" minY="321" maxY="379" name="cricket-l"/>
-  <symbol minX="754" maxX="812" minY="321" maxY="379" name="marketplace-l"/>
+  <symbol minX="754" maxX="812" minY="321" maxY="379" name="tennis-l"/>
   <symbol minX="812" maxX="870" minY="321" maxY="379" name="curling-l"/>
-  <symbol minX="870" maxX="928" minY="321" maxY="379" name="theatre-l"/>
-  <symbol minX="928" maxX="986" minY="321" maxY="379" name="department_store-l"/>
-  <symbol minX="986" maxX="1044" minY="321" maxY="379" name="mail-l"/>
-  <symbol minX="1044" maxX="1102" minY="321" maxY="379" name="diving-l"/>
-  <symbol minX="1102" maxX="1160" minY="321" maxY="379" name="lightrail-berlin-l"/>
-  <symbol minX="1160" maxX="1218" minY="321" maxY="379" name="dog_park-l"/>
-  <symbol minX="1218" maxX="1276" minY="321" maxY="379" name="toilets-l"/>
-  <symbol minX="1276" maxX="1334" minY="321" maxY="379" name="doityourself-l"/>
-  <symbol minX="1334" maxX="1392" minY="321" maxY="379" name="lighthouse-l"/>
-  <symbol minX="1392" maxX="1450" minY="321" maxY="379" name="lift_gate-l"/>
-  <symbol minX="1450" maxX="1508" minY="321" maxY="379" name="wayside_cross-l"/>
-  <symbol minX="1508" maxX="1566" minY="321" maxY="379" name="library-l"/>
-  <symbol minX="1566" maxX="1624" minY="321" maxY="379" name="drinking-water-l"/>
-  <symbol minX="1624" maxX="1682" minY="321" maxY="379" name="laundry-l"/>
+  <symbol minX="870" maxX="928" minY="321" maxY="379" name="marketplace-l"/>
+  <symbol minX="928" maxX="986" minY="321" maxY="379" name="dentist-l"/>
+  <symbol minX="986" maxX="1044" minY="321" maxY="379" name="dentist-m"/>
+  <symbol minX="1044" maxX="1102" minY="321" maxY="379" name="mail-l"/>
+  <symbol minX="1102" maxX="1160" minY="321" maxY="379" name="department_store-l"/>
+  <symbol minX="1160" maxX="1218" minY="321" maxY="379" name="theatre-l"/>
+  <symbol minX="1218" maxX="1276" minY="321" maxY="379" name="diving-l"/>
+  <symbol minX="1276" maxX="1334" minY="321" maxY="379" name="lightrail-berlin-l"/>
+  <symbol minX="1334" maxX="1392" minY="321" maxY="379" name="dog_park-l"/>
+  <symbol minX="1392" maxX="1450" minY="321" maxY="379" name="lighthouse-l"/>
+  <symbol minX="1450" maxX="1508" minY="321" maxY="379" name="doityourself-l"/>
+  <symbol minX="1508" maxX="1566" minY="321" maxY="379" name="lift_gate-l"/>
+  <symbol minX="1566" maxX="1624" minY="321" maxY="379" name="wayside_cross-l"/>
+  <symbol minX="1624" maxX="1682" minY="321" maxY="379" name="toilets-l"/>
   <symbol minX="1682" maxX="1740" minY="321" maxY="379" name="waterfall-l"/>
-  <symbol minX="1740" maxX="1798" minY="321" maxY="379" name="kiosk-l"/>
-  <symbol minX="1798" maxX="1856" minY="321" maxY="379" name="electronics-l"/>
-  <symbol minX="1856" maxX="1914" minY="321" maxY="379" name="toll_booth-l"/>
-  <symbol minX="1914" maxX="1972" minY="321" maxY="379" name="embassy-l"/>
-  <symbol minX="1972" maxX="2030" minY="321" maxY="379" name="kindergarten-m"/>
-  <symbol minX="0" maxX="58" minY="379" maxY="437" name="kindergarten-l"/>
-  <symbol minX="58" maxX="116" minY="379" maxY="437" name="volcano-l"/>
-  <symbol minX="116" maxX="174" minY="379" maxY="437" name="jewelry-l"/>
-  <symbol minX="174" maxX="232" minY="379" maxY="437" name="equestrian-l"/>
-  <symbol minX="232" maxX="290" minY="379" maxY="437" name="equestrian-m"/>
-  <symbol minX="290" maxX="348" minY="379" maxY="437" name="fastfood-l"/>
-  <symbol minX="348" maxX="406" minY="379" maxY="437" name="information-l"/>
-  <symbol minX="406" maxX="464" minY="379" maxY="437" name="vending-l"/>
-  <symbol minX="464" maxX="522" minY="379" maxY="437" name="fire_station-l"/>
-  <symbol minX="522" maxX="580" minY="379" maxY="437" name="hunting-tower-l"/>
-  <symbol minX="580" maxX="638" minY="379" maxY="437" name="tomb-l"/>
-  <symbol minX="638" maxX="696" minY="379" maxY="437" name="florist-l"/>
-  <symbol minX="696" maxX="754" minY="379" maxY="437" name="hotel-l"/>
-  <symbol minX="754" maxX="812" minY="379" maxY="437" name="fountain-l"/>
-  <symbol minX="812" maxX="870" minY="379" maxY="437" name="hospital-l"/>
-  <symbol minX="870" maxX="928" minY="379" maxY="437" name="tram-l"/>
-  <symbol minX="928" maxX="986" minY="379" maxY="437" name="fuel-l copy"/>
-  <symbol minX="986" maxX="1044" minY="379" maxY="437" name="fuel-l"/>
-  <symbol minX="1044" maxX="1102" minY="379" maxY="437" name="historic-ship-l"/>
-  <symbol minX="1102" maxX="1160" minY="379" maxY="437" name="tourism-l"/>
-  <symbol minX="1160" maxX="1218" minY="379" maxY="437" name="funicular-l"/>
-  <symbol minX="1218" maxX="1276" minY="379" maxY="437" name="heliport-l"/>
+  <symbol minX="1740" maxX="1798" minY="321" maxY="379" name="drinking-water-l"/>
+  <symbol minX="1798" maxX="1856" minY="321" maxY="379" name="library-l"/>
+  <symbol minX="1856" maxX="1914" minY="321" maxY="379" name="laundry-l"/>
+  <symbol minX="1914" maxX="1972" minY="321" maxY="379" name="kiosk-l"/>
+  <symbol minX="1972" maxX="2030" minY="321" maxY="379" name="electronics-l"/>
+  <symbol minX="0" maxX="58" minY="379" maxY="437" name="kindergarten-m"/>
+  <symbol minX="58" maxX="116" minY="379" maxY="437" name="embassy-l"/>
+  <symbol minX="116" maxX="174" minY="379" maxY="437" name="kindergarten-l"/>
+  <symbol minX="174" maxX="232" minY="379" maxY="437" name="volcano-l"/>
+  <symbol minX="232" maxX="290" minY="379" maxY="437" name="jewelry-l"/>
+  <symbol minX="290" maxX="348" minY="379" maxY="437" name="vending-l"/>
+  <symbol minX="348" maxX="406" minY="379" maxY="437" name="equestrian-l"/>
+  <symbol minX="406" maxX="464" minY="379" maxY="437" name="equestrian-m"/>
+  <symbol minX="464" maxX="522" minY="379" maxY="437" name="fastfood-l"/>
+  <symbol minX="522" maxX="580" minY="379" maxY="437" name="toll_booth-l"/>
+  <symbol minX="580" maxX="638" minY="379" maxY="437" name="information-l"/>
+  <symbol minX="638" maxX="696" minY="379" maxY="437" name="fire_station-l"/>
+  <symbol minX="696" maxX="754" minY="379" maxY="437" name="hunting-tower-l"/>
+  <symbol minX="754" maxX="812" minY="379" maxY="437" name="tram-l"/>
+  <symbol minX="812" maxX="870" minY="379" maxY="437" name="florist-l"/>
+  <symbol minX="870" maxX="928" minY="379" maxY="437" name="hotel-l"/>
+  <symbol minX="928" maxX="986" minY="379" maxY="437" name="fountain-l"/>
+  <symbol minX="986" maxX="1044" minY="379" maxY="437" name="tomb-l"/>
+  <symbol minX="1044" maxX="1102" minY="379" maxY="437" name="hospital-l"/>
+  <symbol minX="1102" maxX="1160" minY="379" maxY="437" name="fuel-l copy"/>
+  <symbol minX="1160" maxX="1218" minY="379" maxY="437" name="fuel-l"/>
+  <symbol minX="1218" maxX="1276" minY="379" maxY="437" name="historic-ship-l"/>
   <symbol minX="1276" maxX="1334" minY="379" maxY="437" name="train-l"/>
-  <symbol minX="1334" maxX="1392" minY="379" maxY="437" name="furniture-l"/>
-  <symbol minX="1392" maxX="1450" minY="379" maxY="437" name="helipad-l"/>
-  <symbol minX="1450" maxX="1508" minY="379" maxY="437" name="gallery-l"/>
-  <symbol minX="1508" maxX="1566" minY="379" maxY="437" name="hardware-l"/>
-  <symbol minX="1566" maxX="1624" minY="379" maxY="437" name="hand-m"/>
-  <symbol minX="1624" maxX="1682" minY="379" maxY="437" name="garden-l"/>
-  <symbol minX="1682" maxX="1740" minY="379" maxY="437" name="hand-l"/>
+  <symbol minX="1334" maxX="1392" minY="379" maxY="437" name="funicular-l"/>
+  <symbol minX="1392" maxX="1450" minY="379" maxY="437" name="heliport-l"/>
+  <symbol minX="1450" maxX="1508" minY="379" maxY="437" name="tourism-l"/>
+  <symbol minX="1508" maxX="1566" minY="379" maxY="437" name="furniture-l"/>
+  <symbol minX="1566" maxX="1624" minY="379" maxY="437" name="helipad-l"/>
+  <symbol minX="1624" maxX="1682" minY="379" maxY="437" name="gallery-l"/>
+  <symbol minX="1682" maxX="1740" minY="379" maxY="437" name="hardware-l"/>
   <symbol minX="1740" maxX="1798" minY="379" maxY="437" name="toys-l"/>
-  <symbol minX="1798" maxX="1856" minY="379" maxY="437" name="garden_center-l"/>
-  <symbol minX="1856" maxX="1914" minY="379" maxY="437" name="hairdresser-l"/>
-  <symbol minX="1914" maxX="1972" minY="379" maxY="437" name="gate-l"/>
-  <symbol minX="1972" maxX="2030" minY="379" maxY="437" name="townhall-l"/>
-  <symbol minX="0" maxX="58" minY="437" maxY="495" name="gift-l"/>
-  <symbol minX="58" maxX="116" minY="437" maxY="495" name="grocery-l"/>
-  <symbol minX="116" maxX="174" minY="437" maxY="495" name="golf-l"/>
+  <symbol minX="1798" maxX="1856" minY="379" maxY="437" name="garden-l"/>
+  <symbol minX="1856" maxX="1914" minY="379" maxY="437" name="hand-m"/>
+  <symbol minX="1914" maxX="1972" minY="379" maxY="437" name="hand-l"/>
+  <symbol minX="1972" maxX="2030" minY="379" maxY="437" name="garden_center-l"/>
+  <symbol minX="0" maxX="58" minY="437" maxY="495" name="hairdresser-l"/>
+  <symbol minX="58" maxX="116" minY="437" maxY="495" name="gate-l"/>
+  <symbol minX="116" maxX="174" minY="437" maxY="495" name="grocery-l"/>
   <symbol minX="174" maxX="232" minY="437" maxY="495" name="greengrocer-l"/>
-  <symbol minX="232" maxX="288" minY="437" maxY="493" name="townhall-m"/>
-  <symbol minX="288" maxX="344" minY="437" maxY="493" name="golf-m"/>
-  <symbol minX="344" maxX="400" minY="437" maxY="493" name="greengrocer-m"/>
-  <symbol minX="400" maxX="456" minY="437" maxY="493" name="gift-m"/>
-  <symbol minX="456" maxX="512" minY="437" maxY="493" name="grocery-m"/>
-  <symbol minX="512" maxX="568" minY="437" maxY="493" name="gate-m"/>
-  <symbol minX="568" maxX="624" minY="437" maxY="493" name="garden_center-m"/>
-  <symbol minX="624" maxX="680" minY="437" maxY="493" name="hairdresser-m"/>
-  <symbol minX="680" maxX="736" minY="437" maxY="493" name="garden-m"/>
-  <symbol minX="736" maxX="792" minY="437" maxY="493" name="toys-m"/>
-  <symbol minX="792" maxX="848" minY="437" maxY="493" name="gallery-m"/>
-  <symbol minX="848" maxX="904" minY="437" maxY="493" name="hardware-m"/>
-  <symbol minX="904" maxX="960" minY="437" maxY="493" name="furniture-m"/>
-  <symbol minX="960" maxX="1016" minY="437" maxY="493" name="helipad-m"/>
-  <symbol minX="1016" maxX="1072" minY="437" maxY="493" name="tourism-m"/>
-  <symbol minX="1072" maxX="1128" minY="437" maxY="493" name="funicular-m"/>
-  <symbol minX="1128" maxX="1184" minY="437" maxY="493" name="heliport-m"/>
-  <symbol minX="1184" maxX="1240" minY="437" maxY="493" name="train-m"/>
-  <symbol minX="1240" maxX="1296" minY="437" maxY="493" name="fuel-m"/>
-  <symbol minX="1296" maxX="1352" minY="437" maxY="493" name="historic-ship-m"/>
-  <symbol minX="1352" maxX="1408" minY="437" maxY="493" name="fountain-m"/>
-  <symbol minX="1408" maxX="1464" minY="437" maxY="493" name="hospital-m"/>
-  <symbol minX="1464" maxX="1520" minY="437" maxY="493" name="tomb-m"/>
-  <symbol minX="1520" maxX="1576" minY="437" maxY="493" name="florist-m"/>
-  <symbol minX="1576" maxX="1632" minY="437" maxY="493" name="hotel-m"/>
-  <symbol minX="1632" maxX="1688" minY="437" maxY="493" name="tram-m"/>
-  <symbol minX="1688" maxX="1744" minY="437" maxY="493" name="fire_station-m"/>
-  <symbol minX="1744" maxX="1800" minY="437" maxY="493" name="hunting-tower-m"/>
-  <symbol minX="1800" maxX="1856" minY="437" maxY="493" name="fastfood-m"/>
-  <symbol minX="1856" maxX="1912" minY="437" maxY="493" name="information-m"/>
-  <symbol minX="1912" maxX="1968" minY="437" maxY="493" name="toll_booth-m"/>
-  <symbol minX="1968" maxX="2024" minY="437" maxY="493" name="vending-m"/>
-  <symbol minX="0" maxX="56" minY="495" maxY="551" name="jewelry-m"/>
-  <symbol minX="56" maxX="112" minY="495" maxY="551" name="volcano-m"/>
-  <symbol minX="112" maxX="168" minY="495" maxY="551" name="embassy-m"/>
-  <symbol minX="168" maxX="224" minY="495" maxY="551" name="electronics-m"/>
-  <symbol minX="224" maxX="280" minY="495" maxY="551" name="drugs"/>
-  <symbol minX="280" maxX="336" minY="495" maxY="551" name="kiosk-m"/>
-  <symbol minX="336" maxX="392" minY="495" maxY="551" name="drinking-water-m"/>
-  <symbol minX="392" maxX="448" minY="495" maxY="551" name="laundry-m"/>
-  <symbol minX="448" maxX="504" minY="495" maxY="551" name="waterfall-m"/>
-  <symbol minX="504" maxX="560" minY="495" maxY="551" name="library-m"/>
-  <symbol minX="560" maxX="616" minY="495" maxY="551" name="toilets-m"/>
-  <symbol minX="616" maxX="672" minY="495" maxY="551" name="wayside_cross-m"/>
-  <symbol minX="672" maxX="728" minY="495" maxY="551" name="lift_gate-m"/>
-  <symbol minX="728" maxX="784" minY="495" maxY="551" name="doityourself-m"/>
-  <symbol minX="784" maxX="840" minY="495" maxY="551" name="lighthouse-m"/>
-  <symbol minX="840" maxX="896" minY="495" maxY="551" name="dog_park-m"/>
-  <symbol minX="896" maxX="952" minY="495" maxY="551" name="diving-m"/>
-  <symbol minX="952" maxX="1008" minY="495" maxY="551" name="australian-football-m"/>
+  <symbol minX="232" maxX="290" minY="437" maxY="495" name="townhall-l"/>
+  <symbol minX="290" maxX="348" minY="437" maxY="495" name="golf-l"/>
+  <symbol minX="348" maxX="404" minY="437" maxY="493" name="golf-m"/>
+  <symbol minX="404" maxX="460" minY="437" maxY="493" name="gift-m"/>
+  <symbol minX="460" maxX="516" minY="437" maxY="493" name="mobile_phone-m"/>
+  <symbol minX="516" maxX="572" minY="437" maxY="493" name="greengrocer-m"/>
+  <symbol minX="572" maxX="628" minY="437" maxY="493" name="gate-m"/>
+  <symbol minX="628" maxX="684" minY="437" maxY="493" name="grocery-m"/>
+  <symbol minX="684" maxX="740" minY="437" maxY="493" name="tourism-m"/>
+  <symbol minX="740" maxX="796" minY="437" maxY="493" name="garden_center-m"/>
+  <symbol minX="796" maxX="852" minY="437" maxY="493" name="hairdresser-m"/>
+  <symbol minX="852" maxX="908" minY="437" maxY="493" name="townhall-m"/>
+  <symbol minX="908" maxX="964" minY="437" maxY="493" name="garden-m"/>
+  <symbol minX="964" maxX="1020" minY="437" maxY="493" name="gallery-m"/>
+  <symbol minX="1020" maxX="1076" minY="437" maxY="493" name="hardware-m"/>
+  <symbol minX="1076" maxX="1132" minY="437" maxY="493" name="furniture-m"/>
+  <symbol minX="1132" maxX="1188" minY="437" maxY="493" name="helipad-m"/>
+  <symbol minX="1188" maxX="1244" minY="437" maxY="493" name="toys-m"/>
+  <symbol minX="1244" maxX="1300" minY="437" maxY="493" name="funicular-m"/>
+  <symbol minX="1300" maxX="1356" minY="437" maxY="493" name="heliport-m"/>
+  <symbol minX="1356" maxX="1412" minY="437" maxY="493" name="tomb-m"/>
+  <symbol minX="1412" maxX="1468" minY="437" maxY="493" name="fuel-m"/>
+  <symbol minX="1468" maxX="1524" minY="437" maxY="493" name="historic-ship-m"/>
+  <symbol minX="1524" maxX="1580" minY="437" maxY="493" name="train-m"/>
+  <symbol minX="1580" maxX="1636" minY="437" maxY="493" name="hospital-m"/>
+  <symbol minX="1636" maxX="1692" minY="437" maxY="493" name="fountain-m"/>
+  <symbol minX="1692" maxX="1748" minY="437" maxY="493" name="florist-m"/>
+  <symbol minX="1748" maxX="1804" minY="437" maxY="493" name="hotel-m"/>
+  <symbol minX="1804" maxX="1860" minY="437" maxY="493" name="toll_booth-m"/>
+  <symbol minX="1860" maxX="1916" minY="437" maxY="493" name="fire_station-m"/>
+  <symbol minX="1916" maxX="1972" minY="437" maxY="493" name="hunting-tower-m"/>
+  <symbol minX="1972" maxX="2028" minY="437" maxY="493" name="tram-m"/>
+  <symbol minX="0" maxX="56" minY="495" maxY="551" name="information-m"/>
+  <symbol minX="56" maxX="112" minY="495" maxY="551" name="fastfood-m"/>
+  <symbol minX="112" maxX="168" minY="495" maxY="551" name="vending-m"/>
+  <symbol minX="168" maxX="224" minY="495" maxY="551" name="jewelry-m"/>
+  <symbol minX="224" maxX="280" minY="495" maxY="551" name="embassy-m"/>
+  <symbol minX="280" maxX="336" minY="495" maxY="551" name="electronics-m"/>
+  <symbol minX="336" maxX="392" minY="495" maxY="551" name="toilets-m"/>
+  <symbol minX="392" maxX="448" minY="495" maxY="551" name="drugs"/>
+  <symbol minX="448" maxX="504" minY="495" maxY="551" name="kiosk-m"/>
+  <symbol minX="504" maxX="560" minY="495" maxY="551" name="volcano-m"/>
+  <symbol minX="560" maxX="616" minY="495" maxY="551" name="laundry-m"/>
+  <symbol minX="616" maxX="672" minY="495" maxY="551" name="drinking-water-m"/>
+  <symbol minX="672" maxX="728" minY="495" maxY="551" name="library-m"/>
+  <symbol minX="728" maxX="784" minY="495" maxY="551" name="waterfall-m"/>
+  <symbol minX="784" maxX="840" minY="495" maxY="551" name="doityourself-m"/>
+  <symbol minX="840" maxX="896" minY="495" maxY="551" name="lift_gate-m"/>
+  <symbol minX="896" maxX="952" minY="495" maxY="551" name="dog_park-m"/>
+  <symbol minX="952" maxX="1008" minY="495" maxY="551" name="lighthouse-m"/>
   <symbol minX="1008" maxX="1064" minY="495" maxY="551" name="theatre-m"/>
-  <symbol minX="1064" maxX="1120" minY="495" maxY="551" name="department_store-m"/>
-  <symbol minX="1120" maxX="1176" minY="495" maxY="551" name="mail-m"/>
-  <symbol minX="1176" maxX="1232" minY="495" maxY="551" name="curling-m"/>
-  <symbol minX="1232" maxX="1288" minY="495" maxY="551" name="cricket-m"/>
-  <symbol minX="1288" maxX="1344" minY="495" maxY="551" name="marketplace-m"/>
+  <symbol minX="1064" maxX="1120" minY="495" maxY="551" name="diving-m"/>
+  <symbol minX="1120" maxX="1176" minY="495" maxY="551" name="ship-m"/>
+  <symbol minX="1176" maxX="1232" minY="495" maxY="551" name="department_store-m"/>
+  <symbol minX="1232" maxX="1288" minY="495" maxY="551" name="wayside_cross-m"/>
+  <symbol minX="1288" maxX="1344" minY="495" maxY="551" name="mail-m"/>
   <symbol minX="1344" maxX="1400" minY="495" maxY="551" name="tennis-m"/>
-  <symbol minX="1400" maxX="1456" minY="495" maxY="551" name="convenience-m"/>
-  <symbol minX="1456" maxX="1512" minY="495" maxY="551" name="computer-m"/>
-  <symbol minX="1512" maxX="1568" minY="495" maxY="551" name="military-m"/>
+  <symbol minX="1400" maxX="1456" minY="495" maxY="551" name="curling-m"/>
+  <symbol minX="1456" maxX="1512" minY="495" maxY="551" name="marketplace-m"/>
+  <symbol minX="1512" maxX="1568" minY="495" maxY="551" name="cricket-m"/>
   <symbol minX="1568" maxX="1624" minY="495" maxY="551" name="taxi-m"/>
-  <symbol minX="1624" maxX="1680" minY="495" maxY="551" name="college-m"/>
-  <symbol minX="1680" maxX="1736" minY="495" maxY="551" name="mobile_phone-m"/>
-  <symbol minX="1736" maxX="1792" minY="495" maxY="551" name="clothes-m"/>
-  <symbol minX="1792" maxX="1848" minY="495" maxY="551" name="monument-m"/>
+  <symbol minX="1624" maxX="1680" minY="495" maxY="551" name="convenience-m"/>
+  <symbol minX="1680" maxX="1736" minY="495" maxY="551" name="military-m"/>
+  <symbol minX="1736" maxX="1792" minY="495" maxY="551" name="computer-m"/>
+  <symbol minX="1792" maxX="1848" minY="495" maxY="551" name="college-m"/>
   <symbol minX="1848" maxX="1904" minY="495" maxY="551" name="swimming-m"/>
-  <symbol minX="1904" maxX="1960" minY="495" maxY="551" name="wayside_shrine-m"/>
-  <symbol minX="1960" maxX="2016" minY="495" maxY="551" name="motel-m"/>
-  <symbol minX="0" maxX="56" minY="551" maxY="607" name="cinema-m"/>
-  <symbol minX="56" maxX="112" minY="551" maxY="607" name="museum-m"/>
-  <symbol minX="112" maxX="168" minY="551" maxY="607" name="chemist-m"/>
-  <symbol minX="168" maxX="224" minY="551" maxY="607" name="sweets-m"/>
-  <symbol minX="224" maxX="280" minY="551" maxY="607" name="cemetery-m"/>
-  <symbol minX="280" maxX="336" minY="551" maxY="607" name="subway-spb-m"/>
-  <symbol minX="336" maxX="392" minY="551" maxY="607" name="windmill-m"/>
-  <symbol minX="392" maxX="448" minY="551" maxY="607" name="ship-m"/>
-  <symbol minX="448" maxX="504" minY="551" maxY="607" name="cave-m"/>
-  <symbol minX="504" maxX="560" minY="551" maxY="607" name="casino-m"/>
-  <symbol minX="560" maxX="616" minY="551" maxY="607" name="npark-m"/>
+  <symbol minX="1904" maxX="1960" minY="495" maxY="551" name="clothes-m"/>
+  <symbol minX="1960" maxX="2016" minY="495" maxY="551" name="monument-m"/>
+  <symbol minX="0" maxX="56" minY="551" maxY="607" name="wayside_shrine-m"/>
+  <symbol minX="56" maxX="112" minY="551" maxY="607" name="cinema-m"/>
+  <symbol minX="112" maxX="168" minY="551" maxY="607" name="motel-m"/>
+  <symbol minX="168" maxX="224" minY="551" maxY="607" name="chemist-m"/>
+  <symbol minX="224" maxX="280" minY="551" maxY="607" name="museum-m"/>
+  <symbol minX="280" maxX="336" minY="551" maxY="607" name="sweets-m"/>
+  <symbol minX="336" maxX="392" minY="551" maxY="607" name="cemetery-m"/>
+  <symbol minX="392" maxX="448" minY="551" maxY="607" name="subway-spb-m"/>
+  <symbol minX="448" maxX="504" minY="551" maxY="607" name="windmill-m"/>
+  <symbol minX="504" maxX="560" minY="551" maxY="607" name="australian-football-m"/>
+  <symbol minX="560" maxX="616" minY="551" maxY="607" name="cave-m"/>
   <symbol minX="616" maxX="672" minY="551" maxY="607" name="subway-newyork-m"/>
-  <symbol minX="672" maxX="728" minY="551" maxY="607" name="caravan_site-m"/>
-  <symbol minX="728" maxX="784" minY="551" maxY="607" name="nparkf-m"/>
-  <symbol minX="784" maxX="840" minY="551" maxY="607" name="car_sharing-m"/>
-  <symbol minX="840" maxX="896" minY="551" maxY="607" name="zoo-m"/>
-  <symbol minX="896" maxX="952" minY="551" maxY="607" name="office-m"/>
+  <symbol minX="672" maxX="728" minY="551" maxY="607" name="casino-m"/>
+  <symbol minX="728" maxX="784" minY="551" maxY="607" name="npark-m"/>
+  <symbol minX="784" maxX="840" minY="551" maxY="607" name="caravan_site-m"/>
+  <symbol minX="840" maxX="896" minY="551" maxY="607" name="car_sharing-m"/>
+  <symbol minX="896" maxX="952" minY="551" maxY="607" name="nparkf-m"/>
   <symbol minX="952" maxX="1008" minY="551" maxY="607" name="bakery-m"/>
-  <symbol minX="1008" maxX="1064" minY="551" maxY="607" name="car-repair-m"/>
-  <symbol minX="1064" maxX="1120" minY="551" maxY="607" name="optician-m"/>
-  <symbol minX="1120" maxX="1176" minY="551" maxY="607" name="atm-m"/>
-  <symbol minX="1176" maxX="1232" minY="551" maxY="607" name="park-m"/>
-  <symbol minX="1232" maxX="1288" minY="551" maxY="607" name="subway-m"/>
-  <symbol minX="1288" maxX="1344" minY="551" maxY="607" name="shoes-m"/>
-  <symbol minX="1344" maxX="1400" minY="551" maxY="607" name="campsite-m"/>
-  <symbol minX="1400" maxX="1456" minY="551" maxY="607" name="cafe-m"/>
-  <symbol minX="1456" maxX="1512" minY="551" maxY="607" name="parking-meter-m"/>
+  <symbol minX="1008" maxX="1064" minY="551" maxY="607" name="zoo-m"/>
+  <symbol minX="1064" maxX="1120" minY="551" maxY="607" name="office-m"/>
+  <symbol minX="1120" maxX="1176" minY="551" maxY="607" name="subway-m"/>
+  <symbol minX="1176" maxX="1232" minY="551" maxY="607" name="car-repair-m"/>
+  <symbol minX="1232" maxX="1288" minY="551" maxY="607" name="optician-m"/>
+  <symbol minX="1288" maxX="1344" minY="551" maxY="607" name="atm-m"/>
+  <symbol minX="1344" maxX="1400" minY="551" maxY="607" name="park-m"/>
+  <symbol minX="1400" maxX="1456" minY="551" maxY="607" name="campsite-m"/>
+  <symbol minX="1456" maxX="1512" minY="551" maxY="607" name="school-m"/>
   <symbol minX="1512" maxX="1568" minY="551" maxY="607" name="subway-entrance-m"/>
-  <symbol minX="1568" maxX="1624" minY="551" maxY="607" name="archery-m"/>
-  <symbol minX="1624" maxX="1680" minY="551" maxY="607" name="peak-m"/>
-  <symbol minX="1680" maxX="1736" minY="551" maxY="607" name="cable-car-m"/>
-  <symbol minX="1736" maxX="1792" minY="551" maxY="607" name="subway-entrance-2-m"/>
-  <symbol minX="1792" maxX="1848" minY="551" maxY="607" name="school-m"/>
-  <symbol minX="1848" maxX="1904" minY="551" maxY="607" name="sports-m"/>
-  <symbol minX="1904" maxX="1960" minY="551" maxY="607" name="butcher-m"/>
-  <symbol minX="1960" maxX="2016" minY="551" maxY="607" name="pharmacy-m"/>
-  <symbol minX="0" maxX="56" minY="607" maxY="663" name="bus-m"/>
-  <symbol minX="56" maxX="112" minY="607" maxY="663" name="bowls-m"/>
-  <symbol minX="112" maxX="168" minY="607" maxY="663" name="phone-m"/>
-  <symbol minX="168" maxX="224" minY="607" maxY="663" name="bank-2-m"/>
-  <symbol minX="224" maxX="280" minY="607" maxY="663" name="boundary_stone-m"/>
-  <symbol minX="280" maxX="336" minY="607" maxY="663" name="picnic-m"/>
+  <symbol minX="1568" maxX="1624" minY="551" maxY="607" name="cafe-m"/>
+  <symbol minX="1624" maxX="1680" minY="551" maxY="607" name="parking-meter-m"/>
+  <symbol minX="1680" maxX="1736" minY="551" maxY="607" name="archery-m"/>
+  <symbol minX="1736" maxX="1792" minY="551" maxY="607" name="cable-car-m"/>
+  <symbol minX="1792" maxX="1848" minY="551" maxY="607" name="peak-m"/>
+  <symbol minX="1848" maxX="1904" minY="551" maxY="607" name="subway-entrance-2-m"/>
+  <symbol minX="1904" maxX="1960" minY="551" maxY="607" name="bank-2-m"/>
+  <symbol minX="1960" maxX="2016" minY="551" maxY="607" name="sports-m"/>
+  <symbol minX="0" maxX="56" minY="607" maxY="663" name="butcher-m"/>
+  <symbol minX="56" maxX="112" minY="607" maxY="663" name="bus-m"/>
+  <symbol minX="112" maxX="168" minY="607" maxY="663" name="pharmacy-m"/>
+  <symbol minX="168" maxX="224" minY="607" maxY="663" name="shoes-m"/>
+  <symbol minX="224" maxX="280" minY="607" maxY="663" name="bowls-m"/>
+  <symbol minX="280" maxX="336" minY="607" maxY="663" name="phone-m"/>
   <symbol minX="336" maxX="392" minY="607" maxY="663" name="soccer-m"/>
-  <symbol minX="392" maxX="448" minY="607" maxY="663" name="america-football-m"/>
-  <symbol minX="448" maxX="504" minY="607" maxY="663" name="pitch-m"/>
-  <symbol minX="504" maxX="560" minY="607" maxY="663" name="book-shop-m"/>
-  <symbol minX="560" maxX="616" minY="607" maxY="663" name="bicycle-m"/>
-  <symbol minX="616" maxX="672" minY="607" maxY="663" name="place-of-worship-m"/>
+  <symbol minX="392" maxX="448" minY="607" maxY="663" name="boundary_stone-m"/>
+  <symbol minX="448" maxX="504" minY="607" maxY="663" name="picnic-m"/>
+  <symbol minX="504" maxX="560" minY="607" maxY="663" name="america-football-m"/>
+  <symbol minX="560" maxX="616" minY="607" maxY="663" name="book-shop-m"/>
+  <symbol minX="616" maxX="672" minY="607" maxY="663" name="pitch-m"/>
   <symbol minX="672" maxX="728" minY="607" maxY="663" name="skiing-m"/>
-  <symbol minX="728" maxX="784" minY="607" maxY="663" name="alpine_hut-m"/>
-  <symbol minX="784" maxX="840" minY="607" maxY="663" name="police-m"/>
-  <symbol minX="840" maxX="896" minY="607" maxY="663" name="beer-m"/>
-  <symbol minX="896" maxX="952" minY="607" maxY="663" name="beauty-m"/>
-  <symbol minX="952" maxX="1008" minY="607" maxY="663" name="postbox-m"/>
-  <symbol minX="1008" maxX="1064" minY="607" maxY="663" name="beach-m"/>
-  <symbol minX="1064" maxX="1120" minY="607" maxY="663" name="banknote-m"/>
-  <symbol minX="1120" maxX="1176" minY="607" maxY="663" name="bcontrol-m"/>
-  <symbol minX="1176" maxX="1232" minY="607" maxY="663" name="pub-m"/>
-  <symbol minX="1232" maxX="1288" minY="607" maxY="663" name="shop-m"/>
-  <symbol minX="1288" maxX="1344" minY="607" maxY="663" name="shop-m copy"/>
-  <symbol minX="1344" maxX="1400" minY="607" maxY="663" name="bbq-m"/>
-  <symbol minX="1400" maxX="1456" minY="607" maxY="663" name="recycling-m"/>
-  <symbol minX="1456" maxX="1512" minY="607" maxY="663" name="alcohol-m"/>
-  <symbol minX="1512" maxX="1568" minY="607" maxY="663" name="basketball-m"/>
-  <symbol minX="1568" maxX="1624" minY="607" maxY="663" name="remains-m"/>
-  <symbol minX="1624" maxX="1680" minY="607" maxY="663" name="baseball-m"/>
-  <symbol minX="1680" maxX="1736" minY="607" maxY="663" name="bar-m"/>
-  <symbol minX="1736" maxX="1792" minY="607" maxY="663" name="restaurant-m"/>
+  <symbol minX="728" maxX="784" minY="607" maxY="663" name="bicycle-m"/>
+  <symbol minX="784" maxX="840" minY="607" maxY="663" name="place-of-worship-m"/>
+  <symbol minX="840" maxX="896" minY="607" maxY="663" name="alpine_hut-m"/>
+  <symbol minX="896" maxX="952" minY="607" maxY="663" name="beer-m"/>
+  <symbol minX="952" maxX="1008" minY="607" maxY="663" name="police-m"/>
+  <symbol minX="1008" maxX="1064" minY="607" maxY="663" name="shop-m"/>
+  <symbol minX="1064" maxX="1120" minY="607" maxY="663" name="beauty-m"/>
+  <symbol minX="1120" maxX="1176" minY="607" maxY="663" name="postbox-m"/>
+  <symbol minX="1176" maxX="1232" minY="607" maxY="663" name="beach-m"/>
+  <symbol minX="1232" maxX="1288" minY="607" maxY="663" name="banknote-m"/>
+  <symbol minX="1288" maxX="1344" minY="607" maxY="663" name="bcontrol-m"/>
+  <symbol minX="1344" maxX="1400" minY="607" maxY="663" name="pub-m"/>
+  <symbol minX="1400" maxX="1456" minY="607" maxY="663" name="shop-m copy"/>
+  <symbol minX="1456" maxX="1512" minY="607" maxY="663" name="bbq-m"/>
+  <symbol minX="1512" maxX="1568" minY="607" maxY="663" name="alcohol-m"/>
+  <symbol minX="1568" maxX="1624" minY="607" maxY="663" name="recycling-m"/>
+  <symbol minX="1624" maxX="1680" minY="607" maxY="663" name="basketball-m"/>
+  <symbol minX="1680" maxX="1736" minY="607" maxY="663" name="baseball-m"/>
+  <symbol minX="1736" maxX="1792" minY="607" maxY="663" name="remains-m"/>
   <symbol minX="1792" maxX="1848" minY="607" maxY="663" name="shop-bicycle-m"/>
-  <symbol minX="1848" maxX="1899" minY="607" maxY="658" name="parking-l"/>
-  <symbol minX="1899" maxX="1950" minY="607" maxY="658" name="speedcam-l"/>
-  <symbol minX="1950" maxX="2001" minY="607" maxY="658" name="subway-berlin-l"/>
-  <symbol minX="0" maxX="51" minY="663" maxY="714" name="lightrail-berlin-m"/>
-  <symbol minX="51" maxX="109" minY="663" maxY="714" name="subway-moscow-l"/>
-  <symbol minX="109" maxX="160" minY="663" maxY="714" name="subway-rome-l"/>
-  <symbol minX="160" maxX="209" minY="663" maxY="712" name="route_from"/>
-  <symbol minX="209" maxX="256" minY="663" maxY="710" name="no-icon-leisure"/>
-  <symbol minX="256" maxX="303" minY="663" maxY="710" name="subway-rome-m"/>
-  <symbol minX="303" maxX="357" minY="663" maxY="710" name="subway-moscow-m"/>
-  <symbol minX="357" maxX="404" minY="663" maxY="710" name="no-icon-amenity"/>
-  <symbol minX="404" maxX="451" minY="663" maxY="710" name="no-icon-shop"/>
-  <symbol minX="451" maxX="498" minY="663" maxY="710" name="no-icon-tourism"/>
-  <symbol minX="498" maxX="545" minY="663" maxY="710" name="subway-berlin-m"/>
-  <symbol minX="545" maxX="592" minY="663" maxY="710" name="no-icon"/>
-  <symbol minX="592" maxX="639" minY="663" maxY="710" name="subway-paris-m"/>
-  <symbol minX="639" maxX="685" minY="663" maxY="709" name="current-position"/>
-  <symbol minX="685" maxX="743" minY="663" maxY="708" name="subway-london-l"/>
-  <symbol minX="743" maxX="788" minY="663" maxY="708" name="airport-s"/>
-  <symbol minX="788" maxX="830" minY="663" maxY="705" name="skiing-s"/>
-  <symbol minX="830" maxX="872" minY="663" maxY="705" name="pitch-s"/>
-  <symbol minX="872" maxX="914" minY="663" maxY="705" name="picnic-s"/>
-  <symbol minX="914" maxX="956" minY="663" maxY="705" name="soccer-s"/>
-  <symbol minX="956" maxX="998" minY="663" maxY="705" name="phone-s"/>
-  <symbol minX="998" maxX="1040" minY="663" maxY="705" name="speedcam-m"/>
-  <symbol minX="1040" maxX="1082" minY="663" maxY="705" name="atm-s"/>
-  <symbol minX="1082" maxX="1124" minY="663" maxY="705" name="pharmacy-s"/>
-  <symbol minX="1124" maxX="1166" minY="663" maxY="705" name="bar-s"/>
-  <symbol minX="1166" maxX="1208" minY="663" maxY="705" name="school-s"/>
-  <symbol minX="1208" maxX="1250" minY="663" maxY="705" name="baseball-s"/>
-  <symbol minX="1250" maxX="1292" minY="663" maxY="705" name="basketball-s"/>
-  <symbol minX="1292" maxX="1334" minY="663" maxY="705" name="bcontrol-s"/>
-  <symbol minX="1334" maxX="1392" minY="663" maxY="705" name="subway-barcelona-m"/>
-  <symbol minX="1392" maxX="1443" minY="663" maxY="705" name="subway-barcelona-s"/>
-  <symbol minX="1443" maxX="1485" minY="663" maxY="705" name="alcohol-s"/>
-  <symbol minX="1485" maxX="1527" minY="663" maxY="705" name="place-of-worship-s"/>
-  <symbol minX="1527" maxX="1569" minY="663" maxY="705" name="beer-s"/>
-  <symbol minX="1569" maxX="1611" minY="663" maxY="705" name="bicycle-s"/>
-  <symbol minX="1611" maxX="1653" minY="663" maxY="705" name="subway-entrance-2-s"/>
-  <symbol minX="1653" maxX="1695" minY="663" maxY="705" name="subway-entrance-arrow"/>
-  <symbol minX="1695" maxX="1737" minY="663" maxY="705" name="peak-s"/>
-  <symbol minX="1737" maxX="1779" minY="663" maxY="705" name="book-shop-s"/>
-  <symbol minX="1779" maxX="1821" minY="663" maxY="705" name="subway-entrance-s"/>
-  <symbol minX="1821" maxX="1863" minY="663" maxY="705" name="america-football-s"/>
-  <symbol minX="1863" maxX="1905" minY="663" maxY="705" name="bus-s"/>
-  <symbol minX="1905" maxX="1947" minY="663" maxY="705" name="cable-car-s"/>
-  <symbol minX="1947" maxX="1989" minY="663" maxY="705" name="cafe-s"/>
-  <symbol minX="1989" maxX="2031" minY="663" maxY="705" name="police-s"/>
-  <symbol minX="0" maxX="56" minY="714" maxY="756" name="subway-london-m"/>
-  <symbol minX="56" maxX="98" minY="714" maxY="756" name="campsite-s"/>
-  <symbol minX="98" maxX="140" minY="714" maxY="756" name="park-s"/>
-  <symbol minX="140" maxX="182" minY="714" maxY="756" name="zoo-s"/>
-  <symbol minX="182" maxX="240" minY="714" maxY="756" name="subway-madrid-m"/>
-  <symbol minX="240" maxX="282" minY="714" maxY="756" name="car-repair-s"/>
-  <symbol minX="282" maxX="324" minY="714" maxY="756" name="casino-s"/>
-  <symbol minX="324" maxX="366" minY="714" maxY="756" name="windmill-s"/>
-  <symbol minX="366" maxX="408" minY="714" maxY="756" name="cave-s"/>
-  <symbol minX="408" maxX="450" minY="714" maxY="756" name="office-s"/>
-  <symbol minX="450" maxX="492" minY="714" maxY="756" name="shop-s"/>
-  <symbol minX="492" maxX="534" minY="714" maxY="756" name="cemetery-s"/>
-  <symbol minX="534" maxX="576" minY="714" maxY="756" name="nparkf-s"/>
-  <symbol minX="576" maxX="618" minY="714" maxY="756" name="npark-s"/>
-  <symbol minX="618" maxX="660" minY="714" maxY="756" name="subway-newyork-s"/>
-  <symbol minX="660" maxX="702" minY="714" maxY="756" name="cinema-s"/>
-  <symbol minX="702" maxX="744" minY="714" maxY="756" name="college-s"/>
-  <symbol minX="744" maxX="786" minY="714" maxY="756" name="shop-s copy"/>
-  <symbol minX="786" maxX="828" minY="714" maxY="756" name="waterfall-s"/>
-  <symbol minX="828" maxX="870" minY="714" maxY="756" name="pub-s"/>
-  <symbol minX="870" maxX="912" minY="714" maxY="756" name="drinking-water-s"/>
-  <symbol minX="912" maxX="954" minY="714" maxY="756" name="volcano-s"/>
-  <symbol minX="954" maxX="996" minY="714" maxY="756" name="subway-s"/>
-  <symbol minX="996" maxX="1038" minY="714" maxY="756" name="recycling-s"/>
-  <symbol minX="1038" maxX="1080" minY="714" maxY="756" name="remains-s"/>
-  <symbol minX="1080" maxX="1122" minY="714" maxY="756" name="subway-spb-s"/>
-  <symbol minX="1122" maxX="1164" minY="714" maxY="756" name="embassy-s"/>
-  <symbol minX="1164" maxX="1206" minY="714" maxY="756" name="fastfood-s"/>
-  <symbol minX="1206" maxX="1248" minY="714" maxY="756" name="tram-s"/>
-  <symbol minX="1248" maxX="1290" minY="714" maxY="756" name="fire_station-s"/>
-  <symbol minX="1290" maxX="1332" minY="714" maxY="756" name="fountain-s"/>
-  <symbol minX="1332" maxX="1374" minY="714" maxY="756" name="ship-s"/>
-  <symbol minX="1374" maxX="1416" minY="714" maxY="756" name="restaurant-s"/>
-  <symbol minX="1416" maxX="1458" minY="714" maxY="756" name="museum-s"/>
-  <symbol minX="1458" maxX="1500" minY="714" maxY="756" name="monument-s"/>
-  <symbol minX="1500" maxX="1542" minY="714" maxY="756" name="swimming-s"/>
-  <symbol minX="1542" maxX="1584" minY="714" maxY="756" name="atm-s copy 2"/>
-  <symbol minX="1584" maxX="1626" minY="714" maxY="756" name="military-s"/>
-  <symbol minX="1626" maxX="1668" minY="714" maxY="756" name="train-s"/>
-  <symbol minX="1668" maxX="1726" minY="714" maxY="756" name="metro-barcelona-m"/>
-  <symbol minX="1726" maxX="1768" minY="714" maxY="756" name="tennis-s"/>
-  <symbol minX="1768" maxX="1810" minY="714" maxY="756" name="mail-s"/>
-  <symbol minX="1810" maxX="1852" minY="714" maxY="756" name="fuel-s"/>
-  <symbol minX="1852" maxX="1894" minY="714" maxY="756" name="theatre-s"/>
-  <symbol minX="1894" maxX="1936" minY="714" maxY="756" name="lighthouse-s"/>
-  <symbol minX="1936" maxX="1978" minY="714" maxY="756" name="library-s"/>
-  <symbol minX="1978" maxX="2020" minY="714" maxY="756" name="toilets-s"/>
-  <symbol minX="0" maxX="42" minY="756" maxY="798" name="kindergarten-s"/>
-  <symbol minX="42" maxX="84" minY="756" maxY="798" name="information-s"/>
-  <symbol minX="84" maxX="126" minY="756" maxY="798" name="hotel-s"/>
-  <symbol minX="126" maxX="168" minY="756" maxY="798" name="hospital-s"/>
-  <symbol minX="168" maxX="210" minY="756" maxY="798" name="heliport-s"/>
-  <symbol minX="210" maxX="252" minY="756" maxY="798" name="helipad-s"/>
-  <symbol minX="252" maxX="294" minY="756" maxY="798" name="tourism-s"/>
-  <symbol minX="294" maxX="336" minY="756" maxY="798" name="grocery-s"/>
-  <symbol minX="336" maxX="378" minY="756" maxY="798" name="golf-s"/>
-  <symbol minX="378" maxX="420" minY="756" maxY="798" name="townhall-s"/>
-  <symbol minX="420" maxX="462" minY="756" maxY="798" name="garden-s"/>
-  <symbol minX="462" maxX="504" minY="756" maxY="798" name="gallery-s"/>
-  <symbol minX="504" maxX="546" minY="756" maxY="798" name="funicular-s"/>
-  <symbol minX="546" maxX="604" minY="756" maxY="797" name="subway-madrid-l"/>
-  <symbol minX="604" maxX="662" minY="756" maxY="797" name="subway-barcelona-l"/>
-  <symbol minX="662" maxX="700" minY="756" maxY="796" name="s-arrow"/>
-  <symbol minX="700" maxX="740" minY="756" maxY="796" name="parking-m"/>
-  <symbol minX="740" maxX="796" minY="756" maxY="794" name="subway-kiev-l"/>
-  <symbol minX="796" maxX="852" minY="756" maxY="794" name="subway-kiev-m"/>
-  <symbol minX="852" maxX="890" minY="756" maxY="794" name="lightrail-berlin-s"/>
-  <symbol minX="890" maxX="928" minY="756" maxY="794" name="subway-paris-s"/>
-  <symbol minX="928" maxX="979" minY="756" maxY="794" name="subway-madrid-s"/>
-  <symbol minX="979" maxX="1030" minY="756" maxY="794" name="metro-barcelona-s"/>
-  <symbol minX="1030" maxX="1066" minY="756" maxY="792" name="api-result"/>
-  <symbol minX="1066" maxX="1102" minY="756" maxY="792" name="subway-moscow-s"/>
-  <symbol minX="1102" maxX="1136" minY="756" maxY="790" name="search-result"/>
-  <symbol minX="1136" maxX="1169" minY="756" maxY="789" name="speedcam-s"/>
-  <symbol minX="1169" maxX="1207" minY="756" maxY="789" name="bench"/>
-  <symbol minX="1207" maxX="1240" minY="756" maxY="789" name="subway-rome-s"/>
-  <symbol minX="1240" maxX="1273" minY="756" maxY="789" name="parking-s"/>
-  <symbol minX="1273" maxX="1306" minY="756" maxY="789" name="subway-berlin-s"/>
-  <symbol minX="1306" maxX="1339" minY="756" maxY="789" name="star-l"/>
-  <symbol minX="1339" maxX="1381" minY="756" maxY="789" name="subway-london-s"/>
-  <symbol minX="1381" maxX="1437" minY="756" maxY="787" name="subway-minsk-l"/>
-  <symbol minX="1437" maxX="1468" minY="756" maxY="787" name="star-m"/>
-  <symbol minX="1468" maxX="1501" minY="756" maxY="787" name="peakt-l"/>
-  <symbol minX="1501" maxX="1532" minY="756" maxY="787" name="survey_point-l"/>
-  <symbol minX="1532" maxX="1579" minY="756" maxY="785" name="subway-kiev-s"/>
-  <symbol minX="1579" maxX="1606" minY="756" maxY="783" name="survey_point-m"/>
-  <symbol minX="1606" maxX="1653" minY="756" maxY="783" name="subway-minsk-m"/>
-  <symbol minX="1653" maxX="1680" minY="756" maxY="783" name="subway-xs"/>
-  <symbol minX="1680" maxX="1707" minY="756" maxY="783" name="subway-newyork-xs"/>
-  <symbol minX="1707" maxX="1734" minY="756" maxY="783" name="star-s"/>
-  <symbol minX="1734" maxX="1776" minY="756" maxY="783" name="railway-crossing"/>
-  <symbol minX="1776" maxX="1818" minY="756" maxY="780" name="subway-minsk-s"/>
-  <symbol minX="1818" maxX="1842" minY="756" maxY="780" name="subway-xs copy"/>
-  <symbol minX="1842" maxX="1864" minY="756" maxY="778" name="survey_point-s"/>
-  <symbol minX="1864" maxX="1888" minY="756" maxY="778" name="peakt-m"/>
-  <symbol minX="1888" maxX="1939" minY="756" maxY="778" name="arrow-m"/>
-  <symbol minX="1939" maxX="1959" minY="756" maxY="776" name="entrance-s"/>
-  <symbol minX="1959" maxX="1977" minY="756" maxY="774" name="dot-m"/>
-  <symbol minX="1977" maxX="1997" minY="756" maxY="774" name="peakt-s"/>
-  <symbol minX="1997" maxX="2012" minY="756" maxY="771" name="tree-l"/>
-  <symbol minX="0" maxX="38" minY="798" maxY="813" name="arrow-s"/>
-  <symbol minX="38" maxX="53" minY="798" maxY="813" name="none"/>
-  <symbol minX="53" maxX="66" minY="798" maxY="811" name="dot-s"/>
-  <symbol minX="66" maxX="79" minY="798" maxY="811" name="entrance-xs"/>
-  <symbol minX="79" maxX="92" minY="798" maxY="811" name="tree-m"/>
-  <symbol minX="92" maxX="105" minY="798" maxY="811" name="dot-s-light"/>
-  <symbol minX="105" maxX="116" minY="798" maxY="809" name="tree-s"/>
-  <symbol minX="116" maxX="127" minY="798" maxY="809" name="zero-icon"/>
+  <symbol minX="1848" maxX="1904" minY="607" maxY="663" name="bar-m"/>
+  <symbol minX="1904" maxX="1960" minY="607" maxY="663" name="restaurant-m"/>
+  <symbol minX="1960" maxX="2011" minY="607" maxY="658" name="parking-l"/>
+  <symbol minX="0" maxX="51" minY="663" maxY="714" name="speedcam-l"/>
+  <symbol minX="51" maxX="102" minY="663" maxY="714" name="subway-berlin-l"/>
+  <symbol minX="102" maxX="153" minY="663" maxY="714" name="lightrail-berlin-m"/>
+  <symbol minX="153" maxX="211" minY="663" maxY="714" name="subway-moscow-l"/>
+  <symbol minX="211" maxX="262" minY="663" maxY="714" name="subway-rome-l"/>
+  <symbol minX="262" maxX="311" minY="663" maxY="712" name="route_from"/>
+  <symbol minX="311" maxX="358" minY="663" maxY="710" name="no-icon-amenity"/>
+  <symbol minX="358" maxX="405" minY="663" maxY="710" name="no-icon-tourism"/>
+  <symbol minX="405" maxX="459" minY="663" maxY="710" name="subway-moscow-m"/>
+  <symbol minX="459" maxX="506" minY="663" maxY="710" name="no-icon-leisure"/>
+  <symbol minX="506" maxX="553" minY="663" maxY="710" name="no-icon-shop"/>
+  <symbol minX="553" maxX="600" minY="663" maxY="710" name="subway-rome-m"/>
+  <symbol minX="600" maxX="647" minY="663" maxY="710" name="subway-berlin-m"/>
+  <symbol minX="647" maxX="694" minY="663" maxY="710" name="subway-paris-m"/>
+  <symbol minX="694" maxX="741" minY="663" maxY="710" name="no-icon"/>
+  <symbol minX="741" maxX="787" minY="663" maxY="709" name="current-position"/>
+  <symbol minX="787" maxX="845" minY="663" maxY="708" name="subway-london-l"/>
+  <symbol minX="845" maxX="890" minY="663" maxY="708" name="airport-s"/>
+  <symbol minX="890" maxX="932" minY="663" maxY="705" name="pitch-s"/>
+  <symbol minX="932" maxX="974" minY="663" maxY="705" name="skiing-s"/>
+  <symbol minX="974" maxX="1016" minY="663" maxY="705" name="picnic-s"/>
+  <symbol minX="1016" maxX="1058" minY="663" maxY="705" name="phone-s"/>
+  <symbol minX="1058" maxX="1100" minY="663" maxY="705" name="soccer-s"/>
+  <symbol minX="1100" maxX="1142" minY="663" maxY="705" name="pharmacy-s"/>
+  <symbol minX="1142" maxX="1184" minY="663" maxY="705" name="speedcam-m"/>
+  <symbol minX="1184" maxX="1226" minY="663" maxY="705" name="atm-s"/>
+  <symbol minX="1226" maxX="1268" minY="663" maxY="705" name="bar-s"/>
+  <symbol minX="1268" maxX="1310" minY="663" maxY="705" name="school-s"/>
+  <symbol minX="1310" maxX="1352" minY="663" maxY="705" name="baseball-s"/>
+  <symbol minX="1352" maxX="1394" minY="663" maxY="705" name="basketball-s"/>
+  <symbol minX="1394" maxX="1436" minY="663" maxY="705" name="bcontrol-s"/>
+  <symbol minX="1436" maxX="1478" minY="663" maxY="705" name="alcohol-s"/>
+  <symbol minX="1478" maxX="1536" minY="663" maxY="705" name="subway-barcelona-m"/>
+  <symbol minX="1536" maxX="1587" minY="663" maxY="705" name="subway-barcelona-s"/>
+  <symbol minX="1587" maxX="1629" minY="663" maxY="705" name="beer-s"/>
+  <symbol minX="1629" maxX="1671" minY="663" maxY="705" name="place-of-worship-s"/>
+  <symbol minX="1671" maxX="1713" minY="663" maxY="705" name="bicycle-s"/>
+  <symbol minX="1713" maxX="1755" minY="663" maxY="705" name="peak-s"/>
+  <symbol minX="1755" maxX="1797" minY="663" maxY="705" name="subway-entrance-2-s"/>
+  <symbol minX="1797" maxX="1839" minY="663" maxY="705" name="subway-entrance-arrow"/>
+  <symbol minX="1839" maxX="1881" minY="663" maxY="705" name="book-shop-s"/>
+  <symbol minX="1881" maxX="1923" minY="663" maxY="705" name="america-football-s"/>
+  <symbol minX="1923" maxX="1965" minY="663" maxY="705" name="subway-entrance-s"/>
+  <symbol minX="1965" maxX="2007" minY="663" maxY="705" name="bus-s"/>
+  <symbol minX="0" maxX="42" minY="714" maxY="756" name="cable-car-s"/>
+  <symbol minX="42" maxX="84" minY="714" maxY="756" name="cafe-s"/>
+  <symbol minX="84" maxX="126" minY="714" maxY="756" name="park-s"/>
+  <symbol minX="126" maxX="168" minY="714" maxY="756" name="shop-s"/>
+  <symbol minX="168" maxX="224" minY="714" maxY="756" name="subway-london-m"/>
+  <symbol minX="224" maxX="266" minY="714" maxY="756" name="campsite-s"/>
+  <symbol minX="266" maxX="308" minY="714" maxY="756" name="office-s"/>
+  <symbol minX="308" maxX="350" minY="714" maxY="756" name="zoo-s"/>
+  <symbol minX="350" maxX="408" minY="714" maxY="756" name="subway-madrid-m"/>
+  <symbol minX="408" maxX="450" minY="714" maxY="756" name="car-repair-s"/>
+  <symbol minX="450" maxX="492" minY="714" maxY="756" name="casino-s"/>
+  <symbol minX="492" maxX="534" minY="714" maxY="756" name="windmill-s"/>
+  <symbol minX="534" maxX="576" minY="714" maxY="756" name="cave-s"/>
+  <symbol minX="576" maxX="618" minY="714" maxY="756" name="nparkf-s"/>
+  <symbol minX="618" maxX="660" minY="714" maxY="756" name="shop-s copy"/>
+  <symbol minX="660" maxX="702" minY="714" maxY="756" name="cemetery-s"/>
+  <symbol minX="702" maxX="744" minY="714" maxY="756" name="npark-s"/>
+  <symbol minX="744" maxX="786" minY="714" maxY="756" name="cinema-s"/>
+  <symbol minX="786" maxX="828" minY="714" maxY="756" name="subway-newyork-s"/>
+  <symbol minX="828" maxX="870" minY="714" maxY="756" name="college-s"/>
+  <symbol minX="870" maxX="912" minY="714" maxY="756" name="police-s"/>
+  <symbol minX="912" maxX="954" minY="714" maxY="756" name="pub-s"/>
+  <symbol minX="954" maxX="996" minY="714" maxY="756" name="dentist-s"/>
+  <symbol minX="996" maxX="1038" minY="714" maxY="756" name="waterfall-s"/>
+  <symbol minX="1038" maxX="1080" minY="714" maxY="756" name="recycling-s"/>
+  <symbol minX="1080" maxX="1122" minY="714" maxY="756" name="volcano-s"/>
+  <symbol minX="1122" maxX="1164" minY="714" maxY="756" name="subway-s"/>
+  <symbol minX="1164" maxX="1206" minY="714" maxY="756" name="remains-s"/>
+  <symbol minX="1206" maxX="1248" minY="714" maxY="756" name="restaurant-s"/>
+  <symbol minX="1248" maxX="1290" minY="714" maxY="756" name="subway-spb-s"/>
+  <symbol minX="1290" maxX="1332" minY="714" maxY="756" name="drinking-water-s"/>
+  <symbol minX="1332" maxX="1374" minY="714" maxY="756" name="embassy-s"/>
+  <symbol minX="1374" maxX="1416" minY="714" maxY="756" name="tram-s"/>
+  <symbol minX="1416" maxX="1458" minY="714" maxY="756" name="fastfood-s"/>
+  <symbol minX="1458" maxX="1500" minY="714" maxY="756" name="fire_station-s"/>
+  <symbol minX="1500" maxX="1542" minY="714" maxY="756" name="ship-s"/>
+  <symbol minX="1542" maxX="1584" minY="714" maxY="756" name="museum-s"/>
+  <symbol minX="1584" maxX="1626" minY="714" maxY="756" name="monument-s"/>
+  <symbol minX="1626" maxX="1668" minY="714" maxY="756" name="atm-s copy 2"/>
+  <symbol minX="1668" maxX="1710" minY="714" maxY="756" name="swimming-s"/>
+  <symbol minX="1710" maxX="1752" minY="714" maxY="756" name="military-s"/>
+  <symbol minX="1752" maxX="1794" minY="714" maxY="756" name="train-s"/>
+  <symbol minX="1794" maxX="1852" minY="714" maxY="756" name="metro-barcelona-m"/>
+  <symbol minX="1852" maxX="1894" minY="714" maxY="756" name="mail-s"/>
+  <symbol minX="1894" maxX="1936" minY="714" maxY="756" name="tennis-s"/>
+  <symbol minX="1936" maxX="1978" minY="714" maxY="756" name="fountain-s"/>
+  <symbol minX="1978" maxX="2020" minY="714" maxY="756" name="lighthouse-s"/>
+  <symbol minX="0" maxX="42" minY="756" maxY="798" name="theatre-s"/>
+  <symbol minX="42" maxX="84" minY="756" maxY="798" name="library-s"/>
+  <symbol minX="84" maxX="126" minY="756" maxY="798" name="kindergarten-s"/>
+  <symbol minX="126" maxX="168" minY="756" maxY="798" name="toilets-s"/>
+  <symbol minX="168" maxX="210" minY="756" maxY="798" name="information-s"/>
+  <symbol minX="210" maxX="252" minY="756" maxY="798" name="hotel-s"/>
+  <symbol minX="252" maxX="294" minY="756" maxY="798" name="hospital-s"/>
+  <symbol minX="294" maxX="336" minY="756" maxY="798" name="heliport-s"/>
+  <symbol minX="336" maxX="378" minY="756" maxY="798" name="helipad-s"/>
+  <symbol minX="378" maxX="420" minY="756" maxY="798" name="grocery-s"/>
+  <symbol minX="420" maxX="462" minY="756" maxY="798" name="tourism-s"/>
+  <symbol minX="462" maxX="504" minY="756" maxY="798" name="golf-s"/>
+  <symbol minX="504" maxX="546" minY="756" maxY="798" name="garden-s"/>
+  <symbol minX="546" maxX="588" minY="756" maxY="798" name="townhall-s"/>
+  <symbol minX="588" maxX="630" minY="756" maxY="798" name="gallery-s"/>
+  <symbol minX="630" maxX="672" minY="756" maxY="798" name="funicular-s"/>
+  <symbol minX="672" maxX="714" minY="756" maxY="798" name="fuel-s"/>
+  <symbol minX="714" maxX="772" minY="756" maxY="797" name="subway-madrid-l"/>
+  <symbol minX="772" maxX="830" minY="756" maxY="797" name="subway-barcelona-l"/>
+  <symbol minX="830" maxX="868" minY="756" maxY="796" name="s-arrow"/>
+  <symbol minX="868" maxX="908" minY="756" maxY="796" name="parking-m"/>
+  <symbol minX="908" maxX="964" minY="756" maxY="794" name="subway-kiev-m"/>
+  <symbol minX="964" maxX="1020" minY="756" maxY="794" name="subway-kiev-l"/>
+  <symbol minX="1020" maxX="1058" minY="756" maxY="794" name="subway-paris-s"/>
+  <symbol minX="1058" maxX="1109" minY="756" maxY="794" name="metro-barcelona-s"/>
+  <symbol minX="1109" maxX="1160" minY="756" maxY="794" name="subway-madrid-s"/>
+  <symbol minX="1160" maxX="1198" minY="756" maxY="794" name="lightrail-berlin-s"/>
+  <symbol minX="1198" maxX="1234" minY="756" maxY="792" name="api-result"/>
+  <symbol minX="1234" maxX="1270" minY="756" maxY="792" name="subway-moscow-s"/>
+  <symbol minX="1270" maxX="1304" minY="756" maxY="790" name="search-result"/>
+  <symbol minX="1304" maxX="1337" minY="756" maxY="789" name="speedcam-s"/>
+  <symbol minX="1337" maxX="1375" minY="756" maxY="789" name="bench"/>
+  <symbol minX="1375" maxX="1408" minY="756" maxY="789" name="subway-berlin-s"/>
+  <symbol minX="1408" maxX="1441" minY="756" maxY="789" name="parking-s"/>
+  <symbol minX="1441" maxX="1474" minY="756" maxY="789" name="subway-rome-s"/>
+  <symbol minX="1474" maxX="1516" minY="756" maxY="789" name="subway-london-s"/>
+  <symbol minX="1516" maxX="1549" minY="756" maxY="789" name="star-l"/>
+  <symbol minX="1549" maxX="1605" minY="756" maxY="787" name="subway-minsk-l"/>
+  <symbol minX="1605" maxX="1636" minY="756" maxY="787" name="star-m"/>
+  <symbol minX="1636" maxX="1669" minY="756" maxY="787" name="peakt-l"/>
+  <symbol minX="1669" maxX="1700" minY="756" maxY="787" name="survey_point-l"/>
+  <symbol minX="1700" maxX="1747" minY="756" maxY="785" name="subway-kiev-s"/>
+  <symbol minX="1747" maxX="1774" minY="756" maxY="783" name="subway-xs"/>
+  <symbol minX="1774" maxX="1821" minY="756" maxY="783" name="subway-minsk-m"/>
+  <symbol minX="1821" maxX="1848" minY="756" maxY="783" name="survey_point-m"/>
+  <symbol minX="1848" maxX="1875" minY="756" maxY="783" name="subway-newyork-xs"/>
+  <symbol minX="1875" maxX="1917" minY="756" maxY="783" name="railway-crossing"/>
+  <symbol minX="1917" maxX="1944" minY="756" maxY="783" name="star-s"/>
+  <symbol minX="1944" maxX="1986" minY="756" maxY="780" name="subway-minsk-s"/>
+  <symbol minX="1986" maxX="2010" minY="756" maxY="780" name="subway-xs copy"/>
+  <symbol minX="2010" maxX="2032" minY="756" maxY="778" name="survey_point-s"/>
+  <symbol minX="0" maxX="51" minY="798" maxY="820" name="arrow-m"/>
+  <symbol minX="51" maxX="75" minY="798" maxY="820" name="peakt-m"/>
+  <symbol minX="75" maxX="95" minY="798" maxY="818" name="entrance-s"/>
+  <symbol minX="95" maxX="115" minY="798" maxY="816" name="peakt-s"/>
+  <symbol minX="115" maxX="133" minY="798" maxY="816" name="dot-m"/>
+  <symbol minX="133" maxX="148" minY="798" maxY="813" name="tree-l"/>
+  <symbol minX="148" maxX="163" minY="798" maxY="813" name="none"/>
+  <symbol minX="163" maxX="201" minY="798" maxY="813" name="arrow-s"/>
+  <symbol minX="201" maxX="214" minY="798" maxY="811" name="dot-s"/>
+  <symbol minX="214" maxX="227" minY="798" maxY="811" name="entrance-xs"/>
+  <symbol minX="227" maxX="240" minY="798" maxY="811" name="tree-m"/>
+  <symbol minX="240" maxX="253" minY="798" maxY="811" name="dot-s-light"/>
+  <symbol minX="253" maxX="264" minY="798" maxY="809" name="tree-s"/>
+  <symbol minX="264" maxX="275" minY="798" maxY="809" name="zero-icon"/>
  </file>
 </root>
diff --git a/data/styles/clear/include/POI.mapcss b/data/styles/clear/include/POI.mapcss
index 153d347597..18b0afc0f5 100644
--- a/data/styles/clear/include/POI.mapcss
+++ b/data/styles/clear/include/POI.mapcss
@@ -205,7 +205,7 @@ node|z16[amenity=place_of_worship], area|z16[amenity=place_of_worship] { icon-im
 node|z16[amenity=kindergarten], area|z16[amenity=kindergarten] { icon-image: kindergarten-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2500; }
 node|z16[amenity=school], area|z16[amenity=school] { icon-image: school-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2500;}*/
 node|z16[amenity=college], area|z16[amenity=college] { icon-image: college-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2600; }
-node|z16[amenity=hospital], area|z16[amenity=hospital] { icon-image: hospital-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2700;}
+node|z16[amenity=hospital], area|z16[amenity=hospital]{ icon-image: hospital-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2700;}
 node|z16[amenity=clinic], area|z16[amenity=clinic] { icon-image: hospital-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2400; }
 node|z16[amenity=university][name], area|z16[amenity=university][name] { icon-image: college-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 1;icon-min-distance: 11; -x-me-text-priority:16000;}
 node|z16[amenity=university][!name], area|z16[amenity=university][!name] { }
@@ -224,6 +224,8 @@ node|z17[amenity=school], area|z17[amenity=school] { icon-image: school-l.svg; t
 node|z17[amenity=college], area|z17[amenity=college] { icon-image: college-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2600;}
 node|z17[amenity=hospital], area|z17[amenity=hospital] { icon-image: hospital-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2700; }
 node|z17[amenity=clinic], area|z17[amenity=clinic] { icon-image: hospital-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2400;}
+node|z17[amenity=doctors],area|z17[amenity=doctors]{ icon-image: hospital-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2400;}
+node|z17[amenity=dentist],area|z17[amenity=dentist]{ icon-image: dentist-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2400;}
 node|z17[amenity=university][name], area|z17[amenity=university][name] { icon-image: college-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; icon-min-distance: 10; -x-me-text-priority:16000;}
 node|z17[amenity=university][!name], area|z17[amenity=university][!name] { }
 node|z17[amenity=cinema], area|z17[amenity=cinema] { icon-image: cinema-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2600;}
@@ -256,6 +258,8 @@ node|z18-[amenity=school], area|z18-[amenity=school] { icon-image: school-l.svg;
 node|z18-[amenity=college], area|z18-[amenity=college] { icon-image: college-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2600;}
 node|z18-[amenity=hospital], area|z18-[amenity=hospital] { icon-image: hospital-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2700; }
 node|z18-[amenity=clinic], area|z18-[amenity=clinic] { icon-image: hospital-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;}
+node|z18-[amenity=doctors],area|z18-[amenity=doctors]{ icon-image: hospital-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;}
+node|z18-[amenity=dentist],area|z18-[amenity=dentist]{ icon-image: dentist-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;}
 node|z18-[amenity=university][name], area|z18-[amenity=university][name] { icon-image: college-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; -x-me-text-priority:16000;}
 node|z18-[amenity=university][!name], area|z18-[amenity=university][!name] { }
 node|z18-[amenity=cinema], area|z18-[amenity=cinema] { icon-image: cinema-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2600;}
diff --git a/data/styles/clear/include/landuse.mapcss b/data/styles/clear/include/landuse.mapcss
index df0a709fd5..6ba9d305dc 100644
--- a/data/styles/clear/include/landuse.mapcss
+++ b/data/styles/clear/include/landuse.mapcss
@@ -174,14 +174,16 @@ area|z17-[sport=multi]
 
 /* hospital*/
 
-area|z14-15[amenity=hospital] {
+area|z14-15[amenity=hospital],
+area|z14-15[amenity=doctors] {
   fill-color: @hospital;
   fill-opacity: 1;
   fill-position: background;
   z-index: 2;
 
 }
-area|z16-[amenity=hospital] {
+area|z16-[amenity=hospital],
+area|z16-[amenity=doctors]{
   fill-color: @hospital;
   fill-opacity: 1;
   fill-position: background;
diff --git a/data/styles/clear/style-clear/colors.mapcss b/data/styles/clear/style-clear/colors.mapcss
index dda99a394e..ee1c3d8392 100644
--- a/data/styles/clear/style-clear/colors.mapcss
+++ b/data/styles/clear/style-clear/colors.mapcss
@@ -116,8 +116,8 @@
 
 /* LANDUSE */
 
-@pedestrian_area: #E3E1D2;
-@pedestrian_area_light: #EDEBDB;
+@pedestrian_area: #EDE8D6;
+@pedestrian_area_light: #F2EEDA;
 
 @unversity: #F8E4BA;
 @hospital: #F8D9D9;/*FADCDB*/
diff --git a/data/styles/clear/style-clear/symbols/dentist-l.svg b/data/styles/clear/style-clear/symbols/dentist-l.svg
new file mode 100644
index 0000000000..5d14d14a59
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/dentist-l.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="27px" height="27px" viewBox="0 0 27 27" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+    <!-- Generator: Sketch 3.4.2 (15857) - http://www.bohemiancoding.com/sketch -->
+    <title>dentist-l</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
+        <g id="dentist-l" sketch:type="MSLayerGroup">
+            <ellipse id="Oval-1-Copy-46" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" rx="13.5" ry="13.5"></ellipse>
+            <circle id="Oval-1-Copy-38" fill="#717065" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
+            <path d="M6.50897437,13.9135201 C5.98487881,11.3254898 5.16165324,6.59032445 8.22835392,6.07169897 C11.2542641,5.55817055 11.3173039,7.98309509 13.5002114,7.98309509 C15.6843549,7.98309509 15.7424504,5.55689628 18.7683606,6.07169897 C21.8400056,6.59032445 21.0143079,11.3242155 20.4914484,13.9135201 C19.8721751,16.9628341 19.6818197,22 17.4197041,22 C15.9735963,22 15.685591,17.4285714 13.4228077,17.4285714 C11.3049432,17.4285714 11.0280625,22 9.42591123,22 C7.3198392,22 7.12701159,16.9628341 6.50897437,13.9135201 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/dentist-m.svg b/data/styles/clear/style-clear/symbols/dentist-m.svg
new file mode 100644
index 0000000000..c683337f97
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/dentist-m.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="25px" height="25px" viewBox="0 0 25 25" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+    <!-- Generator: Sketch 3.4.2 (15857) - http://www.bohemiancoding.com/sketch -->
+    <title>dentist-m</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
+        <g id="dentist-m" sketch:type="MSLayerGroup">
+            <circle id="Oval-1-Copy-38" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="12.5" cy="12.5" r="12.5"></circle>
+            <circle id="Oval-1-Copy-47" fill="#717065" sketch:type="MSShapeGroup" cx="12.5" cy="12.5" r="11.5"></circle>
+            <path d="M6.44569839,12.9243301 C5.98675869,10.6598036 5.26587698,6.5165339 7.95132369,6.0627366 C10.601051,5.61339923 10.6562537,7.73520821 12.5677809,7.73520821 C14.4803904,7.73520821 14.5312635,5.61228425 17.1809908,6.0627366 C19.8707671,6.5165339 19.1477206,10.6586886 18.6898633,12.9243301 C18.1475784,15.5924798 17.9808881,20 16,20 C14.7336732,20 14.4814728,16 12.5,16 C10.6454296,16 10.4029709,20 9,20 C7.15575605,20 6.98690087,15.5924798 6.44569839,12.9243301 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/dentist-s.svg b/data/styles/clear/style-clear/symbols/dentist-s.svg
new file mode 100644
index 0000000000..8f29030dd0
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/dentist-s.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="17px" height="17px" viewBox="0 0 17 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+    <!-- Generator: Sketch 3.4.2 (15857) - http://www.bohemiancoding.com/sketch -->
+    <title>dentist-s</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage"></g>
+</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/hospital-l.svg b/data/styles/clear/style-clear/symbols/hospital-l.svg
index df9f588c26..22fb7fb4b2 100644
--- a/data/styles/clear/style-clear/symbols/hospital-l.svg
+++ b/data/styles/clear/style-clear/symbols/hospital-l.svg
@@ -5,10 +5,10 @@
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <g id="hospital-l-copy" sketch:type="MSLayerGroup">
-            <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#A64B3C" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
-            <path d="M12,5.3622 C11.446,5.3622 11,5.8082 11,6.3622 L11,10.3622 L7,10.3622 C6.446,10.3622 6,10.8082 6,11.3622 L6,14.3622 C6,14.9162 6.446,15.3622 7,15.3622 L11,15.3622 L11,19.3622 C11,19.9162 11.446,20.3622 12,20.3622 L15,20.3622 C15.554,20.3622 16,19.9162 16,19.3622 L16,15.3622 L20,15.3622 C20.554,15.3622 21,14.9162 21,14.3622 L21,11.3622 C21,10.8082 20.554,10.3622 20,10.3622 L16,10.3622 L16,6.3622 C16,5.8082 15.554,5.3622 15,5.3622 L12,5.3622 Z" id="rect8206-4-copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+        <g id="hospital-l" sketch:type="MSLayerGroup">
+            <circle id="Oval-1-Copy-39" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
+            <circle id="Oval-1-Copy-38" fill="#C15746" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
+            <path d="M12,5.3622 C11.446,5.3622 11,5.8082 11,6.3622 L11,10.3622 L7,10.3622 C6.446,10.3622 6,10.8082 6,11.3622 L6,14.3622 C6,14.9162 6.446,15.3622 7,15.3622 L11,15.3622 L11,19.3622 C11,19.9162 11.446,20.3622 12,20.3622 L15,20.3622 C15.554,20.3622 16,19.9162 16,19.3622 L16,15.3622 L20,15.3622 C20.554,15.3622 21,14.9162 21,14.3622 L21,11.3622 C21,10.8082 20.554,10.3622 20,10.3622 L16,10.3622 L16,6.3622 C16,5.8082 15.554,5.3622 15,5.3622 L12,5.3622 Z" id="rect8206-4-copy" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/hospital-m.svg b/data/styles/clear/style-clear/symbols/hospital-m.svg
index 2fdd43afa1..fea2f89044 100644
--- a/data/styles/clear/style-clear/symbols/hospital-m.svg
+++ b/data/styles/clear/style-clear/symbols/hospital-m.svg
@@ -5,10 +5,10 @@
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <g id="hospital-m-copy" sketch:type="MSLayerGroup">
-            <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
-            <ellipse id="Oval-1-Copy-40" fill="#A64B3C" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
-            <path d="M10,5 C9.446,5 9,5.446 9,6 L9,9 L6,9 C5.446,9 5,9.446 5,10 L5,13 C5,13.554 5.474429,14.1752 6,14 L9,14 L9,17 C9,17.554 9.446,18 10,18 L13,18 C13.554,18 14,17.554 14,17 L14,14 L17,14 C17.554,14 18,13.554 18,13 L18,10 C18,9.446 17.554,9 17,9 L14,9 L14,6 C14,5.446 13.554,5 13,5 L10,5 Z" id="rect8206-4-3-copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+        <g id="hospital-m" sketch:type="MSLayerGroup">
+            <ellipse id="Oval-1-Copy-41" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
+            <ellipse id="Oval-1-Copy-40" fill="#C15746" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+            <path d="M10,5 C9.446,5 9,5.446 9,6 L9,9 L6,9 C5.446,9 5,9.446 5,10 L5,13 C5,13.554 5.474429,14.1752 6,14 L9,14 L9,17 C9,17.554 9.446,18 10,18 L13,18 C13.554,18 14,17.554 14,17 L14,14 L17,14 C17.554,14 18,13.554 18,13 L18,10 C18,9.446 17.554,9 17,9 L14,9 L14,6 C14,5.446 13.554,5 13,5 L10,5 Z" id="rect8206-4-3-copy" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/hospital-s.svg b/data/styles/clear/style-clear/symbols/hospital-s.svg
index 1608301939..191881843d 100644
--- a/data/styles/clear/style-clear/symbols/hospital-s.svg
+++ b/data/styles/clear/style-clear/symbols/hospital-s.svg
@@ -5,10 +5,10 @@
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <g id="hospital-s-copy" sketch:type="MSLayerGroup">
-            <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-42" fill="#A64B3C" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
-            <path d="M4,8 C4,7.446 4.446,7 5,7 L7,7 L7,5 C7,4.446 7.446,4 8,4 L9,4 C9.554,4 10,4.446 10,5 L10,7 L12,7 C12.554,7 13,7.446 13,8 L13,9 C13,9.554 12.554,10 12,10 L10,10 L10,12 C10,12.554 9.554,13 9,13 L8,13 C7.446,13 7,12.554 7,12 L7,10 L5,10 C4.446,10 4,9.554 4,9 L4,8 Z" id="path5535" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+        <g id="hospital-s" sketch:type="MSLayerGroup">
+            <circle id="Oval-1-Copy-43" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
+            <circle id="Oval-1-Copy-42" fill="#C15746" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
+            <path d="M4,8 C4,7.446 4.446,7 5,7 L7,7 L7,5 C7,4.446 7.446,4 8,4 L9,4 C9.554,4 10,4.446 10,5 L10,7 L12,7 C12.554,7 13,7.446 13,8 L13,9 C13,9.554 12.554,10 12,10 L10,10 L10,12 C10,12.554 9.554,13 9,13 L8,13 C7.446,13 7,12.554 7,12 L7,10 L5,10 C4.446,10 4,9.554 4,9 L4,8 Z" id="path5535" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/colors.mapcss b/data/styles/clear/style-night/colors.mapcss
index 443eae2f28..24a4df3a06 100644
--- a/data/styles/clear/style-night/colors.mapcss
+++ b/data/styles/clear/style-night/colors.mapcss
@@ -77,21 +77,21 @@
 
 
 /* TRANSPORT */
-@railway_light: #212119;
-@railway: #212119;
-@railway_tunnel: #212119;
-@railway_dash: #000000;
+@railway_light: #333333;
+@railway: #333333;
+@railway_tunnel: #222222;
+@railway_dash: #111111;
 @aerialway: #4E4E3D;
 @tram: #5C5C51;
 @ferry: #2A4541;
- @aerodrome: #382D45;
+ @aerodrome: #30263B;
 /*aerodrome*/
  @aerodrome0: #382D45;
- @aerodrome1: #382D45;
- @aerodrome2: #382D45;
- @aerodrome3: #382D45;
- @aerodrome4: #382D45;
- @aerodrome5: #382D45;
+ @aerodrome1: #342A40;
+ @aerodrome2: #30263B;
+ @aerodrome3: #30263B;
+ @aerodrome4: #2B2336;
+ @aerodrome5: #292133;
 /* NATURAL */
 @glacier: #111111;
 @water: #002222;
diff --git a/data/styles/clear/style-night/symbols/airport-l.svg b/data/styles/clear/style-night/symbols/airport-l.svg
index b4cc83306a..7085c42082 100644
--- a/data/styles/clear/style-night/symbols/airport-l.svg
+++ b/data/styles/clear/style-night/symbols/airport-l.svg
@@ -7,7 +7,7 @@
     <g id="Transport" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="airport-l" sketch:type="MSLayerGroup" transform="translate(0.840271, 0.634843)">
             <ellipse id="Oval-1-Copy-45" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.3823814" cy="13.3804134" rx="13.3823814" ry="13.3804134"></ellipse>
-            <ellipse id="Oval-1-Copy-44" fill="#12314C" sketch:type="MSShapeGroup" cx="13.3823814" cy="13.3804134" rx="12.3910939" ry="12.3892717"></ellipse>
+            <ellipse id="Oval-1-Copy-44" fill="#0F2940" sketch:type="MSShapeGroup" cx="13.3823814" cy="13.3804134" rx="12.3910939" ry="12.3892717"></ellipse>
             <g id="g6678" transform="translate(4.956438, 3.964567)" fill="#FFFFFF" opacity="0.7" sketch:type="MSShapeGroup">
                 <g id="g14771">
                     <path d="M16.8518877,10.7659797 L16.8518877,11.2615506 L9.91287512,10.2704089 L9.91287512,14.2347776 L11.8954501,16.2172593 C11.8954501,16.7128301 11.3998064,17.208401 10.9041626,17.208401 L5.94772507,17.208401 C5.45208132,17.208401 4.95643756,16.7128301 4.95643756,16.2172593 L6.93901258,14.2347776 L6.93901258,10.2702106 L0,11.2613524 L0,10.7659797 C0,10.2704089 0.303009927,10.1337304 0.495643756,10.0226234 L6.93901258,6.3056437 L6.93901258,4.32336024 C6.93901258,3.3322185 7.43465634,0.358793307 8.42594385,0.358793307 C9.41723136,0.358793307 9.91287512,3.3322185 9.91287512,4.32336024 L9.91287512,6.3056437 L16.3562439,10.0226234 C16.6322283,10.1818008 16.8518877,10.2615877 16.8518877,10.7659797 L16.8518877,10.7659797 Z" id="path7712"></path>
diff --git a/data/styles/clear/style-night/symbols/airport-m.svg b/data/styles/clear/style-night/symbols/airport-m.svg
index 3fffcbc07e..57207bb731 100644
--- a/data/styles/clear/style-night/symbols/airport-m.svg
+++ b/data/styles/clear/style-night/symbols/airport-m.svg
@@ -7,7 +7,7 @@
     <g id="Transport" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="airport-m" sketch:type="MSLayerGroup" transform="translate(0.526621, 0.617126)">
             <ellipse id="Oval-1-Copy-47" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.3998064" cy="11.3981299" rx="11.3998064" ry="11.3981299"></ellipse>
-            <ellipse id="Oval-1-Copy-46" fill="#12314C" sketch:type="MSShapeGroup" cx="11.3998064" cy="11.3981299" rx="10.4085189" ry="10.4069882"></ellipse>
+            <ellipse id="Oval-1-Copy-46" fill="#0F2940" sketch:type="MSShapeGroup" cx="11.3998064" cy="11.3981299" rx="10.4085189" ry="10.4069882"></ellipse>
             <path d="M18.338819,12.2526923 L18.338819,13.2438341 L12.8867377,12.2526923 L12.8867377,15.2261175 L14.8693127,16.4374909 L14.8693127,17.208401 L8.92158761,17.208401 L8.92158761,16.4374909 L10.9041626,15.2261175 L10.9041626,12.2526923 L5.45208132,13.2438341 L5.45208132,12.2526923 L10.9041626,9.27926713 L10.9041626,6.30584193 C10.9041626,5.535031 11.1244465,4.32355846 11.8954501,4.32355846 C12.6664438,4.32355846 12.8867377,5.535031 12.8867377,6.30584193 L12.8867377,9.27926713 L18.338819,12.2526923 Z" id="path7712-0" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-night/symbols/airport-s.svg b/data/styles/clear/style-night/symbols/airport-s.svg
index 8320aa3f80..41f8fcf919 100644
--- a/data/styles/clear/style-night/symbols/airport-s.svg
+++ b/data/styles/clear/style-night/symbols/airport-s.svg
@@ -7,7 +7,7 @@
     <g id="Transport" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="airport-s" sketch:type="MSLayerGroup" transform="translate(0.239109, 0.590551)">
             <ellipse id="Oval-1-Copy-51" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.42594385" cy="8.42470472" rx="8.42594385" ry="8.42470472"></ellipse>
-            <ellipse id="Oval-1-Copy-50" fill="#12314C" sketch:type="MSShapeGroup" cx="8.42594385" cy="8.42470472" rx="7.43465634" ry="7.43356299"></ellipse>
+            <ellipse id="Oval-1-Copy-50" fill="#0F2940" sketch:type="MSShapeGroup" cx="8.42594385" cy="8.42470472" rx="7.43465634" ry="7.43356299"></ellipse>
             <path d="M12.8867377,8.71292874 L12.8867377,9.27926713 L9.91287512,9.27926692 L9.91287512,10.7659797 L10.9041626,11.8122289 L10.9041626,12.2526923 L6.93901258,12.2526923 L6.93901258,11.8122289 L7.9303001,10.7659797 L7.9303001,9.27926692 L4.95643756,9.27926713 L4.95643756,8.71292874 L7.9303001,7.29698366 L7.9303001,5.3147002 C7.9303001,4.87423681 8.47917438,4.03223664 8.91970255,4.03223664 C9.36027037,4.03223664 9.91287512,4.87423681 9.91287512,5.3147002 L9.91287512,7.29698366 L12.8867377,8.71292874 Z" id="path7712-0-5" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-night/symbols/alcohol-l.svg b/data/styles/clear/style-night/symbols/alcohol-l.svg
index 4a84528671..7b1848ca70 100644
--- a/data/styles/clear/style-night/symbols/alcohol-l.svg
+++ b/data/styles/clear/style-night/symbols/alcohol-l.svg
@@ -10,7 +10,7 @@
         <g id="alcohol-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.057,27 0,20.943 0,13.5 C0,6.057 6.057,0 13.5,0 C20.943,0 27,6.057 27,13.5 C27,20.943 20.943,27 13.5,27 L13.5,27 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M12.174,10.437 L11,9.637 L10.502,4 L8.498,4 L8,9.695 L6.838,10.453 C6.375,10.756 6,11.447 6,12 L6,21 C6,21.553 6.447,22 7,22 L12,22 C12.553,22 13,21.553 13,21 L13,12 C13,11.447 12.63,10.748 12.174,10.437 L12.174,10.437 Z M20,16 C21.104,16 22,15.104 22,14 L21,9 L16,9 L15,14 C15,15.104 15.896,16 17,16 L18,16 L18,20.2 L16,21 L16,22 L21,22 L21,21 L19,20.2 L19,16 L20,16 L20,16 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/alcohol-m.svg b/data/styles/clear/style-night/symbols/alcohol-m.svg
index db53469fd9..da015d9074 100644
--- a/data/styles/clear/style-night/symbols/alcohol-m.svg
+++ b/data/styles/clear/style-night/symbols/alcohol-m.svg
@@ -10,7 +10,7 @@
         <g id="alcohol-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M10.41,9.742 L9.571,9.171 L9.215,5.146 L7.785,5.146 L7.429,9.212 L6.599,9.755 C6.269,9.971 6,10.464 6,10.859 L6,17.288 C6,17.683 6.32,18.001 6.715,18.001 L10.286,18.001 C10.68,18.001 11,17.683 11,17.288 L11,10.859 C11,10.464 10.736,9.965 10.41,9.742 L10.41,9.742 Z M16.571,13.001 C17.36,13.001 18,12.361 18,11.572 L17.285,8 L13.713,8 L13,11.572 C13,12.361 13.639,13.001 14.429,13.001 L15,13.001 L15,16.715 L13,17.287 L13,18 L18,18 L18,17.287 L16,16.715 L16,13.001 L16.571,13.001 L16.571,13.001 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/alcohol-s.svg b/data/styles/clear/style-night/symbols/alcohol-s.svg
index 78a6aaa81c..c6f2a76315 100644
--- a/data/styles/clear/style-night/symbols/alcohol-s.svg
+++ b/data/styles/clear/style-night/symbols/alcohol-s.svg
@@ -10,7 +10,7 @@
         <g id="alcohol-s" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
             <g id="Oval-1-Copy-42">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M6,3 L6,5 L4,7 L4,12.4063 L4.59375,13 L8.625,13 L9,12.5 L9,7 L7,5 L7,3 L6,3 L6,3 Z M10,7 L10,9 L11,10 L11,12 L10,13 L13,13 L12,12 L12,10 L13,9 L13,7 L10,7 L10,7 Z" id="path5715-copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/alpine_hut-l.svg b/data/styles/clear/style-night/symbols/alpine_hut-l.svg
index d719bdb1f1..6308e2898a 100644
--- a/data/styles/clear/style-night/symbols/alpine_hut-l.svg
+++ b/data/styles/clear/style-night/symbols/alpine_hut-l.svg
@@ -8,7 +8,7 @@
         <g id="alpine_hut-l" sketch:type="MSLayerGroup">
             <g id="Shape-+-Shape-+-Shape" sketch:type="MSShapeGroup">
                 <path d="M13.5,27 C6.057,27 0,20.943 0,13.5 C0,6.057 6.057,0 13.5,0 C20.943,0 27,6.057 27,13.5 C27,20.943 20.943,27 13.5,27 L13.5,27 Z" id="Shape" opacity="0" fill="#FFFFFF"></path>
-                <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#331E12"></path>
+                <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#2E1B10"></path>
                 <path d="M21,12.502 L21,21 L16,21 L16,16 L11,16 L11,21 L6,21 L6,12.502 L13.498,5 L21,12.502 L21,12.502 Z" id="Shape" opacity="0.7" fill="#FFFFFF"></path>
             </g>
         </g>
diff --git a/data/styles/clear/style-night/symbols/alpine_hut-m.svg b/data/styles/clear/style-night/symbols/alpine_hut-m.svg
index 780c828299..73594c908c 100644
--- a/data/styles/clear/style-night/symbols/alpine_hut-m.svg
+++ b/data/styles/clear/style-night/symbols/alpine_hut-m.svg
@@ -8,7 +8,7 @@
         <g id="alpine_hut-m" sketch:type="MSLayerGroup">
             <g id="Shape-+-Shape-+-Shape" sketch:type="MSShapeGroup">
                 <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" opacity="0" fill="#FFFFFF"></path>
-                <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#331E12"></path>
+                <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#2E1B10"></path>
                 <path d="M17,10.502 L17,18 L13,18 L13,14 L10,14 L10,18 L6,18 L6,10.502 L11.498,5 L17,10.502 L17,10.502 Z" id="Shape" opacity="0.7" fill="#FFFFFF"></path>
             </g>
         </g>
diff --git a/data/styles/clear/style-night/symbols/america-football-l.svg b/data/styles/clear/style-night/symbols/america-football-l.svg
index f52c4b5ca1..72c76dadb3 100644
--- a/data/styles/clear/style-night/symbols/america-football-l.svg
+++ b/data/styles/clear/style-night/symbols/america-football-l.svg
@@ -10,7 +10,7 @@
         <g id="america-football-l" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
             <g id="Oval-1-Copy-38">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M13.5,7 C7,7 4,13.5 4,13.5 C4,13.5 7,20 13.5,20 C20,20 23,13.5 23,13.5 C23,13.5 20,7 13.5,7 L13.5,7 Z M10.5,12 C10.777,12 11,12.223 11,12.5 L11,13 L13,13 L13,12.5 C13,12.223 13.223,12 13.5,12 C13.777,12 14,12.223 14,12.5 L14,13 L16,13 L16,12.5 C16,12.223 16.223,12 16.5,12 C16.777,12 17,12.223 17,12.5 L17,13 L18.5,13 C18.777,13 19,13.223 19,13.5 C19,13.777 18.777,14 18.5,14 L17,14 L17,14.5 C17,14.777 16.777,15 16.5,15 C16.223,15 16,14.777 16,14.5 L16,14 L14,14 L14,14.5 C14,14.777 13.777,15 13.5,15 C13.223,15 13,14.777 13,14.5 L13,14 L11,14 L11,14.5 C11,14.777 10.777,15 10.5,15 C10.223,15 10,14.777 10,14.5 L10,14 L8.5,14 C8.223,14 8,13.777 8,13.5 C8,13.223 8.223,13 8.5,13 L10,13 L10,12.5 C10,12.223 10.223,12 10.5,12 L10.5,12 Z" id="path14961-copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/america-football-m.svg b/data/styles/clear/style-night/symbols/america-football-m.svg
index 34822d1fda..7861c71064 100644
--- a/data/styles/clear/style-night/symbols/america-football-m.svg
+++ b/data/styles/clear/style-night/symbols/america-football-m.svg
@@ -10,7 +10,7 @@
         <g id="america-football-m" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
             <g id="Oval-1-Copy-40">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M11.5,7 C6.71053,7 5,11.5 5,11.5 C5,11.5 6.71053,16 11.5,16 C16.28947,16 18,11.5 18,11.5 C18,11.5 16.28947,7 11.5,7 L11.5,7 Z M9.25,10 C9.3885,10 9.5,10.1115 9.5,10.25 L9.5,11 L11.25,11 L11.25,10.25 C11.25,10.1115 11.3615,10 11.5,10 C11.6385,10 11.75,10.1115 11.75,10.25 L11.75,11 L13.5,11 L13.5,10.25 C13.5,10.1115 13.6115,10 13.75,10 C13.8885,10 14.03359,10.1156 14,10.25 L14,11 L14.5625,11 C14.80872,11 15,11.223 15,11.5 C15,11.777 14.80872,12 14.5625,12 L14,12 L14,12.75 C14,12.8885 13.8885,13 13.75,13 C13.6115,13 13.53359,12.8844 13.5,12.75 L13.5,12 L11.75,12 L11.75,12.75 C11.75,12.8885 11.6385,13 11.5,13 C11.3615,13 11.25,12.8885 11.25,12.75 L11.25,12 L9.5,12 L9.5,12.75 C9.5,12.8885 9.3885,13 9.25,13 C9.1115,13 9,12.8885 9,12.75 L9,12 L8.4375,12 C8.19128,12 8,11.777 8,11.5 C8,11.223 8.19128,11 8.4375,11 L9,11 L9,10.25 C9,10.1115 9.1115,10 9.25,10 L9.25,10 Z" id="path11300-2-copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/america-football-s.svg b/data/styles/clear/style-night/symbols/america-football-s.svg
index 604184b500..82e8456e19 100644
--- a/data/styles/clear/style-night/symbols/america-football-s.svg
+++ b/data/styles/clear/style-night/symbols/america-football-s.svg
@@ -10,7 +10,7 @@
         <g id="america-football-s" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
             <g id="Oval-1-Copy-42">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M8.5,6 C5.25,6 4,9 4,9 C4,9 5.25,12 8.5,12 C11.75,12 13,9 13,9 C13,9 11.75,6 8.5,6 L8.5,6 Z M7.5,8.5 L8.5,8.5 L9,8.5 L10,8.5 L10.5,8.5 L11,8.5 C11.1385,8.5 11.25,8.6115 11.25,8.75 C11.25,8.8885 11.1385,9 11,9 L10.5,9 L10,9 L9,9 L8.5,9 L7.5,9 L7,9 L6.25,9 C6.1115,9 6,8.8885 6,8.75 C6,8.6115 6.1115,8.5 6.25,8.5 L7,8.5 L7.5,8.5 Z" id="path11300-6-copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/archery-l.svg b/data/styles/clear/style-night/symbols/archery-l.svg
index 4117fccb55..4d39027dae 100644
--- a/data/styles/clear/style-night/symbols/archery-l.svg
+++ b/data/styles/clear/style-night/symbols/archery-l.svg
@@ -10,7 +10,7 @@
         <g id="archery-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.057,27 0,20.943 0,13.5 C0,6.057 6.057,0 13.5,0 C20.943,0 27,6.057 27,13.5 C27,20.943 20.943,27 13.5,27 L13.5,27 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M21,11.501 C21,9.266 20.012,7.262 18.456,5.886 L18,3 L16,3 L16.241,4.525 C15.39,4.19 14.469,4 13.501,4 C12.532,4 11.609,4.19 10.759,4.526 L11,3 L9,3 L8.544,5.887 C6.988,7.262 6,9.266 6,11.501 C6,12.896 6.39,14.197 7.055,15.316 L6,22 L8,22 L8.743,17.294 C9.917,18.26 11.39,18.868 13,18.976 L13,21 L14,21 L14,18.976 C15.609,18.87 17.083,18.261 18.257,17.295 L19,22 L21,22 L19.945,15.317 C20.61,14.197 21,12.896 21,11.501 L21,11.501 Z M13.501,17.001 C10.468,17.001 8,14.533 8,11.501 C8,8.468 10.468,6 13.501,6 C16.533,6 19,8.468 19,11.501 C19,14.533 16.533,17.001 13.501,17.001 L13.501,17.001 Z M13.501,9 C12.122,9 11,10.121 11,11.5 C11,12.879 12.122,14 13.501,14 C14.879,14 16,12.879 16,11.5 C16,10.121 14.879,9 13.501,9 L13.501,9 Z M13.501,13 C12.672,13 12,12.328 12,11.5 C12,10.672 12.672,10 13.501,10 C14.329,10 15,10.672 15,11.5 C15,12.328 14.329,13 13.501,13 L13.501,13 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/archery-m.svg b/data/styles/clear/style-night/symbols/archery-m.svg
index 2494f2c791..a20f2c20e5 100644
--- a/data/styles/clear/style-night/symbols/archery-m.svg
+++ b/data/styles/clear/style-night/symbols/archery-m.svg
@@ -10,7 +10,7 @@
         <g id="archery-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M17,10.501 C17,8.776 16.201,7.236 14.956,6.227 L14.6,4 L13,4 L13.204,5.273 C12.667,5.097 12.096,5 11.501,5 C10.905,5 10.334,5.098 9.796,5.273 L10,4 L8.4,4 L8.044,6.228 C6.799,7.238 6,8.777 6,10.501 C6,11.599 6.327,12.62 6.884,13.48 L6,19 L7.6,19 L8.252,14.928 C9.036,15.505 9.977,15.882 11,15.975 L11,18 L12,18 L12,15.975 C13.023,15.882 13.964,15.506 14.748,14.929 L15.4,19 L17,19 L16.117,13.479 C16.673,12.62 17,11.599 17,10.501 L17,10.501 Z M11.501,14 C9.57,14 8,12.431 8,10.501 C8,8.57 9.57,7 11.501,7 C13.431,7 15,8.57 15,10.501 C15,12.431 13.431,14 11.501,14 L11.501,14 Z M11.501,9 C10.672,9 10,9.672 10,10.5 C10,11.329 10.672,12.002 11.501,12.002 C12.33,12.002 13,11.329 13,10.5 C13,9.672 12.33,9 11.501,9 L11.501,9 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/atm-l.svg b/data/styles/clear/style-night/symbols/atm-l.svg
index b86b2f6395..105f17eac1 100644
--- a/data/styles/clear/style-night/symbols/atm-l.svg
+++ b/data/styles/clear/style-night/symbols/atm-l.svg
@@ -10,7 +10,7 @@
         <g id="atm-l-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
             <g id="Oval-1-Copy-38">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M6,9 C5.446,9 5,9.446 5,10 L5,19 C5,19.554 5.446,20 6,20 L21,20 C21.554,20 22,19.554 22,19 L22,10 C22,9.446 21.554,9 21,9 L6,9 Z M5.5,11 L21,11 L21,13 L5.5,13 L5.5,11 Z M6,16 L9,16 L9,18 L6,18 L6,16 Z M14,17 L21,17 L21,18 L14,18 L14,17 Z" id="rect10401-copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/atm-m.svg b/data/styles/clear/style-night/symbols/atm-m.svg
index 04b106bfd5..13d63a4b96 100644
--- a/data/styles/clear/style-night/symbols/atm-m.svg
+++ b/data/styles/clear/style-night/symbols/atm-m.svg
@@ -10,7 +10,7 @@
         <g id="atm-m-copy" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
             <g id="Oval-1-Copy-40">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M5.72222,8 C5.32211,8 5,8.3221 5,8.7223 L5,15.2778 C5,15.6779 5.32211,16 5.72222,16 L17.27778,16 C17.67789,16 18,15.6779 18,15.2778 L18,8.7223 C18,8.3221 17.67789,8 17.27778,8 L5.72222,8 Z M5.5,9.5 L17.5,9.5 L17.5,11 L5.5,11 L5.5,9.5 Z M6,13.5 L8,13.5 L8,15 L6,15 L6,13.5 Z M12,14.2777 L17,14.2777 L17,15 L12,15 L12,14.2777 Z" id="rect10401-9-copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/atm-s.svg b/data/styles/clear/style-night/symbols/atm-s.svg
index c879380a65..39c8765c73 100644
--- a/data/styles/clear/style-night/symbols/atm-s.svg
+++ b/data/styles/clear/style-night/symbols/atm-s.svg
@@ -10,7 +10,7 @@
         <g id="atm-s-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
             <g id="Oval-1-Copy-42">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M4.5,5 C4.223,5 4,5.223 4,5.5 L4,10.5 C4,10.777 4.223,11 4.5,11 L12.5,11 C12.777,11 13,10.777 13,10.5 L13,5.5 C13,5.223 12.777,5 12.5,5 L4.5,5 Z M4.5,6 L12.5,6 L12.5,7 L4.5,7 L4.5,6 Z M4.5,9 L6,9 L6,10 L4.5,10 L4.5,9 Z M9,9.5 L12,9.5 L12,10 L9,10 L9,9.5 Z" id="rect10401-7-copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/australian-football-l.svg b/data/styles/clear/style-night/symbols/australian-football-l.svg
index eefe51fd4b..d28fa75987 100644
--- a/data/styles/clear/style-night/symbols/australian-football-l.svg
+++ b/data/styles/clear/style-night/symbols/australian-football-l.svg
@@ -10,7 +10,7 @@
         <g id="australian-football-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.057,27 0,20.943 0,13.5 C0,6.057 6.057,0 13.5,0 C20.943,0 27,6.057 27,13.5 C27,20.943 20.943,27 13.5,27 L13.5,27 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M17.3414941,6.00207143 C14.4756401,6.11677618 11.6441974,7.27000008 9.45686611,9.45821376 C7.26865244,11.6455451 6.11631088,14.4769877 6.00072379,17.3428417 C5.92748922,19.1913529 7.8086471,21.0725108 9.65715825,20.9992762 C12.5230123,20.8836891 15.3544549,19.7313476 17.5417862,17.5431339 C19.7299999,15.3558026 20.8832238,12.5243599 20.9979286,9.6585059 C21.0711631,7.80999475 19.1900053,5.92883686 17.3414941,6.00207143 L17.3414941,6.00207143 Z M18.1029572,11.8026024 C18.3094257,12.0081886 18.3094257,12.3443617 18.1029572,12.5508303 L17.8444303,12.8093571 C17.7447254,12.909062 17.6114914,12.9646497 17.4703164,12.9646497 C17.3291413,12.9646497 17.1959073,12.9099444 17.0962024,12.8093571 L16.1468,11.8608371 L14.5074045,13.5002327 L15.4559245,14.449635 C15.662393,14.6552212 15.662393,14.9913944 15.4559245,15.1978629 L15.1973976,15.4563898 C15.0976927,15.5560947 14.9644588,15.6116824 14.8232837,15.6116824 C14.6821086,15.6116824 14.5488746,15.556977 14.4491697,15.4563898 L13.4997673,14.5078698 L11.8603718,16.1472653 L12.8088918,17.0966677 C12.9085967,17.1963726 12.9641844,17.3296066 12.9641844,17.4707817 C12.9641844,17.6119567 12.9094791,17.7451907 12.8088918,17.8448956 L12.550365,18.1034225 C12.4506601,18.2031274 12.3174261,18.2587151 12.176251,18.2587151 C12.0350759,18.2587151 11.901842,18.2040097 11.8021371,18.1034225 L10.8527347,17.1549024 L9.90333229,18.1034225 C9.80362739,18.2031274 9.67039342,18.2587151 9.52921834,18.2587151 C9.38804326,18.2587151 9.25480929,18.2040097 9.15510439,18.1034225 L8.89657753,17.8448956 C8.69010898,17.6393094 8.69010898,17.3031363 8.89657753,17.0966677 L9.84509757,16.1472653 L8.89657753,15.1978629 C8.69010898,14.9922767 8.69010898,14.6561036 8.89657753,14.449635 L9.15510439,14.1911082 C9.25480929,14.0914033 9.38804326,14.0358156 9.52921834,14.0358156 C9.67039342,14.0358156 9.80362739,14.0905209 9.90333229,14.1911082 L10.8527347,15.1396282 L12.4921302,13.5002327 L11.5436102,12.5508303 C11.3371417,12.3452441 11.3371417,12.0090709 11.5436102,11.8026024 L11.8021371,11.5440755 C11.901842,11.4443706 12.0350759,11.3887829 12.176251,11.3887829 C12.3174261,11.3887829 12.4506601,11.4434883 12.550365,11.5440755 L13.4997673,12.4925955 L15.1391629,10.8532 L14.1906429,9.90379759 C14.090938,9.80409269 14.0353503,9.67085872 14.0353503,9.52968364 C14.0353503,9.38850856 14.0900556,9.25527459 14.1906429,9.15556969 L14.4491697,8.89704283 C14.5488746,8.79733793 14.6821086,8.74175025 14.8232837,8.74175025 C14.9644588,8.74175025 15.0976927,8.79645559 15.1973976,8.89704283 L16.1468,9.84556287 L17.0962024,8.89704283 C17.1959073,8.79733793 17.3291413,8.74175025 17.4703164,8.74175025 C17.6114914,8.74175025 17.7447254,8.79645559 17.8444303,8.89704283 L18.1029572,9.15556969 C18.3094257,9.36115589 18.3094257,9.69732904 18.1029572,9.90379759 L17.1544371,10.8532 L18.1029572,11.8026024 L18.1029572,11.8026024 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/australian-football-m.svg b/data/styles/clear/style-night/symbols/australian-football-m.svg
index 403381819b..f4777a2f3b 100644
--- a/data/styles/clear/style-night/symbols/australian-football-m.svg
+++ b/data/styles/clear/style-night/symbols/australian-football-m.svg
@@ -10,7 +10,7 @@
         <g id="australian-football-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M14.8416197,5.00174174 C12.3658587,5.10049497 9.92041664,6.09755618 8.03284378,7.98599529 C6.14267215,9.87530066 5.14734346,12.3198764 5.04772397,14.7947712 C4.98448725,16.3904156 6.60958439,18.0155128 8.20522882,17.952276 C10.6801236,17.8526565 13.1255656,16.8564616 15.0140047,14.9671562 C16.9033101,13.0787171 17.899505,10.6341413 17.9982583,8.15838033 C18.0606287,6.5627359 16.4372641,4.93937127 14.8416197,5.00174174 L14.8416197,5.00174174 Z M9.64754585,12.3631893 L8.71632014,11.4310973 C8.51361612,11.2292595 8.51361612,10.8992158 8.71632014,10.6965118 L8.97013329,10.4426987 C9.06802027,10.3448117 9.198825,10.2902375 9.33742603,10.2902375 C9.47602707,10.2902375 9.60683179,10.3439454 9.70471878,10.4426987 L10.6368107,11.3739244 L11.3800588,10.6306763 L10.4488331,9.69858434 C10.3509461,9.60069736 10.2963719,9.46989263 10.2963719,9.3312916 C10.2963719,9.19269056 10.3500798,9.06188583 10.4488331,8.96399885 L10.7026462,8.7101857 C10.8005332,8.61229872 10.9313379,8.55772456 11.069939,8.55772456 C11.20854,8.55772456 11.3393447,8.61143247 11.4372317,8.7101857 L12.3693237,9.64141141 L13.3014157,8.7101857 C13.3993026,8.61229872 13.5301074,8.55772456 13.6687084,8.55772456 C13.8073094,8.55772456 13.9381142,8.61143247 14.0360011,8.7101857 L14.2898143,8.96399885 C14.4925183,9.16583661 14.4925183,9.49588033 14.2898143,9.69858434 L13.3585886,10.6306763 L14.2898143,11.5627683 C14.4925183,11.764606 14.4925183,12.0946497 14.2898143,12.2973538 L14.0360011,12.5511669 C13.9381142,12.6490539 13.8073094,12.7036281 13.6687084,12.7036281 C13.5301074,12.7036281 13.3993026,12.6499202 13.3014157,12.5511669 L12.3693237,11.6199412 L11.6260756,12.3631893 L12.5573013,13.2952812 C12.7600054,13.497119 12.7600054,13.8271627 12.5573013,14.0298667 L12.3034882,14.2836799 C12.2056012,14.3815668 12.0747965,14.436141 11.9361955,14.436141 C11.7975944,14.436141 11.6667897,14.3824331 11.5689027,14.2836799 L10.6368107,13.3524542 L9.70471878,14.2836799 C9.60683179,14.3815668 9.47602707,14.436141 9.33742603,14.436141 C9.198825,14.436141 9.06802027,14.3824331 8.97013329,14.2836799 L8.71632014,14.0298667 C8.51361612,13.828029 8.51361612,13.4979852 8.71632014,13.2952812 L9.64754585,12.3631893 L9.64754585,12.3631893 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/bakery-l.svg b/data/styles/clear/style-night/symbols/bakery-l.svg
index ac9df82563..81b3143c93 100644
--- a/data/styles/clear/style-night/symbols/bakery-l.svg
+++ b/data/styles/clear/style-night/symbols/bakery-l.svg
@@ -10,7 +10,7 @@
         <g id="bakery-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.057,27 0,20.943 0,13.5 C0,6.057 6.057,0 13.5,0 C20.943,0 27,6.057 27,13.5 C27,20.943 20.943,27 13.5,27 L13.5,27 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M13.5,7 C12,7 10.736,7.536 11.062,9 L12.5,15.5 C12.551,15.73 12.689,16 13,16 L14,16 L14,16 C14.311,16 14.449,15.73 14.5,15.5 L15.938,9 C16.264,7.536 15,7 13.5,7 L14,7 L13.5,7 L13.5,7 Z M8,10 C7,10 6.049,10.599 6.5,11.5 L8.5,15.5 C8.666,15.834 9,16 9.5,16 L10.5,16 C10.5,16 11.115,16.018 11,15.5 L10,11 C9.889,10.497 9.5,10 9,10 L8,10 L8,10 Z M18,10 C17.5,10 17.111,10.497 17,11 L16,15.5 C15.885,16.018 16.5,16 16.5,16 L17.5,16 C18,16 18.334,15.834 18.5,15.5 L20.5,11.5 C20.951,10.599 20,10 19,10 L18,10 L18,10 Z M5.438,13.125 C5.245,13.124 5.083,13.243 5,13.5 L4.043,16.494 C3.924,16.869 4.005,17.06 4.512,16.963 L7,16.5 C7.491,16.406 7.572,16.234 7.438,16 L6,13.5 C5.854,13.248 5.631,13.126 5.438,13.125 L5.438,13.125 Z M21.562,13.125 C21.369,13.126 21.145,13.248 21,13.5 L19.562,16 C19.427,16.234 19.508,16.406 20,16.5 L22.453,16.975 C22.96,17.072 23.072,16.88 22.953,16.506 L22,13.5 C21.918,13.243 21.756,13.124 21.562,13.125 L21.562,13.125 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/bakery-m.svg b/data/styles/clear/style-night/symbols/bakery-m.svg
index bfd48fb775..def34e6351 100644
--- a/data/styles/clear/style-night/symbols/bakery-m.svg
+++ b/data/styles/clear/style-night/symbols/bakery-m.svg
@@ -10,7 +10,7 @@
         <g id="bakery-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M11,7 C10,7 9.5,7.5 9.5,8.5 L10.5,12.5 L11,13 L12,13 L12.5,12.5 L13.5,8.5 C13.5,7.5 13,7 12,7 L11,7 L11,7 Z M8.5,8.5 L6.5,9.5 L8,13 L9,13 L9.5,12.5 L8.5,8.5 L8.5,8.5 Z M14.5,8.5 L13.5,12.5 L14,13 L15,13 L16.5,9.5 L14.5,8.5 L14.5,8.5 Z M6,10.5 L5.5,11 L5,12.5 L5,14 L5.5,14 L7,13 L6,10.5 L6,10.5 Z M17,10.5 L16,13 L17,14 L18,14 L18,12.5 L17.5,11 L17,10.5 L17,10.5 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/bank-l.svg b/data/styles/clear/style-night/symbols/bank-l.svg
index 7ada33c1f8..3dd73312a6 100644
--- a/data/styles/clear/style-night/symbols/bank-l.svg
+++ b/data/styles/clear/style-night/symbols/bank-l.svg
@@ -11,12 +11,12 @@
         <g id="bank-l-copy-2" sketch:type="MSLayerGroup" transform="translate(0.000000, 0.500000)">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
             <g id="Oval-1-Copy-38">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M13.5,5.5 C13.5,5.5 6.00625,9.08651786 6.00397727,9.54568452 L6,10.5 L21,10.5 L21,9.55133929 C20.99375,9.08651786 13.5,5.5 13.5,5.5 Z M20.0365553,19.5 L19.5,10.5 L7.5,10.5 L7.04839683,19.5 L7.00334852,19.5 C6.44921444,19.5 6,19.9438648 6,20.5 L6,21.5 L21,21.5 L21,20.5 C21,19.9477153 20.5521239,19.5 20.0365553,19.5 L20.0365553,19.5 Z" id="Imported-Layers-Copy-3" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Rectangle-11-Copy">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-2"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-2"></use>
                 <use fill="none" xlink:href="#path-2"></use>
             </g>
         </g>
diff --git a/data/styles/clear/style-night/symbols/bank-m.svg b/data/styles/clear/style-night/symbols/bank-m.svg
index dff1c902c4..c6f9a8cd3d 100644
--- a/data/styles/clear/style-night/symbols/bank-m.svg
+++ b/data/styles/clear/style-night/symbols/bank-m.svg
@@ -11,12 +11,12 @@
         <g id="bank-2-m" sketch:type="MSLayerGroup" transform="translate(0.000000, 1.000000)">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
             <g id="Oval-1-Copy-40">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M11.5,4 C11.5,4 5.00541667,6.86921429 5.00344697,7.23654762 L5,8 L18,8 L18,7.24107143 C17.9945833,6.86921429 11.5,4 11.5,4 Z M17.0365553,16 L16.5,8 L6.5,8 L6.04839683,16 L6.00334852,16 C5.44921444,16 5,16.4438648 5,17 L5,18 L18,18 L18,17 C18,16.4477153 17.5521239,16 17.0365553,16 L17.0365553,16 Z" id="Imported-Layers-Copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Rectangle-11">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-2"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-2"></use>
                 <use fill="none" xlink:href="#path-2"></use>
             </g>
         </g>
diff --git a/data/styles/clear/style-night/symbols/banknote-l.svg b/data/styles/clear/style-night/symbols/banknote-l.svg
index 6c12484d53..c1ced1d26b 100644
--- a/data/styles/clear/style-night/symbols/banknote-l.svg
+++ b/data/styles/clear/style-night/symbols/banknote-l.svg
@@ -7,12 +7,12 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="banknote-l-copy" sketch:type="MSLayerGroup" transform="translate(0.000000, 0.500000)">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#331E12" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
+            <circle id="Oval-1-Copy-38" fill="#2E1B10" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
             <path d="M5,9 L22,9 L22,18 L5,18 L5,9 Z M12.5,17 C13.8807119,17 15,15.4329966 15,13.5 C15,11.5670034 13.8807119,10 12.5,10 C11.1192881,10 10,11.5670034 10,13.5 C10,15.4329966 11.1192881,17 12.5,17 Z" id="Rectangle-12-Copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M19.5,19 C20.8807119,19 22,18.5522847 22,18 C22,17.4477153 20.8807119,17 19.5,17 C18.1192881,17 17,17.4477153 17,18 C17,18.5522847 18.1192881,19 19.5,19 L19.5,19 Z M19.5,20 L19.5,20 C17.6125116,20 16,19.3549954 16,18 C16,16.6450046 17.6125116,16 19.5,16 C21.3874884,16 23,16.6450046 23,18 C23,19.3549954 21.3874884,20 19.5,20 L19.5,20 Z" id="Shape-Copy-4" fill="#331E12" sketch:type="MSShapeGroup"></path>
+            <path d="M19.5,19 C20.8807119,19 22,18.5522847 22,18 C22,17.4477153 20.8807119,17 19.5,17 C18.1192881,17 17,17.4477153 17,18 C17,18.5522847 18.1192881,19 19.5,19 L19.5,19 Z M19.5,20 L19.5,20 C17.6125116,20 16,19.3549954 16,18 C16,16.6450046 17.6125116,16 19.5,16 C21.3874884,16 23,16.6450046 23,18 C23,19.3549954 21.3874884,20 19.5,20 L19.5,20 Z" id="Shape-Copy-4" fill="#2E1B10" sketch:type="MSShapeGroup"></path>
             <ellipse id="Oval-304-Copy-2" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="19.5" cy="16" rx="2.5" ry="1"></ellipse>
             <ellipse id="Oval-304-Copy-3" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="19.5" cy="18" rx="2.5" ry="1"></ellipse>
-            <path d="M19.5,17 C20.8807119,17 22,16.5522847 22,16 C22,15.4477153 20.8807119,15 19.5,15 C18.1192881,15 17,15.4477153 17,16 C17,16.5522847 18.1192881,17 19.5,17 L19.5,17 Z M19.5,18 L19.5,18 C17.6125116,18 16,17.3549954 16,16 C16,14.6450046 17.6125116,14 19.5,14 C21.3874884,14 23,14.6450046 23,16 C23,17.3549954 21.3874884,18 19.5,18 L19.5,18 Z" id="Shape-Copy-3" fill="#331E12" sketch:type="MSShapeGroup"></path>
+            <path d="M19.5,17 C20.8807119,17 22,16.5522847 22,16 C22,15.4477153 20.8807119,15 19.5,15 C18.1192881,15 17,15.4477153 17,16 C17,16.5522847 18.1192881,17 19.5,17 L19.5,17 Z M19.5,18 L19.5,18 C17.6125116,18 16,17.3549954 16,16 C16,14.6450046 17.6125116,14 19.5,14 C21.3874884,14 23,14.6450046 23,16 C23,17.3549954 21.3874884,18 19.5,18 L19.5,18 Z" id="Shape-Copy-3" fill="#2E1B10" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/banknote-m.svg b/data/styles/clear/style-night/symbols/banknote-m.svg
index 4a50216e14..bb87520c86 100644
--- a/data/styles/clear/style-night/symbols/banknote-m.svg
+++ b/data/styles/clear/style-night/symbols/banknote-m.svg
@@ -7,12 +7,12 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="banknote-m-copy" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
-            <ellipse id="Oval-1-Copy-40" fill="#331E12" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+            <ellipse id="Oval-1-Copy-40" fill="#2E1B10" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
         </g>
         <path d="M3,7 L20,7 L20,16 L3,16 L3,7 Z M10.5,15 C11.8807119,15 13,13.4329966 13,11.5 C13,9.56700338 11.8807119,8 10.5,8 C9.11928813,8 8,9.56700338 8,11.5 C8,13.4329966 9.11928813,15 10.5,15 Z" id="Rectangle-12" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-        <path d="M16.5,17 C17.8807119,17 19,16.5522847 19,16 C19,15.4477153 17.8807119,15 16.5,15 C15.1192881,15 14,15.4477153 14,16 C14,16.5522847 15.1192881,17 16.5,17 L16.5,17 Z M16.5,18 L16.5,18 C14.6125116,18 13,17.3549954 13,16 C13,14.6450046 14.6125116,14 16.5,14 C18.3874884,14 20,14.6450046 20,16 C20,17.3549954 18.3874884,18 16.5,18 L16.5,18 Z" id="Shape-Copy-6" fill="#331E12" sketch:type="MSShapeGroup"></path>
+        <path d="M16.5,17 C17.8807119,17 19,16.5522847 19,16 C19,15.4477153 17.8807119,15 16.5,15 C15.1192881,15 14,15.4477153 14,16 C14,16.5522847 15.1192881,17 16.5,17 L16.5,17 Z M16.5,18 L16.5,18 C14.6125116,18 13,17.3549954 13,16 C13,14.6450046 14.6125116,14 16.5,14 C18.3874884,14 20,14.6450046 20,16 C20,17.3549954 18.3874884,18 16.5,18 L16.5,18 Z" id="Shape-Copy-6" fill="#2E1B10" sketch:type="MSShapeGroup"></path>
         <ellipse id="Oval-304" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="16.5" cy="14" rx="2.5" ry="1"></ellipse>
         <ellipse id="Oval-304-Copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="16.5" cy="16" rx="2.5" ry="1"></ellipse>
-        <path d="M16.5,15 C17.8807119,15 19,14.5522847 19,14 C19,13.4477153 17.8807119,13 16.5,13 C15.1192881,13 14,13.4477153 14,14 C14,14.5522847 15.1192881,15 16.5,15 L16.5,15 Z M16.5,16 L16.5,16 C14.6125116,16 13,15.3549954 13,14 C13,12.6450046 14.6125116,12 16.5,12 C18.3874884,12 20,12.6450046 20,14 C20,15.3549954 18.3874884,16 16.5,16 L16.5,16 Z" id="Shape-Copy-7" fill="#331E12" sketch:type="MSShapeGroup"></path>
+        <path d="M16.5,15 C17.8807119,15 19,14.5522847 19,14 C19,13.4477153 17.8807119,13 16.5,13 C15.1192881,13 14,13.4477153 14,14 C14,14.5522847 15.1192881,15 16.5,15 L16.5,15 Z M16.5,16 L16.5,16 C14.6125116,16 13,15.3549954 13,14 C13,12.6450046 14.6125116,12 16.5,12 C18.3874884,12 20,12.6450046 20,14 C20,15.3549954 18.3874884,16 16.5,16 L16.5,16 Z" id="Shape-Copy-7" fill="#2E1B10" sketch:type="MSShapeGroup"></path>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/bar-l.svg b/data/styles/clear/style-night/symbols/bar-l.svg
index 9fe8fa6390..f2c499dfe5 100644
--- a/data/styles/clear/style-night/symbols/bar-l.svg
+++ b/data/styles/clear/style-night/symbols/bar-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="bar-l-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#4C3A1E" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
+            <circle id="Oval-1-Copy-38" fill="#403119" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
             <path d="M7,7 C6.5,7 6,7.0006 6,7.25 C6,7.5006 6.34281,7.7979 6.5,8 L13,14.8125 L13,21 L10,22 C9.5,22.1667 9,22.5 9,23 L18,23 C18,22.5 17.5,22.1667 17,22 L14,21 L14,14.8125 L20.5,8 C20.65719,7.7979 21,7.5006 21,7.25 C21,7.0006 20.5,7 20,7 L7,7 Z" id="path15601-4" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-night/symbols/bar-m.svg b/data/styles/clear/style-night/symbols/bar-m.svg
index fc25392114..d10941417b 100644
--- a/data/styles/clear/style-night/symbols/bar-m.svg
+++ b/data/styles/clear/style-night/symbols/bar-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="bar-m-copy" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
-            <ellipse id="Oval-1-Copy-40" fill="#4C3A1E" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+            <ellipse id="Oval-1-Copy-40" fill="#403119" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
             <path d="M6,6 C5.59375,6 5,6.047 5,6.25 C5,6.4536 5.37228,6.8358 5.5,7 L11,13 L11,17 L8.1875,18.1875 C7.78125,18.3229 7.5,18.5 7.5,19 L15.5,19 C15.5,18.5 15.09375,18.3229 14.6875,18.1875 L12,17 L12,13 L17.5,7 C17.62772,6.8358 18,6.4536 18,6.25 C18,6.0474 17.40625,6 17,6 L6,6 Z" id="path15601-4-0" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-night/symbols/bar-s.svg b/data/styles/clear/style-night/symbols/bar-s.svg
index 99f84ae10a..0625f4e42b 100644
--- a/data/styles/clear/style-night/symbols/bar-s.svg
+++ b/data/styles/clear/style-night/symbols/bar-s.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="bar-s-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-42" fill="#4C3A1E" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
+            <circle id="Oval-1-Copy-42" fill="#403119" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
             <path d="M4.5,5 C4.21875,5 4,5.0003 4,5.1406 C4,5.2816 4.19283,5.4488 4.28125,5.5625 L8,10 L8,12.5 C7,13 5.5,13.5 5.5,14 L11.5,14 C11.5,13.5 10,13 9,12.5 L9,10 L12.71875,5.5625 C12.80715,5.4488 13,5.2816 13,5.1406 C13,5.0003 12.78125,5 12.5,5 L4.5,5 Z" id="path15601-4-2" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-night/symbols/baseball-l.svg b/data/styles/clear/style-night/symbols/baseball-l.svg
index eb375b473d..12df4d48cd 100644
--- a/data/styles/clear/style-night/symbols/baseball-l.svg
+++ b/data/styles/clear/style-night/symbols/baseball-l.svg
@@ -10,7 +10,7 @@
         <g id="baseball-l" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
             <g id="Oval-1-Copy-38">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M6,6 C5,7 5,8 5,8 L15,18 L16.5,17.5 L20.5,21.5 C20.81628,21.8163 21.00625,22 21.40625,22 C21.53125,22 21.6875,22 21.84375,21.8438 C22.00005,21.6875 22,21.5313 22,21.4063 C22,21.0063 21.78212,20.7821 21.5,20.5 L17.5,16.5 L18,15 L8,5 C8,5 7,5 6,6 L6,6 Z M9.5,15 C8.67157,15 8,15.6716 8,16.5 C8,17.3284 8.67157,18 9.5,18 C10.32843,18 11,17.3284 11,16.5 C11,15.6716 10.32843,15 9.5,15 L9.5,15 Z" id="path9336-3-copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/baseball-m.svg b/data/styles/clear/style-night/symbols/baseball-m.svg
index 80d1a52b7a..690ba1e195 100644
--- a/data/styles/clear/style-night/symbols/baseball-m.svg
+++ b/data/styles/clear/style-night/symbols/baseball-m.svg
@@ -10,7 +10,7 @@
         <g id="baseball-m" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
             <g id="Oval-1-Copy-40">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M8,5 C8,5 7,5 6.5,5.5 C6,6 6,7 6,7 C8.5,10.5 13.07972,13.1418 14,14 L16.59375,16.4063 L16,17 L16,18 L17,18 L18,17 L19,16 L19,15 L18,15 L17.40625,15.5938 L15,13 C12.63789,10.4672 11.5,7.5 8,5 L8,5 Z M9.75,14 C9.05964,14 8.5,14.5596 8.5,15.25 C8.5,15.9404 9.05964,16.5 9.75,16.5 C10.44036,16.5 11,15.9404 11,15.25 C11,14.5596 10.44036,14 9.75,14 L9.75,14 Z" id="path20837-copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/baseball-s.svg b/data/styles/clear/style-night/symbols/baseball-s.svg
index a987c283ff..a9e09dc19e 100644
--- a/data/styles/clear/style-night/symbols/baseball-s.svg
+++ b/data/styles/clear/style-night/symbols/baseball-s.svg
@@ -10,7 +10,7 @@
         <g id="baseball-s" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
             <g id="Oval-1-Copy-42">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M4,4 L4,5.5 C5.5,7.5 8.58739,9.0874 10.5,11 L11.5,12 L11.5,13 L12.5,13 L13,12.5 L13,11.5 L12,11.5 L11,10.5 C9.21569,8.7157 7.5,5.5 5.5,4 L4,4 Z M6,9.5 C5.44772,9.5 5,9.9477 5,10.5 C5,11.0523 5.44772,11.5 6,11.5 C6.55228,11.5 7,11.0523 7,10.5 C7,9.9477 6.55228,9.5 6,9.5 L6,9.5 Z" id="path20839-copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/basketball-l.svg b/data/styles/clear/style-night/symbols/basketball-l.svg
index d113f23f70..1c2adb2488 100644
--- a/data/styles/clear/style-night/symbols/basketball-l.svg
+++ b/data/styles/clear/style-night/symbols/basketball-l.svg
@@ -10,7 +10,7 @@
         <g id="basketball-l" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
             <g id="Oval-1-Copy-38">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M9.5,6 L5,10 L5,18 C5,18.5 5.5,19 6,19 L9.5625,19 L11.5,22.5 C11.77778,23 12,23 12.5,23 L14.5,23 C15,23 15.22222,23 15.5,22.5 L17.4375,19 L21,19 C21.5,19 22,18.5 22,18 L22,10 L17.5,6 L9.5,6 L9.5,6 Z M9,10 L18,10 L18,16 L9,16 L9,10 L9,10 Z M10,11 L10,15 L17,15 L17,11 L10,11 L10,11 Z M10.5625,19 L12,19 L12,20 L13,20 L13,19 L14,19 L14,20 L15,20 L15,19 L16.4375,19 L15.875,20 L15,20 L15,21 L15.34375,21 L15,21.625 L15,21 L14,21 L14,22 L13,22 L13,21 L12,21 L12,21.625 L11.65625,21 L12,21 L12,20 L11.125,20 L10.5625,19 L10.5625,19 Z M13,21 L14,21 L14,20 L13,20 L13,21 L13,21 Z" id="rect5769-7-copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/basketball-m.svg b/data/styles/clear/style-night/symbols/basketball-m.svg
index 631ba6d368..6658dece89 100644
--- a/data/styles/clear/style-night/symbols/basketball-m.svg
+++ b/data/styles/clear/style-night/symbols/basketball-m.svg
@@ -10,7 +10,7 @@
         <g id="basketball-m" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
             <g id="Oval-1-Copy-40">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M8,6 L5,8 L5,15 C5,15.5 5.5,16 6,16 L8.5,16 L10.5,19 L11.5,19 L12.5,19 L14.5,16 L17,16 C17.5,16 18,15.5 18,15 L18,8.5 L15,6 L8,6 L8,6 Z M8,9 L15,9 L15,14 L8,14 L8,9 L8,9 Z M9,10 L9,13 L14,13 L14,10 L9,10 L9,10 Z M9.5,16 L11,16 L11,17 L12,17 L12,16 L13.5,16 L12.8125,17 L12,17 L12,18 L11,18 L11,17 L10.1875,17 L9.5,16 L9.5,16 Z" id="rect5769-7-5-copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/basketball-s.svg b/data/styles/clear/style-night/symbols/basketball-s.svg
index f3913c1f26..9a70df1090 100644
--- a/data/styles/clear/style-night/symbols/basketball-s.svg
+++ b/data/styles/clear/style-night/symbols/basketball-s.svg
@@ -10,7 +10,7 @@
         <g id="basketball-s" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
             <g id="Oval-1-Copy-42">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M6,4.3622 L4,6.3622 L4,10.8622 C4,11.1122 4.25,11.3622 4.5,11.3622 L6,11.3622 L7,12.3622 L8,13.3622 L9,13.3622 L10,12.3622 L11,11.3622 L12.5,11.3622 C12.75,11.3622 13,11.1122 13,10.8622 L13,6.3622 L11,4.3622 L6,4.3622 L6,4.3622 Z M6,6.3622 L11,6.3622 L11,9.3622 L6,9.3622 L6,6.3622 L6,6.3622 Z M6.6875,7.0497 L6.6875,8.6747 L10.3125,8.6747 L10.3125,7.0497 L6.6875,7.0497 L6.6875,7.0497 Z M7,10.3622 L8,10.3622 L8,11.3622 L9,11.3622 L9,10.3622 L10,10.3622 L10,11.3622 L9,12.3622 L8,12.3622 L7,11.3622 L7,10.3622 L7,10.3622 Z" id="rect5769-7-3-copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/bbq-l.svg b/data/styles/clear/style-night/symbols/bbq-l.svg
index 984d7c3b57..53825b2221 100644
--- a/data/styles/clear/style-night/symbols/bbq-l.svg
+++ b/data/styles/clear/style-night/symbols/bbq-l.svg
@@ -10,7 +10,7 @@
         <g id="bbq-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.056,27 0,20.943 0,13.5 C0,6.057 6.056,0 13.5,0 C20.944,0 27,6.057 27,13.5 C27,20.943 20.944,27 13.5,27 L13.5,27 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M20,12 L7,12 C7,13.94 8.002,15.661 9.551,16.758 L7,23 L9,23 L9.409,22 L15.431,22 L14.614,20 L10.227,20 L11.205,17.607 C11.918,17.857 12.69,18 13.5,18 C14.31,18 15.082,17.857 15.796,17.607 L18,23 L20,23 L17.449,16.758 C18.998,15.661 20,13.94 20,12 L20,12 Z M13.338,10.942 C16.766,9 13.315,5.871 13.939,4.033 C11.643,6.34 14.495,9.736 13.338,10.942 L13.338,10.942 Z M16.338,10.942 C19.766,9.592 16.315,7.417 16.939,6.139 C14.643,7.743 17.495,10.104 16.338,10.942 L16.338,10.942 Z M10.338,10.942 C13.766,9.592 10.315,7.417 10.939,6.139 C8.643,7.743 11.495,10.104 10.338,10.942 L10.338,10.942 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/bbq-m.svg b/data/styles/clear/style-night/symbols/bbq-m.svg
index f159bccce8..a5aa1cbf09 100644
--- a/data/styles/clear/style-night/symbols/bbq-m.svg
+++ b/data/styles/clear/style-night/symbols/bbq-m.svg
@@ -10,7 +10,7 @@
         <g id="bbq-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M15.204,13.674 C16.305,12.763 17,11.457 17,10 L6,10 C6,11.655 6.896,13.117 8.268,14.022 L6.2,19 L7.801,19 L8.216,18 L13.235,18 L12.82,17 L8.632,17 L9.6,14.668 C10.194,14.866 10.831,14.98 11.5,14.98 C12.374,14.98 13.197,14.791 13.931,14.462 L15.815,19 L17.416,19 L15.204,13.674 L15.204,13.674 Z M9.322,8.859 C12.609,7.493 9.299,5.293 9.898,4 C7.695,5.623 10.432,8.011 9.322,8.859 L9.322,8.859 Z M12.371,8.959 C15.113,7.879 12.351,6.139 12.851,5.117 C11.015,6.4 13.297,8.288 12.371,8.959 L12.371,8.959 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/bcontrol-l.svg b/data/styles/clear/style-night/symbols/bcontrol-l.svg
index 85d1dfa7bc..d0e2b50bb9 100644
--- a/data/styles/clear/style-night/symbols/bcontrol-l.svg
+++ b/data/styles/clear/style-night/symbols/bcontrol-l.svg
@@ -11,13 +11,13 @@
         <g id="bcontrol-l-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
             <g id="Oval-1-Copy-38">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <g id="Rectangle-22-+-Group-Copy" transform="translate(6.000000, 5.000000)">
                 <path d="M6.00000002,7 L6,18 L9,18 L8.99437037,10 L14.0472255,10 L14.9880238,9 L14.0472255,8 L8.99296296,8 L8.98944444,3 L14.0472255,3 L14.9880238,2 L14.0472255,1 L8.98803704,1 L8.98733333,0 L6.00000002,0 L6.00000002,5 L1,5 L0,6 L1,7 L6.00000002,7 Z" id="Rectangle-22" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
                 <g id="Rectangle-52">
-                    <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-2"></use>
+                    <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-2"></use>
                     <use fill="none" xlink:href="#path-2"></use>
                 </g>
             </g>
diff --git a/data/styles/clear/style-night/symbols/bcontrol-m.svg b/data/styles/clear/style-night/symbols/bcontrol-m.svg
index 39e4f06787..667313ef9a 100644
--- a/data/styles/clear/style-night/symbols/bcontrol-m.svg
+++ b/data/styles/clear/style-night/symbols/bcontrol-m.svg
@@ -9,7 +9,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
         <g id="Oval-1-Copy-40">
-            <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+            <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
             <use fill="none" xlink:href="#path-1"></use>
         </g>
         <g id="Rectangle-22-+-Group" sketch:type="MSLayerGroup" transform="translate(3.000000, 4.000000)">
diff --git a/data/styles/clear/style-night/symbols/bcontrol-s.svg b/data/styles/clear/style-night/symbols/bcontrol-s.svg
index 836b9546c3..4d9965e917 100644
--- a/data/styles/clear/style-night/symbols/bcontrol-s.svg
+++ b/data/styles/clear/style-night/symbols/bcontrol-s.svg
@@ -11,14 +11,14 @@
         <g id="bcontrol-s" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
             <g id="Oval-1-Copy-42">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <g id="Rectangle-22-+-Group-Copy-2" transform="translate(4.000000, 3.000000)">
                 <path d="M6,1 L6,0 L3,0 L3,3 L0,3 L0,4 L3,4 L3,11 L6,11 L6,6 L9,6 L9,5 L6,5 L6,2 L9,2 L9,1 L6,1 Z" id="Rectangle-22" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
                 <g id="Group" transform="translate(3.250000, 0.733333)">
                     <g id="Rectangle-49">
-                        <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-2"></use>
+                        <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-2"></use>
                         <use fill="none" xlink:href="#path-2"></use>
                     </g>
                 </g>
diff --git a/data/styles/clear/style-night/symbols/beach-l.svg b/data/styles/clear/style-night/symbols/beach-l.svg
index 15eacd474e..ed4a2e6897 100644
--- a/data/styles/clear/style-night/symbols/beach-l.svg
+++ b/data/styles/clear/style-night/symbols/beach-l.svg
@@ -10,7 +10,7 @@
         <g id="beach-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.057,27 0,20.943 0,13.5 C0,6.057 6.057,0 13.5,0 C20.943,0 27,6.057 27,13.5 C27,20.943 20.943,27 13.5,27 L13.5,27 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M6,22 L20,22 L20,20 L6,20 L6,22 L6,22 Z M16.089,5.257 C12.25,4.229 8.318,6.375 7.057,10.084 L13.58,11.832 L11.928,18 L13.421,18 L14.974,12.206 L21.497,13.953 C22.26,10.111 19.927,6.285 16.089,5.257 L16.089,5.257 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/beach-m.svg b/data/styles/clear/style-night/symbols/beach-m.svg
index efcc61bfa6..58ac6f5c72 100644
--- a/data/styles/clear/style-night/symbols/beach-m.svg
+++ b/data/styles/clear/style-night/symbols/beach-m.svg
@@ -10,7 +10,7 @@
         <g id="beach-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M13.436,5.304 C10.366,4.481 7.219,6.199 6.21,9.166 L11.516,10.588 L10.066,16 L11.168,16 L12.544,10.863 L17.764,12.26 C18.373,9.188 16.506,6.127 13.436,5.304 L13.436,5.304 Z M5,19 L17,19 L17,17 L5,17 L5,19 L5,19 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/beauty-l.svg b/data/styles/clear/style-night/symbols/beauty-l.svg
index 8f908956bc..f06e989bae 100644
--- a/data/styles/clear/style-night/symbols/beauty-l.svg
+++ b/data/styles/clear/style-night/symbols/beauty-l.svg
@@ -10,7 +10,7 @@
         <g id="beauty-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.057,27 0,20.943 0,13.5 C0,6.057 6.057,0 13.5,0 C20.943,0 27,6.057 27,13.5 C27,20.943 20.943,27 13.5,27 L13.5,27 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M14,8 L14,21 C14,21.552 14.448,22 15,22 L18,22 C18.553,22 19,21.552 19,21 L19,8 L14,8 L14,8 Z M11,9 L12,9 L12,8 L11,8 L11,7 L12,7 L12,6 L11,6 L11,5 L12,5 L12,4 L9,4 L9,5 L10,5 L10,6 L9,6 L9,7 L10,7 L10,8 L9,8 L9,9 L10,9 L10,15 L8,15 L8,21 C8,21.552 8.447,22 9,22 L12,22 C12.552,22 13,21.552 13,21 L13,15 L11,15 L11,9 L11,9 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/beauty-m.svg b/data/styles/clear/style-night/symbols/beauty-m.svg
index cf040fde90..ba4b92e40a 100644
--- a/data/styles/clear/style-night/symbols/beauty-m.svg
+++ b/data/styles/clear/style-night/symbols/beauty-m.svg
@@ -10,7 +10,7 @@
         <g id="beauty-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M12,9 L12,18 C12,18.552 12.448,19 13,19 L16,19 C16.553,19 17,18.552 17,18 L17,9 L12,9 L12,9 Z M9,9 L10,9 L10,8 L9,8 L9,7 L10,7 L10,6 L9,6 L9,5 L10,5 L10,4 L7,4 L7,5 L8,5 L8,6 L7,6 L7,7 L8,7 L8,8 L7,8 L7,9 L8,9 L8,13 L6,13 L6,18 C6,18.552 6.447,19 7,19 L10,19 C10.552,19 11,18.552 11,18 L11,13 L9,13 L9,9 L9,9 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/beer-l.svg b/data/styles/clear/style-night/symbols/beer-l.svg
index 70fcba6b41..d7578b0570 100644
--- a/data/styles/clear/style-night/symbols/beer-l.svg
+++ b/data/styles/clear/style-night/symbols/beer-l.svg
@@ -8,7 +8,7 @@
         <g id="beer-l" sketch:type="MSLayerGroup">
             <g id="Layer_2" sketch:type="MSShapeGroup">
                 <path d="M13.5,27 C6.056,27 0,20.944 0,13.5 C0,6.056 6.056,0 13.5,0 C20.944,0 27,6.056 27,13.5 C27,20.944 20.944,27 13.5,27 L13.5,27 Z" id="Shape" opacity="0" fill="#FFFFFF"></path>
-                <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#4C3A1E"></path>
+                <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#403119"></path>
             </g>
             <g id="Layer_1" transform="translate(8.000000, 3.000000)" fill="#FFFFFF" opacity="0.7" sketch:type="MSShapeGroup">
                 <path d="M7.777,2.778 C7.333,2.778 6.922,2.912 6.573,3.136 C6.231,1.659 4.914,0.555 3.333,0.555 C1.493,0.556 0,2.048 0,3.889 L0,5 L10,5 C10,3.773 9.005,2.778 7.777,2.778 L7.777,2.778 Z M11,7 L0,7 L0,18 C0,18.553 0.447,19 1,19 L9,19 C9.553,19 10,18.553 10,18 L10,16.35 L13.9,14.66 L13.9,10 C13.9,8.346 12.654,7 11,7 L11,7 Z M12,13.341 L10,14.198 L10,9 L11,9 C11.552,9 12,9.449 12,10 L12,13.341 L12,13.341 Z" id="Shape"></path>
diff --git a/data/styles/clear/style-night/symbols/beer-m.svg b/data/styles/clear/style-night/symbols/beer-m.svg
index 17c75d8553..3eea32d945 100644
--- a/data/styles/clear/style-night/symbols/beer-m.svg
+++ b/data/styles/clear/style-night/symbols/beer-m.svg
@@ -8,7 +8,7 @@
         <g id="beer-m" sketch:type="MSLayerGroup">
             <g id="Layer_2" sketch:type="MSShapeGroup">
                 <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" opacity="0" fill="#FFFFFF"></path>
-                <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#4C3A1E"></path>
+                <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#403119"></path>
             </g>
             <g id="Layer_1" transform="translate(7.000000, 4.000000)" fill="#FFFFFF" opacity="0.7" sketch:type="MSShapeGroup">
                 <path d="M6.222,2.2 C5.868,2.2 5.537,2.307 5.259,2.487 C4.986,1.305 3.932,0.423 2.666,0.423 C1.194,0.422 0,1.616 0,3.089 L0,3.978 L8,3.978 C8,2.996 7.204,2.2 6.222,2.2 L6.222,2.2 Z M8.998,5 L0,5 L0,13 C0,13.552 0.447,14 1,14 L7,14 C7.553,14 8,13.552 8,13 L8,11.614 L10.998,10.329 L10.998,7 C10.998,5.896 10.101,5 8.998,5 L8.998,5 Z M10.098,9.67 L8,10.526 L8,6 L8.998,6 C9.81,6 10.098,6.449 10.098,7 L10.098,9.67 L10.098,9.67 Z" id="Shape"></path>
diff --git a/data/styles/clear/style-night/symbols/bench.svg b/data/styles/clear/style-night/symbols/bench.svg
index 413d2aa733..ce6e26b0a4 100644
--- a/data/styles/clear/style-night/symbols/bench.svg
+++ b/data/styles/clear/style-night/symbols/bench.svg
@@ -3,10 +3,15 @@
     <!-- Generator: Sketch 3.4.2 (15857) - http://www.bohemiancoding.com/sketch -->
     <title>bench</title>
     <desc>Created with Sketch.</desc>
-    <defs></defs>
+    <defs>
+        <path d="M5,2 L5,3 L10,3 L10,2 L5,2 Z M5,1 L5,0 L4,0 L4,1 L1,1 L1,2 L4,2 L4,3 L2,3 L2,4 L4,4 L4,6 L5,6 L5,4 L10,4 L10,6 L11,6 L11,4 L13,4 L13,3.5673974 L13,3 L11,3 L11,2 L14,2 L14,1 L11,1 L11,0 L10,0 L10,1 L5,1 Z M2,8 L4,8 L4,11 L2,11 L2,8 Z M11,8 L13,8 L13,11 L11,11 L11,8 Z M0,6 L15,6 L15,8 L0,8 L0,6 Z" id="path-1"></path>
+    </defs>
     <g id="Other" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <g id="bench" sketch:type="MSLayerGroup" transform="translate(0.000000, 1.000000)" fill="#383833">
-            <path d="M5,2 L5,3 L10,3 L10,2 L5,2 Z M5,1 L5,0 L4,0 L4,1 L1,1 L1,2 L4,2 L4,3 L2,3 L2,4 L4,4 L4,6 L5,6 L5,4 L10,4 L10,6 L11,6 L11,4 L13,4 L13,3.5673974 L13,3 L11,3 L11,2 L14,2 L14,1 L11,1 L11,0 L10,0 L10,1 L5,1 Z M2,8 L4,8 L4,11 L2,11 L2,8 Z M11,8 L13,8 L13,11 L11,11 L11,8 Z M0,6 L15,6 L15,8 L0,8 L0,6 Z" id="Rectangle-30" sketch:type="MSShapeGroup"></path>
+        <g id="bench" sketch:type="MSLayerGroup" transform="translate(0.000000, 1.000000)">
+            <g id="Rectangle-30">
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="none" xlink:href="#path-1"></use>
+            </g>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/bicycle-l.svg b/data/styles/clear/style-night/symbols/bicycle-l.svg
index 06c0727d10..3fdef19bc6 100644
--- a/data/styles/clear/style-night/symbols/bicycle-l.svg
+++ b/data/styles/clear/style-night/symbols/bicycle-l.svg
@@ -10,7 +10,7 @@
         <g id="bicycle-l-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
             <g id="Oval-1-Copy-38">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M15.875,5.3622 C15.31346,5.4382 15.23786,6.4201 15.78125,6.581 L18,7.456 L18,9.3622 L11,9.3622 L11,8.3622 L12.375,8.3622 C12.70519,8.3622 13,8.0674 13,7.7372 C13,7.407 12.70519,7.1075 12.375,7.1122 L8.5,7.1122 C8.438,7.1022 8.37453,7.1022 8.3125,7.1122 C7.98523,7.1612 7.73216,7.5037 7.78125,7.831 C7.83035,8.1582 8.17274,8.4113 8.5,8.3622 L10,8.3622 L10,9.3622 L8.9375,12.4872 C8.63782,12.4152 8.32165,12.3622 8,12.3622 C5.79086,12.3622 4,14.1531 4,16.3622 C4,18.5713 5.79086,20.3622 8,20.3622 C10.20914,20.3622 12,18.5713 12,16.3622 C12,16.0618 11.93779,15.7687 11.875,15.4872 L13,15.4872 C13.19854,15.4772 13.39085,15.372 13.5,15.206 L16.875,10.3622 L17,10.3622 L18,10.3622 L18.6875,12.3935 C16.62561,12.5541 15,14.2591 15,16.3622 C15,18.5713 16.79086,20.3622 19,20.3622 C21.20914,20.3622 23,18.5713 23,16.3622 C23,14.534 21.76891,13.027 20.09375,12.5497 L19,9.3622 L19,7.0185 C19,6.9136 18.9577,6.8075 18.9063,6.706 C18.9023,6.696 18.9103,6.682 18.9063,6.675 C18.8914,6.643 18.8634,6.611 18.8438,6.581 C18.8118,6.536 18.7892,6.495 18.7501,6.456 C18.7332,6.44 18.7061,6.439 18.6876,6.425 C18.6693,6.41 18.6443,6.407 18.6251,6.394 C18.5927,6.375 18.5674,6.344 18.5314,6.332 L18.5002,6.301 L18.0627,6.1448 L16.21895,5.3948 C16.15394,5.3698 16.06966,5.3668 16.0002,5.3638 C15.9532,5.3638 15.9214,5.3528 15.8752,5.3638 L15.875,5.3622 Z M11,10.3622 L15.40625,10.3622 L12.6875,14.2372 L11.375,14.2372 C11.06533,13.7431 10.67588,13.3363 10.1875,13.0185 L11,10.3622 L11,10.3622 Z M8,13.8622 C9.38071,13.8622 10.5,14.9815 10.5,16.3622 C10.5,17.7429 9.38071,18.8622 8,18.8622 C6.61929,18.8622 5.5,17.7429 5.5,16.3622 C5.5,14.9815 6.61929,13.8622 8,13.8622 L8,13.8622 Z M19,13.8622 C20.38071,13.8622 21.5,14.9815 21.5,16.3622 C21.5,17.7429 20.38071,18.8622 19,18.8622 C17.61929,18.8622 16.5,17.7429 16.5,16.3622 C16.5,16.1896 16.5292,16.0249 16.5625,15.8622 C16.79562,14.723 17.79188,13.8622 19,13.8622 L19,13.8622 Z" id="path5421-copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/bicycle-m.svg b/data/styles/clear/style-night/symbols/bicycle-m.svg
index 882c0b0598..0e99c99c67 100644
--- a/data/styles/clear/style-night/symbols/bicycle-m.svg
+++ b/data/styles/clear/style-night/symbols/bicycle-m.svg
@@ -10,7 +10,7 @@
         <g id="bicycle-m-copy" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
             <g id="Oval-1-Copy-40">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <g id="bicycle-18-copy" transform="translate(2.000000, 2.000000)" sketch:type="MSShapeGroup">
diff --git a/data/styles/clear/style-night/symbols/bicycle-s.svg b/data/styles/clear/style-night/symbols/bicycle-s.svg
index ef2e5574b8..7215a9e330 100644
--- a/data/styles/clear/style-night/symbols/bicycle-s.svg
+++ b/data/styles/clear/style-night/symbols/bicycle-s.svg
@@ -10,7 +10,7 @@
         <g id="bicycle-s-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
             <g id="Oval-1-Copy-42">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M9,5.0005 L9,6.0005 L10,6.0005 L10,7.0005 L8,7.0005 L8,6.0005 L7,6.0005 L7,7.0005 L6.5,7.5005 L6,8.0005 L5,8.0005 L4,10.0005 L5,12.0005 L6,12.0005 L7,12.0005 L8,10.0005 L9.5,8.0005 L10.5,8.0005 L8.99995,10 L10,12.0005 L9.99995,12 L10.99995,12 L11.99995,12 L12,12.0005 L12.99995,10 L12,8.0005 L11.99995,8 L11.49995,8 L10.99995,7 L10.99995,6 L9.99995,5 L8.99995,5 L9,5.0005 Z M7,8.0005 L8,8.0005 L8,9.0005 L7,9.0005 L7,10.0005 L7,11.0005 L5,11.0005 L5,10.0005 L5,9.0005 L7,9.0005 L7,8.0005 Z M10,9.0005 L12,9.0005 L12,10.0005 L12,11.0005 L10,11.0005 L10,10.0005 L10,9.0005 Z" id="path5464-7-copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/book-shop-l.svg b/data/styles/clear/style-night/symbols/book-shop-l.svg
index 1826b25d3e..87faa6db58 100644
--- a/data/styles/clear/style-night/symbols/book-shop-l.svg
+++ b/data/styles/clear/style-night/symbols/book-shop-l.svg
@@ -10,7 +10,7 @@
         <g id="book-shop-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.057,27 0,20.944 0,13.5 C0,6.056 6.057,0 13.5,0 C20.943,0 27,6.056 27,13.5 C27,20.944 20.943,27 13.5,27 L13.5,27 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M20.03,6.02997932 L14,7.81073241 L14,18.9594427 L20.03,17.1786896 C20.565,17.042878 21,16.4793614 21,15.9188853 L21,6.79721329 C21,6.23775074 20.565,5.89315424 20.03,6.02997932 L20.03,6.02997932 Z M6.97,17.1786896 L13,18.9594427 L13,7.81073241 L6.97,6.02997932 C6.435,5.89416776 6,6.23775074 6,6.79721329 L6,15.9188853 C6,16.4783479 6.435,17.0418645 6.97,17.1786896 L6.97,17.1786896 Z M6,22 L21,22 L21,19.9729618 L6,19.9729618 L6,22 L6,22 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/book-shop-m.svg b/data/styles/clear/style-night/symbols/book-shop-m.svg
index c728caf9b6..d443097f0a 100644
--- a/data/styles/clear/style-night/symbols/book-shop-m.svg
+++ b/data/styles/clear/style-night/symbols/book-shop-m.svg
@@ -10,7 +10,7 @@
         <g id="book-shop-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M5,18 L18,18 L18,16.9570376 L5,16.9570376 L5,18 L5,18 Z M17.038,14.425768 L12,15.9140753 L12,6.52741406 L17.038,5.03910677 C17.569,4.88266242 18,5.22162518 18,5.79838337 L18,13.0991199 C18,13.6748351 17.569,14.2682807 17.038,14.425768 L17.038,14.425768 Z M5,13.0980769 L5,5.79734041 C5,5.22162518 5.431,4.88161945 5.962,5.03806381 L11,6.52741406 L11,15.9140753 L5.962,14.425768 C5.431,14.2682807 5,13.6748351 5,13.0980769 L5,13.0980769 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/boundary_stone-l.svg b/data/styles/clear/style-night/symbols/boundary_stone-l.svg
index a39aac4265..6c2ce5e971 100644
--- a/data/styles/clear/style-night/symbols/boundary_stone-l.svg
+++ b/data/styles/clear/style-night/symbols/boundary_stone-l.svg
@@ -10,7 +10,7 @@
         <g id="boundary_stone-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.057,27 0,20.943 0,13.5 C0,6.056 6.057,0 13.5,0 C20.943,0 27,6.056 27,13.5 C27,20.943 20.943,27 13.5,27 L13.5,27 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M19,8.313 L14.686,4 L12.315,4 L8,8.313 L8,17 L19,17 L19,8.313 L19,8.313 Z M6,19 L6,21 L21,21 L21,19 L6,19 L6,19 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/boundary_stone-m.svg b/data/styles/clear/style-night/symbols/boundary_stone-m.svg
index da9d36bec1..bae8cee771 100644
--- a/data/styles/clear/style-night/symbols/boundary_stone-m.svg
+++ b/data/styles/clear/style-night/symbols/boundary_stone-m.svg
@@ -10,7 +10,7 @@
         <g id="boundary_stone-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M16,7.313 L12.686,4 L10.315,4 L7,7.313 L7,14 L16,14 L16,7.313 L16,7.313 Z M5,16 L5,18 L18,18 L18,16 L5,16 L5,16 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/bowls-l.svg b/data/styles/clear/style-night/symbols/bowls-l.svg
index 1082df7b6b..66de84169e 100644
--- a/data/styles/clear/style-night/symbols/bowls-l.svg
+++ b/data/styles/clear/style-night/symbols/bowls-l.svg
@@ -10,7 +10,7 @@
         <g id="bowls-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.057,27 0,20.943 0,13.5 C0,6.057 6.057,0 13.5,0 C20.943,0 27,6.057 27,13.5 C27,20.943 20.943,27 13.5,27 L13.5,27 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M20.439,12.144 C19.916,11.371 19.462,10.704 19.462,9.919 C19.462,9.155 19.622,8.395 19.764,7.725 C19.967,6.765 20.143,5.936 19.829,5.358 C19.597,4.749 18.994,4.099 18.002,4.099 C17.01,4.099 16.407,4.748 16.184,5.335 C15.86,5.936 16.036,6.765 16.239,7.725 C16.382,8.395 16.542,9.156 16.542,9.919 C16.542,10.019 16.516,10.111 16.502,10.207 C18.037,11.665 19,13.72 19,15.999 C19,18.34 17.983,20.442 16.376,21.907 C16.381,21.913 16.391,21.925 16.393,21.928 C16.431,21.974 16.488,22 16.548,22 L19.456,22 C19.517,22 19.573,21.974 19.611,21.928 C19.705,21.816 21.908,19.142 21.908,16.065 C21.908,14.309 21.128,13.157 20.439,12.144 L20.439,12.144 Z M11,10 C7.687,10 5,12.685 5,15.999 C5,19.313 7.687,22 11,22 C14.314,22 17,19.313 17,15.999 C17,12.685 14.314,10 11,10 L11,10 Z M10.8,13.001 C10.8,12.339 11.338,11.8 11.999,11.8 C12.661,11.8 13.2,12.339 13.2,13.001 C13.2,13.662 12.661,14.2 11.999,14.2 C11.338,14.2 10.8,13.662 10.8,13.001 L10.8,13.001 Z M13.999,17.2 C13.338,17.2 12.8,16.662 12.8,16.001 C12.8,15.339 13.338,14.8 13.999,14.8 C14.661,14.8 15.2,15.339 15.2,16.001 C15.2,16.662 14.661,17.2 13.999,17.2 L13.999,17.2 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/bowls-m.svg b/data/styles/clear/style-night/symbols/bowls-m.svg
index 7035475fe4..2d724f3442 100644
--- a/data/styles/clear/style-night/symbols/bowls-m.svg
+++ b/data/styles/clear/style-night/symbols/bowls-m.svg
@@ -10,7 +10,7 @@
         <g id="bowls-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M8.999,9 C6.238,9 4,11.238 4,13.999 C4,16.762 6.238,19 8.999,19 C11.762,19 14,16.762 14,13.999 C14,11.238 11.762,9 8.999,9 L8.999,9 Z M9.999,13.1 C9.393,13.1 8.9,12.607 8.9,12 C8.9,11.393 9.392,10.9 9.999,10.9 C10.606,10.9 11.1,11.393 11.1,12 C11.1,12.607 10.606,13.1 9.999,13.1 L9.999,13.1 Z M11.999,15.1 C11.393,15.1 10.9,14.607 10.9,14 C10.9,13.393 11.392,12.9 11.999,12.9 C12.606,12.9 13.1,13.393 13.1,14 C13.1,14.607 12.606,15.1 11.999,15.1 L11.999,15.1 Z M18,14.036 C18,16.61 16.158,18.847 16.079,18.94 C16.048,18.978 16.001,19 15.95,19 L13.888,19 C15.189,17.729 15.999,15.957 15.999,13.999 C15.999,11.821 14.999,9.874 13.435,8.59 C13.387,8.072 13.323,7.361 13.258,7.062 C13.088,6.259 12.942,5.565 13.213,5.063 C13.4,4.573 13.903,4.03 14.734,4.03 C15.562,4.03 16.067,4.573 16.261,5.083 C16.523,5.565 16.376,6.26 16.205,7.062 C16.087,7.623 15.954,8.258 15.954,8.898 C15.954,9.553 16.332,10.11 16.77,10.757 C17.349,11.604 18,12.568 18,14.036 L18,14.036 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/bus-l.svg b/data/styles/clear/style-night/symbols/bus-l.svg
index 55b80d89ed..83773cb637 100644
--- a/data/styles/clear/style-night/symbols/bus-l.svg
+++ b/data/styles/clear/style-night/symbols/bus-l.svg
@@ -7,7 +7,7 @@
     <g id="Transport" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="bus-l" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#12314C" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
+            <circle id="Oval-1-Copy-38" fill="#0F2940" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
             <path d="M24.1791951,7 L7.99456145,7 C6.90234375,7 6,7.89111747 6,8.99036657 L6,14.6514969 L5.87738037,14.7172421 C5.39522648,14.9757597 5,15.6350152 5,16.1868445 L5,20.0008247 C5,20.5439162 5.44881738,21 6.00246167,21 L15.0354444,21 C15.012086,20.8366985 15,20.6697607 15,20.5 C15,18.5670034 16.5670034,17 18.5,17 C20.4329966,17 22,18.5670034 22,20.5 C22,20.6697607 21.987914,20.8366985 21.9645556,21 L23.5009155,21 C24.9767568,19.0351697 25.8870676,16.6212813 25.9901828,14 L25.0029293,14 C24.4490268,14 24,13.5562834 24,13.0001925 L24,9.99980749 C24,9.44762906 24.4378814,9 25.0029293,9 L25.1655114,9 C24.8956127,8.30079625 24.5646621,7.63195111 24.1791951,7 Z M15,9.99980749 C15,9.44762906 15.4378814,9 16.0029293,9 L20.9970707,9 C21.5509732,9 22,9.44371665 22,9.99980749 L22,13.0001925 C22,13.5523709 21.5621186,14 20.9970707,14 L16.0029293,14 C15.4490268,14 15,13.5562834 15,13.0001925 L15,9.99980749 Z M8,9.99539757 C8,9.44565467 8.44371665,9 8.99980749,9 L12.0001925,9 C12.5523709,9 13,9.4556644 13,9.99539757 L13,19 L8,19 L8,9.99539757 Z M18.5,23 C19.8807119,23 21,21.8807119 21,20.5 C21,19.1192881 19.8807119,18 18.5,18 C17.1192881,18 16,19.1192881 16,20.5 C16,21.8807119 17.1192881,23 18.5,23 Z" id="Mask" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-night/symbols/bus-m.svg b/data/styles/clear/style-night/symbols/bus-m.svg
index 2681b6c7a8..fec808a870 100644
--- a/data/styles/clear/style-night/symbols/bus-m.svg
+++ b/data/styles/clear/style-night/symbols/bus-m.svg
@@ -7,7 +7,7 @@
     <g id="Transport" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="bus-m" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" r="11.5"></circle>
-            <circle id="Oval-1-Copy-40" fill="#12314C" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" r="10.5"></circle>
+            <circle id="Oval-1-Copy-40" fill="#0F2940" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" r="10.5"></circle>
             <path d="M20.4460025,6 L6.99079514,6 C5.89821238,6 5,6.89112225 5,7.99037724 L5,10.9638276 L4.87738037,11.0295729 C4.39522648,11.2880905 4,11.9516483 4,12.5087848 L4,15.9912152 C4,16.5499119 4.44715386,17 4.99874609,17 L12.0354444,17 C12.012086,16.8366985 12,16.6697607 12,16.5 C12,14.5670034 13.5670034,13 15.5,13 C17.4329966,13 19,14.5670034 19,16.5 C19,16.6697607 18.987914,16.8366985 18.9645556,17 L20.4460025,17 C21.3495828,15.533412 21.9026157,13.8278132 21.9883049,12 L21.0029293,12 C20.4490268,12 20,11.5566468 20,10.9906311 L20,9.0093689 C20,8.45190985 20.4378814,8 21.0029293,8 L21.40253,8 C21.1536409,7.29582798 20.8317689,6.62613174 20.4460025,6 L20.4460025,6 Z M13,9.0093689 C13,8.45190985 13.4437166,8 13.9998075,8 L17.0001925,8 C17.5523709,8 18,8.44335318 18,9.0093689 L18,10.9906311 C18,11.5480902 17.5562834,12 17.0001925,12 L13.9998075,12 C13.4476291,12 13,11.5566468 13,10.9906311 L13,9.0093689 L13,9.0093689 Z M7,8.99703014 C7,8.4463856 7.44335318,8 8.0093689,8 L9.9906311,8 C10.5480902,8 11,8.45303631 11,8.99703014 L11,16 L7,16 L7,8.99703014 L7,8.99703014 Z M15.5,19 C16.8807119,19 18,17.8807119 18,16.5 C18,15.1192881 16.8807119,14 15.5,14 C14.1192881,14 13,15.1192881 13,16.5 C13,17.8807119 14.1192881,19 15.5,19 L15.5,19 Z" id="Mask" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-night/symbols/bus-s.svg b/data/styles/clear/style-night/symbols/bus-s.svg
index 558d4f94ef..2b2382f8ff 100644
--- a/data/styles/clear/style-night/symbols/bus-s.svg
+++ b/data/styles/clear/style-night/symbols/bus-s.svg
@@ -7,7 +7,7 @@
     <g id="Transport" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="bus-s" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-42" fill="#12314C" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
+            <circle id="Oval-1-Copy-42" fill="#0F2940" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
             <path d="M14.5005493,13 L13.9499909,13 C13.9827849,12.838445 14,12.6712329 14,12.5 C14,11.1192881 12.8807119,10 11.5,10 C10.1192881,10 9,11.1192881 9,12.5 C9,12.6712329 9.01721513,12.838445 9.05000906,13 L4,13 L4,7.65149687 L4,5.99668948 C4,4.89394833 4.89821238,4 5.99079514,4 L14.5005493,4 C14.9532572,4.60270312 15.3172777,5.27582819 15.5732357,6 L15.0093689,6 C14.4433532,6 14,6.44724809 14,6.99895656 L14,8.00104344 C14,8.55733967 14.4519098,9 15.0093689,9 L15.9835977,9 C15.8851642,10.495487 15.3483904,11.8712446 14.5005493,13 Z M9,6.99895656 C9,6.44724809 9.44335318,6 10.0093689,6 L11.9906311,6 C12.5480902,6 13,6.44266033 13,6.99895656 L13,8.00104344 C13,8.55275191 12.5566468,9 11.9906311,9 L10.0093689,9 C9.45190985,9 9,8.55733967 9,8.00104344 L9,6.99895656 Z M5,6.49100518 C5,6.21983051 5.2157526,6 5.49538898,6 L7.50461102,6 C7.7782068,6 8,6.22788048 8,6.49100518 L8,12 L5,12 L5,6.49100518 Z M11.5,14 C12.3284271,14 13,13.3284271 13,12.5 C13,11.6715729 12.3284271,11 11.5,11 C10.6715729,11 10,11.6715729 10,12.5 C10,13.3284271 10.6715729,14 11.5,14 Z" id="Mask" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-night/symbols/butcher-l.svg b/data/styles/clear/style-night/symbols/butcher-l.svg
index 0e107be959..7e3263b622 100644
--- a/data/styles/clear/style-night/symbols/butcher-l.svg
+++ b/data/styles/clear/style-night/symbols/butcher-l.svg
@@ -10,7 +10,7 @@
         <g id="butcher-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.057,27 0,20.943 0,13.5 C0,6.056 6.057,0 13.5,0 C20.943,0 27,6.056 27,13.5 C27,20.943 20.943,27 13.5,27 L13.5,27 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M23,9.325 L18.362,4.688 L9.171,13.88 L13.808,18.517 C15.855,17.766 17.781,16.584 19.424,14.941 C21.067,13.298 22.248,11.373 23,9.325 L23,9.325 Z M17.291,8.707 C16.899,8.316 16.898,7.683 17.291,7.292 C17.68,6.9 18.315,6.902 18.706,7.292 C19.098,7.684 19.098,8.317 18.706,8.707 C18.317,9.098 17.681,9.098 17.291,8.707 L17.291,8.707 Z M9.38,16.502 L7.965,15.088 L4.574,18.477 C3.988,19.062 3.988,20.013 4.574,20.599 C5.16,21.184 6.038,21.122 6.535,20.459 L9.38,16.502 L9.38,16.502 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/butcher-m.svg b/data/styles/clear/style-night/symbols/butcher-m.svg
index 3127a0abe5..868254b3b3 100644
--- a/data/styles/clear/style-night/symbols/butcher-m.svg
+++ b/data/styles/clear/style-night/symbols/butcher-m.svg
@@ -10,7 +10,7 @@
         <g id="butcher-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M19.113,8.029 L15.403,4.32 L8.049,11.674 L11.759,15.383 C13.396,14.781 14.937,13.837 16.251,12.522 C17.567,11.208 18.512,9.667 19.113,8.029 L19.113,8.029 Z M14.294,7.707 C13.902,7.316 13.902,6.684 14.294,6.294 C14.683,5.903 15.316,5.904 15.707,6.294 C16.099,6.685 16.099,7.318 15.707,7.707 C15.319,8.098 14.683,8.097 14.294,7.707 L14.294,7.707 Z M8.217,13.771 L7.085,12.64 L4.373,15.351 C3.904,15.819 3.904,16.58 4.373,17.048 C4.842,17.516 5.544,17.467 5.941,16.936 L8.217,13.771 L8.217,13.771 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/cable-car-l.svg b/data/styles/clear/style-night/symbols/cable-car-l.svg
index eb4ce90cb2..2849ee2b74 100644
--- a/data/styles/clear/style-night/symbols/cable-car-l.svg
+++ b/data/styles/clear/style-night/symbols/cable-car-l.svg
@@ -7,7 +7,7 @@
     <g id="Transport" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="cable-car-l" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
-            <path d="M13.5,26 C20.4035594,26 26,20.4035594 26,13.5 C26,6.59644063 20.4035594,1 13.5,1 C6.59644063,1 1,6.59644063 1,13.5 C1,20.4035594 6.59644063,26 13.5,26 Z" id="Oval-1-Copy-38" fill="#12314C" sketch:type="MSShapeGroup"></path>
+            <path d="M13.5,26 C20.4035594,26 26,20.4035594 26,13.5 C26,6.59644063 20.4035594,1 13.5,1 C6.59644063,1 1,6.59644063 1,13.5 C1,20.4035594 6.59644063,26 13.5,26 Z" id="Oval-1-Copy-38" fill="#0F2940" sketch:type="MSShapeGroup"></path>
             <path d="M11.0029293,10 C10.4490268,10 9.63214111,10.2452393 9.16433275,10.5571115 L7.83566725,11.4428885 C7.37414097,11.7505727 7,12.4556644 7,12.9953976 L7,22 C7,22.5 7.5,23 8,23 L10.5,23 L14,23 L16.5,23 L19,23 C19.5,23 20,22.5 20,22 L20,12.9953976 C20,12.4456547 19.6321411,11.7547607 19.1643327,11.4428885 L17.8356673,10.5571115 C17.374141,10.2494273 16.5621186,10 15.9970707,10 L11.0029293,10 Z M10.1052949,12.4473525 C10.5994269,12.2002865 11.4437166,12 11.9998075,12 L15.0001925,12 C15.5523709,12 16.4047298,12.2023649 16.8947051,12.4473525 L17.1052949,12.5526475 C17.5994269,12.7997135 18,13.4433532 18,14.0093689 L18,15.9906311 C18,16.5480902 17.5536886,17 17.0024554,17 L9.99754465,17 C9.44661595,17 9,16.5566468 9,15.9906311 L9,14.0093689 C9,13.4519098 9.40472984,12.7976351 9.89470506,12.5526475 L10.1052949,12.4473525 Z M13,12 L14,12 L14,17 L13,17 L13,12 Z" id="path24859-copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <path d="M14.357121,5.91071975 L15.4619459,7.99771849 L13.6126744,8 L12.7108116,6.32229711 L6,8 L6,6 L18,3 L18,5 L14.357121,5.91071975 Z M13.6126744,8 L15.4619459,8.00228151 L13.875,11 L12,11 L13.6126744,8 Z" id="Path-Copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
diff --git a/data/styles/clear/style-night/symbols/cable-car-m.svg b/data/styles/clear/style-night/symbols/cable-car-m.svg
index 50e8e9637d..ebf9dbed48 100644
--- a/data/styles/clear/style-night/symbols/cable-car-m.svg
+++ b/data/styles/clear/style-night/symbols/cable-car-m.svg
@@ -7,7 +7,7 @@
     <g id="Transport" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="cable-car-m" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" r="11.5"></circle>
-            <circle id="Oval-1-Copy-40" fill="#12314C" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" r="10.5"></circle>
+            <circle id="Oval-1-Copy-40" fill="#0F2940" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" r="10.5"></circle>
             <path d="M8.98774308,8 C8.43572034,8 7.63187106,8.2689333 7.18898655,8.60317655 L6.79423602,8.90109328 C6.35283296,9.2342185 5.99727577,9.96088415 6.00001573,10.5118661 L6.03723909,17.9971534 C6.05254779,18.4985767 6.55085089,19 7.04915399,19 L16.0186098,19 C16.5169129,19 17.0077475,18.6699559 16.9999073,17.9971534 L16.962684,10.5118661 C16.9599166,9.95538605 16.6013269,9.23533654 16.1584424,8.90109328 L15.7636918,8.60317655 C15.3222888,8.27005134 14.5174531,8 13.9649353,8 L8.98774308,8 Z M8.37871804,10.7399976 C8.75450397,10.3375159 9.49939393,10.0112401 10.0630702,10.0112401 L13.0162029,10.0112401 C13.5706589,10.0112401 14.3214957,10.3477925 14.6836581,10.7522459 L15.0066949,11.1130049 L15.0066949,13.9754866 C15.0066949,14.5238178 14.5596871,14.9683281 14.0071693,14.9683281 L9.02997709,14.9683281 C8.47795435,14.9683281 8.0304515,14.5260735 8.0304515,13.9754866 L8.0304515,11.1130049 L8.37871804,10.7399976 Z" id="path24869" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <path d="M11.7,5 L13.2,5 L11.5,8 L10,8 L11.7,5 Z" id="Rectangle-58" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <rect id="Rectangle" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup" x="11.0002578" y="10.00631" width="1.00005155" height="5.0157749"></rect>
diff --git a/data/styles/clear/style-night/symbols/cable-car-s.svg b/data/styles/clear/style-night/symbols/cable-car-s.svg
index 05da2d49df..c3390de8ff 100644
--- a/data/styles/clear/style-night/symbols/cable-car-s.svg
+++ b/data/styles/clear/style-night/symbols/cable-car-s.svg
@@ -7,7 +7,7 @@
     <g id="Transport" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="cable-car-s" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-42" fill="#12314C" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
+            <circle id="Oval-1-Copy-42" fill="#0F2940" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
             <path d="M5.69730425,6.61157772 L5.80269575,6.53127943 C5.35937913,6.86904447 5,7.59491021 5,8.15276589 L5,12.4285714 C5,12.7142857 5.25,13 5.5,13 L6.75,13 L9,13 L10.25,13 L11.5,13 C11.75,13 12,12.7142857 12,12.4285714 L12,8.15276589 C12,7.59500869 11.6368918,6.86620331 11.1973042,6.53127943 L11.3026958,6.61157772 C10.8593791,6.27381267 10.0566468,6 9.4906311,6 L7.5093689,6 C6.95190985,6 6.13689184,6.27665383 5.69730425,6.61157772 Z M7,7.14285714 L10,7.14285714 L11,7.71428571 L11,9.42857143 L6,9.42857143 L6,7.71428571 L7,7.14285714 L7,7.14285714 Z" id="path24879" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <rect id="Rectangle-58" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup" x="8" y="7" width="1" height="3"></rect>
             <path d="M9.93798452,4.29457364 L12,4 L12,3 L5,4.00000001 L5,5.00000001 L8.52713179,4.49612404 L7.7,6 L9,6 L9.93798452,4.29457364 Z" id="Rectangle-56-Copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/cafe-l.svg b/data/styles/clear/style-night/symbols/cafe-l.svg
index 01cf5b9960..8b1f943740 100644
--- a/data/styles/clear/style-night/symbols/cafe-l.svg
+++ b/data/styles/clear/style-night/symbols/cafe-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="cafe-l-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#4C3A1E" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
+            <circle id="Oval-1-Copy-38" fill="#403119" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
             <path d="M8,7 C7.44599,7 7,7.446 7,8 L7,17 C7,17.554 7.44599,18 8,18 L19,18 C19.55401,18 20,17.554 20,17 L20,16 L20.5,16 C21,16 21,15.5 21,15.5 L21,15 L22,15 C23,15 24,14 24,13 L24,12 L24,10 C24,9.5 23.5,9 23,9 L20,9 L20,8 C20,7.446 19.55401,7 19,7 L8,7 Z M20,10 L22.5,10 C23,10 23,10.5 23,10.5 L23,13 C23,13.5 22.5,14 22,14 L21,14 L20,14 L20,10 Z M5,19 L6,20 L7,21 L20,21 L21,20 L22,19 L5,19 Z" id="rect9826-2-1" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-night/symbols/cafe-m.svg b/data/styles/clear/style-night/symbols/cafe-m.svg
index 53748f6335..92c3ad0ab5 100644
--- a/data/styles/clear/style-night/symbols/cafe-m.svg
+++ b/data/styles/clear/style-night/symbols/cafe-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="cafe-m-copy" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
-            <ellipse id="Oval-1-Copy-40" fill="#4C3A1E" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+            <ellipse id="Oval-1-Copy-40" fill="#403119" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
             <path d="M7,6.3622 C6.5,6.3622 6,6.8622 6,7.3622 L6,13.3622 C6,13.8622 6.5,14.3622 7,14.3622 L14,14.3622 C14.40011,14.3622 15,13.8622 15,13.3622 L15,12.9178 L15.36111,12.9178 C15.72222,12.9178 15.72222,12.5567 15.72222,12.5567 L15.72222,12.1956 L16.16667,12.1956 C16.88889,12.1956 18,11.8622 18,10.7512 L18,8.8622 C18,8.3622 17.75,7.8622 17.25,7.8622 L15,7.8622 L15,7.3622 C15,6.8622 14.5,6.3622 14,6.3622 L7,6.3622 Z M15,8.5845 L16.88889,8.5845 C17.25,8.5845 17.25,8.8622 17.25,8.8622 L17.25,10.7512 C17.25,11.3232 16.52775,11.3576 16.16667,11.3622 L15.72222,11.3622 L15,11.3622 L15,8.5845 Z M5,15.3622 L7,17.3622 L14,17.3622 L16,15.3622 L5,15.3622 Z" id="rect9826-2-1-5-9" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-night/symbols/cafe-s.svg b/data/styles/clear/style-night/symbols/cafe-s.svg
index b5d149b603..82dfae0444 100644
--- a/data/styles/clear/style-night/symbols/cafe-s.svg
+++ b/data/styles/clear/style-night/symbols/cafe-s.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="cafe-s-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-42" fill="#4C3A1E" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
+            <circle id="Oval-1-Copy-42" fill="#403119" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
             <path d="M5.5,5 C5.22299,5 5,5.223 5,5.5 L5,10 C5,10.277 5.22299,10.5 5.5,10.5 L11.5,10.5 C11.777,10.5 12,10.277 12,10 L12,9.5 L12.25,9.5 C12.5,9.5 12.5,9.25 12.5,9.25 L12.5,9 L13,9 C13.5,9 14,8.5 14,8 L14,7.5 L14,6.5 C14,6.25 13.75,6 13.5,6 L12,6 L12,5.5 C12,5.223 11.777,5 11.5,5 L5.5,5 Z M12,6.5 L13.25,6.5 C13.5,6.5 13.5,6.75 13.5,6.75 L13.5,8 C13.5,8.25 13.25,8.5 13,8.5 L12.5,8.5 L12,8.5 L12,6.5 Z M4,11 L6,12 L11,12 L13,11 L4,11 Z" id="rect9826-2-1-5" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-night/symbols/campsite-l.svg b/data/styles/clear/style-night/symbols/campsite-l.svg
index d97d12f284..42c7c8f32e 100644
--- a/data/styles/clear/style-night/symbols/campsite-l.svg
+++ b/data/styles/clear/style-night/symbols/campsite-l.svg
@@ -10,7 +10,7 @@
         <g id="campsite-l-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
             <g id="Oval-1-Copy-38">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M13.5,6.00000003 C13,5.99990003 12.773906,6.23940003 12.625,6.50000003 L6.40625,18 L5.0625,18 C4.4759168,18 4,18.446005 4,19 C4,19.553995 4.4759168,20 5.0625,20 L7,20 L20,20 L21.9375,20 C22.524083,20 23,19.553995 23,19 C23,18.446005 22.524083,18 21.9375,18 L20.59375,18 L14.375,6.50000003 C14.226094,6.23940003 14,5.99990003 13.5,6.00000003 L13.5,6.00000003 Z M13.5,11 L17,18 L10,18 L13.5,11 Z" id="path11349-0" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/campsite-m.svg b/data/styles/clear/style-night/symbols/campsite-m.svg
index 8db59e9397..5a55fe78e2 100644
--- a/data/styles/clear/style-night/symbols/campsite-m.svg
+++ b/data/styles/clear/style-night/symbols/campsite-m.svg
@@ -10,7 +10,7 @@
         <g id="campsite-m-copy" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
             <g id="Oval-1-Copy-40">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M11.5,6.00040004 C11.13889,6.00030004 10.9756,6.17330004 10.86806,6.36150004 L7,14.5 L5.5,14.5 C5,14.5 5,15.2778 5,15.2778 C5,15.2778 5,16 5.5,16 L17.5,16 C18,16 18,15.2778 18,15.2778 C18,15.2778 18,14.5001 17.5,14.5 L16,14.4996 L12.13194,6.36110004 C12.0244,6.17290004 11.86111,5.99990004 11.5,6.00000004 L11.5,6.00040004 Z M11.5,9.00000004 L14,14.5 L9,14.5 L11.5,9.00000004 Z" id="path11349-0-7-copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/campsite-s.svg b/data/styles/clear/style-night/symbols/campsite-s.svg
index ee5b456c0b..dcd9b3ec18 100644
--- a/data/styles/clear/style-night/symbols/campsite-s.svg
+++ b/data/styles/clear/style-night/symbols/campsite-s.svg
@@ -10,7 +10,7 @@
         <g id="campsite-s-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
             <g id="Oval-1-Copy-42">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M8.53125,5 C8.28125,5 8.1682,5.1197 8.09375,5.25 L5.23437,11 L4.5,11 C4.20671,11 4,11.223 4,11.5 C4,11.777 4.20671,12 4.5,12 L5.53125,12 L11.53125,12 L12.46875,12 C12.76204,12 13,11.777 13,11.5 C13,11.223 12.76204,11 12.46875,11 L11.82812,11 L8.96875,5.25 C8.89425,5.1197 8.78125,5 8.53125,5 L8.53125,5 Z M8.53125,7.5 L10.03125,11 L7.03125,11 L8.53125,7.5 Z" id="path11349-0-3-copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/car-repair-l.svg b/data/styles/clear/style-night/symbols/car-repair-l.svg
index d1d0aaf4e4..887c86182d 100644
--- a/data/styles/clear/style-night/symbols/car-repair-l.svg
+++ b/data/styles/clear/style-night/symbols/car-repair-l.svg
@@ -11,7 +11,7 @@
             <g id="Layer_2">
                 <path d="M13.5,27 C6.056,27 0,20.943 0,13.5 C0,6.057 6.056,0 13.5,0 C20.944,0 27,6.057 27,13.5 C27,20.943 20.944,27 13.5,27 L13.5,27 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
                 <g id="Shape">
-                    <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                    <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                     <use fill="none" xlink:href="#path-1"></use>
                 </g>
             </g>
diff --git a/data/styles/clear/style-night/symbols/car-repair-m.svg b/data/styles/clear/style-night/symbols/car-repair-m.svg
index 293aa0c781..45bb86925c 100644
--- a/data/styles/clear/style-night/symbols/car-repair-m.svg
+++ b/data/styles/clear/style-night/symbols/car-repair-m.svg
@@ -11,7 +11,7 @@
             <g id="Layer_2">
                 <path d="M11.5,23 C5.159,23 0,17.842 0,11.5 C0,5.158 5.159,0 11.5,0 C17.841,0 23,5.158 23,11.5 C23,17.842 17.841,23 11.5,23 L11.5,23 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
                 <g id="Shape">
-                    <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                    <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                     <use fill="none" xlink:href="#path-1"></use>
                 </g>
             </g>
diff --git a/data/styles/clear/style-night/symbols/car_sharing-l.svg b/data/styles/clear/style-night/symbols/car_sharing-l.svg
index 46b1aa0a60..38d12aa42e 100644
--- a/data/styles/clear/style-night/symbols/car_sharing-l.svg
+++ b/data/styles/clear/style-night/symbols/car_sharing-l.svg
@@ -10,7 +10,7 @@
         <g id="car_sharing-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.056,27 0,20.943 0,13.5 C0,6.056 6.056,0 13.5,0 C20.944,0 27,6.056 27,13.5 C27,20.943 20.944,27 13.5,27 L13.5,27 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M20.968,11 L19.471,6.998 C19.284,6.499 18.973,6 17.974,6 L9.027,6 C8.028,6 7.716,6.499 7.53,6.998 L6.032,11 L5,12 L5,18 L7,18 L7,18.975 C7,19.473 7.499,19.973 7.998,19.973 L9,19.973 C9.499,19.973 9.998,19.473 9.998,18.975 L9.998,18 L17.002,18 L17.002,18.975 C17.002,19.473 17.501,19.973 18,19.973 L19.002,19.973 C19.501,19.973 20,19.473 20,18.975 L20,18 L22,18 L22,12 L20.968,11 L20.968,11 Z M9.525,8 L17.474,8 L18.472,11 L8.527,11 L9.525,8 L9.525,8 Z M9.2,15.5 C9.2,15.886 8.886,16.2 8.5,16.2 L7.5,16.2 C7.114,16.2 6.8,15.886 6.8,15.5 L6.8,14.5 C6.8,14.114 7.114,13.8 7.5,13.8 L8.5,13.8 C8.886,13.8 9.2,14.114 9.2,14.5 L9.2,15.5 L9.2,15.5 Z M20.2,15.5 C20.2,15.886 19.886,16.2 19.5,16.2 L18.5,16.2 C18.114,16.2 17.8,15.886 17.8,15.5 L17.8,14.5 C17.8,14.114 18.114,13.8 18.5,13.8 L19.5,13.8 C19.886,13.8 20.2,14.114 20.2,14.5 L20.2,15.5 L20.2,15.5 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/car_sharing-m.svg b/data/styles/clear/style-night/symbols/car_sharing-m.svg
index 635697d417..9ef80f8022 100644
--- a/data/styles/clear/style-night/symbols/car_sharing-m.svg
+++ b/data/styles/clear/style-night/symbols/car_sharing-m.svg
@@ -10,7 +10,7 @@
         <g id="car_sharing-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M17.968,10 L16.471,5.998 C16.284,5.499 15.973,5 14.974,5 L8.027,5 C7.028,5 6.716,5.499 6.53,5.998 L5.032,10 L4,11 L4,16 L6,16 L6,16.975 C6,17.473 6.499,17.973 6.998,17.973 L8,17.973 C8.499,17.973 8.998,17.473 8.998,16.975 L8.998,16 L14.002,16 L14.002,16.975 C14.002,17.473 14.501,17.973 15,17.973 L16.002,17.973 C16.501,17.973 17,17.473 17,16.975 L17,16 L19,16 L19,11 L17.968,10 L17.968,10 Z M8.525,7 L14.474,7 L15.472,10 L7.527,10 L8.525,7 L8.525,7 Z M8.2,13.5 C8.2,13.886 7.886,14.2 7.5,14.2 L6.5,14.2 C6.114,14.2 5.8,13.886 5.8,13.5 L5.8,12.5 C5.8,12.114 6.114,11.8 6.5,11.8 L7.5,11.8 C7.886,11.8 8.2,12.114 8.2,12.5 L8.2,13.5 L8.2,13.5 Z M17.2,13.5 C17.2,13.886 16.886,14.2 16.5,14.2 L15.5,14.2 C15.114,14.2 14.8,13.886 14.8,13.5 L14.8,12.5 C14.8,12.114 15.114,11.8 15.5,11.8 L16.5,11.8 C16.886,11.8 17.2,12.114 17.2,12.5 L17.2,13.5 L17.2,13.5 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/caravan_site-l.svg b/data/styles/clear/style-night/symbols/caravan_site-l.svg
index edd534ba80..74a763a569 100644
--- a/data/styles/clear/style-night/symbols/caravan_site-l.svg
+++ b/data/styles/clear/style-night/symbols/caravan_site-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="caravan_site-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.057,27 0,20.943 0,13.5 C0,6.057 6.057,0 13.5,0 C20.943,0 27,6.057 27,13.5 C27,20.943 20.943,27 13.5,27 L13.5,27 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#331E12" sketch:type="MSShapeGroup"></path>
+            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#2E1B10" sketch:type="MSShapeGroup"></path>
             <path d="M9.5,18 C8.672,18 8,18.672 8,19.5 C8,20.328 8.672,21 9.5,21 C10.328,21 11,20.328 11,19.5 C11,18.672 10.328,18 9.5,18 L9.5,18 Z M22,17 L22,15 L20.485,8.94 C20.216,7.869 19.104,7 18,7 L6,7 C4.896,7 4,7.896 4,9 L4,19 L6.051,19 C6.296,17.309 7.741,16 9.5,16 C11.259,16 12.704,17.309 12.949,19 L23,19 L23,17 L22,17 L22,17 Z M12,12 C12,12.553 11.553,13 11,13 L8,13 C7.447,13 7,12.553 7,12 L7,11 C7,10.447 7.447,10 8,10 L11,10 C11.553,10 12,10.447 12,11 L12,12 L12,12 Z M19,18 L14,18 L14,11.5 C14,10.673 14.673,10 15.5,10 L17.5,10 C18.327,10 19,10.673 19,11.5 L19,18 L19,18 Z M17.5,11 L15.5,11 C15.225,11 15,11.225 15,11.5 L15,17 L18,17 L18,11.5 C18,11.225 17.775,11 17.5,11 L17.5,11 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-night/symbols/caravan_site-m.svg b/data/styles/clear/style-night/symbols/caravan_site-m.svg
index 30ab42eded..0c2cf1c241 100644
--- a/data/styles/clear/style-night/symbols/caravan_site-m.svg
+++ b/data/styles/clear/style-night/symbols/caravan_site-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="caravan_site-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#331E12" sketch:type="MSShapeGroup"></path>
+            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#2E1B10" sketch:type="MSShapeGroup"></path>
             <path d="M10,16.5 C10,17.328 9.328,18 8.5,18 C7.672,18 7,17.328 7,16.5 C7,15.672 7.672,15 8.5,15 C9.328,15 10,15.672 10,16.5 L10,16.5 Z M19,12.6 L19,16 L11.949,16 C11.704,14.309 10.259,13 8.5,13 C6.741,13 5.296,14.309 5.051,16 L4,16 L4,7.601 C4,6.717 4.717,6 5.601,6 L15.201,6 C16.085,6 16.974,6.695 17.189,7.553 L19,12.6 L19,12.6 Z M10,9 C10,8.447 9.553,8 9,8 L7,8 C6.447,8 6,8.447 6,9 L6,10 C6,10.553 6.447,11 7,11 L9,11 C9.553,11 10,10.553 10,10 L10,9 L10,9 Z M16,9.5 C16,8.673 15.327,8 14.5,8 L13.5,8 C12.673,8 12,8.673 12,9.5 L12,14 L16,14 L16,9.5 L16,9.5 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-night/symbols/casino-l.svg b/data/styles/clear/style-night/symbols/casino-l.svg
index d4ac42efbe..41700c76ff 100644
--- a/data/styles/clear/style-night/symbols/casino-l.svg
+++ b/data/styles/clear/style-night/symbols/casino-l.svg
@@ -10,7 +10,7 @@
         <g id="casino-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.056,27 0,20.943 0,13.5 C0,6.057 6.056,0 13.5,0 C20.944,0 27,6.057 27,13.5 C27,20.943 20.944,27 13.5,27 L13.5,27 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M21.098,7.2687044 L15.903,4.2687044 C14.946,3.7157044 13.723,4.0437044 13.171,5.0007044 L10.228,10.0987044 L14,10.0987044 C16.205,10.0987044 18,11.8927044 18,14.0987044 L18,15.9797044 C18.336,15.8097044 18.628,15.5457044 18.83,15.1967044 L21.83,10.0017044 C22.383,9.0437044 22.055,7.8217044 21.098,7.2687044 L21.098,7.2687044 Z M20.748,9.8747044 C20.352,10.5607044 19.477,10.7937044 18.791,10.3977044 C18.106,10.0027044 17.871,9.1267044 18.268,8.4427044 C18.664,7.7557044 19.539,7.5217044 20.225,7.9187044 C20.908,8.3147044 21.144,9.1887044 20.748,9.8747044 L20.748,9.8747044 Z M14,12.0987044 L8,12.0987044 C6.896,12.0987044 6,12.9947044 6,14.0987044 L6,20.0987044 C6,21.2027044 6.896,22.0987044 8,22.0987044 L14,22.0987044 C15.104,22.0987044 16,21.2027044 16,20.0987044 L16,14.0987044 C16,12.9947044 15.104,12.0987044 14,12.0987044 L14,12.0987044 Z M8.5,21.0987044 C7.672,21.0987044 7,20.4277044 7,19.5987044 C7,18.7697044 7.672,18.0987044 8.5,18.0987044 C9.328,18.0987044 10,18.7697044 10,19.5987044 C10,20.4277044 9.328,21.0987044 8.5,21.0987044 L8.5,21.0987044 Z M8.5,16.0987044 C7.672,16.0987044 7,15.4277044 7,14.5987044 C7,13.7697044 7.672,13.0987044 8.5,13.0987044 C9.328,13.0987044 10,13.7697044 10,14.5987044 C10,15.4277044 9.328,16.0987044 8.5,16.0987044 L8.5,16.0987044 Z M13.5,21.0987044 C12.672,21.0987044 12,20.4277044 12,19.5987044 C12,18.7697044 12.672,18.0987044 13.5,18.0987044 C14.328,18.0987044 15,18.7697044 15,19.5987044 C15,20.4277044 14.328,21.0987044 13.5,21.0987044 L13.5,21.0987044 Z M13.5,16.0987044 C12.672,16.0987044 12,15.4277044 12,14.5987044 C12,13.7697044 12.672,13.0987044 13.5,13.0987044 C14.328,13.0987044 15,13.7697044 15,14.5987044 C15,15.4277044 14.328,16.0987044 13.5,16.0987044 L13.5,16.0987044 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/casino-m.svg b/data/styles/clear/style-night/symbols/casino-m.svg
index dc03342222..57b28accd6 100644
--- a/data/styles/clear/style-night/symbols/casino-m.svg
+++ b/data/styles/clear/style-night/symbols/casino-m.svg
@@ -10,7 +10,7 @@
         <g id="casino-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M17.488,6.61421587 L13.331,4.21521587 C12.566,3.77221587 11.588,4.03521587 11.145,4.80121587 L9.248,8.08821587 L11.4,8.08821587 C13.384,8.08821587 15,9.70321587 15,11.6882159 L15,13.5892159 C15.272,13.4542159 15.51,13.2402159 15.674,12.9572159 L18.074,8.80121587 C18.516,8.03521587 18.254,7.05721587 17.488,6.61421587 L17.488,6.61421587 Z M17.208,8.69921587 C16.892,9.24821587 16.191,9.43421587 15.643,9.11821587 C15.095,8.80321587 14.908,8.10121587 15.224,7.55521587 C15.54,7.00521587 16.241,6.81821587 16.789,7.13521587 C17.337,7.45121587 17.524,8.15021587 17.208,8.69921587 L17.208,8.69921587 Z M11.4,10.0882159 L6.6,10.0882159 C5.717,10.0882159 5,10.8052159 5,11.6882159 L5,16.4892159 C5,17.3722159 5.717,18.0892159 6.6,18.0892159 L11.401,18.0892159 C12.284,18.0892159 13.001,17.3722159 13.001,16.4892159 L13.001,11.6882159 C13,10.8052159 12.283,10.0882159 11.4,10.0882159 L11.4,10.0882159 Z M7,17.2882159 C6.338,17.2882159 5.8,16.7502159 5.8,16.0892159 C5.8,15.4272159 6.338,14.8892159 7,14.8892159 C7.662,14.8892159 8.2,15.4272159 8.2,16.0892159 C8.2,16.7502159 7.662,17.2882159 7,17.2882159 L7,17.2882159 Z M7,13.2872159 C6.338,13.2872159 5.8,12.7492159 5.8,12.0882159 C5.8,11.4262159 6.338,10.8882159 7,10.8882159 C7.662,10.8882159 8.2,11.4262159 8.2,12.0882159 C8.2,12.7492159 7.662,13.2872159 7,13.2872159 L7,13.2872159 Z M11,17.2882159 C10.338,17.2882159 9.8,16.7502159 9.8,16.0892159 C9.8,15.4272159 10.338,14.8892159 11,14.8892159 C11.662,14.8892159 12.2,15.4272159 12.2,16.0892159 C12.2,16.7502159 11.662,17.2882159 11,17.2882159 L11,17.2882159 Z M11,13.2872159 C10.338,13.2872159 9.8,12.7492159 9.8,12.0882159 C9.8,11.4262159 10.338,10.8882159 11,10.8882159 C11.662,10.8882159 12.2,11.4262159 12.2,12.0882159 C12.2,12.7492159 11.662,13.2872159 11,13.2872159 L11,13.2872159 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/cave-l.svg b/data/styles/clear/style-night/symbols/cave-l.svg
index ad681d7e4f..d136798432 100644
--- a/data/styles/clear/style-night/symbols/cave-l.svg
+++ b/data/styles/clear/style-night/symbols/cave-l.svg
@@ -11,7 +11,7 @@
             <g id="peak-l-copy">
                 <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
                 <g id="Oval-1-Copy-38">
-                    <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                    <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                     <use fill="none" xlink:href="#path-1"></use>
                 </g>
             </g>
diff --git a/data/styles/clear/style-night/symbols/cave-m.svg b/data/styles/clear/style-night/symbols/cave-m.svg
index 1898c9d364..58387b195f 100644
--- a/data/styles/clear/style-night/symbols/cave-m.svg
+++ b/data/styles/clear/style-night/symbols/cave-m.svg
@@ -10,7 +10,7 @@
         <g id="cave-m-copy" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
             <g id="Oval-1-Copy-38">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M18,14.2958404 C18,14.8817912 17.9546888,15.4443973 17.8921162,16 L13.7580086,16 C13.7731124,15.6241511 13.7968468,15.2529711 13.7968468,14.8654499 C13.7968468,10.0471138 13.1063904,7.83637521 11.4989217,7.83637521 C9.89145295,7.83637521 9.20099658,10.0471138 9.20099658,14.8654499 C9.20099658,15.2529711 9.22257334,15.6241511 9.23983475,16 L5.10788488,16 C5.0431546,15.4443973 5.00000107,14.8817912 5.00000107,14.2958404 C4.9978434,9.16001698 8.24514603,5 11.4989217,5 C14.7505397,5 18,9.16001698 18,14.2958404 Z" id="Shape-Copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/cave-s.svg b/data/styles/clear/style-night/symbols/cave-s.svg
index 439d8cabbf..53a3242169 100644
--- a/data/styles/clear/style-night/symbols/cave-s.svg
+++ b/data/styles/clear/style-night/symbols/cave-s.svg
@@ -10,7 +10,7 @@
         <g id="cave-s-copy" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" rx="8.5" ry="8.5"></ellipse>
             <g id="Oval-1-Copy-38">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M8.49925348,4 C10.7503736,4 13,7.02546689 13,10.7606112 C13,11.1867572 12.9686307,11.5959253 12.9253112,12 L10.0632368,12 C10.0736932,11.7266553 10.0901247,11.4567063 10.0901247,11.1748727 C10.0901247,7.67062818 9.61211646,6.06281834 8.49925348,6.06281834 C7.38639051,6.06281834 6.90838225,7.67062818 6.90838225,11.1748727 C6.90838225,11.4567063 6.92332,11.7266553 6.93527021,12 L4.07468953,12 C4.02987626,11.5959253 4.00000074,11.1867572 4.00000074,10.7606112 C3.99850697,7.02546689 6.24663956,4 8.49925348,4 L8.49925348,4 Z" id="Shape-Copy-2" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/cemetery-l.svg b/data/styles/clear/style-night/symbols/cemetery-l.svg
index f41fa563fd..83c7b173dc 100644
--- a/data/styles/clear/style-night/symbols/cemetery-l.svg
+++ b/data/styles/clear/style-night/symbols/cemetery-l.svg
@@ -10,7 +10,7 @@
         <g id="cemetery-l" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
             <g id="Oval-1-Copy-38">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M13.5,6 C10.426354,6 9,7.75 9,10.375 L9,14.75 L9,18.25 C8.5,18.25 8,18.6875 8,19.125 L8,20 L19,20 L19,19.125 C19,18.6875 18.5,18.25 18,18.25 L18,10.375 C18,7.75 16.5,6 13.5,6 L13.5,6 Z" id="rect12479-9-copy-3" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/cemetery-m.svg b/data/styles/clear/style-night/symbols/cemetery-m.svg
index 8fcb72209a..7896a64cc6 100644
--- a/data/styles/clear/style-night/symbols/cemetery-m.svg
+++ b/data/styles/clear/style-night/symbols/cemetery-m.svg
@@ -10,7 +10,7 @@
         <g id="cemetery-m" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
             <g id="Oval-1-Copy-40">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M11.5,5 C8.98519873,5 7.81818182,6.5 7.81818182,8.75 L7.81818182,12.5 L7.81818182,15.5 C7.40909091,15.5 7,15.875 7,16.25 L7,17 L16,17 L16,16.25 C16,15.875 15.5909091,15.5 15.1818182,15.5 L15.1818182,8.75 C15.1818182,6.5 13.9545455,5 11.5,5 L11.5,5 Z" id="rect12479-9-copy-2" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/cemetery-s.svg b/data/styles/clear/style-night/symbols/cemetery-s.svg
index e1bbfcac26..f696746573 100644
--- a/data/styles/clear/style-night/symbols/cemetery-s.svg
+++ b/data/styles/clear/style-night/symbols/cemetery-s.svg
@@ -10,7 +10,7 @@
         <g id="cemetery-s" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
             <g id="Oval-1-Copy-42">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M8.5,4 C6.54404345,4 5.63636364,5.125 5.63636364,6.8125 L5.63636364,9.625 L5.63636364,11.875 C5.31818182,11.875 5,12.15625 5,12.4375 L5,13 L12,13 L12,12.4375 C12,12.15625 11.6818182,11.875 11.3636364,11.875 L11.3636364,6.8125 C11.3636364,5.125 10.4090909,4 8.5,4 L8.5,4 Z" id="rect12479-9-copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/chemist-l.svg b/data/styles/clear/style-night/symbols/chemist-l.svg
index d35fe99362..63d10ad9b5 100644
--- a/data/styles/clear/style-night/symbols/chemist-l.svg
+++ b/data/styles/clear/style-night/symbols/chemist-l.svg
@@ -10,7 +10,7 @@
         <g id="chemist-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.057,27 0,20.943 0,13.5 C0,6.057 6.057,0 13.5,0 C20.943,0 27,6.057 27,13.5 C27,20.943 20.943,27 13.5,27 L13.5,27 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M11,22 L16,22 C17.104,22 18,21.104 18,20 L9,20 C9,21.104 9.896,22 11,22 L11,22 Z M5,12 C5,14.916 6.481,17.469 8.72,19 L18.281,19 C20.518,17.469 22.001,14.916 22.001,12 L5,12 L5,12 Z M20.652,6.771 C21.085,6.338 21.118,5.668 20.724,5.276 C20.33,4.881 19.661,4.915 19.227,5.348 L14.039,10 L18.058,10 L20.652,6.771 L20.652,6.771 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/chemist-m.svg b/data/styles/clear/style-night/symbols/chemist-m.svg
index 41c2bbdb7f..c6bd0e0ed4 100644
--- a/data/styles/clear/style-night/symbols/chemist-m.svg
+++ b/data/styles/clear/style-night/symbols/chemist-m.svg
@@ -10,7 +10,7 @@
         <g id="chemist-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M9.5,19 L13.5,19 C14.384,19 15.1,18.105 15.1,17 L7.9,17 C7.9,18.105 8.617,19 9.5,19 L9.5,19 Z M4.7,10 C4.7,12.333 5.885,14.674 7.676,15.899 L15.324,15.899 C17.114,14.673 18.301,12.333 18.301,10 L4.7,10 L4.7,10 Z M17.495,5.794 C17.924,5.364 17.957,4.7 17.565,4.31 C17.175,3.918 16.511,3.952 16.08,4.382 L10.932,8.998 L14.919,8.998 L17.495,5.794 L17.495,5.794 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/cinema-l.svg b/data/styles/clear/style-night/symbols/cinema-l.svg
index d66fddf8df..a14d953a02 100644
--- a/data/styles/clear/style-night/symbols/cinema-l.svg
+++ b/data/styles/clear/style-night/symbols/cinema-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="cinema-l-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#331E12" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
+            <circle id="Oval-1-Copy-38" fill="#2E1B10" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
             <path d="M19,5 L16.75,5.6563 L17.84375,8.625 L20,8 L19,5 Z M15.375,6.0313 L12.4375,6.875 L12.5,7 L13.0625,8.5313 L13.5625,9.8438 L16.5,9 L15.375,6.0313 Z M11.09375,7.25 L8.5,8 L9.625,10.9688 L12.21875,10.2188 L11.5625,8.5313 L11.09375,7.25 Z M7.15625,8.375 L5,9 L6,12 L8.25,11.3438 L7.15625,8.375 Z M6,12 L6,21 C6,21.554 6.44599,22 7,22 L20,22 C20.55401,22 21,21.554 21,21 L21,12 L6,12 Z M8,14 L19,14 L19,17 L8,17 L8,14 Z" id="rect7568-8-4-copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-night/symbols/cinema-m.svg b/data/styles/clear/style-night/symbols/cinema-m.svg
index 0045da4266..0de8b2ffc1 100644
--- a/data/styles/clear/style-night/symbols/cinema-m.svg
+++ b/data/styles/clear/style-night/symbols/cinema-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="cinema-m-copy" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
-            <ellipse id="Oval-1-Copy-40" fill="#331E12" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+            <ellipse id="Oval-1-Copy-40" fill="#2E1B10" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
             <path d="M16.23529,4.65997314 L14.5147,5.16177314 L15.3511,7.43207314 L17,6.95407314 L16.23529,4.65997314 Z M13.46323,5.44857314 L11.21691,6.09377314 L12.0772,8.36397314 L14.32353,7.71877314 L13.46323,5.44857314 Z M10.18933,6.38057314 L8.20588,6.95407314 L9.06617,9.22427314 L11.04963,8.65077314 L10.18933,6.38057314 Z M7.17831,7.24087314 L5,8.01107314 L6,10.0110731 L8.0147,9.51107314 L7.17831,7.24087314 Z M6,10.0110731 L6,17.0110731 C6,17.5110731 6.5,18.0110731 7,18.0110731 L17,18.0110731 C17.5,18.0110731 18,17.5110731 18,17.0110731 L18,10.0110731 L6,10.0110731 Z M8,12.0110731 L16,12.0110731 L16,14.0110731 L8,14.0110731 L8,12.0110731 Z" id="rect7568-8-4-7-copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-night/symbols/cinema-s.svg b/data/styles/clear/style-night/symbols/cinema-s.svg
index 29786bdd73..9747afac48 100644
--- a/data/styles/clear/style-night/symbols/cinema-s.svg
+++ b/data/styles/clear/style-night/symbols/cinema-s.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="cinema-s-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-42" fill="#331E12" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
+            <circle id="Oval-1-Copy-42" fill="#2E1B10" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
             <path d="M11.5,4.5 L4.5,6.5 L5,8 L12,6 L11.5,4.5 L11.5,4.5 Z M5,8 L5,12.5 C5,12.8077 5.19231,13 5.5,13 L11.5,13 C11.80769,13 12,12.8077 12,12.5 L12,8 L5,8 L5,8 Z M6,9 L11,9 L11,10 L6,10 L6,9 L6,9 Z" id="rect7568-8-4-7-5-copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-night/symbols/clothes-l.svg b/data/styles/clear/style-night/symbols/clothes-l.svg
index c85a8e60fd..1bd36e1519 100644
--- a/data/styles/clear/style-night/symbols/clothes-l.svg
+++ b/data/styles/clear/style-night/symbols/clothes-l.svg
@@ -10,7 +10,7 @@
         <g id="clothes-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.057,27 0,20.943 0,13.5 C0,6.057 6.057,0 13.5,0 C20.943,0 27,6.057 27,13.5 C27,20.943 20.943,27 13.5,27 L13.5,27 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M20.974,12 L18,12 L18,22 L9,22 L9,12 L6.026,12 L5,8.342 L10.658,7 C10.937,8.18 11.931,9.075 13.159,9.22 L13.841,9.22 C15.067,9.075 16.062,8.18 16.341,7 L22,8.342 L20.974,12 L20.974,12 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/clothes-m.svg b/data/styles/clear/style-night/symbols/clothes-m.svg
index f01aecd74f..edbd094a3f 100644
--- a/data/styles/clear/style-night/symbols/clothes-m.svg
+++ b/data/styles/clear/style-night/symbols/clothes-m.svg
@@ -10,7 +10,7 @@
         <g id="clothes-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M17.214,9.889 L14.94,9.889 L14.94,18 L8.059,18 L8.059,9.889 L5.785,9.889 L5,7.093 L9.326,6.066 C9.54,6.968 10.301,7.653 11.238,7.763 L11.76,7.763 C12.697,7.653 13.456,6.968 13.671,6.066 L17.999,7.093 L17.214,9.889 L17.214,9.889 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/college-l.svg b/data/styles/clear/style-night/symbols/college-l.svg
index e078a9860c..19a8035a4a 100644
--- a/data/styles/clear/style-night/symbols/college-l.svg
+++ b/data/styles/clear/style-night/symbols/college-l.svg
@@ -10,7 +10,7 @@
         <g id="college-l-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
             <g id="Oval-1-Copy-38">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M13.5,7 L4,12 L13.5,17 L19,14.21875 L19,18 C19,20 21,20 21,20 L21,19 C21,19 20,18.94281 20,18 L20,13.65625 L23,12 L13.5,7 Z M9,16 L9,18 C9,18.4967 9.3250891,19.1625 10,19.5 L13.5,21 L16.5,19.5 C17.174911,19.1625 18.047132,18.494459 18,18 L18,16 L13.5,18.1875 L9,16 Z" id="path7442-copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/college-m.svg b/data/styles/clear/style-night/symbols/college-m.svg
index 9951d744fa..169625dfd6 100644
--- a/data/styles/clear/style-night/symbols/college-m.svg
+++ b/data/styles/clear/style-night/symbols/college-m.svg
@@ -10,7 +10,7 @@
         <g id="college-m-copy" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
             <g id="Oval-1-Copy-40">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M11.5,6 L5,9.5 L11.5,13 L16,10.6563 L16,14.2188 C16,16 17.5,15.75 17.5,15.75 L17.5,15 C17.5,15 16.71875,15 16.71875,14.2188 L16.71875,10.25 L18,9.5 L11.5,6 Z M8,12.5 L8,13.9375 C8,14.2963 8.51257,14.7562 9,15 L11.5,16 L14,15 C14.48743,14.7562 15,14.2963 15,13.9375 L15,12.5 L11.5,14 L8,12.5 Z" id="path7442-0-copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/college-s.svg b/data/styles/clear/style-night/symbols/college-s.svg
index e96473b61e..262e568b64 100644
--- a/data/styles/clear/style-night/symbols/college-s.svg
+++ b/data/styles/clear/style-night/symbols/college-s.svg
@@ -10,7 +10,7 @@
         <g id="college-s-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
             <g id="Oval-1-Copy-42">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M8.5,5 L4,7.5 L8.5,10 L11,8.5 L11,9.75 L8.5,11 L6,9.75 L6,11 L8.5,12.5 L11,11 C11,11.5 12,11.5 12,11.5 L12,11 C12,11 11.5,10.971 11.5,10.5 L11.5,8.5 L13,7.5 L8.5,5 Z" id="path7442-3-copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/computer-l.svg b/data/styles/clear/style-night/symbols/computer-l.svg
index 7002c052e1..4208ad193d 100644
--- a/data/styles/clear/style-night/symbols/computer-l.svg
+++ b/data/styles/clear/style-night/symbols/computer-l.svg
@@ -10,7 +10,7 @@
         <g id="computer-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.057,27 0,20.943 0,13.5 C0,6.057 6.057,0 13.5,0 C20.943,0 27,6.057 27,13.5 C27,20.943 20.943,27 13.5,27 L13.5,27 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M22,8 L22,16 C22,17.104 21.104,18 20,18 L15,18 L17,20 L17,21 C17,21.553 16.553,22 16,22 L11,22 C10.447,22 10,21.553 10,21 L10,20 L12,18 L7,18 C5.896,18 5,17.104 5,16 L5,8 C5,6.896 5.896,6 7,6 L20,6 C21.104,6 22,6.896 22,8 L22,8 Z M20,15 L20,8 L7,8 L7,15 L20,15 L20,15 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/computer-m.svg b/data/styles/clear/style-night/symbols/computer-m.svg
index 9ca3f850fb..5757e7aa35 100644
--- a/data/styles/clear/style-night/symbols/computer-m.svg
+++ b/data/styles/clear/style-night/symbols/computer-m.svg
@@ -10,7 +10,7 @@
         <g id="computer-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M18,6.601 L18,13.4 C18,14.284 17.283,15.001 16.399,15.001 L12.7,15.001 L14,16.4 L14,17.2 C14,17.642 13.642,18.001 13.199,18.001 L9.8,18.001 C9.359,18.001 9,17.643 9,17.2 L9,16.4 L10.301,15.001 L6.601,15.001 C5.716,15.001 5,14.284 5,13.4 L5,6.601 C5,5.717 5.716,5 6.601,5 L16.4,5 C17.283,5 18,5.717 18,6.601 L18,6.601 Z M16,13 L16,7 L7,7 L7,13 L16,13 L16,13 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/convenience-l.svg b/data/styles/clear/style-night/symbols/convenience-l.svg
index 6f1155cb06..c1db67bf3c 100644
--- a/data/styles/clear/style-night/symbols/convenience-l.svg
+++ b/data/styles/clear/style-night/symbols/convenience-l.svg
@@ -10,7 +10,7 @@
         <g id="convenience-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.057,27 0,20.943 0,13.5 C0,6.057 6.057,0 13.5,0 C20.943,0 27,6.057 27,13.5 C27,20.943 20.943,27 13.5,27 L13.5,27 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M5,7 L5,9 L22,9 L22,7 L5,7 L5,7 Z M6,21 L10,21 L10,16 L13,16 L13,21 L14,21 L14,16 L17,16 L17,21 L21,21 L21,11 L6,11 L6,21 L6,21 Z M10,13 L17,13 L17,15 L10,15 L10,13 L10,13 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/convenience-m.svg b/data/styles/clear/style-night/symbols/convenience-m.svg
index 195e1b94c0..dddf49eb99 100644
--- a/data/styles/clear/style-night/symbols/convenience-m.svg
+++ b/data/styles/clear/style-night/symbols/convenience-m.svg
@@ -10,7 +10,7 @@
         <g id="convenience-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M5,5 L5,7 L18,7 L18,5 L5,5 L5,5 Z M6,18 L8,18 L8,14 L11,14 L11,18 L12,18 L12,14 L15,14 L15,18 L17,18 L17,9 L6,9 L6,18 L6,18 Z M8,11 L15,11 L15,13 L8,13 L8,11 L8,11 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/cricket-l.svg b/data/styles/clear/style-night/symbols/cricket-l.svg
index a095480e44..520346b019 100644
--- a/data/styles/clear/style-night/symbols/cricket-l.svg
+++ b/data/styles/clear/style-night/symbols/cricket-l.svg
@@ -10,7 +10,7 @@
         <g id="cricket-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.057,27 0,20.943 0,13.5 C0,6.057 6.057,0 13.5,0 C20.943,0 27,6.057 27,13.5 C27,20.943 20.943,27 13.5,27 L13.5,27 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M21.377,6.86 C20.653,6.135 19.807,5.61 18.907,5.271 L8.908,15.27 L9.503,16.995 L6.719,19.78 C6.238,20.259 6.238,21.04 6.719,21.519 C7.199,21.999 7.979,21.999 8.458,21.519 L11.242,18.734 L12.968,19.33 L22.967,9.332 C22.628,8.432 22.103,7.585 21.377,6.86 L21.377,6.86 Z M9,11 C10.104,11 11,10.104 11,9 C11,7.896 10.104,7 9,7 C7.896,7 7,7.896 7,9 C7,10.104 7.896,11 9,11 L9,11 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/cricket-m.svg b/data/styles/clear/style-night/symbols/cricket-m.svg
index 9683da6bc6..b85ca6438d 100644
--- a/data/styles/clear/style-night/symbols/cricket-m.svg
+++ b/data/styles/clear/style-night/symbols/cricket-m.svg
@@ -10,7 +10,7 @@
         <g id="cricket-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M18.333,6.303 C17.754,5.723 17.076,5.303 16.357,5.032 L8.357,13.032 L8.834,14.411 L6.606,16.64 C6.22,17.024 6.22,17.648 6.606,18.032 C6.99,18.416 7.614,18.416 7.998,18.032 L10.225,15.804 L11.606,16.281 L19.606,8.282 C19.334,7.561 18.914,6.883 18.333,6.303 L18.333,6.303 Z M8.5,9 C9.328,9 10,8.328 10,7.499 C10,6.67 9.328,5.998 8.5,5.998 C7.671,5.998 7,6.67 7,7.499 C7,8.328 7.671,9 8.5,9 L8.5,9 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/curling-l.svg b/data/styles/clear/style-night/symbols/curling-l.svg
index 02c90db63d..9dc7abe36c 100644
--- a/data/styles/clear/style-night/symbols/curling-l.svg
+++ b/data/styles/clear/style-night/symbols/curling-l.svg
@@ -10,7 +10,7 @@
         <g id="curling-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.057,27 0,20.943 0,13.5 C0,6.057 6.057,0 13.5,0 C20.943,0 27,6.057 27,13.5 C27,20.943 20.943,27 13.5,27 L13.5,27 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M22.949,14 L4.029,14 C4.01,14.164 4,14.331 4,14.5 C4,16.985 6.015,19 8.5,19 L18.5,19 C20.985,19 23,16.985 23,14.5 C23,14.329 22.968,14.166 22.949,14 L22.949,14 Z M18.5,10 L12.1,10 C11.547,10 11.1,9.553 11.1,9 C11.1,8.447 11.547,8 12.1,8 L18,8 C18.553,8 19,7.553 19,7 C19,6.447 18.553,6 18,6 L10.697,6 L5.668,11.029 C5.327,11.307 5.031,11.636 4.782,12 L22.24,12 C21.433,10.795 20.06,10 18.5,10 L18.5,10 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/curling-m.svg b/data/styles/clear/style-night/symbols/curling-m.svg
index 1b164f766a..62d130b860 100644
--- a/data/styles/clear/style-night/symbols/curling-m.svg
+++ b/data/styles/clear/style-night/symbols/curling-m.svg
@@ -10,7 +10,7 @@
         <g id="curling-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M19.06,12.099 L3.924,12.099 C3.908,12.231 3.901,12.264 3.901,12.399 C3.901,14.387 5.512,16 7.501,16 L15.501,16 C17.489,16 19.101,14.388 19.101,12.399 C19.1,12.262 19.074,12.231 19.06,12.099 L19.06,12.099 Z M15.898,9.098 L10.379,9.098 C9.937,9.098 8.999,8.919 8.999,7.999 C8.999,7.079 9.937,6.801 10.379,6.801 L15.099,6.801 C15.542,6.801 15.9,6.444 15.9,6 C15.9,5.559 15.543,5.201 15.099,5.201 L9.257,5.201 C9.257,5.201 4.832,9.687 4.122,10.996 L18.89,10.996 C18.244,10.033 17.146,9.098 15.898,9.098 L15.898,9.098 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/dentist-l.svg b/data/styles/clear/style-night/symbols/dentist-l.svg
new file mode 100644
index 0000000000..467b001851
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/dentist-l.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="27px" height="27px" viewBox="0 0 27 27" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+    <!-- Generator: Sketch 3.4.2 (15857) - http://www.bohemiancoding.com/sketch -->
+    <title>dentist-l</title>
+    <desc>Created with Sketch.</desc>
+    <defs>
+        <circle id="path-1" cx="13.5" cy="13.5" r="12.5"></circle>
+    </defs>
+    <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
+        <g id="dentist-l" sketch:type="MSLayerGroup">
+            <ellipse id="Oval-1-Copy-46" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" rx="13.5" ry="13.5"></ellipse>
+            <g id="Oval-1-Copy-38">
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="none" xlink:href="#path-1"></use>
+            </g>
+            <path d="M6.50897437,13.9135201 C5.98487881,11.3254898 5.16165324,6.59032445 8.22835392,6.07169897 C11.2542641,5.55817055 11.3173039,7.98309509 13.5002114,7.98309509 C15.6843549,7.98309509 15.7424504,5.55689628 18.7683606,6.07169897 C21.8400056,6.59032445 21.0143079,11.3242155 20.4914484,13.9135201 C19.8721751,16.9628341 19.6818197,22 17.4197041,22 C15.9735963,22 15.685591,17.4285714 13.4228077,17.4285714 C11.3049432,17.4285714 11.0280625,22 9.42591123,22 C7.3198392,22 7.12701159,16.9628341 6.50897437,13.9135201 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/dentist-m.svg b/data/styles/clear/style-night/symbols/dentist-m.svg
new file mode 100644
index 0000000000..890d5ebc09
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/dentist-m.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="25px" height="25px" viewBox="0 0 25 25" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+    <!-- Generator: Sketch 3.4.2 (15857) - http://www.bohemiancoding.com/sketch -->
+    <title>dentist-m</title>
+    <desc>Created with Sketch.</desc>
+    <defs>
+        <circle id="path-1" cx="12.5" cy="12.5" r="11.5"></circle>
+    </defs>
+    <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
+        <g id="dentist-m" sketch:type="MSLayerGroup">
+            <circle id="Oval-1-Copy-38" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="12.5" cy="12.5" r="12.5"></circle>
+            <g id="Oval-1-Copy-47">
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="none" xlink:href="#path-1"></use>
+            </g>
+            <path d="M6.44569839,12.9243301 C5.98675869,10.6598036 5.26587698,6.5165339 7.95132369,6.0627366 C10.601051,5.61339923 10.6562537,7.73520821 12.5677809,7.73520821 C14.4803904,7.73520821 14.5312635,5.61228425 17.1809908,6.0627366 C19.8707671,6.5165339 19.1477206,10.6586886 18.6898633,12.9243301 C18.1475784,15.5924798 17.9808881,20 16,20 C14.7336732,20 14.4814728,16 12.5,16 C10.6454296,16 10.4029709,20 9,20 C7.15575605,20 6.98690087,15.5924798 6.44569839,12.9243301 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/dentist-s.svg b/data/styles/clear/style-night/symbols/dentist-s.svg
new file mode 100644
index 0000000000..8f29030dd0
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/dentist-s.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="17px" height="17px" viewBox="0 0 17 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+    <!-- Generator: Sketch 3.4.2 (15857) - http://www.bohemiancoding.com/sketch -->
+    <title>dentist-s</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage"></g>
+</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/department_store-l.svg b/data/styles/clear/style-night/symbols/department_store-l.svg
index 27dc8f2aff..93a6b16d24 100644
--- a/data/styles/clear/style-night/symbols/department_store-l.svg
+++ b/data/styles/clear/style-night/symbols/department_store-l.svg
@@ -10,7 +10,7 @@
         <g id="department_store-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.057,27 0,20.943 0,13.5 C0,6.057 6.057,0 13.5,0 C20.943,0 27,6.057 27,13.5 C27,20.943 20.943,27 13.5,27 L13.5,27 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M12,6.28694737 L12.414,5.89473684 L14.586,5.89473684 L15,6.28694737 L15,7.78947368 L17,7.78947368 L17,5.50252632 L15.414,4 L11.586,4 L10,5.50252632 L10,7.78947368 L12,7.78947368 L12,6.28694737 L12,6.28694737 Z M17,9.68421053 L17,12.9185263 L15.414,14.4210526 L11.586,14.4210526 L10,12.9185263 L10,9.68421053 L7,9.68421053 L7,20.1052632 C7,21.1511579 7.896,22 9,22 L18,22 C19.104,22 20,21.1511579 20,20.1052632 L20,9.68421053 L17,9.68421053 L17,9.68421053 Z M12,12.1341053 L12.414,12.5263158 L14.586,12.5263158 L15,12.1341053 L15,9.68421053 L12,9.68421053 L12,12.1341053 L12,12.1341053 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/department_store-m.svg b/data/styles/clear/style-night/symbols/department_store-m.svg
index 7a92d814f3..096cd3255b 100644
--- a/data/styles/clear/style-night/symbols/department_store-m.svg
+++ b/data/styles/clear/style-night/symbols/department_store-m.svg
@@ -10,7 +10,7 @@
         <g id="department_store-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M10,5.414 L10.414,5 L12.586,5 L13,5.414 L13,7 L14,7 L14,4.586 L13.414,4 L9.586,4 L9,4.586 L9,7 L10,7 L10,5.414 L10,5.414 Z M14,9 L14,12.414 L13.414,13 L9.586,13 L9,12.414 L9,9 L6,9 L6,17 C6,18.104 6.896,19 8,19 L15,19 C16.104,19 17,18.104 17,17 L17,9 L14,9 L14,9 Z M10,11.586 L10.414,12 L12.586,12 L13,11.586 L13,9 L10,9 L10,11.586 L10,11.586 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/diving-l.svg b/data/styles/clear/style-night/symbols/diving-l.svg
index 1e5ef8d45f..7a9ed2ca22 100644
--- a/data/styles/clear/style-night/symbols/diving-l.svg
+++ b/data/styles/clear/style-night/symbols/diving-l.svg
@@ -10,7 +10,7 @@
         <g id="diving-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.057,27 0,20.943 0,13.5 C0,6.057 6.057,0 13.5,0 C20.943,0 27,6.057 27,13.5 C27,20.943 20.943,27 13.5,27 L13.5,27 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M22.994,13.166 C22.903,14.267 21.936,15.085 20.836,14.993 C19.736,14.903 18.918,13.937 19.007,12.836 C19.099,11.736 20.066,10.918 21.166,11.008 C22.266,11.099 23.084,12.065 22.994,13.166 L22.994,13.166 Z M4.881,8.055 L7.22,12.739 L15.955,16.24 L18.562,19.001 L22,19.001 C22.553,19.001 23,18.664 23,18.247 C23,17.831 22.556,17.438 22.008,17.37 L19.054,17.001 L16.908,13.395 L9.012,10.59 L6.584,7.217 C6.262,6.769 5.649,6.574 5.217,6.783 C4.785,6.992 4.634,7.561 4.881,8.055 L4.881,8.055 Z M11.227,9.939 L16.406,11.696 C17.09,11.927 17.831,11.562 18.062,10.879 L18.062,10.879 C18.294,10.196 17.928,9.455 17.246,9.223 L12.066,7.466 L11.227,9.939 L11.227,9.939 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/diving-m.svg b/data/styles/clear/style-night/symbols/diving-m.svg
index 05639cb3dc..15ac660754 100644
--- a/data/styles/clear/style-night/symbols/diving-m.svg
+++ b/data/styles/clear/style-night/symbols/diving-m.svg
@@ -10,7 +10,7 @@
         <g id="diving-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M18.892,11.586 C18.828,12.366 18.142,12.947 17.361,12.882 C16.582,12.818 16.001,12.134 16.064,11.352 C16.128,10.573 16.814,9.993 17.595,10.056 C18.374,10.12 18.955,10.806 18.892,11.586 L18.892,11.586 Z M4.482,7.213 L6.353,10.96 L13.341,13.761 L15.427,15.969 L18.177,15.969 C18.618,15.969 18.976,15.699 18.976,15.366 C18.976,15.033 18.621,14.719 18.183,14.664 L15.82,14.369 L14.103,11.484 L7.787,9.24 L5.844,6.542 C5.586,6.184 5.097,6.027 4.75,6.195 C4.404,6.362 4.284,6.818 4.482,7.213 L4.482,7.213 Z M9.359,8.422 L13.502,9.828 C14.049,10.013 14.643,9.721 14.827,9.174 L14.827,9.174 C15.014,8.627 14.721,8.035 14.174,7.849 L10.03,6.444 L9.359,8.422 L9.359,8.422 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/dog_park-l.svg b/data/styles/clear/style-night/symbols/dog_park-l.svg
index 47d42d598a..b60e2a68b5 100644
--- a/data/styles/clear/style-night/symbols/dog_park-l.svg
+++ b/data/styles/clear/style-night/symbols/dog_park-l.svg
@@ -10,7 +10,7 @@
         <g id="dog_park-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.057,27 0,20.943 0,13.5 C0,6.057 6.057,0 13.5,0 C20.943,0 27,6.057 27,13.5 C27,20.943 20.943,27 13.5,27 L13.5,27 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M19.457,7.371 L19,6 L18,6 L18,7.668 C17.723,7.946 17.389,8.281 17.058,8.611 L19.732,11.004 L19.734,11 L21.368,11 C22.269,11 23.001,10.328 23.001,9.5 L23.001,9 L19.457,7.371 L19.457,7.371 Z M18.768,13.499 L18.916,13.114 L15.517,10.072 L8.73,10.879 L8.188,8 L7,8 L7,14 L6,20 L6.95,20 C7.474,20 8.062,19.582 8.262,19.067 L9.894,14.485 L16.474,16.547 L17.214,19.041 C17.371,19.57 17.945,20 18.498,20 L19,20 L18.45,14.32 L18.768,13.499 L18.768,13.499 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/dog_park-m.svg b/data/styles/clear/style-night/symbols/dog_park-m.svg
index 72bfa36f46..16ddb7f1bb 100644
--- a/data/styles/clear/style-night/symbols/dog_park-m.svg
+++ b/data/styles/clear/style-night/symbols/dog_park-m.svg
@@ -10,7 +10,7 @@
         <g id="dog_park-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M15.215,11.799 L15.334,11.491 L12.615,9.058 L7.419,9.692 L6.949,7 L6,7 L6,12.034 L5,17 L5.761,17 C6.18,17 6.651,16.666 6.811,16.254 L7.986,13.22 L13.367,14.194 L13.972,16.233 C14.098,16.657 14.557,17.001 14.999,17.001 L15.4,17.001 L14.961,12.457 L15.215,11.799 L15.215,11.799 Z M16.159,7.077 L15.8,6 L15,6 L15,6.729 C14.785,6.95 14.312,7.425 13.847,7.888 L15.987,9.803 L15.988,9.8 L17.296,9.8 C18.017,9.8 18.602,9.262 18.602,8.599 L18.602,8.2 L16.159,7.077 L16.159,7.077 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/doityourself-l.svg b/data/styles/clear/style-night/symbols/doityourself-l.svg
index 7455143a82..556f6435a2 100644
--- a/data/styles/clear/style-night/symbols/doityourself-l.svg
+++ b/data/styles/clear/style-night/symbols/doityourself-l.svg
@@ -10,7 +10,7 @@
         <g id="doityourself-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.057,27 0,20.943 0,13.5 C0,6.057 6.057,0 13.5,0 C20.943,0 27,6.057 27,13.5 C27,20.943 20.943,27 13.5,27 L13.5,27 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M19,8 L19,10 L8,10 L8,5 L16,5 C16,6.657 17.343,8 19,8 L19,8 Z M15,21.5 L15,12 L12,12 L12,21.5 C12,22.328 12.672,23 13.5,23 L13.5,23 C14.328,23 15,22.328 15,21.5 L15,21.5 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/doityourself-m.svg b/data/styles/clear/style-night/symbols/doityourself-m.svg
index 17911e8b3d..6acd8d7a08 100644
--- a/data/styles/clear/style-night/symbols/doityourself-m.svg
+++ b/data/styles/clear/style-night/symbols/doityourself-m.svg
@@ -10,7 +10,7 @@
         <g id="doityourself-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M15.801,7.4 L15.801,9 L7,9 L7,5 L13.4,5 C13.4,6.326 14.475,7.4 15.801,7.4 L15.801,7.4 Z M13,17.499 L13,10 L10,10 L10,17.499 C10,18.327 10.672,19 11.5,19 L11.5,19 C12.328,19 13,18.327 13,17.499 L13,17.499 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/drinking-water-l.svg b/data/styles/clear/style-night/symbols/drinking-water-l.svg
index 2464f88dba..bf402ebda0 100644
--- a/data/styles/clear/style-night/symbols/drinking-water-l.svg
+++ b/data/styles/clear/style-night/symbols/drinking-water-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="drinking-water-l-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#12314C" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
+            <circle id="Oval-1-Copy-38" fill="#0F2940" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
             <path d="M13.5,5 C12,7 7,13 7,16.5 C7,20 10.27126,23 13.5,23 C16.72874,23 20,20 20,16.5 C20,13 15,7 13.5,5 Z" id="path7962-4-3-5-3-9-copy-2" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-night/symbols/drinking-water-m.svg b/data/styles/clear/style-night/symbols/drinking-water-m.svg
index f3bf76b6c3..bf46303f35 100644
--- a/data/styles/clear/style-night/symbols/drinking-water-m.svg
+++ b/data/styles/clear/style-night/symbols/drinking-water-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="drinking-water-m-copy" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
-            <ellipse id="Oval-1-Copy-40" fill="#12314C" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+            <ellipse id="Oval-1-Copy-40" fill="#0F2940" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
             <path d="M11.5,18 C9.16814,18 7,16 7,13.5 C7,10.9722 10.41667,6.4444 11.5,5 C12.58334,6.4444 16,10.9722 16,13.5 C16,16 13.83187,18 11.5,18 L11.5,18 Z" id="path12622-2-4-copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-night/symbols/drinking-water-s.svg b/data/styles/clear/style-night/symbols/drinking-water-s.svg
index 23d44df125..08eaf299e2 100644
--- a/data/styles/clear/style-night/symbols/drinking-water-s.svg
+++ b/data/styles/clear/style-night/symbols/drinking-water-s.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="drinking-water-s-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-42" fill="#12314C" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
+            <circle id="Oval-1-Copy-42" fill="#0F2940" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
             <path d="M8.5,12 C7.34687857,12 6,11.3 6,9.55 C6,8.325 7.96428571,5.7 8.5,5 C9.03571429,5.7 11,8.325 11,9.55 C11,11.3 9.65312143,12 8.5,12 L8.5,12 Z" id="path4133-5-copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-night/symbols/electronics-l.svg b/data/styles/clear/style-night/symbols/electronics-l.svg
index df492ecf90..7dccf007b3 100644
--- a/data/styles/clear/style-night/symbols/electronics-l.svg
+++ b/data/styles/clear/style-night/symbols/electronics-l.svg
@@ -10,7 +10,7 @@
         <g id="electronics-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.057,27 0,20.943 0,13.5 C0,6.057 6.057,0 13.5,0 C20.943,0 27,6.057 27,13.5 C27,20.943 20.943,27 13.5,27 L13.5,27 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M8,16 L8,19 C8,20.104 8.672,21 9.5,21 L11,21 L11,14 L9.5,14 C8.672,14 8,14.896 8,16 L8,16 Z M17.5,14 L16,14 L16,21 L17.5,21 C18.328,21 19,20.104 19,19 L19,16 C19,14.896 18.328,14 17.5,14 L17.5,14 Z M13.5,4 C8.262,4 4,8.262 4,13.5 L5.023,18.217 L6,18 L6,13 L6.026,13 C6.285,9.098 9.533,6 13.5,6 C17.467,6 20.715,9.098 20.974,13 L21,13 L21,18 L21.977,18.217 L22.977,13.717 L23,13.5 C23,8.262 18.738,4 13.5,4 L13.5,4 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/electronics-m.svg b/data/styles/clear/style-night/symbols/electronics-m.svg
index cb0912e21b..dd25f664a7 100644
--- a/data/styles/clear/style-night/symbols/electronics-m.svg
+++ b/data/styles/clear/style-night/symbols/electronics-m.svg
@@ -10,7 +10,7 @@
         <g id="electronics-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M17,13.601 L17,16.4 C17,17.284 16.463,18.001 15.8,18.001 L14,18.001 L14,12.001 L15.8,12.001 C16.463,12.001 17,12.716 17,13.601 L17,13.601 Z M7.2,18 L9,18 L9,12 L7.2,12 C6.537,12 6,12.717 6,13.601 L6,16.4 C6,17.284 6.537,18 7.2,18 L7.2,18 Z M11.5,4 C7.31,4 4,7.409 4,11.601 L4,15 L5,15 L5,11.2 L5.021,11.2 C5.228,8.078 8.326,5.6 11.5,5.6 C14.674,5.6 17.771,8.078 17.979,11.2 L18,11.2 L18,15 L19,15 L18.982,11.773 L19,11.6 C19,7.409 15.691,4 11.5,4 L11.5,4 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/embassy-l.svg b/data/styles/clear/style-night/symbols/embassy-l.svg
index 1d78f25cb3..674a777c7a 100644
--- a/data/styles/clear/style-night/symbols/embassy-l.svg
+++ b/data/styles/clear/style-night/symbols/embassy-l.svg
@@ -10,7 +10,7 @@
         <g id="embassy-l-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
             <g id="Oval-1-Copy-38">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M12,5.16554271 L10,6.16554271 L8,7.16554271 L8,22.1655427 C8,22.6655427 8.5,23.1655427 9,23.1655427 C9.5,23.1655427 10,22.6655427 10,22.1655427 L10,13.1655427 C10,13.1655427 11.000008,12.6655427 12.00008,12.1655427 C14,11.1656427 16.211251,15.0598427 18.00012,14.1654427 C20.0002,13.1654427 21.00012,12.6655427 21.00012,12.6655427 L21.00012,5.66554271 C21.00012,5.66554271 20,6.16554271 18,7.16554271 C16.211131,8.05994271 14.00016,4.16554271 12,5.16554271 L12,5.16554271 Z" id="rect9498-4-copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/embassy-m.svg b/data/styles/clear/style-night/symbols/embassy-m.svg
index c35b36e30d..865633a0a8 100644
--- a/data/styles/clear/style-night/symbols/embassy-m.svg
+++ b/data/styles/clear/style-night/symbols/embassy-m.svg
@@ -10,7 +10,7 @@
         <g id="embassy-m-copy" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
             <g id="Oval-1-Copy-40">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M11,5 L8,6.5 L8,19 L9,19 L9,11 L11,10 L14.5,12 L17,11 L17,6 L14.5,7 L11,5 Z" id="rect9498-4-99-copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/embassy-s.svg b/data/styles/clear/style-night/symbols/embassy-s.svg
index 1a8f50c3c0..d78f04e4a6 100644
--- a/data/styles/clear/style-night/symbols/embassy-s.svg
+++ b/data/styles/clear/style-night/symbols/embassy-s.svg
@@ -10,7 +10,7 @@
         <g id="embassy-s-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
             <g id="Oval-1-Copy-42">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M8.5,4 L6,5 L6,13 L7,13 L7,8 L8.5,7.5 L11,9 L13,8 L13,4.5 L11,5.5 L8.5,4 Z" id="rect9498-4-99-4-copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/entrance-s.svg b/data/styles/clear/style-night/symbols/entrance-s.svg
index 1a2f3fad1b..d19d972020 100644
--- a/data/styles/clear/style-night/symbols/entrance-s.svg
+++ b/data/styles/clear/style-night/symbols/entrance-s.svg
@@ -3,11 +3,16 @@
     <!-- Generator: Sketch 3.4.2 (15857) - http://www.bohemiancoding.com/sketch -->
     <title>entrance-s</title>
     <desc>Created with Sketch.</desc>
-    <defs></defs>
+    <defs>
+        <circle id="path-1" cx="3.5" cy="3.5" r="2.5"></circle>
+    </defs>
     <g id="Other" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="entrance-s" sketch:type="MSLayerGroup">
             <circle id="Oval-369" sketch:type="MSShapeGroup" cx="3.5" cy="3.5" r="3.5"></circle>
-            <circle id="Oval-369-Copy" fill="#383833" sketch:type="MSShapeGroup" cx="3.5" cy="3.5" r="2.5"></circle>
+            <g id="Oval-369-Copy">
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="none" xlink:href="#path-1"></use>
+            </g>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/entrance-xs.svg b/data/styles/clear/style-night/symbols/entrance-xs.svg
index 8de576da04..360182931a 100644
--- a/data/styles/clear/style-night/symbols/entrance-xs.svg
+++ b/data/styles/clear/style-night/symbols/entrance-xs.svg
@@ -9,7 +9,7 @@
     <g id="Other" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="entrance-s-copy-2" sketch:type="MSLayerGroup">
             <g id="Oval-369-Copy">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
         </g>
diff --git a/data/styles/clear/style-night/symbols/equestrian-l.svg b/data/styles/clear/style-night/symbols/equestrian-l.svg
index f84b89d066..2c75e9b8b0 100644
--- a/data/styles/clear/style-night/symbols/equestrian-l.svg
+++ b/data/styles/clear/style-night/symbols/equestrian-l.svg
@@ -10,7 +10,7 @@
         <g id="equestrian-l" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-46" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" rx="13.5" ry="13.5"></ellipse>
             <g id="Oval-1-Copy-38">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <g id="icons2-01" transform="translate(6.000000, 7.000000)" fill="#FFFFFF" opacity="0.7" sketch:type="MSShapeGroup">
diff --git a/data/styles/clear/style-night/symbols/equestrian-m.svg b/data/styles/clear/style-night/symbols/equestrian-m.svg
index 3d34273749..f8cef7b06d 100644
--- a/data/styles/clear/style-night/symbols/equestrian-m.svg
+++ b/data/styles/clear/style-night/symbols/equestrian-m.svg
@@ -10,7 +10,7 @@
         <g id="equestrian-m" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-38" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="12.5" cy="12.5" r="12.5"></circle>
             <g id="Oval-1-Copy-47">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M17.7401761,15 L17,18 L17.9993304,18 C17.9993304,18 19.0056826,14.4541832 18.9998217,14.5 C18.9790688,13.9049206 18.2521674,14.0083414 18.016754,14.0067731 C17.677836,14.0045154 17,14 17,14 C17,14 15.8694676,10.3501363 15.8694676,10.2023234 C15.8694676,9.81801007 16.1800029,9.5039078 16.5633889,9.5039078 C16.7399966,9.5039078 16.8996795,9.57116264 17.0233049,9.67832694 L17.666296,10.6459883 C17.7884497,10.8580997 18.0187756,11 18.2829514,11 C18.6781112,11 19.0033638,10.6762899 19.0033638,10.2764562 L18.9996844,7.79172248 C18.9783443,7.79172248 18.9319848,7.7872881 18.9319848,7.7872881 C18.700923,7.75476927 18.5221077,7.55448289 18.5221077,7.31428703 C18.5221077,7.21229618 18.5508064,7.1191741 18.6037888,7.04231142 L19.6398875,6.60921983 L16,6 C13.94937,6.08764279 13.043726,7.73901797 13.043726,9.88452122 C13.043726,9.96463477 13,11 13,11 L7.03614238,11 C6.68612143,11 6.37488359,11.0149269 6.12728691,11.1350632 C5.87969023,11.2551994 5.83493556,11.6602577 5.75240334,12 C5.50160223,12.9935911 5,15 5,15 L6,15 L7,12 L7,15 L5.99999997,16.0006247 L7.0602796,20 L8,20 L7.27001953,16.9733391 L8,16.0006247 L9,20 L10.0772519,20 L8.94777015,16.0006247 L14.916664,16.0006247 L15,20 L16,20 L16.0863236,15 L17.7401761,15 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/fastfood-l.svg b/data/styles/clear/style-night/symbols/fastfood-l.svg
index 1e86e67daf..dcbad5cae0 100644
--- a/data/styles/clear/style-night/symbols/fastfood-l.svg
+++ b/data/styles/clear/style-night/symbols/fastfood-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="fastfood-l-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#4C3A1E" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
+            <circle id="Oval-1-Copy-38" fill="#403119" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
             <g id="g16674-copy" transform="translate(4.000000, 7.000000)" fill="#FFFFFF" opacity="0.7" sketch:type="MSShapeGroup">
                 <path d="M8,0 C5,0 1,1.5 1,4 L1,6 L18,6 L18,4 C17.99998,1.5 14,0 11,0 L8,0 Z M7.5,1 C7.777,1 8,1.223 8,1.5 C8,1.777 7.777,2 7.5,2 C7.223,2 7,1.777 7,1.5 C7,1.223 7.223,1 7.5,1 L7.5,1 Z M11.5,1 C11.777,1 12,1.223 12,1.5 C12,1.777 11.777,2 11.5,2 C11.223,2 11,1.777 11,1.5 C11,1.223 11.223,1 11.5,1 L11.5,1 Z M5.5,3 C5.777,3 6,3.223 6,3.5 C6,3.777 5.777,4 5.5,4 C5.223,4 5,3.777 5,3.5 C5,3.223 5.223,3 5.5,3 L5.5,3 Z M9.5,3 C9.777,3 10,3.223 10,3.5 C10,3.777 9.777,4 9.5,4 C9.223,4 9,3.777 9,3.5 C9,3.223 9.223,3 9.5,3 L9.5,3 Z M13.5,3 C13.777,3 14,3.223 14,3.5 C14,3.777 13.777,4 13.5,4 C13.223,4 13,3.777 13,3.5 C13,3.223 13.223,3 13.5,3 L13.5,3 Z M1,7 C0.49997,7 -9.99999997e-06,7.5 0,8 C9.99999997e-06,8.5 0.49997,9 1,9 L18,9 C18.50001,9 18.99999,8.5 19,8 C19,7.5 18.5,7 18,7 L1,7 Z M1,10 L1,11 C1,12 2,13 3,13 L16,13 C17,13 18,12 18,11 L18,10 L1,10 Z" id="rect13326-2-5-2-3"></path>
             </g>
diff --git a/data/styles/clear/style-night/symbols/fastfood-m.svg b/data/styles/clear/style-night/symbols/fastfood-m.svg
index 7121034e33..5dca810bcb 100644
--- a/data/styles/clear/style-night/symbols/fastfood-m.svg
+++ b/data/styles/clear/style-night/symbols/fastfood-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="fastfood-m-copy" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
-            <ellipse id="Oval-1-Copy-40" fill="#4C3A1E" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+            <ellipse id="Oval-1-Copy-40" fill="#403119" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
             <path d="M11,7 C8.94737,7 5.5,7.7895 5.5,9.5 L5.5,11 L17.5,11 L17.5,9.5 C17.5,7.7895 14.05263,7 12,7 L11,7 Z M9,8.125 C9.20711,8.125 9.375,8.2929 9.375,8.5 C9.375,8.7071 9.20711,8.875 9,8.875 C8.79289,8.875 8.625,8.7071 8.625,8.5 C8.625,8.2929 8.79289,8.125 9,8.125 L9,8.125 Z M14,8.125 C14.20711,8.125 14.375,8.2929 14.375,8.5 C14.375,8.7071 14.20711,8.875 14,8.875 C13.79289,8.875 13.625,8.7071 13.625,8.5 C13.625,8.2929 13.79289,8.125 14,8.125 L14,8.125 Z M7,9.125 C7.20711,9.125 7.375,9.2929 7.375,9.5 C7.375,9.7071 7.20711,9.875 7,9.875 C6.79289,9.875 6.625,9.7071 6.625,9.5 C6.625,9.2929 6.79289,9.125 7,9.125 L7,9.125 Z M11.375,9.125 C11.58211,9.125 11.75,9.2929 11.75,9.5 C11.75,9.7071 11.58211,9.875 11.375,9.875 C11.16789,9.875 11,9.7071 11,9.5 C11,9.2929 11.16789,9.125 11.375,9.125 L11.375,9.125 Z M16,9.125 C16.20711,9.125 16.375,9.2929 16.375,9.5 C16.375,9.7071 16.20711,9.875 16,9.875 C15.79289,9.875 15.625,9.7071 15.625,9.5 C15.625,9.2929 15.79289,9.125 16,9.125 L16,9.125 Z M5.5,12 C5.15787,12 4.99999,12.1579 5,12.5 C5.00001,12.8422 5.15787,13 5.5,13 L17.5,13 C17.84211,13 17.99999,12.8422 18,12.5 C18.00001,12.1579 17.84211,12 17.5,12 L6.5,12 L5.5,12 Z M5.5,14.625 C5.5,15.3092 6.19079,16 6.875,16 L16.125,16 C16.80921,16 17.5,15.3092 17.5,14.625 L17.5,14 L5.5,14 L5.5,14.625 Z" id="rect13326-2-5-2-3-6-copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-night/symbols/fastfood-s.svg b/data/styles/clear/style-night/symbols/fastfood-s.svg
index 5654925ed5..49f1debbb7 100644
--- a/data/styles/clear/style-night/symbols/fastfood-s.svg
+++ b/data/styles/clear/style-night/symbols/fastfood-s.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="fastfood-s-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-42" fill="#4C3A1E" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
+            <circle id="Oval-1-Copy-42" fill="#403119" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
             <path d="M8.05044132,5 C6.62939132,5 4.3512,5.8723 4.44736,7.0526 L4.44736,8.25 L12.5,8.25 L12.5,7.0526 C12.5,5.8684 10.4050722,5 8.98402216,5 L8.05044132,5 Z M4,9 L4,10 L13,10 L13,9 L4,9 Z M4.49996,10.75 C4.49996,11.2237 5.02628,12 5.49996,12 L11.49996,12 C11.97364,12 12.49996,11.2237 12.49996,10.75 L4.49996,10.75 Z" id="rect13326-2-5-2-3-1-copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-night/symbols/fire_station-l.svg b/data/styles/clear/style-night/symbols/fire_station-l.svg
index b327145e54..94435ddcc7 100644
--- a/data/styles/clear/style-night/symbols/fire_station-l.svg
+++ b/data/styles/clear/style-night/symbols/fire_station-l.svg
@@ -10,7 +10,7 @@
         <g id="fire_station-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.056,27 0,20.943 0,13.5 C0,6.057 6.056,0 13.5,0 C20.944,0 27,6.057 27,13.5 C27,20.943 20.944,27 13.5,27 L13.5,27 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M13.5,5 L6,6.89473684 L6,13.2013684 C6,18.482 8.982,20.2914737 13.5,23 C18.018,20.2924211 21,18.482 21,13.2013684 L21,6.89473684 L13.5,5 L13.5,5 Z M13.441,19.1053684 C13.441,19.1053684 5.972,14.1638947 13.382,7.90557895 C10.418,13.0062105 14.612,16.4404211 15.134,10.9513684 C19.912,16.3456842 13.441,19.1053684 13.441,19.1053684 L13.441,19.1053684 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/fire_station-m.svg b/data/styles/clear/style-night/symbols/fire_station-m.svg
index 6c0bc23bc4..4cca6e0479 100644
--- a/data/styles/clear/style-night/symbols/fire_station-m.svg
+++ b/data/styles/clear/style-night/symbols/fire_station-m.svg
@@ -10,7 +10,7 @@
         <g id="fire_station-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M5,6.4728 L5,11.3793333 C5,15.486 7.585,16.8934667 11.5,19 C15.415,16.8934667 18,15.486 18,11.3793333 L18,6.4728 L11.5,4 L5,6.4728 Z M11.3957358,6 C8.82978238,9.96666667 12.4608863,12.6378667 12.9135252,8.3688 C17.0522243,12.5641333 11.4466952,14.7108 11.4466952,14.7108 C11.4466952,14.7108 4.97885384,10.8682667 11.3957358,6 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/florist-l.svg b/data/styles/clear/style-night/symbols/florist-l.svg
index 9b6cadf839..052f5c403b 100644
--- a/data/styles/clear/style-night/symbols/florist-l.svg
+++ b/data/styles/clear/style-night/symbols/florist-l.svg
@@ -10,7 +10,7 @@
         <g id="florist-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.057,27 0,20.943 0,13.5 C0,6.057 6.057,0 13.5,0 C20.943,0 27,6.057 27,13.5 C27,20.943 20.943,27 13.5,27 L13.5,27 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M15.433,18.433 C14.22,19.646 13.779,21.334 14.104,22.898 C15.665,23.222 17.355,22.781 18.568,21.568 C19.781,20.355 20.222,18.666 19.897,17.103 C18.336,16.778 16.646,17.22 15.433,18.433 L15.433,18.433 Z M7.104,17.103 C6.779,18.665 7.22,20.355 8.433,21.568 C9.646,22.781 11.336,23.222 12.897,22.898 C13.222,21.335 12.781,19.646 11.568,18.433 C10.355,17.22 8.664,16.778 7.104,17.103 L7.104,17.103 Z M14.92,14.494 C14.92,14.202 14.876,13.923 14.812,13.65 C14.958,13.886 15.124,14.114 15.33,14.32 C15.9,14.891 16.61,15.233 17.35,15.352 C17.915,15.442 18.454,14.904 18.363,14.339 C18.245,13.6 17.901,12.89 17.331,12.319 C17.125,12.112 16.895,11.946 16.658,11.799 C16.929,11.861 17.207,11.906 17.497,11.906 C18.303,11.907 19.048,11.646 19.654,11.208 C20.118,10.872 20.118,10.109 19.654,9.776 C19.048,9.336 18.302,9.078 17.496,9.078 C17.204,9.078 16.925,9.122 16.653,9.185 C16.888,9.039 17.117,8.873 17.322,8.668 C17.893,8.098 18.235,7.388 18.354,6.648 C18.443,6.083 17.906,5.544 17.34,5.636 C16.601,5.753 15.891,6.098 15.32,6.667 C15.113,6.874 14.947,7.104 14.799,7.342 C14.863,7.071 14.907,6.792 14.907,6.502 C14.907,5.694 14.647,4.95 14.208,4.345 C13.873,3.881 13.112,3.881 12.777,4.345 C12.338,4.95 12.079,5.695 12.079,6.502 C12.079,6.793 12.124,7.073 12.187,7.346 C12.041,7.11 11.875,6.882 11.67,6.677 C11.1,6.106 10.39,5.764 9.65,5.645 C9.085,5.555 8.547,6.093 8.636,6.657 C8.755,7.397 9.097,8.107 9.669,8.677 C9.875,8.884 10.105,9.051 10.343,9.198 C10.072,9.134 9.793,9.09 9.503,9.09 C8.695,9.09 7.952,9.351 7.346,9.789 C6.882,10.124 6.882,10.885 7.346,11.219 C7.952,11.66 8.696,11.919 9.503,11.919 C9.795,11.919 10.074,11.874 10.346,11.811 C10.111,11.957 9.883,12.122 9.678,12.327 C9.107,12.898 8.764,13.608 8.646,14.348 C8.557,14.913 9.093,15.451 9.659,15.36 C10.398,15.243 11.109,14.899 11.679,14.329 C11.886,14.123 12.053,13.893 12.2,13.655 C12.137,13.926 12.093,14.204 12.093,14.494 C12.092,15.302 12.353,16.046 12.792,16.651 C13.127,17.115 13.888,17.115 14.222,16.651 C14.662,16.047 14.92,15.302 14.92,14.494 L14.92,14.494 Z M13.5,13 C12.119,13 11,11.881 11,10.5 C11,9.119 12.119,8 13.5,8 C14.881,8 16,9.119 16,10.5 C16,11.881 14.881,13 13.5,13 L13.5,13 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/florist-m.svg b/data/styles/clear/style-night/symbols/florist-m.svg
index d4e9a4d8af..212b45b00b 100644
--- a/data/styles/clear/style-night/symbols/florist-m.svg
+++ b/data/styles/clear/style-night/symbols/florist-m.svg
@@ -10,7 +10,7 @@
         <g id="florist-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M13.194,15.193 C12.183,16.205 11.815,17.613 12.086,18.915 C13.387,19.186 14.796,18.817 15.808,17.807 C16.818,16.796 17.185,15.388 16.914,14.086 C15.614,13.816 14.205,14.184 13.194,15.193 L13.194,15.193 Z M6.086,14.086 C5.815,15.388 6.184,16.796 7.193,17.807 C8.204,18.818 9.614,19.186 10.914,18.915 C11.185,17.613 10.816,16.205 9.807,15.193 C8.796,14.184 7.386,13.816 6.086,14.086 L6.086,14.086 Z M12.702,12.88 C12.702,12.633 12.665,12.397 12.609,12.166 C12.733,12.365 12.874,12.559 13.047,12.732 C13.53,13.215 14.132,13.505 14.757,13.606 C15.235,13.681 15.691,13.226 15.613,12.749 C15.513,12.123 15.222,11.522 14.74,11.041 C14.565,10.865 14.371,10.725 14.171,10.601 C14.4,10.654 14.636,10.692 14.881,10.692 C15.563,10.692 16.193,10.472 16.706,10.102 C17.098,9.817 17.098,9.172 16.706,8.89 C16.193,8.517 15.562,8.299 14.88,8.299 C14.633,8.299 14.397,8.336 14.167,8.39 C14.365,8.266 14.56,8.126 14.732,7.953 C15.215,7.47 15.505,6.869 15.606,6.244 C15.68,5.765 15.226,5.31 14.748,5.387 C14.123,5.487 13.522,5.779 13.039,6.261 C12.864,6.436 12.724,6.63 12.599,6.831 C12.654,6.602 12.692,6.366 12.692,6.12 C12.692,5.436 12.471,4.808 12.099,4.295 C11.817,3.902 11.172,3.902 10.889,4.295 C10.517,4.808 10.298,5.437 10.298,6.12 C10.298,6.366 10.336,6.603 10.39,6.835 C10.266,6.635 10.126,6.442 9.953,6.27 C9.47,5.787 8.869,5.497 8.244,5.396 C7.765,5.319 7.31,5.775 7.386,6.25 C7.487,6.877 7.776,7.478 8.261,7.96 C8.435,8.135 8.629,8.277 8.831,8.401 C8.601,8.347 8.365,8.31 8.12,8.31 C7.436,8.31 6.808,8.53 6.294,8.9 C5.902,9.183 5.902,9.828 6.294,10.111 C6.808,10.484 7.437,10.703 8.12,10.703 C8.366,10.703 8.603,10.665 8.833,10.611 C8.634,10.735 8.44,10.874 8.268,11.047 C7.785,11.53 7.495,12.132 7.395,12.758 C7.32,13.237 7.774,13.691 8.251,13.613 C8.877,13.513 9.478,13.223 9.96,12.741 C10.135,12.566 10.277,12.372 10.401,12.171 C10.347,12.4 10.31,12.636 10.31,12.881 C10.308,13.564 10.529,14.193 10.901,14.705 C11.183,15.098 11.828,15.098 12.111,14.705 C12.483,14.193 12.702,13.563 12.702,12.88 L12.702,12.88 Z M11.5,11.1 C10.616,11.1 9.9,10.385 9.9,9.5 C9.9,8.616 10.616,7.9 11.5,7.9 C12.385,7.9 13.1,8.616 13.1,9.5 C13.1,10.385 12.385,11.1 11.5,11.1 L11.5,11.1 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/fountain-l.svg b/data/styles/clear/style-night/symbols/fountain-l.svg
index 80ce425c93..0662d876a6 100644
--- a/data/styles/clear/style-night/symbols/fountain-l.svg
+++ b/data/styles/clear/style-night/symbols/fountain-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="fountain-l" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#12314C" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
+            <circle id="Oval-1-Copy-38" fill="#0F2940" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
             <path d="M13.2069489,11.9381747 L7.06942208,11.9381747 C7.06942187,14.8998487 9.63479656,17.5310648 13.0280788,17.7875843 L9.02118359,20.981 L18.0066582,20.981 L14.0089146,17.794878 C17.4513122,17.5862935 20.075285,14.9309517 20.075285,11.9381747 L13.8240729,11.9381747 L13.8240729,11.4872581 L14.4071886,9.16986002 C14.5906963,8.21260375 15.4189609,7.6068177 16.2497054,7.8211288 C16.9713371,8.00400761 17.4549047,8.73838033 17.4549047,9.55562 L17.6040647,9.55562015 L17.4549047,9.55562 L17.4549047,9.97556423 L20.0442215,9.97556438 L20.0442215,9.02984358 C20.0442215,6.89816247 18.4730616,4.9898692 16.6255852,4.9898692 C15.2681696,4.9898692 14.0599217,6.0200488 13.5144344,7.4120991 C12.9715913,6.02218898 11.7763987,4.9898692 10.4233794,4.9898692 C8.57342316,4.9898692 7.02268589,6.9145738 7.02268589,9.04625492 L7.02268589,9.97432002 L9.57363728,9.97432002 L9.57363725,9.56917401 C9.57363725,8.75479182 10.0596847,8.01756162 10.7813165,7.83754029 C11.6120609,7.62322919 12.4403255,8.22901524 12.6238332,9.18627151 L13.2069489,11.5036696 L13.2069489,11.9381747 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-night/symbols/fountain-m.svg b/data/styles/clear/style-night/symbols/fountain-m.svg
index 07841dc29b..34724bb6d6 100644
--- a/data/styles/clear/style-night/symbols/fountain-m.svg
+++ b/data/styles/clear/style-night/symbols/fountain-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="fountain-m" sketch:type="MSLayerGroup" transform="translate(0.000000, -0.019000)">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
-            <ellipse id="Oval-1-Copy-40" fill="#12314C" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+            <ellipse id="Oval-1-Copy-40" fill="#0F2940" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
             <path d="M11.1316441,15.5508237 C8.24183572,15.4086379 5.94170881,13.4894614 5.94170898,10.9897551 L11.4564534,10.9897551 L10.5688771,7.92856109 C10.4205105,7.25690108 9.75085539,6.83185056 9.07919538,6.98222221 C8.4957534,7.11053935 8.10478712,7.62581285 8.10478712,8.19923005 L7.98419069,8.19923016 L8.10478712,8.19923005 L8.10478719,9.04531044 L6.01131478,9.04531054 L6.01131471,7.83031839 C6.01131471,6.33462176 7.28160343,4.99566549 8.7752951,4.99566549 C10.2642654,4.99566549 11.5312427,6.32617042 11.5392374,7.81613977 C11.5471408,6.32609794 12.799703,4.98415035 14.2886734,4.98415035 C15.78437,4.98415035 17.038147,6.33462166 17.038147,7.83031828 L17.038147,9.03070778 L14.9756931,9.03070778 L14.9756932,8.1972251 C14.9756932,7.62581285 14.5827219,7.10853439 13.9992799,6.98222221 C13.3276199,6.83185056 12.6579649,7.25690108 12.5095982,7.92856109 L11.6220219,10.9897551 L16.9709677,10.9897551 C16.9709677,13.4551243 14.7664478,15.355803 11.9394199,15.5439615 L15.0055485,18.0181528 L8.07401961,18.0181528 L11.1316441,15.5508237 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-night/symbols/fountain-s.svg b/data/styles/clear/style-night/symbols/fountain-s.svg
index 60ab2f17a8..70c66fc0b5 100644
--- a/data/styles/clear/style-night/symbols/fountain-s.svg
+++ b/data/styles/clear/style-night/symbols/fountain-s.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="fountain-s" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-42" fill="#12314C" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
+            <circle id="Oval-1-Copy-42" fill="#0F2940" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
             <path d="M8.15815787,11.5819215 C6.23298,11.4299033 5.00457575,9.92816918 5.00457587,7.981 L8.34126545,7.981 L7.85537648,6.30213386 C7.75266108,5.83628769 7.27232388,4.87629277 6.7660499,4.9910794 C6.31907564,5.0924211 6.02476126,6.09215544 6.02476126,6.48986291 L6.02476124,6.99090774 L5.00490908,6.99090774 L5.0049091,6.23399516 C5.0049091,5.42845436 5.35141839,4.50649376 6.02615808,4.13464126 C6.22034933,4.02762147 6.44172784,3.96616704 6.68985788,3.96616704 C7.64776009,3.96616704 8.50775808,4.95227206 8.50775808,5.98964889 L8.52283517,7.981 L8.52713835,7.981 L8.52713835,6.23399516 C8.52713835,5.64798339 8.80456806,5.00761305 9.2323988,4.56130008 C9.56192775,4.21753551 9.98068323,3.98889692 10.43062,3.98889692 C11.4661023,3.98889692 12.0149155,5.10344634 12.0149155,6.14082317 L12.0149155,6.97338254 L11.0085353,6.97338254 L11.0085353,6.39530033 C11.0085353,5.99898344 10.8308225,5.10554702 10.43062,4.99239547 C9.77911381,4.80819137 9.30166799,5.83628769 9.19895259,6.30213386 L8.71306362,7.981 L12.0171114,7.981 C12.0171114,9.91848393 10.7503288,11.414953 8.83818848,11.579553 L11,12.981 L6,12.981 L8.15815787,11.5819215 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-night/symbols/fuel-l.svg b/data/styles/clear/style-night/symbols/fuel-l.svg
index e5908013e0..ea904fcc19 100644
--- a/data/styles/clear/style-night/symbols/fuel-l.svg
+++ b/data/styles/clear/style-night/symbols/fuel-l.svg
@@ -10,7 +10,7 @@
         <g id="fuel-l" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
             <g id="Oval-1-Copy-38">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M8,4.5 C7.4459904,4.5 7,4.946 7,5.5 L7,21.5 C7,22 7.5,22.5 8,22.5 L17,22.5 C17.5,22.5 18,22 18,21.5 L18,16.5 L18.5,16.5 C19,16.5 19,17 19,17 L19,19 C19,20 19.5,20.5 20.5,20.5 C21.5,20.5 22,20 22,19 L22,13.5 C22,12.5 20,11.5 20,10.5 L20,7.5 L19,7.5 L18,6.5 L18,5.5 C18,4.946 17.55401,4.5 17,4.5 L8,4.5 Z M9,6.5 L16,6.5 L16,10.5 L9,10.5 L9,6.5 Z M18,9.5 L19,9.5 L19,11 C19,12 21,13 21,14 L21,19 C21,19.5 20.5,19.5 20.5,19.5 C20.5,19.5 20,19.5 20,19 L20,16.5 C20,16 19.5,15.5 19,15.5 L18,15.5 L18,9.5 Z" id="rect7223-2-4-9-copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/fuel-m.svg b/data/styles/clear/style-night/symbols/fuel-m.svg
index d8eeb83dfd..391526d43b 100644
--- a/data/styles/clear/style-night/symbols/fuel-m.svg
+++ b/data/styles/clear/style-night/symbols/fuel-m.svg
@@ -10,7 +10,7 @@
         <g id="fuel-m" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
             <g id="Oval-1-Copy-40">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M8,5 C7.5,5 7,5.5 7,6 L7,17 C7,17.5 7.5,18 8,18 L14,18 C14.5,18 15,17.5 15,17 L15,14 L15.25,14 C15.38687,14 15.5,14.096 15.5,14.25 L15.5,15 C15.5,15.5 16,16 16.5,16 L17,16 C17.5,16 18,15.5928 18,15 L18,11.5 C18,10.5 17,10.5 17,9.5002 L17,8.0002 L16,8.0002 L15,7 L15,6.0002 C15,5.5002 14.5,5.0002 14,5.0002 L8,5 Z M8,6.5 L14,6.5 L14,9 L8,9 L8,6.5 Z M15,10 L16,10 C16,11 17,11 17,12 L17,14.75 C17,15 16.75002,15 16.75002,15 C16.75002,15 16.5,15 16.50002,14.75 L16.50002,14 C16.50002,13.4094 16.00064,12.9986 15.50002,13 L14.99993,12.9998 L15,10 Z" id="rect7223-2-4-9-4-2-3-copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/fuel-s.svg b/data/styles/clear/style-night/symbols/fuel-s.svg
index 5c7c989d91..d2f63b4fbc 100644
--- a/data/styles/clear/style-night/symbols/fuel-s.svg
+++ b/data/styles/clear/style-night/symbols/fuel-s.svg
@@ -10,7 +10,7 @@
         <g id="fuel-s" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
             <g id="Oval-1-Copy-42">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M5.5,4 C5.22299,4 5,4.223 5,4.5 L5,12.5 C5,12.75 5.25,13 5.5,13 L9.5,13 C9.75,13 10,12.75 10,12.5 L10,12 L11.25,12 C11.75,12 12,11.75 12,11.25 L12,8.5 C12,8 11,7.5 11,7 L11,6.75 L11,6 L10,5 L10,4.5 C10,4.223 9.777,4 9.5,4 L5.5,4 L5.5,4 Z M6,5 L9,5 L9,7 L6,7 L6,5 L6,5 Z M10,6.5 L10.5,6.5 L10.5,7.25 C10.5,7.75 11.5,8.25 11.5,8.75 L11.5,11 L11.5,11.25 C11.5,11.5 11.25,11.5 11.25,11.5 L10.5,11.5 L10.5,10 L10,10 L10,6.5 L10,6.5 Z" id="rect7223-2-4-9-3-copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/funicular-l.svg b/data/styles/clear/style-night/symbols/funicular-l.svg
index 5ce4890255..7c54eccc8b 100644
--- a/data/styles/clear/style-night/symbols/funicular-l.svg
+++ b/data/styles/clear/style-night/symbols/funicular-l.svg
@@ -7,7 +7,7 @@
     <g id="Transport" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="funicular-l" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
-            <path d="M13.5,26 C20.4035594,26 26,20.4035594 26,13.5 C26,6.59644063 20.4035594,1 13.5,1 C6.59644063,1 1,6.59644063 1,13.5 C1,20.4035594 6.59644063,26 13.5,26 Z" id="Oval-1-Copy-38" fill="#12314C" sketch:type="MSShapeGroup"></path>
+            <path d="M13.5,26 C20.4035594,26 26,20.4035594 26,13.5 C26,6.59644063 20.4035594,1 13.5,1 C6.59644063,1 1,6.59644063 1,13.5 C1,20.4035594 6.59644063,26 13.5,26 Z" id="Oval-1-Copy-38" fill="#0F2940" sketch:type="MSShapeGroup"></path>
             <path d="M5,10.9953976 C5,10.4456547 5.43731068,9.89710337 5.9750526,9.77057586 L21.0249474,6.22942414 C21.5634541,6.10271669 22,6.4556644 22,6.99539757 L22,15.0046024 C22,15.5543453 21.5626893,16.1028966 21.0249474,16.2294241 L5.9750526,19.7705759 C5.43654592,19.8972833 5,19.5443356 5,19.0046024 L5,10.9953976 Z M7,12.1904785 C7,11.9195947 7.2157526,11.6496577 7.49538898,11.5844092 L9.50461102,11.1155908 C9.7782068,11.0517517 10,11.2150574 10,11.4904785 L10,14.5095215 C10,14.7804053 9.7842474,15.0503423 9.50461102,15.1155908 L7.49538898,15.5844092 C7.2217932,15.6482482 7,15.4849426 7,15.2095215 L7,12.1904785 Z M17,9.19047851 C17,8.91959471 17.2157526,8.64965772 17.495389,8.58440923 L19.504611,8.11559076 C19.7782068,8.05175175 20,8.21505737 20,8.49047852 L20,11.5095215 C20,11.7804053 19.7842474,12.0503423 19.504611,12.1155908 L17.495389,12.5844092 C17.2217932,12.6482482 17,12.4849426 17,12.2095215 L17,9.19047851 Z M12,10.6904785 C12,10.4195947 12.2157526,10.1496577 12.495389,10.0844092 L14.504611,9.61559076 C14.7782068,9.55175175 15,9.71505737 15,9.99047852 L15,13.0095215 C15,13.2804053 14.7842474,13.5503423 14.504611,13.6155908 L12.495389,14.0844092 C12.2217932,14.1482482 12,13.9849426 12,13.7095215 L12,10.6904785 Z" id="Rectangle-41" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-night/symbols/funicular-m.svg b/data/styles/clear/style-night/symbols/funicular-m.svg
index 37330349cf..6d304e5dd7 100644
--- a/data/styles/clear/style-night/symbols/funicular-m.svg
+++ b/data/styles/clear/style-night/symbols/funicular-m.svg
@@ -7,7 +7,7 @@
     <g id="Transport" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="funicular-m" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" r="11.5"></circle>
-            <circle id="Oval-1-Copy-40" fill="#12314C" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" r="10.5"></circle>
+            <circle id="Oval-1-Copy-40" fill="#0F2940" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" r="10.5"></circle>
             <path d="M4,9.21764909 C4,8.6679062 4.43274403,8.12416288 4.98419189,7.99916803 L18.0158081,5.04533502 C18.5593623,4.9221294 19,5.27791592 19,5.81764909 L19,13.826854 C19,14.3765968 18.567256,14.9203402 18.0158081,15.045335 L4.98419189,17.999168 C4.44063772,18.1223736 4,17.7665871 4,17.226854 L4,9.21764909 Z M5.7,9.91273003 C5.7,9.64184623 5.9157526,9.37190924 6.19538898,9.30666075 L8.20461102,8.83784228 C8.4782068,8.77400327 8.7,8.93730889 8.7,9.21273004 L8.7,12.231773 C8.7,12.5026568 8.4842474,12.7725938 8.20461102,12.8378423 L6.19538898,13.3066608 C5.9217932,13.3704998 5.7,13.2071941 5.7,12.931773 L5.7,9.91273003 Z M14.6,7.71273003 C14.6,7.44184623 14.8157526,7.17190924 15.095389,7.10666075 L17.104611,6.63784228 C17.3782068,6.57400327 17.6,6.73730889 17.6,7.01273004 L17.6,10.031773 C17.6,10.3026568 17.3842474,10.5725938 17.104611,10.6378423 L15.095389,11.1066608 C14.8217932,11.1704998 14.6,11.0071941 14.6,10.731773 L14.6,7.71273003 Z M10.2,8.91273003 C10.2,8.64184623 10.4197113,8.36732369 10.6877228,8.30032082 L12.5122772,7.84418221 C12.7816391,7.77684175 13,7.93730889 13,8.21273004 L13,11.231773 C13,11.5026568 12.7802887,11.7771793 12.5122772,11.8441822 L10.6877228,12.3003208 C10.4183609,12.3676613 10.2,12.2071941 10.2,11.931773 L10.2,8.91273003 Z" id="Rectangle-41-Copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-night/symbols/funicular-s.svg b/data/styles/clear/style-night/symbols/funicular-s.svg
index cf1bd92a22..7baaed84bc 100644
--- a/data/styles/clear/style-night/symbols/funicular-s.svg
+++ b/data/styles/clear/style-night/symbols/funicular-s.svg
@@ -7,7 +7,7 @@
     <g id="Transport" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="funicular-s" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
-            <path d="M8.5,16 C12.6421356,16 16,12.6421356 16,8.5 C16,4.35786438 12.6421356,1 8.5,1 C4.35786438,1 1,4.35786438 1,8.5 C1,12.6421356 4.35786438,16 8.5,16 Z" id="Oval-1-Copy-42" fill="#12314C" sketch:type="MSShapeGroup"></path>
+            <path d="M8.5,16 C12.6421356,16 16,12.6421356 16,8.5 C16,4.35786438 12.6421356,1 8.5,1 C4.35786438,1 1,4.35786438 1,8.5 C1,12.6421356 4.35786438,16 8.5,16 Z" id="Oval-1-Copy-42" fill="#0F2940" sketch:type="MSShapeGroup"></path>
             <path d="M3,7.99077797 C3,7.44358641 3.4296875,6.85820312 3.95884204,6.68358213 L12.041158,4.01641787 C12.5707118,3.8416651 13,4.15097518 13,4.69077796 L13,8.70922203 C13,9.25641359 12.5703125,9.84179687 12.041158,10.0164179 L3.95884204,12.6835821 C3.4292882,12.8583349 3,12.5490248 3,12.009222 L3,7.99077797 Z M4,8 L6,7.3 L6,9.3 L4,10 L4,8 Z M7,6.89999998 L9,6.19999999 L9,8.19999999 L7,8.89999998 L7,6.89999998 Z M10,5.99999998 L12,5.29999999 L12,7.29999999 L10,7.99999998 L10,5.99999998 Z" id="Rectangle-49" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-night/symbols/furniture-l.svg b/data/styles/clear/style-night/symbols/furniture-l.svg
index 25fbb3c680..898ba563d0 100644
--- a/data/styles/clear/style-night/symbols/furniture-l.svg
+++ b/data/styles/clear/style-night/symbols/furniture-l.svg
@@ -10,7 +10,7 @@
         <g id="furniture-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.057,27 0,20.943 0,13.5 C0,6.057 6.057,0 13.5,0 C20.943,0 27,6.057 27,13.5 C27,20.943 20.943,27 13.5,27 L13.5,27 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M22,15.16 C22,16.264 21.104,17.159 20,17.159 L20,22 L18,22 L18,20 L9,20 L9,22 L7,22 L7,17.159 C5.896,17.159 5,16.263 5,15.16 C5,14.055 5.896,13.159 7,13.159 C8.104,13.159 9,14.055 9,15.16 L9,16 L11,16 L11,15.16 C11,13.302 9.721,11.748 8,11.301 L8,6.529 C9.605,5.559 11.488,5.001 13.501,5.001 C15.513,5.001 17.395,5.56 19,6.529 L19,11.301 C17.279,11.748 16,13.302 16,15.16 L16,16 L18,16 L18,15.16 C18,14.055 18.896,13.159 20,13.159 C21.104,13.159 22,14.055 22,15.16 L22,15.16 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/furniture-m.svg b/data/styles/clear/style-night/symbols/furniture-m.svg
index f32178f944..3e9ba37287 100644
--- a/data/styles/clear/style-night/symbols/furniture-m.svg
+++ b/data/styles/clear/style-night/symbols/furniture-m.svg
@@ -10,7 +10,7 @@
         <g id="furniture-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M18,11.9333333 C18,12.5418667 17.581,13.0542667 17,13.2474667 L17,18 L15,18 L15,16.1333333 L8,16.1333333 L8,18 L6,18 L6,13.2474667 C5.419,13.0542667 5,12.5418667 5,11.9333333 C5,11.1605333 5.672,10.5333333 6.5,10.5333333 C7.327,10.5333333 7.999,11.1596 8,11.9314667 L8,13.3333333 L9.2,13.3333333 L9.2,11.9305333 C9.198,10.7022667 8.249,9.68026667 7,9.46093333 L7,5.25906667 C8.308,4.46106667 9.859,4 11.501,4 C13.141,4 14.692,4.46013333 16,5.25906667 L16,9.46093333 C14.751,9.68026667 13.802,10.7032 13.8,11.9314667 L13.8,13.3333333 L15,13.3333333 L15,11.9314667 C15.001,11.1596 15.673,10.5333333 16.5,10.5333333 C17.328,10.5333333 18,11.1605333 18,11.9333333 L18,11.9333333 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/gallery-l.svg b/data/styles/clear/style-night/symbols/gallery-l.svg
index 9ba07e39c4..3811f5e26d 100644
--- a/data/styles/clear/style-night/symbols/gallery-l.svg
+++ b/data/styles/clear/style-night/symbols/gallery-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="art-gallery-l" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#331E12" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
+            <circle id="Oval-1-Copy-38" fill="#2E1B10" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
             <path d="M12,6 C7,6 4,10 4,12 C4,14 5,15.5 7,15.5 C9,15.5 10,16 10,17.5 C10,19.5 11.5,21 13.5,21 C20,21 23,17.5 23,14 C23,8 18,6 12,6 L12,6 Z M10.75,8 C11.44034,8 12,8.55966 12,9.25 C12,9.94034 11.44034,10.5 10.75,10.5 C10.05966,10.5 9.5,9.94034 9.5,9.25 C9.5,8.55966 10.05966,8 10.75,8 L10.75,8 Z M14.75,8 C15.44033,8 16,8.55967 16,9.25 C16,9.94033 15.44033,10.5 14.75,10.5 C14.05967,10.5 13.5,9.94033 13.5,9.25 C13.5,8.55967 14.05967,8 14.75,8 L14.75,8 Z M18.75,10 C19.44034,10 20,10.55966 20,11.25 C20,11.94034 19.44034,12.5 18.75,12.5 C18.05966,12.5 17.5,11.94034 17.5,11.25 C17.5,10.55966 18.05966,10 18.75,10 L18.75,10 Z M7.25,11 C7.94034,11 8.5,11.55966 8.5,12.25 C8.5,12.94034 7.94034,13.5 7.25,13.5 C6.55966,13.5 6,12.94034 6,12.25 C6,11.55966 6.55966,11 7.25,11 L7.25,11 Z M13.5,16 C14.32843,16 15,16.67157 15,17.5 C15,18.32843 14.32843,19 13.5,19 C12.67157,19 12,18.32843 12,17.5 C12,16.67157 12.67157,16 13.5,16 L13.5,16 Z" id="path6511" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-night/symbols/gallery-m.svg b/data/styles/clear/style-night/symbols/gallery-m.svg
index dc4e03cad4..b9cd6dad0e 100644
--- a/data/styles/clear/style-night/symbols/gallery-m.svg
+++ b/data/styles/clear/style-night/symbols/gallery-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="art-gallery-m" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
-            <ellipse id="Oval-1-Copy-40" fill="#331E12" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+            <ellipse id="Oval-1-Copy-40" fill="#2E1B10" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
             <path d="M10.5000045,7 C6.61111446,7 4.00000442,10.44444 4.00000442,12.0000001 C4.00000442,13.5000001 4.99999444,14.5000001 6.50000446,14.5000001 C8.05556448,14.5000001 9.5000045,14.8333301 9.5000045,16.0000001 C9.5000045,17.5555601 10.9444445,18.5000002 12.5000045,18.5000002 C17.0000046,18.5000002 19.0000046,15.7222201 19.0000046,13.0000001 C19.0000046,7.50000001 14.3660046,7 10.5000045,7 L10.5000045,7 Z M9.00000449,8.50000002 C9.5522845,8.50000002 10.0000045,8.94772003 10.0000045,9.50000003 C10.0000045,10.05228 9.5522845,10.5 9.00000449,10.5 C8.44772449,10.5 8.00000448,10.05228 8.00000448,9.50000003 C8.00000448,8.94772003 8.44772449,8.50000002 9.00000449,8.50000002 L9.00000449,8.50000002 Z M12.0000045,8.50000002 C12.5522745,8.50000002 13.0000046,8.94773003 13.0000046,9.50000003 C13.0000046,10.05227 12.5522745,10.5 12.0000045,10.5 C11.4477345,10.5 11.0000045,10.05227 11.0000045,9.50000003 C11.0000045,8.94773003 11.4477345,8.50000002 12.0000045,8.50000002 L12.0000045,8.50000002 Z M15.0000046,10 C15.5446246,10 15.9687546,10.45538 15.9687546,11.0000001 C15.9687546,11.5446201 15.5446246,11.9687501 15.0000046,11.9687501 C14.4553846,11.9687501 14.0000046,11.5446201 14.0000046,11.0000001 C14.0000046,10.45538 14.4553846,10 15.0000046,10 L15.0000046,10 Z M7.00000447,11.0000001 C7.55229447,11.0000001 8.00000448,11.4477101 8.00000448,12.0000001 C8.00000448,12.5522901 7.55229447,13.0000001 7.00000447,13.0000001 C6.44771446,13.0000001 6.00000445,12.5522901 6.00000445,12.0000001 C6.00000445,11.4477101 6.44771446,11.0000001 7.00000447,11.0000001 L7.00000447,11.0000001 Z M12.2500045,14.5000001 C12.9403545,14.5000001 13.5000046,15.0596501 13.5000046,15.7500001 C13.5000046,16.4403501 12.9403545,17.0000001 12.2500045,17.0000001 C11.5596545,17.0000001 11.0000045,16.4403501 11.0000045,15.7500001 C11.0000045,15.0596501 11.5596545,14.5000001 12.2500045,14.5000001 L12.2500045,14.5000001 Z" id="path6511-1" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-night/symbols/gallery-s.svg b/data/styles/clear/style-night/symbols/gallery-s.svg
index 6994141909..6c520f4d87 100644
--- a/data/styles/clear/style-night/symbols/gallery-s.svg
+++ b/data/styles/clear/style-night/symbols/gallery-s.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="art-gallery-s" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-42" fill="#331E12" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
+            <circle id="Oval-1-Copy-42" fill="#2E1B10" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
             <path d="M8,5 C5.5,5 4,6.5 4,8 C4,9 4.5,10 6,10 C7,10 7,10.25 7,11 C7,12.5 8.5,13 9.5,13 C12,13 13,10.75 13,9 C13,5.5 10.48528,5 8,5 L8,5 Z M7.375,6 C7.72017,6 8,6.2798 8,6.625 C8,6.9702 7.72017,7.25 7.375,7.25 C7.02983,7.25 6.75,6.9702 6.75,6.625 C6.75,6.2798 7.02983,6 7.375,6 L7.375,6 Z M9.375,6 C9.72017,6 10,6.2798 10,6.625 C10,6.9702 9.72017,7.25 9.375,7.25 C9.02983,7.25 8.75,6.9702 8.75,6.625 C8.75,6.2798 9.02983,6 9.375,6 L9.375,6 Z M5.625,6.75 C5.97017,6.75 6.25,7.0298 6.25,7.375 C6.25,7.7202 5.97017,8 5.625,8 C5.27983,8 5,7.7202 5,7.375 C5,7.0298 5.27983,6.75 5.625,6.75 L5.625,6.75 Z M11.375,7 C11.72017,7 12,7.2798 12,7.625 C12,7.9702 11.72017,8.25 11.375,8.25 C11.02983,8.25 10.75,7.9702 10.75,7.625 C10.75,7.2798 11.02983,7 11.375,7 L11.375,7 Z M9,9.5 C9.55228,9.5 10,9.9477 10,10.5 C10,11.0523 9.55228,11.5 9,11.5 C8.44772,11.5 8,11.0523 8,10.5 C8,9.9477 8.44772,9.5 9,9.5 L9,9.5 Z" id="path6558" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-night/symbols/garden-l.svg b/data/styles/clear/style-night/symbols/garden-l.svg
index d0b86dd9e3..e34ec78442 100644
--- a/data/styles/clear/style-night/symbols/garden-l.svg
+++ b/data/styles/clear/style-night/symbols/garden-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="garden-l" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#173809" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
+            <circle id="Oval-1-Copy-38" fill="#153308" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
             <path d="M9,7 L9,9 C9,11.0312 11,12.0625 13,12 L13,20 C12,18 9,15 6,16 C6,16 8.5,22 13.5,22 C18.5,22 21,16 21,16 C18,15 15,18 14,20 L14,12 C16,12.062 18,11.0312 18,9 L18,7 C18,6.5596 17.9532,6 17.7,6 C17.50708,6 17.27438,6.2256 17,6.5 L15.5,8 L14,6.3125 C13.84343,6.1364 13.75304,6 13.5,6 C13.24695,6 13.15657,6.1364 13,6.3125 L11.5,8 L10,6.5 C9.72562,6.2256 9.49292,6 9.3,6 C9.047,6 9,6.5596 9,7 Z" id="path6080-4" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-night/symbols/garden-m.svg b/data/styles/clear/style-night/symbols/garden-m.svg
index 59bf60a5a0..a2d5d06404 100644
--- a/data/styles/clear/style-night/symbols/garden-m.svg
+++ b/data/styles/clear/style-night/symbols/garden-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="garden-m" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
-            <ellipse id="Oval-1-Copy-40" fill="#173809" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+            <ellipse id="Oval-1-Copy-40" fill="#153308" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
             <path d="M8,5 L8,7.5 C8,9.15038 9.375,10.05078 11,10 L11,16.5 C10.1875,14.875 8.5,13 6,14 C6,14 7.5,18 11.5,18 C15.5,18 17,14 17,14 C14.5,13 12.8125,14.875 12,16.5 L12,10 C13.625,10.0508 15,9.15038 15,7.5 L15,5.00001 L13,7 L11.5,5 L10,7 L8,5 Z" id="path6080-4-1" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-night/symbols/garden-s.svg b/data/styles/clear/style-night/symbols/garden-s.svg
index 074559190b..7b19114908 100644
--- a/data/styles/clear/style-night/symbols/garden-s.svg
+++ b/data/styles/clear/style-night/symbols/garden-s.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="garden-s" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-42" fill="#173809" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
+            <circle id="Oval-1-Copy-42" fill="#153308" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
             <path d="M6,4 L6,6 C6,6.86708 6.9353,7.75357 8,7.96875 L8,12 C7.5,11 6.5,10 5,11 C5,11 6,13 8.5,13 C11,13 12,11 12,11 C10.5,10 9.5,11 9,12 L9,7.96875 C10.0647,7.75357 11,6.86708 11,6 L11,4 L9.4375,5.25 L8.5,4 L7.5625,5.25 L6,4 L6,4 Z" id="path6080-4-3" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-night/symbols/garden_center-l.svg b/data/styles/clear/style-night/symbols/garden_center-l.svg
index 35b02d00b3..a3153076d5 100644
--- a/data/styles/clear/style-night/symbols/garden_center-l.svg
+++ b/data/styles/clear/style-night/symbols/garden_center-l.svg
@@ -10,7 +10,7 @@
         <g id="garden_center-l" sketch:type="MSLayerGroup">
             <path d="M13.4238214,27 C6.24664286,27 0.405964286,20.943 0.405964286,13.5 C0.405964286,6.057 6.24664286,0 13.4238214,0 C20.601,0 26.4416786,6.057 26.4416786,13.5 C26.4416786,20.943 20.601,27 13.4238214,27 L13.4238214,27 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M14.2897002,13.895 C15.7949502,14.219 17.424593,13.778 18.5942716,12.565 C19.7639502,11.352 20.1892002,9.663 19.8758073,8.1 C18.3705573,7.776 16.7409144,8.217 15.5712359,9.43 C14.4015573,10.643 13.975343,12.332 14.2897002,13.895 L14.2897002,13.895 Z M12.8587002,13.912 C13.1200216,12.613 12.7642002,11.204 11.7902716,10.193 C10.8173073,9.182 9.45862873,8.814 8.20312873,9.086 C7.9418073,10.387 8.29859301,11.794 9.2715573,12.805 C10.2445216,13.816 11.6012716,14.184 12.8587002,13.912 L12.8587002,13.912 Z M13.6207573,9.5 C14.5216704,8.91384362 15.1192355,7.90166636 15.12025,6.75050357 C15.12025,5.59833364 14.5226849,4.58817066 13.6197427,4 C12.7178151,4.58817066 12.1212645,5.59934078 12.12025,6.75050357 C12.12025,7.90166636 12.7168006,8.91182934 13.6207573,9.5 L13.6207573,9.5 Z M9.11030391,17.999 L9.67562469,17.999 L11.0904117,22.999 L16.0406813,22.999 L17.4554683,17.999 L18.0207891,17.999 C18.5682889,17.999 19.010843,17.552 19.010843,16.999 L19.010843,15.999 L8.12025,15.999 L8.12025,16.999 C8.12025,17.552 8.5628041,17.999 9.11030391,17.999 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/garden_center-m.svg b/data/styles/clear/style-night/symbols/garden_center-m.svg
index 0caf3440bc..9ff605d1cd 100644
--- a/data/styles/clear/style-night/symbols/garden_center-m.svg
+++ b/data/styles/clear/style-night/symbols/garden_center-m.svg
@@ -10,7 +10,7 @@
         <g id="garden_center-m" sketch:type="MSLayerGroup">
             <path d="M11.4242917,23 C5.3475,23 0.403458333,17.841 0.403458333,11.5 C0.403458333,5.159 5.3475,0 11.4242917,0 C17.5010833,0 22.445125,5.159 22.445125,11.5 C22.445125,17.841 17.5010833,23 11.4242917,23 L11.4242917,23 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M13.0020468,8.347 C13.9325884,7.377 15.2272968,7.024 16.4232968,7.284 C16.6734218,8.534 16.3351301,9.886 15.4055468,10.855 C14.4759634,11.824 13.1802968,12.178 11.9833384,11.918 C11.7332134,10.668 12.0724634,9.316 13.0020468,8.347 L13.0020468,8.347 Z M10.8802968,11.83 C11.0882551,10.791 10.8055468,9.664 10.0302551,8.855 C9.25688009,8.046 8.17588009,7.751 7.17729676,7.968 C6.97029676,9.009 7.25396342,10.135 8.02733842,10.944 C8.80263009,11.753 9.88075509,12.047 10.8802968,11.83 L10.8802968,11.83 Z M7.11179167,14.2 C7.11179167,14.642 7.47792803,15 7.92997348,15 L8.39735985,15 L8.98235985,19 L14.0959962,19 L14.8262235,15 L15.2936098,15 C15.7456553,15 16.1117917,14.643 16.1117917,14.2 L16.1117917,13 L7.11179167,13 L7.11179167,14.2 L7.11179167,14.2 Z M11.4246301,4 C10.6311301,4 9.98713009,4.672 9.98713009,5.5 C9.98713009,6.328 10.6311301,7 11.4246301,7 C12.2181301,7 12.8621301,6.328 12.8621301,5.5 C12.8621301,4.672 12.2181301,4 11.4246301,4 L11.4246301,4 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/gate-l.svg b/data/styles/clear/style-night/symbols/gate-l.svg
index d2a3c64c7a..880bae674e 100644
--- a/data/styles/clear/style-night/symbols/gate-l.svg
+++ b/data/styles/clear/style-night/symbols/gate-l.svg
@@ -10,7 +10,7 @@
         <g id="gate-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.056,27 0,20.943 0,13.5 C0,6.057 6.056,0 13.5,0 C20.944,0 27,6.057 27,13.5 C27,20.943 20.944,27 13.5,27 L13.5,27 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M5,19 L22,19 C22.552,19 23,18.553 23,18 L23,17 L4,17 L4,18 C4,18.553 4.448,19 5,19 L5,19 Z M10,14 L21.5,14 C22.329,14 23,13.328 23,12.5 C23,11.672 22.329,11 21.5,11 L16.883,11 L11.299,6 L9.299,6 L12.383,11 L8.208,11 L5.833,8 L4,8 L5.5,12 L10,14 L10,14 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/gate-m.svg b/data/styles/clear/style-night/symbols/gate-m.svg
index 2799dae811..415de42b01 100644
--- a/data/styles/clear/style-night/symbols/gate-m.svg
+++ b/data/styles/clear/style-night/symbols/gate-m.svg
@@ -10,7 +10,7 @@
         <g id="gate-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M5,15.8 L18,15.8 C18.552,15.8 19,15.353 19,14.8 L19,14.199 L4,14.199 L4,14.8 C4,15.353 4.448,15.8 5,15.8 L5,15.8 Z M9,12 L17.5,12 C18.329,12 19,11.328 19,10.5 C19,9.672 18.329,9 17.5,9 L13.9,9 L10.3,6 L8.7,6 L10.5,9 L7.207,9 L5.528,7 L4,7 L5.25,10.333 L9,12 L9,12 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/gift-l.svg b/data/styles/clear/style-night/symbols/gift-l.svg
index e68fe73e7a..892e4ed727 100644
--- a/data/styles/clear/style-night/symbols/gift-l.svg
+++ b/data/styles/clear/style-night/symbols/gift-l.svg
@@ -10,7 +10,7 @@
         <g id="gift-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.057,27 0,20.943 0,13.5 C0,6.057 6.057,0 13.5,0 C20.943,0 27,6.057 27,13.5 C27,20.943 20.943,27 13.5,27 L13.5,27 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M20,10.6700916 L15,10.6700916 L15,14.4467277 L21,14.4467277 L21,11.6142506 C21,11.0921307 20.553,10.6700916 20,10.6700916 L20,10.6700916 Z M6,21.055841 C6,21.5779609 6.447,22 7,22 L12,22 L12,16.3350458 L6,16.3350458 L6,21.055841 L6,21.055841 Z M6,11.6142506 L6,14.4467277 L12,14.4467277 L12,10.6700916 L7,10.6700916 C6.447,10.6700916 6,11.0921307 6,11.6142506 L6,11.6142506 Z M15,22 L20,22 C20.553,22 21,21.5779609 21,21.055841 L21,16.3350458 L15,16.3350458 L15,22 L15,22 Z M10.498,9.72404423 L16.502,9.72404423 C17.856,9.72404423 18.955,8.68546929 18.955,7.40802211 C18.955,6.13057494 17.855,5.092 16.502,5.092 C15.847,5.092 15.231,5.33370471 14.769,5.76990619 L13.5,6.95671409 L12.232,5.77179451 C11.77,5.33370471 11.154,5.092 10.498,5.092 C9.144,5.092 8.045,6.13057494 8.045,7.40802211 C8.045,8.68546929 9.145,9.72404423 10.498,9.72404423 L10.498,9.72404423 Z M10.44,5.85299218 C10.868,5.85299218 11.269,6.00972258 11.571,6.29580277 L13.5,8.10009069 L15.427,6.29674693 C15.73,6.01066674 16.133,5.85299218 16.56,5.85299218 C17.442,5.85299218 18.16,6.53089837 18.16,7.36364664 C18.16,8.19639491 17.442,8.87430109 16.56,8.87430109 L10.441,8.87430109 C9.559,8.87430109 8.841,8.19639491 8.841,7.36364664 C8.841,6.53089837 9.559,5.85299218 10.44,5.85299218 L10.44,5.85299218 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/gift-m.svg b/data/styles/clear/style-night/symbols/gift-m.svg
index 678f325ceb..5235a38e51 100644
--- a/data/styles/clear/style-night/symbols/gift-m.svg
+++ b/data/styles/clear/style-night/symbols/gift-m.svg
@@ -10,7 +10,7 @@
         <g id="gift-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M17,8 L13,8 L13,11 L18,11 L18,9 C18,8.447 17.553,8 17,8 L17,8 Z M5,17 C5,17.553 5.447,18 6,18 L10,18 L10,13 L5,13 L5,17 L5,17 Z M5,9 L5,11 L10,11 L10,8 L6,8 C5.447,8 5,8.447 5,9 L5,9 Z M13,18 L17,18 C17.553,18 18,17.553 18,17 L18,13 L13,13 L13,18 L13,18 Z M8.649,7 L14.35,7 C15.171,7 15.84,6.331 15.84,5.51 C15.84,4.689 15.171,4.02 14.35,4.02 C13.953,4.02 13.577,4.175 13.294,4.458 L11.499,6.237 L9.702,4.457 C9.421,4.175 9.047,4.02 8.648,4.02 C7.827,4.02 7.158,4.689 7.158,5.51 C7.158,6.331 7.828,7 8.649,7 L8.649,7 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/golf-l.svg b/data/styles/clear/style-night/symbols/golf-l.svg
index 3f34318b9e..e12bcb6014 100644
--- a/data/styles/clear/style-night/symbols/golf-l.svg
+++ b/data/styles/clear/style-night/symbols/golf-l.svg
@@ -10,7 +10,7 @@
         <g id="golf-l" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
             <g id="Oval-1-Copy-38">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M10,5.5 L10,17.9375 C8,17.9995 7,19.5 7,20.5 C7,21 7.5,21 7.5,21 L19.5,21 C19.5,21 20,21 20,20.5 C20,18 18.5,16 17,16 C15.42767,16 14.55691,18.7803 13,19 C12.31729,19.096 11.6576,18.6547 11,18.3125 L11,11 L18,8 L11.50162,5.215 C11.12515,5.0537 10.75012,5 10.5,5 C10.15852,5 10,5 10,5.5 Z" id="rect8138-7-copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/golf-m.svg b/data/styles/clear/style-night/symbols/golf-m.svg
index d0c259c080..8916c2da32 100644
--- a/data/styles/clear/style-night/symbols/golf-m.svg
+++ b/data/styles/clear/style-night/symbols/golf-m.svg
@@ -10,7 +10,7 @@
         <g id="golf-m" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
             <g id="Oval-1-Copy-40">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M9,5.3823 L9,14.6581 C7.47058,14.7051 7,15.7353 7,16.5 C7,16.8823 7.5,17 7.5,17 L15.5,17 C15.5,17 16,16.8823 16,16.5 C16,14.5882 15.14706,13 14,13 C12.79763,13 12.48469,15.3025 11.29411,15.4706 C10.77204,15.5446 10.26758,15.2065 9.7647,14.9449 L9.7647,9.5882 L15.11765,7.2941 L10.1483,5.1644 C9.86043,5.041 9.57362,5 9.38235,5 C9.12122,5 9,5 9,5.3823 Z" id="rect8138-7-4-copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/golf-s.svg b/data/styles/clear/style-night/symbols/golf-s.svg
index 405f6ac8d2..5b4f306d20 100644
--- a/data/styles/clear/style-night/symbols/golf-s.svg
+++ b/data/styles/clear/style-night/symbols/golf-s.svg
@@ -10,7 +10,7 @@
         <g id="golf-s" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
             <g id="Oval-1-Copy-42">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M7,4 C6.80487,4 6.5,4.2143 6.5,4.5 L6.5,11.25 C5.35714,11.285 5,12.1429 5,12.7143 C5,13 5.28571,13 5.28571,13 L11.71429,13 C11.71429,13 12,13 12,12.7143 C12,11.2857 11.35714,10.1429 10.5,10.1429 C9.60152,10.1429 9.31823,11.7316 8.42857,11.8571 C8.03845,11.9121 7.37578,11.6598 7,11.4643 L7,7.5 L11,6 L7,4 Z" id="rect8138-7-8-copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/greengrocer-l.svg b/data/styles/clear/style-night/symbols/greengrocer-l.svg
index 5609b21435..af7a2ad1f9 100644
--- a/data/styles/clear/style-night/symbols/greengrocer-l.svg
+++ b/data/styles/clear/style-night/symbols/greengrocer-l.svg
@@ -10,7 +10,7 @@
         <g id="greengrocer-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.057,27 0,20.943 0,13.5 C0,6.057 6.057,0 13.5,0 C20.943,0 27,6.057 27,13.5 C27,20.943 20.943,27 13.5,27 L13.5,27 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M17.5,4 C16.454,4 15.535,4.597 15,5.499 C15.535,6.402 16.454,7 17.499,7 C18.544,7 19.463,6.402 20,5.499 C19.463,4.596 18.545,4 17.5,4 L17.5,4 Z M16.012,13.269 L14.959,8.089 C14.948,8.027 14.937,7.967 14.922,7.907 L14.901,7.803 L14.89,7.803 C14.632,6.921 13.908,6.243 13,6.057 L13,4 L12,4 L12,6.057 C11.093,6.244 10.368,6.921 10.11,7.803 L10.1,7.803 L10.079,7.907 C10.064,7.967 10.053,8.027 10.042,8.089 L8.989,13.269 C7.774,14.278 7.001,15.799 7.001,17.5 C7.001,20.537 9.464,23 12.501,23 C15.538,23 18.001,20.537 18.001,17.5 C18,15.799 17.227,14.277 16.012,13.269 L16.012,13.269 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/greengrocer-m.svg b/data/styles/clear/style-night/symbols/greengrocer-m.svg
index 4744cc7617..cb34216828 100644
--- a/data/styles/clear/style-night/symbols/greengrocer-m.svg
+++ b/data/styles/clear/style-night/symbols/greengrocer-m.svg
@@ -10,7 +10,7 @@
         <g id="greengrocer-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M18,5 C17.57,5.603 16.835,6 15.999,6 C15.163,6 14.429,5.603 14,5 C14.429,4.397 15.163,4 16,4 C16.836,4 17.57,4.397 18,5 L18,5 Z M14.374,11.012 L13.513,6.774 C13.503,6.723 13.494,6.673 13.482,6.625 L13.465,6.539 L13.455,6.539 C13.245,5.818 12.651,5.264 11.908,5.11 L11.908,4 L11.092,4 L11.092,5.109 C10.349,5.262 9.755,5.817 9.545,6.538 L9.535,6.538 L9.518,6.624 C9.505,6.673 9.497,6.723 9.487,6.773 L8.626,11.011 C7.632,11.835 7,13.081 7,14.473 C7,16.958 9.015,18.974 11.5,18.974 C13.985,18.974 16,16.958 16,14.473 C16,13.082 15.368,11.836 14.374,11.012 L14.374,11.012 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/grocery-l.svg b/data/styles/clear/style-night/symbols/grocery-l.svg
index dade61bb28..7b90842189 100644
--- a/data/styles/clear/style-night/symbols/grocery-l.svg
+++ b/data/styles/clear/style-night/symbols/grocery-l.svg
@@ -10,7 +10,7 @@
         <g id="grocery-l-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
             <g id="Oval-1-Copy-38">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M21,5.999983 C20.416667,5.999983 19.899101,6.163382 19.53125,6.531233 C19.163399,6.899084 19,7.41665 19,7.999983 L5,7.999983 L7,16.999983 L19,16.999983 L19,17.999983 L8,17.999983 C7,17.999983 7,18.999983 8,18.999983 L9.5,18.999983 L17.5,18.999983 L19,18.999983 C19.5,18.999983 20,18.499983 20,17.999983 L20,16.999983 L20,8.999983 L20,7.999983 C20,7.999983 20.0866,7.350882 20.21875,7.218733 C20.350899,7.086584 20.583333,6.999983 21,6.999983 L21.4,6.999983 C21.9,6.999983 22,6.75131 22,6.499983 C22,6.252562 21.9,5.999983 21.4,5.999983 L21,5.999983 L21,5.999983 Z M17.5,18.999983 C16.671573,18.999983 16,19.671556 16,20.499983 C16,21.32841 16.671573,21.999983 17.5,21.999983 C18.328427,21.999983 19,21.32841 19,20.499983 C19,19.671556 18.328427,18.999983 17.5,18.999983 L17.5,18.999983 Z M9.5,18.999983 C8.6715729,18.999983 8,19.671556 8,20.499983 C8,21.32841 8.6715729,21.999983 9.5,21.999983 C10.328427,21.999983 11,21.32841 11,20.499983 C11,19.671556 10.328427,18.999983 9.5,18.999983 L9.5,18.999983 Z" id="rect7842-copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/grocery-m.svg b/data/styles/clear/style-night/symbols/grocery-m.svg
index 2a6c77a219..ad22071669 100644
--- a/data/styles/clear/style-night/symbols/grocery-m.svg
+++ b/data/styles/clear/style-night/symbols/grocery-m.svg
@@ -10,7 +10,7 @@
         <g id="grocery-m-copy" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
             <g id="Oval-1-Copy-40">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
         </g>
diff --git a/data/styles/clear/style-night/symbols/grocery-s.svg b/data/styles/clear/style-night/symbols/grocery-s.svg
index 911be7cb01..6f38a3bac2 100644
--- a/data/styles/clear/style-night/symbols/grocery-s.svg
+++ b/data/styles/clear/style-night/symbols/grocery-s.svg
@@ -10,7 +10,7 @@
         <g id="grocery-s-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
             <g id="Oval-1-Copy-42">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M12.5,5.3622 C12.20834,5.3622 11.94955,5.4442 11.76562,5.6279 C11.5817,5.8118 11.5,6.0706 11.5,6.3622 L4,6.3622 L5,10.3622 L11.5,10.3622 L11.5,11.3622 L5.36742,11.3622 C4.86742,11.3622 4.86742,11.8622 5.36742,11.8622 L6.25,11.8622 L10.75,11.8622 L11.5,11.8622 C11.75,11.8622 12,11.6122 12,11.3622 L12,10.8622 L12,6.8622 L12,6.3622 C12,6.3622 12.0433,6.0377 12.10937,5.9716 C12.17547,5.9056 12.29166,5.8622 12.5,5.8622 L13,5.8622 L13,5.3622 L12.5,5.3622 L12.5,5.3622 Z M10.75,11.8622 C10.33578,11.8622 10,12.198 10,12.6122 C10,13.0264 10.33578,13.3622 10.75,13.3622 C11.16422,13.3622 11.5,13.0264 11.5,12.6122 C11.5,12.198 11.16422,11.8622 10.75,11.8622 L10.75,11.8622 Z M6.25,11.8622 C5.83578,11.8622 5.5,12.198 5.5,12.6122 C5.5,13.0264 5.83578,13.3622 6.25,13.3622 C6.66422,13.3622 7,13.0264 7,12.6122 C7,12.198 6.66422,11.8622 6.25,11.8622 L6.25,11.8622 Z" id="rect7842-7" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/hairdresser-l.svg b/data/styles/clear/style-night/symbols/hairdresser-l.svg
index 27d7f66fc4..f144d9d644 100644
--- a/data/styles/clear/style-night/symbols/hairdresser-l.svg
+++ b/data/styles/clear/style-night/symbols/hairdresser-l.svg
@@ -10,7 +10,7 @@
         <g id="hairdresser-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.057,27 0,20.943 0,13.5 C0,6.057 6.057,0 13.5,0 C20.943,0 27,6.057 27,13.5 C27,20.943 20.943,27 13.5,27 L13.5,27 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M20.513,17.428 L20.005,16.549 C19.188,15.133 17.393,14.641 15.965,15.425 L14.524,18.949 L14.669,19.303 L14.688,19.276 C14.729,19.367 14.76,19.461 14.811,19.549 L15.319,20.428 C16.147,21.863 17.981,22.355 19.417,21.527 C20.85,20.698 21.341,18.863 20.513,17.428 L20.513,17.428 Z M18.782,20.291 C18.57,20.414 18.329,20.479 18.085,20.479 C17.585,20.479 17.119,20.21 16.871,19.779 L16.27,18.74 C15.883,18.07 16.113,17.213 16.781,16.828 C16.993,16.705 17.235,16.64 17.479,16.64 C17.978,16.64 18.443,16.909 18.693,17.34 L19.294,18.38 C19.68,19.048 19.45,19.906 18.782,20.291 L18.782,20.291 Z M17.051,5.071 L13.484,11.251 L9.916,5.071 L9.05,5.571 L12.249,13.39 L11.06,15.451 C9.624,14.622 7.79,15.114 6.962,16.549 L6.454,17.428 C5.626,18.864 6.117,20.699 7.552,21.527 C8.988,22.355 10.822,21.863 11.65,20.428 L12.158,19.549 C12.208,19.463 12.238,19.371 12.278,19.282 L12.299,19.303 L17.918,5.572 L17.051,5.071 L17.051,5.071 Z M10.68,18.738 L10.086,19.765 C9.84,20.193 9.38,20.458 8.885,20.458 C8.643,20.458 8.405,20.394 8.195,20.272 C7.534,19.889 7.306,19.04 7.688,18.378 L8.282,17.351 C8.528,16.923 8.989,16.657 9.483,16.657 C9.725,16.657 9.964,16.721 10.175,16.844 C10.835,17.227 11.062,18.076 10.68,18.738 L10.68,18.738 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/hairdresser-m.svg b/data/styles/clear/style-night/symbols/hairdresser-m.svg
index 8825466ff5..1c33c8fd5d 100644
--- a/data/styles/clear/style-night/symbols/hairdresser-m.svg
+++ b/data/styles/clear/style-night/symbols/hairdresser-m.svg
@@ -10,7 +10,7 @@
         <g id="hairdresser-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M17.459,15.053 L17.027,14.306 C16.333,13.102 14.806,12.682 13.593,13.348 L12.365,16.345 L12.49,16.647 L12.504,16.622 C12.54,16.701 12.567,16.779 12.61,16.855 L13.042,17.602 C13.745,18.822 15.304,19.241 16.525,18.536 C17.746,17.831 18.162,16.272 17.459,15.053 L17.459,15.053 Z M15.987,17.485 C15.807,17.589 15.601,17.643 15.395,17.643 C14.968,17.643 14.574,17.415 14.362,17.05 L13.852,16.166 C13.524,15.596 13.718,14.866 14.286,14.54 C14.466,14.435 14.673,14.38 14.88,14.38 C15.305,14.38 15.699,14.609 15.912,14.974 L16.423,15.86 C16.751,16.429 16.555,17.158 15.987,17.485 L15.987,17.485 Z M14.516,4.548 L11.484,9.802 L8.452,4.548 L7.714,4.972 L10.435,11.619 L9.422,13.371 C8.202,12.666 6.644,13.084 5.941,14.306 L5.509,15.053 C4.806,16.273 5.222,17.831 6.441,18.535 C7.663,19.24 9.222,18.821 9.925,17.601 L10.357,16.854 C10.398,16.78 10.425,16.704 10.459,16.626 L10.478,16.646 L15.255,4.971 L14.516,4.548 L14.516,4.548 Z M9.1,16.165 L8.596,17.039 C8.386,17.403 7.996,17.628 7.574,17.628 C7.37,17.628 7.167,17.572 6.988,17.471 C6.426,17.147 6.233,16.424 6.557,15.862 L7.063,14.989 C7.271,14.626 7.663,14.397 8.084,14.397 C8.288,14.397 8.492,14.454 8.67,14.556 C9.231,14.88 9.424,15.602 9.1,16.165 L9.1,16.165 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/hand-l.svg b/data/styles/clear/style-night/symbols/hand-l.svg
index 568b2ffd4f..5f28324eaf 100644
--- a/data/styles/clear/style-night/symbols/hand-l.svg
+++ b/data/styles/clear/style-night/symbols/hand-l.svg
@@ -10,7 +10,7 @@
         <g id="hand-l" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-46" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" rx="13.5" ry="13.5"></ellipse>
             <g id="Oval-1-Copy-38">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M9,18.048907 L8,14.9999998 L8,9 C8,9 8.5,8.5 9,8.5 C9.5,8.5 10,9 10,9 L10,12 L10.461174,12 L10.5,6 C10.5,6 11.0013973,5.50264525 11.5009725,5.50264525 C12.0005477,5.50264525 12.5,6 12.5,6 L12.461174,12 L13,12 L13,5 C13,5 13.5,4.50264525 14,4.50264525 C14.5,4.50264525 15,5 15,5 L15,12 L15.5,12 L15.5,6 C15.5,6 16,5.50264525 16.5,5.50264525 C17,5.50264525 17.5,6 17.5,6 L17.5,15 L19,12 C19,12 19.5,11.5 20,11.5 C20.5,11.5 21,12 21,12 L16,22 L16.0000002,23 L9.99999993,23 L10,22 L9,18.048907 Z" id="Path-1150" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/hand-m.svg b/data/styles/clear/style-night/symbols/hand-m.svg
index 41e9185be0..292e598bc4 100644
--- a/data/styles/clear/style-night/symbols/hand-m.svg
+++ b/data/styles/clear/style-night/symbols/hand-m.svg
@@ -10,7 +10,7 @@
         <g id="hand-m" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-38" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="12.5" cy="12.5" r="12.5"></circle>
             <g id="Oval-1-Copy-47">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M8.84615385,15.8519018 L8,14 L8,8 C8,8 8.375,7.5 8.75,7.5 C9.125,7.5 9.5,8 9.5,8 L9.5,11 L10,11 L10,6 C10,6 10.375,5.5 10.75,5.5 C11.125,5.5 11.5,6 11.5,6 L11.5,11 L12,11 L12,5 C12,5 12.375,4.50264525 12.75,4.50264525 C13.125,4.50264525 13.5,5 13.5,5 L13.5,11 L14,11 L14,6 C14,6 14.375,5.5 14.75,5.5 C15.125,5.5 15.5,6 15.5,6 L15.5,13.2974828 L16.5,10.9999998 C16.5,10.9999998 16.875,10.4999998 17.25,10.4999998 C17.625,10.4999998 18,10.9999998 18,10.9999998 L15,19 L15.0143576,19.9999998 L10,20 L10,19 L8.84615385,15.8519018 Z" id="Path-1150" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/hardware-l.svg b/data/styles/clear/style-night/symbols/hardware-l.svg
index 59a5c82aae..8bae24ce34 100644
--- a/data/styles/clear/style-night/symbols/hardware-l.svg
+++ b/data/styles/clear/style-night/symbols/hardware-l.svg
@@ -10,7 +10,7 @@
         <g id="hardware-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.057,27 0,20.943 0,13.5 C0,6.057 6.057,0 13.5,0 C20.943,0 27,6.057 27,13.5 C27,20.943 20.943,27 13.5,27 L13.5,27 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M17,5 L14,5 L14,11 L19,11 L19,7 C19,5.896 18.104,5 17,5 L17,5 Z M8,17.5 C8,20.537 10.463,23 13.5,23 C16.537,23 19,20.537 19,17.5 L19,12 L8,12 L8,17.5 L8,17.5 Z M13,5 L10,5 C8.896,5 8,5.896 8,7 L8,11 L13,11 L13,5 L13,5 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/hardware-m.svg b/data/styles/clear/style-night/symbols/hardware-m.svg
index f238f5c589..2de3cfae57 100644
--- a/data/styles/clear/style-night/symbols/hardware-m.svg
+++ b/data/styles/clear/style-night/symbols/hardware-m.svg
@@ -10,7 +10,7 @@
         <g id="hardware-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M14.364,5 L12,5 L12,9 L16,9 L16,6.637 C16,5.733 15.267,5 14.364,5 L14.364,5 Z M7,14.5 C7,16.984 9.016,19 11.5,19 C13.984,19 16,16.984 16,14.5 L16,10 L7,10 L7,14.5 L7,14.5 Z M11,5 L8.637,5 C7.734,5 7,5.733 7,6.637 L7,9 L11,9 L11,5 L11,5 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/helipad-l.svg b/data/styles/clear/style-night/symbols/helipad-l.svg
index 7363181096..92eaf1f4c5 100644
--- a/data/styles/clear/style-night/symbols/helipad-l.svg
+++ b/data/styles/clear/style-night/symbols/helipad-l.svg
@@ -7,7 +7,7 @@
     <g id="Transport" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="helipad-l" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
-            <path d="M13.5,24 C19.2989899,24 24,19.2989899 24,13.5 C24,7.70101013 19.2989899,3 13.5,3 C7.70101013,3 3,7.70101013 3,13.5 C3,19.2989899 7.70101013,24 13.5,24 Z" id="Oval-1-Copy-48" fill="#12314C" sketch:type="MSShapeGroup"></path>
+            <path d="M13.5,24 C19.2989899,24 24,19.2989899 24,13.5 C24,7.70101013 19.2989899,3 13.5,3 C7.70101013,3 3,7.70101013 3,13.5 C3,19.2989899 7.70101013,24 13.5,24 Z" id="Oval-1-Copy-48" fill="#0F2940" sketch:type="MSShapeGroup"></path>
             <path d="M13.5,26 C20.4035594,26 26,20.4035594 26,13.5 C26,6.59644063 20.4035594,1 13.5,1 C6.59644063,1 1,6.59644063 1,13.5 C1,20.4035594 6.59644063,26 13.5,26 Z M13.5,24 C19.2989899,24 24,19.2989899 24,13.5 C24,7.70101013 19.2989899,3 13.5,3 C7.70101013,3 3,7.70101013 3,13.5 C3,19.2989899 7.70101013,24 13.5,24 Z" id="Oval-1-Copy-49" fill="#F8E81C" sketch:type="MSShapeGroup"></path>
             <path d="M9,7 L11,7 L11,19 L9,19 L9,7 Z M16,7 L18,7 L18,19 L16,19 L16,7 Z M11,12 L16,12 L16,14 L11,14 L11,12 Z" id="Rectangle-53" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
diff --git a/data/styles/clear/style-night/symbols/helipad-m.svg b/data/styles/clear/style-night/symbols/helipad-m.svg
index 93f22d9f11..3a79d7a9f4 100644
--- a/data/styles/clear/style-night/symbols/helipad-m.svg
+++ b/data/styles/clear/style-night/symbols/helipad-m.svg
@@ -7,7 +7,7 @@
     <g id="Transport" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="helipad-m" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" r="11.5"></circle>
-            <circle id="Oval-1-Copy-40" fill="#12314C" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" r="8.5"></circle>
+            <circle id="Oval-1-Copy-40" fill="#0F2940" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" r="8.5"></circle>
             <path d="M11.5,22 C17.2989899,22 22,17.2989899 22,11.5 C22,5.70101013 17.2989899,1 11.5,1 C5.70101013,1 1,5.70101013 1,11.5 C1,17.2989899 5.70101013,22 11.5,22 Z M11.5,20 C16.1944204,20 20,16.1944204 20,11.5 C20,6.80557963 16.1944204,3 11.5,3 C6.80557963,3 3,6.80557963 3,11.5 C3,16.1944204 6.80557963,20 11.5,20 Z" id="Oval-1-Copy-53" fill="#F8E81C" sketch:type="MSShapeGroup"></path>
             <path d="M10,11 L10,7 L8,7 L8,17 L10,17 L10,13 L13,13 L13,11 L10,11 Z M13,7 L15,7 L15,17 L13,17 L13,7 Z" id="Rectangle-53-Copy-2" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
diff --git a/data/styles/clear/style-night/symbols/helipad-s.svg b/data/styles/clear/style-night/symbols/helipad-s.svg
index d5aa84ccfd..50719524ac 100644
--- a/data/styles/clear/style-night/symbols/helipad-s.svg
+++ b/data/styles/clear/style-night/symbols/helipad-s.svg
@@ -7,7 +7,7 @@
     <g id="Transport" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="helipad-s" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-42" fill="#12314C" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
+            <circle id="Oval-1-Copy-42" fill="#0F2940" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
             <path d="M8.5,17 C13.1944204,17 17,13.1944204 17,8.5 C17,3.80557963 13.1944204,0 8.5,0 C3.80557963,0 0,3.80557963 0,8.5 C0,13.1944204 3.80557963,17 8.5,17 Z M8.5,15.8666667 C12.5684977,15.8666667 15.8666667,12.5684977 15.8666667,8.5 C15.8666667,4.43150234 12.5684977,1.13333333 8.5,1.13333333 C4.43150234,1.13333333 1.13333333,4.43150234 1.13333333,8.5 C1.13333333,12.5684977 4.43150234,15.8666667 8.5,15.8666667 Z" id="Oval-1-Copy-54" fill="#F8E81C" sketch:type="MSShapeGroup"></path>
             <path d="M6,5 L7,5 L7,12 L6,12 L6,5 Z M10,5 L11,5 L11,12 L10,12 L10,5 Z M7,8 L10,8 L10,9 L7,9 L7,8 Z" id="Rectangle-53-Copy-3" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
diff --git a/data/styles/clear/style-night/symbols/heliport-l.svg b/data/styles/clear/style-night/symbols/heliport-l.svg
index f8ec5348b3..d0d29f8ae2 100644
--- a/data/styles/clear/style-night/symbols/heliport-l.svg
+++ b/data/styles/clear/style-night/symbols/heliport-l.svg
@@ -9,7 +9,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
         <g id="Oval-1-Copy-38">
-            <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+            <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
             <use fill="none" xlink:href="#path-1"></use>
         </g>
         <path d="M20.0526316,19 C20.5263158,19 21,18.5 21,18 L21,15 C21,14 20.5445432,13.5192 20.0526316,13 C20.0526316,13 19.4210495,12.3333 19.1052632,12 C18.7894768,11.6667 18.1578947,11 17.2105263,11 L14.009058,11 L14.009058,9 L18.1578947,9 L19.0526316,9 C19.5774642,9 20,8.554 20,8 C20,7.446 19.5774642,7 19.0526316,7 L18.1578947,7 L14.8421053,7 L13.8947368,7 L9.63157895,7 L7.9853363,7 C7.46049894,7 7.03796788,7.446 7.03796788,8 C7.03796788,8.554 7.46049894,9 7.9853363,9 L9.63157895,9 L12.9962654,9 L12.9962654,11 L10.5789474,11 L6.52302632,11 C6.19519611,10.4031 5.59541432,10 4.89473684,10 C4.28049615,10 3.73452162,10.3085111 3.38830818,10.7867518 C3.14470488,11.1232524 3,11.5437834 3,12 C3,13.1046 3.84830305,14 4.89473684,14 C5.44140821,14 5.91075253,13.7347 6.25657895,13.3438 L9.63157895,17 C10.5789474,18.0263 11.2894737,19 11.7631579,19 L20.0526316,19 Z M5.84210526,12 C5.84210526,12.5523 5.41795421,13 4.89473684,13 C4.37151947,13 3.94736842,12.5523 3.94736842,12 C3.94736842,11.4477 4.37151947,11 4.89473684,11 C5.41795421,11 5.84210526,11.4477 5.84210526,12 Z" id="rect9361" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/heliport-m.svg b/data/styles/clear/style-night/symbols/heliport-m.svg
index e76bac9f45..c68cdd66d5 100644
--- a/data/styles/clear/style-night/symbols/heliport-m.svg
+++ b/data/styles/clear/style-night/symbols/heliport-m.svg
@@ -10,12 +10,12 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
         <g id="Oval-1-Copy-40">
-            <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+            <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
             <use fill="none" xlink:href="#path-1"></use>
         </g>
         <path d="M17.1618468,16 C17.5809234,16 18,15.5678889 18,15.1357778 L18,12.5432222 C18,11.679 17.5970554,11.2635556 17.1618468,10.8147778 C17.1618468,10.8147778 16.603078,10.2386667 16.3236936,9.95066667 C16.04432,9.66255556 15.4946433,9.00191157 14.6564901,9.00191157 L12.0087546,9.00191164 L11.9996624,7.0083074 L15.011649,7.00830734 C15.4759749,7.00830734 15.9978548,6.97255556 15.9978548,6.49377778 C15.9978548,6.01511112 15.6084122,6 15.011649,6 L8.10908776,6 C7.77718829,6 7.11687224,6.01555556 7.11687224,6.49377778 C7.11687224,6.97255556 7.64744507,6.95675178 8.10908776,7.00830734 L10.9228786,7.00830726 L10.9319707,9.00191149 L7.11687214,9.00191157 C6.82684082,8.48602269 6.29619797,8.13768935 5.67630641,8.13768935 C4.75051017,8.13768935 4,8.91146713 4,9.8661338 C4,10.8206894 4.75051017,11.5944671 5.67630641,11.5944671 C6.15994338,11.5944671 6.57518365,11.3652449 6.88114222,11.027356 L9.85795875,14.2715556 C10.7304235,15.1226667 11.3247322,16 11.7437981,16 L17.1618468,16 Z" id="rect9361-7" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         <g id="Oval-410">
-            <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-2"></use>
+            <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-2"></use>
             <use fill="none" xlink:href="#path-2"></use>
         </g>
     </g>
diff --git a/data/styles/clear/style-night/symbols/heliport-s.svg b/data/styles/clear/style-night/symbols/heliport-s.svg
index fe139e578d..e8231b5728 100644
--- a/data/styles/clear/style-night/symbols/heliport-s.svg
+++ b/data/styles/clear/style-night/symbols/heliport-s.svg
@@ -9,7 +9,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
         <g id="Oval-1-Copy-42">
-            <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+            <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
             <use fill="none" xlink:href="#path-1"></use>
         </g>
         <path d="M12.4983883,12 C12.7483883,12 12.9983883,11.750207 12.9983883,11.5004141 L12.9983883,10.0016562 C12.9983883,9.50207031 12.7580083,9.26186939 12.4983883,9.00248437 C12.4983883,9.00248437 12.1650483,8.66946039 11.9983883,8.50289844 C11.8317283,8.3364364 11.4983883,8.0033125 10.9983883,8.0033125 L9,7.99751563 L9,5.99917188 L10.5,5.99917188 L11.5,5.99917188 C11.77699,5.99917188 12,5.74864852 12,5.49958594 C12,5.20454054 11.77699,5 11.5,5 L10.5,5 L9,5 L8.5,5 L6.5,5 L6,5 L5.5,5 C5.223,5 5,5.22281533 5,5.49958594 C5,5.77635655 5.223,5.99917188 5.5,5.99917188 L6,5.99917188 L6.5,5.99917188 L8,5.99917188 L8,7.99751563 L7,7.99751563 L4.85938,7.99751563 C4.68635,7.69936274 4.3698,7.49792969 4,7.49792969 C3.44772,7.49792969 3,7.94525894 3,8.49710156 C3,9.04894419 3.44772,9.49627344 4,9.49627344 C4.28852,9.49627344 4.53623,9.36378325 4.71875,9.16844515 L6.5,10.9950313 C7,11.5078063 7.375,11.9942031 7.625,11.9942031 L12.4983883,12 Z M4.5,8.49710156 C4.5,8.77307284 4.27614,8.9966875 4,8.9966875 C3.72386,8.9966875 3.5,8.77307284 3.5,8.49710156 C3.5,8.22113029 3.72386,7.99751563 4,7.99751563 C4.27614,7.99751563 4.5,8.22113029 4.5,8.49710156 Z" id="rect9361-1" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/historic-ship-l.svg b/data/styles/clear/style-night/symbols/historic-ship-l.svg
index 4b447e8f86..e7beab3236 100644
--- a/data/styles/clear/style-night/symbols/historic-ship-l.svg
+++ b/data/styles/clear/style-night/symbols/historic-ship-l.svg
@@ -10,7 +10,7 @@
         <g id="historic-ship-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.057,27 0,20.943 0,13.5 C0,6.057 6.057,0 13.5,0 C20.943,0 27,6.057 27,13.5 C27,20.943 20.943,27 13.5,27 L13.5,27 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M21.507,12.0784539 L19.891,12.2704539 C19.62,10.7494539 18.823,9.41445388 17.691,8.45745388 L18.665,7.15445388 C19.152,6.48445388 18.966,5.60645388 18.249,5.19245388 C17.532,4.77845388 16.678,5.05645388 16.341,5.81245388 L15.699,7.30945388 C15.011,7.06245388 14.272,6.91945388 13.499,6.91945388 C12.726,6.91945388 11.986,7.06245388 11.298,7.31045388 L10.655,5.81245388 C10.319,5.05545388 9.466,4.77845388 8.749,5.19145388 C8.032,5.60545388 7.846,6.48445388 8.331,7.15445388 L9.306,8.45845388 C8.176,9.41345388 7.381,10.7474539 7.108,12.2644539 L5.492,12.0764539 C4.668,11.9904539 4,12.5934539 4,13.4214539 C4,14.2494539 4.668,14.8524539 5.492,14.7664539 L7.108,14.5784539 C7.38,16.0934539 8.174,17.4254539 9.301,18.3804539 L8.331,19.6844539 C7.845,20.3564539 8.032,21.2354539 8.749,21.6494539 C9.466,22.0634539 10.322,21.7864539 10.659,21.0304539 L11.305,19.5354539 C11.992,19.7814539 12.728,19.9234539 13.499,19.9234539 C14.27,19.9234539 15.007,19.7814539 15.693,19.5354539 L16.338,21.0284539 C16.677,21.7864539 17.531,22.0634539 18.249,21.6494539 C18.966,21.2354539 19.153,20.3544539 18.667,19.6854539 L17.696,18.3804539 C18.825,17.4244539 19.62,16.0894539 19.891,14.5714539 L21.507,14.7634539 C22.33,14.8504539 22.998,14.2494539 22.998,13.4214539 C22.998,12.5934539 22.33,11.9914539 21.507,12.0784539 L21.507,12.0784539 Z M18.075,12.4864539 L14.346,12.9304539 L16.583,9.93845388 C17.326,10.5984539 17.87,11.4774539 18.075,12.4864539 L18.075,12.4864539 Z M13.498,8.74845388 C14.016,8.74845388 14.504,8.85245388 14.97,9.00845388 L13.497,12.4424539 L12.025,9.00945388 C12.491,8.85345388 12.98,8.74845388 13.498,8.74845388 L13.498,8.74845388 Z M10.412,9.94045388 L12.632,12.9084539 L8.923,12.4754539 C9.13,11.4714539 9.672,10.5964539 10.412,9.94045388 L10.412,9.94045388 Z M8.923,14.3654539 L12.605,13.9354539 L10.405,16.8934539 C9.668,16.2374539 9.129,15.3654539 8.923,14.3654539 L8.923,14.3654539 Z M13.498,18.0924539 C12.984,18.0924539 12.499,17.9884539 12.037,17.8354539 L13.498,14.4524539 L14.959,17.8354539 C14.496,17.9884539 14.012,18.0924539 13.498,18.0924539 L13.498,18.0924539 Z M16.592,16.8954539 L14.374,13.9144539 L18.075,14.3544539 C17.871,15.3594539 17.33,16.2354539 16.592,16.8954539 L16.592,16.8954539 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/historic-ship-m.svg b/data/styles/clear/style-night/symbols/historic-ship-m.svg
index 2aedee9269..260e87f2a6 100644
--- a/data/styles/clear/style-night/symbols/historic-ship-m.svg
+++ b/data/styles/clear/style-night/symbols/historic-ship-m.svg
@@ -10,7 +10,7 @@
         <g id="historic-ship-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M18,10.5203959 L17.416,10.5645183 C17.178,9.10946115 16.397,7.82893245 15.279,6.93766094 L15.615,6.4709445 C15.892,6.00128658 15.728,5.40318358 15.25,5.13158599 C14.771,4.8619494 14.16,5.02177036 13.883,5.49044779 L13.63,6.00716956 C12.967,5.75910389 12.251,5.61791236 11.5,5.61791236 C10.745,5.61791236 10.025,5.76106488 9.359,6.01109154 L9.114,5.49142829 C8.839,5.02078987 8.228,4.8609689 7.748,5.13158599 C7.271,5.40318358 7.106,6.00226707 7.383,6.471925 L7.712,6.94256342 C6.598,7.83481543 5.822,9.11142215 5.584,10.5635378 L5,10.5203959 C4.447,10.5203959 4,10.958678 4,11.5008926 C4,12.0431073 4.447,12.4813893 5,12.4813893 L5.582,12.4284425 C5.819,13.8834996 6.596,15.1640283 7.712,16.0582414 L7.383,16.5288798 C7.108,16.9985377 7.272,17.5976212 7.75,17.8672578 C8.229,18.1388554 8.84,17.9780539 9.115,17.5093765 L9.359,16.9897132 C10.025,17.2397399 10.745,17.3828924 11.5,17.3828924 C12.251,17.3828924 12.967,17.2407204 13.63,16.9936352 L13.883,17.5093765 C14.159,17.9790344 14.772,18.1398359 15.248,17.8672578 C15.728,17.5976212 15.892,16.9975572 15.615,16.5288798 L15.279,16.0631438 C16.4,15.1689308 17.18,13.8864411 17.418,12.427462 L18,12.4813893 C18.553,12.4813893 19,12.0431073 19,11.5008926 C19,10.958678 18.553,10.5203959 18,10.5203959 L18,10.5203959 Z M16.411,10.6400165 L13.892,10.8282719 C13.772,10.4154828 13.553,10.044855 13.249,9.7516865 L14.689,7.7544147 C15.573,8.47802127 16.201,9.48106941 16.411,10.6400165 L16.411,10.6400165 Z M11.5,6.59840908 C12.097,6.59840908 12.66,6.71802967 13.19,6.90530455 L12.103,9.13005159 C11.909,9.08200725 11.708,9.04965085 11.499,9.04965085 C11.267,9.04965085 11.047,9.09083172 10.833,9.14868102 L9.782,6.91412902 C10.32,6.71999067 10.894,6.59840908 11.5,6.59840908 L11.5,6.59840908 Z M8.289,7.77108314 L9.705,9.79875034 C9.425,10.0840749 9.222,10.4370537 9.107,10.8282719 L6.588,10.6400165 C6.797,9.49087438 7.417,8.49468972 8.289,7.77108314 L8.289,7.77108314 Z M6.586,12.3382368 L9.088,12.1127226 C9.197,12.5284532 9.41,12.9030029 9.705,13.2020544 L8.289,15.2297216 C7.411,14.5031736 6.79,13.4962034 6.586,12.3382368 L6.586,12.3382368 Z M11.5,16.4033762 C10.895,16.4033762 10.321,16.2817946 9.784,16.0886367 L10.835,13.8540847 C11.048,13.911934 11.268,13.9531149 11.5,13.9531149 C11.709,13.9531149 11.909,13.9207585 12.104,13.8727142 L13.192,16.0974612 C12.66,16.2837556 12.097,16.4033762 11.5,16.4033762 L11.5,16.4033762 Z M14.69,15.2463901 L13.25,13.2481378 C13.568,12.9422228 13.797,12.5500241 13.912,12.1127226 L16.414,12.3382368 C16.208,13.5060084 15.579,14.517881 14.69,15.2463901 L14.69,15.2463901 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/hospital-l.svg b/data/styles/clear/style-night/symbols/hospital-l.svg
index c51abf8ffa..c88a9f4dc2 100644
--- a/data/styles/clear/style-night/symbols/hospital-l.svg
+++ b/data/styles/clear/style-night/symbols/hospital-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="hospital-l-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#7F3A2E" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
+            <circle id="Oval-1-Copy-38" fill="#73342A" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
             <path d="M12,5.3622 C11.446,5.3622 11,5.8082 11,6.3622 L11,10.3622 L7,10.3622 C6.446,10.3622 6,10.8082 6,11.3622 L6,14.3622 C6,14.9162 6.446,15.3622 7,15.3622 L11,15.3622 L11,19.3622 C11,19.9162 11.446,20.3622 12,20.3622 L15,20.3622 C15.554,20.3622 16,19.9162 16,19.3622 L16,15.3622 L20,15.3622 C20.554,15.3622 21,14.9162 21,14.3622 L21,11.3622 C21,10.8082 20.554,10.3622 20,10.3622 L16,10.3622 L16,6.3622 C16,5.8082 15.554,5.3622 15,5.3622 L12,5.3622 Z" id="rect8206-4-copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-night/symbols/hospital-m.svg b/data/styles/clear/style-night/symbols/hospital-m.svg
index f43845c8f8..08606fc379 100644
--- a/data/styles/clear/style-night/symbols/hospital-m.svg
+++ b/data/styles/clear/style-night/symbols/hospital-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="hospital-m-copy" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
-            <ellipse id="Oval-1-Copy-40" fill="#7F3A2E" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+            <ellipse id="Oval-1-Copy-40" fill="#73342A" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
             <path d="M10,5 C9.446,5 9,5.446 9,6 L9,9 L6,9 C5.446,9 5,9.446 5,10 L5,13 C5,13.554 5.474429,14.1752 6,14 L9,14 L9,17 C9,17.554 9.446,18 10,18 L13,18 C13.554,18 14,17.554 14,17 L14,14 L17,14 C17.554,14 18,13.554 18,13 L18,10 C18,9.446 17.554,9 17,9 L14,9 L14,6 C14,5.446 13.554,5 13,5 L10,5 Z" id="rect8206-4-3-copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-night/symbols/hospital-s.svg b/data/styles/clear/style-night/symbols/hospital-s.svg
index 3d72488345..160810909f 100644
--- a/data/styles/clear/style-night/symbols/hospital-s.svg
+++ b/data/styles/clear/style-night/symbols/hospital-s.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="hospital-s-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-42" fill="#7F3A2E" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
+            <circle id="Oval-1-Copy-42" fill="#73342A" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
             <path d="M4,8 C4,7.446 4.446,7 5,7 L7,7 L7,5 C7,4.446 7.446,4 8,4 L9,4 C9.554,4 10,4.446 10,5 L10,7 L12,7 C12.554,7 13,7.446 13,8 L13,9 C13,9.554 12.554,10 12,10 L10,10 L10,12 C10,12.554 9.554,13 9,13 L8,13 C7.446,13 7,12.554 7,12 L7,10 L5,10 C4.446,10 4,9.554 4,9 L4,8 Z" id="path5535" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-night/symbols/hotel-l.svg b/data/styles/clear/style-night/symbols/hotel-l.svg
index 42904815fa..ff5f2dde70 100644
--- a/data/styles/clear/style-night/symbols/hotel-l.svg
+++ b/data/styles/clear/style-night/symbols/hotel-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="hotel-l-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#331E12" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
+            <circle id="Oval-1-Copy-38" fill="#2E1B10" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
             <path d="M7,8 C5.89543,8 5,8.8954 5,10 C5,11.1046 5.89543,12 7,12 C8.10457,12 9,11.1046 9,10 C9,8.8954 8.10457,8 7,8 L7,8 Z M10,10 C10,11.6569 8.65686,13 7,13 L5.5,13 C5.24741,13 4.9987,13 5,13.5 C5.00035,13.636 5,14.1157 5,14.5 C5,15 5.38857,15 5.5,15 L22,15 L22,13 C22,12 22,10 17,10 L10,10 Z M6,16 C5.5,16 5,16.5 5,17 C4.99976,17.9907 5,19.1445 5,20 C5,20.5 5.5,21 6,21 C6.5,21 7,20.5 7,20 L7,18 L20,18 L20,20 C20,20.5 20.5,21 21,21 C21.5,21 22,20.5 22,20 L22,17 C22,16.5 21.5,16 21,16 L6,16 Z" id="path4536" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-night/symbols/hotel-m.svg b/data/styles/clear/style-night/symbols/hotel-m.svg
index 94854489ef..155ade50ff 100644
--- a/data/styles/clear/style-night/symbols/hotel-m.svg
+++ b/data/styles/clear/style-night/symbols/hotel-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="hotel-m-copy" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
-            <ellipse id="Oval-1-Copy-40" fill="#331E12" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+            <ellipse id="Oval-1-Copy-40" fill="#2E1B10" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
             <path d="M6.49999,7.75 C5.67157,7.75 5,8.4215 5,9.25 C5,10.0784 5.67157,10.7499 6.49999,10.7499 C7.32842,10.7499 7.99998,10.0784 7.99998,9.25 C7.99998,8.4215 7.32842,7.75 6.49999,7.75 L6.49999,7.75 Z M9,8.9999 C9,10.9999 8,11.9999 6.5,11.9999 L5.5,11.9999 C5,11.9999 5,12.4999 5,12.4999 C5,12.4999 5,12.9999 5.5,12.9999 L18,12.9999 L18,11.2498 C18,10.4998 18,8.9999 14.25003,8.9999 L9,8.9999 Z M5.74999,13.9999 C5.37499,13.9999 4.99999,14.3749 4.99999,14.7499 C4.99981,15.4929 4.99999,15.6083 4.99999,16.2499 C4.99999,16.6249 5.37499,16.9999 5.74999,16.9999 C6.12499,16.9999 6.49998,16.6249 6.49998,16.2499 L6.5,14.9999 L16.50002,14.9999 L16.5,16.2499 C16.49999,16.6249 16.875,16.9999 17.25,16.9999 C17.625,16.9999 17.99999,16.6249 17.99999,16.2499 L17.99999,14.7499 C17.99999,14.3749 17.625,13.9999 17.25,13.9999 L5.74999,13.9999 Z" id="path4536-7" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-night/symbols/hotel-s.svg b/data/styles/clear/style-night/symbols/hotel-s.svg
index daf96fc996..2f0d6271bb 100644
--- a/data/styles/clear/style-night/symbols/hotel-s.svg
+++ b/data/styles/clear/style-night/symbols/hotel-s.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="hotel-s-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-42" fill="#331E12" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
+            <circle id="Oval-1-Copy-42" fill="#2E1B10" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
             <path d="M5,6 C4.44771,6 4,6.4477 4,7 C4,7.5523 4.44771,8 5,8 C5.55228,8 6,7.5523 6,7 C6,6.4477 5.55228,6 5,6 L5,6 Z M7,7 C7,8 6.5,9 5,9 L4.25,9 C4.1237,9 3.99935,9 4,9.25 C4.00017,9.318 4,9.5579 4,9.75 C4,10 4.19428,10 4.25,10 L13,10 L13,8.5 C13,8 13,7 10.5,7 L7,7 Z M4.5,11 C4.25,11 4,11.25 4,11.5 C3.99988,11.9954 4,12.0723 4,12.5 C4,12.75 4.25,13 4.5,13 C4.75,13 5,12.75 5,12.5 L5,12 L12,12 L12,12.5 C12,12.75 12.25,13 12.5,13 C12.75,13 13,12.75 13,12.5 L13,11.5 C13,11.25 12.75,11 12.5,11 L4.5,11 Z" id="path4536-6" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-night/symbols/hunting-tower-l.svg b/data/styles/clear/style-night/symbols/hunting-tower-l.svg
index 03184c84e0..18980e8bb2 100644
--- a/data/styles/clear/style-night/symbols/hunting-tower-l.svg
+++ b/data/styles/clear/style-night/symbols/hunting-tower-l.svg
@@ -11,7 +11,7 @@
             <g id="Layer_2">
                 <path d="M13.5,27 C6.056,27 0,20.943 0,13.5 C0,6.056 6.056,0 13.5,0 C20.944,0 27,6.056 27,13.5 C27,20.943 20.944,27 13.5,27 L13.5,27 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
                 <g id="Shape">
-                    <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                    <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                     <use fill="none" xlink:href="#path-1"></use>
                 </g>
             </g>
diff --git a/data/styles/clear/style-night/symbols/hunting-tower-m.svg b/data/styles/clear/style-night/symbols/hunting-tower-m.svg
index 667a2c5041..15841701f6 100644
--- a/data/styles/clear/style-night/symbols/hunting-tower-m.svg
+++ b/data/styles/clear/style-night/symbols/hunting-tower-m.svg
@@ -11,7 +11,7 @@
             <g id="Layer_2">
                 <path d="M11.5,23 C5.159,23 0,17.842 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.842 17.841,23 11.5,23 L11.5,23 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
                 <g id="Shape">
-                    <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                    <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                     <use fill="none" xlink:href="#path-1"></use>
                 </g>
             </g>
diff --git a/data/styles/clear/style-night/symbols/information-l.svg b/data/styles/clear/style-night/symbols/information-l.svg
index 3599d11811..b27b6f3ce9 100644
--- a/data/styles/clear/style-night/symbols/information-l.svg
+++ b/data/styles/clear/style-night/symbols/information-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="information-l" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#331E12" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
+            <circle id="Oval-1-Copy-38" fill="#2E1B10" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
             <path d="M11.0635378,11.7954545 L11.0635378,11.2941176 C11.4659448,11.0935825 11.7483321,11.0100272 12.1013216,10.9231283 C12.454311,10.8362295 12.8284742,10.7593586 13.2238224,10.6925134 C13.6191706,10.6256681 14.010983,10.5688505 14.3992714,10.5220588 C14.7875598,10.4752671 15.1299545,10.4518717 15.4264656,10.4518717 L15.8076923,10.6925134 L13.9015588,19.4358289 L15.3841071,19.4358289 L15.3841071,20.1176471 C15.2005526,20.2379685 14.9852322,20.3516037 14.7381396,20.4585561 C14.491047,20.5655086 14.2298387,20.6590905 13.9545069,20.7393048 C13.6791752,20.8195191 13.4003177,20.8830212 13.1179261,20.9298128 C12.8355346,20.9766045 12.5672666,21 12.3131142,21 C11.7765702,21 11.5118332,20.9030758 11.3070993,20.7092246 C11.1023654,20.5153734 11,20.304814 11,20.0775401 C11,19.8101591 11.021179,19.5494665 11.0635378,19.2954545 C11.1058965,19.0414426 11.162374,18.7606967 11.2329719,18.4532086 L12.5672653,12.1363636 L11.0635378,11.7954545 Z M14.3653846,9.00802139 C15.1619492,9.00802139 15.8076923,8.33465287 15.8076923,7.5040107 C15.8076923,6.67336852 15.1619492,6 14.3653846,6 C13.5688201,6 12.9230769,6.67336852 12.9230769,7.5040107 C12.9230769,8.33465287 13.5688201,9.00802139 14.3653846,9.00802139 Z" id="i" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-night/symbols/information-m.svg b/data/styles/clear/style-night/symbols/information-m.svg
index de523f0cbc..db08cf7dda 100644
--- a/data/styles/clear/style-night/symbols/information-m.svg
+++ b/data/styles/clear/style-night/symbols/information-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="information-m-copy" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
-            <ellipse id="Oval-1-Copy-40" fill="#331E12" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+            <ellipse id="Oval-1-Copy-40" fill="#2E1B10" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
             <path d="M9.06353778,9.79545455 L9.06353778,9.29411765 C9.46594481,9.09358249 9.74833213,9.01002717 10.1013216,8.92312834 C10.454311,8.83622951 10.8284742,8.75935862 11.2238224,8.69251337 C11.6191706,8.62566811 12.010983,8.5688505 12.3992714,8.52205882 C12.7875598,8.47526714 13.1299545,8.45187166 13.4264656,8.45187166 L13.8076923,8.69251337 L11.9015588,17.4358289 L13.3841071,17.4358289 L13.3841071,18.1176471 C13.2005526,18.2379685 12.9852322,18.3516037 12.7381396,18.4585561 C12.491047,18.5655086 12.2298387,18.6590905 11.9545069,18.7393048 C11.6791752,18.8195191 11.4003177,18.8830212 11.1179261,18.9298128 C10.8355346,18.9766045 10.5672666,19 10.3131142,19 C9.77657023,19 9.51183317,18.9030758 9.30709929,18.7092246 C9.10236541,18.5153734 9,18.304814 9,18.0775401 C9,17.8101591 9.02117905,17.5494665 9.06353778,17.2954545 C9.10589652,17.0414426 9.16237398,16.7606967 9.23297187,16.4532086 L10.5672653,10.1363636 L9.06353778,9.79545455 Z M12.3653846,7.00802139 C13.1619492,7.00802139 13.8076923,6.33465287 13.8076923,5.5040107 C13.8076923,4.67336852 13.1619492,4 12.3653846,4 C11.5688201,4 10.9230769,4.67336852 10.9230769,5.5040107 C10.9230769,6.33465287 11.5688201,7.00802139 12.3653846,7.00802139 Z" id="i-copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-night/symbols/information-s.svg b/data/styles/clear/style-night/symbols/information-s.svg
index 7e48b28e89..549b3453e4 100644
--- a/data/styles/clear/style-night/symbols/information-s.svg
+++ b/data/styles/clear/style-night/symbols/information-s.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="information-s" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-42" fill="#331E12" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
+            <circle id="Oval-1-Copy-42" fill="#2E1B10" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
             <path d="M7.03964758,7.89163498 L7.03964758,7.55893536 C7.29074956,7.42585525 7.46695925,7.37040586 7.68722467,7.31273764 C7.90749009,7.25506942 8.14096793,7.20405599 8.3876652,7.15969582 C8.63436247,7.11533565 8.87885341,7.07763007 9.12114537,7.04657795 C9.36343733,7.01552583 9.57709159,7 9.76211454,7 L10,7.15969582 L8.81057269,11.9619772 L9.73568282,11.9619772 L9.73568282,12.4144487 C9.6211448,12.494297 9.48678491,12.5697081 9.33259912,12.6406844 C9.17841333,12.7116607 9.01541936,12.773764 8.84361233,12.8269962 C8.67180531,12.8802284 8.49779824,12.9223699 8.3215859,12.9534221 C8.14537357,12.9844742 7.97797436,13 7.81938326,13 C7.48457982,13 7.3193839,12.9356787 7.19162996,12.8070342 C7.06387601,12.6783897 7,12.5386573 7,12.3878327 C7,12.210392 7.01321573,12.0373899 7.03964758,11.8688213 C7.06607943,11.7002526 7.10132137,11.5139427 7.14537445,11.3098859 L7.97797357,8.11787072 L7.03964758,7.89163498 Z M9,6 C9.55228475,6 10,5.55228475 10,5 C10,4.44771525 9.55228475,4 9,4 C8.44771525,4 8,4.44771525 8,5 C8,5.55228475 8.44771525,6 9,6 Z" id="i-copy-2" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-night/symbols/jewelry-l.svg b/data/styles/clear/style-night/symbols/jewelry-l.svg
index 43f8d1a4a3..953750b5b7 100644
--- a/data/styles/clear/style-night/symbols/jewelry-l.svg
+++ b/data/styles/clear/style-night/symbols/jewelry-l.svg
@@ -10,7 +10,7 @@
         <g id="jewelry-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.057,27 0,20.943 0,13.5 C0,6.057 6.057,0 13.5,0 C20.943,0 27,6.057 27,13.5 C27,20.943 20.943,27 13.5,27 L13.5,27 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M14.674,8.102 L17,5 L17,4 L10,4 L10,5 L12.326,8.102 C8.747,8.668 6,11.765 6,15.5 C6,19.636 9.364,23 13.5,23 C17.636,23 21,19.636 21,15.5 C21,11.765 18.253,8.668 14.674,8.102 L14.674,8.102 Z M13.5,21 C10.463,21 8,18.537 8,15.5 C8,12.463 10.463,10 13.5,10 C16.537,10 19,12.463 19,15.5 C19,18.537 16.537,21 13.5,21 L13.5,21 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/jewelry-m.svg b/data/styles/clear/style-night/symbols/jewelry-m.svg
index effdde6d15..527faf3317 100644
--- a/data/styles/clear/style-night/symbols/jewelry-m.svg
+++ b/data/styles/clear/style-night/symbols/jewelry-m.svg
@@ -10,7 +10,7 @@
         <g id="jewelry-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M12.489,8.094 L15,6 L15,5 L8,5 L8,6 L10.395,8.111 C7.887,8.623 6,10.84 6,13.5 C6,16.538 8.463,19 11.5,19 C14.537,19 17,16.538 17,13.5 C17,10.801 15.054,8.561 12.489,8.094 L12.489,8.094 Z M11.5,17.29 C9.41,17.29 7.71,15.59 7.71,13.5 C7.71,11.41 9.41,9.71 11.5,9.71 C13.59,9.71 15.29,11.41 15.29,13.5 C15.29,15.59 13.59,17.29 11.5,17.29 L11.5,17.29 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/kindergarten-l.svg b/data/styles/clear/style-night/symbols/kindergarten-l.svg
index a9ab376334..b80837d0ed 100644
--- a/data/styles/clear/style-night/symbols/kindergarten-l.svg
+++ b/data/styles/clear/style-night/symbols/kindergarten-l.svg
@@ -10,7 +10,7 @@
         <g id="kindergarten-l-copy" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-46" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" rx="13.5" ry="13.5"></ellipse>
             <g id="Oval-1-Copy-38">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <g id="icons2-01" transform="translate(5.000000, 7.000000)" fill="#FFFFFF" opacity="0.7" sketch:type="MSShapeGroup">
diff --git a/data/styles/clear/style-night/symbols/kindergarten-m.svg b/data/styles/clear/style-night/symbols/kindergarten-m.svg
index 16e97c4fa2..3b9ff60f4e 100644
--- a/data/styles/clear/style-night/symbols/kindergarten-m.svg
+++ b/data/styles/clear/style-night/symbols/kindergarten-m.svg
@@ -10,7 +10,7 @@
         <g id="kindergarten-m-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-38" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="12.5" cy="12.5" r="12.5"></circle>
             <g id="Oval-1-Copy-47">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M19.4733392,14.5186499 C19.4110071,14.5024828 19.3480256,14.4934293 19.2830963,14.4934293 C18.9623455,14.4934293 18.6779551,14.7094208 18.5928977,15.0178877 C18.4026548,15.7111299 18.0968377,16.3519909 17.7014182,16.9197769 C17.2995057,15.1892582 16.2820633,10.7950599 16.2820633,10.6657236 C16.2820633,10.3294494 16.556065,10.05461 16.8943467,10.05461 C17.0501771,10.05461 17.1910737,10.1134579 17.300155,10.2072267 L17.7910295,11.0664304 C17.8988121,11.2520279 18.1020409,11.3761906 18.3351371,11.3761906 C18.6838076,11.3761906 18.9707952,11.0929443 18.9707952,10.7430898 L18.9675487,8.46894781 C18.9487192,8.46894781 18.5714799,7.88046797 18.618229,7.81321313 L19.7324338,7.23425798 L16.3924431,7.0701765 C14.5068957,7.0701765 12.9797582,8.59181722 12.9797582,10.4691326 C12.9797582,10.6786573 12.9972891,11.291711 13.036896,11.4915355 L7.13741822,11.4915355 C6.8738052,11.4915355 6.65888915,11.7030002 6.65888915,11.9661994 C6.65888915,12.228752 6.8738052,12.4408634 7.13741822,12.4408634 L8.47885792,12.4408634 L7.3588272,17.0019054 C6.93548805,16.4134256 6.60629641,15.7466974 6.40631411,15.0191811 C6.3212567,14.7107142 6.03816488,14.4947227 5.71676476,14.4947227 C5.65248474,14.4947227 5.58820471,14.5037762 5.52717115,14.5199432 C5.34277189,14.5703844 5.18888941,14.6893737 5.09409261,14.8549241 C4.9992958,15.0204744 4.97527196,15.2125387 5.02591682,15.3955495 C5.94531596,18.7375976 9.01842055,21.0701765 12.4999305,21.0701765 C15.9820898,21.0701765 19.0545451,18.7363043 19.9739443,15.3955495 C20.0252384,15.2112454 19.999916,15.0191811 19.9057685,14.8536307 C19.8109717,14.6880803 19.6570892,14.5697377 19.4733392,14.5186499 Z M12.4999305,19.6429512 C11.0000633,19.6429512 9.59629147,19.1087926 8.49249308,18.205379 C8.85934372,16.3325905 10.5104963,14.9182988 12.4999305,14.9182988 C14.4893648,14.9182988 16.1405174,16.3332371 16.5067187,18.2060257 C15.4042189,19.1087926 14.0004471,19.6429512 12.4999305,19.6429512 L12.4999305,19.6429512 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/kindergarten-s.svg b/data/styles/clear/style-night/symbols/kindergarten-s.svg
index 943f94cd26..0731b33517 100644
--- a/data/styles/clear/style-night/symbols/kindergarten-s.svg
+++ b/data/styles/clear/style-night/symbols/kindergarten-s.svg
@@ -10,7 +10,7 @@
         <g id="kindergarten-s-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-38" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
             <g id="Oval-1-Copy-48">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M13.6137821,9.83659341 C13.5680719,9.82542179 13.5218855,9.81916567 13.4742706,9.81916567 C13.2390534,9.81916567 13.0305004,9.96841861 12.968125,10.1815733 C12.8286135,10.6606126 12.6043476,11.1034559 12.3143733,11.4958034 C12.0196375,10.2999925 11.0735131,7.1635443 11.0735131,7.07417129 C11.0735131,6.84180145 11.1744477,6.65188379 11.4225209,6.65188379 C11.5367965,6.65188379 11.6401207,6.69254851 11.7201136,6.75734395 L12.3067549,7.38196355 C12.3857956,7.51021383 12.53483,7.59601192 12.7057672,7.59601192 C12.9614589,7.59601192 13.1719164,7.40028502 13.1719164,7.15853101 L13.1695357,5.65617063 C13.1557274,5.65617063 12.8790852,5.24952341 12.9133679,5.20304944 L13.5837848,4.94118651 L11.3544583,4.68960147 C9.97172354,4.68960147 8.85182268,5.74107499 8.85182268,7.03832431 C8.85182268,7.18310859 8.86467868,7.60673668 8.89372373,7.74481799 L4.56744003,7.74481799 C4.37412381,7.74481799 4.21651871,7.89094287 4.21651871,8.07281696 C4.21651871,8.25424418 4.37412381,8.40081592 4.56744003,8.40081592 L5.55116247,8.40081592 L4.72980661,11.5525553 C4.4193579,11.1459081 4.1779507,10.6851902 4.03129701,10.182467 C3.96892158,9.96931234 3.76132091,9.8200594 3.52562749,9.8200594 C3.47848881,9.8200594 3.43135012,9.82631552 3.38659218,9.83748714 C3.25136605,9.87234262 3.1385189,9.95456579 3.06900125,10.0689633 C2.99948359,10.1833607 2.9818661,10.3160796 3.01900567,10.4425425 C3.6932317,12.7519412 5.94684173,14.3637835 8.49994906,14.3637835 C11.0535325,14.3637835 13.3066664,12.7510474 13.9808925,10.4425425 C14.0185082,10.3151859 13.9999384,10.182467 13.9308969,10.0680695 C13.8613792,9.95367206 13.7485321,9.87189575 13.6137821,9.83659341 Z M5.56116159,12.3841712 C5.83018539,11.09005 7.04103059,10.112756 8.49994906,10.112756 C9.95886754,10.112756 11.1697127,11.0904968 11.4382604,12.3846181 C10.6297605,13.0084417 9.60032785,13.3775523 8.49994906,13.3775523 C7.40004643,13.3775523 6.37061375,13.0084417 5.56116159,12.3841712 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/kiosk-l.svg b/data/styles/clear/style-night/symbols/kiosk-l.svg
index 10aeb78d68..daa7d8cb16 100644
--- a/data/styles/clear/style-night/symbols/kiosk-l.svg
+++ b/data/styles/clear/style-night/symbols/kiosk-l.svg
@@ -10,7 +10,7 @@
         <g id="kiosk-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.057,27 0,20.943 0,13.5 C0,6.057 6.057,0 13.5,0 C20.943,0 27,6.057 27,13.5 C27,20.943 20.943,27 13.5,27 L13.5,27 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M4,7 L4,9 L23,9 L23,7 L4,7 L4,7 Z M6,22 L21,22 L21,11 L6,11 L6,22 L6,22 Z M14,13 L19,13 L19,20 L14,20 L14,13 L14,13 Z M8,13 L13,13 L13,20 L8,20 L8,13 L8,13 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/kiosk-m.svg b/data/styles/clear/style-night/symbols/kiosk-m.svg
index 90af51c7cf..8bb18bd18e 100644
--- a/data/styles/clear/style-night/symbols/kiosk-m.svg
+++ b/data/styles/clear/style-night/symbols/kiosk-m.svg
@@ -10,7 +10,7 @@
         <g id="kiosk-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M4,6 L4,8 L19,8 L19,6 L4,6 L4,6 Z M6,19 L17,19 L17,10 L6,10 L6,19 L6,19 Z M12,12 L15,12 L15,17 L12,17 L12,12 L12,12 Z M8,12 L11,12 L11,17 L8,17 L8,12 L8,12 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/laundry-l.svg b/data/styles/clear/style-night/symbols/laundry-l.svg
index 3ec7a1005b..7818fc853a 100644
--- a/data/styles/clear/style-night/symbols/laundry-l.svg
+++ b/data/styles/clear/style-night/symbols/laundry-l.svg
@@ -10,7 +10,7 @@
         <g id="Layer_2" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.056,27 0,20.944 0,13.5 C0,6.056 6.056,0 13.5,0 C20.944,0 27,6.056 27,13.5 C27,20.944 20.944,27 13.5,27 L13.5,27 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
         </g>
diff --git a/data/styles/clear/style-night/symbols/laundry-m.svg b/data/styles/clear/style-night/symbols/laundry-m.svg
index e9a1800d82..9fd5d482e9 100644
--- a/data/styles/clear/style-night/symbols/laundry-m.svg
+++ b/data/styles/clear/style-night/symbols/laundry-m.svg
@@ -10,7 +10,7 @@
         <g id="Layer_2" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
         </g>
diff --git a/data/styles/clear/style-night/symbols/library-l.svg b/data/styles/clear/style-night/symbols/library-l.svg
index 1f877b1a4b..8bac3a0b3a 100644
--- a/data/styles/clear/style-night/symbols/library-l.svg
+++ b/data/styles/clear/style-night/symbols/library-l.svg
@@ -10,7 +10,7 @@
         <g id="library-l-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
             <g id="Oval-1-Copy-38">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M5,7 L5,17 C8,20 12,19 12,21 L13,21 L13,12 C13,9 8,9 5,7 L5,7 Z M22,7 C19,9 14,9 14,12 L14,21 L15,21 C15,19 19,20 22,17 L22,7 Z" id="path7994-9-9-copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/library-m.svg b/data/styles/clear/style-night/symbols/library-m.svg
index 86760b0dc6..d5adf9e057 100644
--- a/data/styles/clear/style-night/symbols/library-m.svg
+++ b/data/styles/clear/style-night/symbols/library-m.svg
@@ -10,7 +10,7 @@
         <g id="library-m-copy" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
             <g id="Oval-1-Copy-40">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M5,7 L5,14.6471 C7,17.1471 10,16.1177 10,17.6471 L11,17.6471 L11,10.7647 C11,8.4706 8,9.1471 5,7 L5,7 Z M18,7 C15,9.1471 12,8.4706 12,10.7647 L12,17.6471 L13,17.6471 C13,16.1177 16,17.1471 18,14.6471 L18,7 Z" id="path7994-9-9-2-1-copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/library-s.svg b/data/styles/clear/style-night/symbols/library-s.svg
index 9e506e0295..e8ccea45a9 100644
--- a/data/styles/clear/style-night/symbols/library-s.svg
+++ b/data/styles/clear/style-night/symbols/library-s.svg
@@ -10,7 +10,7 @@
         <g id="library-s-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
             <g id="Oval-1-Copy-42">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M4,5.3622 L4,11.3622 C5.5,12.8622 7.75,12.3622 7.75,13.3622 L8.25,13.3622 L8.25,7.8622 C8.25,6.3622 5.5,6.3622 4,5.3622 L4,5.3622 Z M13,5.3622 C11.5,6.3622 8.75,6.3622 8.75,7.8622 L8.75,13.3622 L9.25,13.3622 C9.25,12.3622 11.5,12.8622 13,11.3622 L13,5.3622 Z" id="path7994-9-9-2-copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/lighthouse-l.svg b/data/styles/clear/style-night/symbols/lighthouse-l.svg
index afe021ca71..2ec1c0ac40 100644
--- a/data/styles/clear/style-night/symbols/lighthouse-l.svg
+++ b/data/styles/clear/style-night/symbols/lighthouse-l.svg
@@ -10,7 +10,7 @@
         <g id="lighthouse-l-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
             <g id="Oval-1-Copy-38">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M13.5,4 L10.6875,5.5 C10.1097686,5.8081 10.125,6.5 10.125,6.5 L10.125,10 L9,10 L9,12 L10.125,13 L10.125,14 L9,23 L18,23 L16.875,14 L16.875,13 L18,12 L18,10 L16.875,10 L16.875,6.5 C16.875,6.5 16.880625,5.803 16.3125,5.5 L13.5,4 Z M14.625,8 L14.625,10 L12.375,10 L12.375,8 C12.375,8 12.375,7 13.5,7 C14.625,7 14.625,8 14.625,8 L14.625,8 Z" id="rect4650-copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/lighthouse-m.svg b/data/styles/clear/style-night/symbols/lighthouse-m.svg
index c62171c909..87f074360b 100644
--- a/data/styles/clear/style-night/symbols/lighthouse-m.svg
+++ b/data/styles/clear/style-night/symbols/lighthouse-m.svg
@@ -10,7 +10,7 @@
         <g id="lighthouse-m-copy" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
             <g id="Oval-1-Copy-40">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M11.5,4 L9.0000002,6 L9.0000002,9 L8,9 L8,10 L9.0000002,11 L8,19 L15,19 L14,11 L15,10 L15,9 L14,9 L14,6 L11.5,4 Z M11.5,6 L12.5,7 L12.5,9 L10.5,9 L10.5,7 L11.5,6 Z" id="rect4650" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/lighthouse-s.svg b/data/styles/clear/style-night/symbols/lighthouse-s.svg
index 444deb1980..6f81d3a5a9 100644
--- a/data/styles/clear/style-night/symbols/lighthouse-s.svg
+++ b/data/styles/clear/style-night/symbols/lighthouse-s.svg
@@ -10,7 +10,7 @@
         <g id="lighthouse-s-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
             <g id="Oval-1-Copy-42">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M8,4 L7,5 L7,7 L6,7 L6,8 L7,9 L7,10 L6,14 L11,14 L10,10 L10,9 L11,8 L11,7 L10,7 L10,5 L9,4 L8,4 Z M8,5 L9,5 L9,7 L8,7 L8,5 Z" id="path5217" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/mail-l.svg b/data/styles/clear/style-night/symbols/mail-l.svg
index 59147d1390..ec10257f3c 100644
--- a/data/styles/clear/style-night/symbols/mail-l.svg
+++ b/data/styles/clear/style-night/symbols/mail-l.svg
@@ -10,7 +10,7 @@
         <g id="mail-l-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
             <g id="Oval-1-Copy-38">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M6,8 C5,8 5.5,8.3393 6,8.75 L13,14.5 L21,8.75 C21.5,8.3393 22,8 21,8 L13,8 L6,8 Z M5,9.5 L5,18 C5,18.5 5.50625,19 5.90625,19 L21.09375,19 C21.49375,19 22,18.5 22,18 L22,9.5 L13,16 L5,9.5 Z" id="path7085" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/mail-m.svg b/data/styles/clear/style-night/symbols/mail-m.svg
index a683361486..7655537420 100644
--- a/data/styles/clear/style-night/symbols/mail-m.svg
+++ b/data/styles/clear/style-night/symbols/mail-m.svg
@@ -10,7 +10,7 @@
         <g id="mail-m-copy" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
             <g id="Oval-1-Copy-40">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M6,7 C5.1875,7 5.40625,7.3382 5.8125,7.6719 L11.5,12 L17.1875,7.6719 C17.60585,7.3535 17.8125,7 17,7 L6,7 Z M5,8.5 L5,15 C5,15.5 5.5,16 6,16 L17,16 C17.5,16 18,15.5 18,15 L18,8.5 L11.5,13.5 L5,8.5 Z" id="path7085-23-copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/mail-s.svg b/data/styles/clear/style-night/symbols/mail-s.svg
index 14eae3a00d..a221a3ed00 100644
--- a/data/styles/clear/style-night/symbols/mail-s.svg
+++ b/data/styles/clear/style-night/symbols/mail-s.svg
@@ -10,7 +10,7 @@
         <g id="mail-s-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
             <g id="Oval-1-Copy-42">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M4,6 L8.5,9 L13,6 L4,6 Z M4,7 L4,11.5 C4,11.75 4.3,12 4.5,12 L12.5,12 C12.7,12 13.05423,11.744 13,11.5 L13.00003,7 L8.5,10.5 L4,7 Z" id="path7085-2-copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/marketplace-l.svg b/data/styles/clear/style-night/symbols/marketplace-l.svg
index 853263ee06..ae75ecd076 100644
--- a/data/styles/clear/style-night/symbols/marketplace-l.svg
+++ b/data/styles/clear/style-night/symbols/marketplace-l.svg
@@ -10,7 +10,7 @@
         <g id="marketplace-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.056,27 0,20.943 0,13.5 C0,6.057 6.056,0 13.5,0 C20.944,0 27,6.057 27,13.5 C27,20.943 20.944,27 13.5,27 L13.5,27 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M7,22 L20,22 L20,18 L7,18 L7,22 L7,22 Z M19,11 L17,11 L17,15 L10,15 L10,11 L8,11 L8,15 L6,15 L6,17 L21,17 L21,15 L19,15 L19,11 L19,11 Z M6,5 L6,7 C6,8.1048 7.119,9 8.5,9 C9.881,9 11,8.1048 11,7 C11,8.1048 12.119,9 13.5,9 C14.881,9 16,8.1048 16,7 C16,8.1048 17.119,9 18.5,9 C19.881,9 21,8.1048 21,7 L21,5 L6,5 L6,5 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/marketplace-m.svg b/data/styles/clear/style-night/symbols/marketplace-m.svg
index a8f970c834..a0b1a0936d 100644
--- a/data/styles/clear/style-night/symbols/marketplace-m.svg
+++ b/data/styles/clear/style-night/symbols/marketplace-m.svg
@@ -10,7 +10,7 @@
         <g id="marketplace-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M6,4 L6,6.167 C6,7.179 6.82,8 7.834,8 C8.846,8 9.666,7.179 9.666,6.167 C9.666,7.179 10.487,8 11.5,8 C12.513,8 13.334,7.179 13.334,6.167 C13.334,7.179 14.154,8 15.166,8 C16.18,8 17,7.179 17,6.167 L17,4 L6,4 L6,4 Z M16,9 L14,9 L14,12 L9,12 L9,9 L7,9 L7,12 L6,12 L6,14 L17,14 L17,12 L16,12 L16,9 L16,9 Z M7,19 L16,19 L16,15 L7,15 L7,19 L7,19 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/military-l.svg b/data/styles/clear/style-night/symbols/military-l.svg
index cbe603f1be..09a98d6e3d 100644
--- a/data/styles/clear/style-night/symbols/military-l.svg
+++ b/data/styles/clear/style-night/symbols/military-l.svg
@@ -10,7 +10,7 @@
         <g id="military-l-copy" sketch:type="MSLayerGroup" transform="translate(0.000000, 0.019000)">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
             <g id="Oval-1-Copy-38">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M17.1029057,12.3396 L20.0072222,12.3396 C21.3605556,12.3396 22.4583333,14.1457875 22.4583333,16.3761 L20.615822,16.3761 C20.6490971,16.5201634 20.6666667,16.6700577 20.6666667,16.82395 C20.6666667,17.937136 19.6530546,19.4607756 18.519926,19.4607756 L7.8651208,19.4607756 C6.73199224,19.4607756 5.79055556,17.937136 5.79055556,16.82395 C5.79055556,16.670046 5.80809411,16.5201534 5.84131218,16.3761 L4.67944444,16.3761 C4.67944444,14.1457875 5.77722222,12.3396 7.13166667,12.3396 L8.02733294,12.3396 L8.02733294,6.94850297 L15.4141499,6.94850297 L16.2465142,9.6057 L22.9912688,9.6057 L22.9912688,10.981 L16.6773256,10.981 L17.1029057,12.3396 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/military-m.svg b/data/styles/clear/style-night/symbols/military-m.svg
index dcb79b0511..582b7622bd 100644
--- a/data/styles/clear/style-night/symbols/military-m.svg
+++ b/data/styles/clear/style-night/symbols/military-m.svg
@@ -10,7 +10,7 @@
         <g id="military-m" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
             <g id="Oval-1-Copy-40">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M14.5688918,10.122 L17.4065,10.122 C18.6245,10.122 19.6125,11.511375 19.6125,13.227 L17.9542398,13.227 C17.9841874,13.337818 18,13.4531213 18,13.5715 C18,14.4277969 17.0678353,15.4963591 16.0480196,15.4963591 L6.45869491,15.4963591 C5.43887921,15.4963591 4.6115,14.4277969 4.6115,13.5715 C4.6115,13.4531123 4.6272847,13.3378103 4.65718096,13.227 L3.6115,13.227 C3.6115,11.511375 4.5995,10.122 5.8185,10.122 L6.6115,10.122 L6.6115,6.019 L13.2945,6.019 L13.9157,8.019 L20.0532028,8.019 L20.0532028,9.00950677 L14.2233514,9.00950677 L14.5688918,10.122 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/military-s.svg b/data/styles/clear/style-night/symbols/military-s.svg
index e7155c0716..b276296ba1 100644
--- a/data/styles/clear/style-night/symbols/military-s.svg
+++ b/data/styles/clear/style-night/symbols/military-s.svg
@@ -10,7 +10,7 @@
         <g id="military-s-copy" sketch:type="MSLayerGroup" transform="translate(0.000000, 0.019000)">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
             <g id="Oval-1-Copy-42">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M11.033347,7.97893641 L12.4405343,7.97893641 C13.2389406,7.97893641 14.014549,8.67695893 14.014549,9.95445007 L13.8294799,9.95445007 L13.4354903,9.95445007 C13.4354903,9.95445007 13.0925936,9.95445007 12.5272656,9.95445006 C12.5378674,10.0310317 12.5464286,10.1103852 12.5464286,10.1916869 C12.5464286,10.8293039 12.0198608,11.4870979 11.3708209,11.4870979 L5.26790069,11.4870979 C4.61886084,11.4870979 4.02560464,10.8293039 4.02560464,10.1916869 C4.02560464,10.1103795 4.03415063,10.0310267 4.05040709,9.95444999 C3.80830543,9.95444998 3.34072847,9.95444998 3.34072847,9.95444998 L2.94673891,9.95445007 C2.94673891,8.67695893 4.04546905,7.97893641 4.84453085,7.97893641 L5.01233991,7.97893641 L5.00678353,4.9270054 L9.53179704,4.9270054 L10.0608464,6.0023091 L14.0034124,6.00230908 L14.0034122,6.98099997 L10.5423623,6.98099999 L11.033347,7.97893641 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/mobile_phone-l.svg b/data/styles/clear/style-night/symbols/mobile_phone-l.svg
index 2a3312832b..c7c01955e2 100644
--- a/data/styles/clear/style-night/symbols/mobile_phone-l.svg
+++ b/data/styles/clear/style-night/symbols/mobile_phone-l.svg
@@ -10,7 +10,7 @@
         <g id="mobile_phone-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.057,27 0,20.944 0,13.5 C0,6.056 6.057,0 13.5,0 C20.943,0 27,6.056 27,13.5 C27,20.944 20.943,27 13.5,27 L13.5,27 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M18,4 C17.447,4 17,4.448 17,5 L17,6 L10,6 C8.896,6 8,6.896 8,8 L8,21 C8,22.104 8.896,23 10,23 L17,23 C18.104,23 19,22.104 19,21 L19,5 C19,4.448 18.553,4 18,4 L18,4 Z M13,21 L11,21 C10.447,21 10,20.552 10,20 L10,19 L13,19 L13,21 L13,21 Z M13,18 L10,18 L10,17 C10,16.448 10.447,16 11,16 L13,16 L13,18 L13,18 Z M17,20 C17,20.552 16.553,21 16,21 L14,21 L14,19 L17,19 L17,20 L17,20 Z M17,18 L14,18 L14,16 L16,16 C16.553,16 17,16.448 17,17 L17,18 L17,18 Z M17,14 L10,14 L10,8 L17,8 L17,14 L17,14 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/mobile_phone-m.svg b/data/styles/clear/style-night/symbols/mobile_phone-m.svg
index 61eb9fec39..10bb71c996 100644
--- a/data/styles/clear/style-night/symbols/mobile_phone-m.svg
+++ b/data/styles/clear/style-night/symbols/mobile_phone-m.svg
@@ -10,7 +10,7 @@
         <g id="mobile_phone-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M15,4 C14.447,4 14,4.448 14,5 L14,6 L9,6 C7.896,6 7,6.896 7,8 L7,17 C7,18.104 7.896,19 9,19 L14,19 C15.104,19 16,18.104 16,17 L16,5 C16,4.448 15.553,4 15,4 L15,4 Z M11,17 L9,17 L9,16 L11,16 L11,17 L11,17 Z M11,15 L9,15 L9,14 L11,14 L11,15 L11,15 Z M14,17 L12,17 L12,16 L14,16 L14,17 L14,17 Z M14,15 L12,15 L12,14 L14,14 L14,15 L14,15 Z M14,12 L9,12 L9,8 L14,8 L14,12 L14,12 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/monument-l.svg b/data/styles/clear/style-night/symbols/monument-l.svg
index 7c4b4c7f83..7ea81b9a82 100644
--- a/data/styles/clear/style-night/symbols/monument-l.svg
+++ b/data/styles/clear/style-night/symbols/monument-l.svg
@@ -10,14 +10,14 @@
         <g id="monument-l-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
             <g id="Oval-1-Copy-38">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M11,7 L11,16 L9,16 C8.44599,16 8,16.446 8,17 L8,19 L7,19 C6.44601,19 6,19.446 6,20 L6,21 L21,21 L21,20 C21,19.446 20.55399,19 20,19 L19,19 L19,17 C19,16.446 18.55401,16 18,16 L16,16 L16,7 C16,6 13.5,4 13.5,4 C13.5,4 10.90946,6.0041 11,7 Z" id="path11719" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
         <g id="monument-l-copy-2" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#331E12" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
+            <circle id="Oval-1-Copy-38" fill="#2E1B10" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
             <path d="M11,7 L11,16 L9,16 C8.44599,16 8,16.446 8,17 L8,19 L7,19 C6.44601,19 6,19.446 6,20 L6,21 L21,21 L21,20 C21,19.446 20.55399,19 20,19 L19,19 L19,17 C19,16.446 18.55401,16 18,16 L16,16 L16,7 C16,6 13.5,4 13.5,4 C13.5,4 10.90946,6.0041 11,7 Z" id="path11719" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-night/symbols/monument-m.svg b/data/styles/clear/style-night/symbols/monument-m.svg
index 6f7422b950..d09bfc6f3c 100644
--- a/data/styles/clear/style-night/symbols/monument-m.svg
+++ b/data/styles/clear/style-night/symbols/monument-m.svg
@@ -10,14 +10,14 @@
         <g id="monument-m-copy" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
             <g id="Oval-1-Copy-40">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M10,6.5 L10,14 L9,14 C8.56908,14 8,14.5136 8,14.9445 L8,16.5 L7,16.5 C6.5,16.5 6,17 6,17.5 L6,18 L17,18 L17,17.5 C17,17 16.5,16.5 16,16.5 L15,16.5 L15,15 C15,14.5 14.5,14 14,14 L13,14 L13,6.5 C13,5.7223 11.44444,4 11.44444,4 C11.44444,4 10,5.7223 10,6.5 Z" id="path11719-5" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
         <g id="monument-m-copy-2" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
-            <ellipse id="Oval-1-Copy-40" fill="#331E12" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+            <ellipse id="Oval-1-Copy-40" fill="#2E1B10" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
             <path d="M10,6.5 L10,14 L9,14 C8.56908,14 8,14.5136 8,14.9445 L8,16.5 L7,16.5 C6.5,16.5 6,17 6,17.5 L6,18 L17,18 L17,17.5 C17,17 16.5,16.5 16,16.5 L15,16.5 L15,15 C15,14.5 14.5,14 14,14 L13,14 L13,6.5 C13,5.7223 11.44444,4 11.44444,4 C11.44444,4 10,5.7223 10,6.5 Z" id="path11719-5" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-night/symbols/monument-s.svg b/data/styles/clear/style-night/symbols/monument-s.svg
index 1368e041e8..8a3dd99e2b 100644
--- a/data/styles/clear/style-night/symbols/monument-s.svg
+++ b/data/styles/clear/style-night/symbols/monument-s.svg
@@ -10,14 +10,14 @@
         <g id="monument-s-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
             <g id="Oval-1-Copy-42">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M8.5,4 C8.5,4 7,5.5 7,6 L7,10 L6.5,10 C6.22299,10 6.03629,10.2254 6,10.5 L6,12 L5.5,12 C5.223,12 5,12.223 5,12.5 L5,13 L12,13 L12,12.5 C12,12.223 11.77699,12 11.5,12 L11,12 L11,10.5 C11,10.223 10.777,10 10.5,10 L10,10 L10,6 C10,5.5 8.5,4 8.5,4 L8.5,4 Z" id="path11719-7" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
         <g id="monument-s-copy-2" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-42" fill="#331E12" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
+            <circle id="Oval-1-Copy-42" fill="#2E1B10" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
             <path d="M8.5,4 C8.5,4 7,5.5 7,6 L7,10 L6.5,10 C6.22299,10 6.03629,10.2254 6,10.5 L6,12 L5.5,12 C5.223,12 5,12.223 5,12.5 L5,13 L12,13 L12,12.5 C12,12.223 11.77699,12 11.5,12 L11,12 L11,10.5 C11,10.223 10.777,10 10.5,10 L10,10 L10,6 C10,5.5 8.5,4 8.5,4 L8.5,4 Z" id="path11719-7" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-night/symbols/motel-l.svg b/data/styles/clear/style-night/symbols/motel-l.svg
index 54a0ccbbf1..7f6b3ed540 100644
--- a/data/styles/clear/style-night/symbols/motel-l.svg
+++ b/data/styles/clear/style-night/symbols/motel-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="motel-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.057,27 0,20.943 0,13.5 C0,6.057 6.057,0 13.5,0 C20.943,0 27,6.057 27,13.5 C27,20.943 20.943,27 13.5,27 L13.5,27 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#331E12" sketch:type="MSShapeGroup"></path>
+            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#2E1B10" sketch:type="MSShapeGroup"></path>
             <path d="M7,14 L22,14 L22,19 L20,19 L20,16 L7,16 L7,19 L5,19 L5,14 L7,14 L7,14 L7,14 Z M7,13 C8.104,13 9,12.104 9,11 C9,9.896 8.104,9 7,9 C5.896,9 5,9.896 5,11 C5,12.104 5.896,13 7,13 L7,13 Z M21.02,10.804 L10.981,9.197 C10.44,9.089 10.001,9.448 10.001,10.001 L10.001,13.001 L22.001,13.001 L22.001,12.001 C22,11.447 21.561,10.912 21.02,10.804 L21.02,10.804 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-night/symbols/motel-m.svg b/data/styles/clear/style-night/symbols/motel-m.svg
index da5e099b5f..7a41640b9a 100644
--- a/data/styles/clear/style-night/symbols/motel-m.svg
+++ b/data/styles/clear/style-night/symbols/motel-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="motel-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#331E12" sketch:type="MSShapeGroup"></path>
+            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#2E1B10" sketch:type="MSShapeGroup"></path>
             <path d="M7,12 L18,12 L18,16 L16,16 L16,14 L7,14 L7,16 L5,16 L5,12 L7,12 L7,12 L7,12 Z M6.5,11 C7.328,11 8,10.328 8,9.5 C8,8.672 7.328,8 6.5,8 C5.672,8 5,8.672 5,9.5 C5,10.328 5.672,11 6.5,11 L6.5,11 Z M17.02,8.804 L9.981,8.197 C9.44,8.089 9.001,8.448 9.001,9.001 L9.001,11.001 L18.001,11.001 L18.001,10.001 C18,9.447 17.561,8.912 17.02,8.804 L17.02,8.804 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-night/symbols/museum-l.svg b/data/styles/clear/style-night/symbols/museum-l.svg
index 06b70a5474..d98714f83a 100644
--- a/data/styles/clear/style-night/symbols/museum-l.svg
+++ b/data/styles/clear/style-night/symbols/museum-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="museum-l-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#331E12" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
+            <circle id="Oval-1-Copy-38" fill="#2E1B10" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
             <path d="M13.5,3.3622 L7,8.3622 L20,8.3622 L13.5,3.3622 Z M8,9.3622 C7.44599,9.3622 7.07835,9.8138 7,10.3622 L7,17.3622 L5.25,20.3622 C5.10167,20.6165 5,20.7189 5,20.8622 C5,21.3622 5.63165,21.3622 6,21.3622 L21,21.3622 C21.35499,21.3622 22,21.3622 22,20.8622 C22,20.716 21.9134,20.6423 21.75,20.3622 L20,17.3622 L20,10.3622 C20,9.8082 19.55401,9.3622 19,9.3622 L8,9.3622 Z M10,11.3622 L11.5,11.3622 C12,11.3622 12.5,12.3622 12.5,12.3622 L13.5,14.8622 L14.5,12.3622 C14.72318,11.8042 15,11.3622 15.5,11.3622 L17,11.3622 C17.554,11.3622 18,11.8082 18,12.3622 L18,17.3622 C18,17.8622 17.5,18.3622 17,18.3622 C16.5,18.3622 16,17.8622 16,17.3622 L16,13.3622 L14.5,16.3622 C14.5,16.3622 14,17.3622 13.5,17.3622 C13,17.3622 12.5,16.3622 12.5,16.3622 L11,13.3622 L11,17.3622 C11,17.8622 10.5,18.3622 10,18.3622 C9.5,18.3622 9,17.8622 9,17.3622 L9,16.3622 L9,12.3622 C9,11.8082 9.446,11.3622 10,11.3622 L10,11.3622 Z" id="rect7645-6-5-0" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-night/symbols/museum-m.svg b/data/styles/clear/style-night/symbols/museum-m.svg
index bff6cbd739..694fc0c39c 100644
--- a/data/styles/clear/style-night/symbols/museum-m.svg
+++ b/data/styles/clear/style-night/symbols/museum-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="museum-m-copy" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
-            <ellipse id="Oval-1-Copy-40" fill="#331E12" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+            <ellipse id="Oval-1-Copy-40" fill="#2E1B10" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
             <path d="M11.5,5.3622 L7,8.3622 L16,8.3622 L11.5,5.3622 Z M8,9.3622 C7.5,9.3622 7,9.8622 7,10.3067 L7,15.3622 L6,16.8622 C6,17.2233 6.23397,17.3622 6.5,17.3622 L16.5,17.3622 C16.75638,17.3622 17,17.2233 17,16.8622 L16,15.3622 L16,10.3067 C16,9.8622 15.5,9.3622 15,9.3622 L8,9.3622 Z M10,10.8622 C10.5,10.8622 10.5,10.8622 11,11.8622 L11.5,12.8622 L12,11.8622 C12.5,10.8622 12.5,10.8622 13,10.8622 C13.5,10.8622 14,11.3622 14,11.8622 L14,15.3622 C14,15.7233 13.86111,15.8622 13.5,15.8622 C13.13889,15.8622 13,15.7233 13,15.3622 L13,12.4733 L12,14.3622 C11.7353,14.8622 11.2647,14.8622 11,14.3622 L10,12.4733 L10,15.3622 C10,15.7233 9.86111,15.8622 9.5,15.8622 C9.13889,15.8622 8.99995,15.7233 8.99995,15.3622 L8.99995,14.64 L9,11.8622 C9.00001,11.3622 9.5,10.8622 10,10.8622 L10,10.8622 Z" id="rect7645-6-5-0-1" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-night/symbols/museum-s.svg b/data/styles/clear/style-night/symbols/museum-s.svg
index 3cc46894f0..4f118ec16e 100644
--- a/data/styles/clear/style-night/symbols/museum-s.svg
+++ b/data/styles/clear/style-night/symbols/museum-s.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="museum-s-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-42" fill="#331E12" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
+            <circle id="Oval-1-Copy-42" fill="#2E1B10" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
             <g id="museum-12-copy" transform="translate(2.000000, 2.000000)" sketch:type="MSShapeGroup">
                 <g id="g21713" transform="translate(2.000000, 1.000000)" fill="#FFFFFF" opacity="0.7">
                     <path d="M4.5,0.3622 L1,2.3622 L8,2.3622 L4.5,0.3622 Z M1.5,3.3622 C1.22299,3.3622 1,3.5852 1,3.8622 L1,7.3622 L1,8.3622 L0,9.3622 L9,9.3622 L8,8.3622 L8,7.3622 L8,3.8622 C8,3.5852 7.777,3.3622 7.5,3.3622 L1.5,3.3622 Z M2.5,4.3622 L3.25,4.3622 C3.5,4.3622 3.75,4.8622 3.75,4.8622 L4.5,6.3622 L5.25,4.8622 C5.38438,4.5935 5.5,4.3622 5.75,4.3622 L6.5,4.3622 C6.777,4.3622 7,4.5852 7,4.8622 L7,7.3622 C7,7.6122 6.75,7.8622 6.5,7.8622 C6.25,7.8622 6,7.6122 6,7.3622 L6,5.3622 L5.25,6.8622 C5.13059,7.101 5,7.3622 4.5,7.3622 C4,7.3622 3.8694,7.101 3.75,6.8622 L3,5.3622 L3,7.3622 C3,7.6122 2.75,7.8622 2.5,7.8622 C2.25,7.8622 2,7.6122 2,7.3622 L2,6.8622 L2,4.8622 C2,4.5852 2.223,4.3622 2.5,4.3622 L2.5,4.3622 Z" id="rect7645-6-5-0-0"></path>
diff --git a/data/styles/clear/style-night/symbols/npark-l.svg b/data/styles/clear/style-night/symbols/npark-l.svg
index cd4eab5acd..0bc877518b 100644
--- a/data/styles/clear/style-night/symbols/npark-l.svg
+++ b/data/styles/clear/style-night/symbols/npark-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="npark-l" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-44" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-45" fill="#173809" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
+            <circle id="Oval-1-Copy-45" fill="#153308" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
             <path d="M20,13.5002001 C20,12.4301001 19.320222,11.5131001 18.375,11.1565001 C18.76954,10.7145001 19,10.1393001 19,9.50020008 C19,8.11950008 17.880712,7.00020008 16.5,7.00020008 C16.303249,7.00020008 16.121152,7.01920008 15.9375,7.06220008 C15.728193,5.89300008 14.729365,4.99970008 13.5,5.00000008 C12.270635,5.00020008 11.271807,5.89350008 11.0625,7.06270008 C10.878848,7.01970008 10.696751,7.00070008 10.5,7.00070008 C9.119288,7.00070008 8,8.12000008 8,9.50070008 C8,10.1398001 8.23046,10.7150001 8.625,11.1570001 C7.679778,11.5136001 7,12.4301001 7,13.5002001 C7,14.8809001 8,16.0007001 9.5,16.0007001 L10,16.0007001 L12,19.5007001 L12,23.0002001 L15,23.0002001 L15,19.5002001 L17,16.0007001 L17.71875,15.9857001 C19,16.0002001 20,14.8052001 20,13.5002001 L20,13.5002001 Z M12,16.0002001 L15,16.0002001 L14,18.0002001 L13,18.0002001 L12,16.0002001 Z" id="path4390-3-copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-night/symbols/npark-m.svg b/data/styles/clear/style-night/symbols/npark-m.svg
index 2100dfdad4..ea2eb38425 100644
--- a/data/styles/clear/style-night/symbols/npark-m.svg
+++ b/data/styles/clear/style-night/symbols/npark-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="npark-m" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
-            <ellipse id="Oval-1-Copy-40" fill="#173809" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+            <ellipse id="Oval-1-Copy-40" fill="#153308" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
             <path d="M16,12 C16,11 15,10 14.5,10 C14.80686,9.6563 15.11108,8.9972 15.11108,8.5001 C15.11108,7.4263 14,6.5 13,6.5 C13,5.5 12.5,5 11.5,5 C10.5,5 10,5.5 10,6.5 C9,6.5 7.88892,7.4266 7.88892,8.5005 C7.88892,8.9976 8.19314,9.6563 8.5,10 C8,10 7,11 7,12 C7,13 7.5,14.056 9.05557,14.056 L9.44446,14.056 L9.49996,15 L10.99996,16.5 L10.99992,19 L11.99992,19 L11.99996,16.4996 L13.49996,15 L13.55546,14.056 L14.11448,14.044 C15.5,14 16,13 16,12 L16,12 Z M10.5,14 L12.5,14 L12.5,14.5 L11.5,15.5 L10.5,14.5 L10.5,14 Z" id="path4390-3-6" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-night/symbols/npark-s.svg b/data/styles/clear/style-night/symbols/npark-s.svg
index 9bfe146e62..8338ceead1 100644
--- a/data/styles/clear/style-night/symbols/npark-s.svg
+++ b/data/styles/clear/style-night/symbols/npark-s.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="npark-s" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-42" fill="#173809" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
+            <circle id="Oval-1-Copy-42" fill="#153308" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
             <path d="M7.84375,4.00711111 C7.28125,4.05411111 7,4.75711111 7,5.50711111 C6,5.00711111 5.5,5.25711111 5.5,6.25711111 C5.5,7.25711111 6.5,7.50711111 6.5,7.50711111 C6.5,7.50711111 5,7.26101111 5,8.75711111 C5,9.44741111 5.80965,10.0071111 6.5,10.0071111 L6.5,11.0071111 L8,11.0071111 L8,14.0071111 L9,14.0071111 L9,11.0071111 L10.5,11.0071111 L10.5,10.0071111 C11.5,10.0071111 12,9.40951111 12,8.75711111 C12,7.26111111 10.5,7.50711111 10.5,7.50711111 C10.5,7.50711111 11.5,7.25711111 11.5,6.25711111 C11.5,5.25711111 10.5,5.00711111 10,5.50711111 C10,4.50711111 9.5,4.00711111 8.5,4.00711111 C8.25,4.00711111 8.03125,3.99111111 7.84375,4.00711111 L7.84375,4.00711111 Z M7.5,10.0071111 L9.5,10.0071111 L9,11.0071111 L8,11.0071111 L7.5,10.0071111 Z" id="path4390-3-8" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-night/symbols/nparkF-l.svg b/data/styles/clear/style-night/symbols/nparkF-l.svg
index cb886ad07b..7776fb3384 100644
--- a/data/styles/clear/style-night/symbols/nparkF-l.svg
+++ b/data/styles/clear/style-night/symbols/nparkF-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="nparkF-l" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-52" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
-            <ellipse id="Oval-1-Copy-53" fill="#173809" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" rx="12.5" ry="12.5"></ellipse>
+            <ellipse id="Oval-1-Copy-53" fill="#153308" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" rx="12.5" ry="12.5"></ellipse>
             <path d="M13.5,5 L8,9.87164526 L11.0555556,9.87164526 L8,13.8987163 L11.0555556,13.8987163 L8,17.9720917 L12.983552,17.9720917 L12.983552,21.8951683 L14.0407867,21.8951683 L14.0407867,17.9720917 L19,17.9720917 L15.9444447,13.8987163 L19,13.8987163 L15.9444447,9.87164545 L19,9.87164545 L13.5,5 Z" id="rect4152-3-3-5-copy-2" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-night/symbols/nparkF-m.svg b/data/styles/clear/style-night/symbols/nparkF-m.svg
index ea6b1e1bcc..9dadfd8dfa 100644
--- a/data/styles/clear/style-night/symbols/nparkF-m.svg
+++ b/data/styles/clear/style-night/symbols/nparkF-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="nparkF-m" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-54" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" r="11.5"></circle>
-            <circle id="Oval-1-Copy-49" fill="#173809" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" r="10.5"></circle>
+            <circle id="Oval-1-Copy-49" fill="#153308" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" r="10.5"></circle>
             <path d="M11.5,5 L7.5,9 L10,9 L7,12 L9.5,12 L7,15 L11,15 L11,18 L12,18 L12,15 L16,15 L13.5,12 L16,12 L13,9 L15.5,9 L11.5,5 Z" id="rect4152-3-3-5" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-night/symbols/nparkF-s.svg b/data/styles/clear/style-night/symbols/nparkF-s.svg
index 42d53aaa7a..34274791bc 100644
--- a/data/styles/clear/style-night/symbols/nparkF-s.svg
+++ b/data/styles/clear/style-night/symbols/nparkF-s.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="nparkF-s" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-50" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
-            <ellipse id="Oval-1-Copy-51" fill="#173809" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" rx="7.5" ry="7.5"></ellipse>
+            <ellipse id="Oval-1-Copy-51" fill="#153308" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" rx="7.5" ry="7.5"></ellipse>
             <path d="M8.5,4 L5,7.16404878 L7.04377508,7.16404878 L5,9.13098417 L7.04377508,9.13098417 L5,11.0880935 L5.68400832,11.0880935 L7.99911189,11.0880935 L7.99911189,13.1035326 L8.99568152,13.103533 L8.99568152,11.0880939 L12,11.0880935 L9.9828372,9.13098417 L12,9.13098417 L9.9828372,7.16404878 L12,7.16404878 L8.5,4 Z" id="rect4152-3-3-5-copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-night/symbols/office-l.svg b/data/styles/clear/style-night/symbols/office-l.svg
index 8fd596de60..db9c572b27 100644
--- a/data/styles/clear/style-night/symbols/office-l.svg
+++ b/data/styles/clear/style-night/symbols/office-l.svg
@@ -9,7 +9,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
         <g id="Oval-1-Copy-38">
-            <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+            <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
             <use fill="none" xlink:href="#path-1"></use>
         </g>
         <path d="M21,8 L17,8 L17,6 C17,5.447 16.552,5 16,5 L11,5 C10.448,5 10,5.447 10,6 L10,8 L6,8 C5.448,8 5,8.447 5,9 L5,19 C5,19.553 5.448,20 6,20 L21,20 C21.552,20 22,19.553 22,19 L22,9 C22,8.447 21.552,8 21,8 L21,8 Z M9,19 L8,19 L8,9 L9,9 L9,19 Z M16,8 L11,8 L11,6 L16,6 L16,8 Z M19,19 L18,19 L18,9 L19,9 L19,19 Z" id="path19" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/office-m.svg b/data/styles/clear/style-night/symbols/office-m.svg
index 26dff201db..73ab0c6af2 100644
--- a/data/styles/clear/style-night/symbols/office-m.svg
+++ b/data/styles/clear/style-night/symbols/office-m.svg
@@ -9,7 +9,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
         <g id="Oval-1-Copy-40">
-            <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+            <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
             <use fill="none" xlink:href="#path-1"></use>
         </g>
         <path d="M17,7 L14,7 L14,6 C14,5.447 13.552,5 13,5 L10,5 C9.448,5 9,5.447 9,6 L9,7 L6,7 C5.448,7 5,7.447 5,8 L5,15 C5,15.553 5.448,16 6,16 L17,16 C17.552,16 18,15.553 18,15 L18,8 C18,7.447 17.552,7 17,7 L17,7 Z M10,6 L13,6 L13,7 L10,7 L10,6 Z M8,15 L7,15 L7,8 L8,8 L8,15 Z M16,15 L15,15 L15,8 L16,8 L16,15 Z" id="path17" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/office-s.svg b/data/styles/clear/style-night/symbols/office-s.svg
index 5e5c0f5ace..18c07c5500 100644
--- a/data/styles/clear/style-night/symbols/office-s.svg
+++ b/data/styles/clear/style-night/symbols/office-s.svg
@@ -9,7 +9,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
         <g id="Oval-1-Copy-42">
-            <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+            <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
             <use fill="none" xlink:href="#path-1"></use>
         </g>
         <path d="M11,6 L11,4.5 L10.5,4 L6.5,4 L6,4.5 L6,6 L4.5,6 L4,6.5 L4,11.5 L4.5,12 L12.5,12 L13,11.499 L13,6.5 L12.5,6 L11,6 Z M7,5 L10,5 L10,6 L7,6 L7,5 Z M6,7 L7,7 L7,11 L6,11 L6,7 Z M11,11 L10,11 L10,7 L11,7 L11,11 Z" id="path17" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/optician-l.svg b/data/styles/clear/style-night/symbols/optician-l.svg
index 562ded957a..b9144451c8 100644
--- a/data/styles/clear/style-night/symbols/optician-l.svg
+++ b/data/styles/clear/style-night/symbols/optician-l.svg
@@ -10,7 +10,7 @@
         <g id="optician-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.057,27 0,20.943 0,13.5 C0,6.056 6.057,0 13.5,0 C20.943,0 27,6.056 27,13.5 C27,20.943 20.943,27 13.5,27 L13.5,27 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M15.424,6.265 C15.19,6.119 15,6.223 15,6.5 L15,7.2 C15,7.476 15.192,7.815 15.429,7.957 L20,11 L7,11 L11.571,7.857 C11.807,7.715 12,7.476 12,7.2 L12,6.5 C12,6.224 11.811,6.119 11.576,6.265 L4,11 L4,16 C4,17.104 5.96,18.127 7.999,18.127 C9.948,18.127 11.97,17.192 12.417,14.5 C12.516,13.906 12.598,13.414 12.666,13 L14.334,13 C14.402,13.414 14.484,13.906 14.583,14.5 C15.03,17.192 17.052,18.127 19.001,18.127 C21.04,18.127 23,17.105 23,16 L23,11 L15.424,6.265 L15.424,6.265 Z M10.444,14.172 C10.363,14.655 10.119,16.127 7.999,16.127 C7.061,16.127 6.32,15.823 6,15.612 L6,13 L10.639,13 C10.582,13.341 10.518,13.729 10.444,14.172 L10.444,14.172 Z M21,15.612 C20.68,15.822 19.938,16.127 19.001,16.127 C16.881,16.127 16.637,14.656 16.556,14.172 C16.483,13.729 16.418,13.34 16.362,13 L21,13 L21,15.612 L21,15.612 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/optician-m.svg b/data/styles/clear/style-night/symbols/optician-m.svg
index 564a84fd2a..85e8abc2d2 100644
--- a/data/styles/clear/style-night/symbols/optician-m.svg
+++ b/data/styles/clear/style-night/symbols/optician-m.svg
@@ -10,7 +10,7 @@
         <g id="optician-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M18.862,9 L13.334,5.353 C13.149,5.237 13,5.32 13,5.539 L13,6.091 C13,6.309 13.151,6.576 13.338,6.689 L16.508,9.001 L5.974,9.001 L6.37,8.792 L9.662,6.311 C9.849,6.199 10.001,6.01 10.001,5.792 L10.001,5.24 C10.001,5.022 9.851,4.939 9.666,5.054 L4,8.791 L4,13.104 C4,14.01 5.548,14.85 7.157,14.85 C8.696,14.85 10.292,14.083 10.645,11.873 C10.697,11.546 10.743,11.26 10.784,11.001 L12.216,11.001 C12.258,11.26 12.303,11.546 12.356,11.873 C12.71,14.083 14.305,14.85 15.844,14.85 C17.452,14.85 19,14.011 19,13.104 L19,9 L18.862,9 L18.862,9 Z M9.164,11.635 C9.097,12.059 8.891,13.349 7.157,13.349 C6.356,13.349 5.73,13.055 5.5,12.875 L5.5,10.5 L9.346,10.5 C9.295,10.819 9.234,11.194 9.164,11.635 L9.164,11.635 Z M17.5,12.875 C17.27,13.055 16.644,13.349 15.844,13.349 C14.111,13.349 13.905,12.059 13.837,11.635 C13.767,11.194 13.706,10.819 13.655,10.5 L17.5,10.5 L17.5,12.875 L17.5,12.875 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/park-l.svg b/data/styles/clear/style-night/symbols/park-l.svg
index 98f4d01c95..7e7bd3833b 100644
--- a/data/styles/clear/style-night/symbols/park-l.svg
+++ b/data/styles/clear/style-night/symbols/park-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="park-l" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#173809" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
+            <circle id="Oval-1-Copy-38" fill="#153308" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
             <path d="M20,13.5002001 C20,12.4301001 19.320222,11.5131001 18.375,11.1565001 C18.76954,10.7145001 19,10.1393001 19,9.50020008 C19,8.11950008 17.880712,7.00020008 16.5,7.00020008 C16.303249,7.00020008 16.121152,7.01920008 15.9375,7.06220008 C15.728193,5.89300008 14.729365,4.99970008 13.5,5.00000008 C12.270635,5.00020008 11.271807,5.89350008 11.0625,7.06270008 C10.878848,7.01970008 10.696751,7.00070008 10.5,7.00070008 C9.119288,7.00070008 8,8.12000008 8,9.50070008 C8,10.1398001 8.23046,10.7150001 8.625,11.1570001 C7.679778,11.5136001 7,12.4301001 7,13.5002001 C7,14.8809001 8,16.0007001 9.5,16.0007001 L10,16.0007001 L12,19.5007001 L12,23.0002001 L15,23.0002001 L15,19.5002001 L17,16.0007001 L17.71875,15.9857001 C19,16.0002001 20,14.8052001 20,13.5002001 L20,13.5002001 Z M12,16.0002001 L15,16.0002001 L14,18.0002001 L13,18.0002001 L12,16.0002001 Z" id="path4390-3" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-night/symbols/park-m.svg b/data/styles/clear/style-night/symbols/park-m.svg
index 87ef7a6d91..3cf86185a2 100644
--- a/data/styles/clear/style-night/symbols/park-m.svg
+++ b/data/styles/clear/style-night/symbols/park-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="park-m" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
-            <ellipse id="Oval-1-Copy-40" fill="#173809" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+            <ellipse id="Oval-1-Copy-40" fill="#153308" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
             <path d="M16,12 C16,11 15,10 14.5,10 C14.80686,9.6563 15.11108,8.9972 15.11108,8.5001 C15.11108,7.4263 14,6.5 13,6.5 C13,5.5 12.5,5 11.5,5 C10.5,5 10,5.5 10,6.5 C9,6.5 7.88892,7.4266 7.88892,8.5005 C7.88892,8.9976 8.19314,9.6563 8.5,10 C8,10 7,11 7,12 C7,13 7.5,14.056 9.05557,14.056 L9.44446,14.056 L9.49996,15 L10.99996,16.5 L10.99992,19 L11.99992,19 L11.99996,16.4996 L13.49996,15 L13.55546,14.056 L14.11448,14.044 C15.5,14 16,13 16,12 L16,12 Z M10.5,14 L12.5,14 L12.5,14.5 L11.5,15.5 L10.5,14.5 L10.5,14 Z" id="path4390-3-6" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-night/symbols/park-s.svg b/data/styles/clear/style-night/symbols/park-s.svg
index 0aba484eb5..0caa9fdaca 100644
--- a/data/styles/clear/style-night/symbols/park-s.svg
+++ b/data/styles/clear/style-night/symbols/park-s.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="park-s" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-42" fill="#173809" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
+            <circle id="Oval-1-Copy-42" fill="#153308" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
             <path d="M7.84375,4.00711111 C7.28125,4.05411111 7,4.75711111 7,5.50711111 C6,5.00711111 5.5,5.25711111 5.5,6.25711111 C5.5,7.25711111 6.5,7.50711111 6.5,7.50711111 C6.5,7.50711111 5,7.26101111 5,8.75711111 C5,9.44741111 5.80965,10.0071111 6.5,10.0071111 L6.5,11.0071111 L8,11.0071111 L8,14.0071111 L9,14.0071111 L9,11.0071111 L10.5,11.0071111 L10.5,10.0071111 C11.5,10.0071111 12,9.40951111 12,8.75711111 C12,7.26111111 10.5,7.50711111 10.5,7.50711111 C10.5,7.50711111 11.5,7.25711111 11.5,6.25711111 C11.5,5.25711111 10.5,5.00711111 10,5.50711111 C10,4.50711111 9.5,4.00711111 8.5,4.00711111 C8.25,4.00711111 8.03125,3.99111111 7.84375,4.00711111 L7.84375,4.00711111 Z M7.5,10.0071111 L9.5,10.0071111 L9,11.0071111 L8,11.0071111 L7.5,10.0071111 Z" id="path4390-3-8" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-night/symbols/parking-l.svg b/data/styles/clear/style-night/symbols/parking-l.svg
index a415d6e1e8..8336bdf066 100644
--- a/data/styles/clear/style-night/symbols/parking-l.svg
+++ b/data/styles/clear/style-night/symbols/parking-l.svg
@@ -7,7 +7,7 @@
     <g id="Other" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="parking-l" sketch:type="MSLayerGroup">
             <rect id="Rectangle-346-Copy-3" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" x="0" y="0" width="21" height="21" rx="2"></rect>
-            <rect id="Rectangle-346" fill="#12314C" sketch:type="MSShapeGroup" x="1" y="1" width="19" height="19" rx="2"></rect>
+            <rect id="Rectangle-346" fill="#0F2940" sketch:type="MSShapeGroup" x="1" y="1" width="19" height="19" rx="2"></rect>
             <path d="M9.42187501,10.3749332 L10.2187499,10.3749332 C10.9635366,10.3749332 11.5208272,10.2291999 11.8906245,9.93746654 C12.2604099,9.64066655 12.4453059,9.21093323 12.4453125,8.64839991 C12.4453059,8.08066659 12.2890552,7.6614666 11.9765619,7.39053327 C11.6692645,7.11973328 11.1848899,6.98439995 10.5234374,6.98439995 L9.42187501,6.98439995 L9.42187501,10.3749332 M14.8906245,8.56253324 C14.8906151,9.79159988 14.5051991,10.7317332 13.7343752,11.3827998 C12.9687419,12.0338665 11.8775979,12.3593331 10.4609374,12.3593331 L9.42187501,12.3593331 L9.42187501,16.4218664 L7,16.4218664 L7,5 L10.6484374,5 C12.0338472,5 13.0859298,5.29946666 13.8046872,5.89839998 C14.5286365,6.4921333 14.8906151,7.38013327 14.8906245,8.56253324" id="path15189-copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-night/symbols/parking-m.svg b/data/styles/clear/style-night/symbols/parking-m.svg
index aa8dc67a3f..99a07e566a 100644
--- a/data/styles/clear/style-night/symbols/parking-m.svg
+++ b/data/styles/clear/style-night/symbols/parking-m.svg
@@ -7,7 +7,7 @@
     <g id="Other" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="parking-m" sketch:type="MSLayerGroup">
             <rect id="Rectangle-346-Copy-4" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" x="0" y="0" width="16" height="16" rx="2"></rect>
-            <rect id="Rectangle-346-Copy" fill="#12314C" sketch:type="MSShapeGroup" x="1" y="1" width="14" height="14" rx="2"></rect>
+            <rect id="Rectangle-346-Copy" fill="#0F2940" sketch:type="MSShapeGroup" x="1" y="1" width="14" height="14" rx="2"></rect>
             <path d="M5,4 L5,13 L7,13 L7,9.79375 L7.65978507,9.79375 C8.72829181,9.79375 9.56053545,9.54715 10.138009,9.03442 C10.7193961,8.52169 10.9999914,7.78054 11,6.8125 C10.9999914,5.88145 10.7379203,5.17072 10.1918835,4.70317 C9.64976876,4.23148 8.83941106,4.00009 7.79447115,4 L5,4 Z M7,5.575 L7.7136595,5.575 C8.212554,5.575 8.55937606,5.67121 8.79114819,5.88442 C9.02684238,6.09772 9.14132339,6.42172 9.14133201,6.86875 C9.14132339,7.31173 9.01617955,7.64743 8.73727376,7.88125 C8.45835072,8.11093 8.03296681,8.24692 7.47122455,8.24692 L7,8.24692 L7,5.575 Z" id="path8599-0-copy-2" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-night/symbols/parking-meter-l.svg b/data/styles/clear/style-night/symbols/parking-meter-l.svg
index cb32bcb898..3b6610ae38 100644
--- a/data/styles/clear/style-night/symbols/parking-meter-l.svg
+++ b/data/styles/clear/style-night/symbols/parking-meter-l.svg
@@ -10,7 +10,7 @@
         <g id="parking-meter-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.056,27 0,20.943 0,13.5 C0,6.057 6.056,0 13.5,0 C20.944,0 27,6.057 27,13.5 C27,20.943 20.944,27 13.5,27 L13.5,27 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M15,14 L13,14 L13,16 L15,16 C15.551,16 16,15.552 16,15 C16,14.448 15.551,14 15,14 L15,14 Z M20,8 L19,8 L19,10 L8,10 L8,8 L7,8 C6.448,8 6,8.447 6,9 L6,20 C6,21.104 6.896,22 8,22 L19,22 C20.104,22 21,21.104 21,20 L21,9 C21,8.447 20.552,8 20,8 L20,8 Z M15,18 L13,18 L13,20 L11,20 L11,12 L15,12 C16.654,12 18,13.346 18,15 C18,16.654 16.654,18 15,18 L15,18 Z M16.65,9 C16.868,8.544 17,8.039 17,7.5 C17,5.567 15.433,4 13.5,4 C11.567,4 10,5.567 10,7.5 C10,8.039 10.132,8.544 10.35,9 L16.65,9 L16.65,9 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/parking-meter-m.svg b/data/styles/clear/style-night/symbols/parking-meter-m.svg
index ef8067e98e..2144d2e69b 100644
--- a/data/styles/clear/style-night/symbols/parking-meter-m.svg
+++ b/data/styles/clear/style-night/symbols/parking-meter-m.svg
@@ -10,7 +10,7 @@
         <g id="parking-meter-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M12.464,12 L11,12 L11,13.07 L12.464,13.07 C12.759,13.07 13,12.83 13,12.535 C13,12.24 12.76,12 12.464,12 L12.464,12 Z M17.134,7 L16,7 L16,9 L7,9 L7,7 L5.867,7 C5.388,7 5,7.389 5,7.867 L5,16.267 C5,17.224 5.776,17.999 6.733,17.999 L16.266,17.999 C17.224,17.999 17.999,17.224 17.999,16.267 L17.999,7.867 C18,7.389 17.612,7 17.134,7 L17.134,7 Z M12.464,15.07 L11,15.07 L11,17 L9,17 L9,10 L12.464,10 C13.862,10 15,11.138 15,12.535 C15,13.932 13.862,15.07 12.464,15.07 L12.464,15.07 Z M9.511,8 C9.195,7.581 9,7.065 9,6.5 C9,5.12 10.12,4 11.5,4 C12.881,4 14,5.12 14,6.5 C14,7.065 13.806,7.581 13.489,8 L9.511,8 L9.511,8 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/parking-s.svg b/data/styles/clear/style-night/symbols/parking-s.svg
index 310da77df4..e4c1626640 100644
--- a/data/styles/clear/style-night/symbols/parking-s.svg
+++ b/data/styles/clear/style-night/symbols/parking-s.svg
@@ -7,7 +7,7 @@
     <g id="Other" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="parking-s" sketch:type="MSLayerGroup">
             <rect id="Rectangle-346-Copy-5" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" x="0" y="0" width="13" height="13" rx="2"></rect>
-            <rect id="Rectangle-346-Copy-2" fill="#12314C" sketch:type="MSShapeGroup" x="1" y="1" width="11" height="11" rx="2"></rect>
+            <rect id="Rectangle-346-Copy-2" fill="#0F2940" sketch:type="MSShapeGroup" x="1" y="1" width="11" height="11" rx="2"></rect>
             <path d="M6.0776,6.1354 C6.51206,6.1354 6.83715,6.0504 7.05286,5.8802 C7.26857,5.707 7.37642,5.4564 7.37643,5.1283 C7.37642,4.7971 7.28533,4.5525 7.10299,4.3945 C6.92373,4.2365 6.64118,4.1576 6.25533,4.1575 L5.41276,4.1575 L5.41276,6.1354 L6.0776,6.1354 Z M8.02838,6.7233 C7.58176,7.1031 6.94526,7.293 6.11888,7.293 L5.41276,7.293 L5.41276,10 L4,10 L4,3 L6.22825,3 C7.03641,3 7.65012,3.1747 8.0694,3.5241 C8.4917,3.8704 8.70285,4.3885 8.70286,5.0781 C8.70285,5.7951 8.47803,6.3435 8.02838,6.7233 Z" id="path5034-copy-2" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-night/symbols/pharmacy-l.svg b/data/styles/clear/style-night/symbols/pharmacy-l.svg
index cf19de67d6..70c2a82cf6 100644
--- a/data/styles/clear/style-night/symbols/pharmacy-l.svg
+++ b/data/styles/clear/style-night/symbols/pharmacy-l.svg
@@ -10,7 +10,7 @@
         <g id="pharmacy-l-copy" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" rx="13.5" ry="13.5"></ellipse>
             <g id="Oval-1-Copy-40">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M13.6088328,15.2221062 L19.0047692,15.2221062 C19.8372528,15.2221062 20.5024476,14.4307366 20.5024476,13.4442123 C20.5024476,12.4646326 19.8305064,11.6663185 19.0047692,11.6663185 L13.5767344,11.6663185 L13.6088328,15.2221062 Z M5.02773961,13.4442123 C5.02773961,11.480405 6.35952442,9.88842468 8.02297041,9.88842468 L19.0047692,9.88842468 C20.6589895,9.88842468 22,11.484401 22,13.4442123 C22,15.4080196 20.6682152,17 19.0047692,17 L8.02297041,17 C6.36875012,17 5.02773961,15.4040237 5.02773961,13.4442123 L5.02773961,13.4442123 Z" id="Shape-Copy-5" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup" transform="translate(13.513870, 13.444212) rotate(-45.000000) translate(-13.513870, -13.444212) "></path>
diff --git a/data/styles/clear/style-night/symbols/pharmacy-m.svg b/data/styles/clear/style-night/symbols/pharmacy-m.svg
index a44d3ea5d4..d909dcc129 100644
--- a/data/styles/clear/style-night/symbols/pharmacy-m.svg
+++ b/data/styles/clear/style-night/symbols/pharmacy-m.svg
@@ -10,7 +10,7 @@
         <g id="pharmacy-m-copy" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
             <g id="Oval-1-Copy-40">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
         </g>
diff --git a/data/styles/clear/style-night/symbols/phone-l.svg b/data/styles/clear/style-night/symbols/phone-l.svg
index f0affd5717..172c292fd3 100644
--- a/data/styles/clear/style-night/symbols/phone-l.svg
+++ b/data/styles/clear/style-night/symbols/phone-l.svg
@@ -10,7 +10,7 @@
         <g id="phone-l-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
             <g id="Oval-1-Copy-38">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M16,6 C15,6 14.67371,6.3263 14,7 L6,15 C5.5,15.5 5,16 5,17 L5,18.5 C5,19.5 5.5,20 6,20.5 L6.5625,21.0625 L10.0625,17.5625 L9.5,17 C8.99991,16.5 9.5,16 9.5,16 L15,10.5 C15,10.5 15.5,10 16,10.5 L16.5625,11.0625 L20.0625,7.5625 L19.5,7 C19,6.5 18.5,6 17.5,6 L16,6 L16,6 Z M20.4375,7.9375 L16.9375,11.4375 L17.5,12 C17.85356,12.3535 18.64645,12.3536 19,12 L21,10 C21.35359,9.6463 21.35357,8.8535 21,8.5 L20.4375,7.9375 Z M10.4375,17.9375 L6.9375,21.4375 L7.5,22 C7.85362,22.3537 8.6464,22.3534 9,22 L11,20 C11.35372,19.6464 11.35352,18.8534 11,18.5 L10.4375,17.9375 Z" id="path5722-copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/phone-m.svg b/data/styles/clear/style-night/symbols/phone-m.svg
index 360b3ade8d..f50619b5b3 100644
--- a/data/styles/clear/style-night/symbols/phone-m.svg
+++ b/data/styles/clear/style-night/symbols/phone-m.svg
@@ -10,7 +10,7 @@
         <g id="phone-m-copy" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
             <g id="Oval-1-Copy-40">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M13.4999986,5.27166656 L4.99999863,13.7716665 L4.99999863,16.2716665 L6.31249862,17.5841665 L9.3124986,14.5841665 L8.4999986,13.7716665 L13.4999986,8.77166653 L14.3124986,9.58416653 L17.3124985,6.58416655 L15.9999985,5.27166656 L13.4999986,5.27166656 L13.4999986,5.27166656 Z M17.6874985,6.95916655 L14.6874986,9.95916652 L14.9999985,10.2716665 L15.9999985,10.2716665 L17.9999985,8.27166654 L17.9999985,7.27166654 L17.6874985,6.95916655 L17.6874985,6.95916655 Z M9.68749859,14.9591665 L6.68749862,17.9591665 L6.99999862,18.2716665 L7.99999861,18.2716665 L9.99999859,16.2716665 L9.99999859,15.2716665 L9.68749859,14.9591665 L9.68749859,14.9591665 Z" id="path5849-copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/phone-s.svg b/data/styles/clear/style-night/symbols/phone-s.svg
index 39ce6ea1bc..c3e268f881 100644
--- a/data/styles/clear/style-night/symbols/phone-s.svg
+++ b/data/styles/clear/style-night/symbols/phone-s.svg
@@ -10,7 +10,7 @@
         <g id="phone-s-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
             <g id="Oval-1-Copy-42">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M9.82352941,4 L4,9.5 L4,11.5 L5.05882353,12.5 L6.11764706,12.5 L7.17647059,11.5 L7.17647059,10.5 L6.11764706,9.5 L9.82352941,6 L10.8823529,7 L11.9411765,7 L13,6 L13,5 L11.9411765,4 L9.82352941,4 Z" id="path6264-3-copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/picnic-l.svg b/data/styles/clear/style-night/symbols/picnic-l.svg
index 529a75a94a..ce19659e7e 100644
--- a/data/styles/clear/style-night/symbols/picnic-l.svg
+++ b/data/styles/clear/style-night/symbols/picnic-l.svg
@@ -10,7 +10,7 @@
         <g id="picnic-l" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
             <g id="Oval-1-Copy-38">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M16.0273984,9 L10.9954545,9 L10.2698347,13 L16.744708,13 L16.0273984,9 Z M18.0273984,9 L20,9 L20,7 L7,7 L7,9 L8.99545455,9 L8.26983471,13 L5,13 L5,15 L7.90702479,15 L7,20 L9,20 L9.90702479,15 L17.1033629,15 L18,20 L20,20 L19.1033629,15 L22,15 L22,13 L18.744708,13 L18.0273984,9 Z" id="Rectangle-22-Copy-6" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/picnic-m.svg b/data/styles/clear/style-night/symbols/picnic-m.svg
index 57d1f3e00b..f93f5f40d1 100644
--- a/data/styles/clear/style-night/symbols/picnic-m.svg
+++ b/data/styles/clear/style-night/symbols/picnic-m.svg
@@ -10,7 +10,7 @@
         <g id="picnic-m" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
             <g id="Oval-1-Copy-40">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M7.99634865,8 L6,8 L6,6 L17,6 L17,8 L15.0136057,8 L15.8964476,12 L19,12 L19,13 L16.1171581,13 L17,17 L15,17 L14.1171581,13 L8.88726607,13 L8,17 L6,17 L6.88726607,13 L4,13 L4,12 L7.10908258,12 L7.99634865,8 Z M9.99634865,8 L13.0136057,8 L13.8964476,12 L9.10908258,12 L9.99634865,8 Z" id="Rectangle-22" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/picnic-s.svg b/data/styles/clear/style-night/symbols/picnic-s.svg
index 55b700bd79..dad688f9a1 100644
--- a/data/styles/clear/style-night/symbols/picnic-s.svg
+++ b/data/styles/clear/style-night/symbols/picnic-s.svg
@@ -10,7 +10,7 @@
         <g id="picnic-s" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
             <g id="Oval-1-Copy-42">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M5.97313072,6 L5,6 L5,5 L12,5 L12,6 L11.0358761,6 L11.3579373,8.00427246 L13,8.00427246 L13,9 L11.517938,9 L12,12 L11.0196533,12.0109253 L10.5202651,9 L6.5203832,9 L5.9880981,12.0187378 L5.00775144,12.0078125 L5.49106876,9 L4,9 L4,8.00427246 L5.65106955,8.00427246 L5.97313072,6 Z M7.04936432,6 L10.0226889,6 L10.355115,8.00427246 L6.69595689,8.00427246 L7.04936432,6 Z" id="Rectangle-22-Copy-2" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/pitch-l.svg b/data/styles/clear/style-night/symbols/pitch-l.svg
index e149367109..f0bb3c7901 100644
--- a/data/styles/clear/style-night/symbols/pitch-l.svg
+++ b/data/styles/clear/style-night/symbols/pitch-l.svg
@@ -10,7 +10,7 @@
         <g id="pitch-l" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
             <g id="Oval-1-Copy-38">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M13,4 C11.89543,4 11,4.8954 11,6 C11,7.1046 11.89543,8 13,8 C14.10457,8 15,7.1046 15,6 C15,4.8954 14.10457,4 13,4 L13,4 Z M7.25,8 L7.75,10 C8,11 8.59716,11 9.34375,11 L11,11 C11.59375,12 11.31467,13.4718 11.5,15 L10.59375,15 C9.59375,15 8,16 9,18 L10.5,21 C11.5,23 13,21.5 12.5,20.5 L11,17.5 C10.75,17 11.2643,17 11.5,17 L13.96793,17 C13.96793,17 15.15167,19.6276 16.54603,21.4285 C17.06075,22.0933 17.63089,23 18.34453,23 C18.84453,23 19.70137,22.2273 18.78944,21.139 C17.0817,19.101 16,17 16,16 C16,14.8368 15.79566,12.3873 15.5,11 L17,11 C17.488,11.9781 18.25,13.5 18.25,13.5 C18.80274,14.4574 20,14.3851 20,13.5 C20,13.3785 20,13.1111 19.86048,12.8232 L18.25,9.5 C18.14722,9.2879 17.99658,9 17.25,9 L9.5,9 L8.75,6.5 C8.45,5.5 7,5.5 7,6.5 C7,7 7.17716,7.6071 7.25,8 L7.25,8 Z" id="path10527-1-copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/pitch-m.svg b/data/styles/clear/style-night/symbols/pitch-m.svg
index 954b0d963c..9005590f1e 100644
--- a/data/styles/clear/style-night/symbols/pitch-m.svg
+++ b/data/styles/clear/style-night/symbols/pitch-m.svg
@@ -10,7 +10,7 @@
         <g id="pitch-m" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
             <g id="Oval-1-Copy-40">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M11.224255,5 C10.468495,5 9.855835,5.6126 9.855835,6.3684 C9.855835,7.1242 10.468495,7.7368 11.224255,7.7368 C11.980015,7.7368 12.592675,7.1242 12.592675,6.3684 C12.592675,5.6126 11.980015,5 11.224255,5 L11.224255,5 Z M7.290045,7.7368 L7.632155,9.1053 C7.803205,9.7895 8.211785,9.7895 8.722615,9.7895 L9.855835,9.7895 C10.262085,10.4737 10.071135,11.586 10.197945,12.6316 L9.577875,12.6316 C8.893665,12.6316 7.803225,13.3158 8.487415,14.6842 L9.513735,16.7369 C10.197925,18.1053 11.224245,17.079 10.882155,16.3948 L9.855835,14.3421 C9.684785,14 10.036675,14 10.197945,14 L11.886525,14 C11.886525,14 12.696455,15.6926 13.650485,16.9248 C14.002665,17.3796 14.392765,18 14.881045,18 C15.223145,18 15.809405,17.4713 15.185455,16.7267 C14.017005,15.3323 13.276885,13.8947 13.276885,13.2105 C13.276885,12.4147 13.137075,10.7387 12.934785,9.7895 L13.961105,9.7895 C14.294995,10.4587 14.881045,11.5 14.881045,11.5 C15.259235,12.1551 15.881045,12.1056 15.881045,11.5 C15.881045,11.417 15.871045,11.2383 15.785545,11.0369 L14.816325,8.7632 C14.753025,8.6148 14.642935,8.4211 14.132115,8.4211 L8.829485,8.4211 L8.316325,6.7105 C8.111065,6.0263 7.118955,6.0263 7.118955,6.7105 C7.118955,7.0526 7.240165,7.468 7.290005,7.7368 L7.290045,7.7368 Z" id="path10527-1-3-copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/pitch-s.svg b/data/styles/clear/style-night/symbols/pitch-s.svg
index 724b160d4e..b6d4ba5487 100644
--- a/data/styles/clear/style-night/symbols/pitch-s.svg
+++ b/data/styles/clear/style-night/symbols/pitch-s.svg
@@ -10,7 +10,7 @@
         <g id="pitch-s" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
             <g id="Oval-1-Copy-42">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M7.99993334,3.5 C7.44765334,3.5 6.99993334,3.9477 6.99993334,4.5 C6.99993334,5.0523 7.44765334,5.5 7.99993334,5.5 C8.55221334,5.5 8.99993334,5.0523 8.99993334,4.5 C8.99993334,3.9477 8.55221334,3.5 7.99993334,3.5 L7.99993334,3.5 Z M5.40618334,4.7188 C5.18754334,4.7188 4.99993334,4.8517 4.99993334,5.125 C4.99993334,5.3982 5.08503334,5.7541 5.12493334,5.9688 L5.40618334,6.9688 C5.55469334,7.5123 5.87307334,7.5 6.28118334,7.5 L7.18743334,7.5 C7.51198334,8.0467 7.39862334,8.6646 7.49993334,9.5 L6.99993334,9.5 C6.45332334,9.5 5.54710334,9.8131 6.09368334,10.9063 L6.90618334,12.5625 C7.10253334,12.9552 7.30084334,12.9977 7.49993334,13 C7.85502334,13 8.15100334,12.6426 7.99993334,12.2813 L7.37493334,10.7813 C7.25706334,10.4994 7.52734334,10.5 7.65618334,10.5 L8.99993334,10.5 C8.99993334,10.5 9.45651334,11.7032 10.2186833,12.6875 C10.5000333,13.0509 10.7973433,13.5 11.1874333,13.5 C11.4607333,13.5 11.9359033,13.1261 11.4374333,12.5313 C10.5039533,11.4172 9.99993334,10.0466 9.99993334,9.5 C9.99993334,8.8643 9.81778334,8.2583 9.65618334,7.5 L10.4686833,7.5 C10.7354333,8.0347 11.1874333,8.875 11.1874333,8.875 C11.4895733,9.3983 11.9999333,9.3588 11.9999333,8.875 C11.9999333,8.808 12.0059333,8.6608 11.9374333,8.5 L11.1874333,6.7813 C11.1371333,6.6627 11.0642833,6.5 10.6561833,6.5 L6.37493334,6.5 L5.96868334,5.125 C5.88668334,4.8517 5.62482334,4.7188 5.40618334,4.7188 L5.40618334,4.7188 Z" id="path10527-1-3-2-copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/place-of-worship-l.svg b/data/styles/clear/style-night/symbols/place-of-worship-l.svg
index 9dc25d4f29..c73c2f0a3b 100644
--- a/data/styles/clear/style-night/symbols/place-of-worship-l.svg
+++ b/data/styles/clear/style-night/symbols/place-of-worship-l.svg
@@ -10,7 +10,7 @@
         <g id="place-of-worship-l" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
             <g id="Oval-1-Copy-38">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M13.5,5 C13.5,5 11,6 11,7 L11,9 C11,10 9,10 9,11 L9,20 L18,20 L18,11 C18,10 16,10 16,8.8125 L16,7 C16,6 13.5,5 13.5,5 L13.5,5 Z M5,13 L5,20 L7,20 L7,13 C7,12 6,12 6,12 C6,12 5,12 5,13 L5,13 Z M20,13 L20,20 L22,20 L22,13 C22,12 21,12 21,12 C21,12 20,12 20,13 L20,13 Z" id="path8846-copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/place-of-worship-m.svg b/data/styles/clear/style-night/symbols/place-of-worship-m.svg
index 0a355f3931..04fd90fbbd 100644
--- a/data/styles/clear/style-night/symbols/place-of-worship-m.svg
+++ b/data/styles/clear/style-night/symbols/place-of-worship-m.svg
@@ -10,7 +10,7 @@
         <g id="place-of-worship-m" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
             <g id="Oval-1-Copy-40">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M11.5,5 L10,6.5 L10,8 L8,10 L8,16.5 L15,16.5 L15,10 L13,8 L13,6.5 L11.5,5 Z M5,11 L5,16.5 L6.5,16.5 L6.5,11 L5,11 Z M16.5,11 L16.5,16.5 L18,16.5 L18,11 L16.5,11 Z" id="path9064-copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/place-of-worship-s.svg b/data/styles/clear/style-night/symbols/place-of-worship-s.svg
index f24c04268c..b1d0c79012 100644
--- a/data/styles/clear/style-night/symbols/place-of-worship-s.svg
+++ b/data/styles/clear/style-night/symbols/place-of-worship-s.svg
@@ -10,7 +10,7 @@
         <g id="place-of-worship-s" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
             <g id="Oval-1-Copy-42">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M8.5,4 L7,4.9411 L7,6 L6,7 L6,12 L11,12 L11,7 L10,6 L10,5.0404 L8.5,4 Z M4,8 L4,12 L5,12 L5,8 L4,8 Z M12,8 L12,12 L13,12 L13,8 L12,8 Z" id="path8846-6-copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/police-l.svg b/data/styles/clear/style-night/symbols/police-l.svg
index 01d67bc4b1..b894b520f1 100644
--- a/data/styles/clear/style-night/symbols/police-l.svg
+++ b/data/styles/clear/style-night/symbols/police-l.svg
@@ -10,7 +10,7 @@
         <g id="police-l-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
             <g id="Oval-1-Copy-38">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M11,4 L10,5 L10,6 L17,6 L17,5 L16,4 L11,4 L11,4 Z M10,7 L10,7.5 C10,9.433 11.56702,11 13.5,11 C15.43298,11 17,9.433 17,7.5 L17,7 L10,7 L10,7 Z M9,12 C7.5,12 7,14.5 7,16 L7,22 L9.6875,22 L16.5,12 L9,12 L9,12 Z M18,12 L11.1875,22 L20,22 L20,16 C20,14.5 19.5,12 18,12 L18,12 Z" id="rect7805-5-copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/police-m.svg b/data/styles/clear/style-night/symbols/police-m.svg
index 01f012715e..8b6ede6d23 100644
--- a/data/styles/clear/style-night/symbols/police-m.svg
+++ b/data/styles/clear/style-night/symbols/police-m.svg
@@ -10,7 +10,7 @@
         <g id="police-m-copy" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
             <g id="Oval-1-Copy-40">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M10,4 L9,4.5 L9,5.5 L14,5.5 L14,4.5 L13,4 L10,4 Z M9,6.5 C8.9667,6.6627 9,6.8274 9,7 C9,8.3807 10.11931,9.5 11.5,9.5 C12.88069,9.5 14,8.3807 14,7 L14,6.5 L9,6.5 Z M9,10.5 C7.91667,10.5 7.01415,12.2917 7,13.375 L7,17.5 L8.53125,17.5 L13,10.5 L9,10.5 Z M14.5,10.5 L10.03125,17.5 L16,17.5 L16,13.375 C16,12.2916 15.58334,10.5 14.5,10.5 L14.5,10.5 Z" id="rect7805-5-4-copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/police-s.svg b/data/styles/clear/style-night/symbols/police-s.svg
index db6a237fcd..47730d7605 100644
--- a/data/styles/clear/style-night/symbols/police-s.svg
+++ b/data/styles/clear/style-night/symbols/police-s.svg
@@ -10,7 +10,7 @@
         <g id="police-s-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
             <g id="Oval-1-Copy-42">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M7,5 L10,5 L10,4 L7,4 L7,5 Z M7,5.75 C7,6.7165 7.53351,7.5 8.5,7.5 C9.46649,7.5 10,6.7165 10,5.75 L10,5.5 L7,5.5 L7,5.75 Z M6,8 C5.5,8 5,9.5 5,10 L5,13 L6.59375,13 L10,8 L6,8 Z M11,8 L7.59375,13 L12,13 L12,10 C12,9.5 11.5,8 11,8 L11,8 Z" id="path5442-copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/postbox-l.svg b/data/styles/clear/style-night/symbols/postbox-l.svg
index 2d0e797768..22cbd9b4bf 100644
--- a/data/styles/clear/style-night/symbols/postbox-l.svg
+++ b/data/styles/clear/style-night/symbols/postbox-l.svg
@@ -10,7 +10,7 @@
         <g id="postbox-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.056,27 0,20.943 0,13.5 C0,6.057 6.056,0 13.5,0 C20.944,0 27,6.057 27,13.5 C27,20.943 20.944,27 13.5,27 L13.5,27 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M19,15.203 L19,17 L8,17 L8,14.95 L5,11.95 L5,21 L22,21 L22,12.203 L19,15.203 L19,15.203 Z M15.904,10.762 L15.88,5.021 L8.99,11.913 L14.84,11.913 L15.904,10.762 L15.904,10.762 Z M16.375,15 L21.713,9.662 L17.076,5.024 L17.076,11.235 L15.335,13.081 C15.316,13.101 15.291,13.111 15.263,13.111 L8.989,13.111 L10.878,15 L16.375,15 L16.375,15 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/postbox-m.svg b/data/styles/clear/style-night/symbols/postbox-m.svg
index 9abadea8af..be9d239a0e 100644
--- a/data/styles/clear/style-night/symbols/postbox-m.svg
+++ b/data/styles/clear/style-night/symbols/postbox-m.svg
@@ -10,7 +10,7 @@
         <g id="postbox-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M17,10.469 L17,18 L6,18 L6,10.25 L8,12.25 L8,14 L15,14 L15,12.469 L17,10.469 L17,10.469 Z M17.606,7.449 L13.056,12 L10.165,12 L8.124,10 L12.827,10 L13.999,8.619 L13.999,3.963 L17.606,7.449 L17.606,7.449 Z M12.403,9 L8.125,9 L10.623,6.461 L13,3.963 L13,8.215 L12.403,9 L12.403,9 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/power-l.svg b/data/styles/clear/style-night/symbols/power-l.svg
index 97f94adb93..0c19d22d35 100644
--- a/data/styles/clear/style-night/symbols/power-l.svg
+++ b/data/styles/clear/style-night/symbols/power-l.svg
@@ -10,7 +10,7 @@
         <g id="power-l" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-46" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" rx="13.5" ry="13.5"></ellipse>
             <g id="Oval-1-Copy-38">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M15,5 L20.0669782,5.0160001 L15,12 L20,12 L9,23 L13,13.9967935 L8,13.9967935 L15,5 Z" id="Path-1152" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/power-m.svg b/data/styles/clear/style-night/symbols/power-m.svg
index 7880cdf192..bb4a4bf08f 100644
--- a/data/styles/clear/style-night/symbols/power-m.svg
+++ b/data/styles/clear/style-night/symbols/power-m.svg
@@ -10,7 +10,7 @@
         <g id="power-m" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-38" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="12.5" cy="12.5" r="12.5"></circle>
             <g id="Oval-1-Copy-47">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M13,5 L18,5 L13,11 L18,11 L8,20 L12,13 L7,13 L13,5 Z" id="Path-1152" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/pub-l.svg b/data/styles/clear/style-night/symbols/pub-l.svg
index 2079a4d86c..f327983ecb 100644
--- a/data/styles/clear/style-night/symbols/pub-l.svg
+++ b/data/styles/clear/style-night/symbols/pub-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="pub-l-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#4C3A1E" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
+            <circle id="Oval-1-Copy-38" fill="#403119" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
             <path d="M6,6 L8,22 C8.0625,22.5 8.5,23 9,23 L18,23 C18.5,23 18.9375,22.5 19,22 L21,6 L6,6 Z M8.25,8 L18.75,8 L18.28125,12 L8.71875,12 L8.25,8 Z" id="path10133-copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-night/symbols/pub-m.svg b/data/styles/clear/style-night/symbols/pub-m.svg
index 5a0f4a7f2e..14b8449635 100644
--- a/data/styles/clear/style-night/symbols/pub-m.svg
+++ b/data/styles/clear/style-night/symbols/pub-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="pub-m-copy" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
-            <ellipse id="Oval-1-Copy-40" fill="#4C3A1E" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+            <ellipse id="Oval-1-Copy-40" fill="#403119" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
             <path d="M6,5 L7.5,18 C7.5577,18.5 8,19 8.5,19 L14.5,19 C15,19 15.44231,18.5 15.5,18 L17,5 L6,5 Z M8,7 L15,7 L14.6,10 L8.4,10 L8,7 Z" id="path10185-copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-night/symbols/pub-s.svg b/data/styles/clear/style-night/symbols/pub-s.svg
index dd1181fa59..72df71f2e4 100644
--- a/data/styles/clear/style-night/symbols/pub-s.svg
+++ b/data/styles/clear/style-night/symbols/pub-s.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="pub-s-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-42" fill="#4C3A1E" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
+            <circle id="Oval-1-Copy-42" fill="#403119" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
             <path d="M5,4.3622 L6,12.8622 C6.0357,13.1479 6.21428,13.3622 6.5,13.3622 L10.5,13.3622 C10.78572,13.3622 10.94996,13.1457 11,12.8622 L12,4.3622 L5,4.3622 Z M6.5,5.3622 L10.5,5.3622 L10.25,7.3622 L6.75,7.3622 L6.5,5.3622 Z" id="path10133-9-copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-night/symbols/recycling-l.svg b/data/styles/clear/style-night/symbols/recycling-l.svg
index 138eba1a38..db03d7b11f 100644
--- a/data/styles/clear/style-night/symbols/recycling-l.svg
+++ b/data/styles/clear/style-night/symbols/recycling-l.svg
@@ -10,7 +10,7 @@
         <g id="recycling-l" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
             <g id="Oval-1-Copy-38">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M11.5,5 C11.223,5 11,5.223 11,5.5 L11,7 L8,7 C7.446,7 7,7.446 7,8 C7,8.554 7.446,9 8,9 L19,9 C19.554,9 20,8.554 20,8 C20,7.446 19.554,7 19,7 L16,7 L16,5.5 C16,5.223 15.77701,5 15.5,5 L11.5,5 Z M12,6 L15,6 L15,7 L12,7 L12,6 Z M8,10 C7.446,10 6.92453,10.4212 7.01563,10.9285714 L9,22.0714286 C9.0904,22.5788929 9.446,23 10,23 L17,23 C17.554,23 17.9089,22.5788 18,22.0714286 L19.98437,10.9285714 C20.07477,10.4211071 19.554,10 19,10 L8,10 Z" id="rect5636-copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/recycling-m.svg b/data/styles/clear/style-night/symbols/recycling-m.svg
index bd7122824c..ed50443112 100644
--- a/data/styles/clear/style-night/symbols/recycling-m.svg
+++ b/data/styles/clear/style-night/symbols/recycling-m.svg
@@ -10,7 +10,7 @@
         <g id="recycling-m" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
             <g id="Oval-1-Copy-40">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M9.518,5 C9.31389,5 9.25,5.1643 9.25,5.3684 L9.25,7 L6.73685,7 C6.32863,7 6,7.092 6,7.5 C6,7.9083 6.32863,8 6.73685,8 L16.26316,8 C16.67137,8 17,7.908 17,7.5 C17,7.0918 16.67137,7 16.26316,7 L13.75,7 L13.75,5.3684 C13.75,5.1643 13.58611,5 13.382,5 L9.518,5 Z M10,5.7368 L13,5.7368 L13,7 L10,7 L10,5.7368 Z M6.73685,9 C6.32863,9 5.94851,9.3343 6.01563,9.7369 L7.42105,18.2632 C7.48745,18.6659 7.74968,19 8.1579,19 L14.78947,19 C15.19769,19 15.45919,18.6658 15.52632,18.2632 L16.98437,9.7369 C17.05317,9.3346 16.67137,9 16.26316,9 L6.73685,9 Z" id="path5652-copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/recycling-s.svg b/data/styles/clear/style-night/symbols/recycling-s.svg
index 0531d6872e..fa9beb0145 100644
--- a/data/styles/clear/style-night/symbols/recycling-s.svg
+++ b/data/styles/clear/style-night/symbols/recycling-s.svg
@@ -10,7 +10,7 @@
         <g id="recycling-s" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
             <g id="Oval-1-Copy-42">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M6.5,4 L6.5,6 L5,6 L5,7 L12,7 L12,6 L10.5,6 L10.5,4 L6.5,4 Z M7,5 L10,5 L10,6 L7.01005,6 L7,5 Z M5,7.5 L6,14 L6.32584,14 L10.58899,14 L11,14 L12,7.5 L5,7.5 Z" id="path5654-copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/remains-l.svg b/data/styles/clear/style-night/symbols/remains-l.svg
index 504ca1ac5e..787a44ab1b 100644
--- a/data/styles/clear/style-night/symbols/remains-l.svg
+++ b/data/styles/clear/style-night/symbols/remains-l.svg
@@ -10,7 +10,7 @@
         <g id="fort-l" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
             <g id="Oval-1-Copy-38">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M10,6.01147485 L10,9 L10.9974258,9 L10.9974258,6.01147487 L13,6 L13,9 L14,9 L14.007736,6 L16,6.01147487 L16,9 L17,9 L17.021636,6.01147485 L19.0299747,6.0233339 L19.0299747,10 L8,10 L8,6 L10,6.01147485 Z" id="Shape-Copy-20" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/remains-m.svg b/data/styles/clear/style-night/symbols/remains-m.svg
index 17302d274e..6bd72f097c 100644
--- a/data/styles/clear/style-night/symbols/remains-m.svg
+++ b/data/styles/clear/style-night/symbols/remains-m.svg
@@ -10,7 +10,7 @@
         <g id="fort-m" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
             <g id="Oval-1-Copy-40">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M14,9 L14,7 L13,7 L13,8.99999998 L12,8.99999998 L12,7 L11,7 L11,8.99999998 L9.95655274,8.99999998 L9.95655276,7 L9,7 L9,9 L7,8.99108016 L7,6 L16,6 L16,9 L14,9 Z" id="Shape-Copy-16" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup" transform="translate(11.500000, 7.500000) rotate(-180.000000) translate(-11.500000, -7.500000) "></path>
diff --git a/data/styles/clear/style-night/symbols/remains-s.svg b/data/styles/clear/style-night/symbols/remains-s.svg
index 3ce7caf107..8399d1bc81 100644
--- a/data/styles/clear/style-night/symbols/remains-s.svg
+++ b/data/styles/clear/style-night/symbols/remains-s.svg
@@ -10,7 +10,7 @@
         <g id="fort-s" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
             <g id="Oval-1-Copy-42">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M7,3.9999999 L7.01171875,4.9749596 L8,4.9749596 L8,3.9999999 L9,3.9999999 L9,4.9749596 L10,4.9749596 L10,4 L12,4 L12,5.9499192 L5,5.9999999 L5,4 L7,3.9999999 Z" id="Shape-Copy-18" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/restaurant-l.svg b/data/styles/clear/style-night/symbols/restaurant-l.svg
index fd9555a1de..54453b4a9a 100644
--- a/data/styles/clear/style-night/symbols/restaurant-l.svg
+++ b/data/styles/clear/style-night/symbols/restaurant-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="restaurant-l-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#4C3A1E" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
+            <circle id="Oval-1-Copy-38" fill="#403119" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
             <path d="M8.5,4 C8,4 8,4.5 8,4.5 L8,10.5 C8,11 8.5,11.5 9,12 C9.5,12.5 9.5,13 9.5,13.5 L9.5,15 C9.5,15.5 9,21.5 9,21.5 C8.9617,21.9985 9.5,23 10.5,23 C11.5,23 12.03846,22 12,21.5 C12,21.5 11.5,15.5 11.5,15 L11.5,13.5 C11.5,13 11.5,12.5 12,12 C12.46054,11.539461 13,11 13,10.5 L13,4.5 C13,4.5 13,4 12.5,4 C12,4 12,4.5 12,4.5 L12,9 C12,9 12,9.5 11.5,9.5 C11,9.5 11,9 11,9 L11,4.5 C11,4.5 11,4 10.5,4 C10,4 10,4.5 10,4.5 L10,9 C10,9 10,9.5 9.5,9.5 C9,9.5 9,9 9,9 L9,4.5 C9,4.5 9,4 8.5,4 L8.5,4 Z M19,4 C18,4 16.13246,4.2351 15.5,5.5 C15,6.5 15,9 15,10 L15,15 C15,15.5 15.5,16 16,16 L17,16 L17,22 C17,22.5 17.5,23 18,23 C18.5,23 19,22.5 19,22 L19,4 Z" id="path5304" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-night/symbols/restaurant-m.svg b/data/styles/clear/style-night/symbols/restaurant-m.svg
index 68073c1bbc..8ce0fe6f9a 100644
--- a/data/styles/clear/style-night/symbols/restaurant-m.svg
+++ b/data/styles/clear/style-night/symbols/restaurant-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="restaurant-m-copy" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
-            <ellipse id="Oval-1-Copy-40" fill="#4C3A1E" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+            <ellipse id="Oval-1-Copy-40" fill="#403119" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
             <path d="M8,5 L7,5 L7,9.5 C7,10.2777 8,10.2222 8,11 L8,18 C8,18.3889 8.5,19 9,19 C9.5,19 10,18.5 10,18 L10,11 C10,10.2222 11,10.2777 11,9.5 L11,5 L10,5 L10,8 L9.5,8 L9.5,5 L8.5,5 L8.5,8 L8,8 L8,5 Z M16,5 C15.22222,5 13.99192,5.5162 13.5,6.5 C13.11111,7.2777 13,9 13,10 L13,13 C13,13.5 13.61111,14 14,14 L14,18 C14,18.5 14.5,19 15,19 C15.5,19 16,18.5 16,18 L16,5 Z" id="rect6396-83" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-night/symbols/restaurant-s.svg b/data/styles/clear/style-night/symbols/restaurant-s.svg
index a9a3fbb48a..f488d6f4ed 100644
--- a/data/styles/clear/style-night/symbols/restaurant-s.svg
+++ b/data/styles/clear/style-night/symbols/restaurant-s.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="restaurant-s-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-42" fill="#4C3A1E" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
+            <circle id="Oval-1-Copy-42" fill="#403119" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
             <path d="M5.5,4 L5,4 L5,7 C5,7.5 6,7.5 6,8 L6,14 L7,14 L7,8 C7,7.5 8,7.5 8,7 L8,4 L7.5,4 L7.5,6 L6.75,6 L6.75,4 L6.25,4 L6.25,6 L5.5,6 L5.5,4 Z M12,4 C11.5,4 10.56623,4.1176 10.25,4.75 C10,5.25 10,6 10,7 L10,9.5 L11,9.5 L11,14 L12,14 L12,4 Z" id="rect6396-8-copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-night/symbols/school-l.svg b/data/styles/clear/style-night/symbols/school-l.svg
index 9f48b65b29..1913409593 100644
--- a/data/styles/clear/style-night/symbols/school-l.svg
+++ b/data/styles/clear/style-night/symbols/school-l.svg
@@ -10,7 +10,7 @@
         <g id="school-l-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
             <g id="Oval-1-Copy-38">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M15.75,4 C14.7805,4 14,4.7805 14,5.75 C14,6.7195 14.7805,7.5 15.75,7.5 C16.7195,7.5 17.5,6.7195 17.5,5.75 C17.5,4.7805 16.7195,4 15.75,4 L15.75,4 Z M7.75,6 C6.7805,6 6,6.7805 6,7.75 C6,8.7195 6.7805,9.5 7.75,9.5 C8.7195,9.5 9.5,8.7195 9.5,7.75 C9.5,6.7805 8.7195,6 7.75,6 L7.75,6 Z M17,8 C16.627322,8 16.013592,8.1345 15.5,8.5 L12.25,10.8125 C11.368196,11.44 12.17732,12.5443 13,12 L15.125,10.59375 C15.125,10.59375 16.526043,13.598 16,15 C15.98243,15.04683 15.96749,15.08933 15.96875,15.125 L13.78125,20.9375 C13.530309,21.606628 14.013036,22.006672 14.5,22 C14.81932,21.9956 15.124779,21.806965 15.28125,21.4375 L18,15 C18,15 18.5,17.9998 20.5,18 C21.70185,18.0001 22.583333,18 23.25,18 C24,18 24,17.25 24,17.25 C24,17.25 24,16.5 23.25,16.5 C22.75,16.5 21.5,16.4998 21,16.5 C19.932813,16.5004 20,14.8975 20,14 C20,12.4998 19,10 19,10 L22,12 C22.906394,12.6043 23.691522,11.5343 22.8125,10.875 L19.5,8.5 C18.896477,8.0701 18.703177,8.0001 18,8 L17,8 L17,8 Z M6.5,10 C6,10 5.763524,10.2365 5.5,10.5 L3.375,12.625 C3.1014,12.8986 3,13.1435 3,13.5 C3,14 3.764327,14.2356 4.1875,13.8125 L6,12 C7,12 7.375,14.5 7,15.5 L5.5,19.5 C5.084539,20.6079 6.644264,20.9486 7,20 L8.5,16 C8.5,16 9,17 10,17 L13,17 C14,17 14,15.5 13,15.5 L10.5,15.5 C10,15.5 10,14.5 10,14 C10,12 9,10 8,10 L6.5,10 Z" id="rect6848-8-copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/school-m.svg b/data/styles/clear/style-night/symbols/school-m.svg
index 10d4be0fb7..cfa718b661 100644
--- a/data/styles/clear/style-night/symbols/school-m.svg
+++ b/data/styles/clear/style-night/symbols/school-m.svg
@@ -10,7 +10,7 @@
         <g id="school-m-copy" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
             <g id="Oval-1-Copy-40">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M12.75,5 C12.05964,5 11.5,5.5596 11.5,6.25 C11.5,6.9404 12.05964,7.5 12.75,7.5 C13.44036,7.5 14,6.9404 14,6.25 C14,5.5596 13.44036,5 12.75,5 L12.75,5 Z M7.0625,6 C6.37214,6 5.8125,6.5596 5.8125,7.25 C5.8125,7.9404 6.37214,8.5 7.0625,8.5 C7.75286,8.5 8.3125,7.9404 8.3125,7.25 C8.3125,6.5596 7.75286,6 7.0625,6 L7.0625,6 Z M13.75,8 C13.47049,8 13.01019,8.1009 12.625,8.375 L10.1875,10.125 C9.52615,10.5956 10.133,11.4082 10.75,11 L12.34375,9.9375 C12.34375,9.9375 12.78038,10.2936 13,11 L12.9688,12.8438 L11.3438,17.1875 C11.15559,17.6894 11.50983,18.005 11.87505,18 C12.11454,18 12.35144,17.8396 12.4688,17.5625 L14.50005,13 C14.50005,13 14.87505,14.9999 16.37505,15 C17.27644,15.0001 18.00005,15 18.50005,15 C19.00005,15 19.00005,14.5 19.00005,14.5 C19.00005,14.5 19.00005,14 18.50005,14 C18.12505,14 16.87505,13.9999 16.50005,14 C16.50005,14 16.00005,14 16.00005,13 C16.00005,12.2963 15.21983,10.5016 15.00005,10 L15.00005,9.5 L17.50005,10.875 C18.17985,11.3283 18.78432,10.5258 18.12505,10.0313 L15.50005,8.5 C14.98309,8.2096 14.41782,8 13.75005,8 L13.75,8 Z M6.625,9 C6.25,9 6.07264,9.1774 5.875,9.375 L4.28125,10.9688 C4.07605,11.174 4,11.3576 4,11.625 C4,12 4.55763,12.1923 4.875,11.875 L6.25,10.5 C6.5648,10.5 7,10.539 7,11 L7,13.125 L5.875,16.125 C5.5634,16.9559 6.7332,17.2115 7,16.5 L8.125,13.5 C8.125,13.5 8.5,14 9.25,14 L11.4375,14 C12.1875,14 12.1875,13 11.4375,13 L9.5,13 C9.5,13 9,13 9,12.5 L9,11.75 C9,10.25 8.5,9 7.75,9 L6.625,9 L6.625,9 Z" id="path17507-copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/school-s.svg b/data/styles/clear/style-night/symbols/school-s.svg
index e8d3379b11..73a58a516f 100644
--- a/data/styles/clear/style-night/symbols/school-s.svg
+++ b/data/styles/clear/style-night/symbols/school-s.svg
@@ -10,7 +10,7 @@
         <g id="school-s-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
             <g id="Oval-1-Copy-42">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M10,3.5 C9.44772,3.5 9,3.9477 9,4.5 C9,5.0523 9.44772,5.5 10,5.5 C10.55228,5.5 11,5.0523 11,4.5 C11,3.9477 10.55228,3.5 10,3.5 L10,3.5 Z M6,4.5 C5.44772,4.5 5,4.9477 5,5.5 C5,6.0523 5.44772,6.5 6,6.5 C6.55228,6.5 7,6.0523 7,5.5 C7,4.9477 6.55228,4.5 6,4.5 L6,4.5 Z M10.5,6 L10,6 L8,7 L8,8 L10,7 L10,8 L10,9.5625 L9,13 L10,13 L11,9.5 C11,9.5 11.25,10.9999 12.25,11 C12.85093,11.0001 13.66667,11 14,11 L14,10.25 C13.75,10.25 12.75,10.2499 12.5,10.25 C11.96641,10.2502 12,9.4488 12,9 C12,8.2499 11.5,7 11.5,7 L13,7.9375 C13.4532,8.2396 13.84576,7.7046 13.40625,7.375 L11.75,6.25 C11.44824,6.0351 11.35159,6.0001 11,6 L10.5,6 Z M5.75,7 C5.5,7 5.38176,7.1183 5.25,7.25 L4.1875,8.3125 C4.0507,8.4493 4,8.5718 4,8.75 C4,9 4.38216,9.1178 4.59375,8.9063 L5.5,8 L6,8 L6,9 L5,11.75 C4.79782,12.306 5.57214,12.4743 5.75,12 L6.25463,10.7 L9,10.7 L9,10 L7.5,10 L7.5,8 C7.5,7.5 7,7 6.5,7 L5.75,7 Z" id="path17501-copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/ship-l.svg b/data/styles/clear/style-night/symbols/ship-l.svg
index 36010b1d65..a209ac6824 100644
--- a/data/styles/clear/style-night/symbols/ship-l.svg
+++ b/data/styles/clear/style-night/symbols/ship-l.svg
@@ -7,7 +7,7 @@
     <g id="Transport" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="ship-l" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#12314C" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
+            <circle id="Oval-1-Copy-38" fill="#0F2940" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
             <path d="M11,4.3622 C10.446,4.3622 10,4.8082 10,5.3622 L8,5.3622 C7.446,5.3622 7,5.8082 7,6.3622 L7,12.4247 L5,13.3622 L7,17.3622 L7,19.3622 C8.5,19.3622 9.5,20.3627 10.5,20.3622 C11.5,20.3627 12,19.3622 13.5,19.3622 C15,19.3622 15.5,20.3617 16.5,20.3622 C17.5,20.3627 18.5,19.3622 20,19.3622 L20,17.3622 L22,13.3622 L20,12.4247 L20,6.3622 C20,5.8082 19.554,5.3622 19,5.3622 L17,5.3622 C17,4.8082 16.554,4.3622 16,4.3622 L11,4.3622 L11,4.3622 Z M9,7.3622 L18,7.3622 L18,11.4872 L13.5,9.3622 L9,11.4872 L9,7.3622 L9,7.3622 Z M7,21.3622 C6.30594,21.3622 5.66024,21.7671 5,21.9872 L5,24.01845 C5,24.01845 6,23.3627 7,23.3622 C8,23.3617 9,24.3622 10.5,24.3622 C12,24.3622 12.47352,23.3969 13.5,23.3622 C14.5,23.3627 15,24.3622 16.5,24.3622 C18,24.3622 19,23.3622 20,23.3622 C20.70165,23.3622 22,24.01845 22,24.01845 L22,21.9872 C21.3584,21.7404 20.65657,21.3622 20,21.3622 C18.5,21.3622 17.5,22.3627 16.5,22.3622 C15.5,22.3617 15,21.3622 13.5,21.3622 C12,21.3622 11.5,22.3627 10.5,22.3622 C9.5,22.3627 8.5,21.3622 7,21.3622 L7,21.3622 Z" id="path8421-9-1-0-1-copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-night/symbols/ship-m.svg b/data/styles/clear/style-night/symbols/ship-m.svg
index 8c0db9fe74..77a879b947 100644
--- a/data/styles/clear/style-night/symbols/ship-m.svg
+++ b/data/styles/clear/style-night/symbols/ship-m.svg
@@ -7,7 +7,7 @@
     <g id="Transport" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="ship-m" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" r="11.5"></circle>
-            <circle id="Oval-1-Copy-40" fill="#12314C" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" r="10.5"></circle>
+            <circle id="Oval-1-Copy-40" fill="#0F2940" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" r="10.5"></circle>
             <path d="M10,4 C9.5,4 9,4.5 9,5 L7.82354,5 C7.3673,5 6.9706,5.5438 6.9706,6 L7,9.5 L5,10.5 L7,14 L7,15.5 L9.5,16.5 L11.5,15.5 L13.5,16.5 L16,15.5 L16,14 L18,10.5 L16,9.5 L16,6 C16,5.5438 15.63271,5 15.17647,5 L14,5 C14,4.5 13.5,4 13,4 L10,4 Z M8,6 L15,6 L15,9.0441 L11.5,7 L8,9.0441 L8,6 Z M7,17 L5,18 L5,19.5 L7,18.5 L9.5,19.5 L11.5,18.5 L13.5,19.5 L16,18.6466 L18,19.5 L18,18 L16,17 L13.5,18 L11.5,17 L9.5,18 L7,17 Z" id="path30964-copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-night/symbols/ship-s.svg b/data/styles/clear/style-night/symbols/ship-s.svg
index 38de5cefc2..b67532e663 100644
--- a/data/styles/clear/style-night/symbols/ship-s.svg
+++ b/data/styles/clear/style-night/symbols/ship-s.svg
@@ -7,7 +7,7 @@
     <g id="Transport" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="ship-s" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-42" fill="#12314C" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
+            <circle id="Oval-1-Copy-42" fill="#0F2940" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
             <path d="M5.5,3.5 C5.223,3.5 5,3.723 5,4 L5,7.5 L4,8 L5,10 L5,11 L7,11.5 L8.5,11 L10,11.5 L12,11 L12,10 L13,8 L12,7.5313 L12,4 C12,3.723 11.777,3.5 11.5,3.5 L10.5,3.5 L6.5,3.5 L5.5,3.5 Z M6,4.5 L11,4.5 L11,7.0625 L8.5,5.5 L6,7 L6,4.5 Z M5.5,11.9995 L4,12.4683 L4,13.4995 L4.15625,13.4375 L5.5,13 L7,13.5 L8.5,13 L10,13.5 L11.5,13 L13,13.5 L13,12.4688 L11.5,12 L10,12.4688 L8.5,12 L7,12.4688 L5.5,11.9995 Z" id="path30937-copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-night/symbols/shoes-l.svg b/data/styles/clear/style-night/symbols/shoes-l.svg
index 7a746bea17..f70b81bca1 100644
--- a/data/styles/clear/style-night/symbols/shoes-l.svg
+++ b/data/styles/clear/style-night/symbols/shoes-l.svg
@@ -10,7 +10,7 @@
         <g id="shoes-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.057,27 0,20.943 0,13.5 C0,6.057 6.057,0 13.5,0 C20.943,0 27,6.057 27,13.5 C27,20.943 20.943,27 13.5,27 L13.5,27 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M6,22 L10,22 L10,19 L11,19 L14,22 L16,22 L22.64,19.473 C22.64,19.473 22.74,17.598 20.285,17.598 C15.234,17.598 13.786,13.727 14.001,12.184 C14.216,10.641 15.001,5 15.001,5 L6.001,7 L7.001,14 L6,22 L6,22 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/shoes-m.svg b/data/styles/clear/style-night/symbols/shoes-m.svg
index 0506b548d5..86b6e156cf 100644
--- a/data/styles/clear/style-night/symbols/shoes-m.svg
+++ b/data/styles/clear/style-night/symbols/shoes-m.svg
@@ -10,7 +10,7 @@
         <g id="shoes-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M6.086,18 L8.987,18 L8.987,14.903 L9.787,14.903 L12.187,18 L13.787,18 L19,15.978 C19,15.978 19.079,14.478 17.115,14.478 C13.074,14.478 12.015,11.382 12.187,10.148 C12.359,8.914 12.987,4.4 12.987,4.4 L6.086,6 L6.086,18 L6.086,18 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/shop-bicycle-l.svg b/data/styles/clear/style-night/symbols/shop-bicycle-l.svg
index 76d2bba0ba..b7eae21f6b 100644
--- a/data/styles/clear/style-night/symbols/shop-bicycle-l.svg
+++ b/data/styles/clear/style-night/symbols/shop-bicycle-l.svg
@@ -10,7 +10,7 @@
         <g id="shop-bicycle-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.057,27 0,20.943 0,13.5 C0,6.057 6.057,0 13.5,0 C20.943,0 27,6.057 27,13.5 C27,20.943 20.943,27 13.5,27 L13.5,27 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M15.875,5 C15.313,5.076 15.238,6.058 15.781,6.219 L18,7.094 L18,9 L11,9 L11,8 L12.375,8 C12.705,8 13,7.705 13,7.375 C13,7.045 12.705,6.745 12.375,6.75 L8.5,6.75 C8.438,6.74 8.375,6.74 8.312,6.75 C7.985,6.799 7.732,7.142 7.781,7.469 C7.83,7.796 8.173,8.049 8.5,8 L10,8 L10,9 L8.938,12.125 C8.638,12.053 8.323,12 8,12 C5.791,12 4,13.791 4,16 C4,18.209 5.791,20 8,20 C10.209,20 12,18.209 12,16 C12,15.699 11.938,15.406 11.875,15.125 L13,15.125 C13.199,15.115 13.391,15.01 13.5,14.844 L16.875,10 L17,10 L18,10 L18.688,12.031 C16.626,12.191 15,13.896 15,16 C15,18.209 16.791,20 19,20 C21.209,20 23,18.209 23,16 C23,14.172 21.77,12.665 20.094,12.188 L19,9 L19,6.656 C19,6.551 18.957,6.445 18.906,6.344 C18.902,6.334 18.91,6.321 18.906,6.313 C18.891,6.282 18.863,6.25 18.844,6.219 C18.813,6.174 18.789,6.133 18.75,6.094 C18.733,6.078 18.706,6.076 18.688,6.063 C18.67,6.048 18.645,6.045 18.626,6.032 C18.594,6.013 18.568,5.982 18.532,5.97 L18.501,5.939 L18.063,5.783 L16.219,5.033 C16.155,5.009 16.071,5.005 16,5.003 C15.953,5.003 15.922,4.991 15.875,5.003 L15.875,5 L15.875,5 Z M11,10 L15.406,10 L12.687,13.875 L11.375,13.875 C11.065,13.381 10.676,12.975 10.187,12.656 L11,10 L11,10 Z M8,13.5 C9.381,13.5 10.5,14.619 10.5,16 C10.5,17.381 9.381,18.5 8,18.5 C6.619,18.5 5.5,17.381 5.5,16 C5.5,14.619 6.619,13.5 8,13.5 L8,13.5 Z M19,13.5 C20.381,13.5 21.5,14.619 21.5,16 C21.5,17.381 20.381,18.5 19,18.5 C17.619,18.5 16.5,17.381 16.5,16 C16.5,15.827 16.529,15.662 16.562,15.5 C16.795,14.361 17.792,13.5 19,13.5 L19,13.5 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/shop-bicycle-m.svg b/data/styles/clear/style-night/symbols/shop-bicycle-m.svg
index db47c3d0d3..5faf0e7381 100644
--- a/data/styles/clear/style-night/symbols/shop-bicycle-m.svg
+++ b/data/styles/clear/style-night/symbols/shop-bicycle-m.svg
@@ -10,7 +10,7 @@
         <g id="shop-bicycle-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M14,6 L14,7 L15,7.5 L15,9 L10,9 L10,8 L11,8 L11,7.5 L10,7 L8,7 L8,8 L9,8 L9,9 L7.75,11.125 C7.504,11.061 7.266,11 7,11 C5.344,11 4,12.344 4,14 C4,15.656 5.344,17 7,17 C8.656,17 10,15.656 10,14 L11,14 L13.5,10 L15,10 L15.531,11.062 C14.103,11.292 13,12.507 13,14 C13,15.656 14.344,17 16,17 C17.656,17 19,15.656 19,14 C19,12.561 17.978,11.354 16.625,11.062 L16,9.5 L16,7 L15.5,6.5 L14,6 L14,6 Z M9.5,10 L12.5,10 L10.5,13 L9.812,13 C9.6,12.408 9.224,11.885 8.718,11.531 L9.5,10 L9.5,10 Z M7,12.25 C7.967,12.25 8.75,13.033 8.75,14 C8.75,14.967 7.967,15.75 7,15.75 C6.033,15.75 5.25,14.967 5.25,14 C5.25,13.033 6.033,12.25 7,12.25 L7,12.25 Z M16,12.25 C16.967,12.25 17.75,13.033 17.75,14 C17.75,14.967 16.967,15.75 16,15.75 C15.033,15.75 14.25,14.967 14.25,14 C14.25,13.033 15.033,12.25 16,12.25 L16,12.25 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/shop-l.svg b/data/styles/clear/style-night/symbols/shop-l.svg
index 3e12703238..041ed1dac9 100644
--- a/data/styles/clear/style-night/symbols/shop-l.svg
+++ b/data/styles/clear/style-night/symbols/shop-l.svg
@@ -10,7 +10,7 @@
         <g id="shop-l" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
             <g id="Oval-1-Copy-38">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M12,4 C11,4 10.11384,5.0065 10,6 L9.65625,9 L8,9 C7.5,9 7,9.5 7,10 L6,20 C6,20.5 6.5,21 7,21 L20,21 C20.5,21 21,20.5 21,20 L20,10 C20,9.5 19.5,9 19,9 L17.34375,9 L17,6 C16.88616,5.0065 16,4 15,4 L12,4 Z M12,5 L15,5 C15.5,5 15.94308,5.5033 16,6 L16.34375,9 L10.65625,9 L11,6 C11.0569,5.5033 11.5,5 12,5 L12,5 Z" id="rect13131-6-copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/shop-m.svg b/data/styles/clear/style-night/symbols/shop-m.svg
index b132e8324f..9185225bdb 100644
--- a/data/styles/clear/style-night/symbols/shop-m.svg
+++ b/data/styles/clear/style-night/symbols/shop-m.svg
@@ -10,7 +10,7 @@
         <g id="shop-m" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
             <g id="Oval-1-Copy-40">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M10.26471,4 C9.5,4 8.64996,4.7502 8.5,5.5 L8,8 L7,8 C6.61765,8 6,8.6177 6,9 L5,17.2353 C5,17.6176 5.5,18 6,18 L17,18 C17.5,18 18,17.6176 18,17.2353 L17,9 C17,8.6177 16.38235,8 16,8 L15,8 L14.5,5.5 C14.35004,4.7502 13.50001,4 12.7353,4 L10.26471,4 Z M10.26471,4.7647 L12.7353,4.7647 C13.11766,4.7647 13.66033,5.1251 13.7353,5.5 L14.2353,8 L8.7647,8 L9.26471,5.5 C9.33971,5.1251 9.88235,4.7647 10.26471,4.7647 L10.26471,4.7647 Z" id="rect13131-6-2-copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/shop-s.svg b/data/styles/clear/style-night/symbols/shop-s.svg
index 4fb6996757..8a1176f5fe 100644
--- a/data/styles/clear/style-night/symbols/shop-s.svg
+++ b/data/styles/clear/style-night/symbols/shop-s.svg
@@ -10,7 +10,7 @@
         <g id="shop-s" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
             <g id="Oval-1-Copy-42">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M7.17188,3.8622 C6.67188,3.8622 6.24623,4.3678 6.17188,4.8622 L6,6.3622 L5,6.3622 C4.75,6.3622 4.5,6.6122 4.5,6.8622 L4,11.8622 C4,12.1122 4.25,12.3622 4.5,12.3622 L12.5,12.3622 C12.75,12.3622 13,12.1122 13,11.8622 L12.5,6.8622 C12.5,6.6122 12.25,6.3622 12,6.3622 L11,6.3622 L10.82813,4.8622 C10.77123,4.3655 10.32813,3.8622 9.82813,3.8622 L7.17188,3.8622 Z M7.17188,4.3622 L9.82813,4.3622 C10.07813,4.3622 10.29603,4.5821 10.32813,4.8622 L10.5,6.3622 L6.5,6.3622 L6.67188,4.8622 C6.70038,4.6139 6.92188,4.3622 7.17188,4.3622 L7.17188,4.3622 Z" id="rect13131-6-6-copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/skiing-l.svg b/data/styles/clear/style-night/symbols/skiing-l.svg
index 25482b16d3..e83e1b6d09 100644
--- a/data/styles/clear/style-night/symbols/skiing-l.svg
+++ b/data/styles/clear/style-night/symbols/skiing-l.svg
@@ -10,7 +10,7 @@
         <g id="skiing-l" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
             <g id="Oval-1-Copy-38">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M12.0000004,6 C11.0000004,6 10.0000004,6.5 10.0000004,8 C10.0000004,8.5367 10.0436904,8.6282 10.1562504,9.0938 L10.8437504,11.9375 L7.12500038,14.2188 L3.75000038,12.25 C3.63768258,12.184 3.49123818,12.182 3.31250038,12.219 C3.13376248,12.256 2.99962988,12.4677 3.00000038,12.6877 C3.00037088,12.9077 3.09635138,13.0351 3.25000038,13.1252 L17.7500004,21.6252 C18.2055714,21.8882 18.6165844,21.9941 19.0000004,22.0002 C19.2682244,22.0002 19.5317824,21.9652 19.7500004,21.8752 C20.2801524,21.6573 20.6118634,21.2634 20.8437504,21.0315 C20.9599364,20.9152 21.0000004,20.7734 21.0000004,20.6252 C21.0000004,20.4137 20.8712294,20.189 20.5937504,20.1565 C20.4146934,20.1355 20.2692694,20.2005 20.1562504,20.344 C19.9215064,20.6416 19.6284844,20.8648 19.3750004,20.969 C19.1215164,21.0732 18.8411854,21.0915 18.2500004,20.7502 L8.96875038,15.3127 L12.5625004,13.219 C12.8952264,12.991 13.0645144,12.5482 12.9687504,12.1565 L12.5625004,10.5002 L16.1380974,12.605 L16.8125004,15.1757 C16.8896004,15.4635 17.1024014,15.7117 17.3750004,15.832 L19.6562504,16.832 C21.2623304,17.536 21.4911994,16.0061 20.4687504,15.563 L18.5937504,14.7505 L17.0000004,8.501 L13.9375004,6.751 C13.1512284,6.2971 12.5000004,6.001 12.0000004,6.001 L12.0000004,6 Z M20.0000004,8 C18.8954304,8 18.0000004,8.8954 18.0000004,10 C18.0000004,11.1046 18.8954304,12 20.0000004,12 C21.1045704,12 22.0000004,11.1046 22.0000004,10 C22.0000004,8.8954 21.1045704,8 20.0000004,8 L20.0000004,8 Z" id="rect10364-copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/skiing-m.svg b/data/styles/clear/style-night/symbols/skiing-m.svg
index 678bb0f004..48e890b7b2 100644
--- a/data/styles/clear/style-night/symbols/skiing-m.svg
+++ b/data/styles/clear/style-night/symbols/skiing-m.svg
@@ -10,7 +10,7 @@
         <g id="skiing-m" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
             <g id="Oval-1-Copy-40">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M10,6 C9,6 8.5,6.5 8.5,7.5 C8.5,7.8954 8.63581,8.1569 8.71875,8.5 L9.5,10.5 L6.6875,12.46875 L4,11 L4,12 L15,18 L16,18 L17,17 L16.5,16.5 L16,16 L16,17 L15,17 L8,13.1875 L10.46875,11.53125 C10.71392,11.36325 11.07056,11.2887 11,11 L10.46875,9.53125 L13,11 L13.625,12.96875 C13.6818,13.18085 13.83039,13.38015 14.03125,13.46875 L15.71875,14.1875 C16.90217,14.7062 17.06588,13.5765 16.3125,13.25 L14.9375,12.65625 L14,10 L14,8 L11.5,6.59375 C10.92064,6.25935 10.5,6 10,6 L10,6 Z M16.5,7.5 C15.6861,7.5 15,8.1861 15,9 C15,9.814 15.6861,10.5 16.5,10.5 C17.31389,10.5 18,9.814 18,9 C18,8.1861 17.31389,7.5 16.5,7.5 L16.5,7.5 Z" id="rect10364-0-copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/skiing-s.svg b/data/styles/clear/style-night/symbols/skiing-s.svg
index 8fc323386f..085bc57f9b 100644
--- a/data/styles/clear/style-night/symbols/skiing-s.svg
+++ b/data/styles/clear/style-night/symbols/skiing-s.svg
@@ -10,7 +10,7 @@
         <g id="skiing-s" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
             <g id="Oval-1-Copy-42">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M8,5 C7.5,5 7,6 7,6.5 L7,8.5 L5.375,9.2813 L4,8.5 L4,9 L11,13 L11,12.5 L6.3125,9.8125 L8,9.1875 L8,7 L8.5,7 L9,7 L10,8.5 L10,10 L11,11 L12,11 L12,10 L11,10 L11,8.5 L10.5,6 L9,5 L8,5 L8,5 Z M12.5,6.5 C11.94773,6.5 11.5,6.9477 11.5,7.5 C11.5,8.0523 11.94773,8.5 12.5,8.5 C12.68732,8.5 12.85013,8.433 13,8.3438 L13,6.6563 C12.85013,6.5663 12.68732,6.5 12.5,6.5 L12.5,6.5 Z" id="rect10364-5-copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/soccer-l.svg b/data/styles/clear/style-night/symbols/soccer-l.svg
index 1a6457c2ce..11c9b55c75 100644
--- a/data/styles/clear/style-night/symbols/soccer-l.svg
+++ b/data/styles/clear/style-night/symbols/soccer-l.svg
@@ -10,7 +10,7 @@
         <g id="soccer-l" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
             <g id="Oval-1-Copy-38">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M13.5,5 C8.81676,5 5,8.8168 5,13.5 C5,18.1832 8.81676,22 13.5,22 C18.18324,22 22,18.1832 22,13.5 C22,8.8168 18.18324,5 13.5,5 L13.5,5 Z M13.5,6.5 C16.16601,6.5 18.47358,7.9738 19.65625,10.1563 C18.54025,10.8967 17.51446,11.2836 17.5,12 C17.4899,12.4999 17.5,12.6412 17.5,13 C17.5,13.5 17.76049,14.1434 18.5,14.5 L20.25,15.3438 C20.04966,16.0846 19.72761,16.7544 19.3125,17.375 L18,16.5 C17.25,16 16.5,15.6667 16,16 L14.5,17 C13.80662,17.4623 13.87903,18 14,18.5 L14.46875,20.4375 C14.15151,20.4815 13.82962,20.4995 13.5,20.4995 C12.80671,20.4995 12.13146,20.4045 11.5,20.2183 L11.5,18.4995 C11.5,17.4995 11,16.9995 10.5,16.4995 C10,15.9995 9.5,15.4995 8.5,15.4995 L6.78125,15.4995 C6.59519,14.8685 6.5,14.1933 6.5,13.5 C6.5,9.6222 9.62216,6.5 13.5,6.5 L13.5,6.5 Z M10.5,10 L10,12 C9.8581107,12.5676 9.47997,13.1533 10,13.5 L11.5,14.5 C12.5,15.1667 12.94098,14.7795 13.5,14.5 L14.5,14 C15.24536,13.6273 15.5,13.5 15.5,12.5 L15.5,10.5 C15.5,10 15.5082,9.7016 14.5,9.5 L12,9 C10.95274,8.7905 10.755655,8.977 10.5,10 L10.5,10 Z" id="path10911-4-1-7-6-7-copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/soccer-m.svg b/data/styles/clear/style-night/symbols/soccer-m.svg
index d2acd3d465..b61c9ca022 100644
--- a/data/styles/clear/style-night/symbols/soccer-m.svg
+++ b/data/styles/clear/style-night/symbols/soccer-m.svg
@@ -10,7 +10,7 @@
         <g id="soccer-m" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
             <g id="Oval-1-Copy-40">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M11.5,5.3622 C7.91871,5.3622 5,8.281 5,11.8622 C5,15.4434 7.91871,18.3622 11.5,18.3622 C15.08129,18.3622 18,15.4434 18,11.8622 C18,8.281 15.08129,5.3622 11.5,5.3622 L11.5,5.3622 Z M11.5,6.5093 C13.53872,6.5093 15.30332,7.6363 16.20772,9.3053 C15.35429,9.8714 14.56988,10.1673 14.55883,10.7151 C14.55183,11.0976 14.55883,11.2054 14.55883,11.4798 C14.55883,11.8622 14.75801,12.3541 15.32354,12.6268 L16.66176,13.2721 C16.50857,13.8387 16.26227,14.3509 15.94486,14.8254 L14.94117,14.1562 C14.36765,13.7739 13.79413,13.5192 13.41176,13.7739 L12.26471,14.5387 C11.73447,14.8922 11.78985,15.3035 11.88235,15.6857 L12.2408,17.1674 C11.99821,17.2004 11.75205,17.2144 11.5,17.2144 C10.96983,17.2144 10.45347,17.1404 9.9706,16.9994 L9.9706,15.6848 C9.9706,14.9202 9.58824,14.5378 9.20587,14.1555 C8.82354,13.7731 8.44117,13.3908 7.67646,13.3908 L6.36212,13.3908 C6.21985,12.9081 6.14706,12.392 6.14706,11.8617 C6.14706,8.8962 8.5346,6.5087 11.5,6.5087 L11.5,6.5093 Z M9.20587,9.1857 L8.82354,10.7151 C8.71506,11.1493 8.42585,11.5971 8.82354,11.8622 L9.9706,12.6268 C10.73529,13.1367 11.07252,12.8407 11.5,12.6268 L12.26471,12.2446 C12.83469,11.9595 13.0294,11.8622 13.0294,11.0976 L13.0294,9.5682 C13.0294,9.1857 13.0354,8.9576 12.26471,8.8035 L10.35294,8.4209 C9.5521,8.2609 9.40138,8.4029 9.20587,9.1857 L9.20587,9.1857 Z" id="path10911-4-1-7-6-7-3-4-copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/soccer-s.svg b/data/styles/clear/style-night/symbols/soccer-s.svg
index c09ca7903e..cb5e5427ee 100644
--- a/data/styles/clear/style-night/symbols/soccer-s.svg
+++ b/data/styles/clear/style-night/symbols/soccer-s.svg
@@ -10,7 +10,7 @@
         <g id="soccer-s" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
             <g id="Oval-1-Copy-42">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M8.5,4 C6.02064,4 4,6.0207 4,8.5 C4,10.9793 6.02064,13 8.5,13 C10.97936,13 13,10.9793 13,8.5 C13,6.0207 10.97936,4 8.5,4 L8.5,4 Z M8.5,4.7941 C9.91142,4.7941 11.13307,5.5744 11.75919,6.7299 C11.16836,7.1218 10.6253,7.3266 10.61765,7.7059 C10.61265,7.9706 10.61765,8.0453 10.61765,8.2353 C10.61765,8.5 10.75555,8.8406 11.14706,9.0294 L12.07353,9.4761 C11.96747,9.8683 11.79696,10.2229 11.57721,10.5515 L10.88235,10.0882 C10.48529,9.8235 10.08824,9.6471 9.82353,9.8235 L9.02941,10.3529 C8.66233,10.5977 8.70066,10.8824 8.76471,11.1471 L9.01286,12.1728 C8.84492,12.1958 8.6745,12.2058 8.5,12.2058 C8.13296,12.2058 7.77548,12.1548 7.44118,12.0569 L7.44118,11.1469 C7.44118,10.6175 7.17647,10.3528 6.91176,10.0881 C6.64706,9.8234 6.38235,9.5587 5.85294,9.5587 L4.94301,9.5587 C4.84451,9.2245 4.79412,8.8672 4.79412,8.5001 C4.79412,6.4471 6.44703,4.7942 8.5,4.7942 L8.5,4.7941 Z M6.91176,6.6471 L6.64706,7.7059 C6.57196,8.0064 6.37174,8.3165 6.64706,8.5 L7.44118,9.0294 C7.97059,9.3824 8.20405,9.1774 8.5,9.0294 L9.02941,8.7647 C9.42401,8.5674 9.55882,8.5 9.55882,7.9706 L9.55882,6.9118 C9.55882,6.6471 9.56282,6.4891 9.02941,6.3824 L7.70588,6.1176 C7.15145,6.0068 7.04711,6.1046 6.91176,6.6471 L6.91176,6.6471 Z" id="path10911-4-1-7-6-7-3-copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/speedcam-l.svg b/data/styles/clear/style-night/symbols/speedcam-l.svg
index c2a711dc84..2813c604ea 100644
--- a/data/styles/clear/style-night/symbols/speedcam-l.svg
+++ b/data/styles/clear/style-night/symbols/speedcam-l.svg
@@ -3,12 +3,17 @@
     <!-- Generator: Sketch 3.4.2 (15857) - http://www.bohemiancoding.com/sketch -->
     <title>speedcam-l</title>
     <desc>Created with Sketch.</desc>
-    <defs></defs>
+    <defs>
+        <rect id="path-1" x="1" y="1" width="19" height="19" rx="2"></rect>
+    </defs>
     <g id="Other" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="speedcam-l" sketch:type="MSLayerGroup">
             <rect id="Rectangle-346-Copy-3" opacity="0.5" fill="#FFFFFF" sketch:type="MSShapeGroup" x="0" y="0" width="21" height="21" rx="2"></rect>
-            <rect id="Rectangle-346" fill="#383833" sketch:type="MSShapeGroup" x="1" y="1" width="19" height="19" rx="2"></rect>
-            <path d="M16.4180495,9.125 L16.4180495,8.4375 C16.4180495,8.058 16.0984067,7.75 15.7037638,7.75 L14.9894781,7.75 L14.9894781,12.5625 L14,12.5625 L14,6.71875 C14,5.7693125 13.2007143,5 12.2142857,5 L5.78571429,5 C4.79928571,5 4,5.7693125 4,6.71875 L4,14.28125 C4,15.2306875 4.79928571,16 5.78571429,16 L12.2142857,16 C13.2007143,16 14,15.2306875 14,14.28125 L14,13.9375 L15.7037638,13.9375 C16.0984067,13.9375 16.4180495,13.6298438 16.4180495,13.25 L16.4180495,12.5625 L17.7037638,12.5625 C17.9012638,12.5625 18.0609067,12.4088437 18,12.21875 L18,9.46875 C18.0609067,9.27865625 17.9012638,9.125 17.7037638,9.125 L16.4180495,9.125 Z M7.5,14.5 C6.395,14.5 5.5,13.6047413 5.5,12.5001667 C5.5,11.395592 6.395,10.5 7.5,10.5 C8.60466667,10.5 9.5,11.395592 9.5,12.5001667 C9.5,13.6047413 8.60466667,14.5 7.5,14.5 L7.5,14.5 Z M11.8932321,7.875 C11.4788571,7.875 11.1428571,7.539375 11.1428571,7.125375 C11.1428571,6.711 11.4788571,6.375 11.8932321,6.375 C12.3072321,6.375 12.6428571,6.711 12.6428571,7.125375 C12.6428571,7.539375 12.3072321,7.875 11.8932321,7.875 L11.8932321,7.875 Z" id="Imported-Layers-Copy-3" opacity="0.693027052" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <g id="Rectangle-346">
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="none" xlink:href="#path-1"></use>
+            </g>
+            <path d="M16.4180495,9.125 L16.4180495,8.4375 C16.4180495,8.058 16.0984067,7.75 15.7037638,7.75 L14.9894781,7.75 L14.9894781,12.5625 L14,12.5625 L14,6.71875 C14,5.7693125 13.2007143,5 12.2142857,5 L5.78571429,5 C4.79928571,5 4,5.7693125 4,6.71875 L4,14.28125 C4,15.2306875 4.79928571,16 5.78571429,16 L12.2142857,16 C13.2007143,16 14,15.2306875 14,14.28125 L14,13.9375 L15.7037638,13.9375 C16.0984067,13.9375 16.4180495,13.6298438 16.4180495,13.25 L16.4180495,12.5625 L17.7037638,12.5625 C17.9012638,12.5625 18.0609067,12.4088437 18,12.21875 L18,9.46875 C18.0609067,9.27865625 17.9012638,9.125 17.7037638,9.125 L16.4180495,9.125 Z M7.5,14.5 C6.395,14.5 5.5,13.6047413 5.5,12.5001667 C5.5,11.395592 6.395,10.5 7.5,10.5 C8.60466667,10.5 9.5,11.395592 9.5,12.5001667 C9.5,13.6047413 8.60466667,14.5 7.5,14.5 L7.5,14.5 Z M11.8932321,7.875 C11.4788571,7.875 11.1428571,7.539375 11.1428571,7.125375 C11.1428571,6.711 11.4788571,6.375 11.8932321,6.375 C12.3072321,6.375 12.6428571,6.711 12.6428571,7.125375 C12.6428571,7.539375 12.3072321,7.875 11.8932321,7.875 L11.8932321,7.875 Z" id="Imported-Layers-Copy-3" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/speedcam-m.svg b/data/styles/clear/style-night/symbols/speedcam-m.svg
index 8608cb49a2..de4e10a508 100644
--- a/data/styles/clear/style-night/symbols/speedcam-m.svg
+++ b/data/styles/clear/style-night/symbols/speedcam-m.svg
@@ -3,12 +3,17 @@
     <!-- Generator: Sketch 3.4.2 (15857) - http://www.bohemiancoding.com/sketch -->
     <title>speedcam-m</title>
     <desc>Created with Sketch.</desc>
-    <defs></defs>
+    <defs>
+        <rect id="path-1" x="1" y="1" width="15" height="15" rx="2"></rect>
+    </defs>
     <g id="Other" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="speedcam-m" sketch:type="MSLayerGroup">
             <rect id="Rectangle-346-Copy-4" opacity="0.478661381" fill="#FFFFFF" sketch:type="MSShapeGroup" x="0" y="0" width="17" height="17" rx="2"></rect>
-            <rect id="Rectangle-346-Copy" fill="#383833" sketch:type="MSShapeGroup" x="1" y="1" width="15" height="15" rx="2"></rect>
-            <path d="M12.6457063,7.32124435 L12.6457063,6.73186652 C12.6457063,6.40652996 12.3716838,6.14248869 12.0333657,6.14248869 L11.4210251,6.14248869 L11.4210251,10.2681335 L10.5727684,10.2681335 L10.5727684,5.25842195 C10.5727684,4.44449117 9.88755927,3.78497738 9.0419169,3.78497738 L4.5308515,3.78497738 C3.68520913,3.78497738 3,4.44449117 3,5.25842195 L3,11.741578 C3,12.5555088 3.68520913,13.2150226 4.5308515,13.2150226 L9.0419169,13.2150226 C9.88755927,13.2150226 10.5727684,12.5555088 10.5727684,11.741578 L10.5727684,11.4468891 L12.0333657,11.4468891 C12.3716838,11.4468891 12.6457063,11.1831426 12.6457063,10.8575113 L12.6457063,10.2681335 L13.7479194,10.2681335 C13.9172315,10.2681335 14.0540896,10.1364075 14.0018758,9.97344457 L14.0018758,7.61593326 C14.0540896,7.45297029 13.9172315,7.32124435 13.7479194,7.32124435 L12.6457063,7.32124435 Z M4,10.500125 C4,9.67169403 4.67125,9 5.5,9 C6.3285,9 7,9.67169403 7,10.500125 C7,11.328556 6.3285,12 5.5,12 C4.67125,12 4,11.328556 4,10.500125 Z M8.76668511,6.2496483 C8.41145102,6.2496483 8.123406,5.96192476 8.123406,5.60701214 C8.123406,5.25177805 8.41145102,4.96373304 8.76668511,4.96373304 C9.12159772,4.96373304 9.40932126,5.25177805 9.40932126,5.60701214 C9.40932126,5.96192476 9.12159772,6.2496483 8.76668511,6.2496483 L8.76668511,6.2496483 Z" id="Imported-Layers-Copy-4" opacity="0.55626166" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <g id="Rectangle-346-Copy">
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="none" xlink:href="#path-1"></use>
+            </g>
+            <path d="M12.6457063,7.32124435 L12.6457063,6.73186652 C12.6457063,6.40652996 12.3716838,6.14248869 12.0333657,6.14248869 L11.4210251,6.14248869 L11.4210251,10.2681335 L10.5727684,10.2681335 L10.5727684,5.25842195 C10.5727684,4.44449117 9.88755927,3.78497738 9.0419169,3.78497738 L4.5308515,3.78497738 C3.68520913,3.78497738 3,4.44449117 3,5.25842195 L3,11.741578 C3,12.5555088 3.68520913,13.2150226 4.5308515,13.2150226 L9.0419169,13.2150226 C9.88755927,13.2150226 10.5727684,12.5555088 10.5727684,11.741578 L10.5727684,11.4468891 L12.0333657,11.4468891 C12.3716838,11.4468891 12.6457063,11.1831426 12.6457063,10.8575113 L12.6457063,10.2681335 L13.7479194,10.2681335 C13.9172315,10.2681335 14.0540896,10.1364075 14.0018758,9.97344457 L14.0018758,7.61593326 C14.0540896,7.45297029 13.9172315,7.32124435 13.7479194,7.32124435 L12.6457063,7.32124435 Z M4,10.500125 C4,9.67169403 4.67125,9 5.5,9 C6.3285,9 7,9.67169403 7,10.500125 C7,11.328556 6.3285,12 5.5,12 C4.67125,12 4,11.328556 4,10.500125 Z M8.76668511,6.2496483 C8.41145102,6.2496483 8.123406,5.96192476 8.123406,5.60701214 C8.123406,5.25177805 8.41145102,4.96373304 8.76668511,4.96373304 C9.12159772,4.96373304 9.40932126,5.25177805 9.40932126,5.60701214 C9.40932126,5.96192476 9.12159772,6.2496483 8.76668511,6.2496483 L8.76668511,6.2496483 Z" id="Imported-Layers-Copy-4" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/speedcam-s.svg b/data/styles/clear/style-night/symbols/speedcam-s.svg
index 37e25a5470..3309ef7261 100644
--- a/data/styles/clear/style-night/symbols/speedcam-s.svg
+++ b/data/styles/clear/style-night/symbols/speedcam-s.svg
@@ -3,18 +3,23 @@
     <!-- Generator: Sketch 3.4.2 (15857) - http://www.bohemiancoding.com/sketch -->
     <title>speedcam-s</title>
     <desc>Created with Sketch.</desc>
-    <defs></defs>
+    <defs>
+        <rect id="path-1" x="1" y="1" width="11" height="11" rx="2"></rect>
+    </defs>
     <g id="Other" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="speedcam-s" sketch:type="MSLayerGroup">
             <rect id="Rectangle-346-Copy-5" opacity="0.398087687" fill="#FFFFFF" sketch:type="MSShapeGroup" x="0" y="0" width="13" height="13" rx="2"></rect>
-            <rect id="Rectangle-346-Copy-2" fill="#383833" sketch:type="MSShapeGroup" x="1" y="1" width="11" height="11" rx="2"></rect>
-            <g id="Rectangle-358-Copy-2-+-Oval-322-Copy-5-+-Oval-322-Copy-6" transform="translate(3.000000, 3.000000)" fill="#FFFFFF" sketch:type="MSShapeGroup" opacity="0.609316698">
-                <path d="M0,1.00292933 C0,0.449026756 0.443716645,0 0.999807492,0 L4.00019251,0 C4.55237094,0 5,0.437881351 5,1.00292933 L5,5.99707067 C5,6.55097324 4.55628335,7 4.00019251,7 L0.999807492,7 C0.447629061,7 0,6.56211865 0,5.99707067 L0,1.00292933 Z M1.875,6.36363636 C2.56535594,6.36363636 3.125,5.79381695 3.125,5.09090909 C3.125,4.38800123 2.56535594,3.81818182 1.875,3.81818182 C1.18464406,3.81818182 0.625,4.38800123 0.625,5.09090909 C0.625,5.79381695 1.18464406,6.36363636 1.875,6.36363636 Z M3.4375,2.70454545 C4.04156145,2.70454545 4.53125,2.20595347 4.53125,1.59090909 C4.53125,0.97586471 4.04156145,0.477272727 3.4375,0.477272727 C2.83343855,0.477272727 2.34375,0.97586471 2.34375,1.59090909 C2.34375,2.20595347 2.83343855,2.70454545 3.4375,2.70454545 Z" id="Rectangle-358-Copy-2"></path>
-                <ellipse id="Oval-322-Copy-5" cx="3.4375" cy="1.59090909" rx="0.625" ry="0.636363636"></ellipse>
-                <ellipse id="Oval-322-Copy-6" cx="1.875" cy="5.09090909" rx="0.625" ry="0.636363636"></ellipse>
+            <g id="Rectangle-346-Copy-2">
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="none" xlink:href="#path-1"></use>
             </g>
-            <rect id="Rectangle-365" opacity="0.6" fill="#FFFFFF" sketch:type="MSShapeGroup" x="10" y="5" width="1" height="3"></rect>
-            <rect id="Rectangle-365-Copy" opacity="0.6" fill="#FFFFFF" sketch:type="MSShapeGroup" x="9" y="4" width="1" height="5"></rect>
+            <g id="Rectangle-358-Copy-2-+-Oval-322-Copy-5-+-Oval-322-Copy-6" transform="translate(3.000000, 3.000000)" fill="#FFFFFF" sketch:type="MSShapeGroup">
+                <path d="M0,1.00292933 C0,0.449026756 0.443716645,0 0.999807492,0 L4.00019251,0 C4.55237094,0 5,0.437881351 5,1.00292933 L5,5.99707067 C5,6.55097324 4.55628335,7 4.00019251,7 L0.999807492,7 C0.447629061,7 0,6.56211865 0,5.99707067 L0,1.00292933 Z M1.875,6.36363636 C2.56535594,6.36363636 3.125,5.79381695 3.125,5.09090909 C3.125,4.38800123 2.56535594,3.81818182 1.875,3.81818182 C1.18464406,3.81818182 0.625,4.38800123 0.625,5.09090909 C0.625,5.79381695 1.18464406,6.36363636 1.875,6.36363636 Z M3.4375,2.70454545 C4.04156145,2.70454545 4.53125,2.20595347 4.53125,1.59090909 C4.53125,0.97586471 4.04156145,0.477272727 3.4375,0.477272727 C2.83343855,0.477272727 2.34375,0.97586471 2.34375,1.59090909 C2.34375,2.20595347 2.83343855,2.70454545 3.4375,2.70454545 Z" id="Rectangle-358-Copy-2" opacity="0.7"></path>
+                <ellipse id="Oval-322-Copy-5" opacity="0.609316698" cx="3.4375" cy="1.59090909" rx="0.625" ry="0.636363636"></ellipse>
+                <ellipse id="Oval-322-Copy-6" opacity="0.609316698" cx="1.875" cy="5.09090909" rx="0.625" ry="0.636363636"></ellipse>
+            </g>
+            <rect id="Rectangle-365" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup" x="10" y="5" width="1" height="3"></rect>
+            <rect id="Rectangle-365-Copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup" x="9" y="4" width="1" height="5"></rect>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/sports-l.svg b/data/styles/clear/style-night/symbols/sports-l.svg
index 5b8d8a4bd7..32fc1a70a1 100644
--- a/data/styles/clear/style-night/symbols/sports-l.svg
+++ b/data/styles/clear/style-night/symbols/sports-l.svg
@@ -10,7 +10,7 @@
         <g id="sports-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.057,27 0,20.943 0,13.5 C0,6.057 6.057,0 13.5,0 C20.943,0 27,6.057 27,13.5 C27,20.943 20.943,27 13.5,27 L13.5,27 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M5,6 L5,12 C5,13.654 6.346,15 8,15 L9,15 C9,16.104 9.842,17.306 10.88,17.684 L12.441,18.469 L12,21.2 L9,22 L9,23 L18,23 L18,22 L15,21.2 L14.56,18.467 L16.121,17.684 C17.159,17.306 18.001,16.105 18.001,15 L19.001,15 C20.655,15 22.001,13.654 22.001,12 L22.001,6 L5,6 L5,6 Z M8,13 C7.448,13 7,12.552 7,12 L7,8 L9,8 L9,13 L8,13 L8,13 Z M20,12 C20,12.552 19.552,13 19,13 L18,13 L18,8 L20,8 L20,12 L20,12 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/sports-m.svg b/data/styles/clear/style-night/symbols/sports-m.svg
index 555543a86d..ea15979abe 100644
--- a/data/styles/clear/style-night/symbols/sports-m.svg
+++ b/data/styles/clear/style-night/symbols/sports-m.svg
@@ -10,7 +10,7 @@
         <g id="sports-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M5,6 L5,11.4 C5,12.284 5.717,13 6.6,13 L8.007,13 C8.045,13.828 8.68,14.706 9.462,14.988 L10.662,15.585 L10.301,17.56 L8,18.2 L8,19 L15,19 L15,18.199 L12.7,17.559 L12.338,15.583 L13.538,14.987 C14.321,14.705 14.956,13.827 14.993,12.999 L16.4,12.999 C17.283,12.999 18,12.282 18,11.399 L18,6 L5,6 L5,6 Z M6,11.4 L6,7 L8,7 L8,12 L6.6,12 C6.269,12 6,11.731 6,11.4 L6,11.4 Z M17,11.4 C17,11.731 16.731,12 16.4,12 L15,12 L15,7 L17,7 L17,11.4 L17,11.4 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/subway-l.svg b/data/styles/clear/style-night/symbols/subway-l.svg
index 83f6c76113..74888e2cc7 100644
--- a/data/styles/clear/style-night/symbols/subway-l.svg
+++ b/data/styles/clear/style-night/symbols/subway-l.svg
@@ -7,7 +7,7 @@
     <g id="Transport" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="subway-l" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#12314C" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
+            <circle id="Oval-1-Copy-38" fill="#0F2940" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
             <g id="g24855" transform="translate(7.000000, 6.000000)" fill="#FFFFFF" opacity="0.7" sketch:type="MSShapeGroup">
                 <path d="M3,0.3622 L0,2.3622 L0,13.3622 C0,13.8622 0.5,14.3622 1,14.3622 L3.5,14.3622 L7,14.3622 L9.5,14.3622 L12,14.3622 C12.5,14.3622 13,13.8622 13,13.3622 L13,2.3622 L10,0.3622 L3,0.3622 Z M4,2.3622 L9,2.3622 L11,3.3622 L11,6.3622 L2,6.3622 L2,3.3622 L4,2.3622 Z M3,10.3622 C3.554,10.3622 4,10.8082 4,11.3622 C4,11.9162 3.554,12.3622 3,12.3622 C2.446,12.3622 2,11.9162 2,11.3622 C2,10.8082 2.446,10.3622 3,10.3622 L3,10.3622 Z M10,10.3622 C10.554,10.3622 11,10.8082 11,11.3622 C11,11.9162 10.554,12.3622 10,12.3622 C9.446,12.3622 9,11.9162 9,11.3622 C9,10.8082 9.446,10.3622 10,10.3622 L10,10.3622 Z" id="path24859"></path>
             </g>
diff --git a/data/styles/clear/style-night/symbols/subway-m.svg b/data/styles/clear/style-night/symbols/subway-m.svg
index 7dc0fabda9..af599dc5d6 100644
--- a/data/styles/clear/style-night/symbols/subway-m.svg
+++ b/data/styles/clear/style-night/symbols/subway-m.svg
@@ -7,7 +7,7 @@
     <g id="Transport" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="subway-m" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" r="11.5"></circle>
-            <circle id="Oval-1-Copy-40" fill="#12314C" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" r="10.5"></circle>
+            <circle id="Oval-1-Copy-40" fill="#0F2940" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" r="10.5"></circle>
             <path d="M7.95762217,5.03583644 L5.95762217,6.53583644 L6,16.0049207 C6.01536083,16.5049207 6.51536083,17.0049207 7.01536083,17.0049207 L16.0153608,17.0049207 C16.5153608,17.0049207 17.0078669,16.6758134 17,16.0049207 L16.9576222,6.53583644 L14.9576222,5.03583644 L7.95762217,5.03583644 Z M9.57605219,7.04136763 L13.5760522,7.04136763 L15,8.14000509 L15,11.9843851 L8,11.9843851 L8,8.14000509 L9.57605219,7.04136763 Z M9,14.6122 C9,15.026414 8.66421,15.3622 8.25,15.3622 C7.83579,15.3622 7.5,15.026414 7.5,14.6122 C7.5,14.197986 7.83579,13.8622 8.25,13.8622 C8.66421,13.8622 9,14.197986 9,14.6122 Z M14.75,13.8622 C15.16421,13.8622 15.5,14.197986 15.5,14.6122 C15.5,15.026414 15.16421,15.3622 14.75,15.3622 C14.33579,15.3622 14,15.026414 14,14.6122 C14,14.197986 14.33579,13.8622 14.75,13.8622 L14.75,13.8622 Z" id="path24869" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-night/symbols/subway-s.svg b/data/styles/clear/style-night/symbols/subway-s.svg
index 3001b49137..a59d60de75 100644
--- a/data/styles/clear/style-night/symbols/subway-s.svg
+++ b/data/styles/clear/style-night/symbols/subway-s.svg
@@ -8,7 +8,7 @@
         <g id="subway-s" sketch:type="MSLayerGroup">
             <g id="g24875" sketch:type="MSShapeGroup">
                 <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" cx="8.5" cy="8.5" r="8.5"></circle>
-                <circle id="Oval-1-Copy-42" fill="#12314C" cx="8.5" cy="8.5" r="7.5"></circle>
+                <circle id="Oval-1-Copy-42" fill="#0F2940" cx="8.5" cy="8.5" r="7.5"></circle>
                 <path d="M6.5,4 L5,5.14285714 L5,11.4285714 C5,11.7142857 5.25,12 5.5,12 L6.75,12 L9,12 L10.25,12 L11.5,12 C11.75,12 12,11.7142857 12,11.4285714 L12,5.14285714 L10.5,4 L6.5,4 Z M7,5.14285714 L10,5.14285714 L11,5.71428571 L11,7.42857143 L6,7.42857143 L6,5.71428571 L7,5.14285714 Z M6.5,9.71428571 C6.777,9.71428571 7,9.96914286 7,10.2857143 C7,10.6022857 6.777,10.8571429 6.5,10.8571429 C6.223,10.8571429 6,10.6022857 6,10.2857143 C6,9.96914286 6.223,9.71428571 6.5,9.71428571 L6.5,9.71428571 Z M10.5,9.71428571 C10.777,9.71428571 11,9.96914286 11,10.2857143 C11,10.6022857 10.777,10.8571429 10.5,10.8571429 C10.223,10.8571429 10,10.6022857 10,10.2857143 C10,9.96914286 10.223,9.71428571 10.5,9.71428571 L10.5,9.71428571 Z" id="path24879" opacity="0.7" fill="#FFFFFF"></path>
             </g>
         </g>
diff --git a/data/styles/clear/style-night/symbols/subway-xs copy.svg b/data/styles/clear/style-night/symbols/subway-xs copy.svg
index b6a35792ef..f6c5f0ae43 100644
--- a/data/styles/clear/style-night/symbols/subway-xs copy.svg	
+++ b/data/styles/clear/style-night/symbols/subway-xs copy.svg	
@@ -7,7 +7,7 @@
     <g id="Transport" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="subway-xs-copy" sketch:type="MSLayerGroup">
             <ellipse id="Oval-139-Copy" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="4.4607938" cy="4.4601378" rx="4.4607938" ry="4.4601378"></ellipse>
-            <ellipse id="Oval-139" fill="#12314C" sketch:type="MSShapeGroup" cx="4.4607938" cy="4.4601378" rx="3.46950629" ry="3.46899606"></ellipse>
+            <ellipse id="Oval-139" fill="#0F2940" sketch:type="MSShapeGroup" cx="4.4607938" cy="4.4601378" rx="3.46950629" ry="3.46899606"></ellipse>
             <rect id="Rectangle-307" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup" x="2.97386254" y="2.9734252" width="2.97386254" height="2.9734252"></rect>
         </g>
     </g>
diff --git a/data/styles/clear/style-night/symbols/subway-xs.svg b/data/styles/clear/style-night/symbols/subway-xs.svg
index 01251adbe3..bd6766ad72 100644
--- a/data/styles/clear/style-night/symbols/subway-xs.svg
+++ b/data/styles/clear/style-night/symbols/subway-xs.svg
@@ -7,7 +7,7 @@
     <g id="Transport" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="subway-xs" sketch:type="MSLayerGroup" transform="translate(0.012585, 0.000000)">
             <circle id="Oval-139-Copy" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="5" cy="5" r="5"></circle>
-            <circle id="Oval-139" fill="#12314C" sketch:type="MSShapeGroup" cx="5" cy="5" r="4"></circle>
+            <circle id="Oval-139" fill="#0F2940" sketch:type="MSShapeGroup" cx="5" cy="5" r="4"></circle>
             <rect id="Rectangle-307" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup" x="3" y="3" width="4" height="4" rx="1"></rect>
         </g>
     </g>
diff --git a/data/styles/clear/style-night/symbols/sweets-l.svg b/data/styles/clear/style-night/symbols/sweets-l.svg
index f4b826f161..e187fc9405 100644
--- a/data/styles/clear/style-night/symbols/sweets-l.svg
+++ b/data/styles/clear/style-night/symbols/sweets-l.svg
@@ -10,7 +10,7 @@
         <g id="sweets-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.057,27 0,20.943 0,13.5 C0,6.057 6.057,0 13.5,0 C20.943,0 27,6.057 27,13.5 C27,20.943 20.943,27 13.5,27 L13.5,27 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M22.143,9.64 L18.27,10.783 C18.755,11.97 18.517,13.381 17.554,14.345 L14.359,17.541 C13.395,18.505 11.982,18.742 10.795,18.257 L9.654,22.13 C9.508,22.624 9.195,22.536 8.956,21.933 L7.857,19.169 L5.093,18.07 C4.49,17.83 4.402,17.517 4.896,17.371 L8.769,16.228 C8.283,15.042 8.52,13.63 9.485,12.666 L12.68,9.47 C13.645,8.506 15.058,8.269 16.244,8.755 L17.385,4.882 C17.531,4.388 17.842,4.476 18.083,5.079 L19.182,7.843 L21.945,8.942 C22.548,9.182 22.637,9.494 22.143,9.64 L22.143,9.64 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/sweets-m.svg b/data/styles/clear/style-night/symbols/sweets-m.svg
index 81db59060a..d71b951b38 100644
--- a/data/styles/clear/style-night/symbols/sweets-m.svg
+++ b/data/styles/clear/style-night/symbols/sweets-m.svg
@@ -10,7 +10,7 @@
         <g id="sweets-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M18.418,8.413 L15.32,9.328 C15.708,10.276 15.517,11.405 14.747,12.176 L12.191,14.734 C11.42,15.505 10.289,15.695 9.339,15.306 L8.426,18.405 C8.31,18.801 8.059,18.73 7.867,18.247 L6.988,16.036 L4.777,15.157 C4.296,14.966 4.223,14.716 4.62,14.598 L7.718,13.684 C7.329,12.736 7.519,11.606 8.29,10.834 L10.847,8.277 C11.618,7.506 12.749,7.316 13.699,7.706 L14.611,4.607 C14.728,4.211 14.977,4.281 15.17,4.764 L16.049,6.975 L18.26,7.854 C18.742,8.047 18.813,8.297 18.418,8.413 L18.418,8.413 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/swimming-l.svg b/data/styles/clear/style-night/symbols/swimming-l.svg
index 46ac9d37d2..761b74c975 100644
--- a/data/styles/clear/style-night/symbols/swimming-l.svg
+++ b/data/styles/clear/style-night/symbols/swimming-l.svg
@@ -10,7 +10,7 @@
         <g id="swimming-l" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
             <g id="Oval-1-Copy-38">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M16.125,6 C15.96683,6 15.69115,6.093 15.5625,6.1563 L11.5625,8.0938 C11.03008,8.3459 10.83636,9.1208 11.1875,9.5938 L12.40625,11.25 L7.6875,14.9063 C8.81645,15.1353 9.6636,15.8442 10.5,15.8438 C11.5,15.8443 12,14.8438 13.5,14.8438 C15,14.8438 15.5,15.8433 16.5,15.8438 C16.9128,15.844 17.33328,15.6689 17.78125,15.4688 L13.5625,9.3438 L16.59375,7.8125 C17.19573,7.5115 17.15614,6.9953 17.09375,6.6875 C17.03465,6.3957 16.67472,6 16.125,6 L16.125,6 Z M18,9 C16.89543,9 16,9.8954 16,11 C16,12.1046 16.89543,13 18,13 C19.10457,13 20,12.1046 20,11 C20,9.8954 19.10457,9 18,9 L18,9 Z M7,17 C6.30594,17 5.66024,17.4049 5,17.625 L5,19.6563 C5,19.6563 6,19.0005 7,19 C8,18.9995 9,20 10.5,20 C12,20 12.47352,19.0347 13.5,19 C14.5,19.0005 15,20 16.5,20 C18,20 19,19 20,19 C20.70165,19 22,19.6563 22,19.6563 L22,17.625 C21.3584,17.3782 20.65657,17 20,17 C18.5,17 17.5,18.0005 16.5,18 C15.5,17.9995 15,17 13.5,17 C12,17 11.5,18.0005 10.5,18 C9.5,18.0005 8.5,17 7,17 L7,17 Z" id="path4758-copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/swimming-m.svg b/data/styles/clear/style-night/symbols/swimming-m.svg
index 5eb491f1f5..8ad47b405b 100644
--- a/data/styles/clear/style-night/symbols/swimming-m.svg
+++ b/data/styles/clear/style-night/symbols/swimming-m.svg
@@ -10,7 +10,7 @@
         <g id="swimming-m" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
             <g id="Oval-1-Copy-40">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M13.75,7 C13.63577,7 13.43667,7.048 13.34375,7.094 L10.46875,8.5003 C10.08422,8.6823 9.9339,9.2524 10.1875,9.594 L11.0625,10.7815 L7.34375,12.9378 L9.34375,13.7503 L11.5,12.8753 L13.65625,13.7503 L14.5,12.8753 L11.90625,9.4065 L14.09375,8.2815 C14.52851,8.0641 14.51381,7.6913 14.46875,7.469 C14.42605,7.2583 14.14702,7.0003 13.75,7.0003 L13.75,7 Z M15.5,9.375 C14.67157,9.375 14,10.0466 14,10.875 C14,11.7034 14.67157,12.375 15.5,12.375 C16.32843,12.375 17,11.7034 17,10.875 C17,10.0466 16.32843,9.375 15.5,9.375 L15.5,9.375 Z M11.5,13.875 L9.5,14.875 L7,13.9375 L5,14.875 L5,16.375 L7,15.375 L9.5,16.375 L11.5,15.3125 L13.5,16.375 L15.5,15.3125 L18,16.375 L18,14.875 L15.5,13.875 L13.5,14.875 L11.5,13.875 L11.5,13.875 Z" id="path16388" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/swimming-s.svg b/data/styles/clear/style-night/symbols/swimming-s.svg
index 8e550ee667..ed2496eb5b 100644
--- a/data/styles/clear/style-night/symbols/swimming-s.svg
+++ b/data/styles/clear/style-night/symbols/swimming-s.svg
@@ -10,7 +10,7 @@
         <g id="swimming-s" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
             <g id="Oval-1-Copy-42">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M10.5,4.3622 L10,4.666 L7.78125,5.956 C7.51504,6.082 7.41818,6.4694 7.59375,6.706 L8.20312,7.5341 L6,9.3622 L7,9.5966 L8.5,9.1281 L10,9.5966 L11,9.3622 L8.78125,6.581 L11.01562,5.1903 L11.00002,4.3622 L10.5,4.3622 Z M11.5,6.4092 C10.94772,6.4092 10.5,6.8569 10.5,7.4092 C10.5,7.9614 10.94772,8.4092 11.5,8.4092 C12.05228,8.4092 12.5,7.9614 12.5,7.4092 C12.5,6.8569 12.05228,6.4092 11.5,6.4092 L11.5,6.4092 Z M5.5,10.3623 L4,10.8308 L4,11.862 L4.15625,11.815 L5.5,11.3619 L7,11.8617 L8.5,11.3619 L10,11.8617 L11.5,11.3619 L13,11.8619 L13,10.8307 L11.5,10.3622 L10,10.8307 L8.5,10.3622 L7,10.8307 L5.5,10.3622 L5.5,10.3623 Z" id="path8421-9-1-0-7-copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/taxi-l.svg b/data/styles/clear/style-night/symbols/taxi-l.svg
index a240ac79a1..9672d303af 100644
--- a/data/styles/clear/style-night/symbols/taxi-l.svg
+++ b/data/styles/clear/style-night/symbols/taxi-l.svg
@@ -10,7 +10,7 @@
         <g id="taxi-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.056,27 0,20.943 0,13.5 C0,6.057 6.056,0 13.5,0 C20.944,0 27,6.057 27,13.5 C27,20.943 20.944,27 13.5,27 L13.5,27 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M22.199,9.99 C22.089,8.89 21.104,8 20,8 L7,8 C5.896,8 4.911,8.891 4.801,9.99 L4,18 L23,18 L22.199,9.99 L22.199,9.99 Z M21,16 L18,16 L18,13 L15,13 L15,16 L12,16 L12,13 L9,13 L9,16 L6,16 L6,13 L9,13 L9,10 L12,10 L12,12.9 L15,12.9 L15,10 L18,10 L18,13 L21,13 L21,16 L21,16 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/taxi-m.svg b/data/styles/clear/style-night/symbols/taxi-m.svg
index 0d5ac38cf6..d4f01e85dc 100644
--- a/data/styles/clear/style-night/symbols/taxi-m.svg
+++ b/data/styles/clear/style-night/symbols/taxi-m.svg
@@ -10,7 +10,7 @@
         <g id="taxi-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M18.359,8.592 C18.271,7.713 17.483,7 16.599,7 L7.4,7 C6.516,7 5.728,7.713 5.64,8.592 L5,15 L19,15 L18.359,8.592 L18.359,8.592 Z M9,13 L7,13 L7,11 L9,11 L9,13 L9,13 Z M11,11 L9,11 L9,9 L11,9 L11,11 L11,11 Z M13,13 L11,13 L11,11 L13,11 L13,13 L13,13 Z M15,11 L13,11 L13,9 L15,9 L15,11 L15,11 Z M17,13 L15,13 L15,11 L17,11 L17,13 L17,13 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/tennis-l.svg b/data/styles/clear/style-night/symbols/tennis-l.svg
index ce0d1b5e7c..a235eb0a94 100644
--- a/data/styles/clear/style-night/symbols/tennis-l.svg
+++ b/data/styles/clear/style-night/symbols/tennis-l.svg
@@ -10,7 +10,7 @@
         <g id="tennis-l" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
             <g id="Oval-1-Copy-38">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M11,5 C7.68629,5 5,7.6863 5,11 C5,14.3137 7.68629,17 11,17 L16,17 L20.5,21.5 C20.81628,21.8163 21.00625,22 21.40625,22 C21.53125,22 21.6875,22 21.84375,21.8438 C22.00005,21.6875 22,21.5313 22,21.4063 C22,21.0063 21.78212,20.7821 21.5,20.5 L17,16 L17,11 C17,7.6863 14.31371,5 11,5 L11,5 Z M16,13 L16,16 L13,16 L16,13 Z M6.5,17 C5.67157,17 5,17.6716 5,18.5 C5,19.3284 5.67157,20 6.5,20 C7.32843,20 8,19.3284 8,18.5 C8,17.6716 7.32843,17 6.5,17 L6.5,17 Z" id="path11507" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/tennis-m.svg b/data/styles/clear/style-night/symbols/tennis-m.svg
index bd968835b9..354c79d1b8 100644
--- a/data/styles/clear/style-night/symbols/tennis-m.svg
+++ b/data/styles/clear/style-night/symbols/tennis-m.svg
@@ -10,7 +10,7 @@
         <g id="tennis-m" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
             <g id="Oval-1-Copy-40">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M9.5,5 C6.96598,5 5,6.966 5,9.5 C5,12.034 7.14246,13.9984 9.67648,14 L13,14 L17,18 L18,18 L18,17 L14,13 L14,9.6764 C14,7.1424 12.03401,5 9.5,5 L9.5,5 Z M13,10.7058 L13,13 L10.5,13 L13,10.7058 Z M6.14706,14 C5.51355,14 5,14.5135 5,15.147 C5,15.7805 5.51355,16.2941 6.14706,16.2941 C6.78056,16.2941 7.29412,15.7805 7.29412,15.147 C7.29412,14.5135 6.78056,14 6.14706,14 L6.14706,14 Z" id="path11507-7-copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/tennis-s.svg b/data/styles/clear/style-night/symbols/tennis-s.svg
index 080153a720..4f98dff65e 100644
--- a/data/styles/clear/style-night/symbols/tennis-s.svg
+++ b/data/styles/clear/style-night/symbols/tennis-s.svg
@@ -10,7 +10,7 @@
         <g id="tennis-s" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
             <g id="Oval-1-Copy-42">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M4.00003,6.9999 C4.00003,8.6568 5.34317,9.9999 7.00003,9.9999 L9.50003,9.9999 L12.5,13 L13,13 L12.99997,12.5001 L10,9.5 L10,7 C10,5.3431 8.65685,4 7.00001,4 C5.34317,3.9999 4.00003,5.343 4.00003,6.9999 L4.00003,6.9999 Z M9,7.5 L9,9 L7.5,9 L9,7.5 Z M4.75003,10.5 C4.33581,10.5 4.00003,10.8358 4.00003,11.25 C4.00003,11.6642 4.33581,12 4.75003,12 C5.16424,12 5.50003,11.6642 5.50003,11.25 C5.50003,10.8358 5.16424,10.5 4.75003,10.5 L4.75003,10.5 Z" id="path11507-3-copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/theatre-l.svg b/data/styles/clear/style-night/symbols/theatre-l.svg
index 0153303c36..4cadfb5997 100644
--- a/data/styles/clear/style-night/symbols/theatre-l.svg
+++ b/data/styles/clear/style-night/symbols/theatre-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="theatre-l-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#331E12" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
+            <circle id="Oval-1-Copy-38" fill="#2E1B10" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
             <path d="M6,5 C5.5286,5 5,5.5 5,6 L5,13 C5,15.216 6,18 10,18 C10.35868,18 10.68618,17.983 11,17.938 L11,15.0005 L7,15.0005 C7,15.0005 7.5,13.0005 10,13.0005 C10.5,13.0005 10.69653,13.0745 11,13.188 L11,11.0005 C11,10.0838 11.36529,9.3179 12,9.0005 C13,8.5005 13.40372,8.7024 14,9.0005 L15,9.5005 L15,6.0005 C15,5.5005 14.4714,5.0005 14,5.0005 C13,5.0005 12,6.0005 10,6.0005 C8,6.0005 7,5.0005 6,5.0005 L6,5 Z M7.75,8.5 C8.44036,8.5 9,9.0596 9,9.75 C9,10.4404 8.44036,11 7.75,11 C7.05964,11 6.5,10.4404 6.5,9.75 C6.5,9.0596 7.05964,8.5 7.75,8.5 L7.75,8.5 Z M13,10 C12.5286,10 12,10.5 12,11 L12,18 C12,20.216 13,23 17,23 C21,23 22,20.216 22,18 L22,11 C22,10.5 21.4714,10 21,10 C20,10 19,11 17,11 C15,11 14,10 13,10 L13,10 Z M14.75,13.5 C15.44036,13.5 16,14.0596 16,14.75 C16,15.4404 15.44036,16 14.75,16 C14.05964,16 13.5,15.4404 13.5,14.75 C13.5,14.0596 14.05964,13.5 14.75,13.5 L14.75,13.5 Z M19.25,13.5 C19.94036,13.5 20.5,14.0596 20.5,14.75 C20.5,15.4404 19.94036,16 19.25,16 C18.55964,16 18,15.4404 18,14.75 C18,14.0596 18.55964,13.5 19.25,13.5 L19.25,13.5 Z M14,19 L20,19 C20,19 19.5,21 17,21 C14.5,21 14,19 14,19 L14,19 Z" id="path6342-copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-night/symbols/theatre-m.svg b/data/styles/clear/style-night/symbols/theatre-m.svg
index fc2d7eb1d7..e56d073312 100644
--- a/data/styles/clear/style-night/symbols/theatre-m.svg
+++ b/data/styles/clear/style-night/symbols/theatre-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="theatre-m-copy" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
-            <ellipse id="Oval-1-Copy-40" fill="#331E12" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+            <ellipse id="Oval-1-Copy-40" fill="#2E1B10" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
             <path d="M5.78125,5.3622 C5.39236,5.3622 5,5.7546 5,6.1435 L5,11.6435 C5,13.3671 5.76389,15.4247 8.875,15.4247 C9.15397,15.4247 8.75591,15.3977 9,15.3627 L9,13.3627 L6.5,13.3627 C6.5,13.3627 7.0555,11.3627 9,11.3627 L9,9.7065 C9,8.9935 9.10973,8.2525 9.5,7.8622 C9.89026,7.4719 10.38818,6.5542 12,7.3617 L13,7.8622 L13,6.144 C13,5.7551 12.60764,5.3627 12.21875,5.3627 C11.49653,5.3627 10,6.3627 9,6.3627 C8,6.3627 6.50347,5.3627 5.78125,5.3627 L5.78125,5.3622 Z M7,7.3622 C7.55228,7.3622 8,7.8099 8,8.3622 C8,8.9145 7.55228,9.3622 7,9.3622 C6.44772,9.3622 6,8.9145 6,8.3622 C6,7.8099 6.44772,7.3622 7,7.3622 L7,7.3622 Z M10.78125,8.3622 C10.4146,8.3622 10,8.7546 10,9.1435 L10,14.3622 C10,16.0858 10.88889,18.3622 14,18.3622 C17.11111,18.3622 18,16.0858 18,14.3622 L18,9.1435 C18,8.7546 17.5854,8.3622 17.21875,8.3622 C16.49653,8.3622 15,9.3622 14,9.3622 C13,9.3622 11.50347,8.3622 10.78125,8.3622 L10.78125,8.3622 Z M12,10.3622 C12.55228,10.3622 13,10.8099 13,11.3622 C13,11.9145 12.55228,12.3622 12,12.3622 C11.44772,12.3622 11,11.9145 11,11.3622 C11,10.8099 11.44772,10.3622 12,10.3622 L12,10.3622 Z M16,10.3622 C16.55228,10.3622 17,10.8099 17,11.3622 C17,11.9145 16.55228,12.3622 16,12.3622 C15.44772,12.3622 15,11.9145 15,11.3622 C15,10.8099 15.44772,10.3622 16,10.3622 L16,10.3622 Z M11.5,14.3622 L14.0625,14.3622 L16.5,14.3622 C16.5,14.3622 15.94445,16.3622 14,16.3622 C12.05556,16.3622 11.5,14.3622 11.5,14.3622 L11.5,14.3622 Z" id="path6342-3-copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-night/symbols/theatre-s.svg b/data/styles/clear/style-night/symbols/theatre-s.svg
index e0c2daf9ff..8a09d0f0ab 100644
--- a/data/styles/clear/style-night/symbols/theatre-s.svg
+++ b/data/styles/clear/style-night/symbols/theatre-s.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="theatre-s-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-42" fill="#331E12" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
+            <circle id="Oval-1-Copy-42" fill="#2E1B10" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
             <g id="g6508-copy" transform="translate(4.000000, 4.000000)" fill="#FFFFFF" opacity="0.7" sketch:type="MSShapeGroup">
                 <path d="M0.5,0.3622 C0.25,0.3622 0,0.6122 0,0.8622 L0,3.8622 C0,4.9702 0.5,6.3622 2.5,6.3622 C2.67934,6.3622 2.84309,6.3522 3,6.3312 L3,4.8624 L1,4.8624 C1,4.8624 1.25,3.8624 2.5,3.8624 C2.75,3.8624 2.84826,3.8994 3,3.9564 L3,2.8624 C3,2.4041 3.20224,2.0508 3.45312,1.7999 C3.70401,1.549 4.04166,1.3624 4.5,1.3624 L5,1.3624 L5,0.8626 C5,0.6126 4.7357,0.3628 4.5,0.3626 C4,0.3622 3.5,0.8622 2.5,0.8622 C1.63337,0.8622 1,0.3622 0.5,0.3622 L0.5,0.3622 Z M1.5,2.3622 C1.77614,2.3622 2,2.5861 2,2.8622 C2,3.1383 1.77614,3.3622 1.5,3.3622 C1.22386,3.3622 1,3.1383 1,2.8622 C1,2.5861 1.22386,2.3622 1.5,2.3622 L1.5,2.3622 Z M4.5,2.3622 C4.2643,2.3622 4,2.6122 4,2.8622 L4,5.8622 C4,6.9702 4.5,8.3622 6.5,8.3622 C8.5,8.3622 9,6.9702 9,5.8622 L9,2.8622 C9,2.6122 8.7357,2.3622 8.5,2.3622 C8,2.3622 7.24536,2.8622 6.5,2.8622 C5.75464,2.8622 5,2.3622 4.5,2.3622 L4.5,2.3622 Z M5.5,4.3622 C5.77614,4.3622 6,4.5861 6,4.8622 C6,5.1383 5.77614,5.3622 5.5,5.3622 C5.22386,5.3622 5,5.1383 5,4.8622 C5,4.5861 5.22386,4.3622 5.5,4.3622 L5.5,4.3622 Z M7.5,4.3622 C7.77614,4.3622 8,4.5861 8,4.8622 C8,5.1383 7.77614,5.3622 7.5,5.3622 C7.22386,5.3622 7,5.1383 7,4.8622 C7,4.5861 7.22386,4.3622 7.5,4.3622 L7.5,4.3622 Z M5,6.3622 L8,6.3622 C8,6.3622 7.75,7.3622 6.5,7.3622 C5.25,7.3622 5,6.3622 5,6.3622 L5,6.3622 Z" id="path6370"></path>
             </g>
diff --git a/data/styles/clear/style-night/symbols/toilets-l.svg b/data/styles/clear/style-night/symbols/toilets-l.svg
index c370970619..037487dda3 100644
--- a/data/styles/clear/style-night/symbols/toilets-l.svg
+++ b/data/styles/clear/style-night/symbols/toilets-l.svg
@@ -10,7 +10,7 @@
         <g id="toilets-l" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
             <g id="Oval-1-Copy-38">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M9.5,4 C8.11929,4 7,5.11929 7,6.5 C7,7.88071 8.11929,9 9.5,9 C10.88071,9 12,7.88071 12,6.5 C12,5.11929 10.88071,4 9.5,4 L9.5,4 Z M17.5,4 C16.11929,4 15,5.11929 15,6.5 C15,7.88071 16.11929,9 17.5,9 C18.88071,9 20,7.88071 20,6.5 C20,5.11929 18.88071,4 17.5,4 L17.5,4 Z M9,10 C8,10 7,11 7,12 L7,14 L5.5,18.5 C5.5,19 6,19 6.5,19 L8,19 L8,23 L11,23 L11,19 L12.5,19 C13,19 13.5,19 13.5,18.5 L12,14 L12,12 C12,11 11,10 10,10 L9,10 Z M15,10 C14.5,10 14,10.5 14,11 L16,17 L16,19 L16,23 L19,23 L19,19 L19,17 L21,11 C21,10.5 20.5,10 20,10 L15,10 Z" id="path16479-copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/toilets-m.svg b/data/styles/clear/style-night/symbols/toilets-m.svg
index 60a6b20c8f..02446ff07d 100644
--- a/data/styles/clear/style-night/symbols/toilets-m.svg
+++ b/data/styles/clear/style-night/symbols/toilets-m.svg
@@ -10,7 +10,7 @@
         <g id="toilets-m" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
             <g id="Oval-1-Copy-40">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M8.00001,4 C6.89544,4 6.00001,4.8954 6.00001,6 C6.00001,7.1046 6.89544,8 8.00001,8 C9.10458,8 10.00001,7.1046 10.00001,6 C10.00001,4.8954 9.10458,4 8.00001,4 L8.00001,4 Z M15,4 C13.89543,4 13,4.8954 13,6 C13,7.1046 13.89543,8 15,8 C16.10457,8 17,7.1046 17,6 C17,4.8954 16.10457,4 15,4 L15,4 Z M7.50001,9 L6.00001,10.5 L6.00001,13 L4.50001,15.5 L5.00001,16 L7.00001,16 L7.00001,19 L9.00001,19 L9.00001,16 L11.00001,16 L11.50001,15.5 L10.00001,13 L10.00001,10.5 L8.50001,9 L7.50001,9 Z M13,9 L12.00001,10 L14,14.5 L14,19 L16,19 L16,14.5 L18.00001,10 L17,9 L13,9 Z" id="path7660-copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/toilets-s.svg b/data/styles/clear/style-night/symbols/toilets-s.svg
index b03325e8b5..b9a0cabe7f 100644
--- a/data/styles/clear/style-night/symbols/toilets-s.svg
+++ b/data/styles/clear/style-night/symbols/toilets-s.svg
@@ -10,7 +10,7 @@
         <g id="toilets-s" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
             <g id="Oval-1-Copy-42">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M6,4 C5.30964,4 4.75,4.55964 4.75,5.25 C4.75,5.94036 5.30964,6.5 6,6.5 C6.69036,6.5 7.25,5.94036 7.25,5.25 C7.25,4.55964 6.69036,4 6,4 L6,4 Z M11,4 C10.30964,4 9.75,4.55964 9.75,5.25 C9.75,5.94036 10.30964,6.5 11,6.5 C11.69036,6.5 12.25,5.94036 12.25,5.25 C12.25,4.55964 11.69036,4 11,4 L11,4 Z M5,7 L5,8.5 L3.5,11 L5,11 L5,13 L7,13 L7,11 L8.5,11 L7,8.5 L7,7 L5,7 L5,7 Z M9,7 L10,10.5 L10,13 L12,13 L12,10.5 L13,7 L9,7 L9,7 Z" id="path7660-7-copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/toll_booth-l.svg b/data/styles/clear/style-night/symbols/toll_booth-l.svg
index c5acfb6f9d..27bafe7eb5 100644
--- a/data/styles/clear/style-night/symbols/toll_booth-l.svg
+++ b/data/styles/clear/style-night/symbols/toll_booth-l.svg
@@ -10,7 +10,7 @@
         <g id="toll_booth-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.056,27 0,20.943 0,13.5 C0,6.057 6.056,0 13.5,0 C20.944,0 27,6.057 27,13.5 C27,20.943 20.944,27 13.5,27 L13.5,27 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M5,19.961 L7,19.961 L7,12 L5,12 L5,19.961 L5,19.961 Z M5.058,6 L5.058,7.961 L5,7.961 L5,10 L22,10 L22,6 L5.058,6 L5.058,6 Z M20,20 L22,20 L22,12 L20,12 L20,20 L20,20 Z M12,20 L15,20 L15,12 L12,12 L12,20 L12,20 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/toll_booth-m.svg b/data/styles/clear/style-night/symbols/toll_booth-m.svg
index aed3458075..08ccb3cabd 100644
--- a/data/styles/clear/style-night/symbols/toll_booth-m.svg
+++ b/data/styles/clear/style-night/symbols/toll_booth-m.svg
@@ -10,7 +10,7 @@
         <g id="toll_booth-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M5,16.961 L7,16.961 L7,11 L5,11 L5,16.961 L5,16.961 Z M5.058,6 L5,9 L18,9 L18,6 L5.058,6 L5.058,6 Z M16,17 L18,17 L18,11 L16,11 L16,17 L16,17 Z M10,17 L13,17 L13,11 L10,11 L10,17 L10,17 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/tomb-l.svg b/data/styles/clear/style-night/symbols/tomb-l.svg
index 7453e21e7b..f8ec2e4449 100644
--- a/data/styles/clear/style-night/symbols/tomb-l.svg
+++ b/data/styles/clear/style-night/symbols/tomb-l.svg
@@ -10,7 +10,7 @@
         <g id="tomb-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.057,27 0,20.943 0,13.5 C0,6.057 6.057,0 13.5,0 C20.943,0 27,6.057 27,13.5 C27,20.943 20.943,27 13.5,27 L13.5,27 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M6,22 L6,10.9641053 C6,7.12442105 9.298,4 13.351,4 L13.65,4 C17.703,4 21.001,7.12442105 21.001,10.9641053 L21.001,22 L6,22 L6,22 Z M19,21 L19,11.351 C19,8.401 16.6,6 13.649,6 L13.35,6 C10.4,6 7.999,8.4 7.999,11.351 L7.999,21 L19,21 L19,21 Z M13.649,8 L13.35,8 C11.498,8 9.999,9.499 9.999,11.351 L9.999,20 L16.999,20 L16.999,11.351 C17,9.499 15.5,8 13.649,8 L13.649,8 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/tomb-m.svg b/data/styles/clear/style-night/symbols/tomb-m.svg
index 65e84db34a..97d1a5db66 100644
--- a/data/styles/clear/style-night/symbols/tomb-m.svg
+++ b/data/styles/clear/style-night/symbols/tomb-m.svg
@@ -10,7 +10,7 @@
         <g id="tomb-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M5,18 L5,9.9276 C5,6.65906667 7.849,4 11.35,4 L11.651,4 C15.152,4 18.001,6.65906667 18.001,9.9276 L18.001,18 L5,18 L5,18 Z M16,17.0666667 L16,9.9276 C16,7.68946667 14.049,5.86666667 11.65,5.86666667 L11.349,5.86666667 C8.951,5.86666667 6.999,7.68853333 6.999,9.9276 L6.999,17.0666667 L16,17.0666667 L16,17.0666667 Z M14,16.1333333 L14,9.9276 C14,8.718 12.946,7.73333333 11.65,7.73333333 L11.349,7.73333333 C10.053,7.73333333 8.999,8.718 8.999,9.9276 L8.999,16.1333333 L14,16.1333333 L14,16.1333333 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/tourism-l.svg b/data/styles/clear/style-night/symbols/tourism-l.svg
index 0f287832d6..8642f2fb47 100644
--- a/data/styles/clear/style-night/symbols/tourism-l.svg
+++ b/data/styles/clear/style-night/symbols/tourism-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="tourism-l-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#331E12" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
+            <circle id="Oval-1-Copy-38" fill="#2E1B10" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
             <polygon id="Star-1" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup" points="13.5 17.75 8.50382536 20.3766445 9.45800981 14.8133222 5.41601961 10.8733555 11.0019127 10.0616778 13.5 5 15.9980873 10.0616778 21.5839804 10.8733555 17.5419902 14.8133222 18.4961746 20.3766445 "></polygon>
         </g>
     </g>
diff --git a/data/styles/clear/style-night/symbols/tourism-m.svg b/data/styles/clear/style-night/symbols/tourism-m.svg
index 0e67a9b61c..4f6248739b 100644
--- a/data/styles/clear/style-night/symbols/tourism-m.svg
+++ b/data/styles/clear/style-night/symbols/tourism-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="tourism-m-copy" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
-            <ellipse id="Oval-1-Copy-40" fill="#331E12" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+            <ellipse id="Oval-1-Copy-40" fill="#2E1B10" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
             <polygon id="Star-1-Copy-2" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup" points="11.5 14.75 7.67939586 16.7586105 8.40906632 12.5043052 5.31813264 9.49138954 9.58969793 8.87069477 11.5 5 13.4103021 8.87069477 17.6818674 9.49138954 14.5909337 12.5043052 15.3206041 16.7586105 "></polygon>
         </g>
     </g>
diff --git a/data/styles/clear/style-night/symbols/tourism-s.svg b/data/styles/clear/style-night/symbols/tourism-s.svg
index 2f56bb279f..cfcf40e10b 100644
--- a/data/styles/clear/style-night/symbols/tourism-s.svg
+++ b/data/styles/clear/style-night/symbols/tourism-s.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="tourism-s-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-42" fill="#331E12" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
+            <circle id="Oval-1-Copy-42" fill="#2E1B10" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
             <polygon id="Star-1-Copy-3" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup" points="8.5 10.75 5.85496636 12.1405765 6.36012284 9.19528824 4.22024568 7.10942353 7.17748318 6.67971176 8.5 4 9.82251682 6.67971176 12.7797543 7.10942353 10.6398772 9.19528824 11.1450336 12.1405765 "></polygon>
         </g>
     </g>
diff --git a/data/styles/clear/style-night/symbols/townhall-l.svg b/data/styles/clear/style-night/symbols/townhall-l.svg
index 1bd01da4e5..04240a4f83 100644
--- a/data/styles/clear/style-night/symbols/townhall-l.svg
+++ b/data/styles/clear/style-night/symbols/townhall-l.svg
@@ -10,7 +10,7 @@
         <g id="bank-l-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
             <g id="Oval-1-Copy-38">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M21.4018182,7.39104762 L14,4 L6.59818182,7.39104762 C6.23090909,7.52404762 6.005,7.86921429 6.00318182,8.23654762 L6,9 L22,9 L22,8.24107143 C21.995,7.86921429 21.7690909,7.52404762 21.4018182,7.39104762 Z M19.5,18 L19,10 L17,10 L16.5,18 L15.5,18 L14.9090909,10 L13.0909091,10 L12.5,18 L11.5,18 L11,10 L9,10 L8.5,18 L7.00244075,18 C6.44880801,18 6,18.4426603 6,18.9989566 L6,21 L22,21 L22,18.9989566 C22,18.4472481 21.5530501,18 20.9975592,18 L19.5,18 Z" id="Imported-Layers" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/townhall-m.svg b/data/styles/clear/style-night/symbols/townhall-m.svg
index 6f72acdad9..ae4189b761 100644
--- a/data/styles/clear/style-night/symbols/townhall-m.svg
+++ b/data/styles/clear/style-night/symbols/townhall-m.svg
@@ -10,7 +10,7 @@
         <g id="bank-m-copy" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
             <g id="Oval-1-Copy-40">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M11.5,4 C11.5,4 4.505,6.86921429 4.50318182,7.23654762 L4.5,8 L18.5,8 L18.5,7.24107143 C18.495,6.86921429 11.5,4 11.5,4 Z M16.0365553,16 L15.0112953,9 L13.9175005,9 L13.4600668,16 L12.5553169,16 L12,9 L11,9 L10.4870887,16 L9.55106163,16 L9.0292325,9 L7.91749907,9 L7.04839683,16 L6.00019572,16 C5.44780288,16 5,16.4438648 5,17 L5,18 L18,18 L18,17 C18,16.4477153 17.5446112,16 16.9952704,16 L16.0365553,16 Z" id="Imported-Layers-Copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/townhall-s.svg b/data/styles/clear/style-night/symbols/townhall-s.svg
index f344b20b2c..6c115c85d8 100644
--- a/data/styles/clear/style-night/symbols/townhall-s.svg
+++ b/data/styles/clear/style-night/symbols/townhall-s.svg
@@ -10,7 +10,7 @@
         <g id="bank-s" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
             <g id="Oval-1-Copy-42">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M8.5,4 C8.5,4 4.0045,5.86921429 4.00286364,6.23654762 L4,7 L13,7 L13,6.24107143 C12.9955,5.86921429 8.5,4 8.5,4 Z M11.5365553,11.5 L9.9600668,11.5 L9.05531693,11.5 L7.98708868,11.5 L7.05106163,11.5 L5.54839683,11.5 L5.25077269,11.5 C4.83613238,11.5 4.5,11.8328986 4.5,12.25 L4.5,13 L12.5,13 L12.5,12.25 C12.5,11.8357864 12.1738216,11.5 11.7408771,11.5 L11.5365553,11.5 Z M6,7.5 L7,7.5 L7,11 L6,11 L6,7.5 Z M8,7.5 L9,7.5 L9,11 L8,11 L8,7.5 Z M10,7.5 L11,7.5 L11,11 L10,11 L10,7.5 Z" id="Imported-Layers-Copy-2" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/toys-l.svg b/data/styles/clear/style-night/symbols/toys-l.svg
index e1b1864bff..dbcd49e384 100644
--- a/data/styles/clear/style-night/symbols/toys-l.svg
+++ b/data/styles/clear/style-night/symbols/toys-l.svg
@@ -10,7 +10,7 @@
         <g id="toys-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.057,27 0,20.943 0,13.5 C0,6.057 6.057,0 13.5,0 C20.943,0 27,6.057 27,13.5 C27,20.943 20.943,27 13.5,27 L13.5,27 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M20,19.5 C20,20.881 18.881,22 17.5,22 C16.119,22 15,20.881 15,19.5 C15,18.119 16.119,17 17.5,17 C18.881,17 20,18.119 20,19.5 L20,19.5 Z M9.5,17 C8.119,17 7,18.119 7,19.5 C7,20.881 8.119,22 9.5,22 C10.881,22 12,20.881 12,19.5 C12,18.119 10.881,17 9.5,17 L9.5,17 Z M22,13.5 C22,14.328 21.328,15 20.5,15 L18.782,15 C18.372,14.883 17.947,14.8 17.5,14.8 C15.855,14.8 14.354,15.661 13.5,17.071 C12.646,15.662 11.145,14.8 9.5,14.8 C9.053,14.8 8.628,14.883 8.218,15 L6.5,15 C5.672,15 5,14.328 5,13.5 C5,12.672 5.672,12 6.5,12 L10.703,12 C9.784,11.265 9.153,10.188 9.026,8.953 C7.873,8.731 7,7.719 7,6.501 C7,5.12 8.119,4 9.5,4 C10.15,4 10.736,4.255 11.182,4.661 C11.861,4.25 12.649,4 13.5,4 C14.351,4 15.14,4.25 15.818,4.661 C16.263,4.255 16.849,4 17.5,4 C18.881,4 20,5.12 20,6.501 C20,7.726 19.117,8.741 17.954,8.955 C17.828,10.188 17.214,11.266 16.297,12 L20.5,12 C21.328,12 22,12.672 22,13.5 L22,13.5 Z M15.2,10 C15.2,9.327 14.453,8.8 13.5,8.8 C12.547,8.8 11.8,9.327 11.8,10 C11.8,10.673 12.547,11.2 13.5,11.2 C14.453,11.2 15.2,10.673 15.2,10 L15.2,10 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/toys-m.svg b/data/styles/clear/style-night/symbols/toys-m.svg
index e894a2c63e..9d2173f2c0 100644
--- a/data/styles/clear/style-night/symbols/toys-m.svg
+++ b/data/styles/clear/style-night/symbols/toys-m.svg
@@ -10,7 +10,7 @@
         <g id="toys-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M15,15 C13.896,15 13,15.895 13,17 C13,18.104 13.896,19 15,19 C16.104,19 17,18.104 17,17 C17,15.895 16.104,15 15,15 L15,15 Z M8,15 C6.895,15 6,15.895 6,17 C6,18.104 6.895,19 8,19 C9.104,19 10,18.104 10,17 C10,15.895 9.104,15 8,15 L8,15 Z M17.498,11 L14.092,11 C14.569,10.456 14.878,9.765 14.961,8.997 C14.975,8.997 14.986,9.001 15,9.001 C16.104,9.001 17,8.105 17,7.001 C17,5.897 16.104,5 15,5 C14.41,5 13.885,5.261 13.52,5.667 C12.949,5.25 12.254,5 11.5,5 C10.746,5 10.052,5.25 9.48,5.667 C9.114,5.261 8.59,5 8,5 C6.895,5 6,5.896 6,7.001 C6,8.105 6.895,9.001 8,9.001 C8.014,9.001 8.025,8.997 8.039,8.997 C8.122,9.765 8.432,10.456 8.908,11 L5.501,11 C4.673,11 4,11.672 4,12.5 C4,13.293 4.617,13.934 5.395,13.989 C6.097,13.381 7,13 8,13 C9.517,13 10.821,13.857 11.5,15.104 C12.179,13.858 13.483,13 15,13 C16,13 16.903,13.381 17.605,13.989 C18.382,13.933 19,13.293 19,12.5 C19,11.672 18.327,11 17.498,11 L17.498,11 Z M11.5,11.2 C10.547,11.2 9.8,10.673 9.8,10 C9.8,9.327 10.547,8.8 11.5,8.8 C12.453,8.8 13.2,9.327 13.2,10 C13.2,10.673 12.453,11.2 11.5,11.2 L11.5,11.2 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/train-l.svg b/data/styles/clear/style-night/symbols/train-l.svg
index 971581104c..ab5ea7fa0f 100644
--- a/data/styles/clear/style-night/symbols/train-l.svg
+++ b/data/styles/clear/style-night/symbols/train-l.svg
@@ -7,7 +7,7 @@
     <g id="Transport" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="train-l" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
-            <path d="M13.5,26 C20.4035594,26 26,20.4035594 26,13.5 C26,6.59644063 20.4035594,1 13.5,1 C6.59644063,1 1,6.59644063 1,13.5 C1,20.4035594 6.59644063,26 13.5,26 Z" id="Oval-1-Copy-38" fill="#12314C" sketch:type="MSShapeGroup"></path>
+            <path d="M13.5,26 C20.4035594,26 26,20.4035594 26,13.5 C26,6.59644063 20.4035594,1 13.5,1 C6.59644063,1 1,6.59644063 1,13.5 C1,20.4035594 6.59644063,26 13.5,26 Z" id="Oval-1-Copy-38" fill="#0F2940" sketch:type="MSShapeGroup"></path>
             <path d="M10.4631148,22 L12,19 L10.125,19 L7.00000001,25 L8.875,25.1 L9.4385246,24 L17.5614754,24 L18.125,25.1 L20,25 L16.875,19 L15,19 L16.5368852,22 L10.4631148,22 Z" id="Rectangle-22-Copy-3" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="g24855" transform="translate(7.000000, 5.000000)" fill="#FFFFFF" opacity="0.7" sketch:type="MSShapeGroup">
                 <path d="M4.00292933,0 C3.44902676,0 2.63214111,0.245239258 2.16433275,0.557111502 L0.835667253,1.4428885 C0.374140973,1.75057268 0,2.44483697 0,2.9955775 L0,13 C0,13.5 0.5,14 1,14 L3.5,14 L7,14 L9.5,14 L12,14 C12.5,14 13,13.5 13,13 L13,2.9955775 C13,2.44573523 12.6321411,1.75476074 12.1643327,1.4428885 L10.8356673,0.557111502 C10.374141,0.249427315 9.56211865,0 8.99707067,0 L4.00292933,0 Z M3.10529494,2.44735253 C3.5994269,2.20028655 4.44371665,2 4.99980749,2 L8.00019251,2 C8.55237094,2 9.40472984,2.20236492 9.89470506,2.44735253 L10.1052949,2.55264747 C10.5994269,2.79971345 11,3.44335318 11,4.0093689 L11,5.9906311 C11,6.54809015 10.5536886,7 10.0024554,7 L2.99754465,7 C2.44661595,7 2,6.55664682 2,5.9906311 L2,4.0093689 C2,3.45190985 2.40472984,2.79763508 2.89470506,2.55264747 L3.10529494,2.44735253 Z M3,10 C3.554,10 4,10.446 4,11 C4,11.554 3.554,12 3,12 C2.446,12 2,11.554 2,11 C2,10.446 2.446,10 3,10 L3,10 Z M10,10 C10.554,10 11,10.446 11,11 C11,11.554 10.554,12 10,12 C9.446,12 9,11.554 9,11 C9,10.446 9.446,10 10,10 L10,10 Z" id="path24859"></path>
diff --git a/data/styles/clear/style-night/symbols/train-m.svg b/data/styles/clear/style-night/symbols/train-m.svg
index 0155c6f908..895990a341 100644
--- a/data/styles/clear/style-night/symbols/train-m.svg
+++ b/data/styles/clear/style-night/symbols/train-m.svg
@@ -7,7 +7,7 @@
     <g id="Transport" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="train-m" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" r="11.5"></circle>
-            <circle id="Oval-1-Copy-40" fill="#12314C" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" r="10.5"></circle>
+            <circle id="Oval-1-Copy-40" fill="#0F2940" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" r="10.5"></circle>
             <path d="M8.9881561,3.03459562 C8.43616181,3.03459562 7.623115,3.30963415 7.18949229,3.63587515 L6.79476211,3.93285492 C6.35338181,4.26493243 5.9976093,4.99070765 6.0000121,5.52928925 L6.0378042,14.0003074 C6.05311212,14.5001537 6.55138953,15 7.04966694,15 L16.0186604,15 C16.5169378,15 17.0077471,14.6709939 16.9999073,14.0003074 L16.9621152,5.52928925 C16.9596632,4.97968043 16.5921085,4.25909592 16.1584858,3.93285492 L15.7637556,3.63587515 C15.3223753,3.30379764 14.5068586,3.03459562 13.9650918,3.03459562 L8.9881561,3.03459562 Z M8.37916245,5.76597573 C8.75492901,5.3647599 9.49978057,5.03951021 10.0634277,5.03951021 L13.0164082,5.03951021 C13.5708357,5.03951021 14.3216338,5.37500414 14.6946598,5.79030102 L15.0067977,6.1378099 L15.0067977,8.97125292 C15.0067977,9.52892524 14.5490904,9.98100797 14.0073236,9.98100797 L9.03038793,9.98100797 C8.47839364,9.98100797 8.03091386,9.54014429 8.03091386,8.97125292 L8.03091386,6.1378099 L8.37916245,5.76597573 Z M9.02746869,12.6080149 C9.02746869,13.0221016 8.69283554,13.3577844 8.28005257,13.3577844 C7.86726959,13.3577844 7.53263645,13.0221016 7.53263645,12.6080149 C7.53263645,12.1939283 7.86726959,11.8582455 8.28005257,11.8582455 C8.69283554,11.8582455 9.02746869,12.1939283 9.02746869,12.6080149 Z M14.757659,11.8582455 C15.1704419,11.8582455 15.5050751,12.1939283 15.5050751,12.6080149 C15.5050751,13.0221016 15.1704419,13.3577844 14.757659,13.3577844 C14.344876,13.3577844 14.0102428,13.0221016 14.0102428,12.6080149 C14.0102428,12.1939283 14.344876,11.8582455 14.757659,11.8582455 L14.757659,11.8582455 Z" id="path24869" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <path d="M8.95833334,17 L10,15 L8.12500001,15 L5.00000001,21 L6.875,21 L7.91666667,19 L15.0833333,19 L16.125,21 L18,21 L14.875,15 L13,15 L14.0416667,17 L8.95833334,17 Z" id="Rectangle-22-Copy-2" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
diff --git a/data/styles/clear/style-night/symbols/train-s.svg b/data/styles/clear/style-night/symbols/train-s.svg
index 5b9b85669e..d803cd82bd 100644
--- a/data/styles/clear/style-night/symbols/train-s.svg
+++ b/data/styles/clear/style-night/symbols/train-s.svg
@@ -7,7 +7,7 @@
     <g id="Transport" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="train-s" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-42" fill="#12314C" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
+            <circle id="Oval-1-Copy-42" fill="#0F2940" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
             <path d="M6.86363637,13 L8.00000001,11 L6.50000001,11 L4,15.4 L5.5,15.4 L6.29545455,14 L10.7045454,14 L11.5,15.4 L13,15.4 L10.5,11 L8.99999999,11 L10.1363636,13 L6.86363637,13 Z" id="Rectangle-22" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <path d="M7.5093689,3 C6.95190985,3 6.13689184,3.27665383 5.69730425,3.61157772 L5.80269575,3.53127943 C5.35937913,3.86904447 5,4.59491021 5,5.15276589 L5,10.4285714 C5,10.7142857 5.25,11 5.5,11 L6.75,11 L9,11 L10.25,11 L11.5,11 C11.75,11 12,10.7142857 12,10.4285714 L12,5.15276589 C12,4.59500869 11.6368918,3.86620331 11.1973042,3.53127943 L11.3026958,3.61157772 C10.8593791,3.27381267 10.0566468,3 9.4906311,3 L7.5093689,3 L7.5093689,3 Z M7,4.14285714 L10,4.14285714 L11,4.71428571 L11,6.42857143 L6,6.42857143 L6,4.71428571 L7,4.14285714 L7,4.14285714 Z M6.5,8.71428571 C6.777,8.71428571 7,8.96914286 7,9.28571429 C7,9.60228571 6.777,9.85714286 6.5,9.85714286 C6.223,9.85714286 6,9.60228571 6,9.28571429 C6,8.96914286 6.223,8.71428571 6.5,8.71428571 L6.5,8.71428571 L6.5,8.71428571 Z M10.5,8.71428571 C10.777,8.71428571 11,8.96914286 11,9.28571429 C11,9.60228571 10.777,9.85714286 10.5,9.85714286 C10.223,9.85714286 10,9.60228571 10,9.28571429 C10,8.96914286 10.223,8.71428571 10.5,8.71428571 L10.5,8.71428571 L10.5,8.71428571 Z" id="path24879" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
diff --git a/data/styles/clear/style-night/symbols/tram-l.svg b/data/styles/clear/style-night/symbols/tram-l.svg
index 1d34c2c541..655603cbfa 100644
--- a/data/styles/clear/style-night/symbols/tram-l.svg
+++ b/data/styles/clear/style-night/symbols/tram-l.svg
@@ -7,7 +7,7 @@
     <g id="Transport" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="tram-l" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#12314C" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
+            <circle id="Oval-1-Copy-38" fill="#0F2940" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
             <g id="g24855" transform="translate(7.000000, 4.000000)" fill="#FFFFFF" opacity="0.7" sketch:type="MSShapeGroup">
                 <path d="M4.00292933,4 C3.44902676,4 2.63214111,4.24523926 2.16433275,4.5571115 L0.835667253,5.4428885 C0.374140973,5.75057268 0,6.44483697 0,6.9955775 L0,17 C0,17.5 0.5,18 1,18 L3.5,18 L7,18 L9.5,18 L12,18 C12.5,18 13,17.5 13,17 L13,6.9955775 C13,6.44573523 12.6321411,5.75476074 12.1643327,5.4428885 L10.8356673,4.5571115 C10.374141,4.24942732 9.56211865,4 8.99707067,4 L4.00292933,4 Z M3.10529494,6.44735253 C3.5994269,6.20028655 4.44371665,6 4.99980749,6 L8.00019251,6 C8.55237094,6 9.40472984,6.20236492 9.89470506,6.44735253 L10.1052949,6.55264747 C10.5994269,6.79971345 11,7.44335318 11,8.0093689 L11,9.9906311 C11,10.5480902 10.5536886,11 10.0024554,11 L2.99754465,11 C2.44661595,11 2,10.5566468 2,9.9906311 L2,8.0093689 C2,7.45190985 2.40472984,6.79763508 2.89470506,6.55264747 L3.10529494,6.44735253 Z M3,14 C3.554,14 4,14.446 4,15 C4,15.554 3.554,16 3,16 C2.446,16 2,15.554 2,15 C2,14.446 2.446,14 3,14 L3,14 Z M10,14 C10.554,14 11,14.446 11,15 C11,15.554 10.554,16 10,16 C9.446,16 9,15.554 9,15 C9,14.446 9.446,14 10,14 Z M1,1 C1,0.44771525 1.44483697,0 1.9955775,0 L11.0044225,0 C11.5542648,0 12,0.443864822 12,1 C12,1.55228475 11.555163,2 11.0044225,2 L1.9955775,2 C1.44573523,2 1,1.55613518 1,1 Z M8,2 L9,2 L9,4 L8,4 L8,2 Z M4,2 L5,2 L5,4 L4,4 L4,2 Z" id="path24859"></path>
             </g>
diff --git a/data/styles/clear/style-night/symbols/tram-m.svg b/data/styles/clear/style-night/symbols/tram-m.svg
index fde344faa0..5f3ef688a0 100644
--- a/data/styles/clear/style-night/symbols/tram-m.svg
+++ b/data/styles/clear/style-night/symbols/tram-m.svg
@@ -7,7 +7,7 @@
     <g id="Transport" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="tram-m" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" r="11.5"></circle>
-            <circle id="Oval-1-Copy-40" fill="#12314C" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" r="10.5"></circle>
+            <circle id="Oval-1-Copy-40" fill="#0F2940" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" r="10.5"></circle>
             <path d="M13.9862193,7.0347299 L13.9862193,4.9993851 L12.9896645,4.9993851 L12.9896645,7.03459562 L9.98621931,7.03459562 L9.98621931,4.9993851 L8.98966449,4.9993851 L8.98966449,7.03459562 L8.9881561,7.03459562 C8.43616181,7.03459562 7.623115,7.30963415 7.18949229,7.63587515 L6.79476211,7.93285492 C6.35338181,8.26493243 5.9976093,8.99070765 6.0000121,9.52928925 L6.0378042,18.0003074 C6.05311212,18.5001537 6.55138953,19 7.04966694,19 L16.0186604,19 C16.5169378,19 17.0077471,18.6709939 16.9999073,18.0003074 L16.9621152,9.52928925 C16.9596632,8.97968043 16.5921085,8.25909592 16.1584858,7.93285492 L15.7637556,7.63587515 C15.328076,7.30808666 14.5278622,7.04155999 13.9862193,7.0347299 Z M8.37916245,9.76597573 C8.75492901,9.3647599 9.49978057,9.03951021 10.0634277,9.03951021 L13.0164082,9.03951021 C13.5708357,9.03951021 14.3216338,9.37500414 14.6946598,9.79030102 L15.0067977,10.1378099 L15.0067977,12.9712529 C15.0067977,13.5289252 14.5490904,13.981008 14.0073236,13.981008 L9.03038793,13.981008 C8.47839364,13.981008 8.03091386,13.5401443 8.03091386,12.9712529 L8.03091386,10.1378099 L8.37916245,9.76597573 Z M9.02746869,16.6080149 C9.02746869,17.0221016 8.69283554,17.3577844 8.28005257,17.3577844 C7.86726959,17.3577844 7.53263645,17.0221016 7.53263645,16.6080149 C7.53263645,16.1939283 7.86726959,15.8582455 8.28005257,15.8582455 C8.69283554,15.8582455 9.02746869,16.1939283 9.02746869,16.6080149 Z M14.757659,15.8582455 C15.1704419,15.8582455 15.5050751,16.1939283 15.5050751,16.6080149 C15.5050751,17.0221016 15.1704419,17.3577844 14.757659,17.3577844 C14.344876,17.3577844 14.0102428,17.0221016 14.0102428,16.6080149 C14.0102428,16.1939283 14.344876,15.8582455 14.757659,15.8582455 Z M7.03435903,3.99969255 C7.03435903,3.4475776 7.49146335,3 8.02846697,3 L15.0092446,3 C15.5582752,3 16.0033525,3.44372836 16.0033525,3.99969255 C16.0033525,4.5518075 15.5462482,4.9993851 15.0092446,4.9993851 L8.02846697,4.9993851 C7.47943632,4.9993851 7.03435903,4.55565675 7.03435903,3.99969255 Z" id="path24869" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-night/symbols/tram-s.svg b/data/styles/clear/style-night/symbols/tram-s.svg
index 8a2ef5bcb2..30fc5b1157 100644
--- a/data/styles/clear/style-night/symbols/tram-s.svg
+++ b/data/styles/clear/style-night/symbols/tram-s.svg
@@ -8,7 +8,7 @@
         <g id="tram-s" sketch:type="MSLayerGroup">
             <g id="g24875" sketch:type="MSShapeGroup">
                 <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" cx="8.5" cy="8.5" r="8.5"></circle>
-                <circle id="Oval-1-Copy-42" fill="#12314C" cx="8.5" cy="8.5" r="7.5"></circle>
+                <circle id="Oval-1-Copy-42" fill="#0F2940" cx="8.5" cy="8.5" r="7.5"></circle>
                 <path d="M10,6.0579843 C10.4717603,6.15576112 10.9815405,6.366888 11.3026958,6.61157772 L11.1973042,6.53127943 C11.6368918,6.86620331 12,7.59500869 12,8.15276589 L12,13.4285714 C12,13.7142857 11.75,14 11.5,14 L10.25,14 L9,14 L6.75,14 L5.5,14 C5.25,14 5,13.7142857 5,13.4285714 L5,8.15276589 C5,7.59491021 5.35937913,6.86904447 5.80269575,6.53127943 L5.69730425,6.61157772 C6.01506149,6.36947696 6.52898734,6.15782327 7,6.05910079 L7,5 L8,5 L8,6 L9,6 L9,5 L10,5 L10,6.0579843 Z M7,7.14285714 L10,7.14285714 L11,7.71428571 L11,9.42857143 L6,9.42857143 L6,7.71428571 L7,7.14285714 Z M6.5,11.7142857 C6.777,11.7142857 7,11.9691429 7,12.2857143 C7,12.6022857 6.777,12.8571429 6.5,12.8571429 C6.223,12.8571429 6,12.6022857 6,12.2857143 C6,11.9691429 6.223,11.7142857 6.5,11.7142857 L6.5,11.7142857 Z M10.5,11.7142857 C10.777,11.7142857 11,11.9691429 11,12.2857143 C11,12.6022857 10.777,12.8571429 10.5,12.8571429 C10.223,12.8571429 10,12.6022857 10,12.2857143 C10,11.9691429 10.223,11.7142857 10.5,11.7142857 Z M5,4.5 C5,4.22385763 5.23290253,4 5.50342274,4 L11.4965773,4 C11.77461,4 12,4.23193359 12,4.5 C12,4.77614237 11.7670975,5 11.4965773,5 L5.50342274,5 C5.22539004,5 5,4.76806641 5,4.5 Z" id="path24879" opacity="0.7" fill="#FFFFFF"></path>
             </g>
         </g>
diff --git a/data/styles/clear/style-night/symbols/tree-l.svg b/data/styles/clear/style-night/symbols/tree-l.svg
index fad6958d6e..a706e6ccfc 100644
--- a/data/styles/clear/style-night/symbols/tree-l.svg
+++ b/data/styles/clear/style-night/symbols/tree-l.svg
@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <g id="path8564-0-+-path8564-0-+-path8564-0" sketch:type="MSLayerGroup" fill="#173809">
+        <g id="path8564-0-+-path8564-0-+-path8564-0" sketch:type="MSLayerGroup" fill="#153308">
             <path d="M5,2.5 C5,3.88071187 3.88071187,5 2.5,5 C1.11928813,5 2.69144976e-16,3.88071187 0,2.5 C-1.34572488e-16,1.11928813 1.11928813,2.69144976e-16 2.5,0 C3.88071187,-2.69144976e-16 5,1.11928813 5,2.5 L5,2.5 Z" id="path8564-0" sketch:type="MSShapeGroup" transform="translate(2.500000, 2.500000) scale(-1, 1) translate(-2.500000, -2.500000) "></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-night/symbols/tree-m.svg b/data/styles/clear/style-night/symbols/tree-m.svg
index fc7497eb06..b2b544b501 100644
--- a/data/styles/clear/style-night/symbols/tree-m.svg
+++ b/data/styles/clear/style-night/symbols/tree-m.svg
@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <g id="path8564-0-+-path8564-0-+-path8564-0" sketch:type="MSLayerGroup" transform="translate(-7.000000, -1.000000)" fill="#173809">
+        <g id="path8564-0-+-path8564-0-+-path8564-0" sketch:type="MSLayerGroup" transform="translate(-7.000000, -1.000000)" fill="#153308">
             <path d="M11,3 C11,4.1045695 10.1045695,5 9,5 C7.8954305,5 7,4.1045695 7,3 C7,1.8954305 7.8954305,1 9,1 C10.1045695,1 11,1.8954305 11,3 L11,3 Z" id="path8564-0" sketch:type="MSShapeGroup" transform="translate(9.000000, 3.000000) scale(-1, 1) translate(-9.000000, -3.000000) "></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-night/symbols/tree-s.svg b/data/styles/clear/style-night/symbols/tree-s.svg
index 222a1f7c4a..0cdac604f4 100644
--- a/data/styles/clear/style-night/symbols/tree-s.svg
+++ b/data/styles/clear/style-night/symbols/tree-s.svg
@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <g id="path8564-0-+-path8564-0-+-path8564-0" sketch:type="MSLayerGroup" transform="translate(-13.000000, -2.000000)" fill="#173809">
+        <g id="path8564-0-+-path8564-0-+-path8564-0" sketch:type="MSLayerGroup" transform="translate(-13.000000, -2.000000)" fill="#153308">
             <path d="M16,3.5 C16,4.32842712 15.3284271,5 14.5,5 C13.6715729,5 13,4.32842712 13,3.5 C13,2.67157288 13.6715729,2 14.5,2 C15.3284271,2 16,2.67157288 16,3.5 L16,3.5 Z" id="path8564-0" sketch:type="MSShapeGroup" transform="translate(14.500000, 3.500000) scale(-1, 1) translate(-14.500000, -3.500000) "></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-night/symbols/vending-l.svg b/data/styles/clear/style-night/symbols/vending-l.svg
index ba26f26de8..b67ef4d732 100644
--- a/data/styles/clear/style-night/symbols/vending-l.svg
+++ b/data/styles/clear/style-night/symbols/vending-l.svg
@@ -10,7 +10,7 @@
         <g id="vending-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.056,27 0,20.943 0,13.5 C0,6.057 6.056,0 13.5,0 C20.944,0 27,6.057 27,13.5 C27,20.943 20.944,27 13.5,27 L13.5,27 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M19,5 L8,5 C7.448,5 7,5.447 7,6 L7,21 C7,21.553 7.448,22 8,22 L19,22 C19.552,22 20,21.553 20,21 L20,6 C20,5.447 19.552,5 19,5 L19,5 Z M16,20 L9,20 L9,18 L16,18 L16,20 L16,20 Z M16,17 L9,17 L9,7 L16,7 L16,17 L16,17 Z M19,9 L17,9 L17,7 L19,7 L19,9 L19,9 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/vending-m.svg b/data/styles/clear/style-night/symbols/vending-m.svg
index 1c7aa52196..97ff89508c 100644
--- a/data/styles/clear/style-night/symbols/vending-m.svg
+++ b/data/styles/clear/style-night/symbols/vending-m.svg
@@ -10,7 +10,7 @@
         <g id="vending-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M16,4 L7,4 C6.448,4 6,4.447 6,5 L6,18 C6,18.553 6.448,19 7,19 L16,19 C16.552,19 17,18.553 17,18 L17,5 C17,4.447 16.552,4 16,4 L16,4 Z M14,17 L8,17 L8,15 L14,15 L14,17 L14,17 Z M14,14 L8,14 L8,6 L14,6 L14,14 L14,14 Z M16,8 L15,8 L15,6 L16,6 L16,8 L16,8 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/volcano-l.svg b/data/styles/clear/style-night/symbols/volcano-l.svg
index 8465f97418..7c9dbc3220 100644
--- a/data/styles/clear/style-night/symbols/volcano-l.svg
+++ b/data/styles/clear/style-night/symbols/volcano-l.svg
@@ -10,7 +10,7 @@
         <g id="volcano-l-copy" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" rx="13.5" ry="13.5"></ellipse>
             <g id="Oval-1-Copy-38">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M13.4999998,11.1570941 C12.902949,11.1570941 11.7512537,10.5975741 11.7512537,10.5975741 L7.08552632,17.96875 C7.02524737,18.0748312 7,18.1938375 7,18.3125 C7,18.828125 7.34210526,19.0001375 7.68421053,19 L19.3157895,19 C19.6578947,19.0001375 20,18.828125 20,18.3125 C20,18.1938375 19.9747868,18.0748312 19.9144737,17.96875 L15.3358539,10.5975741 C15.3358539,10.5975741 14.0978158,11.1570941 13.4999998,11.1570941 Z" id="path11349" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/volcano-m.svg b/data/styles/clear/style-night/symbols/volcano-m.svg
index fcc0c53009..8b0d809982 100644
--- a/data/styles/clear/style-night/symbols/volcano-m.svg
+++ b/data/styles/clear/style-night/symbols/volcano-m.svg
@@ -10,7 +10,7 @@
         <g id="volcano-m-copy" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
             <g id="Oval-1-Copy-38">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M11.4999999,9.50419125 C10.991401,9.50419125 10.0103272,9.02756313 10.0103272,9.02756313 L6.03581871,15.306713 C5.98446998,15.3970785 5.96296296,15.4984542 5.96296296,15.599537 C5.96296296,16.0387731 6.25438596,16.1853023 6.54580897,16.1851852 L16.454191,16.1851852 C16.745614,16.1853023 17.037037,16.0387731 17.037037,15.599537 C17.037037,15.4984542 17.0155592,15.3970785 16.9641813,15.306713 L13.0638755,9.02756313 C13.0638755,9.02756313 12.0092505,9.50419125 11.4999999,9.50419125 Z" id="path11349" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/volcano-s.svg b/data/styles/clear/style-night/symbols/volcano-s.svg
index 4d355bb0d6..3964f35a1a 100644
--- a/data/styles/clear/style-night/symbols/volcano-s.svg
+++ b/data/styles/clear/style-night/symbols/volcano-s.svg
@@ -10,7 +10,7 @@
         <g id="volcano-s-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
             <g id="Oval-1-Copy-38">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M8.4999999,7.02483701 C8.12407903,7.02483701 7.39893749,6.67254666 7.39893749,6.67254666 L4.46125731,11.3136574 C4.4233039,11.3804493 4.40740741,11.4553792 4.40740741,11.5300926 C4.40740741,11.8547454 4.62280702,11.9630495 4.83820663,11.962963 L12.1617934,11.962963 C12.377193,11.9630495 12.5925926,11.8547454 12.5925926,11.5300926 C12.5925926,11.4553792 12.5767176,11.3804493 12.5387427,11.3136574 L9.655908,6.67254666 C9.655908,6.67254666 8.87640253,7.02483701 8.4999999,7.02483701 Z" id="path11349" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/waterfall-l.svg b/data/styles/clear/style-night/symbols/waterfall-l.svg
index 6b1fb491a4..7e525bc4f1 100644
--- a/data/styles/clear/style-night/symbols/waterfall-l.svg
+++ b/data/styles/clear/style-night/symbols/waterfall-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="waterfall-l" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#12314C" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
+            <circle id="Oval-1-Copy-38" fill="#0F2940" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
             <path d="M5,17.4166667 L5,18.7708667 C5,18.7708667 6,18.3336667 7,18.3333333 C8,18.333 9,19 10.5,19 C12,19 12.47352,18.3564667 13.5,18.3333333 C14.5,18.3336667 15,19 16.5,19 C18,19 19,18.3333333 20,18.3333333 C20.70165,18.3333333 22,18.7708667 22,18.7708667 L22,17.4166667 C21.3584,17.2521333 20.65657,17 20,17 C18.5,17 17.5,17.667 16.5,17.6666667 C15.5,17.6663333 15,17 13.5,17 C12,17 11.5,17.667 10.5,17.6666667 C9.5,17.667 8.5,17 7,17 C6.30594,17 5.66024,17.2699333 5,17.4166667 Z" id="path4758-copy-12" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <path d="M7,20 C6.30594,20 5.66024,20.2699333 5,20.4166667 L5,21.7708667 C5,21.7708667 6,21.3336667 7,21.3333333 C8,21.333 9,22 10.5,22 C12,22 12.47352,21.3564667 13.5,21.3333333 C14.5,21.3336667 15,22 16.5,22 C18,22 19,21.3333333 20,21.3333333 C20.70165,21.3333333 22,21.7708667 22,21.7708667 L22,20.4166667 C21.3584,20.2521333 20.65657,20 20,20 C18.5,20 17.5,20.667 16.5,20.6666667 C15.5,20.6663333 15,20 13.5,20 C12,20 11.5,20.667 10.5,20.6666667 C9.5,20.667 8.5,20 7,20 L7,20 Z" id="path4758-copy-7" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <path d="M13.1875,4 L12.17185,4 C12.17185,4 12.49975,4.69515724 12.5,5.39031449 C12.50025,6.08547173 12,6.78062897 12,7.82336484 C12,8.8661007 12.48265,9.19527156 12.5,9.90883657 C12.49975,10.6039938 12,10.9515724 12,11.9943083 C12,13.0370442 12.5,13.7322014 12.5,14.4273586 C12.5,14.9151157 12.17185,15.8176731 12.17185,15.8176731 L13.1875,15.8176731 C13.3109,15.3716602 13.5,14.883778 13.5,14.4273586 C13.5,13.3846228 12.99975,12.6894655 13,11.9943083 C13.00025,11.2991511 13.5,10.9515724 13.5,9.90883657 C13.5,8.8661007 12.99975,8.51852208 13,7.82336484 C12.99975,7.12820759 13.5,6.43305035 13.5,5.39031449 C13.5,4.90783365 13.29755,4.45897062 13.1875,4 Z" id="path4758-copy-8" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/waterfall-m.svg b/data/styles/clear/style-night/symbols/waterfall-m.svg
index 57ad5fcff6..b664eed7cc 100644
--- a/data/styles/clear/style-night/symbols/waterfall-m.svg
+++ b/data/styles/clear/style-night/symbols/waterfall-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="waterfall-m" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
-            <ellipse id="Oval-1-Copy-40" fill="#12314C" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+            <ellipse id="Oval-1-Copy-40" fill="#0F2940" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
             <path d="M6.53367864,14 C6.00144614,14 5.50629799,14.2069955 5,14.3195164 L5,15.3579702 C5,15.3579702 5.76683932,15.022708 6.53367864,15.0224524 C7.30051796,15.0221968 8.06735728,15.5336786 9.21761626,15.5336786 C10.3678752,15.5336786 10.730989,15.040192 11.5181342,15.0224524 C12.2849735,15.022708 12.6683932,15.5336786 13.8186522,15.5336786 C14.9689111,15.5336786 15.7357505,15.0224524 16.5025898,15.0224524 C17.0406426,15.0224524 18.0362684,15.3579702 18.0362684,15.3579702 L18.0362684,14.3195164 C17.5442643,14.1933458 17.0060735,14 16.5025898,14 C15.3523308,14 14.5854915,14.5114818 13.8186522,14.5112262 C13.0518129,14.5109706 12.6683932,14 11.5181342,14 C10.3678752,14 9.98445557,14.5114818 9.21761626,14.5112262 C8.45077694,14.5114818 7.68393762,14 6.53367864,14 L6.53367864,14 Z" id="path4758-copy-18" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <path d="M5,16.3195164 L5,17.3579702 C5,17.3579702 5.76683932,17.022708 6.53367864,17.0224524 C7.30051796,17.0221968 8.06735728,17.5336786 9.21761626,17.5336786 C10.3678752,17.5336786 10.730989,17.040192 11.5181342,17.0224524 C12.2849735,17.022708 12.6683932,17.5336786 13.8186522,17.5336786 C14.9689111,17.5336786 15.7357505,17.0224524 16.5025898,17.0224524 C17.0406426,17.0224524 18.0362684,17.3579702 18.0362684,17.3579702 L18.0362684,16.3195164 C17.5442643,16.1933458 17.0060735,16 16.5025898,16 C15.3523308,16 14.5854915,16.5114818 13.8186522,16.5112262 C13.0518129,16.5109706 12.6683932,16 11.5181342,16 C10.3678752,16 9.98445557,16.5114818 9.21761626,16.5112262 C8.45077694,16.5114818 7.68393762,16 6.53367864,16 C6.00144615,16 5.50629799,16.2069955 5,16.3195164 Z" id="path4758-copy-13" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <path d="M10.9106217,4 L10.1317813,4 C10.1317813,4 10.3832279,4.53307391 10.3834197,5.06614781 C10.3836114,5.59922172 10,6.13229563 10,6.93190649 C10,7.73151735 10.370115,7.98393851 10.3834197,8.53112821 C10.3832279,9.06420212 10,9.33073907 10,10.1303499 C10,10.9299608 10.3834197,11.4630347 10.3834197,11.9961086 C10.3834197,12.3701399 10.1317813,13.0622564 10.1317813,13.0622564 L10.9106217,13.0622564 C11.0052497,12.7202362 11.150259,12.3461089 11.150259,11.9961086 C11.150259,11.1964977 10.7666476,10.6634238 10.7668393,10.1303499 C10.767031,9.59727602 11.150259,9.33073907 11.150259,8.53112821 C11.150259,7.73151735 10.7666476,7.4649804 10.7668393,6.93190649 C10.7666476,6.39883258 11.150259,5.86575867 11.150259,5.06614781 C11.150259,4.69616254 10.9950124,4.35195672 10.9106217,4 Z" id="path4758-copy-14" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/waterfall-s.svg b/data/styles/clear/style-night/symbols/waterfall-s.svg
index ef4954e4bb..98f9d0b885 100644
--- a/data/styles/clear/style-night/symbols/waterfall-s.svg
+++ b/data/styles/clear/style-night/symbols/waterfall-s.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="waterfall-s" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-42" fill="#12314C" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
+            <circle id="Oval-1-Copy-42" fill="#0F2940" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
             <path d="M5.05882353,10 C4.69138,10 4.34953882,10.1368898 4,10.2113019 L4,10.89805 C4,10.89805 4.52941176,10.6763352 5.05882353,10.6761661 C5.58823529,10.6759971 6.11764706,11.0142492 6.91176471,11.0142492 C7.70588235,11.0142492 7.95656941,10.6878976 8.5,10.6761661 C9.02941176,10.6763352 9.29411765,11.0142492 10.0882353,11.0142492 C10.8823529,11.0142492 11.4117647,10.6761661 11.9411765,10.6761661 C12.3126382,10.6761661 13,10.89805 13,10.89805 L13,10.2113019 C12.6603294,10.127863 12.2887724,10 11.9411765,10 C11.1470588,10 10.6176471,10.3382521 10.0882353,10.3380831 C9.55882353,10.337914 9.29411765,10 8.5,10 C7.70588235,10 7.44117647,10.3382521 6.91176471,10.3380831 C6.38235294,10.3382521 5.85294118,10 5.05882353,10 L5.05882353,10 Z" id="path4758-copy-24" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <path d="M5.05882353,12 C4.69138,12 4.34953882,12.1368898 4,12.2113019 L4,12.89805 C4,12.89805 4.52941176,12.6763352 5.05882353,12.6761661 C5.58823529,12.6759971 6.11764706,13.0142492 6.91176471,13.0142492 C7.70588235,13.0142492 7.95656941,12.6878976 8.5,12.6761661 C9.02941176,12.6763352 9.29411765,13.0142492 10.0882353,13.0142492 C10.8823529,13.0142492 11.4117647,12.6761661 11.9411765,12.6761661 C12.3126382,12.6761661 13,12.89805 13,12.89805 L13,12.2113019 C12.6603294,12.127863 12.2887724,12 11.9411765,12 C11.1470588,12 10.6176471,12.3382521 10.0882353,12.3380831 C9.55882353,12.337914 9.29411765,12 8.5,12 C7.70588235,12 7.44117647,12.3382521 6.91176471,12.3380831 C6.38235294,12.3382521 5.85294118,12 5.05882353,12 L5.05882353,12 Z" id="path4758-copy-19" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <path d="M6.92033348,3 L6.13318679,3 C6.13318679,3 6.38731508,3.35253134 6.38750883,3.70506267 C6.38770259,4.05759401 6,4.41012534 6,4.93892234 C6,5.46771935 6.37406228,5.63464998 6.38750883,5.99651635 C6.38731508,6.34904769 6,6.52531335 6,7.05411036 C6,7.58290736 6.38750883,7.93543869 6.38750883,8.28797003 C6.38750883,8.53532364 6.13318679,8.9930327 6.13318679,8.9930327 L6.92033348,8.9930327 C7.01597066,8.7668486 7.1625265,8.51943153 7.1625265,8.28797003 C7.1625265,7.75917303 6.77482391,7.40664169 6.77501767,7.05411036 C6.77521142,6.70157902 7.1625265,6.52531335 7.1625265,5.99651635 C7.1625265,5.46771935 6.77482391,5.29145368 6.77501767,4.93892234 C6.77482391,4.58639101 7.1625265,4.23385967 7.1625265,3.70506267 C7.1625265,3.46038477 7.00562417,3.23275529 6.92033348,3 Z" id="path4758-copy-20" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/wayside_cross-l.svg b/data/styles/clear/style-night/symbols/wayside_cross-l.svg
index 37658e48bf..b912c98b76 100644
--- a/data/styles/clear/style-night/symbols/wayside_cross-l.svg
+++ b/data/styles/clear/style-night/symbols/wayside_cross-l.svg
@@ -10,7 +10,7 @@
         <g id="wayside_cross-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.057,27 0,20.943 0,13.5 C0,6.057 6.057,0 13.5,0 C20.943,0 27,6.057 27,13.5 C27,20.943 20.943,27 13.5,27 L13.5,27 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M7,20 L7,22 L20,22 L20,20 L7,20 L7,20 Z M17,8 L15,5 L12,5 L10,8 L10,18 L17,18 L17,8 L17,8 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/wayside_cross-m.svg b/data/styles/clear/style-night/symbols/wayside_cross-m.svg
index 58c2b18570..037a45446e 100644
--- a/data/styles/clear/style-night/symbols/wayside_cross-m.svg
+++ b/data/styles/clear/style-night/symbols/wayside_cross-m.svg
@@ -10,7 +10,7 @@
         <g id="wayside_cross-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M7,17 L7,19 L16,19 L16,17 L7,17 L7,17 Z M14,7.72727273 L12,5 L11,5 L9,7.72727273 L9,15 L14,15 L14,7.72727273 L14,7.72727273 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/wayside_shrine-l.svg b/data/styles/clear/style-night/symbols/wayside_shrine-l.svg
index eff799d2b7..1abc9f651a 100644
--- a/data/styles/clear/style-night/symbols/wayside_shrine-l.svg
+++ b/data/styles/clear/style-night/symbols/wayside_shrine-l.svg
@@ -10,7 +10,7 @@
         <g id="wayside_shrine-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.057,27 0,20.943 0,13.5 C0,6.057 6.057,0 13.5,0 C20.943,0 27,6.057 27,13.5 C27,20.943 20.943,27 13.5,27 L13.5,27 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M13.546,4.086 L5.338,11.8590886 L6.752,13.1983292 L13.546,6.76448113 L20.338,13.1983292 L21.752,11.8590886 L13.546,4.086 L13.546,4.086 Z M8,14.6692207 L8,22 L11,22 L11,16.776583 C11,15.4771218 12.112,14.4229671 13.484,14.4229671 L13.514,14.4229671 C14.887,14.4229671 15.999,15.4771218 15.999,16.776583 L15.999,22 L18.999,22 L18.999,14.5839791 L13.545,9.41738976 L8,14.6692207 L8,14.6692207 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/wayside_shrine-m.svg b/data/styles/clear/style-night/symbols/wayside_shrine-m.svg
index 21f2a4033c..7ec77c73f6 100644
--- a/data/styles/clear/style-night/symbols/wayside_shrine-m.svg
+++ b/data/styles/clear/style-night/symbols/wayside_shrine-m.svg
@@ -10,7 +10,7 @@
         <g id="wayside_shrine-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M11.545,4 L4.979,10.565 L6.111,11.696 L11.546,6.262 L16.98,11.696 L18.112,10.565 L11.545,4 L11.545,4 Z M16,12.735 L16,19 L14,19 L14,15.5 C14,14.119 12.881,13 11.5,13 C10.119,13 9,14.119 9,15.5 L9,19 L7,19 L7,12.807 L11.537,8.371 L16,12.735 L16,12.735 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/windmill-l.svg b/data/styles/clear/style-night/symbols/windmill-l.svg
index 6274fc93c0..74b6f04406 100644
--- a/data/styles/clear/style-night/symbols/windmill-l.svg
+++ b/data/styles/clear/style-night/symbols/windmill-l.svg
@@ -10,7 +10,7 @@
         <g id="windmill-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.057,27 0,20.943 0,13.5 C0,6.057 6.057,0 13.5,0 C20.943,0 27,6.057 27,13.5 C27,20.943 20.943,27 13.5,27 L13.5,27 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M13.9857586,14.8051956 L10.7637586,19.3911956 L10.4847586,22.9851956 L17.4847586,22.9851956 L17.2137586,19.2301956 L13.9857586,14.8051956 L13.9857586,14.8051956 Z M20.6057586,14.9841956 L15.2057586,10.9851956 L20.6047586,6.98419562 C21.0487586,6.65519562 21.0917586,6.07219562 20.7017586,5.68119562 L19.2887586,4.26719562 C18.8977586,3.87619562 18.3157586,3.91919562 17.9867586,4.36419562 L13.9867586,9.76619562 L9.98375862,4.36519562 C9.65475862,3.92019562 9.07175862,3.87819562 8.68175862,4.26719562 L7.26675862,5.68019562 C6.87575862,6.07219562 6.91975862,6.65419562 7.36475862,6.98219562 L12.7677586,10.9831956 L7.36575862,14.9861956 C6.92175862,15.3141956 6.87975862,15.8981956 7.26975862,16.2881956 L8.68175862,17.7021956 C9.07275862,18.0941956 9.65475862,18.0501956 9.98475862,17.6061956 L13.9857586,12.2041956 L17.9857586,17.6031956 C18.3147586,18.0481956 18.8977586,18.0901956 19.2887586,17.7001956 L20.7027586,16.2881956 C21.0927586,15.8971956 21.0487586,15.3141956 20.6057586,14.9841956 L20.6057586,14.9841956 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/windmill-m.svg b/data/styles/clear/style-night/symbols/windmill-m.svg
index 8960c180f2..3bc99a959c 100644
--- a/data/styles/clear/style-night/symbols/windmill-m.svg
+++ b/data/styles/clear/style-night/symbols/windmill-m.svg
@@ -10,7 +10,7 @@
         <g id="windmill-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Shape">
-                <use fill="#383833" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
+                <use fill="#33332E" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
                 <use fill="none" xlink:href="#path-1"></use>
             </g>
             <path d="M11.5879177,12.6429177 L9.0109177,16.3119177 L8.7869177,19.1869177 L14.3879177,19.1869177 L14.1699177,16.1829177 L11.5879177,12.6429177 L11.5879177,12.6429177 Z M16.8839177,12.7869177 L12.5639177,9.5879177 L16.8839177,6.3869177 C17.2389177,6.1229177 17.2729177,5.6569177 16.9599177,5.3439177 L15.8299177,4.2129177 C15.5179177,3.9009177 15.0519177,3.9359177 14.7879177,4.2909177 L11.5889177,8.6119177 L8.3859177,4.2909177 C8.1229177,3.9359177 7.6569177,3.9009177 7.3449177,4.2129177 L6.2129177,5.3439177 C5.9009177,5.6559177 5.9359177,6.1229177 6.2909177,6.3849177 L10.6139177,9.5859177 L6.2919177,12.7879177 C5.9369177,13.0509177 5.9029177,13.5169177 6.2159177,13.8299177 L7.3449177,14.9609177 C7.6569177,15.2729177 8.1229177,15.2379177 8.3879177,14.8849177 L11.5879177,10.5629177 L14.7879177,14.8819177 C15.0519177,15.2379177 15.5169177,15.2719177 15.8299177,14.9589177 L16.9619177,13.8299177 C17.2749177,13.5169177 17.2389177,13.0499177 16.8839177,12.7869177 L16.8839177,12.7869177 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-night/symbols/zoo-l.svg b/data/styles/clear/style-night/symbols/zoo-l.svg
index 9437814756..28a47eab5d 100644
--- a/data/styles/clear/style-night/symbols/zoo-l.svg
+++ b/data/styles/clear/style-night/symbols/zoo-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="zoo-l-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#331E12" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
+            <circle id="Oval-1-Copy-38" fill="#2E1B10" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
             <path d="M19,4 C17,7 15.215787,9.0052 13,11 C10.883373,12.9055 7,12.2513 7,15 L7,16 C7,17 8,17.9515 8,19 L8,20 C8,21.5 7.5,21.5 7,23 L8,23 L10,20 L10,23 L11,23 L11,21.5 L11,17 L13,17 L13,23 L14,23 L14,20 L14,18.5 L15,20 L16,23 L17,23 L15.46875,16.71875 C16.058246,16.359058 16,15.694118 16,15 L16,12 L20,6.5 L21.4375,6.9453125 C21.737214,7.0381587 22,7 22,6.75 C22,6.25 21.673378,6.1387024 21.5,6 L19,4 Z" id="path10847-43-3-9" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-night/symbols/zoo-m.svg b/data/styles/clear/style-night/symbols/zoo-m.svg
index aa1d3bfe3e..3d79d6eae3 100644
--- a/data/styles/clear/style-night/symbols/zoo-m.svg
+++ b/data/styles/clear/style-night/symbols/zoo-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="zoo-m-copy" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
-            <ellipse id="Oval-1-Copy-40" fill="#331E12" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+            <ellipse id="Oval-1-Copy-40" fill="#2E1B10" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
             <path d="M15,6 C13.66667,8 13.47719,9.6701 12,11 C10.58891,12.2703 8,11.8342 8,13.6667 L8,14.3333 C8,15 8.66667,15.6343 8.66667,16.3333 L8.66667,17 C8.66667,18 8.33333,18 8,19 L8.66667,19 L10,17 L10,19 L11,19 L11,15 L12,15 L12,19 L13,19 L13,16 L14,19 L14.66667,19 L13.64583,14.8125 C14.03883,14.5727 14,14.1294 14,13.6667 L14,11.6667 L15.5,8 L17,8.5 C17,8.453 16.99948,8.038 17,8 C17,8 16.75649,7.7565 16.66667,7.6667 L15,6 Z" id="path10847-43-3-9-9" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-night/symbols/zoo-s.svg b/data/styles/clear/style-night/symbols/zoo-s.svg
index 70f2b1785f..d83c3906d6 100644
--- a/data/styles/clear/style-night/symbols/zoo-s.svg
+++ b/data/styles/clear/style-night/symbols/zoo-s.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="zoo-s-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-42" fill="#331E12" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
+            <circle id="Oval-1-Copy-42" fill="#2E1B10" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
             <path d="M10.5,4 C9.5,5.5 9.60789,7.0026 8.5,8 C7.44168,8.9528 5,8.6257 5,10 L5,10.5 C5,11 5.5,11.4758 5.5,12 L5.5,12.5 C5.5,13.25 5.25,13.25 5,14 L5.5,14 L6.5,12.5 L6.5,14 L7,14 L7,11 L8,11 L8,14 L8.5,14 L8.5,11.5 L9.5,11.5 L10,14 L10.5,14 L10,10 L10,8.5 L11,5 L12,5 L12,4 L10.5,4 Z" id="path10518" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>