From 67e4a41bb23f9a3760e6fffb9918491dbaba2478 Mon Sep 17 00:00:00 2001
From: David Martinez <47610359+dvdmrtnz@users.noreply.github.com>
Date: Thu, 1 Dec 2022 22:22:19 +0100
Subject: [PATCH] [styles] Change style of icons to filled and color fixes

Signed-off-by: David Martinez <47610359+dvdmrtnz@users.noreply.github.com>
---
 .../clear/style-clear/symbols/beauty-m.svg    | 14 +++++------
 .../clear/style-clear/symbols/beekeeper-m.svg |  2 +-
 .../clear/style-clear/symbols/bus-m.svg       | 23 +++++--------------
 .../clear/style-clear/symbols/bus-s.svg       | 23 +++++--------------
 .../clear/style-clear/symbols/campsite-m.svg  | 14 +++++------
 .../style-clear/symbols/caravan-shop-m.svg    | 17 +++++---------
 .../style-clear/symbols/caravan_site-m.svg    | 17 +++++---------
 .../clear/style-clear/symbols/dentist-m.svg   | 14 +++++------
 .../clear/style-clear/symbols/funicular-m.svg | 14 +++++------
 .../clear/style-clear/symbols/gift-m.svg      | 12 ++++------
 .../style-clear/symbols/hairdresser-m.svg     | 14 +++++------
 .../style-clear/symbols/newsagent_shop-m.svg  | 14 +++++------
 .../style-clear/symbols/stationery_shop-m.svg | 14 +++++------
 .../clear/style-clear/symbols/sweets-m.svg    | 14 +++++------
 .../clear/style-clear/symbols/taxi-m.svg      | 14 +++++------
 .../clear/style-night/symbols/beauty-m.svg    | 14 +++++------
 .../clear/style-night/symbols/beekeeper-m.svg |  2 +-
 .../clear/style-night/symbols/bus-m.svg       | 23 +++++--------------
 .../clear/style-night/symbols/bus-s.svg       | 23 +++++--------------
 .../clear/style-night/symbols/campsite-m.svg  | 14 +++++------
 .../style-night/symbols/caravan-shop-m.svg    | 17 +++++---------
 .../style-night/symbols/caravan_site-m.svg    | 17 +++++---------
 .../clear/style-night/symbols/dentist-m.svg   | 14 +++++------
 .../clear/style-night/symbols/funicular-m.svg | 14 +++++------
 .../clear/style-night/symbols/gift-m.svg      | 14 +++++------
 .../style-night/symbols/hairdresser-m.svg     | 14 +++++------
 .../style-night/symbols/newsagent_shop-m.svg  | 14 +++++------
 .../style-night/symbols/stationery_shop-m.svg | 14 +++++------
 .../clear/style-night/symbols/sweets-m.svg    | 14 +++++------
 .../clear/style-night/symbols/taxi-m.svg      | 14 +++++------
 30 files changed, 169 insertions(+), 273 deletions(-)

diff --git a/data/styles/clear/style-clear/symbols/beauty-m.svg b/data/styles/clear/style-clear/symbols/beauty-m.svg
index 5bacbc6084..39be63bfef 100644
--- a/data/styles/clear/style-clear/symbols/beauty-m.svg
+++ b/data/styles/clear/style-clear/symbols/beauty-m.svg
@@ -1,10 +1,8 @@
-<svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <title>beauty-m</title>
- <g fill="none" fill-rule="evenodd">
-  <g id="beauty-m" fill-rule="nonzero">
-   <circle id="Oval" cx="12" cy="12" r="12" fill="#fff" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#8C5F93"/>
-   <path id="Shape" d="m14.6 12.7v-6.9998c0-0.25199-0.1358-0.48439-0.35489-0.60898-0.21909-0.1246-0.48859-0.1218-0.70488 0.0083998l-3.4999 2.0999c-0.21139 0.1267-0.34019 0.35489-0.34019 0.60058v4.8999h-0.69998v4.8999c0 0.77208 0.62788 1.4 1.4 1.4h3.4999c0.77208 0 1.4-0.62788 1.4-1.4v-4.8999h-0.69998zm-4.1999 1.4h3.4999v1.4h-3.4999v-1.4zm0.69998-5.9036 2.0999-1.26v5.7636h-2.0999v-4.5037zm-0.69998 9.4035v-0.69998h3.5006v0.69998h-3.5006z" fill="#fff"/>
-  </g>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" viewBox="0 0 24 24" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <g opacity="1">
+  <circle id="Oval" cx="12" cy="12" r="12" fill="#fff" opacity=".6"/>
+  <circle cx="12" cy="12" r="11" fill="#8C5F93"/>
+  <path d="m13.469 4.3867c-0.092224 0.0013998-0.18374 0.03451-0.26562 0.099609l-2.6504 2.0996c-0.16006 0.1267-0.25781 0.35587-0.25781 0.60156v4.3125h3.7109v-6.4121c0-0.25199-0.10364-0.48479-0.26953-0.60938-0.082946-0.0623-0.17535-0.093197-0.26758-0.091797zm-4.7031 8.1133v4h6.7676v-4h-6.7676zm0 5v0.43945c0 0.91944 0.67451 1.668 1.5039 1.668h3.7598c0.82936 0 1.5039-0.74848 1.5039-1.668v-0.43945h-6.7676z" fill="#fff"/>
  </g>
 </svg>
diff --git a/data/styles/clear/style-clear/symbols/beekeeper-m.svg b/data/styles/clear/style-clear/symbols/beekeeper-m.svg
index cf474d7d76..baef91a8f1 100644
--- a/data/styles/clear/style-clear/symbols/beekeeper-m.svg
+++ b/data/styles/clear/style-clear/symbols/beekeeper-m.svg
@@ -3,6 +3,6 @@
  <g opacity="1">
   <circle cx="12" cy="12" r="12" fill="#fff" opacity=".6"/>
   <circle cx="12" cy="12" r="11" fill="#8C5F93"/>
-  <path d="m8.6463 3.6857-0.5827 0.5827 1.4971 1.4971-0.12348 0.13616c-0.40917 0.45341-0.67933 0.97215-0.81164 1.5565-0.13109 0.57898-0.08803 1.1645 0.13283 1.7608l0.06408 0.17288-1.6413 0.70351-0.0034 6.83e-4c-1.0565 0.41147-1.64 1.0503-1.7935 1.8916-0.15505 0.85008 0.1228 1.6486 0.8637 2.3895 0.26641 0.26641 0.61685 0.48656 1.0553 0.65679 0.29919 2.2359 2.0677 3.9872 4.2598 4.2037v1.3409h1.0593v-1.3643c2.0602-0.28802 3.7124-1.9345 4.0549-4.0402 0.42228-0.11839 0.80092-0.34171 1.134-0.67481 0.66561-0.66561 0.93848-1.4688 0.81832-2.4082-0.11979-0.93652-0.58618-1.5645-1.4044-1.909l-0.0013-0.0013-1.7414-0.7736 0.06341-0.17087c0.21998-0.59395 0.2599-1.1793 0.12415-1.7494-0.13827-0.58072-0.40668-1.105-0.8063-1.5712l-0.11681-0.13616 1.4938-1.4938-0.60072-0.60006-1.5465 1.5465-0.13149-0.0841c-0.41898-0.26858-0.99473-0.43053-1.7434-0.47591-0.72998-0.04424-1.3602 0.1169-1.8903 0.4739l-0.13216 0.08877zm3.5322 2.0678c0.64989 0 1.1905 0.21934 1.64 0.6688 0.29735 0.29734 0.52269 0.63324 0.67281 1.0085 0.15938 0.39842 0.16011 0.85644 0.02403 1.3636l-0.0574 0.21492-2.2434-0.9458-2.2247 0.97384-0.07342-0.18823c-0.17879-0.45974-0.19665-0.90892-0.04605-1.3476 0.14343-0.41782 0.36552-0.77735 0.66747-1.0793 0.4454-0.44539 0.9963-0.6688 1.6406-0.6688zm0.47457 3.6357 4.1143 1.8175c0.51452 0.22428 0.805 0.61351 0.83233 1.1467 0.02677 0.52186-0.16493 0.9719-0.56401 1.371-0.38756 0.38756-0.89148 0.46505-1.4678 0.26432-0.53063-0.18482-0.94346-0.40882-1.2014-0.6668-0.59898-0.59898-0.99631-1.2118-1.1767-1.8402-0.16982-0.59143-0.31954-1.1629-0.44854-1.7141zm-0.99987 0.01468-0.07142 0.35776c-0.06068 0.3034-0.22866 0.84648-0.49727 1.6173-0.27562 0.79092-0.65643 1.4347-1.1474 1.9256-0.19221 0.19221-0.57574 0.60791-1.2862 0.76292-0.71613 0.15625-1.3214-0.15933-1.6627-0.5006-0.34782-0.34784-0.59005-0.92342-0.3591-1.5212 0.22762-0.58914 0.75498-0.86266 1.1908-1.0326l4e-3 -2e-3h6.84e-4zm0.4392 2.3709 0.20958 0.45588c0.1932 0.4205 0.42356 0.82045 0.69083 1.2014 0.26402 0.37636 0.6268 0.76576 0.96116 1.0332 0.34232 0.25428 0.67653 0.40726 1.2135 0.6381 0.12035 0.04353 0.23924 0.07681 0.35643 0.10212-0.0017 0.0078-0.0036 0.01554-0.0053 0.02336h-6.7915c0.11867-0.01762 0.23628-0.04341 0.35243-0.07876 0.43249-0.18326 0.85985-0.37385 1.2575-0.6895 0.37243-0.28215 0.67809-0.64926 0.96516-1.0039 0.28097-0.34707 0.49414-0.74798 0.63877-1.2041zm-3.1605 4.5822h6.1354c-0.64052 1.0665-1.7785 1.7664-3.067 1.7748-1.289-0.0082-2.4278-0.70786-3.0684-1.7748z" fill="#fff"/>
+  <path d="m8.7793 3.5527-0.42383 0.42383-0.42578 0.42383 1.7461 1.75c-0.30791 0.35129-0.54092 0.75567-0.69922 1.2168-0.19425 0.56584-0.17202 1.1453 0.058594 1.7383l0.095703 0.24414 2.8613-1.0078 2.9023 0.9707 0.072266-0.27734c0.17553-0.65417 0.17628-1.2439-0.029297-1.7578-0.15692-0.39225-0.3816-0.75007-0.66406-1.0762l1.7969-1.8008-0.42578-0.42383-0.42383-0.42383-1.8809 1.8848c-0.41314-0.21581-0.87309-0.32422-1.3867-0.32422-0.48309 1e-7 -0.92392 0.10036-1.3223 0.29492l-1.8516-1.8555zm3.0527 5.9258s-3.4697 1.1955-4.4687 1.666c-0.99908 0.47052-1.4656 1.0767-1.6582 1.7129-0.24708 0.63952 0.012657 1.2548 0.38477 1.627 0.36513 0.3651 1.0132 0.70427 1.7793 0.53711 0.76007-0.16583 1.4524-0.56602 2.1113-1.2285 0.52525-0.52518 0.94732-1.355 1.2422-2.2012 0.28737-0.82465 0.46828-1.4059 0.5332-1.7305l0.076172-0.38281zm0.33594 0 0.076172 0.38281c0.06492 0.32459 0.24584 0.90582 0.5332 1.7305 0.29486 0.84615 0.71694 1.676 1.2422 2.2012 0.65896 0.6625 1.3513 1.0627 2.1113 1.2285 0.76614 0.16716 1.4142-0.17201 1.7793-0.53711 0.37211-0.37213 0.63184-0.98743 0.38477-1.627-0.19263-0.63623-0.65912-1.2424-1.6582-1.7129-0.99908-0.47052-4.4688-1.666-4.4688-1.666zm-0.16797 2.6465c-0.20461 0.67674-0.39347 1.1835-0.82031 1.7852-0.28707 0.37547-0.59242 0.76378-0.96484 1.0625-0.14229 0.11958-0.28868 0.22136-0.4375 0.3125h4.5195c-0.16494-0.092973-0.3145-0.19036-0.46484-0.30859-0.33436-0.28315-0.69887-0.69528-0.96289-1.0938-0.29132-0.5025-0.62864-1.1279-0.86914-1.7578zm-3.9512 4.1602c0.19439 0.39663 0.41526 0.75984 0.65625 1.0898h6.5898c0.24102-0.32994 0.46192-0.69335 0.65625-1.0898h-7.9023zm1.5762 2.0898c0.53884 0.45196 1.1388 0.75512 1.7754 0.87695v1.7559h0.59961 0.59961v-1.7559c0.63593-0.12187 1.2345-0.425 1.7734-0.87695h-4.748z" fill="#fff"/>
  </g>
 </svg>
diff --git a/data/styles/clear/style-clear/symbols/bus-m.svg b/data/styles/clear/style-clear/symbols/bus-m.svg
index 4c8715b7b9..a2fecb965c 100644
--- a/data/styles/clear/style-clear/symbols/bus-m.svg
+++ b/data/styles/clear/style-clear/symbols/bus-m.svg
@@ -1,19 +1,8 @@
-<svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <title>bus-m</title>
- <g fill="none" fill-rule="evenodd">
-  <g id="bus-m">
-   <rect id="Rectangle" width="24" height="24" rx="2.5" fill="#fff" fill-rule="nonzero" opacity=".6"/>
-   <rect id="Rectangle" x="1" y="1" width="22" height="22" rx="2" fill="#2F6499" fill-rule="nonzero"/>
-   <g id="bus" transform="translate(4 4)">
-    <polygon id="Path" points="0 0 16 0 16 16 0 16"/>
-    <circle id="Oval" cx="4" cy="11.333" r="1.3333" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"/>
-    <circle id="Oval" cx="12" cy="11.333" r="1.3333" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"/>
-    <path id="Shape" d="m2.6667 11.333h-1.3333v-7.3333c0-0.36819 0.29848-0.66667 0.66667-0.66667h9.3333c1.8409 0 3.3333 2.0893 3.3333 4.6667v3.3333h-1.3333m-2.6667 0h-5.3333" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"/>
-    <polyline id="Path" points="10.667 3.3333 11.667 8 14.667 8" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"/>
-    <line id="Path" x1="1.3333" x2="11.333" y1="6.6667" y2="6.6667" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"/>
-    <line id="Path" x1="4.6667" x2="4.6667" y1="3.3333" y2="6.6667" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"/>
-    <line id="Path" x1="8" x2="8" y1="3.3333" y2="6.6667" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"/>
-   </g>
-  </g>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" viewBox="0 0 24 24" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <g opacity="1">
+  <rect id="Rectangle" width="24" height="24" rx="2.5" fill="#fff" opacity=".6"/>
+  <rect x="1" y="1" width="22" height="22" rx="2" fill="#2F6499"/>
+  <path d="m5.999 6.584c-0.77352 0-1.416 0.64249-1.416 1.416v7.332c4.1e-5 0.4142 0.3358 0.74996 0.75 0.75h0.72461c0.3044 0.77641 1.0636 1.334 1.9414 1.334 0.87716 0 1.6366-0.5565 1.9414-1.332h4.1172c0.30484 0.77554 1.0642 1.332 1.9414 1.332s1.6366-0.5565 1.9414-1.332h0.72461c0.4142-4.1e-5 0.74996-0.3358 0.75-0.75v-3.3184c7.06e-4 -0.0052 0.0014-0.01041 2e-3 -0.01563-7.5e-5 -0.02479-0.0014-0.04956-0.0039-0.07422-0.01389-1.4044-0.41753-2.688-1.1133-3.6621-0.70808-0.99132-1.7626-1.6797-2.9668-1.6797zm0.08398 1.357h1.8633v2.8715h-1.8633zm3.2539 0h1.9121v2.8715h-1.9121zm3.2953 0h1.4274l0.58594 2.8715h-2.0133zm2.686 0c2.2166 0.34738 2.7966 2.607 2.8669 4.01l-1.9126-0.02337zm-7.3192 6.5121c0.49963 0 0.88086 0.37927 0.88086 0.87891s-0.38122 0.88086-0.88086 0.88086c-0.49963 0-0.88086-0.38123-0.88086-0.88086s0.38123-0.87891 0.88086-0.87891zm8 0c0.49964 0 0.88086 0.37927 0.88086 0.87891 0 0.49963-0.38122 0.88086-0.88086 0.88086-0.49963 0-0.88086-0.38123-0.88086-0.88086s0.38122-0.87891 0.88086-0.87891z" fill="#fff"/>
  </g>
 </svg>
diff --git a/data/styles/clear/style-clear/symbols/bus-s.svg b/data/styles/clear/style-clear/symbols/bus-s.svg
index f1fe635b34..f1ece3593b 100644
--- a/data/styles/clear/style-clear/symbols/bus-s.svg
+++ b/data/styles/clear/style-clear/symbols/bus-s.svg
@@ -1,19 +1,8 @@
-<svg version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
- <title>bus-s</title>
- <g fill="none" fill-rule="evenodd">
-  <g id="bus-s">
-   <rect id="Rectangle" width="16" height="16" rx="2.5" fill="#fff" fill-rule="nonzero" opacity=".6"/>
-   <rect id="Rectangle" x=".66667" y=".66667" width="14.667" height="14.667" rx="2" fill="#2F6499" fill-rule="nonzero"/>
-   <g id="bus" transform="translate(2.6667 2.6667)">
-    <polygon id="Path" points="0 0 10.667 0 10.667 10.667 0 10.667"/>
-    <circle id="Oval" cx="2.6667" cy="7.5556" r="1" stroke="#fff" stroke-linecap="round" stroke-linejoin="round"/>
-    <circle id="Oval" cx="8" cy="7.5556" r="1" stroke="#fff" stroke-linecap="round" stroke-linejoin="round"/>
-    <path id="Shape" d="m1.7778 7.5556h-0.88889v-4.8889c0-0.24546 0.19898-0.44444 0.44444-0.44444h6.2222c1.2273 0 2.2222 1.3929 2.2222 3.1111v2.2222h-0.88889m-1.7778 0h-3.5556" stroke="#fff" stroke-linecap="round" stroke-linejoin="round"/>
-    <polyline id="Path" points="7.1111 2.2222 7.7778 5.3333 9.7778 5.3333" stroke="#fff" stroke-linecap="round" stroke-linejoin="round"/>
-    <line id="Path" x1=".88889" x2="7.5556" y1="4.4444" y2="4.4444" stroke="#fff" stroke-linecap="round" stroke-linejoin="round"/>
-    <line id="Path" x1="3.1111" x2="3.1111" y1="2.2222" y2="4.4444" stroke="#fff" stroke-linecap="round" stroke-linejoin="round"/>
-    <line id="Path" x1="5.3333" x2="5.3333" y1="2.2222" y2="4.4444" stroke="#fff" stroke-linecap="round" stroke-linejoin="round"/>
-   </g>
-  </g>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" viewBox="0 0 16 16" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <g opacity="1">
+  <rect id="Rectangle" width="16" height="16" rx="2.5" fill="#fff" opacity=".6" />
+  <rect x=".66667" y=".66667" width="14.667" height="14.667" rx="2" fill="#2F6499" />
+  <path d="m3.9997 4.3897c-0.51566 0-0.94397 0.42831-0.94397 0.94397v4.8878c2.7e-5 0.27612 0.22386 0.49996 0.49998 0.49998h0.48306c0.20293 0.51759 0.70904 0.8893 1.2942 0.8893 0.58475 0 1.091-0.37099 1.2942-0.88797h2.7447c0.20322 0.51701 0.70944 0.88797 1.2942 0.88797s1.091-0.37099 1.2942-0.88797h0.48306c0.27612-2.8e-5 0.49996-0.22386 0.49998-0.49998v-2.2122c4.7e-4 -0.00347 9.33e-4 -0.00694 0.0013-0.01042-5e-5 -0.016526-9.33e-4 -0.033039-0.0026-0.049478-0.009226-0.93623-0.27831-1.7919-0.74214-2.4413-0.47204-0.66086-1.175-1.1198-1.9778-1.1198zm0.05598 0.90464h1.2422v1.9143h-1.2422zm2.1692 0h1.2747v1.9143h-1.2747zm2.1968 0h0.95157l0.39061 1.9143h-1.3422zm1.7906 0c1.4777 0.23158 1.8643 1.7379 1.9112 2.6732l-1.275-0.015579zm-4.8793 4.3412c0.33308 0 0.58722 0.25284 0.58722 0.58592 0 0.33308-0.25414 0.58722-0.58722 0.58722-0.33308 0-0.58722-0.25414-0.58722-0.58722s0.25414-0.58592 0.58722-0.58592zm5.3331 0c0.33308 0 0.58722 0.25284 0.58722 0.58592 0 0.33308-0.25414 0.58722-0.58722 0.58722-0.33308 0-0.58722-0.25414-0.58722-0.58722s0.25414-0.58592 0.58722-0.58592z" fill="#fff" />
  </g>
 </svg>
diff --git a/data/styles/clear/style-clear/symbols/campsite-m.svg b/data/styles/clear/style-clear/symbols/campsite-m.svg
index fcf17d51e3..20c4f3539d 100644
--- a/data/styles/clear/style-clear/symbols/campsite-m.svg
+++ b/data/styles/clear/style-clear/symbols/campsite-m.svg
@@ -1,10 +1,8 @@
-<svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <title>campsite-m</title>
- <g fill="none" fill-rule="evenodd">
-  <g id="campsite-m" fill-rule="nonzero">
-   <circle id="Oval" cx="12" cy="12" r="12" fill="#fff" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#717065"/>
-   <path id="Shape" d="m17.589 17.065-5.0294-8.2295 1.3413-2.1938-1.0493-0.64112-1.0118 1.656-1.0118-1.6566-1.0499 0.64174 1.3413 2.1938-5.0294 8.2295c-0.11556 0.18994-0.12048 0.42721-0.011679 0.62145 0.1088 0.19363 0.31411 0.31349 0.53663 0.31349h10.45c0.22252 0 0.42721-0.11986 0.53601-0.31411 0.1088-0.19363 0.1045-0.43151-0.011679-0.62084zm-6.6712-0.29444v-0.92204c0-0.50835 0.41369-0.92204 0.92204-0.92204 0.50835 0 0.92204 0.41369 0.92204 0.92204v0.92204h-1.8441zm3.0735 0v-0.92204c0-1.187-0.96506-2.1514-2.1514-2.1514s-2.1514 0.96445-2.1514 2.1514v0.92204h-1.9775l4.1289-6.7561 4.1283 6.7561h-1.9768z" fill="#fff"/>
-  </g>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" viewBox="0 0 24 24" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <g opacity="1">
+  <circle id="Oval" cx="12" cy="12" r="12" fill="#fff" opacity=".6"/>
+  <circle cx="12" cy="12" r="11" fill="#664e42"/>
+  <path id="Shape" d="m10.828 5.7196-1.0508 0.64258 1.3418 2.1934-4.8496 7.9355h-1.1523a0.615 0.615 0 0 0-0.61523 0.61328 0.615 0.615 0 0 0 0.61523 0.61523h13.461a0.615 0.615 0 0 0 0.61523-0.61523 0.615 0.615 0 0 0-0.61523-0.61328h-1.168l-4.8496-7.9355 1.3398-2.1934-1.0488-0.64062-1.0117 1.6543zm1.0117 7.6973c1.1863 0 2.1523 0.96339 2.1523 2.1504v0.92383h-4.3027v-0.92383c0-1.1869 0.96405-2.1504 2.1504-2.1504z" fill="#fff"/>
  </g>
 </svg>
diff --git a/data/styles/clear/style-clear/symbols/caravan-shop-m.svg b/data/styles/clear/style-clear/symbols/caravan-shop-m.svg
index 3d406d58fe..b9e67148c0 100644
--- a/data/styles/clear/style-clear/symbols/caravan-shop-m.svg
+++ b/data/styles/clear/style-clear/symbols/caravan-shop-m.svg
@@ -1,13 +1,8 @@
-<svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <title>caravan_shop-m</title>
- <g fill="none" fill-rule="evenodd">
-  <g id="caravan_shop-m" fill-rule="nonzero">
-   <circle id="Oval" cx="12" cy="12" r="12" fill="#fff" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#8C5F93"/>
-   <g id="caravan" transform="translate(5 7)" fill="#fff">
-    <path id="Shape" d="m4.5517 1.6361h-1.6322c-0.2603 0-0.47138 0.21108-0.47138 0.47138v1.6322c0 0.2603 0.21108 0.47138 0.47138 0.47138h1.6322c0.2603 0 0.47138-0.21108 0.47138-0.47138v-1.6322c0-0.2603-0.21104-0.47138-0.47138-0.47138zm-0.47138 1.6322h-0.68939v-0.68939h0.68939v0.68939z"/>
-    <path id="Shape" d="m13.529 9.1075c0.2603 0 0.47138-0.21108 0.47138-0.47138 0-0.2603-0.21108-0.47138-0.47138-0.47138h-1.436c0.1746-0.29075 0.27524-0.63071 0.27524-0.99381v-2.6928c0-2.4671-2.0071-4.4742-4.4742-4.4742h-5.9571c-1.0678 0-1.9366 0.8688-1.9366 1.9366v5.2303c0 1.0631 0.86102 1.9285 1.9223 1.9362 0.2043 0.69948 0.85098 1.2122 1.6156 1.2122 0.76444 0 1.4111-0.51248 1.6155-1.2118h8.3753zm-9.9908 0.26902c-0.40822 0-0.74035-0.33213-0.74035-0.7404 0-0.40822 0.33213-0.74035 0.74035-0.74035 0.40826 0 0.7404 0.33213 0.7404 0.74035 0 0.40826-0.33213 0.7404-0.7404 0.7404zm3.1174-1.2118v-3.6708c0-0.60596 0.49297-1.0989 1.0989-1.0989h0.12364c0.60596 0 1.0989 0.49297 1.0989 1.0989v3.6708h-2.3215zm3.2643 0v-3.6708c0-1.1258-0.91594-2.0417-2.0417-2.0417h-0.12364c-1.1258 0-2.0417 0.91594-2.0417 2.0417v3.6708h-0.5592c-0.20439-0.69929-0.85103-1.2117-1.6155-1.2117-0.7642 0-1.4106 0.51211-1.6152 1.211-0.54152-0.0075892-0.97986-0.44984-0.97986-0.9931v-5.2303c0-0.54803 0.44583-0.99386 0.99381-0.99386h5.9571c1.9473 0 3.5314 1.5842 3.5314 3.5314v2.6928c0 0.54798-0.44583 0.99381-0.99386 0.99381h-0.51164z"/>
-   </g>
-  </g>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" viewBox="0 0 24 24" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <g opacity="1">
+  <circle id="Oval" cx="12" cy="12" r="12" fill="#fff" opacity=".6"/>
+  <circle cx="12" cy="12" r="11" fill="#8C5F93"/>
+  <path d="m7.1465 6.377c-1.1838 0-2.1465 0.98593-2.1465 2.1993v5.9435c0 0.95125 0.59187 1.7639 1.418 2.0703a2.5496 2.6133 0 0 1-0.04492-0.41212 2.5496 2.6133 0 0 1 2.5508-2.6134 2.5496 2.6133 0 0 1 2.5489 2.6134 2.5496 2.6133 0 0 1-0.06055 0.54298h8.586c0.28857 0 0.52344-0.24134 0.52344-0.53712s-0.23488-0.53516-0.52344-0.53516h-1.5918c0.19356-0.33038 0.30469-0.71635 0.30469-1.1289v-3.0606c0-2.8034-2.224-5.0821-4.959-5.0821h-6.6055zm0.46875 1.8535h1.8086c0.28861 0 0.52345 0.2394 0.52345 0.53517v1.8555c0 0.29578-0.23488 0.53516-0.52345 0.53516h-1.8086c-0.28857 0-0.52345-0.2394-0.52345-0.53516v-1.8555c0-0.29578 0.23488-0.53517 0.52345-0.53517zm6.6544 0.92775h0.13867c1.2481 0 2.2618 1.0411 2.2618 2.3203v4.17h-1.0449v-4.17c0-0.68852-0.54504-1.25-1.2168-1.25h-0.13867c-0.67173 0-1.2168 0.56148-1.2168 1.25v4.17h-1.0469v-4.17c0-1.2792 1.0156-2.3203 2.2637-2.3203zm-5.3458 5.463a1.5187 1.5566 0 0 0-1.5196 1.5567 1.5187 1.5566 0 0 0 1.5196 1.5567 1.5187 1.5566 0 0 0 1.5176-1.5567 1.5187 1.5566 0 0 0-1.5176-1.5567z" fill="#fff"/>
  </g>
 </svg>
diff --git a/data/styles/clear/style-clear/symbols/caravan_site-m.svg b/data/styles/clear/style-clear/symbols/caravan_site-m.svg
index 2d3806234e..6169305a5b 100644
--- a/data/styles/clear/style-clear/symbols/caravan_site-m.svg
+++ b/data/styles/clear/style-clear/symbols/caravan_site-m.svg
@@ -1,13 +1,8 @@
-<svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <title>caravan_site-m</title>
- <g fill="none" fill-rule="evenodd">
-  <g id="caravan_site-m" fill-rule="nonzero">
-   <circle id="Oval" cx="12" cy="12" r="12" fill="#fff" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#664E42"/>
-   <g id="caravan" transform="translate(5 7)" fill="#fff">
-    <path id="Shape" d="m4.5517 1.6361h-1.6322c-0.2603 0-0.47138 0.21108-0.47138 0.47138v1.6322c0 0.2603 0.21108 0.47138 0.47138 0.47138h1.6322c0.2603 0 0.47138-0.21108 0.47138-0.47138v-1.6322c0-0.2603-0.21104-0.47138-0.47138-0.47138zm-0.47138 1.6322h-0.68939v-0.68939h0.68939v0.68939z"/>
-    <path id="Shape" d="m13.529 9.1075c0.2603 0 0.47138-0.21108 0.47138-0.47138 0-0.2603-0.21108-0.47138-0.47138-0.47138h-1.436c0.1746-0.29075 0.27524-0.63071 0.27524-0.99381v-2.6928c0-2.4671-2.0071-4.4742-4.4742-4.4742h-5.9571c-1.0678 0-1.9366 0.8688-1.9366 1.9366v5.2303c0 1.0631 0.86102 1.9285 1.9223 1.9362 0.2043 0.69948 0.85098 1.2122 1.6156 1.2122 0.76444 0 1.4111-0.51248 1.6155-1.2118h8.3753zm-9.9908 0.26902c-0.40822 0-0.74035-0.33213-0.74035-0.7404 0-0.40822 0.33213-0.74035 0.74035-0.74035 0.40826 0 0.7404 0.33213 0.7404 0.74035 0 0.40826-0.33213 0.7404-0.7404 0.7404zm3.1174-1.2118v-3.6708c0-0.60596 0.49297-1.0989 1.0989-1.0989h0.12364c0.60596 0 1.0989 0.49297 1.0989 1.0989v3.6708h-2.3215zm3.2643 0v-3.6708c0-1.1258-0.91594-2.0417-2.0417-2.0417h-0.12364c-1.1258 0-2.0417 0.91594-2.0417 2.0417v3.6708h-0.5592c-0.20439-0.69929-0.85103-1.2117-1.6155-1.2117-0.7642 0-1.4106 0.51211-1.6152 1.211-0.54152-0.0075892-0.97986-0.44984-0.97986-0.9931v-5.2303c0-0.54803 0.44583-0.99386 0.99381-0.99386h5.9571c1.9473 0 3.5314 1.5842 3.5314 3.5314v2.6928c0 0.54798-0.44583 0.99381-0.99386 0.99381h-0.51164z"/>
-   </g>
-  </g>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" viewBox="0 0 24 24" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <g opacity="1">
+  <circle id="Oval" cx="12" cy="12" r="12" fill="#fff" opacity=".6"/>
+  <circle cx="12" cy="12" r="11" fill="#664e42"/>
+  <path d="m7.1465 6.377c-1.1838 0-2.1465 0.98593-2.1465 2.1993v5.9435c0 0.95125 0.59187 1.7639 1.418 2.0703a2.5496 2.6133 0 0 1-0.04492-0.41212 2.5496 2.6133 0 0 1 2.5508-2.6134 2.5496 2.6133 0 0 1 2.5489 2.6134 2.5496 2.6133 0 0 1-0.06055 0.54298h8.586c0.28857 0 0.52344-0.24134 0.52344-0.53712s-0.23488-0.53516-0.52344-0.53516h-1.5918c0.19356-0.33038 0.30469-0.71635 0.30469-1.1289v-3.0606c0-2.8034-2.224-5.0821-4.959-5.0821h-6.6055zm0.46875 1.8535h1.8086c0.28861 0 0.52345 0.2394 0.52345 0.53517v1.8555c0 0.29578-0.23488 0.53516-0.52345 0.53516h-1.8086c-0.28857 0-0.52345-0.2394-0.52345-0.53516v-1.8555c0-0.29578 0.23488-0.53517 0.52345-0.53517zm6.6544 0.92775h0.13867c1.2481 0 2.2618 1.0411 2.2618 2.3203v4.17h-1.0449v-4.17c0-0.68852-0.54504-1.25-1.2168-1.25h-0.13867c-0.67173 0-1.2168 0.56148-1.2168 1.25v4.17h-1.0469v-4.17c0-1.2792 1.0156-2.3203 2.2637-2.3203zm-5.3458 5.463a1.5187 1.5566 0 0 0-1.5196 1.5567 1.5187 1.5566 0 0 0 1.5196 1.5567 1.5187 1.5566 0 0 0 1.5176-1.5567 1.5187 1.5566 0 0 0-1.5176-1.5567z" fill="#fff"/>
  </g>
 </svg>
diff --git a/data/styles/clear/style-clear/symbols/dentist-m.svg b/data/styles/clear/style-clear/symbols/dentist-m.svg
index 8ea9aa09a6..62a13230e9 100644
--- a/data/styles/clear/style-clear/symbols/dentist-m.svg
+++ b/data/styles/clear/style-clear/symbols/dentist-m.svg
@@ -1,10 +1,8 @@
-<svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <title>dentist-m</title>
- <g fill="none" fill-rule="evenodd">
-  <g id="dentist-m" fill-rule="nonzero">
-   <circle id="Oval" cx="12" cy="12" r="12" fill="#fff" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#717065"/>
-   <path id="Shape" d="m8.5 6.4c1.4 0 2.1 0.7 3.5 0.7s2.1-0.7 3.5-0.7c1.1667 0 2.1 1.4 2.1 2.8 0 1.2266-0.60221 2.8772-1.2688 3.5438-0.59857 0.59857-1.4885 4.8125-1.8812 4.8125-0.14917 0-0.34048-0.74046-0.35-1.6407-0.01512-1.429-0.40131-3.2156-2.1-3.2156-1.6987 0-2.0849 1.7865-2.1 3.2156-0.00951 0.9002-0.20082 1.6407-0.35 1.6407-0.39276 0-1.2827-4.214-1.8812-4.8125-0.66653-0.66654-1.2688-2.3171-1.2688-3.5438 0-1.4 0.93333-2.8 2.1-2.8z" fill="#fff"/>
-  </g>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" viewBox="0 0 24 24" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <g opacity="1">
+  <circle id="Oval" cx="12" cy="12" r="12" fill="#fff" opacity=".6"/>
+  <circle cx="12" cy="12" r="11" fill="#c15746"/>
+  <path id="Shape" d="m8.5 6.4c1.4 0 2.1 0.7 3.5 0.7s2.1-0.7 3.5-0.7c1.1667 0 2.1 1.4 2.1 2.8 0 1.2266-0.60221 2.8772-1.2688 3.5438-0.59857 0.59857-1.4885 4.8125-1.8812 4.8125-0.14917 0-0.34048-0.74046-0.35-1.6407-0.01512-1.429-0.40131-3.2156-2.1-3.2156-1.6987 0-2.0849 1.7865-2.1 3.2156-0.00951 0.9002-0.20082 1.6407-0.35 1.6407-0.39276 0-1.2827-4.214-1.8812-4.8125-0.66653-0.66654-1.2688-2.3171-1.2688-3.5438 0-1.4 0.93333-2.8 2.1-2.8z" fill="#fff"/>
  </g>
 </svg>
diff --git a/data/styles/clear/style-clear/symbols/funicular-m.svg b/data/styles/clear/style-clear/symbols/funicular-m.svg
index 508009cd51..881e0235c1 100644
--- a/data/styles/clear/style-clear/symbols/funicular-m.svg
+++ b/data/styles/clear/style-clear/symbols/funicular-m.svg
@@ -1,10 +1,8 @@
-<svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <title>funicular-m</title>
- <g fill="none" fill-rule="evenodd">
-  <g id="funicular-m" fill-rule="nonzero">
-   <rect id="Rectangle" width="24" height="24" rx="2.5" fill="#fff" opacity=".6"/>
-   <rect id="Rectangle" x="1" y="1" width="22" height="22" rx="2" fill="#2F6499"/>
-   <path id="Shape" d="m19 17.784-1.7467-0.81946c0.41272-0.34855 0.65292-0.85936 0.65292-1.4098v-2.5005c0-1.011-0.28643-1.9968-0.82834-2.8506-0.54183-0.85364-1.3118-1.5323-2.2269-1.9628l-6.5814-3.0956c-0.46903-0.22157-1.0107-0.18807-1.4488 0.089465-0.43818 0.27754-0.69974 0.75298-0.69974 1.2717v4.723c0 0.18243 0.018799 0.36248 0.054175 0.53773l-1.1753-0.5514v1.21l2.4123 1.1317c0.090149 0.056482 0.1838 0.10835 0.28138 0.15432l4.2327 1.9635 7.0736 3.3187v-1.21zm-3.7461-1.7708v-2.2776l1.5586 0.72384v1.0954c0 0.26361-0.12766 0.49569-0.35026 0.63694-0.22242 0.14116-0.48698 0.15782-0.72538 0.045544l-0.48296-0.22405zm1.5586-2.9589v0.19927l-1.5586-0.72401v-2.7507c0.96899 0.7922 1.5586 1.994 1.5586 3.2754zm-7.0547-3.0775v-2.9228l1.668 0.78459v2.913l-1.668-0.77477zm2.7617-1.6238 1.6406 0.77169v2.8968l-1.6406-0.76195v-2.9066zm-5.1134-2.1943c0.057507-0.036572 0.21132-0.11185 0.397-0.024011l0.8609 0.40477v2.9293l-1.4492-0.67308v-2.2893c0-0.20448 0.13381-0.31129 0.19132-0.34769zm-0.19132 5.0707v-1.2279l6.9453 3.226v2.2782l-1.4234-0.66027-4.8021-2.253c-0.44391-0.30463-0.71982-0.81544-0.71982-1.3631z" fill="#fff"/>
-  </g>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" viewBox="0 0 24 24" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <g opacity="1">
+  <rect id="Rectangle" width="24" height="24" rx="2.5" fill="#fff" opacity=".6"/>
+  <rect x="1" y="1" width="22" height="22" rx="2" fill="#2F6499"/>
+  <path id="Shape" d="m7.5332 5.002c-0.24881 0.015371-0.49384 0.093654-0.71289 0.23242-0.43818 0.27754-0.69922 0.75276-0.69922 1.2715v4.7227c0 0.18243 0.019312 0.36381 0.054687 0.53906l-2.4023-1.1348v1.2109l3.6387 1.7129c0.090149 0.05648 0.18367 0.10833 0.28125 0.1543l4.2324 1.9648 8.0293 3.7734v-1.209l-2.7012-1.2754c0.41272-0.34855 0.65234-0.85972 0.65234-1.4102v-2.5c0-1.011-0.28622-1.9978-0.82812-2.8516-0.54183-0.85364-1.3115-1.5324-2.2266-1.9629l-6.582-3.0957c-0.23451-0.11078-0.48752-0.15795-0.73633-0.14258zm0.13672 1.0938c0.04143 0.0047236 0.086392 0.017103 0.13281 0.039062l0.86133 0.4043v2.9297l-1.4492-0.67383v-2.2891c0-0.20448 0.1339-0.31126 0.19141-0.34766 0.04313-0.027429 0.13938-0.076671 0.26367-0.0625zm2.0879 0.95898 1.668 0.7832v2.9141l-1.668-0.77539v-2.9219zm2.7617 1.2988 1.6406 0.77148v2.8965l-1.6406-0.76172v-2.9063zm2.7344 1.4258c0.96899 0.7922 1.5586 1.994 1.5586 3.2754v0.19922l-1.5586-0.72461v-2.75z" fill="#fff"/>
  </g>
 </svg>
diff --git a/data/styles/clear/style-clear/symbols/gift-m.svg b/data/styles/clear/style-clear/symbols/gift-m.svg
index b88e86433b..2100f2fa89 100644
--- a/data/styles/clear/style-clear/symbols/gift-m.svg
+++ b/data/styles/clear/style-clear/symbols/gift-m.svg
@@ -1,10 +1,8 @@
-<svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <title>gift-m</title>
- <g fill="none" fill-rule="evenodd">
-  <g id="gift-m" fill-rule="nonzero">
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" viewBox="0 0 24 24" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <g opacity="1">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#fff" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#8C5F93"/>
-   <path id="Shape" d="m17.6 7.8h-1.526c0.077-0.217 0.126-0.455 0.126-0.7 0-1.162-0.938-2.1-2.1-2.1-0.735 0-1.372 0.378-1.75 0.945l-0.35 0.469-0.35-0.476c-0.378-0.56-1.015-0.938-1.75-0.938-1.162 0-2.1 0.938-2.1 2.1 0 0.245 0.049 0.483 0.126 0.7h-1.526c-0.777 0-1.393 0.623-1.393 1.4l-7e-3 7.7c0 0.777 0.623 1.4 1.4 1.4h11.2c0.777 0 1.4-0.623 1.4-1.4v-7.7c0-0.777-0.623-1.4-1.4-1.4zm-3.5-1.4c0.385 0 0.7 0.315 0.7 0.7s-0.315 0.7-0.7 0.7-0.7-0.315-0.7-0.7 0.315-0.7 0.7-0.7zm-4.2 0c0.385 0 0.7 0.315 0.7 0.7s-0.315 0.7-0.7 0.7-0.7-0.315-0.7-0.7 0.315-0.7 0.7-0.7zm7.7 10.5h-11.2v-1.4h11.2v1.4zm0-3.5h-11.2v-3.5c0-0.385 0.315-0.7 0.7-0.7h2.856l-1.036 1.414c-0.231 0.315-0.161 0.756 0.154 0.98 0.308 0.224 0.749 0.154 0.973-0.154l1.953-2.66 1.953 2.66c0.224 0.308 0.665 0.378 0.973 0.154 0.315-0.224 0.385-0.665 0.154-0.98l-1.036-1.414h2.856c0.385 0 0.7 0.315 0.7 0.7v3.5z" fill="#fff"/>
+   <circle cx="12" cy="12" r="11" fill="#8C5F93"/>
+   <path d="m9.7871 4.1406c-1.1544 0-2.1055 0.95104-2.1055 2.1055 0 0.58751 0.29031 1.1106 0.66406 1.4375 0.049239 0.043069 0.09915 0.082878 0.15039 0.12109h-2.2539c-0.33366 0-0.64672 0.083462-0.91211 0.26367-0.26539 0.18021-0.50391 0.50102-0.50391 0.89453v1.1582h1.416 4.8086v-2.3164h1.8984v2.3164h4.8086 1.416v-1.1582c0-0.39352-0.23852-0.71432-0.50391-0.89453-0.26539-0.18021-0.57844-0.26367-0.91211-0.26367h-2.2539c0.051265-0.038231 0.10308-0.078004 0.15234-0.12109 0.37376-0.32692 0.66406-0.84999 0.66406-1.4375 0-1.1544-0.95104-2.1055-2.1055-2.1055-0.64295 2e-7 -1.1512 0.38355-1.4473 0.75977-0.29604 0.37621-0.46366 0.77348-0.58984 1.041-0.08357 0.17717-0.10962 0.26925-0.17773 0.41992-0.068027-0.15046-0.09235-0.24304-0.17578-0.41992-0.12619-0.26753-0.2938-0.6648-0.58984-1.041-0.29604-0.37621-0.80432-0.75977-1.4473-0.75977zm0 1.4297c0.12507 1e-7 0.18254 0.032841 0.32422 0.21289 0.14168 0.18005 0.28376 0.47892 0.41992 0.76758 0.14464 0.30664 0.18756 0.43516 0.27344 0.64062-0.24266-0.070788-0.45327-0.13034-0.80859-0.23828-0.31057-0.094349-0.57114-0.22513-0.70898-0.3457-0.13784-0.12057-0.17578-0.18082-0.17578-0.36133 0-0.38161 0.29418-0.67578 0.67578-0.67578zm4.3828 0c0.013818-0.0012497 0.029288 0 0.044922 0 0.3816 0 0.67578 0.29418 0.67578 0.67578 0 0.18051-0.03794 0.24076-0.17578 0.36133s-0.39842 0.25135-0.70898 0.3457c-0.35532 0.10794-0.56594 0.16749-0.80859 0.23828 0.08588-0.20546 0.1288-0.33398 0.27344-0.64062 0.13616-0.28866 0.27824-0.58753 0.41992-0.76758 0.12397-0.15754 0.18257-0.20414 0.2793-0.21289zm-8.5156 5.8203v1.416 2.0527 2.0547c0 0.77327 0.64275 1.416 1.416 1.416h3.9805v-6.9395h-3.9805-1.416zm7.2949 0v6.9395h3.9805c0.77327 0 1.416-0.64274 1.416-1.416v-2.0547-2.0527-1.416h-1.416-3.9805z" fill="#fff" fill-rule="evenodd" />
   </g>
- </g>
 </svg>
diff --git a/data/styles/clear/style-clear/symbols/hairdresser-m.svg b/data/styles/clear/style-clear/symbols/hairdresser-m.svg
index ed1878cff1..bde3024bc3 100644
--- a/data/styles/clear/style-clear/symbols/hairdresser-m.svg
+++ b/data/styles/clear/style-clear/symbols/hairdresser-m.svg
@@ -1,10 +1,8 @@
-<svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <title>hairdresser-m</title>
- <g fill="none" fill-rule="evenodd">
-  <g id="hairdresser-m" fill-rule="nonzero">
-   <circle id="Oval" cx="12" cy="12" r="12" fill="#fff" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#717065"/>
-   <path id="Shape" d="m10.349 8.9525c0.20298-0.43395 0.29397-0.9309 0.23797-1.4628-0.13299-1.2109-1.0779-2.2398-2.2818-2.4427-1.9388-0.33596-3.5976 1.3229-3.2616 3.2546 0.20998 1.2039 1.2319 2.1488 2.4427 2.2818 0.53194 0.055994 1.0219-0.034996 1.4628-0.23797l1.6518 1.6588-1.6518 1.6518c-0.43395-0.20298-0.9309-0.29397-1.4628-0.23797-1.2109 0.13299-2.2398 1.0779-2.4427 2.2818-0.33596 1.9388 1.3229 3.5906 3.2546 3.2546 1.2039-0.20998 2.1488-1.2319 2.2818-2.4427 0.055994-0.53194-0.034996-1.0219-0.23797-1.4628l1.6588-1.6448 5.3124 5.3124c0.62293 0.62293 1.6868 0.18198 1.6868-0.69992v-0.0069992c0-0.25897-0.10499-0.51094-0.28697-0.69992l-8.3641-8.3571zm-2.5477 0.25197c-0.76992 0-1.3998-0.62293-1.3998-1.3998 0-0.77692 0.62993-1.3998 1.3998-1.3998 0.76992 0 1.3998 0.62293 1.3998 1.3998 0 0.77692-0.62993 1.3998-1.3998 1.3998zm0 8.3991c-0.76992 0-1.3998-0.62293-1.3998-1.3998 0-0.77692 0.62993-1.3998 1.3998-1.3998 0.76992 0 1.3998 0.62293 1.3998 1.3998 0 0.77692-0.62993 1.3998-1.3998 1.3998zm4.1995-5.2494c-0.19598 0-0.34996-0.15398-0.34996-0.34996 0-0.19598 0.15398-0.34996 0.34996-0.34996s0.34996 0.15398 0.34996 0.34996c0 0.19598-0.15398 0.34996-0.34996 0.34996zm5.3124-7.0622-4.6125 4.6125 1.3998 1.3998 4.6125-4.6125c0.18198-0.18198 0.28697-0.43395 0.28697-0.69992v-0.0069992c0-0.8749-1.0639-1.3159-1.6868-0.69292z" fill="#fff"/>
-  </g>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" viewBox="0 0 24 24" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <g opacity="1">
+  <circle id="Oval" cx="12" cy="12" r="12" fill="#fff" opacity=".6"/>
+  <circle cx="12" cy="12" r="11" fill="#8c5f93"/>
+  <path id="Shape" d="m10.349 8.9525c0.20298-0.43395 0.29397-0.9309 0.23797-1.4628-0.13299-1.2109-1.0779-2.2398-2.2818-2.4427-1.9388-0.33596-3.5976 1.3229-3.2616 3.2546 0.20998 1.2039 1.2319 2.1488 2.4427 2.2818 0.53194 0.055994 1.0219-0.034996 1.4628-0.23797l1.6518 1.6588-1.6518 1.6518c-0.43395-0.20298-0.9309-0.29397-1.4628-0.23797-1.2109 0.13299-2.2398 1.0779-2.4427 2.2818-0.33596 1.9388 1.3229 3.5906 3.2546 3.2546 1.2039-0.20998 2.1488-1.2319 2.2818-2.4427 0.055994-0.53194-0.034996-1.0219-0.23797-1.4628l1.6588-1.6448 5.3124 5.3124c0.62293 0.62293 1.6868 0.18198 1.6868-0.69992v-0.0069992c0-0.25897-0.10499-0.51094-0.28697-0.69992l-8.3641-8.3571zm-2.5477 0.25197c-0.76992 0-1.3998-0.62293-1.3998-1.3998 0-0.77692 0.62993-1.3998 1.3998-1.3998 0.76992 0 1.3998 0.62293 1.3998 1.3998 0 0.77692-0.62993 1.3998-1.3998 1.3998zm0 8.3991c-0.76992 0-1.3998-0.62293-1.3998-1.3998 0-0.77692 0.62993-1.3998 1.3998-1.3998 0.76992 0 1.3998 0.62293 1.3998 1.3998 0 0.77692-0.62993 1.3998-1.3998 1.3998zm4.1995-5.2494c-0.19598 0-0.34996-0.15398-0.34996-0.34996s0.15398-0.34996 0.34996-0.34996 0.34996 0.15398 0.34996 0.34996-0.15398 0.34996-0.34996 0.34996zm5.3124-7.0622-4.6125 4.6125 1.3998 1.3998 4.6125-4.6125c0.18198-0.18198 0.28697-0.43395 0.28697-0.69992v-0.0069992c0-0.8749-1.0639-1.3159-1.6868-0.69292z" fill="#fff"/>
  </g>
 </svg>
diff --git a/data/styles/clear/style-clear/symbols/newsagent_shop-m.svg b/data/styles/clear/style-clear/symbols/newsagent_shop-m.svg
index 6142e07c1f..a30d40cad1 100644
--- a/data/styles/clear/style-clear/symbols/newsagent_shop-m.svg
+++ b/data/styles/clear/style-clear/symbols/newsagent_shop-m.svg
@@ -1,10 +1,8 @@
-<svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <title>newsagent_shop-m</title>
- <g fill="none" fill-rule="evenodd">
-  <g id="newsagent_shop-m" fill-rule="nonzero">
-   <circle id="Oval" cx="12" cy="12" r="12" fill="#fff" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#8C5F93"/>
-   <path id="Shape" d="m16.9 18.6h-9.8c-1.1598 0-2.1-0.9402-2.1-2.1v-10.5h9.8 1.4v3.5h2.8v0.7 6.3c0 1.1598-0.9402 2.1-2.1 2.1zm-1.9805-1.4c-0.077386-0.21895-0.11949-0.45456-0.11949-0.7v-9.1h-8.4v9.1c0 0.3866 0.3134 0.7 0.7 0.7h7.8195zm1.2805-6.3v5.6c0 0.3866 0.3134 0.7 0.7 0.7s0.7-0.3134 0.7-0.7v-5.6h-1.4zm-5.6-2.1v2.8h-2.8v-2.8h2.8zm2.8 0.7v1.4h-2.1v-1.4h2.1zm0 2.8v1.4h-5.6v-1.4h5.6zm0 2.1v1.4h-5.6v-1.4h5.6z" fill="#fff"/>
-  </g>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" viewBox="0 0 24 24" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <g opacity="1">
+  <circle id="Oval" cx="12" cy="12" r="12" fill="#fff" opacity=".6"/>
+  <circle cx="12" cy="12" r="11" fill="#8C5F93"/>
+  <path id="Shape" d="m5 6v10.5c0 1.1598 0.93981 2.0996 2.0996 2.0996h9.8008c1.1598 0 2.0996-0.93981 2.0996-2.0996v-6.3008-0.69922h-2.8008v-3.5h-1.3984-9.8008zm2.0176 1.8223h3.582v3.582h-3.582v-3.582zm4.4785 0.89453h2.6855v1.791h-2.6855v-1.791zm4.7031 2.1836h1.4004v5.5996c0 0.3866-0.31262 0.69922-0.69922 0.69922-0.3866 0-0.70117-0.31262-0.70117-0.69922v-5.5996zm-9.1816 1.4004h7.1641v1.791h-7.1641v-1.791zm0 2.6855h7.1641v1.791h-7.1641v-1.791z" fill="#fff" fill-rule="evenodd"/>
  </g>
 </svg>
diff --git a/data/styles/clear/style-clear/symbols/stationery_shop-m.svg b/data/styles/clear/style-clear/symbols/stationery_shop-m.svg
index 616c1a663f..32cc8c9d88 100644
--- a/data/styles/clear/style-clear/symbols/stationery_shop-m.svg
+++ b/data/styles/clear/style-clear/symbols/stationery_shop-m.svg
@@ -1,10 +1,8 @@
-<svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <title>stationery_shop-m</title>
- <g fill="none" fill-rule="evenodd">
-  <g id="stationery_shop-m" fill-rule="nonzero">
-   <circle id="Oval" cx="12" cy="12" r="12" fill="#fff" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#8C5F93"/>
-   <path id="Shape" d="m18.376 5.6233c-0.83092-0.83103-2.1763-0.83117-3.0074 0-0.1093 0.1093-3.1851 3.1852-3.2537 3.2538l-1.6771-1.6771c-8.24e-5 -8.235e-5 -1.647e-4 -1.9214e-4 -2.47e-4 -2.7449e-4 -8.24e-5 -8.234e-5 -1.922e-4 -1.6469e-4 -2.745e-4 -2.4703e-4l-2.0477-2.0477c-0.16077-0.16077-0.42147-0.16077-0.58226 0l-2.6559 2.6559c-0.16079 0.16077-0.16079 0.42147 0 0.58226l3.7253 3.7253-2.5165 2.5165c-0.042243 0.042243-0.078201 0.098046-0.098897 0.1592l-1.2395 3.6646c-0.10784 0.31868 0.19598 0.63219 0.52196 0.52196l3.6646-1.2395c0.058575-0.019818 0.11548-0.055116 0.15926-0.098897l2.5164-2.5164 3.7252 3.7252c0.16079 0.16079 0.42147 0.16079 0.58226 0l2.6559-2.6559c0.16079-0.16077 0.16079-0.42147 0-0.58226l-3.7253-3.7253c0.068539-0.068539 3.1448-3.1448 3.2537-3.2537 0.84234-0.84234 0.81851-2.1891 0-3.0074zm-2.4755 12.351-3.434-3.434 2.0737-2.0736 1.3861 1.3861-0.64254 0.64251c-0.16079 0.16077-0.16079 0.42144 0 0.58226 0.16074 0.16079 0.42144 0.16082 0.58226 0l0.64254-0.64251 1.4656 1.4656-2.0736 2.0736zm-1.0296-10.689 0.63038 0.63038-7.6372 7.6372-0.63038-0.63038c0.37094-0.37097 7.3892-7.3893 7.6372-7.6372zm1.0801-1.0801c0.50876-0.5087 1.3348-0.50711 1.8421-6.5877e-4 2.47e-4 2.4704e-4 4.391e-4 5.2152e-4 6.862e-4 7.6856e-4 0.50524 0.50508 0.5104 1.3322 0 1.8426l-0.49786 0.49786-0.92043-0.92043c-2.745e-4 -2.7448e-4 -4.941e-4 -5.7642e-4 -7.686e-4 -8.509e-4 -2.744e-4 -2.7448e-4 -5.764e-4 -4.9407e-4 -8.509e-4 -7.6856e-4l-0.92073-0.92073 0.49786-0.49783zm-7.5046 9.9299 7.6372-7.6372 0.63011 0.63011-7.6372 7.6372-0.63011-0.63011zm-0.12975 1.0348-2.2479 0.76035 0.76035-2.2479 1.4876 1.4875zm-2.2917-9.0714 2.0736-2.0736 1.4656 1.4656-0.64251 0.64254c-0.16079 0.16079-0.16079 0.42147 0 0.58226 0.16074 0.16079 0.42144 0.16082 0.58226 0l0.64251-0.64254 1.3863 1.3863-2.0736 2.0736-3.4342-3.4342z" fill="#fff"/>
-  </g>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" viewBox="0 0 24 24" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <g opacity="1">
+  <circle id="Oval" cx="12" cy="12" r="12" fill="#fff" opacity=".6"/>
+  <circle cx="12" cy="12" r="11" fill="#8C5F93"/>
+  <path d="m14.861 4.8613c-1.2646-0.014877-2.3354 0.42329-3.2363 1.3242l-6.166 6.168 0.97656 0.97656 6.1816-6.1797c0.61883-0.61883 1.3737-0.92656 2.2363-0.91406 0.87307 0.012653 1.619 0.33191 2.2559 0.96875 0.62719 0.62719 0.94762 1.3731 0.96875 2.248 0.02086 0.86347-0.27659 1.6086-0.88477 2.2168l-5.9688 5.9688c-0.38041 0.38041-0.84556 0.57228-1.3672 0.56836-0.53199-0.003999-0.98371-0.19464-1.3711-0.58203-0.38739-0.38738-0.57804-0.8391-0.58203-1.3711-0.0039218-0.52163 0.18795-0.98678 0.56836-1.3672l5.457-5.457c0.13861-0.13862 0.29707-0.20571 0.49023-0.20898 0.1813-0.00307 0.34803 0.064829 0.47852 0.19531 0.12844 0.12845 0.19562 0.2973 0.18945 0.48242-0.0065 0.19618-0.07935 0.36255-0.23047 0.51367l-5.668 5.6719 0.97656 0.97656 5.6289-5.627c0.41232-0.41232 0.63359-0.91328 0.66016-1.4922 0.027234-0.59369-0.16242-1.0882-0.57812-1.5039-0.41169-0.41168-0.89023-0.61093-1.4648-0.60547-0.5639 0.00537-1.0564 0.21463-1.4609 0.61914l-5.4434 5.4434c-0.65971 0.65971-0.98633 1.4342-0.98633 2.3535 0 0.91033 0.33247 1.7016 0.98633 2.3555 0.64552 0.64553 1.4332 0.97349 2.3457 0.97852 0.92235 0.0051 1.6972-0.31243 2.3496-0.96484l5.9414-5.9414c0.90093-0.90093 1.3363-1.968 1.3164-3.2285-0.019672-1.2491-0.48027-2.3279-1.373-3.2207-0.8932-0.8932-1.973-1.3505-3.2266-1.3652z" fill="#fff"/>
  </g>
 </svg>
diff --git a/data/styles/clear/style-clear/symbols/sweets-m.svg b/data/styles/clear/style-clear/symbols/sweets-m.svg
index 3160450b22..6ff2752577 100644
--- a/data/styles/clear/style-clear/symbols/sweets-m.svg
+++ b/data/styles/clear/style-clear/symbols/sweets-m.svg
@@ -1,10 +1,8 @@
-<svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <title>sweets-m</title>
- <g fill="none" fill-rule="evenodd">
-  <g id="sweets-m" fill-rule="nonzero">
-   <circle id="Oval" cx="12" cy="12" r="12" fill="#fff" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#8C5F93"/>
-   <path id="Shape" d="m18.991 9.0796c-0.028182-0.13633-0.1231-0.24939-0.25254-0.30071l-1.2598-0.49984-0.23594-1.1965c-0.032484-0.16463-0.16118-0.29332-0.32578-0.32578l-1.1965-0.23594-0.49981-1.2598c-0.051346-0.12944-0.16438-0.22436-0.30071-0.25254-0.13642-0.02821-0.27777 0.014119-0.37624 0.11259-0.57892 0.57892-0.89775 1.3486-0.89775 2.1674 0 0.21492 0.022171 0.4264 0.065051 0.63201-1.6017-0.66727-3.5199-0.35071-4.8209 0.95034-1.3081 1.3081-1.6211 3.2401-0.93942 4.847-0.21517-0.047182-0.43702-0.071531-0.66261-0.071531-0.81872 0-1.5885 0.31886-2.1674 0.89778-0.098473 0.098472-0.14077 0.23988-0.11259 0.37627 0.02821 0.13636 0.12315 0.24939 0.25262 0.30074l1.2656 0.50177 0.23574 1.1893c0.032594 0.1643 0.16101 0.29272 0.32531 0.32531l1.1893 0.23574 0.50179 1.2656c0.051318 0.12944 0.16435 0.22438 0.30071 0.25259 0.027851 0.0057633 0.055896 0.008576 0.083775 0.008576 0.10857 0 0.21412-0.042797 0.29247-0.12117 0.57892-0.57889 0.89778-1.3486 0.89778-2.1674 0-0.2256-0.024349-0.44741-0.071531-0.66261 0.55049 0.23354 1.1391 0.35057 1.7277 0.35057 1.1297 0 2.2593-0.43001 3.1193-1.29 1.301-1.301 1.6176-3.2192 0.95034-4.8209 0.2056 0.04288 0.41708 0.065078 0.63201 0.065078 0.81872 0 1.5885-0.31886 2.1674-0.89778 0.098555-0.098445 0.14086-0.23983 0.11265-0.37621zm-9.7167 8.6653-0.31169-0.78602c-0.051759-0.13057-0.16628-0.22595-0.30405-0.25328l-1.1388-0.22573-0.22573-1.1388c-0.0273-0.13777-0.12268-0.25229-0.25331-0.30408l-0.78602-0.31166c0.31527-0.16452 0.66763-0.25166 1.0334-0.25166 0.59773 0 1.1597 0.23277 1.5824 0.65547 0.42268 0.42271 0.65547 0.98464 0.65547 1.5824 0 0.36579-0.087139 0.71815-0.25166 1.0334zm0.20081-3.2204c-0.77402-0.77402-1.1191-1.8169-1.0356-2.8308l3.8665 3.8665c-1.0139 0.083444-2.0568-0.26161-2.8308-1.0356zm5.0686 0c-0.37503 0.37503-0.81318 0.64924-1.2806 0.82297l-4.6111-4.611c0.17373-0.46735 0.44797-0.90553 0.82297-1.2806 0.375-0.375 0.81318-0.64921 1.2806-0.82294l4.611 4.611c-0.17373 0.46735-0.44794 0.90553-0.82294 1.2805zm1.0356-2.2378-3.8664-3.8664c0.098638-0.0081072 0.19755-0.012437 0.29647-0.012437 0.9178 0 1.8356 0.34936 2.5343 1.048 0.77402 0.77402 1.1191 1.8169 1.0356 2.8308zm1.1317-2.7603c-0.59773 0-1.1597-0.23277-1.5824-0.65547-0.42265-0.42265-0.65544-0.98461-0.65544-1.5824 0-0.36585 0.087194-0.71829 0.25174-1.0336l0.30973 0.78069c0.051842 0.13068 0.1665 0.22609 0.30443 0.25331l1.1456 0.22587 0.22587 1.1456c0.02719 0.13793 0.1226 0.25259 0.25331 0.30443l0.78069 0.30973c-0.31533 0.1646-0.66772 0.25177-1.0336 0.25177z" fill="#fff"/>
-  </g>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" viewBox="0 0 24 24" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <g opacity="1">
+  <circle id="Oval" cx="12" cy="12" r="12" fill="#fff" opacity=".6"/>
+  <circle cx="12" cy="12" r="11" fill="#8C5F93"/>
+  <path d="m15.272 4.8672c-0.10049 0-0.19896 0.038791-0.27148 0.11133-0.53584 0.53581-0.83008 1.248-0.83008 2.0058 0 0.20881 0.02274 0.41409 0.06641 0.61328 0.33276 1.1422 1.0033 1.8734 2.1562 2.1582 0.19916 0.043669 0.40448 0.06641 0.61328 0.06641 0.75779 0 1.47-0.29619 2.0058-0.83203 0.09114-0.091141 0.13155-0.22142 0.10547-0.34766-0.02611-0.12621-0.11454-0.22981-0.23437-0.27734l-1.1719-0.46484-0.21875-1.1015c-0.03017-0.15207-0.14871-0.27062-0.30078-0.30078l-1.0996-0.21875-0.46484-1.1699c-0.0475-0.11981-0.15308-0.20826-0.27929-0.23437-0.02578-0.00537-0.05038-0.00777-0.07617-0.00777zm-3.3398 3.0429c-1.0196 0.019048-2.0344 0.4172-2.8105 1.1933-1.1241 1.1241-1.4537 2.7454-0.99027 4.1621 1.2894 0.43385 2.1113 1.3082 2.5839 2.5957 0.41892 0.13924 0.85582 0.21094 1.2929 0.21094 1.0456 0 2.0926-0.39932 2.8886-1.1953 1.1177-1.1177 1.4481-2.7259 0.9961-4.1367-1.314-0.43339-2.1481-1.3207-2.6231-2.6309-0.36882-0.11913-0.75082-0.18544-1.1348-0.19727-0.06796-0.00213-0.13515-0.00324-0.20313-0.00194zm-4.9414 6.2617c-0.75779 0-1.47 0.29424-2.0058 0.83008-0.09114 0.09114-0.1296 0.22142-0.10352 0.34766 0.02611 0.12621 0.11259 0.23176 0.23242 0.27929l1.1719 0.46484 0.21875 1.0996c0.03016 0.15207 0.14871 0.27062 0.30078 0.30078l1.1015 0.21875 0.46289 1.1719c0.0475 0.11981 0.15308 0.20826 0.27929 0.23437 0.02578 0.0054 0.05232 0.0078 0.07813 0.0078 0.10049 0 0.19701-0.04074 0.26953-0.11328 0.53584-0.53581 0.83203-1.248 0.83203-2.0058 0-0.20881-0.02274-0.41409-0.06641-0.61328-0.33276-1.1422-1.0053-1.8734-2.1582-2.1582-0.19916-0.04367-0.40448-0.06446-0.61328-0.06446z" fill="#fff" />
  </g>
 </svg>
diff --git a/data/styles/clear/style-clear/symbols/taxi-m.svg b/data/styles/clear/style-clear/symbols/taxi-m.svg
index f0eb249706..7a9c041ab0 100644
--- a/data/styles/clear/style-clear/symbols/taxi-m.svg
+++ b/data/styles/clear/style-clear/symbols/taxi-m.svg
@@ -1,10 +1,8 @@
-<svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <title>taxi-m</title>
- <g fill="none" fill-rule="evenodd">
-  <g id="taxi-m" fill-rule="nonzero">
-   <circle id="Oval" cx="12" cy="12" r="12" fill="#fff" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#717065"/>
-   <path id="Shape" d="m17.451 10.194c-0.075428-0.65925-0.75086-1.194-1.5086-1.194h-7.8849c-0.75771 0-1.4331 0.53475-1.5086 1.194l-0.54857 4.806h12l-0.54943-4.806zm-8.022 3.306h-1.7143v-1.5h1.7143v1.5zm1.7143-1.5h-1.7143v-1.5h1.7143v1.5zm1.7143 1.5h-1.7143v-1.5h1.7143v1.5zm1.7143-1.5h-1.7143v-1.5h1.7143v1.5zm1.7143 1.5h-1.7143v-1.5h1.7143v1.5z" fill="#fff"/>
-  </g>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" viewBox="0 0 24 24" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <g opacity="1">
+  <rect id="Rectangle" width="24" height="24" rx="2.5" fill="#fff" opacity=".6"/>
+  <rect x="1" y="1" width="22" height="22" rx="2" fill="#2F6499"/>
+  <path d="m7.2007 9.1768v2.825h3.1972v-2.825zm3.1972 2.825v2.8214h3.2007v-2.8214zm3.2007 0h3.2007v-2.825h-3.2007zm3.2007 0v2.8214h3.2007v-2.8214zm-9.5986 0h-3.2007v2.8214h3.2007z" fill="#fff" />
  </g>
 </svg>
diff --git a/data/styles/clear/style-night/symbols/beauty-m.svg b/data/styles/clear/style-night/symbols/beauty-m.svg
index 4375549219..c6b574a15f 100644
--- a/data/styles/clear/style-night/symbols/beauty-m.svg
+++ b/data/styles/clear/style-night/symbols/beauty-m.svg
@@ -1,10 +1,8 @@
-<svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <title>beauty-m</title>
- <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity=".6">
-  <g id="beauty-m" fill-rule="nonzero">
-   <circle id="Oval" cx="12" cy="12" r="12" fill="#fff"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#8C5F93"/>
-   <path id="Shape" d="m14.6 12.7v-6.9998c0-0.25199-0.1358-0.48439-0.35489-0.60898-0.21909-0.1246-0.48859-0.1218-0.70488 0.0083998l-3.4999 2.0999c-0.21139 0.1267-0.34019 0.35489-0.34019 0.60058v4.8999h-0.69998v4.8999c0 0.77208 0.62788 1.4 1.4 1.4h3.4999c0.77208 0 1.4-0.62788 1.4-1.4v-4.8999h-0.69998zm-4.1999 1.4h3.4999v1.4h-3.4999v-1.4zm0.69998-5.9036 2.0999-1.26v5.7636h-2.0999v-4.5037zm-0.69998 9.4035v-0.69998h3.5006v0.69998h-3.5006z" fill="#fff"/>
-  </g>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" viewBox="0 0 24 24" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <g opacity=".6">
+  <circle id="Oval" cx="12" cy="12" r="12" fill="#fff" opacity="1"/>
+  <circle cx="12" cy="12" r="11" fill="#8C5F93"/>
+  <path d="m13.469 4.3867c-0.092224 0.0013998-0.18374 0.03451-0.26562 0.099609l-2.6504 2.0996c-0.16006 0.1267-0.25781 0.35587-0.25781 0.60156v4.3125h3.7109v-6.4121c0-0.25199-0.10364-0.48479-0.26953-0.60938-0.082946-0.0623-0.17535-0.093197-0.26758-0.091797zm-4.7031 8.1133v4h6.7676v-4h-6.7676zm0 5v0.43945c0 0.91944 0.67451 1.668 1.5039 1.668h3.7598c0.82936 0 1.5039-0.74848 1.5039-1.668v-0.43945h-6.7676z" fill="#fff"/>
  </g>
 </svg>
diff --git a/data/styles/clear/style-night/symbols/beekeeper-m.svg b/data/styles/clear/style-night/symbols/beekeeper-m.svg
index 8407c75828..0dd2611b1a 100644
--- a/data/styles/clear/style-night/symbols/beekeeper-m.svg
+++ b/data/styles/clear/style-night/symbols/beekeeper-m.svg
@@ -3,6 +3,6 @@
  <g opacity=".6">
   <circle cx="12" cy="12" r="12" fill="#fff" opacity="1"/>
   <circle cx="12" cy="12" r="11" fill="#8C5F93"/>
-  <path d="m8.6463 3.6857-0.5827 0.5827 1.4971 1.4971-0.12348 0.13616c-0.40917 0.45341-0.67933 0.97215-0.81164 1.5565-0.13109 0.57898-0.08803 1.1645 0.13283 1.7608l0.06408 0.17288-1.6413 0.70351-0.0034 6.83e-4c-1.0565 0.41147-1.64 1.0503-1.7935 1.8916-0.15505 0.85008 0.1228 1.6486 0.8637 2.3895 0.26641 0.26641 0.61685 0.48656 1.0553 0.65679 0.29919 2.2359 2.0677 3.9872 4.2598 4.2037v1.3409h1.0593v-1.3643c2.0602-0.28802 3.7124-1.9345 4.0549-4.0402 0.42228-0.11839 0.80092-0.34171 1.134-0.67481 0.66561-0.66561 0.93848-1.4688 0.81832-2.4082-0.11979-0.93652-0.58618-1.5645-1.4044-1.909l-0.0013-0.0013-1.7414-0.7736 0.06341-0.17087c0.21998-0.59395 0.2599-1.1793 0.12415-1.7494-0.13827-0.58072-0.40668-1.105-0.8063-1.5712l-0.11681-0.13616 1.4938-1.4938-0.60072-0.60006-1.5465 1.5465-0.13149-0.0841c-0.41898-0.26858-0.99473-0.43053-1.7434-0.47591-0.72998-0.04424-1.3602 0.1169-1.8903 0.4739l-0.13216 0.08877zm3.5322 2.0678c0.64989 0 1.1905 0.21934 1.64 0.6688 0.29735 0.29734 0.52269 0.63324 0.67281 1.0085 0.15938 0.39842 0.16011 0.85644 0.02403 1.3636l-0.0574 0.21492-2.2434-0.9458-2.2247 0.97384-0.07342-0.18823c-0.17879-0.45974-0.19665-0.90892-0.04605-1.3476 0.14343-0.41782 0.36552-0.77735 0.66747-1.0793 0.4454-0.44539 0.9963-0.6688 1.6406-0.6688zm0.47457 3.6357 4.1143 1.8175c0.51452 0.22428 0.805 0.61351 0.83233 1.1467 0.02677 0.52186-0.16493 0.9719-0.56401 1.371-0.38756 0.38756-0.89148 0.46505-1.4678 0.26432-0.53063-0.18482-0.94346-0.40882-1.2014-0.6668-0.59898-0.59898-0.99631-1.2118-1.1767-1.8402-0.16982-0.59143-0.31954-1.1629-0.44854-1.7141zm-0.99987 0.01468-0.07142 0.35776c-0.06068 0.3034-0.22866 0.84648-0.49727 1.6173-0.27562 0.79092-0.65643 1.4347-1.1474 1.9256-0.19221 0.19221-0.57574 0.60791-1.2862 0.76292-0.71613 0.15625-1.3214-0.15933-1.6627-0.5006-0.34782-0.34784-0.59005-0.92342-0.3591-1.5212 0.22762-0.58914 0.75498-0.86266 1.1908-1.0326l4e-3 -2e-3h6.84e-4zm0.4392 2.3709 0.20958 0.45588c0.1932 0.4205 0.42356 0.82045 0.69083 1.2014 0.26402 0.37636 0.6268 0.76576 0.96116 1.0332 0.34232 0.25428 0.67653 0.40726 1.2135 0.6381 0.12035 0.04353 0.23924 0.07681 0.35643 0.10212-0.0017 0.0078-0.0036 0.01554-0.0053 0.02336h-6.7915c0.11867-0.01762 0.23628-0.04341 0.35243-0.07876 0.43249-0.18326 0.85985-0.37385 1.2575-0.6895 0.37243-0.28215 0.67809-0.64926 0.96516-1.0039 0.28097-0.34707 0.49414-0.74798 0.63877-1.2041zm-3.1605 4.5822h6.1354c-0.64052 1.0665-1.7785 1.7664-3.067 1.7748-1.289-0.0082-2.4278-0.70786-3.0684-1.7748z" fill="#fff"/>
+  <path d="m8.7793 3.5527-0.42383 0.42383-0.42578 0.42383 1.7461 1.75c-0.30791 0.35129-0.54092 0.75567-0.69922 1.2168-0.19425 0.56584-0.17202 1.1453 0.058594 1.7383l0.095703 0.24414 2.8613-1.0078 2.9023 0.9707 0.072266-0.27734c0.17553-0.65417 0.17628-1.2439-0.029297-1.7578-0.15692-0.39225-0.3816-0.75007-0.66406-1.0762l1.7969-1.8008-0.42578-0.42383-0.42383-0.42383-1.8809 1.8848c-0.41314-0.21581-0.87309-0.32422-1.3867-0.32422-0.48309 1e-7 -0.92392 0.10036-1.3223 0.29492l-1.8516-1.8555zm3.0527 5.9258s-3.4697 1.1955-4.4687 1.666c-0.99908 0.47052-1.4656 1.0767-1.6582 1.7129-0.24708 0.63952 0.012657 1.2548 0.38477 1.627 0.36513 0.3651 1.0132 0.70427 1.7793 0.53711 0.76007-0.16583 1.4524-0.56602 2.1113-1.2285 0.52525-0.52518 0.94732-1.355 1.2422-2.2012 0.28737-0.82465 0.46828-1.4059 0.5332-1.7305l0.076172-0.38281zm0.33594 0 0.076172 0.38281c0.06492 0.32459 0.24584 0.90582 0.5332 1.7305 0.29486 0.84615 0.71694 1.676 1.2422 2.2012 0.65896 0.6625 1.3513 1.0627 2.1113 1.2285 0.76614 0.16716 1.4142-0.17201 1.7793-0.53711 0.37211-0.37213 0.63184-0.98743 0.38477-1.627-0.19263-0.63623-0.65912-1.2424-1.6582-1.7129-0.99908-0.47052-4.4688-1.666-4.4688-1.666zm-0.16797 2.6465c-0.20461 0.67674-0.39347 1.1835-0.82031 1.7852-0.28707 0.37547-0.59242 0.76378-0.96484 1.0625-0.14229 0.11958-0.28868 0.22136-0.4375 0.3125h4.5195c-0.16494-0.092973-0.3145-0.19036-0.46484-0.30859-0.33436-0.28315-0.69887-0.69528-0.96289-1.0938-0.29132-0.5025-0.62864-1.1279-0.86914-1.7578zm-3.9512 4.1602c0.19439 0.39663 0.41526 0.75984 0.65625 1.0898h6.5898c0.24102-0.32994 0.46192-0.69335 0.65625-1.0898h-7.9023zm1.5762 2.0898c0.53884 0.45196 1.1388 0.75512 1.7754 0.87695v1.7559h0.59961 0.59961v-1.7559c0.63593-0.12187 1.2345-0.425 1.7734-0.87695h-4.748z" fill="#fff"/>
  </g>
 </svg>
diff --git a/data/styles/clear/style-night/symbols/bus-m.svg b/data/styles/clear/style-night/symbols/bus-m.svg
index 3f687238b1..d8734c2e08 100644
--- a/data/styles/clear/style-night/symbols/bus-m.svg
+++ b/data/styles/clear/style-night/symbols/bus-m.svg
@@ -1,19 +1,8 @@
-<svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <title>bus-m</title>
- <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity=".6">
-  <g id="bus-m">
-   <rect id="Rectangle" width="24" height="24" rx="2.5" fill="#fff" fill-rule="nonzero"/>
-   <rect id="Rectangle" x="1" y="1" width="22" height="22" rx="2" fill="#2F6499" fill-rule="nonzero"/>
-   <g id="bus" transform="translate(4 4)">
-    <polygon id="Path" points="0 0 16 0 16 16 0 16"/>
-    <circle id="Oval" cx="4" cy="11.333" r="1.3333" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"/>
-    <circle id="Oval" cx="12" cy="11.333" r="1.3333" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"/>
-    <path id="Shape" d="m2.6667 11.333h-1.3333v-7.3333c0-0.36819 0.29848-0.66667 0.66667-0.66667h9.3333c1.8409 0 3.3333 2.0893 3.3333 4.6667v3.3333h-1.3333m-2.6667 0h-5.3333" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"/>
-    <polyline id="Path" points="10.667 3.3333 11.667 8 14.667 8" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"/>
-    <line id="Path" x1="1.3333" x2="11.333" y1="6.6667" y2="6.6667" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"/>
-    <line id="Path" x1="4.6667" x2="4.6667" y1="3.3333" y2="6.6667" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"/>
-    <line id="Path" x1="8" x2="8" y1="3.3333" y2="6.6667" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"/>
-   </g>
-  </g>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" viewBox="0 0 24 24" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <g opacity=".6">
+  <rect id="Rectangle" width="24" height="24" rx="2.5" fill="#fff" opacity="1"/>
+  <rect x="1" y="1" width="22" height="22" rx="2" fill="#2F6499"/>
+  <path d="m5.999 6.584c-0.77352 0-1.416 0.64249-1.416 1.416v7.332c4.1e-5 0.4142 0.3358 0.74996 0.75 0.75h0.72461c0.3044 0.77641 1.0636 1.334 1.9414 1.334 0.87716 0 1.6366-0.5565 1.9414-1.332h4.1172c0.30484 0.77554 1.0642 1.332 1.9414 1.332s1.6366-0.5565 1.9414-1.332h0.72461c0.4142-4.1e-5 0.74996-0.3358 0.75-0.75v-3.3184c7.06e-4 -0.0052 0.0014-0.01041 2e-3 -0.01563-7.5e-5 -0.02479-0.0014-0.04956-0.0039-0.07422-0.01389-1.4044-0.41753-2.688-1.1133-3.6621-0.70808-0.99132-1.7626-1.6797-2.9668-1.6797zm0.08398 1.357h1.8633v2.8715h-1.8633zm3.2539 0h1.9121v2.8715h-1.9121zm3.2953 0h1.4274l0.58594 2.8715h-2.0133zm2.686 0c2.2166 0.34738 2.7966 2.607 2.8669 4.01l-1.9126-0.02337zm-7.3192 6.5121c0.49963 0 0.88086 0.37927 0.88086 0.87891s-0.38122 0.88086-0.88086 0.88086c-0.49963 0-0.88086-0.38123-0.88086-0.88086s0.38123-0.87891 0.88086-0.87891zm8 0c0.49964 0 0.88086 0.37927 0.88086 0.87891 0 0.49963-0.38122 0.88086-0.88086 0.88086-0.49963 0-0.88086-0.38123-0.88086-0.88086s0.38122-0.87891 0.88086-0.87891z" fill="#fff"/>
  </g>
 </svg>
diff --git a/data/styles/clear/style-night/symbols/bus-s.svg b/data/styles/clear/style-night/symbols/bus-s.svg
index da4590025e..e54be760ed 100644
--- a/data/styles/clear/style-night/symbols/bus-s.svg
+++ b/data/styles/clear/style-night/symbols/bus-s.svg
@@ -1,19 +1,8 @@
-<svg version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
- <title>bus-s</title>
- <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity=".6">
-  <g id="bus-s">
-   <rect id="Rectangle" width="16" height="16" rx="2.5" fill="#fff" fill-rule="nonzero"/>
-   <rect id="Rectangle" x=".66667" y=".66667" width="14.667" height="14.667" rx="2" fill="#2F6499" fill-rule="nonzero"/>
-   <g id="bus" transform="translate(2.6667 2.6667)">
-    <polygon id="Path" points="0 0 10.667 0 10.667 10.667 0 10.667"/>
-    <circle id="Oval" cx="2.6667" cy="7.5556" r="1" stroke="#fff" stroke-linecap="round" stroke-linejoin="round"/>
-    <circle id="Oval" cx="8" cy="7.5556" r="1" stroke="#fff" stroke-linecap="round" stroke-linejoin="round"/>
-    <path id="Shape" d="m1.7778 7.5556h-0.88889v-4.8889c0-0.24546 0.19898-0.44444 0.44444-0.44444h6.2222c1.2273 0 2.2222 1.3929 2.2222 3.1111v2.2222h-0.88889m-1.7778 0h-3.5556" stroke="#fff" stroke-linecap="round" stroke-linejoin="round"/>
-    <polyline id="Path" points="7.1111 2.2222 7.7778 5.3333 9.7778 5.3333" stroke="#fff" stroke-linecap="round" stroke-linejoin="round"/>
-    <line id="Path" x1=".88889" x2="7.5556" y1="4.4444" y2="4.4444" stroke="#fff" stroke-linecap="round" stroke-linejoin="round"/>
-    <line id="Path" x1="3.1111" x2="3.1111" y1="2.2222" y2="4.4444" stroke="#fff" stroke-linecap="round" stroke-linejoin="round"/>
-    <line id="Path" x1="5.3333" x2="5.3333" y1="2.2222" y2="4.4444" stroke="#fff" stroke-linecap="round" stroke-linejoin="round"/>
-   </g>
-  </g>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" viewBox="0 0 16 16" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <g opacity=".6">
+  <rect id="Rectangle" width="16" height="16" rx="2.5" fill="#fff" opacity="1" />
+  <rect x=".66667" y=".66667" width="14.667" height="14.667" rx="2" fill="#2F6499" />
+  <path d="m3.9997 4.3897c-0.51566 0-0.94397 0.42831-0.94397 0.94397v4.8878c2.7e-5 0.27612 0.22386 0.49996 0.49998 0.49998h0.48306c0.20293 0.51759 0.70904 0.8893 1.2942 0.8893 0.58475 0 1.091-0.37099 1.2942-0.88797h2.7447c0.20322 0.51701 0.70944 0.88797 1.2942 0.88797s1.091-0.37099 1.2942-0.88797h0.48306c0.27612-2.8e-5 0.49996-0.22386 0.49998-0.49998v-2.2122c4.7e-4 -0.00347 9.33e-4 -0.00694 0.0013-0.01042-5e-5 -0.016526-9.33e-4 -0.033039-0.0026-0.049478-0.009226-0.93623-0.27831-1.7919-0.74214-2.4413-0.47204-0.66086-1.175-1.1198-1.9778-1.1198zm0.05598 0.90464h1.2422v1.9143h-1.2422zm2.1692 0h1.2747v1.9143h-1.2747zm2.1968 0h0.95157l0.39061 1.9143h-1.3422zm1.7906 0c1.4777 0.23158 1.8643 1.7379 1.9112 2.6732l-1.275-0.015579zm-4.8793 4.3412c0.33308 0 0.58722 0.25284 0.58722 0.58592 0 0.33308-0.25414 0.58722-0.58722 0.58722-0.33308 0-0.58722-0.25414-0.58722-0.58722s0.25414-0.58592 0.58722-0.58592zm5.3331 0c0.33308 0 0.58722 0.25284 0.58722 0.58592 0 0.33308-0.25414 0.58722-0.58722 0.58722-0.33308 0-0.58722-0.25414-0.58722-0.58722s0.25414-0.58592 0.58722-0.58592z" fill="#fff" />
  </g>
 </svg>
diff --git a/data/styles/clear/style-night/symbols/campsite-m.svg b/data/styles/clear/style-night/symbols/campsite-m.svg
index b8b92790a5..88b4b8160e 100644
--- a/data/styles/clear/style-night/symbols/campsite-m.svg
+++ b/data/styles/clear/style-night/symbols/campsite-m.svg
@@ -1,10 +1,8 @@
-<svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <title>campsite-m</title>
- <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity=".6">
-  <g id="campsite-m" fill-rule="nonzero">
-   <circle id="Oval" cx="12" cy="12" r="12" fill="#fff"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#717065"/>
-   <path id="Shape" d="m17.589 17.065-5.0294-8.2295 1.3413-2.1938-1.0493-0.64112-1.0118 1.656-1.0118-1.6566-1.0499 0.64174 1.3413 2.1938-5.0294 8.2295c-0.11556 0.18994-0.12048 0.42721-0.011679 0.62145 0.1088 0.19363 0.31411 0.31349 0.53663 0.31349h10.45c0.22252 0 0.42721-0.11986 0.53601-0.31411 0.1088-0.19363 0.1045-0.43151-0.011679-0.62084zm-6.6712-0.29444v-0.92204c0-0.50835 0.41369-0.92204 0.92204-0.92204 0.50835 0 0.92204 0.41369 0.92204 0.92204v0.92204h-1.8441zm3.0735 0v-0.92204c0-1.187-0.96506-2.1514-2.1514-2.1514s-2.1514 0.96445-2.1514 2.1514v0.92204h-1.9775l4.1289-6.7561 4.1283 6.7561h-1.9768z" fill="#fff"/>
-  </g>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" viewBox="0 0 24 24" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <g opacity=".6">
+  <circle id="Oval" cx="12" cy="12" r="12" fill="#fff" opacity="1"/>
+  <circle cx="12" cy="12" r="11" fill="#664e42"/>
+  <path id="Shape" d="m10.828 5.7196-1.0508 0.64258 1.3418 2.1934-4.8496 7.9355h-1.1523a0.615 0.615 0 0 0-0.61523 0.61328 0.615 0.615 0 0 0 0.61523 0.61523h13.461a0.615 0.615 0 0 0 0.61523-0.61523 0.615 0.615 0 0 0-0.61523-0.61328h-1.168l-4.8496-7.9355 1.3398-2.1934-1.0488-0.64062-1.0117 1.6543zm1.0117 7.6973c1.1863 0 2.1523 0.96339 2.1523 2.1504v0.92383h-4.3027v-0.92383c0-1.1869 0.96405-2.1504 2.1504-2.1504z" fill="#fff"/>
  </g>
 </svg>
diff --git a/data/styles/clear/style-night/symbols/caravan-shop-m.svg b/data/styles/clear/style-night/symbols/caravan-shop-m.svg
index f72dedd351..537311909c 100644
--- a/data/styles/clear/style-night/symbols/caravan-shop-m.svg
+++ b/data/styles/clear/style-night/symbols/caravan-shop-m.svg
@@ -1,13 +1,8 @@
-<svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <title>caravan_shop-m</title>
- <g fill="none" fill-rule="evenodd" opacity=".6">
-  <g id="caravan_shop-m" fill-rule="nonzero">
-   <circle id="Oval" cx="12" cy="12" r="12" fill="#fff"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#8C5F93"/>
-   <g id="caravan" transform="translate(5 7)" fill="#fff">
-    <path id="Shape" d="m4.5517 1.6361h-1.6322c-0.2603 0-0.47138 0.21108-0.47138 0.47138v1.6322c0 0.2603 0.21108 0.47138 0.47138 0.47138h1.6322c0.2603 0 0.47138-0.21108 0.47138-0.47138v-1.6322c0-0.2603-0.21104-0.47138-0.47138-0.47138zm-0.47138 1.6322h-0.68939v-0.68939h0.68939v0.68939z"/>
-    <path id="Shape" d="m13.529 9.1075c0.2603 0 0.47138-0.21108 0.47138-0.47138 0-0.2603-0.21108-0.47138-0.47138-0.47138h-1.436c0.1746-0.29075 0.27524-0.63071 0.27524-0.99381v-2.6928c0-2.4671-2.0071-4.4742-4.4742-4.4742h-5.9571c-1.0678 0-1.9366 0.8688-1.9366 1.9366v5.2303c0 1.0631 0.86102 1.9285 1.9223 1.9362 0.2043 0.69948 0.85098 1.2122 1.6156 1.2122 0.76444 0 1.4111-0.51248 1.6155-1.2118h8.3753zm-9.9908 0.26902c-0.40822 0-0.74035-0.33213-0.74035-0.7404 0-0.40822 0.33213-0.74035 0.74035-0.74035 0.40826 0 0.7404 0.33213 0.7404 0.74035 0 0.40826-0.33213 0.7404-0.7404 0.7404zm3.1174-1.2118v-3.6708c0-0.60596 0.49297-1.0989 1.0989-1.0989h0.12364c0.60596 0 1.0989 0.49297 1.0989 1.0989v3.6708h-2.3215zm3.2643 0v-3.6708c0-1.1258-0.91594-2.0417-2.0417-2.0417h-0.12364c-1.1258 0-2.0417 0.91594-2.0417 2.0417v3.6708h-0.5592c-0.20439-0.69929-0.85103-1.2117-1.6155-1.2117-0.7642 0-1.4106 0.51211-1.6152 1.211-0.54152-0.0075892-0.97986-0.44984-0.97986-0.9931v-5.2303c0-0.54803 0.44583-0.99386 0.99381-0.99386h5.9571c1.9473 0 3.5314 1.5842 3.5314 3.5314v2.6928c0 0.54798-0.44583 0.99381-0.99386 0.99381h-0.51164z"/>
-   </g>
-  </g>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" viewBox="0 0 24 24" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <g opacity=".6">
+  <circle id="Oval" cx="12" cy="12" r="12" fill="#fff" opacity="1"/>
+  <circle cx="12" cy="12" r="11" fill="#8C5F93"/>
+  <path d="m7.1465 6.377c-1.1838 0-2.1465 0.98593-2.1465 2.1993v5.9435c0 0.95125 0.59187 1.7639 1.418 2.0703a2.5496 2.6133 0 0 1-0.04492-0.41212 2.5496 2.6133 0 0 1 2.5508-2.6134 2.5496 2.6133 0 0 1 2.5489 2.6134 2.5496 2.6133 0 0 1-0.06055 0.54298h8.586c0.28857 0 0.52344-0.24134 0.52344-0.53712s-0.23488-0.53516-0.52344-0.53516h-1.5918c0.19356-0.33038 0.30469-0.71635 0.30469-1.1289v-3.0606c0-2.8034-2.224-5.0821-4.959-5.0821h-6.6055zm0.46875 1.8535h1.8086c0.28861 0 0.52345 0.2394 0.52345 0.53517v1.8555c0 0.29578-0.23488 0.53516-0.52345 0.53516h-1.8086c-0.28857 0-0.52345-0.2394-0.52345-0.53516v-1.8555c0-0.29578 0.23488-0.53517 0.52345-0.53517zm6.6544 0.92775h0.13867c1.2481 0 2.2618 1.0411 2.2618 2.3203v4.17h-1.0449v-4.17c0-0.68852-0.54504-1.25-1.2168-1.25h-0.13867c-0.67173 0-1.2168 0.56148-1.2168 1.25v4.17h-1.0469v-4.17c0-1.2792 1.0156-2.3203 2.2637-2.3203zm-5.3458 5.463a1.5187 1.5566 0 0 0-1.5196 1.5567 1.5187 1.5566 0 0 0 1.5196 1.5567 1.5187 1.5566 0 0 0 1.5176-1.5567 1.5187 1.5566 0 0 0-1.5176-1.5567z" fill="#fff"/>
  </g>
 </svg>
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 844a37c2e8..97ed4d399c 100644
--- a/data/styles/clear/style-night/symbols/caravan_site-m.svg
+++ b/data/styles/clear/style-night/symbols/caravan_site-m.svg
@@ -1,13 +1,8 @@
-<svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <title>caravan_site-m</title>
- <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity=".6">
-  <g id="caravan_site-m" fill-rule="nonzero">
-   <circle id="Oval" cx="12" cy="12" r="12" fill="#fff"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#664E42"/>
-   <g id="caravan" transform="translate(5 7)" fill="#fff">
-    <path id="Shape" d="m4.5517 1.6361h-1.6322c-0.2603 0-0.47138 0.21108-0.47138 0.47138v1.6322c0 0.2603 0.21108 0.47138 0.47138 0.47138h1.6322c0.2603 0 0.47138-0.21108 0.47138-0.47138v-1.6322c0-0.2603-0.21104-0.47138-0.47138-0.47138zm-0.47138 1.6322h-0.68939v-0.68939h0.68939v0.68939z"/>
-    <path id="Shape" d="m13.529 9.1075c0.2603 0 0.47138-0.21108 0.47138-0.47138 0-0.2603-0.21108-0.47138-0.47138-0.47138h-1.436c0.1746-0.29075 0.27524-0.63071 0.27524-0.99381v-2.6928c0-2.4671-2.0071-4.4742-4.4742-4.4742h-5.9571c-1.0678 0-1.9366 0.8688-1.9366 1.9366v5.2303c0 1.0631 0.86102 1.9285 1.9223 1.9362 0.2043 0.69948 0.85098 1.2122 1.6156 1.2122 0.76444 0 1.4111-0.51248 1.6155-1.2118h8.3753zm-9.9908 0.26902c-0.40822 0-0.74035-0.33213-0.74035-0.7404 0-0.40822 0.33213-0.74035 0.74035-0.74035 0.40826 0 0.7404 0.33213 0.7404 0.74035 0 0.40826-0.33213 0.7404-0.7404 0.7404zm3.1174-1.2118v-3.6708c0-0.60596 0.49297-1.0989 1.0989-1.0989h0.12364c0.60596 0 1.0989 0.49297 1.0989 1.0989v3.6708h-2.3215zm3.2643 0v-3.6708c0-1.1258-0.91594-2.0417-2.0417-2.0417h-0.12364c-1.1258 0-2.0417 0.91594-2.0417 2.0417v3.6708h-0.5592c-0.20439-0.69929-0.85103-1.2117-1.6155-1.2117-0.7642 0-1.4106 0.51211-1.6152 1.211-0.54152-0.0075892-0.97986-0.44984-0.97986-0.9931v-5.2303c0-0.54803 0.44583-0.99386 0.99381-0.99386h5.9571c1.9473 0 3.5314 1.5842 3.5314 3.5314v2.6928c0 0.54798-0.44583 0.99381-0.99386 0.99381h-0.51164z"/>
-   </g>
-  </g>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" viewBox="0 0 24 24" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <g opacity=".6">
+  <circle id="Oval" cx="12" cy="12" r="12" fill="#fff" opacity="1"/>
+  <circle cx="12" cy="12" r="11" fill="#664e42"/>
+  <path d="m7.1465 6.377c-1.1838 0-2.1465 0.98593-2.1465 2.1993v5.9435c0 0.95125 0.59187 1.7639 1.418 2.0703a2.5496 2.6133 0 0 1-0.04492-0.41212 2.5496 2.6133 0 0 1 2.5508-2.6134 2.5496 2.6133 0 0 1 2.5489 2.6134 2.5496 2.6133 0 0 1-0.06055 0.54298h8.586c0.28857 0 0.52344-0.24134 0.52344-0.53712s-0.23488-0.53516-0.52344-0.53516h-1.5918c0.19356-0.33038 0.30469-0.71635 0.30469-1.1289v-3.0606c0-2.8034-2.224-5.0821-4.959-5.0821h-6.6055zm0.46875 1.8535h1.8086c0.28861 0 0.52345 0.2394 0.52345 0.53517v1.8555c0 0.29578-0.23488 0.53516-0.52345 0.53516h-1.8086c-0.28857 0-0.52345-0.2394-0.52345-0.53516v-1.8555c0-0.29578 0.23488-0.53517 0.52345-0.53517zm6.6544 0.92775h0.13867c1.2481 0 2.2618 1.0411 2.2618 2.3203v4.17h-1.0449v-4.17c0-0.68852-0.54504-1.25-1.2168-1.25h-0.13867c-0.67173 0-1.2168 0.56148-1.2168 1.25v4.17h-1.0469v-4.17c0-1.2792 1.0156-2.3203 2.2637-2.3203zm-5.3458 5.463a1.5187 1.5566 0 0 0-1.5196 1.5567 1.5187 1.5566 0 0 0 1.5196 1.5567 1.5187 1.5566 0 0 0 1.5176-1.5567 1.5187 1.5566 0 0 0-1.5176-1.5567z" fill="#fff"/>
  </g>
 </svg>
diff --git a/data/styles/clear/style-night/symbols/dentist-m.svg b/data/styles/clear/style-night/symbols/dentist-m.svg
index 4625ac4e81..c0de14333e 100644
--- a/data/styles/clear/style-night/symbols/dentist-m.svg
+++ b/data/styles/clear/style-night/symbols/dentist-m.svg
@@ -1,10 +1,8 @@
-<svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <title>dentist-m</title>
- <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity=".6">
-  <g id="dentist-m" fill-rule="nonzero">
-   <circle id="Oval" cx="12" cy="12" r="12" fill="#fff"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#717065"/>
-   <path id="Shape" d="m8.5 6.4c1.4 0 2.1 0.7 3.5 0.7s2.1-0.7 3.5-0.7c1.1667 0 2.1 1.4 2.1 2.8 0 1.2266-0.60221 2.8772-1.2688 3.5438-0.59857 0.59857-1.4885 4.8125-1.8812 4.8125-0.14917 0-0.34048-0.74046-0.35-1.6407-0.01512-1.429-0.40131-3.2156-2.1-3.2156-1.6987 0-2.0849 1.7865-2.1 3.2156-0.00951 0.9002-0.20082 1.6407-0.35 1.6407-0.39276 0-1.2827-4.214-1.8812-4.8125-0.66653-0.66654-1.2688-2.3171-1.2688-3.5438 0-1.4 0.93333-2.8 2.1-2.8z" fill="#fff"/>
-  </g>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" viewBox="0 0 24 24" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <g opacity=".6">
+  <circle id="Oval" cx="12" cy="12" r="12" fill="#fff" opacity="1"/>
+  <circle cx="12" cy="12" r="11" fill="#c15746"/>
+  <path id="Shape" d="m8.5 6.4c1.4 0 2.1 0.7 3.5 0.7s2.1-0.7 3.5-0.7c1.1667 0 2.1 1.4 2.1 2.8 0 1.2266-0.60221 2.8772-1.2688 3.5438-0.59857 0.59857-1.4885 4.8125-1.8812 4.8125-0.14917 0-0.34048-0.74046-0.35-1.6407-0.01512-1.429-0.40131-3.2156-2.1-3.2156-1.6987 0-2.0849 1.7865-2.1 3.2156-0.00951 0.9002-0.20082 1.6407-0.35 1.6407-0.39276 0-1.2827-4.214-1.8812-4.8125-0.66653-0.66654-1.2688-2.3171-1.2688-3.5438 0-1.4 0.93333-2.8 2.1-2.8z" fill="#fff"/>
  </g>
 </svg>
diff --git a/data/styles/clear/style-night/symbols/funicular-m.svg b/data/styles/clear/style-night/symbols/funicular-m.svg
index 56c9697a24..7d1bab1213 100644
--- a/data/styles/clear/style-night/symbols/funicular-m.svg
+++ b/data/styles/clear/style-night/symbols/funicular-m.svg
@@ -1,10 +1,8 @@
-<svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <title>funicular-m</title>
- <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity=".6">
-  <g id="funicular-m" fill-rule="nonzero">
-   <rect id="Rectangle" width="24" height="24" rx="2.5" fill="#fff"/>
-   <rect id="Rectangle" x="1" y="1" width="22" height="22" rx="2" fill="#2F6499"/>
-   <path id="Shape" d="m19 17.784-1.7467-0.81946c0.41272-0.34855 0.65292-0.85936 0.65292-1.4098v-2.5005c0-1.011-0.28643-1.9968-0.82834-2.8506-0.54183-0.85364-1.3118-1.5323-2.2269-1.9628l-6.5814-3.0956c-0.46903-0.22157-1.0107-0.18807-1.4488 0.089465-0.43818 0.27754-0.69974 0.75298-0.69974 1.2717v4.723c0 0.18243 0.018799 0.36248 0.054175 0.53773l-1.1753-0.5514v1.21l2.4123 1.1317c0.090149 0.056482 0.1838 0.10835 0.28138 0.15432l4.2327 1.9635 7.0736 3.3187v-1.21zm-3.7461-1.7708v-2.2776l1.5586 0.72384v1.0954c0 0.26361-0.12766 0.49569-0.35026 0.63694-0.22242 0.14116-0.48698 0.15782-0.72538 0.045544l-0.48296-0.22405zm1.5586-2.9589v0.19927l-1.5586-0.72401v-2.7507c0.96899 0.7922 1.5586 1.994 1.5586 3.2754zm-7.0547-3.0775v-2.9228l1.668 0.78459v2.913l-1.668-0.77477zm2.7617-1.6238 1.6406 0.77169v2.8968l-1.6406-0.76195v-2.9066zm-5.1134-2.1943c0.057507-0.036572 0.21132-0.11185 0.397-0.024011l0.8609 0.40477v2.9293l-1.4492-0.67308v-2.2893c0-0.20448 0.13381-0.31129 0.19132-0.34769zm-0.19132 5.0707v-1.2279l6.9453 3.226v2.2782l-1.4234-0.66027-4.8021-2.253c-0.44391-0.30463-0.71982-0.81544-0.71982-1.3631z" fill="#fff"/>
-  </g>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" viewBox="0 0 24 24" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <g opacity=".6">
+  <rect id="Rectangle" width="24" height="24" rx="2.5" fill="#fff" opacity="1"/>
+  <rect x="1" y="1" width="22" height="22" rx="2" fill="#2F6499"/>
+  <path id="Shape" d="m7.5332 5.002c-0.24881 0.015371-0.49384 0.093654-0.71289 0.23242-0.43818 0.27754-0.69922 0.75276-0.69922 1.2715v4.7227c0 0.18243 0.019312 0.36381 0.054687 0.53906l-2.4023-1.1348v1.2109l3.6387 1.7129c0.090149 0.05648 0.18367 0.10833 0.28125 0.1543l4.2324 1.9648 8.0293 3.7734v-1.209l-2.7012-1.2754c0.41272-0.34855 0.65234-0.85972 0.65234-1.4102v-2.5c0-1.011-0.28622-1.9978-0.82812-2.8516-0.54183-0.85364-1.3115-1.5324-2.2266-1.9629l-6.582-3.0957c-0.23451-0.11078-0.48752-0.15795-0.73633-0.14258zm0.13672 1.0938c0.04143 0.0047236 0.086392 0.017103 0.13281 0.039062l0.86133 0.4043v2.9297l-1.4492-0.67383v-2.2891c0-0.20448 0.1339-0.31126 0.19141-0.34766 0.04313-0.027429 0.13938-0.076671 0.26367-0.0625zm2.0879 0.95898 1.668 0.7832v2.9141l-1.668-0.77539v-2.9219zm2.7617 1.2988 1.6406 0.77148v2.8965l-1.6406-0.76172v-2.9063zm2.7344 1.4258c0.96899 0.7922 1.5586 1.994 1.5586 3.2754v0.19922l-1.5586-0.72461v-2.75z" fill="#fff"/>
  </g>
 </svg>
diff --git a/data/styles/clear/style-night/symbols/gift-m.svg b/data/styles/clear/style-night/symbols/gift-m.svg
index 9239b91504..9a418e2e35 100644
--- a/data/styles/clear/style-night/symbols/gift-m.svg
+++ b/data/styles/clear/style-night/symbols/gift-m.svg
@@ -1,10 +1,8 @@
-<svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <title>gift-m</title>
- <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity=".6">
-  <g id="gift-m" fill-rule="nonzero">
-   <circle id="Oval" cx="12" cy="12" r="12" fill="#fff"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#8C5F93"/>
-   <path id="Shape" d="m17.6 7.8h-1.526c0.077-0.217 0.126-0.455 0.126-0.7 0-1.162-0.938-2.1-2.1-2.1-0.735 0-1.372 0.378-1.75 0.945l-0.35 0.469-0.35-0.476c-0.378-0.56-1.015-0.938-1.75-0.938-1.162 0-2.1 0.938-2.1 2.1 0 0.245 0.049 0.483 0.126 0.7h-1.526c-0.777 0-1.393 0.623-1.393 1.4l-7e-3 7.7c0 0.777 0.623 1.4 1.4 1.4h11.2c0.777 0 1.4-0.623 1.4-1.4v-7.7c0-0.777-0.623-1.4-1.4-1.4zm-3.5-1.4c0.385 0 0.7 0.315 0.7 0.7s-0.315 0.7-0.7 0.7-0.7-0.315-0.7-0.7 0.315-0.7 0.7-0.7zm-4.2 0c0.385 0 0.7 0.315 0.7 0.7s-0.315 0.7-0.7 0.7-0.7-0.315-0.7-0.7 0.315-0.7 0.7-0.7zm7.7 10.5h-11.2v-1.4h11.2v1.4zm0-3.5h-11.2v-3.5c0-0.385 0.315-0.7 0.7-0.7h2.856l-1.036 1.414c-0.231 0.315-0.161 0.756 0.154 0.98 0.308 0.224 0.749 0.154 0.973-0.154l1.953-2.66 1.953 2.66c0.224 0.308 0.665 0.378 0.973 0.154 0.315-0.224 0.385-0.665 0.154-0.98l-1.036-1.414h2.856c0.385 0 0.7 0.315 0.7 0.7v3.5z" fill="#fff"/>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" viewBox="0 0 24 24" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <g opacity=".6">
+   <circle id="Oval" cx="12" cy="12" r="12" fill="#fff" opacity="1"/>
+   <circle cx="12" cy="12" r="11" fill="#8C5F93"/>
+   <path d="m9.7871 4.1406c-1.1544 0-2.1055 0.95104-2.1055 2.1055 0 0.58751 0.29031 1.1106 0.66406 1.4375 0.049239 0.043069 0.09915 0.082878 0.15039 0.12109h-2.2539c-0.33366 0-0.64672 0.083462-0.91211 0.26367-0.26539 0.18021-0.50391 0.50102-0.50391 0.89453v1.1582h1.416 4.8086v-2.3164h1.8984v2.3164h4.8086 1.416v-1.1582c0-0.39352-0.23852-0.71432-0.50391-0.89453-0.26539-0.18021-0.57844-0.26367-0.91211-0.26367h-2.2539c0.051265-0.038231 0.10308-0.078004 0.15234-0.12109 0.37376-0.32692 0.66406-0.84999 0.66406-1.4375 0-1.1544-0.95104-2.1055-2.1055-2.1055-0.64295 2e-7 -1.1512 0.38355-1.4473 0.75977-0.29604 0.37621-0.46366 0.77348-0.58984 1.041-0.08357 0.17717-0.10962 0.26925-0.17773 0.41992-0.068027-0.15046-0.09235-0.24304-0.17578-0.41992-0.12619-0.26753-0.2938-0.6648-0.58984-1.041-0.29604-0.37621-0.80432-0.75977-1.4473-0.75977zm0 1.4297c0.12507 1e-7 0.18254 0.032841 0.32422 0.21289 0.14168 0.18005 0.28376 0.47892 0.41992 0.76758 0.14464 0.30664 0.18756 0.43516 0.27344 0.64062-0.24266-0.070788-0.45327-0.13034-0.80859-0.23828-0.31057-0.094349-0.57114-0.22513-0.70898-0.3457-0.13784-0.12057-0.17578-0.18082-0.17578-0.36133 0-0.38161 0.29418-0.67578 0.67578-0.67578zm4.3828 0c0.013818-0.0012497 0.029288 0 0.044922 0 0.3816 0 0.67578 0.29418 0.67578 0.67578 0 0.18051-0.03794 0.24076-0.17578 0.36133s-0.39842 0.25135-0.70898 0.3457c-0.35532 0.10794-0.56594 0.16749-0.80859 0.23828 0.08588-0.20546 0.1288-0.33398 0.27344-0.64062 0.13616-0.28866 0.27824-0.58753 0.41992-0.76758 0.12397-0.15754 0.18257-0.20414 0.2793-0.21289zm-8.5156 5.8203v1.416 2.0527 2.0547c0 0.77327 0.64275 1.416 1.416 1.416h3.9805v-6.9395h-3.9805-1.416zm7.2949 0v6.9395h3.9805c0.77327 0 1.416-0.64274 1.416-1.416v-2.0547-2.0527-1.416h-1.416-3.9805z" fill="#fff" fill-rule="evenodd" />
   </g>
- </g>
 </svg>
diff --git a/data/styles/clear/style-night/symbols/hairdresser-m.svg b/data/styles/clear/style-night/symbols/hairdresser-m.svg
index 90c7b9a462..3dd5c4aa72 100644
--- a/data/styles/clear/style-night/symbols/hairdresser-m.svg
+++ b/data/styles/clear/style-night/symbols/hairdresser-m.svg
@@ -1,10 +1,8 @@
-<svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <title>hairdresser-m</title>
- <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity=".6">
-  <g id="hairdresser-m" fill-rule="nonzero">
-   <circle id="Oval" cx="12" cy="12" r="12" fill="#fff"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#717065"/>
-   <path id="Shape" d="m10.349 8.9525c0.20298-0.43395 0.29397-0.9309 0.23797-1.4628-0.13299-1.2109-1.0779-2.2398-2.2818-2.4427-1.9388-0.33596-3.5976 1.3229-3.2616 3.2546 0.20998 1.2039 1.2319 2.1488 2.4427 2.2818 0.53194 0.055994 1.0219-0.034996 1.4628-0.23797l1.6518 1.6588-1.6518 1.6518c-0.43395-0.20298-0.9309-0.29397-1.4628-0.23797-1.2109 0.13299-2.2398 1.0779-2.4427 2.2818-0.33596 1.9388 1.3229 3.5906 3.2546 3.2546 1.2039-0.20998 2.1488-1.2319 2.2818-2.4427 0.055994-0.53194-0.034996-1.0219-0.23797-1.4628l1.6588-1.6448 5.3124 5.3124c0.62293 0.62293 1.6868 0.18198 1.6868-0.69992v-0.0069992c0-0.25897-0.10499-0.51094-0.28697-0.69992l-8.3641-8.3571zm-2.5477 0.25197c-0.76992 0-1.3998-0.62293-1.3998-1.3998 0-0.77692 0.62993-1.3998 1.3998-1.3998 0.76992 0 1.3998 0.62293 1.3998 1.3998 0 0.77692-0.62993 1.3998-1.3998 1.3998zm0 8.3991c-0.76992 0-1.3998-0.62293-1.3998-1.3998 0-0.77692 0.62993-1.3998 1.3998-1.3998 0.76992 0 1.3998 0.62293 1.3998 1.3998 0 0.77692-0.62993 1.3998-1.3998 1.3998zm4.1995-5.2494c-0.19598 0-0.34996-0.15398-0.34996-0.34996 0-0.19598 0.15398-0.34996 0.34996-0.34996s0.34996 0.15398 0.34996 0.34996c0 0.19598-0.15398 0.34996-0.34996 0.34996zm5.3124-7.0622-4.6125 4.6125 1.3998 1.3998 4.6125-4.6125c0.18198-0.18198 0.28697-0.43395 0.28697-0.69992v-0.0069992c0-0.8749-1.0639-1.3159-1.6868-0.69292z" fill="#fff"/>
-  </g>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" viewBox="0 0 24 24" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <g opacity=".6">
+  <circle id="Oval" cx="12" cy="12" r="12" fill="#fff" opacity="1"/>
+  <circle cx="12" cy="12" r="11" fill="#8c5f93"/>
+  <path id="Shape" d="m10.349 8.9525c0.20298-0.43395 0.29397-0.9309 0.23797-1.4628-0.13299-1.2109-1.0779-2.2398-2.2818-2.4427-1.9388-0.33596-3.5976 1.3229-3.2616 3.2546 0.20998 1.2039 1.2319 2.1488 2.4427 2.2818 0.53194 0.055994 1.0219-0.034996 1.4628-0.23797l1.6518 1.6588-1.6518 1.6518c-0.43395-0.20298-0.9309-0.29397-1.4628-0.23797-1.2109 0.13299-2.2398 1.0779-2.4427 2.2818-0.33596 1.9388 1.3229 3.5906 3.2546 3.2546 1.2039-0.20998 2.1488-1.2319 2.2818-2.4427 0.055994-0.53194-0.034996-1.0219-0.23797-1.4628l1.6588-1.6448 5.3124 5.3124c0.62293 0.62293 1.6868 0.18198 1.6868-0.69992v-0.0069992c0-0.25897-0.10499-0.51094-0.28697-0.69992l-8.3641-8.3571zm-2.5477 0.25197c-0.76992 0-1.3998-0.62293-1.3998-1.3998 0-0.77692 0.62993-1.3998 1.3998-1.3998 0.76992 0 1.3998 0.62293 1.3998 1.3998 0 0.77692-0.62993 1.3998-1.3998 1.3998zm0 8.3991c-0.76992 0-1.3998-0.62293-1.3998-1.3998 0-0.77692 0.62993-1.3998 1.3998-1.3998 0.76992 0 1.3998 0.62293 1.3998 1.3998 0 0.77692-0.62993 1.3998-1.3998 1.3998zm4.1995-5.2494c-0.19598 0-0.34996-0.15398-0.34996-0.34996s0.15398-0.34996 0.34996-0.34996 0.34996 0.15398 0.34996 0.34996-0.15398 0.34996-0.34996 0.34996zm5.3124-7.0622-4.6125 4.6125 1.3998 1.3998 4.6125-4.6125c0.18198-0.18198 0.28697-0.43395 0.28697-0.69992v-0.0069992c0-0.8749-1.0639-1.3159-1.6868-0.69292z" fill="#fff"/>
  </g>
 </svg>
diff --git a/data/styles/clear/style-night/symbols/newsagent_shop-m.svg b/data/styles/clear/style-night/symbols/newsagent_shop-m.svg
index 1996c298bc..8875066190 100644
--- a/data/styles/clear/style-night/symbols/newsagent_shop-m.svg
+++ b/data/styles/clear/style-night/symbols/newsagent_shop-m.svg
@@ -1,10 +1,8 @@
-<svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <title>newsagent_shop-m</title>
- <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity=".6">
-  <g id="newsagent_shop-m" fill-rule="nonzero">
-   <circle id="Oval" cx="12" cy="12" r="12" fill="#fff"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#8C5F93"/>
-   <path id="Shape" d="m16.9 18.6h-9.8c-1.1598 0-2.1-0.9402-2.1-2.1v-10.5h9.8 1.4v3.5h2.8v0.7 6.3c0 1.1598-0.9402 2.1-2.1 2.1zm-1.9805-1.4c-0.077386-0.21895-0.11949-0.45456-0.11949-0.7v-9.1h-8.4v9.1c0 0.3866 0.3134 0.7 0.7 0.7h7.8195zm1.2805-6.3v5.6c0 0.3866 0.3134 0.7 0.7 0.7s0.7-0.3134 0.7-0.7v-5.6h-1.4zm-5.6-2.1v2.8h-2.8v-2.8h2.8zm2.8 0.7v1.4h-2.1v-1.4h2.1zm0 2.8v1.4h-5.6v-1.4h5.6zm0 2.1v1.4h-5.6v-1.4h5.6z" fill="#fff"/>
-  </g>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" viewBox="0 0 24 24" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <g opacity=".6">
+  <circle id="Oval" cx="12" cy="12" r="12" fill="#fff" opacity="1"/>
+  <circle cx="12" cy="12" r="11" fill="#8C5F93"/>
+  <path id="Shape" d="m5 6v10.5c0 1.1598 0.93981 2.0996 2.0996 2.0996h9.8008c1.1598 0 2.0996-0.93981 2.0996-2.0996v-6.3008-0.69922h-2.8008v-3.5h-1.3984-9.8008zm2.0176 1.8223h3.582v3.582h-3.582v-3.582zm4.4785 0.89453h2.6855v1.791h-2.6855v-1.791zm4.7031 2.1836h1.4004v5.5996c0 0.3866-0.31262 0.69922-0.69922 0.69922-0.3866 0-0.70117-0.31262-0.70117-0.69922v-5.5996zm-9.1816 1.4004h7.1641v1.791h-7.1641v-1.791zm0 2.6855h7.1641v1.791h-7.1641v-1.791z" fill="#fff" fill-rule="evenodd"/>
  </g>
 </svg>
diff --git a/data/styles/clear/style-night/symbols/stationery_shop-m.svg b/data/styles/clear/style-night/symbols/stationery_shop-m.svg
index 192f02fca0..0086996e26 100644
--- a/data/styles/clear/style-night/symbols/stationery_shop-m.svg
+++ b/data/styles/clear/style-night/symbols/stationery_shop-m.svg
@@ -1,10 +1,8 @@
-<svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <title>stationery_shop-m</title>
- <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity=".6">
-  <g id="stationery_shop-m" fill-rule="nonzero">
-   <circle id="Oval" cx="12" cy="12" r="12" fill="#fff"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#8C5F93"/>
-   <path id="Shape" d="m18.376 5.6233c-0.83092-0.83103-2.1763-0.83117-3.0074 0-0.1093 0.1093-3.1851 3.1852-3.2537 3.2538l-1.6771-1.6771c-8.24e-5 -8.235e-5 -1.647e-4 -1.9214e-4 -2.47e-4 -2.7449e-4 -8.24e-5 -8.234e-5 -1.922e-4 -1.6469e-4 -2.745e-4 -2.4703e-4l-2.0477-2.0477c-0.16077-0.16077-0.42147-0.16077-0.58226 0l-2.6559 2.6559c-0.16079 0.16077-0.16079 0.42147 0 0.58226l3.7253 3.7253-2.5165 2.5165c-0.042243 0.042243-0.078201 0.098046-0.098897 0.1592l-1.2395 3.6646c-0.10784 0.31868 0.19598 0.63219 0.52196 0.52196l3.6646-1.2395c0.058575-0.019818 0.11548-0.055116 0.15926-0.098897l2.5164-2.5164 3.7252 3.7252c0.16079 0.16079 0.42147 0.16079 0.58226 0l2.6559-2.6559c0.16079-0.16077 0.16079-0.42147 0-0.58226l-3.7253-3.7253c0.068539-0.068539 3.1448-3.1448 3.2537-3.2537 0.84234-0.84234 0.81851-2.1891 0-3.0074zm-2.4755 12.351-3.434-3.434 2.0737-2.0736 1.3861 1.3861-0.64254 0.64251c-0.16079 0.16077-0.16079 0.42144 0 0.58226 0.16074 0.16079 0.42144 0.16082 0.58226 0l0.64254-0.64251 1.4656 1.4656-2.0736 2.0736zm-1.0296-10.689 0.63038 0.63038-7.6372 7.6372-0.63038-0.63038c0.37094-0.37097 7.3892-7.3893 7.6372-7.6372zm1.0801-1.0801c0.50876-0.5087 1.3348-0.50711 1.8421-6.5877e-4 2.47e-4 2.4704e-4 4.391e-4 5.2152e-4 6.862e-4 7.6856e-4 0.50524 0.50508 0.5104 1.3322 0 1.8426l-0.49786 0.49786-0.92043-0.92043c-2.745e-4 -2.7448e-4 -4.941e-4 -5.7642e-4 -7.686e-4 -8.509e-4 -2.744e-4 -2.7448e-4 -5.764e-4 -4.9407e-4 -8.509e-4 -7.6856e-4l-0.92073-0.92073 0.49786-0.49783zm-7.5046 9.9299 7.6372-7.6372 0.63011 0.63011-7.6372 7.6372-0.63011-0.63011zm-0.12975 1.0348-2.2479 0.76035 0.76035-2.2479 1.4876 1.4875zm-2.2917-9.0714 2.0736-2.0736 1.4656 1.4656-0.64251 0.64254c-0.16079 0.16079-0.16079 0.42147 0 0.58226 0.16074 0.16079 0.42144 0.16082 0.58226 0l0.64251-0.64254 1.3863 1.3863-2.0736 2.0736-3.4342-3.4342z" fill="#fff"/>
-  </g>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" viewBox="0 0 24 24" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <g opacity=".6">
+  <circle id="Oval" cx="12" cy="12" r="12" fill="#fff" opacity="1"/>
+  <circle cx="12" cy="12" r="11" fill="#8C5F93"/>
+  <path d="m14.861 4.8613c-1.2646-0.014877-2.3354 0.42329-3.2363 1.3242l-6.166 6.168 0.97656 0.97656 6.1816-6.1797c0.61883-0.61883 1.3737-0.92656 2.2363-0.91406 0.87307 0.012653 1.619 0.33191 2.2559 0.96875 0.62719 0.62719 0.94762 1.3731 0.96875 2.248 0.02086 0.86347-0.27659 1.6086-0.88477 2.2168l-5.9688 5.9688c-0.38041 0.38041-0.84556 0.57228-1.3672 0.56836-0.53199-0.003999-0.98371-0.19464-1.3711-0.58203-0.38739-0.38738-0.57804-0.8391-0.58203-1.3711-0.0039218-0.52163 0.18795-0.98678 0.56836-1.3672l5.457-5.457c0.13861-0.13862 0.29707-0.20571 0.49023-0.20898 0.1813-0.00307 0.34803 0.064829 0.47852 0.19531 0.12844 0.12845 0.19562 0.2973 0.18945 0.48242-0.0065 0.19618-0.07935 0.36255-0.23047 0.51367l-5.668 5.6719 0.97656 0.97656 5.6289-5.627c0.41232-0.41232 0.63359-0.91328 0.66016-1.4922 0.027234-0.59369-0.16242-1.0882-0.57812-1.5039-0.41169-0.41168-0.89023-0.61093-1.4648-0.60547-0.5639 0.00537-1.0564 0.21463-1.4609 0.61914l-5.4434 5.4434c-0.65971 0.65971-0.98633 1.4342-0.98633 2.3535 0 0.91033 0.33247 1.7016 0.98633 2.3555 0.64552 0.64553 1.4332 0.97349 2.3457 0.97852 0.92235 0.0051 1.6972-0.31243 2.3496-0.96484l5.9414-5.9414c0.90093-0.90093 1.3363-1.968 1.3164-3.2285-0.019672-1.2491-0.48027-2.3279-1.373-3.2207-0.8932-0.8932-1.973-1.3505-3.2266-1.3652z" fill="#fff"/>
  </g>
 </svg>
diff --git a/data/styles/clear/style-night/symbols/sweets-m.svg b/data/styles/clear/style-night/symbols/sweets-m.svg
index 9f43a69220..dfe41d8602 100644
--- a/data/styles/clear/style-night/symbols/sweets-m.svg
+++ b/data/styles/clear/style-night/symbols/sweets-m.svg
@@ -1,10 +1,8 @@
-<svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <title>sweets-m</title>
- <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity=".6">
-  <g id="sweets-m" fill-rule="nonzero">
-   <circle id="Oval" cx="12" cy="12" r="12" fill="#fff"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#8C5F93"/>
-   <path id="Shape" d="m18.991 9.0796c-0.028182-0.13633-0.1231-0.24939-0.25254-0.30071l-1.2598-0.49984-0.23594-1.1965c-0.032484-0.16463-0.16118-0.29332-0.32578-0.32578l-1.1965-0.23594-0.49981-1.2598c-0.051346-0.12944-0.16438-0.22436-0.30071-0.25254-0.13642-0.02821-0.27777 0.014119-0.37624 0.11259-0.57892 0.57892-0.89775 1.3486-0.89775 2.1674 0 0.21492 0.022171 0.4264 0.065051 0.63201-1.6017-0.66727-3.5199-0.35071-4.8209 0.95034-1.3081 1.3081-1.6211 3.2401-0.93942 4.847-0.21517-0.047182-0.43702-0.071531-0.66261-0.071531-0.81872 0-1.5885 0.31886-2.1674 0.89778-0.098473 0.098472-0.14077 0.23988-0.11259 0.37627 0.02821 0.13636 0.12315 0.24939 0.25262 0.30074l1.2656 0.50177 0.23574 1.1893c0.032594 0.1643 0.16101 0.29272 0.32531 0.32531l1.1893 0.23574 0.50179 1.2656c0.051318 0.12944 0.16435 0.22438 0.30071 0.25259 0.027851 0.0057633 0.055896 0.008576 0.083775 0.008576 0.10857 0 0.21412-0.042797 0.29247-0.12117 0.57892-0.57889 0.89778-1.3486 0.89778-2.1674 0-0.2256-0.024349-0.44741-0.071531-0.66261 0.55049 0.23354 1.1391 0.35057 1.7277 0.35057 1.1297 0 2.2593-0.43001 3.1193-1.29 1.301-1.301 1.6176-3.2192 0.95034-4.8209 0.2056 0.04288 0.41708 0.065078 0.63201 0.065078 0.81872 0 1.5885-0.31886 2.1674-0.89778 0.098555-0.098445 0.14086-0.23983 0.11265-0.37621zm-9.7167 8.6653-0.31169-0.78602c-0.051759-0.13057-0.16628-0.22595-0.30405-0.25328l-1.1388-0.22573-0.22573-1.1388c-0.0273-0.13777-0.12268-0.25229-0.25331-0.30408l-0.78602-0.31166c0.31527-0.16452 0.66763-0.25166 1.0334-0.25166 0.59773 0 1.1597 0.23277 1.5824 0.65547 0.42268 0.42271 0.65547 0.98464 0.65547 1.5824 0 0.36579-0.087139 0.71815-0.25166 1.0334zm0.20081-3.2204c-0.77402-0.77402-1.1191-1.8169-1.0356-2.8308l3.8665 3.8665c-1.0139 0.083444-2.0568-0.26161-2.8308-1.0356zm5.0686 0c-0.37503 0.37503-0.81318 0.64924-1.2806 0.82297l-4.6111-4.611c0.17373-0.46735 0.44797-0.90553 0.82297-1.2806 0.375-0.375 0.81318-0.64921 1.2806-0.82294l4.611 4.611c-0.17373 0.46735-0.44794 0.90553-0.82294 1.2805zm1.0356-2.2378-3.8664-3.8664c0.098638-0.0081072 0.19755-0.012437 0.29647-0.012437 0.9178 0 1.8356 0.34936 2.5343 1.048 0.77402 0.77402 1.1191 1.8169 1.0356 2.8308zm1.1317-2.7603c-0.59773 0-1.1597-0.23277-1.5824-0.65547-0.42265-0.42265-0.65544-0.98461-0.65544-1.5824 0-0.36585 0.087194-0.71829 0.25174-1.0336l0.30973 0.78069c0.051842 0.13068 0.1665 0.22609 0.30443 0.25331l1.1456 0.22587 0.22587 1.1456c0.02719 0.13793 0.1226 0.25259 0.25331 0.30443l0.78069 0.30973c-0.31533 0.1646-0.66772 0.25177-1.0336 0.25177z" fill="#fff"/>
-  </g>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" viewBox="0 0 24 24" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <g opacity=".6">
+  <circle id="Oval" cx="12" cy="12" r="12" fill="#fff" opacity="1"/>
+  <circle cx="12" cy="12" r="11" fill="#8C5F93"/>
+  <path d="m15.272 4.8672c-0.10049 0-0.19896 0.038791-0.27148 0.11133-0.53584 0.53581-0.83008 1.248-0.83008 2.0058 0 0.20881 0.02274 0.41409 0.06641 0.61328 0.33276 1.1422 1.0033 1.8734 2.1562 2.1582 0.19916 0.043669 0.40448 0.06641 0.61328 0.06641 0.75779 0 1.47-0.29619 2.0058-0.83203 0.09114-0.091141 0.13155-0.22142 0.10547-0.34766-0.02611-0.12621-0.11454-0.22981-0.23437-0.27734l-1.1719-0.46484-0.21875-1.1015c-0.03017-0.15207-0.14871-0.27062-0.30078-0.30078l-1.0996-0.21875-0.46484-1.1699c-0.0475-0.11981-0.15308-0.20826-0.27929-0.23437-0.02578-0.00537-0.05038-0.00777-0.07617-0.00777zm-3.3398 3.0429c-1.0196 0.019048-2.0344 0.4172-2.8105 1.1933-1.1241 1.1241-1.4537 2.7454-0.99027 4.1621 1.2894 0.43385 2.1113 1.3082 2.5839 2.5957 0.41892 0.13924 0.85582 0.21094 1.2929 0.21094 1.0456 0 2.0926-0.39932 2.8886-1.1953 1.1177-1.1177 1.4481-2.7259 0.9961-4.1367-1.314-0.43339-2.1481-1.3207-2.6231-2.6309-0.36882-0.11913-0.75082-0.18544-1.1348-0.19727-0.06796-0.00213-0.13515-0.00324-0.20313-0.00194zm-4.9414 6.2617c-0.75779 0-1.47 0.29424-2.0058 0.83008-0.09114 0.09114-0.1296 0.22142-0.10352 0.34766 0.02611 0.12621 0.11259 0.23176 0.23242 0.27929l1.1719 0.46484 0.21875 1.0996c0.03016 0.15207 0.14871 0.27062 0.30078 0.30078l1.1015 0.21875 0.46289 1.1719c0.0475 0.11981 0.15308 0.20826 0.27929 0.23437 0.02578 0.0054 0.05232 0.0078 0.07813 0.0078 0.10049 0 0.19701-0.04074 0.26953-0.11328 0.53584-0.53581 0.83203-1.248 0.83203-2.0058 0-0.20881-0.02274-0.41409-0.06641-0.61328-0.33276-1.1422-1.0053-1.8734-2.1582-2.1582-0.19916-0.04367-0.40448-0.06446-0.61328-0.06446z" fill="#fff" />
  </g>
 </svg>
diff --git a/data/styles/clear/style-night/symbols/taxi-m.svg b/data/styles/clear/style-night/symbols/taxi-m.svg
index 06de4196a9..39b4ce4004 100644
--- a/data/styles/clear/style-night/symbols/taxi-m.svg
+++ b/data/styles/clear/style-night/symbols/taxi-m.svg
@@ -1,10 +1,8 @@
-<svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <title>taxi-m</title>
- <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity=".6">
-  <g id="taxi-m" fill-rule="nonzero">
-   <circle id="Oval" cx="12" cy="12" r="12" fill="#fff"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#717065"/>
-   <path id="Shape" d="m17.451 10.194c-0.075428-0.65925-0.75086-1.194-1.5086-1.194h-7.8849c-0.75771 0-1.4331 0.53475-1.5086 1.194l-0.54857 4.806h12l-0.54943-4.806zm-8.022 3.306h-1.7143v-1.5h1.7143v1.5zm1.7143-1.5h-1.7143v-1.5h1.7143v1.5zm1.7143 1.5h-1.7143v-1.5h1.7143v1.5zm1.7143-1.5h-1.7143v-1.5h1.7143v1.5zm1.7143 1.5h-1.7143v-1.5h1.7143v1.5z" fill="#fff"/>
-  </g>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" viewBox="0 0 24 24" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <g opacity=".6">
+  <rect id="Rectangle" width="24" height="24" rx="2.5" fill="#fff" opacity="1"/>
+  <rect x="1" y="1" width="22" height="22" rx="2" fill="#2F6499"/>
+  <path d="m7.2007 9.1768v2.825h3.1972v-2.825zm3.1972 2.825v2.8214h3.2007v-2.8214zm3.2007 0h3.2007v-2.825h-3.2007zm3.2007 0v2.8214h3.2007v-2.8214zm-9.5986 0h-3.2007v2.8214h3.2007z" fill="#fff" />
  </g>
 </svg>