From d099c29113f2e4ccc6eb6461ca1b4a3dea1d0a15 Mon Sep 17 00:00:00 2001
From: David Martinez <47610359+dvdmrtnz@users.noreply.github.com>
Date: Tue, 6 Dec 2022 11:43:47 +0100
Subject: [PATCH] [style] Change white transparent icons to a shade of grey in
 dark mode

Signed-off-by: David Martinez <47610359+dvdmrtnz@users.noreply.github.com>
---
 .../symbols/america-football-m.svg            |  8 ++--
 .../clear/style-night/symbols/archery-m.svg   |  2 +-
 .../symbols/australian-football-m.svg         |  2 +-
 .../clear/style-night/symbols/badminton-m.svg |  2 +-
 .../clear/style-night/symbols/baseball-m.svg  |  8 ++--
 .../style-night/symbols/basketball-m.svg      | 18 ++++----
 .../clear/style-night/symbols/bench.svg       |  4 +-
 .../symbols/bicycle-repair-station.svg        |  2 +-
 .../clear/style-night/symbols/board.svg       |  2 +-
 .../clear/style-night/symbols/bowling-m.svg   | 12 ++---
 .../clear/style-night/symbols/cemetery-m.svg  |  4 +-
 .../clear/style-night/symbols/chess-m.svg     |  2 +-
 .../clear/style-night/symbols/chimney-m.svg   | 44 ++++++-------------
 .../clear/style-night/symbols/climbing-m.svg  |  8 ++--
 .../clear/style-night/symbols/cricket-m.svg   | 10 ++---
 .../clear/style-night/symbols/curling-m.svg   | 12 ++---
 .../clear/style-night/symbols/diving-m.svg    |  2 +-
 .../clear/style-night/symbols/dog_park-m.svg  |  4 +-
 .../clear/style-night/symbols/dot-m.svg       |  6 +--
 .../clear/style-night/symbols/elevator.svg    |  2 +-
 .../clear/style-night/symbols/entrance-s.svg  |  4 +-
 .../style-night/symbols/equestrian-m.svg      |  8 ++--
 .../style-night/symbols/fuel-dispenser-m.svg  |  2 +-
 .../clear/style-night/symbols/golf-m.svg      |  8 ++--
 .../clear/style-night/symbols/guidepost.svg   |  2 +-
 .../clear/style-night/symbols/gym-m.svg       |  2 +-
 .../clear/style-night/symbols/handball-m.svg  |  2 +-
 .../clear/style-night/symbols/hockey-m.svg    |  2 +-
 .../clear/style-night/symbols/lift_gate-m.svg |  4 +-
 data/styles/clear/style-night/symbols/map.svg |  2 +-
 .../clear/style-night/symbols/military-m.svg  |  4 +-
 .../style-night/symbols/mountain-pass.svg     |  2 +-
 .../clear/style-night/symbols/padel-m.svg     |  2 +-
 .../style-night/symbols/parking-meter-m.svg   |  4 +-
 .../clear/style-night/symbols/peakt-m.svg     |  4 +-
 .../clear/style-night/symbols/peakt-s.svg     |  4 +-
 .../clear/style-night/symbols/pelota-m.svg    |  4 +-
 .../clear/style-night/symbols/phone-m.svg     |  2 +-
 .../clear/style-night/symbols/picnic-m.svg    |  4 +-
 .../style-night/symbols/picnic_table-m.svg    |  4 +-
 .../clear/style-night/symbols/pitch-m.svg     |  2 +-
 .../style-night/symbols/playground-m.svg      |  2 +-
 .../clear/style-night/symbols/postbox-m.svg   |  2 +-
 .../clear/style-night/symbols/power-m.svg     |  2 +-
 .../clear/style-night/symbols/recycling-m.svg |  2 +-
 .../clear/style-night/symbols/shelter-m.svg   |  2 +-
 .../clear/style-night/symbols/shower-m.svg    |  4 +-
 .../style-night/symbols/skateboard-m.svg      |  4 +-
 .../clear/style-night/symbols/skiing-m.svg    |  2 +-
 .../clear/style-night/symbols/soccer-m.svg    |  4 +-
 .../style-night/symbols/storage-tank.svg      |  2 +-
 .../style-night/symbols/survey_point-m.svg    |  4 +-
 .../clear/style-night/symbols/swimming-m.svg  |  4 +-
 .../style-night/symbols/table-tennis-m.svg    |  2 +-
 .../clear/style-night/symbols/tennis-m.svg    |  8 ++--
 .../clear/style-night/symbols/tomb-m.svg      |  4 +-
 .../clear/style-night/symbols/vending-m.svg   |  2 +-
 .../clear/style-night/symbols/viewpoint-m.svg |  5 +--
 .../clear/style-night/symbols/viewpoint-s.svg |  5 +--
 .../style-night/symbols/volleyball-m.svg      |  6 +--
 .../style-night/symbols/waste-basket-m.svg    |  4 +-
 .../style-night/symbols/waste-basket-s.svg    |  4 +-
 .../clear/style-night/symbols/yoga-m.svg      |  6 +--
 63 files changed, 144 insertions(+), 162 deletions(-)

diff --git a/data/styles/clear/style-night/symbols/america-football-m.svg b/data/styles/clear/style-night/symbols/america-football-m.svg
index 4d28afc0b7..6cc071deea 100644
--- a/data/styles/clear/style-night/symbols/america-football-m.svg
+++ b/data/styles/clear/style-night/symbols/america-football-m.svg
@@ -1,12 +1,12 @@
 <svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
  <title>america-football-m</title>
  <g fill="none" fill-rule="evenodd">
-  <g id="america-football-m" fill="#fff" fill-rule="nonzero" stroke-width="1.5">
+  <g id="america-football-m" fill="#777777" fill-rule="nonzero" stroke-width="1.5">
    <g id="Group" transform="translate(6 9.6071)">
-    <path id="Path" d="m-3 2.3929c0.56652 1.4062 1.4545 2.6518 2.5714 3.6402v-7.2804c-1.117 0.98839-2.0049 2.2339-2.5714 3.6402z" opacity=".6"/>
-    <path d="m15 2.3929c-0.56652-1.4063-1.4545-2.6518-2.5714-3.6402v7.2804c1.117-0.98839 2.0049-2.2339 2.5714-3.6402z" opacity=".6"/>
+    <path id="Path" d="m-3 2.3929c0.56652 1.4062 1.4545 2.6518 2.5714 3.6402v-7.2804c-1.117 0.98839-2.0049 2.2339-2.5714 3.6402z"/>
+    <path d="m15 2.3929c-0.56652-1.4063-1.4545-2.6518-2.5714-3.6402v7.2804c1.117-0.98839 2.0049-2.2339 2.5714-3.6402z"/>
    </g>
-   <path id="Shape" d="m12 5.935c-1.8924 0-3.6562 0.53839-5.1429 1.4665v9.1969c1.4866 0.92812 3.2504 1.4665 5.1429 1.4665s3.6562-0.53839 5.1429-1.4665v-9.1969c-1.4866-0.92812-3.2504-1.4665-5.1429-1.4665zm3.8571 5.4241v2.5714h-1.2857v-1.2857h-1.9286v1.2857h-1.2857v-1.2857h-1.9286v1.2857h-1.2857v-3.8571h1.2857v1.2857h1.9286v-1.2857h1.2857v1.2857h1.9286v-1.2857h1.2857z" opacity=".6"/>
+   <path id="Shape" d="m12 5.935c-1.8924 0-3.6562 0.53839-5.1429 1.4665v9.1969c1.4866 0.92812 3.2504 1.4665 5.1429 1.4665s3.6562-0.53839 5.1429-1.4665v-9.1969c-1.4866-0.92812-3.2504-1.4665-5.1429-1.4665zm3.8571 5.4241v2.5714h-1.2857v-1.2857h-1.9286v1.2857h-1.2857v-1.2857h-1.9286v1.2857h-1.2857v-3.8571h1.2857v1.2857h1.9286v-1.2857h1.2857v1.2857h1.9286v-1.2857h1.2857z"/>
   </g>
  </g>
 </svg>
diff --git a/data/styles/clear/style-night/symbols/archery-m.svg b/data/styles/clear/style-night/symbols/archery-m.svg
index 0d7365da8a..37138aac92 100644
--- a/data/styles/clear/style-night/symbols/archery-m.svg
+++ b/data/styles/clear/style-night/symbols/archery-m.svg
@@ -2,7 +2,7 @@
  <title>archery-m</title>
  <g fill="none" fill-rule="evenodd">
   <g id="archery-m" fill-rule="nonzero">
-   <path id="Shape" d="m12 3c-4.9706 0-9 4.0295-9 9s4.0294 9 9 9c4.9705 0 9-4.0295 9-9s-4.0295-9-9-9zm0 1.8c3.9765 0 7.2 3.2235 7.2 7.2s-3.2235 7.2-7.2 7.2c-3.9765 0-7.2-3.2235-7.2-7.2s3.2235-7.2 7.2-7.2zm0 1.8c-2.9823 0-5.4 2.4177-5.4 5.4s2.4177 5.4 5.4 5.4c2.9823 0 5.4-2.4177 5.4-5.4s-2.4177-5.4-5.4-5.4zm0 1.8c1.9882 0 3.6 1.6118 3.6 3.6s-1.6118 3.6-3.6 3.6c-1.9882 0-3.6-1.6118-3.6-3.6s1.6118-3.6 3.6-3.6zm0 1.8c-0.99414 0-1.8 0.80586-1.8 1.8s0.80586 1.8 1.8 1.8 1.8-0.80586 1.8-1.8-0.80586-1.8-1.8-1.8z" fill="#fff" opacity=".6" stroke-width="1.2857"/>
+   <path id="Shape" d="m12 3c-4.9706 0-9 4.0295-9 9s4.0294 9 9 9c4.9705 0 9-4.0295 9-9s-4.0295-9-9-9zm0 1.8c3.9765 0 7.2 3.2235 7.2 7.2s-3.2235 7.2-7.2 7.2c-3.9765 0-7.2-3.2235-7.2-7.2s3.2235-7.2 7.2-7.2zm0 1.8c-2.9823 0-5.4 2.4177-5.4 5.4s2.4177 5.4 5.4 5.4c2.9823 0 5.4-2.4177 5.4-5.4s-2.4177-5.4-5.4-5.4zm0 1.8c1.9882 0 3.6 1.6118 3.6 3.6s-1.6118 3.6-3.6 3.6c-1.9882 0-3.6-1.6118-3.6-3.6s1.6118-3.6 3.6-3.6zm0 1.8c-0.99414 0-1.8 0.80586-1.8 1.8s0.80586 1.8 1.8 1.8 1.8-0.80586 1.8-1.8-0.80586-1.8-1.8-1.8z" fill="#777777" stroke-width="1.2857"/>
   </g>
  </g>
 </svg>
diff --git a/data/styles/clear/style-night/symbols/australian-football-m.svg b/data/styles/clear/style-night/symbols/australian-football-m.svg
index f6e1e98287..933b9d6c42 100644
--- a/data/styles/clear/style-night/symbols/australian-football-m.svg
+++ b/data/styles/clear/style-night/symbols/australian-football-m.svg
@@ -2,7 +2,7 @@
  <title>australian-football-m</title>
  <g fill="none" fill-rule="evenodd">
   <g id="australian-football-m" fill-rule="nonzero">
-   <path id="Shape" d="m20.474 4.898c-0.17419-0.66048-0.69314-1.1794-1.3536-1.3573-0.86734-0.23226-2.221-0.50806-3.8032-0.54073l5.6831 5.6903c-0.029025-1.5786-0.29758-2.925-0.52621-3.7923zm-16.948 14.204c0.17419 0.66048 0.69315 1.1794 1.3536 1.3573 0.86734 0.23226 2.221 0.50806 3.8032 0.54073l-5.6831-5.6903c0.029033 1.5786 0.29758 2.925 0.52621 3.7923zm-0.37379-6.1077 7.846 7.8605c4.8085-0.70403 9.029-4.3077 9.8528-9.8492l-7.8496-7.8605c-4.8085 0.70403-9.029 4.3077-9.8492 9.8492zm11.515-4.4855c0.1125-0.1125 0.29758-0.1125 0.41008 0l0.41008 0.41008c0.1125 0.1125 0.1125 0.29758 0 0.41008l-1.027 1.027 1.027 1.027c0.1125 0.1125 0.1125 0.29758 0 0.41008l-0.41008 0.41008c-0.1125 0.1125-0.29758 0.1125-0.41008 0l-1.027-1.027-0.82016 0.82379 1.027 1.027c0.1125 0.1125 0.1125 0.29758 0 0.41008l-0.41008 0.41008c-0.1125 0.1125-0.29758 0.1125-0.41008 0l-1.027-1.027-0.82016 0.82016 1.027 1.027c0.1125 0.1125 0.1125 0.29758 0 0.41008l-0.41008 0.41008c-0.1125 0.1125-0.29758 0.1125-0.41008 0l-1.027-1.027-1.027 1.027c-0.1125 0.1125-0.29758 0.1125-0.41008 0l-0.41008-0.41008c-0.1125-0.1125-0.1125-0.29758 0-0.41008l1.027-1.027-1.027-1.0234c-0.1125-0.1125-0.1125-0.29758 0-0.41008l0.41008-0.41008c0.1125-0.1125 0.29758-0.1125 0.41008 0l1.027 1.027 0.82016-0.82016-1.027-1.027c-0.1125-0.1125-0.1125-0.29758 0-0.41008l0.41008-0.41008c0.1125-0.1125 0.29758-0.1125 0.41008 0l1.027 1.027 0.82016-0.82016-1.027-1.027c-0.1125-0.1125-0.1125-0.29758 0-0.41008l0.41008-0.41008c0.1125-0.1125 0.29758-0.1125 0.41008 0l1.027 1.027z" fill="#fff" opacity=".6" stroke-width="1.5"/>
+   <path id="Shape" d="m20.474 4.898c-0.17419-0.66048-0.69314-1.1794-1.3536-1.3573-0.86734-0.23226-2.221-0.50806-3.8032-0.54073l5.6831 5.6903c-0.029025-1.5786-0.29758-2.925-0.52621-3.7923zm-16.948 14.204c0.17419 0.66048 0.69315 1.1794 1.3536 1.3573 0.86734 0.23226 2.221 0.50806 3.8032 0.54073l-5.6831-5.6903c0.029033 1.5786 0.29758 2.925 0.52621 3.7923zm-0.37379-6.1077 7.846 7.8605c4.8085-0.70403 9.029-4.3077 9.8528-9.8492l-7.8496-7.8605c-4.8085 0.70403-9.029 4.3077-9.8492 9.8492zm11.515-4.4855c0.1125-0.1125 0.29758-0.1125 0.41008 0l0.41008 0.41008c0.1125 0.1125 0.1125 0.29758 0 0.41008l-1.027 1.027 1.027 1.027c0.1125 0.1125 0.1125 0.29758 0 0.41008l-0.41008 0.41008c-0.1125 0.1125-0.29758 0.1125-0.41008 0l-1.027-1.027-0.82016 0.82379 1.027 1.027c0.1125 0.1125 0.1125 0.29758 0 0.41008l-0.41008 0.41008c-0.1125 0.1125-0.29758 0.1125-0.41008 0l-1.027-1.027-0.82016 0.82016 1.027 1.027c0.1125 0.1125 0.1125 0.29758 0 0.41008l-0.41008 0.41008c-0.1125 0.1125-0.29758 0.1125-0.41008 0l-1.027-1.027-1.027 1.027c-0.1125 0.1125-0.29758 0.1125-0.41008 0l-0.41008-0.41008c-0.1125-0.1125-0.1125-0.29758 0-0.41008l1.027-1.027-1.027-1.0234c-0.1125-0.1125-0.1125-0.29758 0-0.41008l0.41008-0.41008c0.1125-0.1125 0.29758-0.1125 0.41008 0l1.027 1.027 0.82016-0.82016-1.027-1.027c-0.1125-0.1125-0.1125-0.29758 0-0.41008l0.41008-0.41008c0.1125-0.1125 0.29758-0.1125 0.41008 0l1.027 1.027 0.82016-0.82016-1.027-1.027c-0.1125-0.1125-0.1125-0.29758 0-0.41008l0.41008-0.41008c0.1125-0.1125 0.29758-0.1125 0.41008 0l1.027 1.027z" fill="#777777" stroke-width="1.5"/>
   </g>
  </g>
 </svg>
diff --git a/data/styles/clear/style-night/symbols/badminton-m.svg b/data/styles/clear/style-night/symbols/badminton-m.svg
index e51c183299..2665f75ce4 100644
--- a/data/styles/clear/style-night/symbols/badminton-m.svg
+++ b/data/styles/clear/style-night/symbols/badminton-m.svg
@@ -1,3 +1,3 @@
 <svg version="1.1" viewBox="0 0 24 24" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
-<g transform="matrix(.84005 0 0 .84005 -30.981 -1.1458)" fill="#fff"><path d="m54.633 4.9941c-0.63366-0.00271-1.2975 0.089825-1.9785 0.28906-0.37703 0.1103-0.67179 0.21016-0.89453 0.30469-0.35711 0.15322-0.66043 0.33892-0.91992 0.47852-0.50752 0.29262-0.66844 0.43639-0.80664 0.53125-0.22008 0.15106-0.49996 0.39261-0.85156 0.72852-2.754 2.6311-3.3918 6.7647-1.4121 9.1543 0.08238 0.09944 0.14844 0.19649 0.14844 0.21484 0 0.01836-0.66626 0.70121-1.4824 1.5176l-1.4844 1.4844-0.17969-0.08984c-0.44992-0.22778-0.51682-0.18634-1.9492 1.2441-0.57055 0.57351-1.129 1.1393-1.7168 1.7402-0.49623 0.51618-0.9043 1.0116-0.9043 1.1758 0 0.31862 0.5329 0.98688 0.86328 1.082 0.19315 0.05563 0.33057 0.0511 0.49219-0.01563 0.16382-0.06764 3.828-3.6954 3.9336-3.8945 0.09273-0.17492 0.07992-0.49051-0.02734-0.66406l-0.08984-0.14453 1.498-1.4961 1.4961-1.4961 0.28906 0.2168c3.9647 2.9827 10.486-0.39139 11.346-5.8691 0.5793-3.6919-1.9474-6.4776-5.3691-6.4922zm-0.21484 1.4629c0.09331-0.0029 0.18539-0.0023 0.27734 0 2.1503 0.052538 3.9034 1.4933 3.9062 3.9961 0.0041 3.6011-3.5896 6.9082-7.0879 6.5234-3.8903-0.42792-4.67-5.3532-1.3574-8.5723 1.3216-1.2843 2.8621-1.9045 4.2617-1.9473z" opacity=".6" stroke-width=".038977"/><path d="m59.336 18.35c-0.16204-0.09052-0.34102-0.0894-0.55664 0.0039-0.42282 0.18297-0.95002 0.77095-1.8926 1.627-1.8246 1.657-1.8506 1.6838-2.1816 1.8281-1.4777 0.64466-2.1192 1.7339-1.6562 3.0039 0.49051 1.3457 1.7598 1.8039 3.1738 1.1953l0.47852-0.20508 2.4824-0.19336c1.8068-0.13958 2.4393-0.18043 2.707-0.24414 0.29682-0.07063 0.33065-0.28438 0.33008-0.2832l0.12891-0.25976-1.373-3.209c-0.80945-1.8959-1.1545-2.9921-1.6406-3.2637zm-0.47461 1.4492c0.07646 0.15536 0.1824 0.3887 0.35938 0.79883l0.38086 0.88477-1.6582 0.7168-1.6562 0.71289-0.10742-0.25-0.13477-0.3125 1.418-1.2871c0.75068-0.68216 1.2596-1.1386 1.3984-1.2637zm1.2266 2.8086 0.37891 0.88086c0.14357 0.33271 0.25641 0.60261 0.32812 0.78906 0.0019 0.0049 4e-3 0.0089 0.0059 0.01367-0.23363 0.01817-0.86052 0.0678-1.8594 0.14648l-1.9297 0.15234-0.13281-0.30469-0.10742-0.24805 1.6582-0.71484zm-5.0898 0.4043 0.4082 0.94726 0.4082 0.94531-0.11719 0.05078c-0.17594 0.07593-0.38507 0.13533-0.50195 0.14453-1.2078 0.09558-1.5025-1.521-0.35547-2.0195z" opacity=".6" stroke-width=".048325"/></g>
+<g transform="matrix(.84005 0 0 .84005 -30.981 -1.1458)" fill="#777777"><path d="m54.633 4.9941c-0.63366-0.00271-1.2975 0.089825-1.9785 0.28906-0.37703 0.1103-0.67179 0.21016-0.89453 0.30469-0.35711 0.15322-0.66043 0.33892-0.91992 0.47852-0.50752 0.29262-0.66844 0.43639-0.80664 0.53125-0.22008 0.15106-0.49996 0.39261-0.85156 0.72852-2.754 2.6311-3.3918 6.7647-1.4121 9.1543 0.08238 0.09944 0.14844 0.19649 0.14844 0.21484 0 0.01836-0.66626 0.70121-1.4824 1.5176l-1.4844 1.4844-0.17969-0.08984c-0.44992-0.22778-0.51682-0.18634-1.9492 1.2441-0.57055 0.57351-1.129 1.1393-1.7168 1.7402-0.49623 0.51618-0.9043 1.0116-0.9043 1.1758 0 0.31862 0.5329 0.98688 0.86328 1.082 0.19315 0.05563 0.33057 0.0511 0.49219-0.01563 0.16382-0.06764 3.828-3.6954 3.9336-3.8945 0.09273-0.17492 0.07992-0.49051-0.02734-0.66406l-0.08984-0.14453 1.498-1.4961 1.4961-1.4961 0.28906 0.2168c3.9647 2.9827 10.486-0.39139 11.346-5.8691 0.5793-3.6919-1.9474-6.4776-5.3691-6.4922zm-0.21484 1.4629c0.09331-0.0029 0.18539-0.0023 0.27734 0 2.1503 0.052538 3.9034 1.4933 3.9062 3.9961 0.0041 3.6011-3.5896 6.9082-7.0879 6.5234-3.8903-0.42792-4.67-5.3532-1.3574-8.5723 1.3216-1.2843 2.8621-1.9045 4.2617-1.9473z" stroke-width=".038977"/><path d="m59.336 18.35c-0.16204-0.09052-0.34102-0.0894-0.55664 0.0039-0.42282 0.18297-0.95002 0.77095-1.8926 1.627-1.8246 1.657-1.8506 1.6838-2.1816 1.8281-1.4777 0.64466-2.1192 1.7339-1.6562 3.0039 0.49051 1.3457 1.7598 1.8039 3.1738 1.1953l0.47852-0.20508 2.4824-0.19336c1.8068-0.13958 2.4393-0.18043 2.707-0.24414 0.29682-0.07063 0.33065-0.28438 0.33008-0.2832l0.12891-0.25976-1.373-3.209c-0.80945-1.8959-1.1545-2.9921-1.6406-3.2637zm-0.47461 1.4492c0.07646 0.15536 0.1824 0.3887 0.35938 0.79883l0.38086 0.88477-1.6582 0.7168-1.6562 0.71289-0.10742-0.25-0.13477-0.3125 1.418-1.2871c0.75068-0.68216 1.2596-1.1386 1.3984-1.2637zm1.2266 2.8086 0.37891 0.88086c0.14357 0.33271 0.25641 0.60261 0.32812 0.78906 0.0019 0.0049 4e-3 0.0089 0.0059 0.01367-0.23363 0.01817-0.86052 0.0678-1.8594 0.14648l-1.9297 0.15234-0.13281-0.30469-0.10742-0.24805 1.6582-0.71484zm-5.0898 0.4043 0.4082 0.94726 0.4082 0.94531-0.11719 0.05078c-0.17594 0.07593-0.38507 0.13533-0.50195 0.14453-1.2078 0.09558-1.5025-1.521-0.35547-2.0195z" stroke-width=".048325"/></g>
 </svg>
diff --git a/data/styles/clear/style-night/symbols/baseball-m.svg b/data/styles/clear/style-night/symbols/baseball-m.svg
index 5d05385e95..c6f7894da9 100644
--- a/data/styles/clear/style-night/symbols/baseball-m.svg
+++ b/data/styles/clear/style-night/symbols/baseball-m.svg
@@ -2,10 +2,10 @@
  <title>baseball-m</title>
  <g fill="none" fill-rule="evenodd">
   <g id="baseball-m" fill-rule="nonzero">
-   <g id="Group" transform="translate(5,5)" fill="#fff" stroke-width="1.2854">
-    <path id="Path" d="m-0.3717 1.852c-1.0256 1.458-1.6283 3.231-1.6283 5.148s0.60274 3.69 1.6283 5.148c2.1771-0.693 3.7694-2.736 3.7694-5.148s-1.5923-4.455-3.7694-5.148z" opacity=".6"/>
-    <path d="m14.372 1.852c-2.1771 0.693-3.7694 2.736-3.7694 5.148s1.5923 4.455 3.7694 5.148c1.0256-1.458 1.6283-3.231 1.6283-5.148s-0.60274-3.69-1.6283-5.148z" opacity=".6"/>
-    <path d="m8.7992 7c0-2.952 1.7722-5.481 4.3092-6.597-1.6013-1.485-3.7424-2.403-6.1084-2.403s-4.5071 0.918-6.1084 2.403c2.5369 1.116 4.3092 3.645 4.3092 6.597s-1.7722 5.481-4.3092 6.597c1.6013 1.485 3.7424 2.403 6.1084 2.403s4.5071-0.918 6.1084-2.403c-2.5369-1.116-4.3092-3.645-4.3092-6.597z" opacity=".6"/>
+   <g id="Group" transform="translate(5,5)" fill="#777777" stroke-width="1.2854">
+    <path id="Path" d="m-0.3717 1.852c-1.0256 1.458-1.6283 3.231-1.6283 5.148s0.60274 3.69 1.6283 5.148c2.1771-0.693 3.7694-2.736 3.7694-5.148s-1.5923-4.455-3.7694-5.148z" />
+    <path d="m14.372 1.852c-2.1771 0.693-3.7694 2.736-3.7694 5.148s1.5923 4.455 3.7694 5.148c1.0256-1.458 1.6283-3.231 1.6283-5.148s-0.60274-3.69-1.6283-5.148z" />
+    <path d="m8.7992 7c0-2.952 1.7722-5.481 4.3092-6.597-1.6013-1.485-3.7424-2.403-6.1084-2.403s-4.5071 0.918-6.1084 2.403c2.5369 1.116 4.3092 3.645 4.3092 6.597s-1.7722 5.481-4.3092 6.597c1.6013 1.485 3.7424 2.403 6.1084 2.403s4.5071-0.918 6.1084-2.403c-2.5369-1.116-4.3092-3.645-4.3092-6.597z" />
    </g>
   </g>
  </g>
diff --git a/data/styles/clear/style-night/symbols/basketball-m.svg b/data/styles/clear/style-night/symbols/basketball-m.svg
index f9d30eeda2..b4c6df5ddc 100644
--- a/data/styles/clear/style-night/symbols/basketball-m.svg
+++ b/data/styles/clear/style-night/symbols/basketball-m.svg
@@ -2,15 +2,15 @@
  <title>basketball-m</title>
  <g fill="none" fill-rule="evenodd">
   <g id="basketball-m" fill-rule="nonzero">
-   <g id="Group" transform="matrix(1.2922 0 0 1.2922 2.9548 2.9548)" fill="#fff">
-    <path id="Path" d="m10.563 6.3h3.402c-0.112-1.127-0.497-2.177-1.078-3.08-1.211 0.581-2.093 1.715-2.324 3.08z" opacity=".6"/>
-    <path d="m3.437 6.3c-0.231-1.365-1.113-2.499-2.324-3.08-0.581 0.903-0.966 1.953-1.078 3.08z" opacity=".6"/>
-    <path d="m9.149 6.3c0.224-1.813 1.316-3.353 2.842-4.2-1.12-1.141-2.618-1.897-4.291-2.065v6.265z" opacity=".6"/>
-    <path d="m4.851 6.3h1.449v-6.265c-1.673 0.168-3.178 0.924-4.291 2.065 1.526 0.847 2.618 2.387 2.842 4.2z" opacity=".6"/>
-    <path d="m9.149 7.7h-1.449v6.265c1.673-0.168 3.178-0.924 4.291-2.065-1.526-0.847-2.618-2.387-2.842-4.2z" opacity=".6"/>
-    <path d="m1.113 10.78c1.204-0.581 2.093-1.722 2.324-3.08h-3.402c0.112 1.127 0.497 2.177 1.078 3.08z" opacity=".6"/>
-    <path d="m10.563 7.7c0.231 1.365 1.113 2.499 2.324 3.08 0.581-0.903 0.966-1.953 1.078-3.08z" opacity=".6"/>
-    <path d="m4.851 7.7c-0.224 1.813-1.316 3.353-2.842 4.2 1.12 1.141 2.618 1.897 4.291 2.065v-6.265z" opacity=".6"/>
+   <g id="Group" transform="matrix(1.2922 0 0 1.2922 2.9548 2.9548)" fill="#777777">
+    <path id="Path" d="m10.563 6.3h3.402c-0.112-1.127-0.497-2.177-1.078-3.08-1.211 0.581-2.093 1.715-2.324 3.08z" />
+    <path d="m3.437 6.3c-0.231-1.365-1.113-2.499-2.324-3.08-0.581 0.903-0.966 1.953-1.078 3.08z" />
+    <path d="m9.149 6.3c0.224-1.813 1.316-3.353 2.842-4.2-1.12-1.141-2.618-1.897-4.291-2.065v6.265z" />
+    <path d="m4.851 6.3h1.449v-6.265c-1.673 0.168-3.178 0.924-4.291 2.065 1.526 0.847 2.618 2.387 2.842 4.2z" />
+    <path d="m9.149 7.7h-1.449v6.265c1.673-0.168 3.178-0.924 4.291-2.065-1.526-0.847-2.618-2.387-2.842-4.2z" />
+    <path d="m1.113 10.78c1.204-0.581 2.093-1.722 2.324-3.08h-3.402c0.112 1.127 0.497 2.177 1.078 3.08z" />
+    <path d="m10.563 7.7c0.231 1.365 1.113 2.499 2.324 3.08 0.581-0.903 0.966-1.953 1.078-3.08z" />
+    <path d="m4.851 7.7c-0.224 1.813-1.316 3.353-2.842 4.2 1.12 1.141 2.618 1.897 4.291 2.065v-6.265z" />
    </g>
   </g>
  </g>
diff --git a/data/styles/clear/style-night/symbols/bench.svg b/data/styles/clear/style-night/symbols/bench.svg
index 5303348a7d..c9ac85abda 100644
--- a/data/styles/clear/style-night/symbols/bench.svg
+++ b/data/styles/clear/style-night/symbols/bench.svg
@@ -1,7 +1,7 @@
 <svg version="1.1" viewBox="0 0 15 12" xmlns="http://www.w3.org/2000/svg">
  <title>bench</title>
- <g id="Page-2:-Night" fill="none" opacity=".6">
-  <g id="bench" fill="#FFF">
+ <g id="Page-2:-Night">
+  <g id="bench" fill="#777777">
    <path d="m15 6.0004h-1.7592v-1.0008h0.87958v-2.9992h-0.87958v-1.0004h-0.87891v1.0004h-9.7238v-1.0004h-0.87891v1.0004h-0.87961v2.9992h0.87958v1.0008h-1.7592v2.9992h0.87961v3.0004h0.87891v-1.0004h11.483v1.0004h0.87891v-3.0004h0.87964v-2.9992zm-12.362-1.0008h9.7238v1.0008h-9.7238v-1.0008zm10.603 5.0008h-11.483v-1.0008h11.483v1.0008z"/>
   </g>
  </g>
diff --git a/data/styles/clear/style-night/symbols/bicycle-repair-station.svg b/data/styles/clear/style-night/symbols/bicycle-repair-station.svg
index 2dc9a423db..0e09d7af55 100644
--- a/data/styles/clear/style-night/symbols/bicycle-repair-station.svg
+++ b/data/styles/clear/style-night/symbols/bicycle-repair-station.svg
@@ -1 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><title>america-football-m</title><g transform="matrix(1.4286 0 0 1.3415 -5.1429 -3.323)" fill="none" fill-rule="evenodd"><g id="america-football-m" transform="matrix(.99 0 0 .99 .19 .041169)" fill-rule="nonzero"><path d="m7.7441 4.1168c-0.71026 3.935e-4 -1.3701 0.41171-1.7441 1h2.3691l0.62305 1-0.62305 1h-2.3672c0.37368 0.58774 1.0326 0.99897 1.7422 1 0.75824 0 1.4121-0.40423 1.7676-1h4.666c0.35542 0.59592 1.0112 1 1.7695 1 1.1337 0 2.0527-0.89543 2.0527-2 0-1.1046-0.91904-2-2.0527-2-0.75836-3e-7 -1.4141 0.40408-1.7695 1h-4.666c-0.35546-0.59577-1.0093-1-1.7676-1zm7.5781 1h1.25l0.62305 1-0.62305 1h-1.25l-0.62305-1zm0.28273 8.0748-0.99167-2.73c-0.16917-0.46083-0.60667-0.77-1.0967-0.77h-1.5167v1.1667h1.5167l0.85167 2.3333h-2.8058l-0.21-0.58333h0.6475v-1.1667h-2.9167v1.1667h1.0208l1.0617 2.9167h-0.39083c-0.25667-1.3008-1.3475-2.2633-2.7125-2.3275-1.6333-0.08167-3.0625 1.2775-3.0625 2.9108 0 1.6333 1.2833 2.9167 2.9167 2.9167 1.435 0 2.5958-0.98583 2.8583-2.3333h2.45c0.25667 1.3008 1.3475 2.2633 2.7125 2.3275 1.6333 0.07583 3.0625-1.2775 3.0625-2.9167 0-1.6333-1.2833-2.9167-2.9167-2.9167h-0.47833zm-6.0433 3.5c-0.23333 0.6825-0.86917 1.1667-1.645 1.1667-0.98 0-1.75-0.77-1.75-1.75s0.77-1.75 1.75-1.75c0.77583 0 1.4117 0.48417 1.645 1.1667h-1.645v1.1667zm3.6633-1.1667h-0.81667l-0.42583-1.1667h1.7675c-0.25667 0.33833-0.44333 0.72917-0.525 1.1667zm2.8583 2.3333c-0.98 0-1.75-0.77-1.75-1.75 0-0.5425 0.23917-1.0092 0.6125-1.33l0.56 1.54 1.0967-0.39667-0.56583-1.5575c0.0175 0 0.035-0.0058 0.0525-0.0058 0.98 0 1.75 0.77 1.75 1.75s-0.77583 1.75-1.7558 1.75z" fill="#fff" opacity=".6"/></g></g></svg>
+<svg version="1.1" viewBox="0 0 24 24" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><title>america-football-m</title><g transform="matrix(1.4286 0 0 1.3415 -5.1429 -3.323)" fill="none" fill-rule="evenodd"><g id="america-football-m" transform="matrix(.99 0 0 .99 .19 .041169)" fill-rule="nonzero"><path d="m7.7441 4.1168c-0.71026 3.935e-4 -1.3701 0.41171-1.7441 1h2.3691l0.62305 1-0.62305 1h-2.3672c0.37368 0.58774 1.0326 0.99897 1.7422 1 0.75824 0 1.4121-0.40423 1.7676-1h4.666c0.35542 0.59592 1.0112 1 1.7695 1 1.1337 0 2.0527-0.89543 2.0527-2 0-1.1046-0.91904-2-2.0527-2-0.75836-3e-7 -1.4141 0.40408-1.7695 1h-4.666c-0.35546-0.59577-1.0093-1-1.7676-1zm7.5781 1h1.25l0.62305 1-0.62305 1h-1.25l-0.62305-1zm0.28273 8.0748-0.99167-2.73c-0.16917-0.46083-0.60667-0.77-1.0967-0.77h-1.5167v1.1667h1.5167l0.85167 2.3333h-2.8058l-0.21-0.58333h0.6475v-1.1667h-2.9167v1.1667h1.0208l1.0617 2.9167h-0.39083c-0.25667-1.3008-1.3475-2.2633-2.7125-2.3275-1.6333-0.08167-3.0625 1.2775-3.0625 2.9108 0 1.6333 1.2833 2.9167 2.9167 2.9167 1.435 0 2.5958-0.98583 2.8583-2.3333h2.45c0.25667 1.3008 1.3475 2.2633 2.7125 2.3275 1.6333 0.07583 3.0625-1.2775 3.0625-2.9167 0-1.6333-1.2833-2.9167-2.9167-2.9167h-0.47833zm-6.0433 3.5c-0.23333 0.6825-0.86917 1.1667-1.645 1.1667-0.98 0-1.75-0.77-1.75-1.75s0.77-1.75 1.75-1.75c0.77583 0 1.4117 0.48417 1.645 1.1667h-1.645v1.1667zm3.6633-1.1667h-0.81667l-0.42583-1.1667h1.7675c-0.25667 0.33833-0.44333 0.72917-0.525 1.1667zm2.8583 2.3333c-0.98 0-1.75-0.77-1.75-1.75 0-0.5425 0.23917-1.0092 0.6125-1.33l0.56 1.54 1.0967-0.39667-0.56583-1.5575c0.0175 0 0.035-0.0058 0.0525-0.0058 0.98 0 1.75 0.77 1.75 1.75s-0.77583 1.75-1.7558 1.75z" fill="#777777"/></g></g></svg>
diff --git a/data/styles/clear/style-night/symbols/board.svg b/data/styles/clear/style-night/symbols/board.svg
index 90ab556451..9144cf121d 100644
--- a/data/styles/clear/style-night/symbols/board.svg
+++ b/data/styles/clear/style-night/symbols/board.svg
@@ -8,5 +8,5 @@
    </cc:Work>
   </rdf:RDF>
  </metadata>
- <path d="m0 0v14h1v-3h12v3h1v-14h-14zm1 1h12v9h-12zm3 2v1h6v-1zm-2 2v1h10v-1zm0 2v1h10v-1z" fill="#fff" opacity=".6" style="paint-order:markers stroke fill"/>
+ <path d="m0 0v14h1v-3h12v3h1v-14h-14zm1 1h12v9h-12zm3 2v1h6v-1zm-2 2v1h10v-1zm0 2v1h10v-1z" fill="#777777" style="paint-order:markers stroke fill"/>
 </svg>
diff --git a/data/styles/clear/style-night/symbols/bowling-m.svg b/data/styles/clear/style-night/symbols/bowling-m.svg
index 53bfdfd3f4..508a5aa377 100644
--- a/data/styles/clear/style-night/symbols/bowling-m.svg
+++ b/data/styles/clear/style-night/symbols/bowling-m.svg
@@ -2,12 +2,12 @@
  <title>bowls-m</title>
  <g fill="none" fill-rule="evenodd">
   <g id="bowls-m" fill-rule="nonzero">
-   <g id="Group" transform="translate(6,5)" fill="#fff">
-    <g transform="matrix(1.2857 0 0 1.2857 -1.8253 -2)" fill="#fff">
-     <path id="Shape" d="m7.9124 5.4783c-0.91974 0-1.7695 0.29522-2.4664 0.79313-0.32809-0.73957-0.57704-1.2369-0.57704-2.0105v-2.4348c0-1.0068-0.8193-1.8261-1.8261-1.8261s-1.8261 0.8193-1.8261 1.8261v2.4348c0 0.71765-0.21609 1.2003-0.49 1.8115-0.34087 0.76087-0.72739 1.6234-0.72739 3.0581 0 2.6229 1.3385 4.8696 2.4348 4.8696h1.2174c0.60139 0 1.0926-0.56548 1.4231-1.0914 0.75417 0.67565 1.747 1.0914 2.8377 1.0914 2.3496 0 4.2609-1.9113 4.2609-4.2609 0-2.3496-1.9119-4.2609-4.2609-4.2609zm-5.4783-3.6522c0-0.33539 0.2733-0.6087 0.6087-0.6087s0.6087 0.2733 0.6087 0.6087v1.8261h-1.2174zm1.1638 10.957h-1.1127c-0.32443-0.18139-1.2691-1.5564-1.2691-3.6522 0-1.1748 0.30191-1.8474 0.62087-2.5602 0.22887-0.51009 0.46261-1.0323 0.55574-1.7007h1.3002c0.092522 0.66835 0.32687 1.1912 0.55513 1.7007 0.08887 0.19783 0.17652 0.40478 0.2593 0.61843-0.53504 0.71217-0.85583 1.5936-0.85583 2.5504 0 0.79009 0.21974 1.5272 0.59591 2.1621-0.29096 0.58009-0.55757 0.82478-0.64948 0.88139zm4.3144 0c-1.6782 0-3.0435-1.3653-3.0435-3.0435 0-1.6782 1.3653-3.0435 3.0435-3.0435s3.0435 1.3653 3.0435 3.0435c0 1.6782-1.3659 3.0435-3.0435 3.0435z" opacity=".6"/>
-     <circle cx="7.9124" cy="9.7391" r="1" opacity=".6"/>
-     <circle cx="9.1298" cy="8.5217" r="1" opacity=".6"/>
-     <circle cx="6.695" cy="8.5217" r="1" opacity=".6"/>
+   <g id="Group" transform="translate(6,5)" fill="#777777">
+    <g transform="matrix(1.2857 0 0 1.2857 -1.8253 -2)" >
+     <path id="Shape" d="m7.9124 5.4783c-0.91974 0-1.7695 0.29522-2.4664 0.79313-0.32809-0.73957-0.57704-1.2369-0.57704-2.0105v-2.4348c0-1.0068-0.8193-1.8261-1.8261-1.8261s-1.8261 0.8193-1.8261 1.8261v2.4348c0 0.71765-0.21609 1.2003-0.49 1.8115-0.34087 0.76087-0.72739 1.6234-0.72739 3.0581 0 2.6229 1.3385 4.8696 2.4348 4.8696h1.2174c0.60139 0 1.0926-0.56548 1.4231-1.0914 0.75417 0.67565 1.747 1.0914 2.8377 1.0914 2.3496 0 4.2609-1.9113 4.2609-4.2609 0-2.3496-1.9119-4.2609-4.2609-4.2609zm-5.4783-3.6522c0-0.33539 0.2733-0.6087 0.6087-0.6087s0.6087 0.2733 0.6087 0.6087v1.8261h-1.2174zm1.1638 10.957h-1.1127c-0.32443-0.18139-1.2691-1.5564-1.2691-3.6522 0-1.1748 0.30191-1.8474 0.62087-2.5602 0.22887-0.51009 0.46261-1.0323 0.55574-1.7007h1.3002c0.092522 0.66835 0.32687 1.1912 0.55513 1.7007 0.08887 0.19783 0.17652 0.40478 0.2593 0.61843-0.53504 0.71217-0.85583 1.5936-0.85583 2.5504 0 0.79009 0.21974 1.5272 0.59591 2.1621-0.29096 0.58009-0.55757 0.82478-0.64948 0.88139zm4.3144 0c-1.6782 0-3.0435-1.3653-3.0435-3.0435 0-1.6782 1.3653-3.0435 3.0435-3.0435s3.0435 1.3653 3.0435 3.0435c0 1.6782-1.3659 3.0435-3.0435 3.0435z" />
+     <circle cx="7.9124" cy="9.7391" r="1" />
+     <circle cx="9.1298" cy="8.5217" r="1" />
+     <circle cx="6.695" cy="8.5217" r="1" />
     </g>
    </g>
   </g>
diff --git a/data/styles/clear/style-night/symbols/cemetery-m.svg b/data/styles/clear/style-night/symbols/cemetery-m.svg
index 1156d0fa1e..0d2ad7ffd7 100644
--- a/data/styles/clear/style-night/symbols/cemetery-m.svg
+++ b/data/styles/clear/style-night/symbols/cemetery-m.svg
@@ -2,8 +2,8 @@
  <title>tomb-m</title>
  <g fill="none" fill-rule="evenodd">
   <g id="tomb-m" fill-rule="nonzero">
-   <g id="tomb" transform="translate(6,6)" fill="#fff">
-    <path id="Shape" d="m5.6528-2.9971c-3.0905 0-5.5937 2.5061-5.5937 5.5966v6.1797h11.882v-6.1797c0-3.0905-2.5061-5.5966-5.5966-5.5966zm-1.8138 4.8025h4.322c0.29128 0 0.52743 0.23615 0.52743 0.52743 0 0.29128-0.23611 0.52743-0.52743 0.52743h-4.322c-0.29128 0-0.52743-0.23615-0.52743-0.52743 0-0.29128 0.23615-0.52743 0.52743-0.52743zm0 2.1097h4.322c0.29128 0 0.52743 0.23615 0.52743 0.52743 0 0.29128-0.23611 0.52743-0.52743 0.52743h-4.322c-0.29128 0-0.52743-0.23615-0.52743-0.52743 0-0.29128 0.23615-0.52743 0.52743-0.52743zm0 2.1097h4.322c0.29128 0 0.52743 0.23615 0.52743 0.52743 0 0.29128-0.23611 0.52743-0.52743 0.52743h-4.322c-0.29128 0-0.52743-0.23615-0.52743-0.52743 0-0.29128 0.23615-0.52743 0.52743-0.52743zm-5.1952 3.8092c-0.29128 0-0.52743 0.23615-0.52743 0.52743v1.3567h15.767v-1.3567c0-0.29128-0.23615-0.52743-0.52743-0.52743zm-1.1164 2.939c-0.29128 0-0.52743 0.23615-0.52743 0.52743v1.6966h18v-1.6966c0-0.29128-0.23615-0.52743-0.52743-0.52743z" fill="#fff" opacity=".6"/>
+   <g id="tomb" transform="translate(6,6)" fill="#777777">
+    <path id="Shape" d="m5.6528-2.9971c-3.0905 0-5.5937 2.5061-5.5937 5.5966v6.1797h11.882v-6.1797c0-3.0905-2.5061-5.5966-5.5966-5.5966zm-1.8138 4.8025h4.322c0.29128 0 0.52743 0.23615 0.52743 0.52743 0 0.29128-0.23611 0.52743-0.52743 0.52743h-4.322c-0.29128 0-0.52743-0.23615-0.52743-0.52743 0-0.29128 0.23615-0.52743 0.52743-0.52743zm0 2.1097h4.322c0.29128 0 0.52743 0.23615 0.52743 0.52743 0 0.29128-0.23611 0.52743-0.52743 0.52743h-4.322c-0.29128 0-0.52743-0.23615-0.52743-0.52743 0-0.29128 0.23615-0.52743 0.52743-0.52743zm0 2.1097h4.322c0.29128 0 0.52743 0.23615 0.52743 0.52743 0 0.29128-0.23611 0.52743-0.52743 0.52743h-4.322c-0.29128 0-0.52743-0.23615-0.52743-0.52743 0-0.29128 0.23615-0.52743 0.52743-0.52743zm-5.1952 3.8092c-0.29128 0-0.52743 0.23615-0.52743 0.52743v1.3567h15.767v-1.3567c0-0.29128-0.23615-0.52743-0.52743-0.52743zm-1.1164 2.939c-0.29128 0-0.52743 0.23615-0.52743 0.52743v1.6966h18v-1.6966c0-0.29128-0.23615-0.52743-0.52743-0.52743z" />
    </g>
   </g>
  </g>
diff --git a/data/styles/clear/style-night/symbols/chess-m.svg b/data/styles/clear/style-night/symbols/chess-m.svg
index 79bcab644c..4fcabb1117 100644
--- a/data/styles/clear/style-night/symbols/chess-m.svg
+++ b/data/styles/clear/style-night/symbols/chess-m.svg
@@ -1 +1 @@
-<svg id="SVGRoot" version="1.1" viewBox="0 0 24 24" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><g fill="#717065"><g fill="#fff" opacity=".6"><path d="m5.6019 10.312h-0.35156c-0.31201 0-0.5625 0.25049-0.5625 0.5625v0.5625c0 0.31201 0.25038 0.5625 0.53086 0.5625h0.5625c-0.00879 1.5163-0.19336 3.028-0.5625 4.5h4.5c-0.36914-1.4723-0.55371-2.9841-0.5625-4.5h0.53086c0.31201 0 0.5625-0.25049 0.5625-0.5625l0.06293-0.5625c0-0.31201-0.25038-0.5625-0.53086-0.5625h-0.35156l1.1911-3.1774c-0.0063-0.063985 0.0042-0.15891 0.0042-0.19406 0-0.31641-0.26016-0.56602-0.5625-0.56602h-2.0004v-1.125h0.5625c0.31092 0 0.5625-0.25158 0.5625-0.5625 0-0.31092-0.24961-0.5625-0.5625-0.5625h-0.5625l1.077e-4 -0.5625c8.2e-6 -0.31092-0.25171-0.5625-0.56249-0.5625s-0.5625 0.25158-0.5625 0.5625v0.5625h-0.56225c-0.31092 0-0.5625 0.25158-0.5625 0.5625 0 0.31092 0.25137 0.5625 0.5625 0.5625h0.5625v1.125h-1.9997c-0.29883 0-0.56461 0.23906-0.56461 0.55898 0 0.067851 0.012364 0.13588 0.037304 0.20078zm9.3477 3.2977-0.11602 2.8898h4.4578l-0.11426-2.8916 0.86133-0.72949c0.25488-0.21445 0.39902-0.52734 0.39902-0.86133v-2.0566c0-0.11953-0.09141-0.21094-0.24258-0.21094h-0.92707c-0.11865 0-0.21094 0.092285-0.21094 0.21094v0.91406h-0.87012v-0.91406c0.03235-0.11953-0.05906-0.21094-0.17859-0.21094h-1.8896c-0.11865 0-0.21094 0.092285-0.21094 0.21094v0.91406h-0.87012v-0.91406c0-0.11953-0.09141-0.21094-0.21094-0.21094h-0.92742c-0.12023 0-0.21164 0.091406-0.21164 0.21094v2.0609c0 0.32959 0.14502 0.6416 0.40008 0.85711zm1.5504 0.077344c0-0.31289 0.24961-0.5625 0.5625-0.5625 0.31289 0 0.5625 0.24961 0.5625 0.5625v1.125h-1.125zm-4.8129 5.4703-0.81211-0.40781v-0.5625c0-0.31289-0.24961-0.5625-0.5625-0.5625h-5.625c-0.31184 0-0.5625 0.24961-0.5625 0.5625v0.5625l-0.81281 0.40852c-0.19353 0.094218-0.31219 0.29109-0.31219 0.50203v0.77695c0 0.31289 0.25049 0.5625 0.5625 0.5625h7.875c0.31201 0 0.5625-0.25049 0.5625-0.5625v-0.77766c0-0.21023-0.11953-0.40711-0.31289-0.50203zm9 0-0.81211-0.40781v-0.5625c0-0.31201-0.25049-0.5625-0.5625-0.5625h-4.5c-0.31201 0-0.5625 0.25049-0.5625 0.5625v0.5625l-0.81281 0.40852c-0.19266 0.094218-0.31219 0.29109-0.31219 0.50203v0.77695c0 0.31201 0.25049 0.5625 0.5625 0.5625h6.75c0.31201 0 0.5625-0.25049 0.5625-0.5625v-0.77766c0-0.21023-0.11953-0.40711-0.31289-0.50203z" fill="#fff" stroke-width=".035156"/></g></g></svg>
+<svg id="SVGRoot" version="1.1" viewBox="0 0 24 24" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><g fill="#717065"><g fill="#777777"><path d="m5.6019 10.312h-0.35156c-0.31201 0-0.5625 0.25049-0.5625 0.5625v0.5625c0 0.31201 0.25038 0.5625 0.53086 0.5625h0.5625c-0.00879 1.5163-0.19336 3.028-0.5625 4.5h4.5c-0.36914-1.4723-0.55371-2.9841-0.5625-4.5h0.53086c0.31201 0 0.5625-0.25049 0.5625-0.5625l0.06293-0.5625c0-0.31201-0.25038-0.5625-0.53086-0.5625h-0.35156l1.1911-3.1774c-0.0063-0.063985 0.0042-0.15891 0.0042-0.19406 0-0.31641-0.26016-0.56602-0.5625-0.56602h-2.0004v-1.125h0.5625c0.31092 0 0.5625-0.25158 0.5625-0.5625 0-0.31092-0.24961-0.5625-0.5625-0.5625h-0.5625l1.077e-4 -0.5625c8.2e-6 -0.31092-0.25171-0.5625-0.56249-0.5625s-0.5625 0.25158-0.5625 0.5625v0.5625h-0.56225c-0.31092 0-0.5625 0.25158-0.5625 0.5625 0 0.31092 0.25137 0.5625 0.5625 0.5625h0.5625v1.125h-1.9997c-0.29883 0-0.56461 0.23906-0.56461 0.55898 0 0.067851 0.012364 0.13588 0.037304 0.20078zm9.3477 3.2977-0.11602 2.8898h4.4578l-0.11426-2.8916 0.86133-0.72949c0.25488-0.21445 0.39902-0.52734 0.39902-0.86133v-2.0566c0-0.11953-0.09141-0.21094-0.24258-0.21094h-0.92707c-0.11865 0-0.21094 0.092285-0.21094 0.21094v0.91406h-0.87012v-0.91406c0.03235-0.11953-0.05906-0.21094-0.17859-0.21094h-1.8896c-0.11865 0-0.21094 0.092285-0.21094 0.21094v0.91406h-0.87012v-0.91406c0-0.11953-0.09141-0.21094-0.21094-0.21094h-0.92742c-0.12023 0-0.21164 0.091406-0.21164 0.21094v2.0609c0 0.32959 0.14502 0.6416 0.40008 0.85711zm1.5504 0.077344c0-0.31289 0.24961-0.5625 0.5625-0.5625 0.31289 0 0.5625 0.24961 0.5625 0.5625v1.125h-1.125zm-4.8129 5.4703-0.81211-0.40781v-0.5625c0-0.31289-0.24961-0.5625-0.5625-0.5625h-5.625c-0.31184 0-0.5625 0.24961-0.5625 0.5625v0.5625l-0.81281 0.40852c-0.19353 0.094218-0.31219 0.29109-0.31219 0.50203v0.77695c0 0.31289 0.25049 0.5625 0.5625 0.5625h7.875c0.31201 0 0.5625-0.25049 0.5625-0.5625v-0.77766c0-0.21023-0.11953-0.40711-0.31289-0.50203zm9 0-0.81211-0.40781v-0.5625c0-0.31201-0.25049-0.5625-0.5625-0.5625h-4.5c-0.31201 0-0.5625 0.25049-0.5625 0.5625v0.5625l-0.81281 0.40852c-0.19266 0.094218-0.31219 0.29109-0.31219 0.50203v0.77695c0 0.31201 0.25049 0.5625 0.5625 0.5625h6.75c0.31201 0 0.5625-0.25049 0.5625-0.5625v-0.77766c0-0.21023-0.11953-0.40711-0.31289-0.50203z" stroke-width=".035156"/></g></g></svg>
diff --git a/data/styles/clear/style-night/symbols/chimney-m.svg b/data/styles/clear/style-night/symbols/chimney-m.svg
index fb28d59345..b40bd347bc 100644
--- a/data/styles/clear/style-night/symbols/chimney-m.svg
+++ b/data/styles/clear/style-night/symbols/chimney-m.svg
@@ -41,63 +41,47 @@
      id="Page-1"
      stroke="none"
      stroke-width="1"
-     fill="none"
      fill-rule="evenodd"
-     style="fill:#ffffff;fill-opacity:1;opacity:0.6"
+     fill="#777777"
      transform="matrix(1.3436877,0,0,1.3436877,-3.6630472,-4.1242524)">
     <g
        id="chimney-m"
-       fill="#FFFFFF"
-       fill-rule="nonzero"
-       style="fill:#ffffff;fill-opacity:1">
+       fill-rule="nonzero">
       <g
          id="chimney"
-         transform="translate(8,6)"
-         style="fill:#ffffff;fill-opacity:1">
+         transform="translate(8,6)">
         <polygon
            id="Path"
-           points="3.5294118,10.235294 0.70588235,10.235294 0.70588235,9.5294118 3.5294118,9.5294118 "
-           style="fill:#ffffff;fill-opacity:1" />
+           points="3.5294118,10.235294 0.70588235,10.235294 0.70588235,9.5294118 3.5294118,9.5294118 " />
         <polygon
            id="polygon14690"
-           points="2.1176471,12 0.70588235,12 0.70588235,10.941176 2.1176471,10.941176 "
-           style="fill:#ffffff;fill-opacity:1" />
+           points="2.1176471,12 0.70588235,12 0.70588235,10.941176 2.1176471,10.941176 " />
         <polygon
-           id="polygon14692"
-           points="2.4705882,8.8235294 0.70588235,8.8235294 0.70588235,7.7647059 2.4705882,7.7647059 "
-           style="fill:#ffffff;fill-opacity:1" />
+           id="polygon14692" />
         <polygon
            id="polygon14694"
-           points="5.6470588,12 2.8235294,12 2.8235294,10.941176 5.6470588,10.941176 "
-           style="fill:#ffffff;fill-opacity:1" />
+           points="5.6470588,12 2.8235294,12 2.8235294,10.941176 5.6470588,10.941176 " />
         <polygon
            id="polygon14696"
-           points="5.6470588,8.8235294 3.1764706,8.8235294 3.1764706,7.7647059 5.6470588,7.7647059 "
-           style="fill:#ffffff;fill-opacity:1" />
+           points="5.6470588,8.8235294 3.1764706,8.8235294 3.1764706,7.7647059 5.6470588,7.7647059 " />
         <polygon
            id="polygon14698"
-           points="5.6470588,10.235294 4.2352941,10.235294 4.2352941,9.5294118 5.6470588,9.5294118 "
-           style="fill:#ffffff;fill-opacity:1" />
+           points="5.6470588,10.235294 4.2352941,10.235294 4.2352941,9.5294118 5.6470588,9.5294118 " />
         <polygon
            id="polygon14700"
-           points="3.1764706,1.0588235 2.4705882,1.0588235 2.4705882,0.35294118 3.1764706,0.35294118 "
-           style="fill:#ffffff;fill-opacity:1" />
+           points="3.1764706,1.0588235 2.4705882,1.0588235 2.4705882,0.35294118 3.1764706,0.35294118 " />
         <polygon
            id="polygon14702"
-           points="1.4117647,2.1176471 0.70588235,2.1176471 0.70588235,1.4117647 1.4117647,1.4117647 "
-           style="fill:#ffffff;fill-opacity:1" />
+           points="1.4117647,2.1176471 0.70588235,2.1176471 0.70588235,1.4117647 1.4117647,1.4117647 " />
         <polygon
            id="polygon14704"
-           points="1.7647059,3.8823529 1.0588235,3.8823529 1.0588235,3.1764706 1.7647059,3.1764706 "
-           style="fill:#ffffff;fill-opacity:1" />
+           points="1.7647059,3.8823529 1.0588235,3.8823529 1.0588235,3.1764706 1.7647059,3.1764706 " />
         <polygon
            id="polygon14706"
-           points="6.3529412,5.6470588 3.1764706,5.6470588 0,5.6470588 0,7.0588235 3.1764706,7.0588235 6.3529412,7.0588235 "
-           style="fill:#ffffff;fill-opacity:1" />
+           points="6.3529412,5.6470588 3.1764706,5.6470588 0,5.6470588 0,7.0588235 3.1764706,7.0588235 6.3529412,7.0588235 " />
         <path
            d="m 9.5294118,0.35294118 c -0.5061647,0 -0.9766824,0.15232941 -1.3684706,0.41348235 C 7.8428235,0.30362353 7.3099059,0 6.7058824,0 5.7312706,0 4.9411765,0.79009412 4.9411765,1.7647059 c 0,0.024588 8.706e-4,0.048965 0.00186,0.073294 -0.5035294,0.1771765 -0.8645882,0.6567059 -0.8645882,1.2208235 0,0.024565 8.235e-4,0.048965 0.00219,0.073177 C 3.612,3.2967529 3.2668706,3.7234118 3.2210588,4.2364235 c -0.014847,-4.706e-4 -0.029624,-0.00113 -0.044588,-0.00113 -0.5224706,0 -0.9783059,0.2840235 -1.2224235,0.7058824 h 3.7088 c 0.090094,-0.1766824 0.1410588,-0.3765883 0.1410588,-0.5882353 0,-0.024565 -8.235e-4,-0.048965 -0.00219,-0.073176 0.3571295,-0.1255529 0.6423765,-0.4032 0.7782589,-0.7553176 0.041624,0.00294 0.083506,0.00496 0.1258823,0.00496 0.1518118,0 0.2991294,-0.0192 0.4397177,-0.055247 0.2856,1.0487765 1.2445647,1.8199529 2.3838353,1.8199529 C 10.893882,5.2941176 12,4.188 12,2.8235294 12,1.4590588 10.893882,0.35294118 9.5294118,0.35294118 Z"
-           id="path14708"
-           style="fill:#ffffff;fill-opacity:1" />
+           id="path14708" />
       </g>
     </g>
   </g>
diff --git a/data/styles/clear/style-night/symbols/climbing-m.svg b/data/styles/clear/style-night/symbols/climbing-m.svg
index b197eb0e45..1c2e2a4a5a 100644
--- a/data/styles/clear/style-night/symbols/climbing-m.svg
+++ b/data/styles/clear/style-night/symbols/climbing-m.svg
@@ -2,10 +2,10 @@
  <title>climbing-m</title>
  <g fill="none" fill-rule="evenodd">
   <g id="climbing-m" fill-rule="nonzero">
-   <g id="climbing-silhouette" transform="translate(6,6)" fill="#fff">
-    <g transform="matrix(1.6132 0 0 1.6132 -3.0024 -3.6586)" fill="#fff">
-     <path id="Path" d="m1.9535 2.1329c0.75051-0.59611 0.4697-1.8613-0.46726-2.0959-0.82975-0.2086-1.5992 0.49401-1.4706 1.3425 0.13688 0.90292 1.2192 1.3235 1.9378 0.75341z" opacity=".6"/>
-     <path id="Shape" d="m2.7293 2.836c-0.14685-0.29003-0.50886-0.42374-0.80908-0.29855l-1.1458 0.47845c-0.20664 0.086542-0.33064 0.27496-0.34497 0.48015l-0.004144-0.00778s-0.48015 1.3743 0 2.2821c0.33379 0.63112 1.0692 0.94963 1.4869 1.0853l0.1663 0.35616c0.00534 0.011161 0.012661 0.020441 0.018229 0.031119l0.011186 0.023848 0.00219-9.661e-4c0.11329 0.19716 0.30633 0.32504 0.52172 0.35908-0.13492 0.75852-0.081432 1.8661 0.97513 2.7715 0.027712 0.02385 0.061754 0.03549 0.095797 0.03549 0.041314 0 0.082653-0.01726 0.11158-0.0513 0.052983-0.06176 0.045941-0.15463-0.016042-0.20761-0.99214-0.85068-1.0123-1.8803-0.87326-2.5615 0.016297-0.00412 0.032568-0.00582 0.048864-0.010958l2.8972-0.94447 3.2772 2.0757c0.082932 0.052271 0.17214 0.084585 0.26306 0.10114l0.7517 2.1047c0.10963 0.3063 0.3749 0.72203 0.5927 0.92845 0.21808 0.20639 0.39506 0.11014 0.39557-0.21491l0.0085-10.054c0-0.36224-0.291-0.65301-0.65275-0.65301h-6.7124c-0.079754-0.11451-0.21201-0.18964-0.36201-0.18964h-0.36808c-0.14441 0-0.27981 0.070754-0.36249 0.18938-0.082424 0.1184-0.1021 0.26985-0.051788 0.40551l0.76144 2.0587-0.37197 0.042559zm3.9027-0.29492c0.31607 0.077059 0.60656 0.39872 0.64886 0.7184 0.042305 0.31945 0.32916 0.65494 0.6406 0.74903l1.4968 0.45196c0.31144 0.094093 0.63526 0.38947 0.72303 0.65982 0.08751 0.27033 0.0525 0.73055-0.0795 1.0279l-0.49086 1.1084-3.2047-2.0295c-0.18623-0.11743-0.41331-0.14634-0.62237-0.078025l-1.2914 0.42107c0.51491-0.52586 1.4385-1.6758 1.4927-3.1962zm-2.56 1.6807c0.13492-0.015559 0.25503-0.091881 0.32601-0.20761 0.070983-0.11573 0.085093-0.25747 0.037932-0.38461l-0.66005-1.7842 1.8763 0.45707c-0.030636 1.6328-1.1492 2.8264-1.5666 3.2157l-0.62019-1.227z" opacity=".6"/>
+   <g id="climbing-silhouette" transform="translate(6,6)" fill="#777777">
+    <g transform="matrix(1.6132 0 0 1.6132 -3.0024 -3.6586)" >
+     <path id="Path" d="m1.9535 2.1329c0.75051-0.59611 0.4697-1.8613-0.46726-2.0959-0.82975-0.2086-1.5992 0.49401-1.4706 1.3425 0.13688 0.90292 1.2192 1.3235 1.9378 0.75341z" />
+     <path id="Shape" d="m2.7293 2.836c-0.14685-0.29003-0.50886-0.42374-0.80908-0.29855l-1.1458 0.47845c-0.20664 0.086542-0.33064 0.27496-0.34497 0.48015l-0.004144-0.00778s-0.48015 1.3743 0 2.2821c0.33379 0.63112 1.0692 0.94963 1.4869 1.0853l0.1663 0.35616c0.00534 0.011161 0.012661 0.020441 0.018229 0.031119l0.011186 0.023848 0.00219-9.661e-4c0.11329 0.19716 0.30633 0.32504 0.52172 0.35908-0.13492 0.75852-0.081432 1.8661 0.97513 2.7715 0.027712 0.02385 0.061754 0.03549 0.095797 0.03549 0.041314 0 0.082653-0.01726 0.11158-0.0513 0.052983-0.06176 0.045941-0.15463-0.016042-0.20761-0.99214-0.85068-1.0123-1.8803-0.87326-2.5615 0.016297-0.00412 0.032568-0.00582 0.048864-0.010958l2.8972-0.94447 3.2772 2.0757c0.082932 0.052271 0.17214 0.084585 0.26306 0.10114l0.7517 2.1047c0.10963 0.3063 0.3749 0.72203 0.5927 0.92845 0.21808 0.20639 0.39506 0.11014 0.39557-0.21491l0.0085-10.054c0-0.36224-0.291-0.65301-0.65275-0.65301h-6.7124c-0.079754-0.11451-0.21201-0.18964-0.36201-0.18964h-0.36808c-0.14441 0-0.27981 0.070754-0.36249 0.18938-0.082424 0.1184-0.1021 0.26985-0.051788 0.40551l0.76144 2.0587-0.37197 0.042559zm3.9027-0.29492c0.31607 0.077059 0.60656 0.39872 0.64886 0.7184 0.042305 0.31945 0.32916 0.65494 0.6406 0.74903l1.4968 0.45196c0.31144 0.094093 0.63526 0.38947 0.72303 0.65982 0.08751 0.27033 0.0525 0.73055-0.0795 1.0279l-0.49086 1.1084-3.2047-2.0295c-0.18623-0.11743-0.41331-0.14634-0.62237-0.078025l-1.2914 0.42107c0.51491-0.52586 1.4385-1.6758 1.4927-3.1962zm-2.56 1.6807c0.13492-0.015559 0.25503-0.091881 0.32601-0.20761 0.070983-0.11573 0.085093-0.25747 0.037932-0.38461l-0.66005-1.7842 1.8763 0.45707c-0.030636 1.6328-1.1492 2.8264-1.5666 3.2157l-0.62019-1.227z" />
     </g>
    </g>
   </g>
diff --git a/data/styles/clear/style-night/symbols/cricket-m.svg b/data/styles/clear/style-night/symbols/cricket-m.svg
index 3f87692bae..c0fc6b5373 100644
--- a/data/styles/clear/style-night/symbols/cricket-m.svg
+++ b/data/styles/clear/style-night/symbols/cricket-m.svg
@@ -2,11 +2,11 @@
  <title>cricket-m</title>
  <g fill="none" fill-rule="evenodd">
   <g id="cricket-m" fill-rule="nonzero">
-   <g id="Group" transform="translate(5,5)" fill="#fff">
-    <g transform="matrix(1.2875 0 0 1.2875 -2.0248 -1.8243)" fill="#fff">
-     <path transform="translate(0,1.4)" d="m9.135 6.167-5.943-5.943c-0.273-0.273-0.714-0.273-0.987 0l-1.981 1.981c-0.273 0.273-0.273 0.714 0 0.987l5.943 5.943c0.273 0.273 0.714 0.273 0.987 0l1.981-1.981c0.273-0.273 0.273-0.714 0-0.987z" opacity=".6"/>
-     <path transform="translate(0,1.4)" d="m8.638 9.632 2.471 2.471c0.273 0.273 0.721 0.273 0.994 0s0.273-0.721 0-0.994l-2.471-2.471z" opacity=".6"/>
-     <circle cx="11.55" cy="2.45" r="2.45" opacity=".6"/>
+   <g id="Group" transform="translate(5,5)" fill="#777777">
+    <g transform="matrix(1.2875 0 0 1.2875 -2.0248 -1.8243)" >
+     <path transform="translate(0,1.4)" d="m9.135 6.167-5.943-5.943c-0.273-0.273-0.714-0.273-0.987 0l-1.981 1.981c-0.273 0.273-0.273 0.714 0 0.987l5.943 5.943c0.273 0.273 0.714 0.273 0.987 0l1.981-1.981c0.273-0.273 0.273-0.714 0-0.987z" />
+     <path transform="translate(0,1.4)" d="m8.638 9.632 2.471 2.471c0.273 0.273 0.721 0.273 0.994 0s0.273-0.721 0-0.994l-2.471-2.471z" />
+     <circle cx="11.55" cy="2.45" r="2.45" />
     </g>
    </g>
   </g>
diff --git a/data/styles/clear/style-night/symbols/curling-m.svg b/data/styles/clear/style-night/symbols/curling-m.svg
index 1f3f826ef6..839bd6df73 100644
--- a/data/styles/clear/style-night/symbols/curling-m.svg
+++ b/data/styles/clear/style-night/symbols/curling-m.svg
@@ -2,12 +2,12 @@
  <title>curling-m</title>
  <g fill="none" fill-rule="evenodd">
   <g id="curling-m" fill-rule="nonzero">
-   <g id="curling" transform="translate(5,6)" fill="#fff">
-    <g transform="matrix(1.2857 0 0 1.2857 .57142 -1.9277)" fill="#fff">
-     <path id="Path" d="m-1.9009 7.8067c-0.060562 0.26479-0.099121 0.53748-0.099121 0.82031 0 0.28284 0.038559 0.55553 0.099121 0.82031h13.802c0.06056-0.26479 0.09912-0.53748 0.09912-0.82031 0-0.28284-0.03866-0.55553-0.09912-0.82031z" opacity=".6"/>
-     <path d="m1.3086 4.9653c-1.265 0.1427-2.3586 0.92777-2.9066 2.0211h13.196c-0.54805-1.0933-1.6417-1.8784-2.9067-2.0211v-1.6703h-6.1524c-0.67954 0-1.2305 0.55093-1.2305 1.2305z" opacity=".6"/>
-     <path d="m-1.598 10.268c0.60648 1.2102 1.8733 2.0508 3.3167 2.0508h6.5625c1.4435 0 2.7102-0.84061 3.3167-2.0508z" opacity=".6"/>
-     <path d="m1.3086 0.42383c0 0.67954 0.55093 1.2305 1.2305 1.2305h3.6914c0.4531 0 0.82031 0.36722 0.82031 0.82031h1.6406v-0.41016c0-1.1326-0.91815-2.0508-2.0508-2.0508h-4.9219c-0.22655 0-0.41016 0.18361-0.41016 0.41016z" opacity=".6"/>
+   <g id="curling" transform="translate(5,6)" fill="#777777">
+    <g transform="matrix(1.2857 0 0 1.2857 .57142 -1.9277)" >
+     <path id="Path" d="m-1.9009 7.8067c-0.060562 0.26479-0.099121 0.53748-0.099121 0.82031 0 0.28284 0.038559 0.55553 0.099121 0.82031h13.802c0.06056-0.26479 0.09912-0.53748 0.09912-0.82031 0-0.28284-0.03866-0.55553-0.09912-0.82031z" />
+     <path d="m1.3086 4.9653c-1.265 0.1427-2.3586 0.92777-2.9066 2.0211h13.196c-0.54805-1.0933-1.6417-1.8784-2.9067-2.0211v-1.6703h-6.1524c-0.67954 0-1.2305 0.55093-1.2305 1.2305z" />
+     <path d="m-1.598 10.268c0.60648 1.2102 1.8733 2.0508 3.3167 2.0508h6.5625c1.4435 0 2.7102-0.84061 3.3167-2.0508z" />
+     <path d="m1.3086 0.42383c0 0.67954 0.55093 1.2305 1.2305 1.2305h3.6914c0.4531 0 0.82031 0.36722 0.82031 0.82031h1.6406v-0.41016c0-1.1326-0.91815-2.0508-2.0508-2.0508h-4.9219c-0.22655 0-0.41016 0.18361-0.41016 0.41016z" />
     </g>
    </g>
   </g>
diff --git a/data/styles/clear/style-night/symbols/diving-m.svg b/data/styles/clear/style-night/symbols/diving-m.svg
index 71dfc4c6d8..e7a07d4856 100644
--- a/data/styles/clear/style-night/symbols/diving-m.svg
+++ b/data/styles/clear/style-night/symbols/diving-m.svg
@@ -2,7 +2,7 @@
  <title>diving-m</title>
  <g fill="none" fill-rule="evenodd">
   <g id="diving-m" fill-rule="nonzero">
-   <path id="Shape" d="m12.34 10.467 0.12411 1.9712-1.2998 0.08211-0.12442-1.9712zm8.5907 1.7328c-0.66476 0.06853-1.1293-0.82455-1.1293-2.4247-0.54822-0.49486-3.1359 2.21-3.1359 2.21l0.01674 0.036c-0.58549 0.40991-1.1823 0.80181-1.7789 1.194 0.29843-0.8356 0.58549-1.6769 0.83529-2.5302 0.0072-0.02685 0.01358-0.05274 0.01863-0.07863l2.2014-1.9848c-1.4672-0.59655-0.90602-1.4239-2.5068-2.0909-0.4778 0.14306-0.98087 2.9666-1.0841 3.5682-0.03284 0.05495-0.05937 0.11622-0.08021 0.18569-0.27254 0.93508-0.59212 1.8541-0.92024 2.7699-2.1616-0.63633-4.4307-0.30127-6.5929 0.24601-1.1265 0.28517-1.1299 1.5942-0.47591 2.2036 0.084002 0.14622 0.23338 0.25801 0.46107 0.29748 1.3036 0.22548 2.4582 0.76897 3.5335 1.5307 0.79423 0.56149 1.5455-0.74339 0.7595-1.3001-0.37201-0.26338-0.76012-0.50149-1.1599-0.71686 1.116-0.10548 2.2295-0.03095 3.3393 0.38685 0.48349 0.18127 1.0188-0.05432 1.3333-0.44149 1.0333-0.72318 2.1121-1.3816 3.1381-2.1177 0.02716-0.01958 0.05179-0.0401 0.07421-0.06063 1.1426-0.28959 3.6708-0.93571 3.1532-0.88234zm-16.01 1.764c0.56338-1.1539 1.1921-1.1514 2.0486-1.1495 0.37201 0.0015 0.7895 0.0032 1.2291-0.10485l2.7294-0.17242-0.12442-1.9718-3.5338 0.22295c-0.54475 0.03442-0.95813 0.5037-0.92371 1.0481 0.00885 0.13832 0.045791 0.2678 0.10453 0.3837-0.7715 0.042-1.5316 0.28548-2.1357 1.6178-0.54633 0.01484-1.0513 0.36254-1.237 0.91076-0.12853 0.37833-0.077687 0.77307 0.10516 1.0952l-0.18285 0.5397 1.2727 0.4317 0.098529-0.29148c0.056528-9.48e-4 0.11242-0.0054 0.168-0.01327 0.19643 0.17369 0.49486 0.17874 0.69602 9.48e-4 0.14464-0.12727 0.20022-0.31769 0.16611-0.49422 0.094108-0.1178 0.17085-0.25327 0.22232-0.40454 0.22232-0.6556-0.090319-1.363-0.70297-1.6488z" fill="#fff" opacity=".6" stroke-width="1.2857"/>
+   <path id="Shape" d="m12.34 10.467 0.12411 1.9712-1.2998 0.08211-0.12442-1.9712zm8.5907 1.7328c-0.66476 0.06853-1.1293-0.82455-1.1293-2.4247-0.54822-0.49486-3.1359 2.21-3.1359 2.21l0.01674 0.036c-0.58549 0.40991-1.1823 0.80181-1.7789 1.194 0.29843-0.8356 0.58549-1.6769 0.83529-2.5302 0.0072-0.02685 0.01358-0.05274 0.01863-0.07863l2.2014-1.9848c-1.4672-0.59655-0.90602-1.4239-2.5068-2.0909-0.4778 0.14306-0.98087 2.9666-1.0841 3.5682-0.03284 0.05495-0.05937 0.11622-0.08021 0.18569-0.27254 0.93508-0.59212 1.8541-0.92024 2.7699-2.1616-0.63633-4.4307-0.30127-6.5929 0.24601-1.1265 0.28517-1.1299 1.5942-0.47591 2.2036 0.084002 0.14622 0.23338 0.25801 0.46107 0.29748 1.3036 0.22548 2.4582 0.76897 3.5335 1.5307 0.79423 0.56149 1.5455-0.74339 0.7595-1.3001-0.37201-0.26338-0.76012-0.50149-1.1599-0.71686 1.116-0.10548 2.2295-0.03095 3.3393 0.38685 0.48349 0.18127 1.0188-0.05432 1.3333-0.44149 1.0333-0.72318 2.1121-1.3816 3.1381-2.1177 0.02716-0.01958 0.05179-0.0401 0.07421-0.06063 1.1426-0.28959 3.6708-0.93571 3.1532-0.88234zm-16.01 1.764c0.56338-1.1539 1.1921-1.1514 2.0486-1.1495 0.37201 0.0015 0.7895 0.0032 1.2291-0.10485l2.7294-0.17242-0.12442-1.9718-3.5338 0.22295c-0.54475 0.03442-0.95813 0.5037-0.92371 1.0481 0.00885 0.13832 0.045791 0.2678 0.10453 0.3837-0.7715 0.042-1.5316 0.28548-2.1357 1.6178-0.54633 0.01484-1.0513 0.36254-1.237 0.91076-0.12853 0.37833-0.077687 0.77307 0.10516 1.0952l-0.18285 0.5397 1.2727 0.4317 0.098529-0.29148c0.056528-9.48e-4 0.11242-0.0054 0.168-0.01327 0.19643 0.17369 0.49486 0.17874 0.69602 9.48e-4 0.14464-0.12727 0.20022-0.31769 0.16611-0.49422 0.094108-0.1178 0.17085-0.25327 0.22232-0.40454 0.22232-0.6556-0.090319-1.363-0.70297-1.6488z" fill="#777777" stroke-width="1.2857"/>
   </g>
  </g>
 </svg>
diff --git a/data/styles/clear/style-night/symbols/dog_park-m.svg b/data/styles/clear/style-night/symbols/dog_park-m.svg
index 878e1cb408..078c23c272 100644
--- a/data/styles/clear/style-night/symbols/dog_park-m.svg
+++ b/data/styles/clear/style-night/symbols/dog_park-m.svg
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
     <title>dog_park-m</title>
-    <g fill="none" fill-rule="evenodd" opacity="0.6">
+    <g fill="none" fill-rule="evenodd" >
         <g id="dog_park-m" fill-rule="nonzero">
             <path id="Shape"
                 d="m19.05 6.3925h-1.88l-0.2103-0.42036c-0.1592-0.31845-0.4847-0.51962-0.8407-0.51964h-1.5752l-0.8013-0.80135c-0.2964-0.29609-0.8025-0.08636-0.8025 0.33223v4.4015l3.76 1.3427v-1.0452h0.9399c1.0384 0 1.88-0.84159 1.88-1.88v-0.93999c0-0.25968-0.2103-0.47-0.47-0.47zm-3.29 1.41c-0.2597 0-0.47-0.21032-0.47-0.47 0-0.25967 0.2103-0.47 0.47-0.47s0.47 0.21033 0.47 0.47c0 0.25968-0.2103 0.47-0.47 0.47zm-8.46 2.35c-0.51817 0-0.94-0.42181-0.94-0.93998 0-0.51905-0.42094-0.93999-0.93999-0.93999s-0.94 0.42094-0.94 0.93999c0 1.2237 0.78813 2.2575 1.88 2.6467v6.2833c0 0.2596 0.21032 0.47 0.47 0.47h1.88c0.25967 0 0.47-0.2104 0.47-0.47v-3.29h4.7v3.29c0 0.2596 0.2103 0.47 0.47 0.47h1.88c0.2597 0 0.47-0.2104 0.47-0.47v-6.4169l-4.4048-1.5731z"
-                fill="#fff" />
+                fill="#777777" />
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/dot-m.svg b/data/styles/clear/style-night/symbols/dot-m.svg
index 77840de3e9..143cc2df22 100644
--- a/data/styles/clear/style-night/symbols/dot-m.svg
+++ b/data/styles/clear/style-night/symbols/dot-m.svg
@@ -1,6 +1,6 @@
 <svg viewBox="0 0 5 5" xmlns="http://www.w3.org/2000/svg">
- <g fill="#FFF" fill-rule="evenodd">
-  <circle cx="2.5" cy="2.5" r="2.5" opacity=".4"/>
-  <circle cx="2.5" cy="2.5" r="1.667" opacity=".6"/>
+ <g>
+  <circle cx="2.5" cy="2.5" r="2.5" fill="#000"/>
+  <circle cx="2.5" cy="2.5" r="1.667" fill="#777777"/>
  </g>
 </svg>
diff --git a/data/styles/clear/style-night/symbols/elevator.svg b/data/styles/clear/style-night/symbols/elevator.svg
index 817792f976..c2e75f6cdc 100644
--- a/data/styles/clear/style-night/symbols/elevator.svg
+++ b/data/styles/clear/style-night/symbols/elevator.svg
@@ -1,5 +1,5 @@
 <svg id="elevator" viewBox="0 0 15 15" xmlns="http://www.w3.org/2000/svg">
- <g id="Page-2:-Night" fill="#FFF" opacity=".6">
+ <g id="Page-2:-Night" fill="#777777">
   <path d="M11,1H4A1,1,0,0,0,3,2V13a1,1,0,0,0,1,1h7a1,1,0,0,0,1-1V2A1,1,0,0,0,11,1ZM7.5,12.5l-2-4h4Zm-2-6,2-4,2,4Z"/>
  </g>
 </svg>
diff --git a/data/styles/clear/style-night/symbols/entrance-s.svg b/data/styles/clear/style-night/symbols/entrance-s.svg
index 4a760265b1..9e2a3ddd1f 100644
--- a/data/styles/clear/style-night/symbols/entrance-s.svg
+++ b/data/styles/clear/style-night/symbols/entrance-s.svg
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg id="entrance-s" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 15 15" fill="#FFF" opacity=".6">
-  <path d="M6.554,9.639a.5.5,0,0,0,.707.707L9.928,7.669a.25.25,0,0,0,0-.354h0L7.261,4.639a.5.5,0,0,0-.707.707L8.2,7H1.5a.5.5,0,0,0,0,1H8.2ZM12,1H5.5a.5.5,0,0,0,0,1h6a.5.5,0,0,1,.5.5v10a.5.5,0,0,1-.5.5H5.25a.5.5,0,0,0,0,1H12a1,1,0,0,0,1-1V2A1,1,0,0,0,12,1Z"/>
+<svg id="entrance-s" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 15 15">
+  <path d="M6.554,9.639a.5.5,0,0,0,.707.707L9.928,7.669a.25.25,0,0,0,0-.354h0L7.261,4.639a.5.5,0,0,0-.707.707L8.2,7H1.5a.5.5,0,0,0,0,1H8.2ZM12,1H5.5a.5.5,0,0,0,0,1h6a.5.5,0,0,1,.5.5v10a.5.5,0,0,1-.5.5H5.25a.5.5,0,0,0,0,1H12a1,1,0,0,0,1-1V2A1,1,0,0,0,12,1Z" fill="#777777"/>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/equestrian-m.svg b/data/styles/clear/style-night/symbols/equestrian-m.svg
index 53b90722ca..0f3d7dbf05 100644
--- a/data/styles/clear/style-night/symbols/equestrian-m.svg
+++ b/data/styles/clear/style-night/symbols/equestrian-m.svg
@@ -2,10 +2,10 @@
  <title>equestrian-m</title>
  <g fill="none" fill-rule="evenodd">
   <g id="equestrian-m" fill-rule="nonzero">
-   <g id="equestrian-race" transform="translate(5,6)" fill="#fff">
-    <g transform="matrix(1.2877 0 0 1.2877 -2 -2.2964)" fill="#fff">
-     <path id="Path" d="m8.338 2.7604c0.50898 0.41577 1.259 0.34036 1.6745-0.16838 0.13596-0.16606 0.21396-0.35864 0.24718-0.5561l0.12175 0.055354c0.12977 0.058962 0.28011-0.00232 0.28681-0.14442 0.0046-0.099885-0.0072-0.22271-0.05974-0.35477-0.09369-0.23633 0.19385-1.1127-0.71212-1.5246-0.64798-0.29451-1.4768 0.4526-1.737 0.73966-0.079558 0.088065-0.061546 0.19902 0.020058 0.26853-0.00307 0.00361-0.00695 0.00617-0.010042 0.010042-0.41575 0.50895-0.34031 1.2589 0.16867 1.6747z" opacity=".6"/>
-     <path d="m7.2974 3.0756-1.7448 2.7529c-0.1712-0.012358-0.33829-0.020596-0.49533-0.020596-1.0476 0-1.6129 0.26826-1.9162 0.52777-0.24869-0.090354-1.0519-0.33829-1.7069-0.048138-0.35013 0.15527-0.59987 0.43817-0.74197 0.84059l-0.080823 0.22938c-0.47786 1.3503-0.71755 2.0282-0.56643 2.6455 0.0089923 0.03632 0.033196 0.06693 0.066688 0.08392 0.018281 0.0095 0.038365 0.01416 0.05845 0.01416 0.016477 0 0.032954-0.0031 0.04865-0.0095 0.015696-0.0064 1.5792-0.66449 1.5818-2.2874 5.115e-4 -0.20055 0.054061-0.33239 0.16426-0.40239 0.2286-0.14573 0.66756-0.0196 0.89027 0.069246v0.4333c0 0.13747-0.012088 0.36147-0.027031 0.49945l-0.060254 0.55144c-0.012869 0.11765-0.085723 0.30507-0.15626 0.40086l-2.143 2.9095c-0.15088 0.20494-0.11275 0.35582-0.076462 0.42765 0.036292 0.07183 0.13518 0.19231 0.38952 0.19231h0.40008c0.32337 0 0.7353-0.19718 0.93816-0.44873l2.2385-2.7759c0.057912-0.071831 0.19129-0.12562 0.29502-0.1089 0.075169 0.011846 0.17198 0.025496 0.28345 0.039415l-0.2366 0.26799c-0.28218 0.32003-0.26826 0.78885 0.031931 1.0476 0.29968 0.25897 0.76876 0.20674 1.0468-0.11609l0.94715-1.0991c0.3038-0.00102 0.61377-0.010015 0.92271-0.028323 1.2795-0.075169 1.9785-0.27728 2.3397-0.4333 0.083651-0.036023 0.20184-0.018765 0.25386 0.038365l1.6616 1.8264c0.05382 0.05947 0.05896 0.16735 0.01058 0.23146l-0.71341 0.94201c-0.15397 0.20314-0.11738 0.35374-0.0816 0.42504 0.03551 0.07159 0.13335 0.1918 0.38823 0.1918h0.43201c0.32157 0 0.73915-0.18922 0.9513-0.43096l0.88615-1.0105c0.1354-0.15473 0.13927-0.40035 0.0088-0.55919l-2.1477-2.6106c-0.06489-0.079046 0.01287-0.19126 0.02908-0.21291 0.07929-0.10583 0.12051-0.22244 0.12334-0.3468 2e-3 -0.097031-0.02703-0.20879-0.05484-0.31691-0.01879-0.071831-0.03783-0.14625-0.04222-0.19799-0.02213-0.27058-0.0036-0.54452 0.01879-0.74068 0.20211 0.15446 0.47654 0.16552 0.69795 0.1743 0.09498 0.00388 0.18458 0.00746 0.25386 0.021108 0.09192 0.018012 0.30353 0.15163 0.41733 0.22346l0.03758 0.023692c0.27316 0.17069 0.59524 0.1802 0.75177 0.013111 0.14495-0.15473 0.14312-0.4266-0.0054-0.7273-0.03915-0.078777-0.08163-0.16552-0.11895-0.2433-0.0564-0.11714-0.10659-0.32335-0.12075-0.44746-0.02935-0.2572-0.08031-0.49533-0.15112-0.708-0.03758-0.11275-0.06462-0.30918-0.043-0.42915l0.07312-0.39905c0.029643-0.16092 7.82e-4 -0.30353-0.080553-0.40137-0.10836-0.13001-0.29893-0.16501-0.5033-0.090112l-0.40498 0.1488c-0.10015 0.036831-0.30173 0.0574-0.43974 0.044288-0.07363-0.0067-0.15112-0.010796-0.2317-0.010796-0.63514 0-1.2095 0.2541-1.6608 0.73478-0.44383 0.47293-0.84264 0.86221-1.3465 1.1313l-0.13413-0.14213 0.39106-1.2692c0.015185-0.049431 0.020085-0.098861 0.020623-0.14805l0.020596-0.032173c0.038096-0.13696-0.035269-0.29658-0.16375-0.35606l-0.073123-0.033977c-0.043481-0.030881-0.091135-0.057158-0.14468-0.073635-0.00848-0.00258-0.016988-0.00283-0.025469-0.00514l-1.0586-0.4907c-0.13007-0.059233-0.29637-0.010313-0.37232 0.10966z" opacity=".6"/>
+   <g id="equestrian-race" transform="translate(5,6)" fill="#777777">
+    <g transform="matrix(1.2877 0 0 1.2877 -2 -2.2964)" >
+     <path id="Path" d="m8.338 2.7604c0.50898 0.41577 1.259 0.34036 1.6745-0.16838 0.13596-0.16606 0.21396-0.35864 0.24718-0.5561l0.12175 0.055354c0.12977 0.058962 0.28011-0.00232 0.28681-0.14442 0.0046-0.099885-0.0072-0.22271-0.05974-0.35477-0.09369-0.23633 0.19385-1.1127-0.71212-1.5246-0.64798-0.29451-1.4768 0.4526-1.737 0.73966-0.079558 0.088065-0.061546 0.19902 0.020058 0.26853-0.00307 0.00361-0.00695 0.00617-0.010042 0.010042-0.41575 0.50895-0.34031 1.2589 0.16867 1.6747z" />
+     <path d="m7.2974 3.0756-1.7448 2.7529c-0.1712-0.012358-0.33829-0.020596-0.49533-0.020596-1.0476 0-1.6129 0.26826-1.9162 0.52777-0.24869-0.090354-1.0519-0.33829-1.7069-0.048138-0.35013 0.15527-0.59987 0.43817-0.74197 0.84059l-0.080823 0.22938c-0.47786 1.3503-0.71755 2.0282-0.56643 2.6455 0.0089923 0.03632 0.033196 0.06693 0.066688 0.08392 0.018281 0.0095 0.038365 0.01416 0.05845 0.01416 0.016477 0 0.032954-0.0031 0.04865-0.0095 0.015696-0.0064 1.5792-0.66449 1.5818-2.2874 5.115e-4 -0.20055 0.054061-0.33239 0.16426-0.40239 0.2286-0.14573 0.66756-0.0196 0.89027 0.069246v0.4333c0 0.13747-0.012088 0.36147-0.027031 0.49945l-0.060254 0.55144c-0.012869 0.11765-0.085723 0.30507-0.15626 0.40086l-2.143 2.9095c-0.15088 0.20494-0.11275 0.35582-0.076462 0.42765 0.036292 0.07183 0.13518 0.19231 0.38952 0.19231h0.40008c0.32337 0 0.7353-0.19718 0.93816-0.44873l2.2385-2.7759c0.057912-0.071831 0.19129-0.12562 0.29502-0.1089 0.075169 0.011846 0.17198 0.025496 0.28345 0.039415l-0.2366 0.26799c-0.28218 0.32003-0.26826 0.78885 0.031931 1.0476 0.29968 0.25897 0.76876 0.20674 1.0468-0.11609l0.94715-1.0991c0.3038-0.00102 0.61377-0.010015 0.92271-0.028323 1.2795-0.075169 1.9785-0.27728 2.3397-0.4333 0.083651-0.036023 0.20184-0.018765 0.25386 0.038365l1.6616 1.8264c0.05382 0.05947 0.05896 0.16735 0.01058 0.23146l-0.71341 0.94201c-0.15397 0.20314-0.11738 0.35374-0.0816 0.42504 0.03551 0.07159 0.13335 0.1918 0.38823 0.1918h0.43201c0.32157 0 0.73915-0.18922 0.9513-0.43096l0.88615-1.0105c0.1354-0.15473 0.13927-0.40035 0.0088-0.55919l-2.1477-2.6106c-0.06489-0.079046 0.01287-0.19126 0.02908-0.21291 0.07929-0.10583 0.12051-0.22244 0.12334-0.3468 2e-3 -0.097031-0.02703-0.20879-0.05484-0.31691-0.01879-0.071831-0.03783-0.14625-0.04222-0.19799-0.02213-0.27058-0.0036-0.54452 0.01879-0.74068 0.20211 0.15446 0.47654 0.16552 0.69795 0.1743 0.09498 0.00388 0.18458 0.00746 0.25386 0.021108 0.09192 0.018012 0.30353 0.15163 0.41733 0.22346l0.03758 0.023692c0.27316 0.17069 0.59524 0.1802 0.75177 0.013111 0.14495-0.15473 0.14312-0.4266-0.0054-0.7273-0.03915-0.078777-0.08163-0.16552-0.11895-0.2433-0.0564-0.11714-0.10659-0.32335-0.12075-0.44746-0.02935-0.2572-0.08031-0.49533-0.15112-0.708-0.03758-0.11275-0.06462-0.30918-0.043-0.42915l0.07312-0.39905c0.029643-0.16092 7.82e-4 -0.30353-0.080553-0.40137-0.10836-0.13001-0.29893-0.16501-0.5033-0.090112l-0.40498 0.1488c-0.10015 0.036831-0.30173 0.0574-0.43974 0.044288-0.07363-0.0067-0.15112-0.010796-0.2317-0.010796-0.63514 0-1.2095 0.2541-1.6608 0.73478-0.44383 0.47293-0.84264 0.86221-1.3465 1.1313l-0.13413-0.14213 0.39106-1.2692c0.015185-0.049431 0.020085-0.098861 0.020623-0.14805l0.020596-0.032173c0.038096-0.13696-0.035269-0.29658-0.16375-0.35606l-0.073123-0.033977c-0.043481-0.030881-0.091135-0.057158-0.14468-0.073635-0.00848-0.00258-0.016988-0.00283-0.025469-0.00514l-1.0586-0.4907c-0.13007-0.059233-0.29637-0.010313-0.37232 0.10966z" />
     </g>
    </g>
   </g>
diff --git a/data/styles/clear/style-night/symbols/fuel-dispenser-m.svg b/data/styles/clear/style-night/symbols/fuel-dispenser-m.svg
index 3e56827792..fbdf3c2d4c 100644
--- a/data/styles/clear/style-night/symbols/fuel-dispenser-m.svg
+++ b/data/styles/clear/style-night/symbols/fuel-dispenser-m.svg
@@ -1,3 +1,3 @@
 <svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <path d="m18.264 8.2895 0.0077765-0.0077765-2.4807-2.4807c-0.22552-0.22552-0.59879-0.22552-0.82431 0s-0.22552 0.59879 0 0.82431l1.2287 1.2287c-0.81653 0.31106-1.3687 1.1431-1.2287 2.1074 0.12442 0.85541 0.85541 1.5475 1.7108 1.6408 0.3655 0.038882 0.68433-0.02333 0.98761-0.15553v5.6069c0 0.42771-0.34994 0.77765-0.77765 0.77765s-0.77765-0.34994-0.77765-0.77765v-3.4994c0-0.85541-0.69988-1.5553-1.5553-1.5553h-0.77765v-5.4435c0-0.85541-0.69988-1.5553-1.5553-1.5553h-4.6659c-0.85541 0-1.5553 0.69988-1.5553 1.5553v11.665c0 0.42771 0.34994 0.77765 0.77765 0.77765h6.2212c0.42771 0 0.77765-0.34994 0.77765-0.77765v-5.0547h1.1665v3.7794c0 1.0187 0.73099 1.9441 1.7419 2.0452 1.1665 0.11665 2.1463-0.7932 2.1463-1.9363v-7.3877c0-0.53658-0.21774-1.0265-0.56768-1.3764zm-6.0423 2.1541h-4.6659v-3.1106c0-0.42771 0.34994-0.77765 0.77765-0.77765h3.1106c0.42771 0 0.77765 0.34994 0.77765 0.77765v3.1106zm4.6659 0c-0.42771 0-0.77765-0.34994-0.77765-0.77765s0.34994-0.77765 0.77765-0.77765 0.77765 0.34994 0.77765 0.77765-0.34994 0.77765-0.77765 0.77765z" fill="#fff" opacity=".6"/>
+ <path d="m18.264 8.2895 0.0077765-0.0077765-2.4807-2.4807c-0.22552-0.22552-0.59879-0.22552-0.82431 0s-0.22552 0.59879 0 0.82431l1.2287 1.2287c-0.81653 0.31106-1.3687 1.1431-1.2287 2.1074 0.12442 0.85541 0.85541 1.5475 1.7108 1.6408 0.3655 0.038882 0.68433-0.02333 0.98761-0.15553v5.6069c0 0.42771-0.34994 0.77765-0.77765 0.77765s-0.77765-0.34994-0.77765-0.77765v-3.4994c0-0.85541-0.69988-1.5553-1.5553-1.5553h-0.77765v-5.4435c0-0.85541-0.69988-1.5553-1.5553-1.5553h-4.6659c-0.85541 0-1.5553 0.69988-1.5553 1.5553v11.665c0 0.42771 0.34994 0.77765 0.77765 0.77765h6.2212c0.42771 0 0.77765-0.34994 0.77765-0.77765v-5.0547h1.1665v3.7794c0 1.0187 0.73099 1.9441 1.7419 2.0452 1.1665 0.11665 2.1463-0.7932 2.1463-1.9363v-7.3877c0-0.53658-0.21774-1.0265-0.56768-1.3764zm-6.0423 2.1541h-4.6659v-3.1106c0-0.42771 0.34994-0.77765 0.77765-0.77765h3.1106c0.42771 0 0.77765 0.34994 0.77765 0.77765v3.1106zm4.6659 0c-0.42771 0-0.77765-0.34994-0.77765-0.77765s0.34994-0.77765 0.77765-0.77765 0.77765 0.34994 0.77765 0.77765-0.34994 0.77765-0.77765 0.77765z" fill="#777777"/>
 </svg>
diff --git a/data/styles/clear/style-night/symbols/golf-m.svg b/data/styles/clear/style-night/symbols/golf-m.svg
index d9768b80e4..413cdd5396 100644
--- a/data/styles/clear/style-night/symbols/golf-m.svg
+++ b/data/styles/clear/style-night/symbols/golf-m.svg
@@ -2,10 +2,10 @@
  <title>golf-m</title>
  <g fill="none" fill-rule="evenodd">
   <g id="golf-m" fill-rule="nonzero">
-   <g id="golf_course_black_24dp" transform="translate(6,5)" fill="#fff">
-    <g transform="matrix(1.392 0 0 1.392 -1.8882 -2.5605)" fill="#fff">
-     <circle cx="10.333" cy="11.667" r="1" opacity=".6"/>
-     <path id="Path" d="m4.6667 10.687v-6.0333l2.8133-1.4333c0.48667-0.24667 0.48667-0.95333-0.0066667-1.1933l-3.1733-1.5533c-0.44667-0.22-0.96667 0.1-0.96667 0.59333v10.267c0 0.36667-0.3 0.66667-0.66667 0.66667-0.36667 0-0.66667-0.3-0.66667-0.66667v-0.48667c-1.1933 0.23333-2 0.66-2 1.1533 0 0.73333 1.7933 1.3333 4 1.3333s4-0.6 4-1.3333c0-0.66-1.44-1.2067-3.3333-1.3133z" opacity=".6"/>
+   <g id="golf_course_black_24dp" transform="translate(6,5)" fill="#777777">
+    <g transform="matrix(1.392 0 0 1.392 -1.8882 -2.5605)">
+     <circle cx="10.333" cy="11.667" r="1"/>
+     <path id="Path" d="m4.6667 10.687v-6.0333l2.8133-1.4333c0.48667-0.24667 0.48667-0.95333-0.0066667-1.1933l-3.1733-1.5533c-0.44667-0.22-0.96667 0.1-0.96667 0.59333v10.267c0 0.36667-0.3 0.66667-0.66667 0.66667-0.36667 0-0.66667-0.3-0.66667-0.66667v-0.48667c-1.1933 0.23333-2 0.66-2 1.1533 0 0.73333 1.7933 1.3333 4 1.3333s4-0.6 4-1.3333c0-0.66-1.44-1.2067-3.3333-1.3133z"/>
     </g>
    </g>
   </g>
diff --git a/data/styles/clear/style-night/symbols/guidepost.svg b/data/styles/clear/style-night/symbols/guidepost.svg
index 318f4cbc31..d7dafb2cf6 100644
--- a/data/styles/clear/style-night/symbols/guidepost.svg
+++ b/data/styles/clear/style-night/symbols/guidepost.svg
@@ -1,3 +1,3 @@
 <svg id="SVGRoot" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <path id="guidepost" d="m12 3c-0.48214 0-0.96429 0.32727-0.96429 0.98182v17.018h1.9286v-17.018c0-0.65455-0.48214-0.98182-0.96429-0.98182zm-6.4286 0.98182-2.5714 1.9636 2.5714 1.9636h5.1429v-3.9273zm7.7143 3.9273v3.9273h5.1429l2.5714-1.9636-2.5714-1.9636z" fill="#fff" opacity=".6"/>
+ <path id="guidepost" d="m12 3c-0.48214 0-0.96429 0.32727-0.96429 0.98182v17.018h1.9286v-17.018c0-0.65455-0.48214-0.98182-0.96429-0.98182zm-6.4286 0.98182-2.5714 1.9636 2.5714 1.9636h5.1429v-3.9273zm7.7143 3.9273v3.9273h5.1429l2.5714-1.9636-2.5714-1.9636z" fill="#777777"/>
 </svg>
diff --git a/data/styles/clear/style-night/symbols/gym-m.svg b/data/styles/clear/style-night/symbols/gym-m.svg
index 5d20f02c7e..7df87b7177 100644
--- a/data/styles/clear/style-night/symbols/gym-m.svg
+++ b/data/styles/clear/style-night/symbols/gym-m.svg
@@ -2,7 +2,7 @@
  <title>gym-m</title>
  <g fill="none" fill-rule="evenodd">
   <g id="gym-m" fill-rule="nonzero">
-   <path id="Path" d="m20.049 14.686 0.67623-0.67623c0.36629-0.36629 0.36629-0.958 0-1.3243l-0.01878-0.01878c-0.36629-0.36629-0.958-0.36629-1.3243 0l-2.6862 2.6861-8.049-8.049 2.6861-2.6861c0.36629-0.36629 0.36629-0.958 0-1.3243l-0.01878-0.018784c-0.36629-0.36629-0.958-0.36629-1.3243 0l-0.67624 0.67623-0.67623-0.67623c-0.36629-0.36629-0.96739-0.36629-1.3337 0l-1.3431 1.3431-0.67623-0.67623c-0.36629-0.36629-0.97678-0.36629-1.3431 0-0.36629 0.36629-0.36629 0.97678 0 1.3431l0.67623 0.67623-1.3431 1.3431c-0.36629 0.36629-0.36629 0.958 0 1.3243l0.67623 0.67623-0.67623 0.68562c-0.36629 0.36629-0.36629 0.958 0 1.3243l0.018784 0.01878c0.36629 0.36629 0.958 0.36629 1.3243 0l2.6861-2.6861 8.049 8.049-2.6861 2.6861c-0.36629 0.36629-0.36629 0.958 0 1.3243l0.01878 0.01878c0.36629 0.36629 0.958 0.36629 1.3243 0l0.67623-0.67623 0.67623 0.67623c0.36629 0.36629 0.958 0.36629 1.3243 0l1.3431-1.3431 0.67623 0.67623c0.36629 0.36629 0.97678 0.36629 1.3431 0 0.36629-0.36629 0.36629-0.97678 0-1.3431l-0.67623-0.67623 1.3525-1.3431c0.36629-0.36629 0.36629-0.958 0-1.3243z" fill="#fff" opacity=".6" stroke-width="1.2857"/>
+   <path id="Path" d="m20.049 14.686 0.67623-0.67623c0.36629-0.36629 0.36629-0.958 0-1.3243l-0.01878-0.01878c-0.36629-0.36629-0.958-0.36629-1.3243 0l-2.6862 2.6861-8.049-8.049 2.6861-2.6861c0.36629-0.36629 0.36629-0.958 0-1.3243l-0.01878-0.018784c-0.36629-0.36629-0.958-0.36629-1.3243 0l-0.67624 0.67623-0.67623-0.67623c-0.36629-0.36629-0.96739-0.36629-1.3337 0l-1.3431 1.3431-0.67623-0.67623c-0.36629-0.36629-0.97678-0.36629-1.3431 0-0.36629 0.36629-0.36629 0.97678 0 1.3431l0.67623 0.67623-1.3431 1.3431c-0.36629 0.36629-0.36629 0.958 0 1.3243l0.67623 0.67623-0.67623 0.68562c-0.36629 0.36629-0.36629 0.958 0 1.3243l0.018784 0.01878c0.36629 0.36629 0.958 0.36629 1.3243 0l2.6861-2.6861 8.049 8.049-2.6861 2.6861c-0.36629 0.36629-0.36629 0.958 0 1.3243l0.01878 0.01878c0.36629 0.36629 0.958 0.36629 1.3243 0l0.67623-0.67623 0.67623 0.67623c0.36629 0.36629 0.958 0.36629 1.3243 0l1.3431-1.3431 0.67623 0.67623c0.36629 0.36629 0.97678 0.36629 1.3431 0 0.36629-0.36629 0.36629-0.97678 0-1.3431l-0.67623-0.67623 1.3525-1.3431c0.36629-0.36629 0.36629-0.958 0-1.3243z" fill="#777777" stroke-width="1.2857"/>
   </g>
  </g>
 </svg>
diff --git a/data/styles/clear/style-night/symbols/handball-m.svg b/data/styles/clear/style-night/symbols/handball-m.svg
index e0cbbc78cf..853b55cea2 100644
--- a/data/styles/clear/style-night/symbols/handball-m.svg
+++ b/data/styles/clear/style-night/symbols/handball-m.svg
@@ -1,3 +1,3 @@
 <svg version="1.1" viewBox="0 0 24 24" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
-<path d="m8.9715 22.813-1.183-0.7098 3.0285-5.1579-1.9401-1.1593-1.7745 2.8629-1.183-0.7098 5.4182-8.7779q-0.99372-0.87542-1.4906-1.9046-0.49686-1.0292-0.49686-2.1649 0-0.89908 0.17745-1.6562t0.62699-1.6562l1.2303 0.66248q-0.33124 0.68614-0.4732 1.2895-0.14196 0.60333-0.14196 1.2185 0 1.1357 0.54418 2.0584t1.8218 1.6799l2.295 1.3486q1.3486 0.78078 1.9993 1.9283 0.65065 1.1475 0.65065 2.6381 0 0.92274-0.28392 1.8691-0.28392 0.9464-0.75712 1.7982l-1.2303-0.7098q0.40222-0.75712 0.62699-1.4788 0.22477-0.72163 0.22477-1.4788 0-0.89908-0.30758-1.6444-0.30758-0.74529-0.92274-1.1475zm6.7431-14.385q-0.7098 0-1.2185-0.50869-0.50869-0.50869-0.50869-1.2185 0-0.7098 0.50869-1.2185 0.50869-0.50869 1.2185-0.50869t1.2185 0.50869q0.50869 0.50869 0.50869 1.2185 0 0.7098-0.50869 1.2185-0.50869 0.50869-1.2185 0.50869zm-2.224-4.4008q-0.61516 0-1.0174-0.40222-0.40222-0.40222-0.40222-1.0174t0.40222-1.0174 1.0174-0.40222q0.61516 0 1.0174 0.40222t0.40222 1.0174-0.40222 1.0174q-0.40222 0.40222-1.0174 0.40222z" fill="#fff" opacity=".6" stroke-width=".4732"/>
+<path d="m8.9715 22.813-1.183-0.7098 3.0285-5.1579-1.9401-1.1593-1.7745 2.8629-1.183-0.7098 5.4182-8.7779q-0.99372-0.87542-1.4906-1.9046-0.49686-1.0292-0.49686-2.1649 0-0.89908 0.17745-1.6562t0.62699-1.6562l1.2303 0.66248q-0.33124 0.68614-0.4732 1.2895-0.14196 0.60333-0.14196 1.2185 0 1.1357 0.54418 2.0584t1.8218 1.6799l2.295 1.3486q1.3486 0.78078 1.9993 1.9283 0.65065 1.1475 0.65065 2.6381 0 0.92274-0.28392 1.8691-0.28392 0.9464-0.75712 1.7982l-1.2303-0.7098q0.40222-0.75712 0.62699-1.4788 0.22477-0.72163 0.22477-1.4788 0-0.89908-0.30758-1.6444-0.30758-0.74529-0.92274-1.1475zm6.7431-14.385q-0.7098 0-1.2185-0.50869-0.50869-0.50869-0.50869-1.2185 0-0.7098 0.50869-1.2185 0.50869-0.50869 1.2185-0.50869t1.2185 0.50869q0.50869 0.50869 0.50869 1.2185 0 0.7098-0.50869 1.2185-0.50869 0.50869-1.2185 0.50869zm-2.224-4.4008q-0.61516 0-1.0174-0.40222-0.40222-0.40222-0.40222-1.0174t0.40222-1.0174 1.0174-0.40222q0.61516 0 1.0174 0.40222t0.40222 1.0174-0.40222 1.0174q-0.40222 0.40222-1.0174 0.40222z" fill="#777777" stroke-width=".4732"/>
 </svg>
diff --git a/data/styles/clear/style-night/symbols/hockey-m.svg b/data/styles/clear/style-night/symbols/hockey-m.svg
index 09f7718901..ad7b9987c3 100644
--- a/data/styles/clear/style-night/symbols/hockey-m.svg
+++ b/data/styles/clear/style-night/symbols/hockey-m.svg
@@ -1,3 +1,3 @@
 <svg version="1.1" viewBox="0 0 24 24" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
-<path d="m3.3924 18.886v-1.8291q0-0.38734 0.23671-0.62405t0.62405-0.23671h0.43038v2.6899zm2.238 0v-2.6899h3.7658l0.92532-2.0228 1.0544 2.0873-0.98987 2.1734q-0.1076 0.23671-0.31203 0.3443-0.20443 0.1076-0.46266 0.1076zm13.686 0v-2.6899h0.43038q0.38734 0 0.62405 0.23671t0.23671 0.62405v1.8291zm-0.94684 0h-3.981q-0.25823 0-0.46266-0.1076t-0.31203-0.3443l-6.0684-13.32h2.0013l2.4532 5.3797 2.4532-5.3797h2.0013l-3.443 7.5962 1.5924 3.4861h3.7658z" fill="#fff" opacity=".6" stroke-width=".43038"/>
+<path d="m3.3924 18.886v-1.8291q0-0.38734 0.23671-0.62405t0.62405-0.23671h0.43038v2.6899zm2.238 0v-2.6899h3.7658l0.92532-2.0228 1.0544 2.0873-0.98987 2.1734q-0.1076 0.23671-0.31203 0.3443-0.20443 0.1076-0.46266 0.1076zm13.686 0v-2.6899h0.43038q0.38734 0 0.62405 0.23671t0.23671 0.62405v1.8291zm-0.94684 0h-3.981q-0.25823 0-0.46266-0.1076t-0.31203-0.3443l-6.0684-13.32h2.0013l2.4532 5.3797 2.4532-5.3797h2.0013l-3.443 7.5962 1.5924 3.4861h3.7658z" fill="#777777" stroke-width=".43038"/>
 </svg>
diff --git a/data/styles/clear/style-night/symbols/lift_gate-m.svg b/data/styles/clear/style-night/symbols/lift_gate-m.svg
index 9976301ab8..555892210d 100644
--- a/data/styles/clear/style-night/symbols/lift_gate-m.svg
+++ b/data/styles/clear/style-night/symbols/lift_gate-m.svg
@@ -1,8 +1,8 @@
 <svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
  <title>lift_gate-m</title>
- <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity=".6">
+ <g id="Page-2:-Night" fill="none" fill-rule="evenodd">
   <g id="lift_gate-m" fill-rule="nonzero">
-   <g id="gate" transform="translate(5 7)" fill="#FFF">
+   <g id="gate" transform="translate(5 7)" fill="#777777">
     <path id="Shape" d="m4.2292 10.5h-3.2083c-0.56292 0-1.0208-0.45792-1.0208-1.0208v-0.58333c0-0.56292 0.45792-1.0208 1.0208-1.0208h3.2083c0.56292 0 1.0208 0.45792 1.0208 1.0208v0.58333c0 0.56292-0.45792 1.0208-1.0208 1.0208zm-3.2083-1.75c-0.0805 0-0.14583 0.065333-0.14583 0.14583v0.58333c0 0.0805 0.065333 0.14583 0.14583 0.14583h3.2083c0.0805 0 0.14583-0.065333 0.14583-0.14583v-0.58333c0-0.0805-0.065333-0.14583-0.14583-0.14583h-3.2083z"/>
     <path id="Path" d="m3.6458 8.6042c-0.2415 0-0.4375-0.196-0.4375-0.4375v-6.7083c0-0.32142-0.26192-0.58333-0.58333-0.58333s-0.58333 0.26192-0.58333 0.58333v6.7083c0 0.2415-0.196 0.4375-0.4375 0.4375s-0.4375-0.196-0.4375-0.4375v-6.7083c0-0.80383 0.6545-1.4583 1.4583-1.4583s1.4583 0.6545 1.4583 1.4583v6.7083c0 0.2415-0.196 0.4375-0.4375 0.4375z"/>
     <path id="Path" d="m12.979 5.25h-9.0417c-0.2415 0-0.4375-0.196-0.4375-0.4375s0.196-0.4375 0.4375-0.4375h9.0417c0.0805 0 0.14583-0.065333 0.14583-0.14583v-1.4583c0-0.0805-0.065333-0.14583-0.14583-0.14583h-9.0417c-0.2415 0-0.4375-0.196-0.4375-0.4375s0.196-0.4375 0.4375-0.4375h9.0417c0.56292 0 1.0208 0.45792 1.0208 1.0208v1.4583c0 0.56292-0.45792 1.0208-1.0208 1.0208z"/>
diff --git a/data/styles/clear/style-night/symbols/map.svg b/data/styles/clear/style-night/symbols/map.svg
index 0e68d4181f..bb765be676 100644
--- a/data/styles/clear/style-night/symbols/map.svg
+++ b/data/styles/clear/style-night/symbols/map.svg
@@ -8,5 +8,5 @@
    </cc:Work>
   </rdf:RDF>
  </metadata>
- <path d="m4.4688 1c-0.034718 0.00224-0.068771 0.017937-0.10352 0.027344-0.023371 0.00664-0.04849 0.00777-0.070312 0.017578-0.0064 0.00284-0.013216 0.0027-0.019531 0.00586l-4.0059 2.002v0.0097656c-0.15861 0.083642-0.26953 0.24505-0.26953 0.4375v9c0 0.0069 0.0036301 0.01268 0.0039062 0.01953 0.0010164 0.02913 0.011287 0.05688 0.017578 0.08594 0.0078135 0.03544 0.012483 0.07137 0.027344 0.10352 0.0023321 0.0051 0.0013892 0.01059 0.0039063 0.01563 0.004814 0.0096 0.016155 0.0123 0.021484 0.02149 0.038308 0.06631 0.088896 0.12162 0.15234 0.16406 0.017387 0.01164 0.032172 0.02389 0.050781 0.0332 0.067593 0.033972 0.14157 0.056633 0.22266 0.056633 0.005593 0 0.010077-0.0037 0.015625-0.0039 0.0055-1.72e-4 0.010118 0.0043 0.015625 0.0039 0.033332-0.0022 0.066217-0.01666 0.099609-0.02539 0.024822-0.0068 0.051123-0.0091 0.074219-0.01953 0.006404-0.0028 0.013216-0.0027 0.019531-0.0059l3.7559-1.877 4.8145 1.8848c0.062651 0.02815 0.13171 0.04492 0.20508 0.04492 0.00346 0 0.00827-0.0019 0.011719-2e-3 0.00422-1.08e-4 0.00751-0.0037 0.011719-0.0039h0.00195c0.0021-1.09e-4 0.00375 0.0021 0.00586 2e-3 0.012444-8.06e-4 0.024582-0.0081 0.037109-0.0098 0.051564-0.0073 0.10131-0.01736 0.14648-0.03906 0.0031-0.0015 0.00668-4.14e-4 0.00977-2e-3l4.0059-2.002v-0.0059c0.1586-0.083487 0.26953-0.2449 0.26953-0.43734v-9c0-0.00692-0.0036-0.012676-0.0039-0.019531-9.83e-4 -0.031791-0.01226-0.062063-0.01953-0.09375-0.0078-0.032675-0.0116-0.065897-0.02539-0.095703-0.0026-0.00568-0.0011-0.01195-0.0039-0.017578-0.0064-0.012713-0.0201-0.017377-0.02734-0.029297-0.03595-0.058913-0.08227-0.10704-0.13867-0.14648-0.02206-0.015579-0.04034-0.031246-0.06445-0.042969-0.06621-0.032253-0.13793-0.054687-0.2168-0.054687-0.0041 0-0.0076 0.00185-0.01172 0.00195-0.0068 1.594e-4 -0.01272-0.004345-0.01953-0.00391-0.04394 0.00283-0.0873 0.020592-0.13086 0.035156-0.01274 0.0044-0.02682 0.0044-0.03906 0.00977-0.0076 0.0033-0.01595 0.00212-0.02344 0.00586l-3.7598 1.8789-4.7676-1.8652-0.0019531-0.0019531c-0.00181-0.00102-0.00404-9.564e-4 -0.00586-0.00195l-0.03125-0.011719c-0.063945-0.02959-0.13365-0.048831-0.20898-0.048831-0.00546 0-0.010208 0.00178-0.015625 0.00195-8.647e-4 2.23e-5 -0.00109 0.00193-0.00195 0.00195-0.0048531 1.769e-4 -0.0088195-0.0042131-0.013675-0.0039zm0.53125 1.2363 4 1.5664v7.9648l-4-1.5664zm-1 0.070312v7.8887l-3 1.498v-7.8887zm9 0v7.8867l-3 1.498v-7.8867z" fill="#fff" opacity=".6" style="paint-order:markers stroke fill"/>
+ <path d="m4.4688 1c-0.034718 0.00224-0.068771 0.017937-0.10352 0.027344-0.023371 0.00664-0.04849 0.00777-0.070312 0.017578-0.0064 0.00284-0.013216 0.0027-0.019531 0.00586l-4.0059 2.002v0.0097656c-0.15861 0.083642-0.26953 0.24505-0.26953 0.4375v9c0 0.0069 0.0036301 0.01268 0.0039062 0.01953 0.0010164 0.02913 0.011287 0.05688 0.017578 0.08594 0.0078135 0.03544 0.012483 0.07137 0.027344 0.10352 0.0023321 0.0051 0.0013892 0.01059 0.0039063 0.01563 0.004814 0.0096 0.016155 0.0123 0.021484 0.02149 0.038308 0.06631 0.088896 0.12162 0.15234 0.16406 0.017387 0.01164 0.032172 0.02389 0.050781 0.0332 0.067593 0.033972 0.14157 0.056633 0.22266 0.056633 0.005593 0 0.010077-0.0037 0.015625-0.0039 0.0055-1.72e-4 0.010118 0.0043 0.015625 0.0039 0.033332-0.0022 0.066217-0.01666 0.099609-0.02539 0.024822-0.0068 0.051123-0.0091 0.074219-0.01953 0.006404-0.0028 0.013216-0.0027 0.019531-0.0059l3.7559-1.877 4.8145 1.8848c0.062651 0.02815 0.13171 0.04492 0.20508 0.04492 0.00346 0 0.00827-0.0019 0.011719-2e-3 0.00422-1.08e-4 0.00751-0.0037 0.011719-0.0039h0.00195c0.0021-1.09e-4 0.00375 0.0021 0.00586 2e-3 0.012444-8.06e-4 0.024582-0.0081 0.037109-0.0098 0.051564-0.0073 0.10131-0.01736 0.14648-0.03906 0.0031-0.0015 0.00668-4.14e-4 0.00977-2e-3l4.0059-2.002v-0.0059c0.1586-0.083487 0.26953-0.2449 0.26953-0.43734v-9c0-0.00692-0.0036-0.012676-0.0039-0.019531-9.83e-4 -0.031791-0.01226-0.062063-0.01953-0.09375-0.0078-0.032675-0.0116-0.065897-0.02539-0.095703-0.0026-0.00568-0.0011-0.01195-0.0039-0.017578-0.0064-0.012713-0.0201-0.017377-0.02734-0.029297-0.03595-0.058913-0.08227-0.10704-0.13867-0.14648-0.02206-0.015579-0.04034-0.031246-0.06445-0.042969-0.06621-0.032253-0.13793-0.054687-0.2168-0.054687-0.0041 0-0.0076 0.00185-0.01172 0.00195-0.0068 1.594e-4 -0.01272-0.004345-0.01953-0.00391-0.04394 0.00283-0.0873 0.020592-0.13086 0.035156-0.01274 0.0044-0.02682 0.0044-0.03906 0.00977-0.0076 0.0033-0.01595 0.00212-0.02344 0.00586l-3.7598 1.8789-4.7676-1.8652-0.0019531-0.0019531c-0.00181-0.00102-0.00404-9.564e-4 -0.00586-0.00195l-0.03125-0.011719c-0.063945-0.02959-0.13365-0.048831-0.20898-0.048831-0.00546 0-0.010208 0.00178-0.015625 0.00195-8.647e-4 2.23e-5 -0.00109 0.00193-0.00195 0.00195-0.0048531 1.769e-4 -0.0088195-0.0042131-0.013675-0.0039zm0.53125 1.2363 4 1.5664v7.9648l-4-1.5664zm-1 0.070312v7.8887l-3 1.498v-7.8887zm9 0v7.8867l-3 1.498v-7.8867z" fill="#777777" style="paint-order:markers stroke fill"/>
 </svg>
diff --git a/data/styles/clear/style-night/symbols/military-m.svg b/data/styles/clear/style-night/symbols/military-m.svg
index b640eabf65..29bb7f9e49 100644
--- a/data/styles/clear/style-night/symbols/military-m.svg
+++ b/data/styles/clear/style-night/symbols/military-m.svg
@@ -1,8 +1,8 @@
 <svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
     <title>military-m</title>
-    <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity=".6">
+    <g id="Page-2:-Night" fill="none" fill-rule="evenodd">
         <g id="military-m" fill-rule="nonzero">
-            <g id="Group" transform="translate(5 7)" fill="#fff">
+            <g id="Group" transform="translate(5 7)" fill="#777777">
                 <path id="Path"
                     d="m11.127 3.8878c-0.1183-0.2366-0.3612-0.3864-0.6265-0.3864h-7.7c-0.3213 0-0.6013 0.2184-0.679 0.5299l-0.3927 1.5701h10.255l-0.8568-1.7136z" />
                 <path id="Shape"
diff --git a/data/styles/clear/style-night/symbols/mountain-pass.svg b/data/styles/clear/style-night/symbols/mountain-pass.svg
index 5b19e1ce2f..559bb007d5 100644
--- a/data/styles/clear/style-night/symbols/mountain-pass.svg
+++ b/data/styles/clear/style-night/symbols/mountain-pass.svg
@@ -1,6 +1,6 @@
 <svg version="1.1" viewBox="0 0 16 8.3845" xmlns="http://www.w3.org/2000/svg">
  <title>mountain-pass</title>
- <g id="Page-2:-Night" transform="matrix(.035273 0 0 .035273 0 -3.806)" fill="#FFF" opacity=".8">
+ <g id="Page-2:-Night" transform="matrix(.035273 0 0 .035273 0 -3.806)" fill="#777777">
   <path d="m226.8 212.2c-113.6 0-107-104.5-226.8-104.3v237.7h453.6v-237.7c-111.3-0.2-113.2 104.3-226.8 104.3z"/>
  </g>
 </svg>
diff --git a/data/styles/clear/style-night/symbols/padel-m.svg b/data/styles/clear/style-night/symbols/padel-m.svg
index 4ddfc0ce33..6d13387923 100644
--- a/data/styles/clear/style-night/symbols/padel-m.svg
+++ b/data/styles/clear/style-night/symbols/padel-m.svg
@@ -1,3 +1,3 @@
 <svg version="1.1" viewBox="0 0 24 24" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
-<g fill="none" fill-rule="evenodd" opacity=".6"><g id="tennis-m" fill-rule="nonzero"><g id="Group" transform="translate(5 5)" fill="#fff"><g transform="matrix(1.2858 0 0 1.2858 -1.9355 -2.0018)" fill="#fff"><path d="m10.818 10.182c0.33727 0 0.66182 0.13364 0.89727 0.37546 0.49636 0.49636 0.49636 1.3045 0 1.8009-0.23546 0.23545-0.56 0.36909-0.89727 0.36909s-0.66182-0.13364-0.89727-0.37546c-0.49636-0.49636-0.49636-1.3045 0-1.8009 0.23545-0.23545 0.56-0.36909 0.89727-0.36909m0-1.2727c-0.64909 0-1.3045 0.24818-1.8009 0.74455-0.99273 0.99273-0.99273 2.6027 0 3.6018 0.49636 0.49636 1.1518 0.74454 1.8009 0.74454s1.3045-0.24818 1.8009-0.74454c0.99273-0.99273 0.99273-2.6027 0-3.6018-0.49636-0.49636-1.1518-0.74455-1.8009-0.74455z" fill="#fff"/></g></g></g></g><path d="m6.2703 13.138 0.60389-2.4108c0.33214-1.3259 0.62962-2.544 0.66108-2.7068 0.29299-1.5168 1.1936-3.0978 2.6613-4.6717 0.82563-0.88535 1.2874-1.2245 2.029-1.4902 1.0927-0.3915 2.1548-0.23984 3.4006 0.48559 0.64748 0.37704 1.0532 0.69989 1.81 1.4405 0.89937 0.87982 1.3826 1.5013 1.7625 2.2661 0.73524 1.4802 0.62214 2.8112-0.35125 4.1335-0.24381 0.33121-1.2616 1.32-1.7451 1.6954-0.88835 0.6897-1.6476 1.1461-2.4752 1.4878-0.36402 0.1503-1.127 0.38604-1.2929 0.39943-0.04132 0.0034-1.2026 0.32394-2.5806 0.71244l-2.5055 0.70637-3.3589 3.4541-2.0614-1.9911zm4.5003-4.9687 0.39866-0.40654-0.81307-0.79731-0.79732 0.81307 0.81307 0.79731zm1.6261 1.5946 0.39866-0.40654-0.81307-0.79731-0.79732 0.81307 0.81307 0.79731zm1.6261 1.5946 0.39866-0.40654-0.81307-0.79731-0.79732 0.81307 0.81307 0.79731zm-1.6577-4.8154 0.39866-0.40654-0.81307-0.79731-0.79732 0.81307 0.81308 0.79732zm1.6261 1.5946 0.39866-0.40654-0.81307-0.79731-0.79732 0.81308 0.81307 0.79731zm1.6261 1.5946 0.39866-0.40654-0.81307-0.79731-0.79732 0.81307 0.81308 0.79732zm-1.6577-4.8154 0.39866-0.40654-0.81307-0.79731-0.79732 0.81307 0.81307 0.79731zm1.6261 1.5946 0.39866-0.40654-0.81307-0.79731-0.79731 0.81307 0.81307 0.79731zm1.6261 1.5946 0.39866-0.40654-0.81307-0.79731-0.79732 0.81307 0.81307 0.79731z" fill="#fff" opacity=".6" stroke-width=".037959"/>
+<g fill="none" fill-rule="evenodd"><g id="tennis-m" fill-rule="nonzero"><g id="Group" transform="translate(5 5)" fill="#777777"><g transform="matrix(1.2858 0 0 1.2858 -1.9355 -2.0018)"><path d="m10.818 10.182c0.33727 0 0.66182 0.13364 0.89727 0.37546 0.49636 0.49636 0.49636 1.3045 0 1.8009-0.23546 0.23545-0.56 0.36909-0.89727 0.36909s-0.66182-0.13364-0.89727-0.37546c-0.49636-0.49636-0.49636-1.3045 0-1.8009 0.23545-0.23545 0.56-0.36909 0.89727-0.36909m0-1.2727c-0.64909 0-1.3045 0.24818-1.8009 0.74455-0.99273 0.99273-0.99273 2.6027 0 3.6018 0.49636 0.49636 1.1518 0.74454 1.8009 0.74454s1.3045-0.24818 1.8009-0.74454c0.99273-0.99273 0.99273-2.6027 0-3.6018-0.49636-0.49636-1.1518-0.74455-1.8009-0.74455z"/></g></g></g></g><path d="m6.2703 13.138 0.60389-2.4108c0.33214-1.3259 0.62962-2.544 0.66108-2.7068 0.29299-1.5168 1.1936-3.0978 2.6613-4.6717 0.82563-0.88535 1.2874-1.2245 2.029-1.4902 1.0927-0.3915 2.1548-0.23984 3.4006 0.48559 0.64748 0.37704 1.0532 0.69989 1.81 1.4405 0.89937 0.87982 1.3826 1.5013 1.7625 2.2661 0.73524 1.4802 0.62214 2.8112-0.35125 4.1335-0.24381 0.33121-1.2616 1.32-1.7451 1.6954-0.88835 0.6897-1.6476 1.1461-2.4752 1.4878-0.36402 0.1503-1.127 0.38604-1.2929 0.39943-0.04132 0.0034-1.2026 0.32394-2.5806 0.71244l-2.5055 0.70637-3.3589 3.4541-2.0614-1.9911zm4.5003-4.9687 0.39866-0.40654-0.81307-0.79731-0.79732 0.81307 0.81307 0.79731zm1.6261 1.5946 0.39866-0.40654-0.81307-0.79731-0.79732 0.81307 0.81307 0.79731zm1.6261 1.5946 0.39866-0.40654-0.81307-0.79731-0.79732 0.81307 0.81307 0.79731zm-1.6577-4.8154 0.39866-0.40654-0.81307-0.79731-0.79732 0.81307 0.81308 0.79732zm1.6261 1.5946 0.39866-0.40654-0.81307-0.79731-0.79732 0.81308 0.81307 0.79731zm1.6261 1.5946 0.39866-0.40654-0.81307-0.79731-0.79732 0.81307 0.81308 0.79732zm-1.6577-4.8154 0.39866-0.40654-0.81307-0.79731-0.79732 0.81307 0.81307 0.79731zm1.6261 1.5946 0.39866-0.40654-0.81307-0.79731-0.79731 0.81307 0.81307 0.79731zm1.6261 1.5946 0.39866-0.40654-0.81307-0.79731-0.79732 0.81307 0.81307 0.79731z" stroke-width=".037959" fill="#777777"/>
 </svg>
diff --git a/data/styles/clear/style-night/symbols/parking-meter-m.svg b/data/styles/clear/style-night/symbols/parking-meter-m.svg
index cb104b55e9..7067f65b31 100644
--- a/data/styles/clear/style-night/symbols/parking-meter-m.svg
+++ b/data/styles/clear/style-night/symbols/parking-meter-m.svg
@@ -1,7 +1,7 @@
 <svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
  <title>parking-meter-m</title>
- <g id="Page-2:-Night" fill="none" opacity=".6">
-  <g id="parking-meter-m" fill="#FFF">
+ <g id="Page-2:-Night">
+  <g id="parking-meter-m" fill="#777777">
    <path d="m12 4c-2.4812 0-4.5001 2.0246-4.5001 4.5133 0 0.29709 0.029602 0.58758 0.084489 0.8688 0.0016445 0.01505 0 0.030101 0.0024668 0.045151l1.1543 7.085c0.058793 0.36142 0.37023 0.62676 0.73532 0.62676h5.0471c0.36509 0 0.67653-0.26534 0.73532-0.62696l1.1541-7.085c0.0024668-0.014844 8.222e-4 -0.029895 0.0024668-0.044739 0.055092-0.28142 0.084489-0.57171 0.084489-0.869 2.056e-4 -2.4887-2.0187-4.5133-4.4999-4.5133zm-2.8556 4.5133c0-0.014638 0.0020557-0.02907 0.0022612-0.043708v-0.09958c0.080172-1.5123 1.3269-2.7204 2.8531-2.7204s2.7729 1.2082 2.8482 2.7204l0.0078116 0.21833h-1.9367c0-0.50945-0.41155-0.9222-0.91951-0.9222-0.50755 0-0.91951 0.41275-0.91951 0.9222h-1.9334v-0.031132c-2.0557e-4 -0.01505-0.0022612-0.029276-0.0022612-0.043914zm4.4668 4.1017-1.6589-1.664c-0.20084-0.20143-0.52605-0.20143-0.72669 0-0.20084 0.20122-0.20084 0.52759 0 0.72881l1.6587 1.6638c-0.69811 0.38451-1.5927 0.28163-2.1846-0.31173-0.71826-0.72036-0.71764-1.8883 0-2.608 0.71826-0.72036 1.8822-0.72036 2.6004 0 0.59183 0.59356 0.69482 1.4906 0.31103 2.1912zm-2.3007 2.6936c0-0.38224 0.30897-0.69149 0.68948-0.69149 0.38112 0 0.68948 0.30946 0.68948 0.69149 0 0.38203-0.30856 0.69149-0.68948 0.69149-0.38071 0-0.68948-0.30967-0.68948-0.69149zm2.2312 2.4716v2.2198h-3.0835v-2.2198h3.0835z"/>
   </g>
  </g>
diff --git a/data/styles/clear/style-night/symbols/peakt-m.svg b/data/styles/clear/style-night/symbols/peakt-m.svg
index f49b71f8af..f9bb02937b 100644
--- a/data/styles/clear/style-night/symbols/peakt-m.svg
+++ b/data/styles/clear/style-night/symbols/peakt-m.svg
@@ -1,7 +1,7 @@
 <svg version="1.1" viewBox="0 0 9 8" xmlns="http://www.w3.org/2000/svg">
  <title>peakt-m</title>
- <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity=".8">
-  <g id="peakt-m" fill="#FFF">
+ <g id="Page-2:-Night">
+  <g id="peakt-m" fill="#777777">
    <path id="Path" d="m4.5 0c-0.25 0-0.36304 0.1197-0.4375 0.25l-4 7c-0.04405 0.077-0.0625 0.1637-0.0625 0.25 0 0.375 0.25 0.5001 0.5 0.5h8c0.25 1e-4 0.5-0.125 0.5-0.5 0-0.086-0.01845-0.1728-0.0625-0.25l-4-7c-0.07446-0.1303-0.1875-0.25-0.4375-0.25z"/>
   </g>
  </g>
diff --git a/data/styles/clear/style-night/symbols/peakt-s.svg b/data/styles/clear/style-night/symbols/peakt-s.svg
index cbc1de94e6..c3733b2f2f 100644
--- a/data/styles/clear/style-night/symbols/peakt-s.svg
+++ b/data/styles/clear/style-night/symbols/peakt-s.svg
@@ -1,7 +1,7 @@
 <svg version="1.1" viewBox="0 0 7 6" xmlns="http://www.w3.org/2000/svg">
  <title>peakt-s</title>
- <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity=".8">
-  <g id="peakt-s" fill="#FFF">
+ <g id="Page-2:-Night">
+  <g id="peakt-s" fill="#777777">
    <path id="Path" d="m3.5-1.7378e-9c-0.18421 0-0.26751 0.089775-0.32237 0.1875l-3.1316 5.25c-0.032458 0.057862-0.046053 0.12278-0.046053 0.1875 0 0.28125 0.18421 0.37508 0.36842 0.375h6.2632c0.18421 7.496e-5 0.36842-0.09375 0.36842-0.375 0-0.064725-0.013576-0.12964-0.046053-0.1875l-3.1316-5.25c-0.05486-0.097725-0.13816-0.1875-0.32237-0.1875z"/>
   </g>
  </g>
diff --git a/data/styles/clear/style-night/symbols/pelota-m.svg b/data/styles/clear/style-night/symbols/pelota-m.svg
index 0ec281a558..733b828927 100644
--- a/data/styles/clear/style-night/symbols/pelota-m.svg
+++ b/data/styles/clear/style-night/symbols/pelota-m.svg
@@ -1,4 +1,4 @@
 <svg version="1.1" viewBox="0 0 24 24" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
-<path d="m16.974 16.09c0.43366 0 0.85097 0.17183 1.1537 0.48277 0.63822 0.63822 0.63822 1.6773 0 2.3156-0.30275 0.30274-0.72005 0.47458-1.1537 0.47458-0.43366 0-0.85097-0.17183-1.1537-0.48277-0.63822-0.63822-0.63822-1.6773 0-2.3156 0.30274-0.30274 0.72005-0.47458 1.1537-0.47458m0-1.6364c-0.8346 0-1.6773 0.31911-2.3156 0.95734-1.2765 1.2765-1.2765 3.3466 0 4.6312 0.63822 0.63822 1.481 0.95733 2.3156 0.95733 0.83461 0 1.6773-0.31911 2.3156-0.95733 1.2765-1.2765 1.2765-3.3466 0-4.6312-0.63822-0.63822-1.481-0.95734-2.3156-0.95734z" fill="#fff" opacity=".6" stroke-width="1.2858"/>
-<path d="m5.2111 18.399c-0.27247-0.0656-0.38999-0.15026-0.91845-0.66163-0.60975-0.59008-1.1061-1.0965-1.0617-1.4401 0.048606-0.3761 0.29494-0.64642 0.74386-0.6948 0.34446-0.03712 0.76035 0.37469 0.81846 0.34119 0.058099-0.0335 0.85197-0.83254 1.7641-1.7756 1.7241-1.7826 1.8834-1.9656 2.1681-2.4911 0.058451-0.10789 0.374-0.7791 0.70122-1.4916 0.84913-1.8684 1.2191-2.9047 2.28-4.9389 0.30335-0.56248 0.97631-1.3409 1.4937-1.7276 0.48761-0.36454 1.0832-0.66391 1.7032-0.85603 0.38951-0.12071 1.2699-0.20106 1.6648-0.15193 0.88086 0.10957 1.5726 0.43858 2.1509 1.0231 0.54238 0.54814 0.86115 1.197 0.98646 2.0081 0.05501 0.35604-0.0098 1.3461-0.11274 1.7217-0.15993 0.58375-0.41632 1.134-0.76496 1.6418-0.39115 0.56965-1.1012 1.2298-1.6978 1.5786-0.10269 0.06003-1.5384 0.78178-3.1905 1.6039-1.6521 0.8221-3.0763 1.5371-3.165 1.5889-0.49322 0.28812-0.66974 0.45388-2.6746 2.5116-2.1813 2.2388-2.0638 2.1364-2.5284 2.2036-0.15139 0.0219-0.28726 0.02445-0.36082 0.0067z" fill="#fff" opacity=".6" stroke-width=".030096"/>
+<path d="m16.974 16.09c0.43366 0 0.85097 0.17183 1.1537 0.48277 0.63822 0.63822 0.63822 1.6773 0 2.3156-0.30275 0.30274-0.72005 0.47458-1.1537 0.47458-0.43366 0-0.85097-0.17183-1.1537-0.48277-0.63822-0.63822-0.63822-1.6773 0-2.3156 0.30274-0.30274 0.72005-0.47458 1.1537-0.47458m0-1.6364c-0.8346 0-1.6773 0.31911-2.3156 0.95734-1.2765 1.2765-1.2765 3.3466 0 4.6312 0.63822 0.63822 1.481 0.95733 2.3156 0.95733 0.83461 0 1.6773-0.31911 2.3156-0.95733 1.2765-1.2765 1.2765-3.3466 0-4.6312-0.63822-0.63822-1.481-0.95734-2.3156-0.95734z" fill="#777777" stroke-width="1.2858"/>
+<path d="m5.2111 18.399c-0.27247-0.0656-0.38999-0.15026-0.91845-0.66163-0.60975-0.59008-1.1061-1.0965-1.0617-1.4401 0.048606-0.3761 0.29494-0.64642 0.74386-0.6948 0.34446-0.03712 0.76035 0.37469 0.81846 0.34119 0.058099-0.0335 0.85197-0.83254 1.7641-1.7756 1.7241-1.7826 1.8834-1.9656 2.1681-2.4911 0.058451-0.10789 0.374-0.7791 0.70122-1.4916 0.84913-1.8684 1.2191-2.9047 2.28-4.9389 0.30335-0.56248 0.97631-1.3409 1.4937-1.7276 0.48761-0.36454 1.0832-0.66391 1.7032-0.85603 0.38951-0.12071 1.2699-0.20106 1.6648-0.15193 0.88086 0.10957 1.5726 0.43858 2.1509 1.0231 0.54238 0.54814 0.86115 1.197 0.98646 2.0081 0.05501 0.35604-0.0098 1.3461-0.11274 1.7217-0.15993 0.58375-0.41632 1.134-0.76496 1.6418-0.39115 0.56965-1.1012 1.2298-1.6978 1.5786-0.10269 0.06003-1.5384 0.78178-3.1905 1.6039-1.6521 0.8221-3.0763 1.5371-3.165 1.5889-0.49322 0.28812-0.66974 0.45388-2.6746 2.5116-2.1813 2.2388-2.0638 2.1364-2.5284 2.2036-0.15139 0.0219-0.28726 0.02445-0.36082 0.0067z" fill="#777777" stroke-width=".030096"/>
 </svg>
diff --git a/data/styles/clear/style-night/symbols/phone-m.svg b/data/styles/clear/style-night/symbols/phone-m.svg
index 0397ba4571..48a8279c01 100644
--- a/data/styles/clear/style-night/symbols/phone-m.svg
+++ b/data/styles/clear/style-night/symbols/phone-m.svg
@@ -2,7 +2,7 @@
  <title>phone-m</title>
  <g id="Page-2:-Night" fill="none">
   <g id="phone-m">
-   <path id="Path" d="m18.23 14.629c-0.95667 0-1.8822-0.15556-2.7456-0.43556-0.27222-0.093333-0.57556-0.023333-0.78556 0.18667l-1.2211 1.5322c-2.2011-1.05-4.2622-3.0333-5.3589-5.3122l1.5167-1.2911c0.21-0.21778 0.27222-0.52111 0.18667-0.79333-0.28778-0.86333-0.43556-1.7889-0.43556-2.7456 0-0.42-0.35-0.77-0.77-0.77h-2.6911c-0.42 0-0.92556 0.18667-0.92556 0.77 0 7.2256 6.0122 13.23 13.23 13.23 0.55222 0 0.77-0.49 0.77-0.91778v-2.6833c0-0.42-0.35-0.77-0.77-0.77z" fill="#FFF" opacity=".6"/>
+   <path id="Path" d="m18.23 14.629c-0.95667 0-1.8822-0.15556-2.7456-0.43556-0.27222-0.093333-0.57556-0.023333-0.78556 0.18667l-1.2211 1.5322c-2.2011-1.05-4.2622-3.0333-5.3589-5.3122l1.5167-1.2911c0.21-0.21778 0.27222-0.52111 0.18667-0.79333-0.28778-0.86333-0.43556-1.7889-0.43556-2.7456 0-0.42-0.35-0.77-0.77-0.77h-2.6911c-0.42 0-0.92556 0.18667-0.92556 0.77 0 7.2256 6.0122 13.23 13.23 13.23 0.55222 0 0.77-0.49 0.77-0.91778v-2.6833c0-0.42-0.35-0.77-0.77-0.77z" fill="#777777"/>
   </g>
  </g>
 </svg>
diff --git a/data/styles/clear/style-night/symbols/picnic-m.svg b/data/styles/clear/style-night/symbols/picnic-m.svg
index 9dd4d92a86..a947bdf8dd 100644
--- a/data/styles/clear/style-night/symbols/picnic-m.svg
+++ b/data/styles/clear/style-night/symbols/picnic-m.svg
@@ -1,8 +1,8 @@
 <svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
  <title>picnic-m</title>
- <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity=".6">
+ <g id="Page-2:-Night" fill="none" fill-rule="evenodd" >
   <g id="picnic-m" fill-rule="nonzero">
-   <path id="Shape" d="m8.6081 8.8182h-1.7414v-1.8182h10.267v1.8182h-1.8473l0.8161 3.6364h2.8979v0.90909h-2.6938l0.83313 3.7122-1.8196-0.0082914-0.83127-3.7039h-5.0653l-0.7897 3.5794-1.8196 0.0082914 0.79153-3.5877h-2.6052v-0.90909h2.8058l0.80228-3.6364zm1.8178 0-0.80228 3.6364h4.6607l-0.8161-3.6364h-3.0423z" fill="#fff"/>
+   <path id="Shape" d="m8.6081 8.8182h-1.7414v-1.8182h10.267v1.8182h-1.8473l0.8161 3.6364h2.8979v0.90909h-2.6938l0.83313 3.7122-1.8196-0.0082914-0.83127-3.7039h-5.0653l-0.7897 3.5794-1.8196 0.0082914 0.79153-3.5877h-2.6052v-0.90909h2.8058l0.80228-3.6364zm1.8178 0-0.80228 3.6364h4.6607l-0.8161-3.6364h-3.0423z" fill="#777777"/>
   </g>
  </g>
 </svg>
diff --git a/data/styles/clear/style-night/symbols/picnic_table-m.svg b/data/styles/clear/style-night/symbols/picnic_table-m.svg
index 196f052f7b..96979ce725 100644
--- a/data/styles/clear/style-night/symbols/picnic_table-m.svg
+++ b/data/styles/clear/style-night/symbols/picnic_table-m.svg
@@ -1,8 +1,8 @@
 <svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
  <title>picnic_table-m</title>
- <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity=".6">
+ <g id="Page-2:-Night">
   <g id="picnic_table-m" fill-rule="nonzero">
-   <path id="Shape" d="m8.6081 8.8182h-1.7414v-1.8182h10.267v1.8182h-1.8473l0.8161 3.6364h2.8979v0.90909h-2.6938l0.83313 3.7122-1.8196-0.0082914-0.83127-3.7039h-5.0653l-0.7897 3.5794-1.8196 0.0082914 0.79153-3.5877h-2.6052v-0.90909h2.8058l0.80228-3.6364zm1.8178 0-0.80228 3.6364h4.6607l-0.8161-3.6364h-3.0423z" fill="#FFF"/>
+   <path id="Shape" d="m8.6081 8.8182h-1.7414v-1.8182h10.267v1.8182h-1.8473l0.8161 3.6364h2.8979v0.90909h-2.6938l0.83313 3.7122-1.8196-0.0082914-0.83127-3.7039h-5.0653l-0.7897 3.5794-1.8196 0.0082914 0.79153-3.5877h-2.6052v-0.90909h2.8058l0.80228-3.6364zm1.8178 0-0.80228 3.6364h4.6607l-0.8161-3.6364h-3.0423z" fill="#777777"/>
   </g>
  </g>
 </svg>
diff --git a/data/styles/clear/style-night/symbols/pitch-m.svg b/data/styles/clear/style-night/symbols/pitch-m.svg
index 86b4ffd625..24ab6519c0 100644
--- a/data/styles/clear/style-night/symbols/pitch-m.svg
+++ b/data/styles/clear/style-night/symbols/pitch-m.svg
@@ -2,7 +2,7 @@
  <title>pitch-m</title>
  <g fill="none" fill-rule="evenodd">
   <g id="pitch-m" fill-rule="nonzero">
-   <path id="Shape" d="m11.595 3c-1.109 0-2.008 0.84822-2.008 1.8947 0 1.0465 0.89899 1.8947 2.008 1.8947 1.109 0 2.008-0.84822 2.008-1.8947 0-1.0465-0.89899-1.8947-2.008-1.8947zm-5.7729 3.7894 0.502 1.8948c0.25099 0.94735 0.85053 0.94735 1.6001 0.94735h1.6628c0.59612 0.94735 0.31592 2.4875 0.502 3.9352h-0.90987c-1.004 0-2.6041 0.94735-1.6001 2.8421l1.506 2.8422c1.004 1.8947 2.5099 0.47368 2.008-0.47368l-1.506-2.8422c-0.25099-0.47368 0.26536-0.47368 0.502-0.47368h2.4778s1.1885 2.3436 2.5884 4.0497c0.51677 0.62972 1.0892 1.4887 1.8057 1.4887 0.50198 0 1.3622-0.73205 0.44668-1.763-1.7145-1.9307-2.8006-3.9212-2.8006-4.8686 0-1.1019-0.20515-3.4225-0.50198-4.7368h1.506c0.48994 0.92658 1.3499 2.3684 1.3499 2.3684 0.55494 0.90706 1.4674 0.83852 1.4674 0 0-0.11492-0.01467-0.36235-0.14013-0.64122l-1.4222-3.1482c-0.09288-0.20548-0.25442-0.47368-1.004-0.47368h-7.7809l-0.75299-2.3685c-0.30119-0.94735-1.757-0.94735-1.757 0 0 0.47368 0.17786 1.0488 0.25099 1.421z" fill="#fff" opacity=".6" stroke-width="1.2857"/>
+   <path id="Shape" d="m11.595 3c-1.109 0-2.008 0.84822-2.008 1.8947 0 1.0465 0.89899 1.8947 2.008 1.8947 1.109 0 2.008-0.84822 2.008-1.8947 0-1.0465-0.89899-1.8947-2.008-1.8947zm-5.7729 3.7894 0.502 1.8948c0.25099 0.94735 0.85053 0.94735 1.6001 0.94735h1.6628c0.59612 0.94735 0.31592 2.4875 0.502 3.9352h-0.90987c-1.004 0-2.6041 0.94735-1.6001 2.8421l1.506 2.8422c1.004 1.8947 2.5099 0.47368 2.008-0.47368l-1.506-2.8422c-0.25099-0.47368 0.26536-0.47368 0.502-0.47368h2.4778s1.1885 2.3436 2.5884 4.0497c0.51677 0.62972 1.0892 1.4887 1.8057 1.4887 0.50198 0 1.3622-0.73205 0.44668-1.763-1.7145-1.9307-2.8006-3.9212-2.8006-4.8686 0-1.1019-0.20515-3.4225-0.50198-4.7368h1.506c0.48994 0.92658 1.3499 2.3684 1.3499 2.3684 0.55494 0.90706 1.4674 0.83852 1.4674 0 0-0.11492-0.01467-0.36235-0.14013-0.64122l-1.4222-3.1482c-0.09288-0.20548-0.25442-0.47368-1.004-0.47368h-7.7809l-0.75299-2.3685c-0.30119-0.94735-1.757-0.94735-1.757 0 0 0.47368 0.17786 1.0488 0.25099 1.421z" fill="#777777" stroke-width="1.2857"/>
   </g>
  </g>
 </svg>
diff --git a/data/styles/clear/style-night/symbols/playground-m.svg b/data/styles/clear/style-night/symbols/playground-m.svg
index fba841210e..19aa2d2c44 100644
--- a/data/styles/clear/style-night/symbols/playground-m.svg
+++ b/data/styles/clear/style-night/symbols/playground-m.svg
@@ -1,3 +1,3 @@
 <svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <path d="m4.7696 21.038c-1.0318-0.26448-1.9314-1.2138-2.1722-2.2923-0.16219-0.72659-0.04871-1.5694 0.30121-2.2371 0.23145-0.44162 0.72468-0.94904 1.1507-1.1839 0.60048-0.33096 0.74638-0.35899 2.0572-0.39536 1.1506-0.03192 1.1938-0.03692 1.4521-0.16782 0.14642-0.0742 1.2791-0.89368 2.5171-1.8211 1.238-0.92738 2.2673-1.6703 2.2875-1.6508 0.02016 0.01941 0.03106 1.4824 0.02421 3.2512l-0.01246 3.2159-1.9362 1.4445c-1.0649 0.79449-2.0669 1.507-2.2266 1.5834-0.59721 0.28553-0.85862 0.32593-2.0781 0.32118-0.71051-0.0028-1.2067-0.02745-1.3645-0.06789zm8.7998-0.0461-0.10525-0.11833v-15.972l4.0055-2.0128 4.0055 2.039v15.987l-0.11427 0.09774c-0.0962 0.08227-0.19418 0.09774-0.61936 0.09774-0.47173 0-0.51294-0.0083-0.6239-0.1255l-0.11881-0.1255v-3.5836h-5.0825v3.6123l-0.11203 0.11117c-0.10036 0.09958-0.16505 0.11117-0.62083 0.11117-0.46925 0-0.51698-0.0092-0.61404-0.11834zm6.4294-12.587v-1.9173h-5.0825v3.8346h5.0825z" fill="#fff" opacity=".6" stroke-width=".049748"/>
+ <path d="m4.7696 21.038c-1.0318-0.26448-1.9314-1.2138-2.1722-2.2923-0.16219-0.72659-0.04871-1.5694 0.30121-2.2371 0.23145-0.44162 0.72468-0.94904 1.1507-1.1839 0.60048-0.33096 0.74638-0.35899 2.0572-0.39536 1.1506-0.03192 1.1938-0.03692 1.4521-0.16782 0.14642-0.0742 1.2791-0.89368 2.5171-1.8211 1.238-0.92738 2.2673-1.6703 2.2875-1.6508 0.02016 0.01941 0.03106 1.4824 0.02421 3.2512l-0.01246 3.2159-1.9362 1.4445c-1.0649 0.79449-2.0669 1.507-2.2266 1.5834-0.59721 0.28553-0.85862 0.32593-2.0781 0.32118-0.71051-0.0028-1.2067-0.02745-1.3645-0.06789zm8.7998-0.0461-0.10525-0.11833v-15.972l4.0055-2.0128 4.0055 2.039v15.987l-0.11427 0.09774c-0.0962 0.08227-0.19418 0.09774-0.61936 0.09774-0.47173 0-0.51294-0.0083-0.6239-0.1255l-0.11881-0.1255v-3.5836h-5.0825v3.6123l-0.11203 0.11117c-0.10036 0.09958-0.16505 0.11117-0.62083 0.11117-0.46925 0-0.51698-0.0092-0.61404-0.11834zm6.4294-12.587v-1.9173h-5.0825v3.8346h5.0825z" fill="#777777" stroke-width=".049748"/>
 </svg>
diff --git a/data/styles/clear/style-night/symbols/postbox-m.svg b/data/styles/clear/style-night/symbols/postbox-m.svg
index 758ed9134a..482587bcd8 100644
--- a/data/styles/clear/style-night/symbols/postbox-m.svg
+++ b/data/styles/clear/style-night/symbols/postbox-m.svg
@@ -2,7 +2,7 @@
  <title>postbox-m</title>
  <g id="Page-2:-Night" fill="none">
   <g id="postbox-m">
-   <path id="Path" d="m17.321 10.489v7.5111h-12.321v-7.7296l2.2402 1.9947v1.7454h7.8408v-1.527l2.2402-1.9947zm0.67879-3.012-5.0965 4.539h-3.2382l-2.2861-1.9947h5.2679l1.3128-1.3774v-4.6437l4.0402 3.4768zm-5.8279 1.5469h-4.7918l2.798-2.5323 2.6625-2.4914v4.2408l-0.66871 0.78293z" fill="#FFF" opacity=".6"/>
+   <path id="Path" d="m17.321 10.489v7.5111h-12.321v-7.7296l2.2402 1.9947v1.7454h7.8408v-1.527l2.2402-1.9947zm0.67879-3.012-5.0965 4.539h-3.2382l-2.2861-1.9947h5.2679l1.3128-1.3774v-4.6437l4.0402 3.4768zm-5.8279 1.5469h-4.7918l2.798-2.5323 2.6625-2.4914v4.2408l-0.66871 0.78293z" fill="#777777"/>
   </g>
  </g>
 </svg>
diff --git a/data/styles/clear/style-night/symbols/power-m.svg b/data/styles/clear/style-night/symbols/power-m.svg
index 50ef83993d..1a44d93793 100644
--- a/data/styles/clear/style-night/symbols/power-m.svg
+++ b/data/styles/clear/style-night/symbols/power-m.svg
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <path d="m12.996 3c-0.23038-1.78e-5 -0.44299 0.12382-0.55664 0.32422-2.3639 4.1598-4.0202 6.791-5.2285 8.9199-5.092e-4 8.97e-4 -0.00144 3e-3 -0.00195 0.0039-0.035086 0.05135-0.02924 0.04302-0.037109 0.05664-0.016749 0.02898-0.041195 0.07424-0.085937 0.1543-0.1275 0.22815-0.29484 0.52895-0.13086 0.96289 0.08199 0.21697 0.27802 0.40446 0.4707 0.49219 0.19269 0.08773 0.37695 0.10907 0.57031 0.10938l2.4375 0.0039-0.85742 6.2461c-0.052498 0.38382 0.24542 0.72588 0.63281 0.72658h0.92969c0.1035-3.64e-4 0.20538-0.02583 0.29688-0.07422 0.09218-0.04799 0.17128-0.11771 0.23047-0.20312 0 0 1.5971-2.3245 5.2637-8.7363 0.0091-0.01526 0.01758-0.0309 0.02539-0.04687l0.05664-0.12305c0.14162-0.28323 0.14702-0.62363-0.05078-0.93164-0.1978-0.30801-0.58731-0.46944-0.95898-0.46875l-2.3242 0.0039 0.88086-6.6973c0.049892-0.38235-0.24722-0.72165-0.63281-0.72265z" fill="#fff" opacity="0.6"/>
+ <path d="m12.996 3c-0.23038-1.78e-5 -0.44299 0.12382-0.55664 0.32422-2.3639 4.1598-4.0202 6.791-5.2285 8.9199-5.092e-4 8.97e-4 -0.00144 3e-3 -0.00195 0.0039-0.035086 0.05135-0.02924 0.04302-0.037109 0.05664-0.016749 0.02898-0.041195 0.07424-0.085937 0.1543-0.1275 0.22815-0.29484 0.52895-0.13086 0.96289 0.08199 0.21697 0.27802 0.40446 0.4707 0.49219 0.19269 0.08773 0.37695 0.10907 0.57031 0.10938l2.4375 0.0039-0.85742 6.2461c-0.052498 0.38382 0.24542 0.72588 0.63281 0.72658h0.92969c0.1035-3.64e-4 0.20538-0.02583 0.29688-0.07422 0.09218-0.04799 0.17128-0.11771 0.23047-0.20312 0 0 1.5971-2.3245 5.2637-8.7363 0.0091-0.01526 0.01758-0.0309 0.02539-0.04687l0.05664-0.12305c0.14162-0.28323 0.14702-0.62363-0.05078-0.93164-0.1978-0.30801-0.58731-0.46944-0.95898-0.46875l-2.3242 0.0039 0.88086-6.6973c0.049892-0.38235-0.24722-0.72165-0.63281-0.72265z" fill="#777777"/>
 </svg>
diff --git a/data/styles/clear/style-night/symbols/recycling-m.svg b/data/styles/clear/style-night/symbols/recycling-m.svg
index 6ddca3d0da..eb2d00411b 100644
--- a/data/styles/clear/style-night/symbols/recycling-m.svg
+++ b/data/styles/clear/style-night/symbols/recycling-m.svg
@@ -2,7 +2,7 @@
  <title>recycling-m</title>
  <g id="Page-2:-Night" fill="none">
   <g id="recycling-m">
-   <path id="Path" d="m8.18 8.4333 0.95333-1.58 0.68667-1.14c0.26-0.43333 0.88667-0.43333 1.1467 0l0.98667 1.64-0.82 1.3733-0.66667 1.08-2.2867-1.3733zm10.633 3.88-1.0667-1.7733-2.3067 1.3333 1.4733 2.46h0.75333c0.50667 0 0.96667-0.28667 1.1933-0.74 0.093333-0.18667 0.14-0.38667 0.14-0.59333 0-0.24-0.066667-0.47333-0.18667-0.68667zm-3.8133 5.3533h1c0.50667 0 0.96667-0.28667 1.1933-0.74l0.96667-1.9267h-3.16v-1.3333l-2.6667 2.6667 2.6667 2.6667v-1.3333zm-4-2.6667h-2.8667l-0.56 0.94c-0.2 0.33333-0.21333 0.74667-0.04 1.1 0.18667 0.38 0.58 0.62667 1.0133 0.62667h2.4533v-2.6667zm-2.5867-1.7667 1.1533 0.69333-0.91333-3.66-3.6533 0.91333 1.1333 0.68-0.27333 0.46c-0.23333 0.39333-0.25333 0.87333-0.046667 1.28l1.0867 2.1733 1.5133-2.54zm7.2667-6.14-0.86667-1.4467c-0.24667-0.4-0.68-0.64667-1.1467-0.64667h-2.3533l2.08 3.4667-1.1467 0.68667 3.66 0.91333 0.91333-3.66-1.14 0.68667z" fill="#FFF" opacity=".6"/>
+   <path id="Path" d="m8.18 8.4333 0.95333-1.58 0.68667-1.14c0.26-0.43333 0.88667-0.43333 1.1467 0l0.98667 1.64-0.82 1.3733-0.66667 1.08-2.2867-1.3733zm10.633 3.88-1.0667-1.7733-2.3067 1.3333 1.4733 2.46h0.75333c0.50667 0 0.96667-0.28667 1.1933-0.74 0.093333-0.18667 0.14-0.38667 0.14-0.59333 0-0.24-0.066667-0.47333-0.18667-0.68667zm-3.8133 5.3533h1c0.50667 0 0.96667-0.28667 1.1933-0.74l0.96667-1.9267h-3.16v-1.3333l-2.6667 2.6667 2.6667 2.6667v-1.3333zm-4-2.6667h-2.8667l-0.56 0.94c-0.2 0.33333-0.21333 0.74667-0.04 1.1 0.18667 0.38 0.58 0.62667 1.0133 0.62667h2.4533v-2.6667zm-2.5867-1.7667 1.1533 0.69333-0.91333-3.66-3.6533 0.91333 1.1333 0.68-0.27333 0.46c-0.23333 0.39333-0.25333 0.87333-0.046667 1.28l1.0867 2.1733 1.5133-2.54zm7.2667-6.14-0.86667-1.4467c-0.24667-0.4-0.68-0.64667-1.1467-0.64667h-2.3533l2.08 3.4667-1.1467 0.68667 3.66 0.91333 0.91333-3.66-1.14 0.68667z" fill="#777777"/>
   </g>
  </g>
 </svg>
diff --git a/data/styles/clear/style-night/symbols/shelter-m.svg b/data/styles/clear/style-night/symbols/shelter-m.svg
index d05b8671ef..5782013edc 100644
--- a/data/styles/clear/style-night/symbols/shelter-m.svg
+++ b/data/styles/clear/style-night/symbols/shelter-m.svg
@@ -1,7 +1,7 @@
 <svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
  <title>shelter-m</title>
  <g fill="none" fill-rule="evenodd">
-  <g id="home-m" fill="none" fill-rule="nonzero" opacity=".6" stroke="#FFF" stroke-linecap="round" stroke-linejoin="round">
+  <g id="home-m" fill="none" fill-rule="nonzero" stroke="#777777" stroke-linecap="round" stroke-linejoin="round">
    <path d="m17.786 20.842v-8.4682h-11.572v8.4682" stroke-width="1.5"/>
    <path d="m12.625 2.2617-.625 2.3203zm-4.4199 3.125-.625 2.3203zm8.8398 0-.625 2.3203zm-13.262 3.9727-.625 2.3203zm17.684 0-.625 2.3203z" stroke-width=".5"/>
    <path d="m3.7832 14.493 8.2168-7.3211 8.2168 7.3211" stroke-width="2"/>
diff --git a/data/styles/clear/style-night/symbols/shower-m.svg b/data/styles/clear/style-night/symbols/shower-m.svg
index fae0032f55..9791fa2324 100644
--- a/data/styles/clear/style-night/symbols/shower-m.svg
+++ b/data/styles/clear/style-night/symbols/shower-m.svg
@@ -1,8 +1,8 @@
 <svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
  <title>shower-m</title>
- <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity=".6">
+ <g id="Page-2:-Night" fill="none" fill-rule="evenodd">
   <g id="shower-m" fill-rule="nonzero">
-   <path id="Shape" d="m11.6 5v1.4656c-1.7775 0.29846-3.1899 1.6981-3.5 3.4344h8.4c-0.31006-1.7363-1.7225-3.1359-3.5-3.4344v-1.4656h-1.4zm-4.2 5.6v1.4h9.8v-1.4h-9.8zm2.1 2.8c-0.3866 0-0.7 0.3134-0.7 0.7s0.3134 0.7 0.7 0.7 0.7-0.3134 0.7-0.7-0.3134-0.7-0.7-0.7zm2.8 0c-0.3866 0-0.7 0.3134-0.7 0.7s0.3134 0.7 0.7 0.7 0.7-0.3134 0.7-0.7-0.3134-0.7-0.7-0.7zm2.8 0c-0.3866 0-0.7 0.3134-0.7 0.7s0.3134 0.7 0.7 0.7 0.7-0.3134 0.7-0.7-0.3134-0.7-0.7-0.7zm-7 2.1c-0.3866 0-0.7 0.3134-0.7 0.7s0.3134 0.7 0.7 0.7 0.7-0.3134 0.7-0.7-0.3134-0.7-0.7-0.7zm2.8 0c-0.3866 0-0.7 0.3134-0.7 0.7s0.3134 0.7 0.7 0.7c0.3866 0 0.7-0.3134 0.7-0.7s-0.3134-0.7-0.7-0.7zm2.8 0c-0.3866 0-0.7 0.3134-0.7 0.7s0.3134 0.7 0.7 0.7 0.7-0.3134 0.7-0.7-0.3134-0.7-0.7-0.7zm2.8 0c-0.3866 0-0.7 0.3134-0.7 0.7s0.3134 0.7 0.7 0.7 0.7-0.3134 0.7-0.7-0.3134-0.7-0.7-0.7zm-9.8 2.1c-0.3866 0-0.7 0.3134-0.7 0.7s0.3134 0.7 0.7 0.7 0.7-0.3134 0.7-0.7-0.3134-0.7-0.7-0.7zm2.8 0c-0.3866 0-0.7 0.3134-0.7 0.7s0.3134 0.7 0.7 0.7 0.7-0.3134 0.7-0.7-0.3134-0.7-0.7-0.7zm2.8 0c-0.3866 0-0.7 0.3134-0.7 0.7s0.3134 0.7 0.7 0.7 0.7-0.3134 0.7-0.7-0.3134-0.7-0.7-0.7zm2.8 0c-0.3866 0-0.7 0.3134-0.7 0.7s0.3134 0.7 0.7 0.7 0.7-0.3134 0.7-0.7-0.3134-0.7-0.7-0.7zm2.8 0c-0.3866 0-0.7 0.3134-0.7 0.7s0.3134 0.7 0.7 0.7 0.7-0.3134 0.7-0.7-0.3134-0.7-0.7-0.7z" fill="#FFF"/>
+   <path id="Shape" d="m11.6 5v1.4656c-1.7775 0.29846-3.1899 1.6981-3.5 3.4344h8.4c-0.31006-1.7363-1.7225-3.1359-3.5-3.4344v-1.4656h-1.4zm-4.2 5.6v1.4h9.8v-1.4h-9.8zm2.1 2.8c-0.3866 0-0.7 0.3134-0.7 0.7s0.3134 0.7 0.7 0.7 0.7-0.3134 0.7-0.7-0.3134-0.7-0.7-0.7zm2.8 0c-0.3866 0-0.7 0.3134-0.7 0.7s0.3134 0.7 0.7 0.7 0.7-0.3134 0.7-0.7-0.3134-0.7-0.7-0.7zm2.8 0c-0.3866 0-0.7 0.3134-0.7 0.7s0.3134 0.7 0.7 0.7 0.7-0.3134 0.7-0.7-0.3134-0.7-0.7-0.7zm-7 2.1c-0.3866 0-0.7 0.3134-0.7 0.7s0.3134 0.7 0.7 0.7 0.7-0.3134 0.7-0.7-0.3134-0.7-0.7-0.7zm2.8 0c-0.3866 0-0.7 0.3134-0.7 0.7s0.3134 0.7 0.7 0.7c0.3866 0 0.7-0.3134 0.7-0.7s-0.3134-0.7-0.7-0.7zm2.8 0c-0.3866 0-0.7 0.3134-0.7 0.7s0.3134 0.7 0.7 0.7 0.7-0.3134 0.7-0.7-0.3134-0.7-0.7-0.7zm2.8 0c-0.3866 0-0.7 0.3134-0.7 0.7s0.3134 0.7 0.7 0.7 0.7-0.3134 0.7-0.7-0.3134-0.7-0.7-0.7zm-9.8 2.1c-0.3866 0-0.7 0.3134-0.7 0.7s0.3134 0.7 0.7 0.7 0.7-0.3134 0.7-0.7-0.3134-0.7-0.7-0.7zm2.8 0c-0.3866 0-0.7 0.3134-0.7 0.7s0.3134 0.7 0.7 0.7 0.7-0.3134 0.7-0.7-0.3134-0.7-0.7-0.7zm2.8 0c-0.3866 0-0.7 0.3134-0.7 0.7s0.3134 0.7 0.7 0.7 0.7-0.3134 0.7-0.7-0.3134-0.7-0.7-0.7zm2.8 0c-0.3866 0-0.7 0.3134-0.7 0.7s0.3134 0.7 0.7 0.7 0.7-0.3134 0.7-0.7-0.3134-0.7-0.7-0.7zm2.8 0c-0.3866 0-0.7 0.3134-0.7 0.7s0.3134 0.7 0.7 0.7 0.7-0.3134 0.7-0.7-0.3134-0.7-0.7-0.7z" fill="#777777"/>
   </g>
  </g>
 </svg>
diff --git a/data/styles/clear/style-night/symbols/skateboard-m.svg b/data/styles/clear/style-night/symbols/skateboard-m.svg
index 52e24dba6e..14a52e3328 100644
--- a/data/styles/clear/style-night/symbols/skateboard-m.svg
+++ b/data/styles/clear/style-night/symbols/skateboard-m.svg
@@ -1,3 +1,3 @@
-<svg enable-background="new 0 0 24 24" fill="#000000" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <path d="m13.588 4.5652c0-0.86087 0.95294-1.5652 2.1176-1.5652s2.1176 0.70435 2.1176 1.5652-0.95294 1.5652-2.1176 1.5652-2.1176-0.70435-2.1176-1.5652zm-6.0882 15.261c-0.43412 0-0.79412 0.26609-0.79412 0.58696 0 0.32087 0.36 0.58696 0.79412 0.58696s0.79412-0.26609 0.79412-0.58696c0-0.32087-0.36-0.58696-0.79412-0.58696zm9 0c-0.43412 0-0.79412 0.26609-0.79412 0.58696 0 0.32087 0.36 0.58696 0.79412 0.58696s0.79412-0.26609 0.79412-0.58696c0-0.32087-0.36-0.58696-0.79412-0.58696zm3.6953-2.7391c-0.25412 0-0.47647 0.08609-0.62471 0.23478-0.58235 0.5713-1.5035 0.93913-2.5412 0.93913h-0.26471v-4.6957l-4.5741-2.0896 1.9059-2.2617c1.2176 1.44 3.3882 2.3948 5.8447 2.3948v-1.5652c-1.9588 0-3.6424-0.87652-4.3729-2.1287l-0.55059-0.94696c-0.20118-0.33652-0.78353-0.83739-1.7471-0.83739h-6.0353l-2.6471 3.1304 1.8 0.82957 2.0118-2.3948h2.4882l-2.5412 3.0052c-0.32824 0.3913-0.41294 0.8687-0.22235 1.307l1.4188 3.2478-3.3035 2.9426c-0.74118-0.12522-1.3765-0.44609-1.8106-0.87652-0.14824-0.1487-0.38118-0.23478-0.63529-0.23478-0.46588 0-0.79412 0.28174-0.79412 0.58696 0 0.11739 0.052941 0.24261 0.15882 0.35217 0.86824 0.86087 2.2553 1.4087 3.8118 1.4087h10.059c1.5565 0 2.9435-0.54783 3.8118-1.4087 0.10588-0.10956 0.15882-0.23478 0.15882-0.35217 0-0.30522-0.33882-0.58696-0.80471-0.58696zm-5.5482 1.1739h-5.7176l3.0706-2.7391-1.0588-2.5826 3.7059 1.7217z" fill="#fff" opacity=".6" stroke-width=".9103"/>
+<svg enable-background="new 0 0 24 24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m13.588 4.5652c0-0.86087 0.95294-1.5652 2.1176-1.5652s2.1176 0.70435 2.1176 1.5652-0.95294 1.5652-2.1176 1.5652-2.1176-0.70435-2.1176-1.5652zm-6.0882 15.261c-0.43412 0-0.79412 0.26609-0.79412 0.58696 0 0.32087 0.36 0.58696 0.79412 0.58696s0.79412-0.26609 0.79412-0.58696c0-0.32087-0.36-0.58696-0.79412-0.58696zm9 0c-0.43412 0-0.79412 0.26609-0.79412 0.58696 0 0.32087 0.36 0.58696 0.79412 0.58696s0.79412-0.26609 0.79412-0.58696c0-0.32087-0.36-0.58696-0.79412-0.58696zm3.6953-2.7391c-0.25412 0-0.47647 0.08609-0.62471 0.23478-0.58235 0.5713-1.5035 0.93913-2.5412 0.93913h-0.26471v-4.6957l-4.5741-2.0896 1.9059-2.2617c1.2176 1.44 3.3882 2.3948 5.8447 2.3948v-1.5652c-1.9588 0-3.6424-0.87652-4.3729-2.1287l-0.55059-0.94696c-0.20118-0.33652-0.78353-0.83739-1.7471-0.83739h-6.0353l-2.6471 3.1304 1.8 0.82957 2.0118-2.3948h2.4882l-2.5412 3.0052c-0.32824 0.3913-0.41294 0.8687-0.22235 1.307l1.4188 3.2478-3.3035 2.9426c-0.74118-0.12522-1.3765-0.44609-1.8106-0.87652-0.14824-0.1487-0.38118-0.23478-0.63529-0.23478-0.46588 0-0.79412 0.28174-0.79412 0.58696 0 0.11739 0.052941 0.24261 0.15882 0.35217 0.86824 0.86087 2.2553 1.4087 3.8118 1.4087h10.059c1.5565 0 2.9435-0.54783 3.8118-1.4087 0.10588-0.10956 0.15882-0.23478 0.15882-0.35217 0-0.30522-0.33882-0.58696-0.80471-0.58696zm-5.5482 1.1739h-5.7176l3.0706-2.7391-1.0588-2.5826 3.7059 1.7217z" fill="#777777" stroke-width=".9103"/>
 </svg>
diff --git a/data/styles/clear/style-night/symbols/skiing-m.svg b/data/styles/clear/style-night/symbols/skiing-m.svg
index 39de6d3cd0..64876116c1 100644
--- a/data/styles/clear/style-night/symbols/skiing-m.svg
+++ b/data/styles/clear/style-night/symbols/skiing-m.svg
@@ -2,7 +2,7 @@
  <title>skiing-m</title>
  <g fill="none" fill-rule="evenodd">
   <g id="skiing-m" fill-rule="nonzero">
-   <path id="Shape" d="m17.85 4.575c0 0.99-0.81 1.8-1.8 1.8s-1.8-0.81-1.8-1.8c0-0.99 0.81-1.8 1.8-1.8s1.8 0.81 1.8 1.8zm-2.448 14.76 0.684 0.243c0.558 0.189 1.143 0.297 1.764 0.297 0.756 0 1.485-0.162 2.142-0.45l1.008 1.017c-0.945 0.495-2.016 0.783-3.15 0.783-0.774 0-1.512-0.126-2.205-0.369l-12.645-4.608 0.45-1.269 6.21 2.259 1.548-3.996-3.213-3.357c-0.801-0.846-0.603-2.223 0.405-2.808l3.132-1.809c0.99-0.576 2.268-0.09 2.619 0.999l0.297 0.972c0.396 1.278 1.332 2.313 2.547 2.826l0.468-1.44 1.287 0.414-1.008 3.105c-2.205-0.36-4.032-1.863-4.842-3.888l-2.277 1.305 2.727 3.114-1.998 5.184 2.781 1.008 1.89-5.796c0.414 0.162 0.846 0.279 1.296 0.369z" fill="#fff" opacity=".6" stroke-width="1.3179"/>
+   <path id="Shape" d="m17.85 4.575c0 0.99-0.81 1.8-1.8 1.8s-1.8-0.81-1.8-1.8c0-0.99 0.81-1.8 1.8-1.8s1.8 0.81 1.8 1.8zm-2.448 14.76 0.684 0.243c0.558 0.189 1.143 0.297 1.764 0.297 0.756 0 1.485-0.162 2.142-0.45l1.008 1.017c-0.945 0.495-2.016 0.783-3.15 0.783-0.774 0-1.512-0.126-2.205-0.369l-12.645-4.608 0.45-1.269 6.21 2.259 1.548-3.996-3.213-3.357c-0.801-0.846-0.603-2.223 0.405-2.808l3.132-1.809c0.99-0.576 2.268-0.09 2.619 0.999l0.297 0.972c0.396 1.278 1.332 2.313 2.547 2.826l0.468-1.44 1.287 0.414-1.008 3.105c-2.205-0.36-4.032-1.863-4.842-3.888l-2.277 1.305 2.727 3.114-1.998 5.184 2.781 1.008 1.89-5.796c0.414 0.162 0.846 0.279 1.296 0.369z" fill="#777777" stroke-width="1.3179"/>
   </g>
  </g>
 </svg>
diff --git a/data/styles/clear/style-night/symbols/soccer-m.svg b/data/styles/clear/style-night/symbols/soccer-m.svg
index 310a0a01f5..cd2ebdc62b 100644
--- a/data/styles/clear/style-night/symbols/soccer-m.svg
+++ b/data/styles/clear/style-night/symbols/soccer-m.svg
@@ -1,8 +1,8 @@
 <svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
  <title>soccer-m</title>
- <g fill="#fff" fill-rule="evenodd" opacity=".6">
+ <g fill="#fff" fill-rule="evenodd">
   <g id="soccer-m" fill="#fff" fill-rule="nonzero">
-   <path id="Shape" d="m12 3c-4.968 0-9 4.032-9 9s4.032 9 9 9 9-4.032 9-9-4.032-9-9-9zm0.9 2.97 1.215-0.855c1.638 0.504 3.033 1.584 3.942 3.006l-0.351 1.206-1.215 0.414-3.591-2.511zm-3.015-0.855 1.215 0.855v1.26l-3.591 2.511-1.215-0.414-0.351-1.206c0.909-1.413 2.304-2.493 3.942-3.006zm-2.313 11.484-1.026 0.09c-1.089-1.26-1.746-2.898-1.746-4.689 0-0.108 9e-3 -0.207 0.018-0.315l0.9-0.657 1.242 0.432 1.314 3.906zm6.678 2.232c-0.711 0.234-1.467 0.369-2.25 0.369s-1.539-0.135-2.25-0.369l-0.621-1.341 0.576-0.99h4.599l0.576 0.999zm-0.207-4.131h-4.086l-1.215-3.618 3.258-2.286 3.267 2.286zm3.411 1.989-1.026-0.09-0.711-1.233 1.314-3.906 1.251-0.423 0.9 0.657c9e-3 0.099 0.018 0.198 0.018 0.306 0 1.791-0.657 3.429-1.746 4.689z" fill="#fff" stroke-width="1.2857"/>
+   <path id="Shape" d="m12 3c-4.968 0-9 4.032-9 9s4.032 9 9 9 9-4.032 9-9-4.032-9-9-9zm0.9 2.97 1.215-0.855c1.638 0.504 3.033 1.584 3.942 3.006l-0.351 1.206-1.215 0.414-3.591-2.511zm-3.015-0.855 1.215 0.855v1.26l-3.591 2.511-1.215-0.414-0.351-1.206c0.909-1.413 2.304-2.493 3.942-3.006zm-2.313 11.484-1.026 0.09c-1.089-1.26-1.746-2.898-1.746-4.689 0-0.108 9e-3 -0.207 0.018-0.315l0.9-0.657 1.242 0.432 1.314 3.906zm6.678 2.232c-0.711 0.234-1.467 0.369-2.25 0.369s-1.539-0.135-2.25-0.369l-0.621-1.341 0.576-0.99h4.599l0.576 0.999zm-0.207-4.131h-4.086l-1.215-3.618 3.258-2.286 3.267 2.286zm3.411 1.989-1.026-0.09-0.711-1.233 1.314-3.906 1.251-0.423 0.9 0.657c9e-3 0.099 0.018 0.198 0.018 0.306 0 1.791-0.657 3.429-1.746 4.689z" fill="#777777" stroke-width="1.2857"/>
   </g>
  </g>
 </svg>
diff --git a/data/styles/clear/style-night/symbols/storage-tank.svg b/data/styles/clear/style-night/symbols/storage-tank.svg
index 485858fd7e..9dba8d8047 100644
--- a/data/styles/clear/style-night/symbols/storage-tank.svg
+++ b/data/styles/clear/style-night/symbols/storage-tank.svg
@@ -1,6 +1,6 @@
 <svg version="1.1" viewBox="0 0 14 14" xmlns="http://www.w3.org/2000/svg">
  <title>storage-tank</title>
- <g id="Page-2:-Night" fill="#FFF" opacity=".6">
+ <g id="Page-2:-Night" fill="#777777">
   <path d="m5.4512 0c-1.2719-0.0065224-2.5281 0.65317-3.4512 2v12h7v-8h2v8h1v-12h-1v2.9414h-2v-2.9414c-0.98932-1.3207-2.2769-1.9935-3.5488-2z"/>
  </g>
 </svg>
diff --git a/data/styles/clear/style-night/symbols/survey_point-m.svg b/data/styles/clear/style-night/symbols/survey_point-m.svg
index f28fbe4e98..fce053aa41 100644
--- a/data/styles/clear/style-night/symbols/survey_point-m.svg
+++ b/data/styles/clear/style-night/symbols/survey_point-m.svg
@@ -1,8 +1,8 @@
 <svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
  <title>survey_point-m</title>
- <g fill="none" fill-rule="evenodd" opacity=".6">
+ <g fill="none" fill-rule="evenodd">
   <g id="survey_point-m" fill-rule="nonzero">
-   <g transform="matrix(1.5049,0,0,1.5049,-6.0591,-8.1013)" fill="#fff">
+   <g transform="matrix(1.5049,0,0,1.5049,-6.0591,-8.1013)" fill="#777777">
     <circle cx="12" cy="10.066" r="1.1503"/>
     <rect x="9.3034" y="7.8647" width="5.3932" height="1.5362" rx=".75229" ry=".76811"/>
     <rect x="11.45" y="10.204" width="1.1003" height="8.9832" ry=".55014"/>
diff --git a/data/styles/clear/style-night/symbols/swimming-m.svg b/data/styles/clear/style-night/symbols/swimming-m.svg
index dcb6a0da67..fbdab41123 100644
--- a/data/styles/clear/style-night/symbols/swimming-m.svg
+++ b/data/styles/clear/style-night/symbols/swimming-m.svg
@@ -1,8 +1,8 @@
 <svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
  <title>swimming-m</title>
  <g fill="none" fill-rule="evenodd">
-  <g id="swimming-m" fill-rule="nonzero">
-   <path id="Shape" d="m15.115 4.5c-0.15816 0-0.43384 0.0768-0.5625 0.1504l-3.9808 2.2501c-0.53243 0.2912-0.74056 1.2034-0.38942 1.7499l1.2115 1.9-5.149 3.4501 2.7692 1.3 2.9856-1.4 2.9856 1.4 1.1683-1.4-3.5913-5.5501 3.0288-1.8c0.60198-0.34784 0.58162-0.94432 0.51923-1.3-0.05912-0.33712-0.44547-0.74992-0.99519-0.74992zm2.4231 3.8c-1.1471 0-2.0769 1.0746-2.0769 2.4 0 1.3254 0.92987 2.4 2.0769 2.4 1.1471 0 2.0769-1.0746 2.0769-2.4 0-1.3254-0.92987-2.4-2.0769-2.4zm-5.5385 7.2-2.7692 1.6-3.4615-1.5-2.7692 1.5v2.4l2.7692-1.6 3.4615 1.6 2.7692-1.7 2.7692 1.7 2.7692-1.7 3.4615 1.7v-2.4l-3.4615-1.6-2.7692 1.6z" fill="#fff" opacity=".6" stroke-width="1.5"/>
+  <g id="swimming-m" fill-rule="nonzero" fill="#777777">
+   <path id="Shape" d="m15.115 4.5c-0.15816 0-0.43384 0.0768-0.5625 0.1504l-3.9808 2.2501c-0.53243 0.2912-0.74056 1.2034-0.38942 1.7499l1.2115 1.9-5.149 3.4501 2.7692 1.3 2.9856-1.4 2.9856 1.4 1.1683-1.4-3.5913-5.5501 3.0288-1.8c0.60198-0.34784 0.58162-0.94432 0.51923-1.3-0.05912-0.33712-0.44547-0.74992-0.99519-0.74992zm2.4231 3.8c-1.1471 0-2.0769 1.0746-2.0769 2.4 0 1.3254 0.92987 2.4 2.0769 2.4 1.1471 0 2.0769-1.0746 2.0769-2.4 0-1.3254-0.92987-2.4-2.0769-2.4zm-5.5385 7.2-2.7692 1.6-3.4615-1.5-2.7692 1.5v2.4l2.7692-1.6 3.4615 1.6 2.7692-1.7 2.7692 1.7 2.7692-1.7 3.4615 1.7v-2.4l-3.4615-1.6-2.7692 1.6z" stroke-width="1.5"/>
   </g>
  </g>
 </svg>
diff --git a/data/styles/clear/style-night/symbols/table-tennis-m.svg b/data/styles/clear/style-night/symbols/table-tennis-m.svg
index f617db2238..fb8efa5677 100644
--- a/data/styles/clear/style-night/symbols/table-tennis-m.svg
+++ b/data/styles/clear/style-night/symbols/table-tennis-m.svg
@@ -1 +1 @@
-<svg id="SVGRoot" version="1.1" viewBox="0 0 24 24" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><g fill="#fff" opacity=".6"><g fill="#fff"><path d="m17.359 13.055c0.93705 0 1.7971 0.30916 2.5028 0.81885 0.46969-0.99625 0.70505-2.0757 0.70505-3.1548 0-3.4445-2.6571-7.2865-7.2479-7.2865-2.0067 0-4.0307 0.79212-5.5406 2.3035l-1.8299 1.8308c-0.051887 0.0825-0.086369 0.10925-0.13458 0.18942l7.7233 7.7074c0.70169-1.4032 2.1412-2.4088 3.8218-2.4088zm-4.2082 3.5079-7.9878-7.9714c-0.43388 0.75838-0.64947 1.5335-0.64947 2.2852 0 1.02 0.39203 2.0025 1.148 2.7589l1.2253 1.2261-3.0927 2.7168c-0.24027 0.20897-0.36189 0.5018-0.36189 0.79547 0 0.26817 0.1015 0.53688 0.30679 0.74302l1.1399 1.1426c0.20572 0.2058 0.47404 0.30753 0.74153 0.30753 0.2929 0 0.58486-0.1219 0.79342-0.36282l2.7127-3.102 1.2035 1.2041c0.79075 0.79112 1.8215 1.177 2.858 1.177 0.15172 0 0.30816-9e-3 0.45932-0.02539-0.35353-0.62174-0.57314-1.3327-0.57314-2.0984-4.68e-4 -0.2621 0.0027-0.51601 0.07653-0.79665zm4.178-2.4088c-1.774 0-3.2135 1.4065-3.2135 3.1772 0 1.7406 1.4392 3.2069 3.2135 3.2069 1.7442 0 3.2135-1.4065 3.2135-3.2069 3.37e-4 -1.7406-1.4392-3.1772-3.2135-3.1772z" fill="#fff" opacity="1" stroke-opacity="0"/></g></g></svg>
+<svg id="SVGRoot" version="1.1" viewBox="0 0 24 24" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><g><g fill="#777777"><path d="m17.359 13.055c0.93705 0 1.7971 0.30916 2.5028 0.81885 0.46969-0.99625 0.70505-2.0757 0.70505-3.1548 0-3.4445-2.6571-7.2865-7.2479-7.2865-2.0067 0-4.0307 0.79212-5.5406 2.3035l-1.8299 1.8308c-0.051887 0.0825-0.086369 0.10925-0.13458 0.18942l7.7233 7.7074c0.70169-1.4032 2.1412-2.4088 3.8218-2.4088zm-4.2082 3.5079-7.9878-7.9714c-0.43388 0.75838-0.64947 1.5335-0.64947 2.2852 0 1.02 0.39203 2.0025 1.148 2.7589l1.2253 1.2261-3.0927 2.7168c-0.24027 0.20897-0.36189 0.5018-0.36189 0.79547 0 0.26817 0.1015 0.53688 0.30679 0.74302l1.1399 1.1426c0.20572 0.2058 0.47404 0.30753 0.74153 0.30753 0.2929 0 0.58486-0.1219 0.79342-0.36282l2.7127-3.102 1.2035 1.2041c0.79075 0.79112 1.8215 1.177 2.858 1.177 0.15172 0 0.30816-9e-3 0.45932-0.02539-0.35353-0.62174-0.57314-1.3327-0.57314-2.0984-4.68e-4 -0.2621 0.0027-0.51601 0.07653-0.79665zm4.178-2.4088c-1.774 0-3.2135 1.4065-3.2135 3.1772 0 1.7406 1.4392 3.2069 3.2135 3.2069 1.7442 0 3.2135-1.4065 3.2135-3.2069 3.37e-4 -1.7406-1.4392-3.1772-3.2135-3.1772z" stroke-opacity="0"/></g></g></svg>
diff --git a/data/styles/clear/style-night/symbols/tennis-m.svg b/data/styles/clear/style-night/symbols/tennis-m.svg
index 0fd838319c..1153449a78 100644
--- a/data/styles/clear/style-night/symbols/tennis-m.svg
+++ b/data/styles/clear/style-night/symbols/tennis-m.svg
@@ -2,10 +2,10 @@
  <title>tennis-m</title>
  <g fill="none" fill-rule="evenodd">
   <g id="tennis-m" fill-rule="nonzero">
-   <g id="Group" transform="translate(5,5)" fill="#fff">
-    <g transform="matrix(1.2858 0 0 1.2858 -1.9355 -2.0018)" fill="#fff">
-     <path id="Shape" d="m11.785 0.94818c-1.4891-1.4891-4.2127-1.19-6.0773 0.67455-1.0182 1.0182-1.6036 2.4627-1.6164 3.4745-0.012727 1.0055 0.16545 2.4755-0.85909 3.5l-2.6982 2.6982 0.90364 0.90364 2.6982-2.6982c1.0245-1.0245 2.4945-0.84636 3.5-0.85909 1.0055-0.012727 2.4564-0.59818 3.4745-1.6164 1.8582-1.8645 2.1636-4.5882 0.67455-6.0773zm-5.8545 5.8482c-0.97364-0.97364-0.66818-2.9336 0.67455-4.2764 1.3427-1.3427 3.2964-1.6482 4.2764-0.67455 0.97364 0.97364 0.66818 2.9336-0.67454 4.2764-1.3427 1.3427-3.2964 1.6482-4.2764 0.67455z" opacity=".6"/>
-     <path d="m10.818 10.182c0.33727 0 0.66182 0.13364 0.89727 0.37546 0.49636 0.49636 0.49636 1.3045 0 1.8009-0.23546 0.23545-0.56 0.36909-0.89727 0.36909-0.33727 0-0.66182-0.13364-0.89727-0.37546-0.49636-0.49636-0.49636-1.3045 0-1.8009 0.23545-0.23545 0.56-0.36909 0.89727-0.36909m0-1.2727c-0.64909 0-1.3045 0.24818-1.8009 0.74455-0.99273 0.99273-0.99273 2.6027 0 3.6018 0.49636 0.49636 1.1518 0.74454 1.8009 0.74454s1.3045-0.24818 1.8009-0.74454c0.99273-0.99273 0.99273-2.6027 0-3.6018-0.49636-0.49636-1.1518-0.74455-1.8009-0.74455z" opacity=".6"/>
+   <g id="Group" transform="translate(5,5)" fill="#777777">
+    <g transform="matrix(1.2858 0 0 1.2858 -1.9355 -2.0018)">
+     <path id="Shape" d="m11.785 0.94818c-1.4891-1.4891-4.2127-1.19-6.0773 0.67455-1.0182 1.0182-1.6036 2.4627-1.6164 3.4745-0.012727 1.0055 0.16545 2.4755-0.85909 3.5l-2.6982 2.6982 0.90364 0.90364 2.6982-2.6982c1.0245-1.0245 2.4945-0.84636 3.5-0.85909 1.0055-0.012727 2.4564-0.59818 3.4745-1.6164 1.8582-1.8645 2.1636-4.5882 0.67455-6.0773zm-5.8545 5.8482c-0.97364-0.97364-0.66818-2.9336 0.67455-4.2764 1.3427-1.3427 3.2964-1.6482 4.2764-0.67455 0.97364 0.97364 0.66818 2.9336-0.67454 4.2764-1.3427 1.3427-3.2964 1.6482-4.2764 0.67455z"/>
+     <path d="m10.818 10.182c0.33727 0 0.66182 0.13364 0.89727 0.37546 0.49636 0.49636 0.49636 1.3045 0 1.8009-0.23546 0.23545-0.56 0.36909-0.89727 0.36909-0.33727 0-0.66182-0.13364-0.89727-0.37546-0.49636-0.49636-0.49636-1.3045 0-1.8009 0.23545-0.23545 0.56-0.36909 0.89727-0.36909m0-1.2727c-0.64909 0-1.3045 0.24818-1.8009 0.74455-0.99273 0.99273-0.99273 2.6027 0 3.6018 0.49636 0.49636 1.1518 0.74454 1.8009 0.74454s1.3045-0.24818 1.8009-0.74454c0.99273-0.99273 0.99273-2.6027 0-3.6018-0.49636-0.49636-1.1518-0.74455-1.8009-0.74455z"/>
     </g>
    </g>
   </g>
diff --git a/data/styles/clear/style-night/symbols/tomb-m.svg b/data/styles/clear/style-night/symbols/tomb-m.svg
index 79e5cc1f2c..b880bcabbc 100644
--- a/data/styles/clear/style-night/symbols/tomb-m.svg
+++ b/data/styles/clear/style-night/symbols/tomb-m.svg
@@ -2,8 +2,8 @@
  <title>tomb-m</title>
  <g transform="matrix(.9375 0 0 .9375 1.25 1.25)" fill="none" fill-rule="evenodd">
   <g id="tomb-m" fill-rule="nonzero">
-   <g id="tomb" transform="translate(6,6)" fill="#fff">
-    <path id="Shape" d="m5.6914-2c-2.7471 0-4.9722 2.2277-4.9722 4.9748v5.4931h10.562v-5.4931c0-2.7471-2.2276-4.9748-4.9748-4.9748zm-1.6122 4.2689h3.8418c0.25892 0 0.46883 0.20991 0.46883 0.46883 0 0.25892-0.20988 0.46883-0.46883 0.46883h-3.8418c-0.25892 0-0.46883-0.20991-0.46883-0.46883 0-0.25892 0.20991-0.46883 0.46883-0.46883zm0 1.8753h3.8418c0.25892 0 0.46883 0.20991 0.46883 0.46883 0 0.25892-0.20988 0.46883-0.46883 0.46883h-3.8418c-0.25892 0-0.46883-0.20991-0.46883-0.46883 0-0.25892 0.20991-0.46883 0.46883-0.46883zm0 1.8753h3.8418c0.25892 0 0.46883 0.20991 0.46883 0.46883 0 0.25892-0.20988 0.46883-0.46883 0.46883h-3.8418c-0.25892 0-0.46883-0.20991-0.46883-0.46883 0-0.25892 0.20991-0.46883 0.46883-0.46883zm-4.6179 3.386c-0.25892 0-0.46883 0.20991-0.46883 0.46883v1.2059h14.015v-1.2059c0-0.25892-0.20991-0.46883-0.46883-0.46883zm-0.99235 2.6124c-0.25892 0-0.46883 0.20991-0.46883 0.46882v1.5081h16v-1.5081c0-0.25892-0.20991-0.46882-0.46883-0.46882z" fill="#717065" opacity=".6" stroke-width=".88889"/>
+   <g id="tomb" transform="translate(6,6)" fill="#777777">
+    <path id="Shape" d="m5.6914-2c-2.7471 0-4.9722 2.2277-4.9722 4.9748v5.4931h10.562v-5.4931c0-2.7471-2.2276-4.9748-4.9748-4.9748zm-1.6122 4.2689h3.8418c0.25892 0 0.46883 0.20991 0.46883 0.46883 0 0.25892-0.20988 0.46883-0.46883 0.46883h-3.8418c-0.25892 0-0.46883-0.20991-0.46883-0.46883 0-0.25892 0.20991-0.46883 0.46883-0.46883zm0 1.8753h3.8418c0.25892 0 0.46883 0.20991 0.46883 0.46883 0 0.25892-0.20988 0.46883-0.46883 0.46883h-3.8418c-0.25892 0-0.46883-0.20991-0.46883-0.46883 0-0.25892 0.20991-0.46883 0.46883-0.46883zm0 1.8753h3.8418c0.25892 0 0.46883 0.20991 0.46883 0.46883 0 0.25892-0.20988 0.46883-0.46883 0.46883h-3.8418c-0.25892 0-0.46883-0.20991-0.46883-0.46883 0-0.25892 0.20991-0.46883 0.46883-0.46883zm-4.6179 3.386c-0.25892 0-0.46883 0.20991-0.46883 0.46883v1.2059h14.015v-1.2059c0-0.25892-0.20991-0.46883-0.46883-0.46883zm-0.99235 2.6124c-0.25892 0-0.46883 0.20991-0.46883 0.46882v1.5081h16v-1.5081c0-0.25892-0.20991-0.46882-0.46883-0.46882z" stroke-width=".88889"/>
    </g>
   </g>
  </g>
diff --git a/data/styles/clear/style-night/symbols/vending-m.svg b/data/styles/clear/style-night/symbols/vending-m.svg
index a0ee4f8a38..7e0a0865c4 100644
--- a/data/styles/clear/style-night/symbols/vending-m.svg
+++ b/data/styles/clear/style-night/symbols/vending-m.svg
@@ -2,7 +2,7 @@
  <title>vending-m</title>
  <g fill="none" fill-rule="evenodd">
   <g id="vending-m" fill-rule="nonzero">
-   <g id="vending-machine" transform="translate(5 5)" fill="#FFF" opacity=".6">
+   <g id="vending-machine" transform="translate(5 5)" fill="#777777">
     <path id="Shape" d="m8.6968 10.224c-0.23466-0.24546-0.54597-0.38065-0.87653-0.38065h-4.1016c-0.68182 0-1.2578 0.576-1.2578 1.2578v0.84766c0 0.22652 0.18364 0.41016 0.41016 0.41016h5.7695c0.22652 0 0.41016-0.18364 0.41016-0.41016v-0.84766c0-0.32689-0.1257-0.63839-0.35394-0.87716zm-0.46638 1.3147h-4.9492v-0.4375c0-0.22488 0.21262-0.4375 0.4375-0.4375h4.1016c0.2185 0 0.41016 0.20445 0.41016 0.4375v0.4375z"/>
     <path id="Shape" d="m12.77 0h-11.539c-0.67848 0-1.2305 0.55199-1.2305 1.2305v11.539c0 0.67848 0.55199 1.2305 1.2305 1.2305h11.539c0.67848 0 1.2305-0.55199 1.2305-1.2305v-11.539c0-0.67848-0.55199-1.2305-1.2305-1.2305zm-2.8711 8.2031h-0.84766v-0.41016c0-0.67848-0.55199-1.2305-1.2305-1.2305s-1.2305 0.55199-1.2305 1.2305v0.41016h-0.82031v-0.41016c0-0.67848-0.55199-1.2305-1.2305-1.2305s-1.2305 0.55199-1.2305 1.2305v0.41016h-0.84766v-2.4609h7.4375v2.4609zm-1.668-0.41016v0.41016h-0.82031v-0.41016c0-0.22616 0.184-0.41016 0.41016-0.41016s0.41016 0.184 0.41016 0.41016zm-3.2812 0v0.41016h-0.82031v-0.41016c0-0.22616 0.184-0.41016 0.41016-0.41016s0.41016 0.184 0.41016 0.41016zm-0.82031-2.8711v-0.41016c0-0.22616 0.184-0.41016 0.41016-0.41016s0.41016 0.184 0.41016 0.41016v0.41016h-0.82031zm3.2812 0v-0.41016c0-0.22616 0.184-0.41016 0.41016-0.41016s0.41016 0.184 0.41016 0.41016v0.41016h-0.82031zm2.4883 0h-0.84766v-0.41016c0-0.67848-0.55199-1.2305-1.2305-1.2305s-1.2305 0.55199-1.2305 1.2305v0.41016h-0.82031v-0.41016c0-0.67848-0.55199-1.2305-1.2305-1.2305s-1.2305 0.55199-1.2305 1.2305v0.41016h-0.84766v-2.4609h7.4375v2.4609zm0-3.2812h-7.8477c-0.22652 0-0.41016 0.18364-0.41016 0.41016v6.5625c0 0.22652 0.18364 0.41016 0.41016 0.41016h7.8477v4.1562h-8.668c-0.22616 0-0.41016-0.184-0.41016-0.41016v-11.539c0-0.22616 0.184-0.41016 0.41016-0.41016h8.668v0.82031zm3.2812 11.129c0 0.22616-0.184 0.41016-0.41016 0.41016h-2.0508v-12.359h2.0508c0.22616 0 0.41016 0.184 0.41016 0.41016v11.539z"/>
     <circle id="Oval" cx="11.949" cy="4.5117" r="1"/>
diff --git a/data/styles/clear/style-night/symbols/viewpoint-m.svg b/data/styles/clear/style-night/symbols/viewpoint-m.svg
index b69cf46e35..9950cc587c 100644
--- a/data/styles/clear/style-night/symbols/viewpoint-m.svg
+++ b/data/styles/clear/style-night/symbols/viewpoint-m.svg
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
     <title>viewpoint-m</title>
-    <g id="viewpoint-m" fill-rule="nonzero" opacity=".6">
+    <g id="viewpoint-m" fill-rule="nonzero" fill="#777777">
         <path id="Shape"
-            d="m9.209 4.6713c-0.98033 0-1.7768 0.69142-1.9437 1.5964-0.43485 0.09882-0.84334 0.36824-1.0965 0.79816l-2.6166 5.3451h0.02492c-0.2168 0.4761-0.34887 0.9964-0.34887 1.548 0 2.1282 1.7945 3.8699 3.987 3.8699 1.7184 0 3.1809-1.0767 3.738-2.5639 0.3173 0.1519 0.6717 0.2418 1.0467 0.2418 0.3749 0 0.7294-0.0899 1.0466-0.2418 0.5571 1.4872 2.0195 2.5639 3.738 2.5639 2.1925 0 3.9871-1.742 3.9871-3.8699 0-0.5516-0.1321-1.0719-0.3488-1.548h0.0249l-2.6166-5.3451c-0.2531-0.42992-0.6616-0.69934-1.0965-0.79816-0.1669-0.90491-0.9634-1.5964-1.9437-1.5964-0.9634 0-1.7578 0.66624-1.9437 1.548h-1.6945c-0.1859-0.88172-0.9804-1.548-1.9437-1.548zm-1.9935 6.9657c1.3307 0 2.3923 1.0304 2.3923 2.3219 0 1.2914-1.0616 2.3218-2.3923 2.3218-1.3307 0-2.3923-1.0304-2.3923-2.3218 0-1.2915 1.0616-2.3219 2.3923-2.3219zm9.5691 0c1.3307 0 2.3922 1.0304 2.3922 2.3219 0 1.2914-1.0615 2.3218-2.3922 2.3218-1.3306 0-2.3923-1.0304-2.3923-2.3218 0-1.2915 1.0616-2.3219 2.3923-2.3219zm-4.7846 0.7739c0.4422 0 0.7974 0.3448 0.7974 0.7741 0 0.4291-0.3552 0.7739-0.7974 0.7739s-0.7974-0.3448-0.7974-0.7739c0-0.4293 0.3552-0.7741 0.7974-0.7741z"
-            fill="#fff" />
+            d="m9.209 4.6713c-0.98033 0-1.7768 0.69142-1.9437 1.5964-0.43485 0.09882-0.84334 0.36824-1.0965 0.79816l-2.6166 5.3451h0.02492c-0.2168 0.4761-0.34887 0.9964-0.34887 1.548 0 2.1282 1.7945 3.8699 3.987 3.8699 1.7184 0 3.1809-1.0767 3.738-2.5639 0.3173 0.1519 0.6717 0.2418 1.0467 0.2418 0.3749 0 0.7294-0.0899 1.0466-0.2418 0.5571 1.4872 2.0195 2.5639 3.738 2.5639 2.1925 0 3.9871-1.742 3.9871-3.8699 0-0.5516-0.1321-1.0719-0.3488-1.548h0.0249l-2.6166-5.3451c-0.2531-0.42992-0.6616-0.69934-1.0965-0.79816-0.1669-0.90491-0.9634-1.5964-1.9437-1.5964-0.9634 0-1.7578 0.66624-1.9437 1.548h-1.6945c-0.1859-0.88172-0.9804-1.548-1.9437-1.548zm-1.9935 6.9657c1.3307 0 2.3923 1.0304 2.3923 2.3219 0 1.2914-1.0616 2.3218-2.3923 2.3218-1.3307 0-2.3923-1.0304-2.3923-2.3218 0-1.2915 1.0616-2.3219 2.3923-2.3219zm9.5691 0c1.3307 0 2.3922 1.0304 2.3922 2.3219 0 1.2914-1.0615 2.3218-2.3922 2.3218-1.3306 0-2.3923-1.0304-2.3923-2.3218 0-1.2915 1.0616-2.3219 2.3923-2.3219zm-4.7846 0.7739c0.4422 0 0.7974 0.3448 0.7974 0.7741 0 0.4291-0.3552 0.7739-0.7974 0.7739s-0.7974-0.3448-0.7974-0.7739c0-0.4293 0.3552-0.7741 0.7974-0.7741z" />
     </g>
 
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/viewpoint-s.svg b/data/styles/clear/style-night/symbols/viewpoint-s.svg
index c7d41c98e4..420aa3aa9a 100644
--- a/data/styles/clear/style-night/symbols/viewpoint-s.svg
+++ b/data/styles/clear/style-night/symbols/viewpoint-s.svg
@@ -1,10 +1,9 @@
 <svg version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
     <title>viewpoint-s</title>
 
-    <g id="viewpoint-m" fill-rule="nonzero" transform="scale(0.666666)" opacity="0.6">
+    <g id="viewpoint-m" fill-rule="nonzero" transform="scale(0.666666)" fill="#777777">
         <path id="Shape"
-            d="m9.209 4.6713c-0.98033 0-1.7768 0.69142-1.9437 1.5964-0.43485 0.09882-0.84334 0.36824-1.0965 0.79816l-2.6166 5.3451h0.02492c-0.2168 0.4761-0.34887 0.9964-0.34887 1.548 0 2.1282 1.7945 3.8699 3.987 3.8699 1.7184 0 3.1809-1.0767 3.738-2.5639 0.3173 0.1519 0.6717 0.2418 1.0467 0.2418 0.3749 0 0.7294-0.0899 1.0466-0.2418 0.5571 1.4872 2.0195 2.5639 3.738 2.5639 2.1925 0 3.9871-1.742 3.9871-3.8699 0-0.5516-0.1321-1.0719-0.3488-1.548h0.0249l-2.6166-5.3451c-0.2531-0.42992-0.6616-0.69934-1.0965-0.79816-0.1669-0.90491-0.9634-1.5964-1.9437-1.5964-0.9634 0-1.7578 0.66624-1.9437 1.548h-1.6945c-0.1859-0.88172-0.9804-1.548-1.9437-1.548zm-1.9935 6.9657c1.3307 0 2.3923 1.0304 2.3923 2.3219 0 1.2914-1.0616 2.3218-2.3923 2.3218-1.3307 0-2.3923-1.0304-2.3923-2.3218 0-1.2915 1.0616-2.3219 2.3923-2.3219zm9.5691 0c1.3307 0 2.3922 1.0304 2.3922 2.3219 0 1.2914-1.0615 2.3218-2.3922 2.3218-1.3306 0-2.3923-1.0304-2.3923-2.3218 0-1.2915 1.0616-2.3219 2.3923-2.3219zm-4.7846 0.7739c0.4422 0 0.7974 0.3448 0.7974 0.7741 0 0.4291-0.3552 0.7739-0.7974 0.7739s-0.7974-0.3448-0.7974-0.7739c0-0.4293 0.3552-0.7741 0.7974-0.7741z"
-            fill="#fff" />
+            d="m9.209 4.6713c-0.98033 0-1.7768 0.69142-1.9437 1.5964-0.43485 0.09882-0.84334 0.36824-1.0965 0.79816l-2.6166 5.3451h0.02492c-0.2168 0.4761-0.34887 0.9964-0.34887 1.548 0 2.1282 1.7945 3.8699 3.987 3.8699 1.7184 0 3.1809-1.0767 3.738-2.5639 0.3173 0.1519 0.6717 0.2418 1.0467 0.2418 0.3749 0 0.7294-0.0899 1.0466-0.2418 0.5571 1.4872 2.0195 2.5639 3.738 2.5639 2.1925 0 3.9871-1.742 3.9871-3.8699 0-0.5516-0.1321-1.0719-0.3488-1.548h0.0249l-2.6166-5.3451c-0.2531-0.42992-0.6616-0.69934-1.0965-0.79816-0.1669-0.90491-0.9634-1.5964-1.9437-1.5964-0.9634 0-1.7578 0.66624-1.9437 1.548h-1.6945c-0.1859-0.88172-0.9804-1.548-1.9437-1.548zm-1.9935 6.9657c1.3307 0 2.3923 1.0304 2.3923 2.3219 0 1.2914-1.0616 2.3218-2.3923 2.3218-1.3307 0-2.3923-1.0304-2.3923-2.3218 0-1.2915 1.0616-2.3219 2.3923-2.3219zm9.5691 0c1.3307 0 2.3922 1.0304 2.3922 2.3219 0 1.2914-1.0615 2.3218-2.3922 2.3218-1.3306 0-2.3923-1.0304-2.3923-2.3218 0-1.2915 1.0616-2.3219 2.3923-2.3219zm-4.7846 0.7739c0.4422 0 0.7974 0.3448 0.7974 0.7741 0 0.4291-0.3552 0.7739-0.7974 0.7739s-0.7974-0.3448-0.7974-0.7739c0-0.4293 0.3552-0.7741 0.7974-0.7741z" />
     </g>
 
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/volleyball-m.svg b/data/styles/clear/style-night/symbols/volleyball-m.svg
index bb09145cb6..7efadedce5 100644
--- a/data/styles/clear/style-night/symbols/volleyball-m.svg
+++ b/data/styles/clear/style-night/symbols/volleyball-m.svg
@@ -1,7 +1,7 @@
 <svg enable-background="new 0 0 24 24" fill="#000000" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <g fill="#717065">
-  <g fill="#717065">
-   <path d="m12 3c-4.968 0-9 4.032-9 9s4.032 9 9 9 9-4.032 9-9-4.032-9-9-9zm0.9 1.863c2.763 0.342 5.013 2.268 5.886 4.824l-5.886-3.402zm-4.5 0.909c1.062-0.621 2.997-0.954 2.7-0.918v6.615l-2.7 1.557zm-3.033 9.018c-0.36-0.864-0.567-1.8-0.567-2.79 0-1.818 0.684-3.474 1.8-4.743v6.822zm0.909 1.557 5.724-3.312 2.7 1.557-6.282 3.627c-0.837-0.477-1.566-1.107-2.142-1.872zm4.302 2.709m1.422 0.144c-0.486 0-0.963-0.054-1.422-0.144l5.922-3.42 1.224 0.702c-1.314 1.737-3.384 2.862-5.724 2.862zm0.9-7.722v-3.114l6.3 3.645c0 0.99-0.207 1.926-0.567 2.781z" fill="#fff" opacity=".6" stroke-width=".9"/>
+ <g>
+  <g>
+   <path d="m12 3c-4.968 0-9 4.032-9 9s4.032 9 9 9 9-4.032 9-9-4.032-9-9-9zm0.9 1.863c2.763 0.342 5.013 2.268 5.886 4.824l-5.886-3.402zm-4.5 0.909c1.062-0.621 2.997-0.954 2.7-0.918v6.615l-2.7 1.557zm-3.033 9.018c-0.36-0.864-0.567-1.8-0.567-2.79 0-1.818 0.684-3.474 1.8-4.743v6.822zm0.909 1.557 5.724-3.312 2.7 1.557-6.282 3.627c-0.837-0.477-1.566-1.107-2.142-1.872zm4.302 2.709m1.422 0.144c-0.486 0-0.963-0.054-1.422-0.144l5.922-3.42 1.224 0.702c-1.314 1.737-3.384 2.862-5.724 2.862zm0.9-7.722v-3.114l6.3 3.645c0 0.99-0.207 1.926-0.567 2.781z" fill="#777777" stroke-width=".9"/>
   </g>
  </g>
 </svg>
diff --git a/data/styles/clear/style-night/symbols/waste-basket-m.svg b/data/styles/clear/style-night/symbols/waste-basket-m.svg
index 405d52c082..815151089f 100644
--- a/data/styles/clear/style-night/symbols/waste-basket-m.svg
+++ b/data/styles/clear/style-night/symbols/waste-basket-m.svg
@@ -1,7 +1,7 @@
 <svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
  <title>waste-basket-m</title>
- <g id="Page-2:-Night" fill="none" opacity=".6">
-  <g id="waste-basket-m" fill="#FFF">
+ <g id="Page-2:-Night" >
+  <g id="waste-basket-m" fill="#777777">
    <path d="m7.7143 17.429c0 0.78571 0.64286 1.4286 1.4286 1.4286h5.7143c0.78571 0 1.4286-0.64286 1.4286-1.4286v-8.5714h-8.5714v8.5714zm9.2857-10.714h-2.5l-0.71429-0.71429h-3.5714l-0.71429 0.71429h-2.5v1.4286h10v-1.4286z"/>
   </g>
  </g>
diff --git a/data/styles/clear/style-night/symbols/waste-basket-s.svg b/data/styles/clear/style-night/symbols/waste-basket-s.svg
index bb771ffd6e..ef391a955f 100644
--- a/data/styles/clear/style-night/symbols/waste-basket-s.svg
+++ b/data/styles/clear/style-night/symbols/waste-basket-s.svg
@@ -1,7 +1,7 @@
 <svg version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
  <title>waste-basket-s</title>
- <g id="Page-2:-Night" fill="none" opacity=".6">
-  <g id="waste-basket-s" fill="#FFF">
+ <g id="Page-2:-Night">
+  <g id="waste-basket-s" fill="#777777">
    <path d="m5.1429 11.619c0 0.52381 0.42857 0.95238 0.95238 0.95238h3.8095c0.52381 0 0.95238-0.42857 0.95238-0.95238v-5.7143h-5.7143v5.7143zm6.1905-7.1429h-1.6667l-0.47619-0.47619h-2.381l-0.47619 0.47619h-1.6667v0.95238h6.6667v-0.95238z"/>
   </g>
  </g>
diff --git a/data/styles/clear/style-night/symbols/yoga-m.svg b/data/styles/clear/style-night/symbols/yoga-m.svg
index 71f8524bc3..8b459bedb0 100644
--- a/data/styles/clear/style-night/symbols/yoga-m.svg
+++ b/data/styles/clear/style-night/symbols/yoga-m.svg
@@ -1,7 +1,7 @@
 <svg enable-background="new 0 0 24 24" fill="#000000" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <g fill="#717065">
-  <g fill="#717065">
-   <path d="m12 4a2 2 0 0 0-2 2 2 2 0 0 0 2 2 2 2 0 0 0 2-2 2 2 0 0 0-2-2zm-0.51953 5c-0.59 0-1.1513 0.2607-1.5313 0.7207l-1.3398 1.5996c-1.45 1.72-3.3694 2.6797-5.6094 2.6797v2c2.77 0 5.19-1.17 7-3.25v2.25l-3.8809 1.5508c-0.67 0.27-1.1191 0.93016-1.1191 1.6602 0 0.99 0.79906 1.7891 1.7891 1.7891h2.2109v-0.5c0-1.38 1.12-2.5 2.5-2.5h3c0.28 0 0.5 0.22 0.5 0.5s-0.22 0.5-0.5 0.5h-3c-0.83 0-1.5 0.67-1.5 1.5v0.5h7.2109c0.99 0 1.7891-0.79906 1.7891-1.7891 0-0.73-0.44914-1.3902-1.1191-1.6602l-3.8809-1.5508v-2.25c1.81 2.08 4.23 3.25 7 3.25v-2c-2.24 0-4.1596-0.95969-5.5996-2.6797l-1.3398-1.5996c-0.38-0.46-0.94125-0.7207-1.5312-0.7207z" fill="#fff" opacity=".6"/>
+ <g>
+  <g>
+   <path d="m12 4a2 2 0 0 0-2 2 2 2 0 0 0 2 2 2 2 0 0 0 2-2 2 2 0 0 0-2-2zm-0.51953 5c-0.59 0-1.1513 0.2607-1.5313 0.7207l-1.3398 1.5996c-1.45 1.72-3.3694 2.6797-5.6094 2.6797v2c2.77 0 5.19-1.17 7-3.25v2.25l-3.8809 1.5508c-0.67 0.27-1.1191 0.93016-1.1191 1.6602 0 0.99 0.79906 1.7891 1.7891 1.7891h2.2109v-0.5c0-1.38 1.12-2.5 2.5-2.5h3c0.28 0 0.5 0.22 0.5 0.5s-0.22 0.5-0.5 0.5h-3c-0.83 0-1.5 0.67-1.5 1.5v0.5h7.2109c0.99 0 1.7891-0.79906 1.7891-1.7891 0-0.73-0.44914-1.3902-1.1191-1.6602l-3.8809-1.5508v-2.25c1.81 2.08 4.23 3.25 7 3.25v-2c-2.24 0-4.1596-0.95969-5.5996-2.6797l-1.3398-1.5996c-0.38-0.46-0.94125-0.7207-1.5312-0.7207z" fill="#777777"/>
   </g>
  </g>
 </svg>