From 901bffdb5b2d550095869582befa85806c6fdff6 Mon Sep 17 00:00:00 2001
From: "i.tomko" <igor.n.tomko@gmail.com>
Date: Fri, 2 Sep 2016 17:10:44 +0300
Subject: [PATCH] Update night style icons

---
 .../clear/style-night/symbols/atm-l.svg       | 16 ++++----
 .../clear/style-night/symbols/atm-m.svg       | 16 ++++----
 .../clear/style-night/symbols/atm-s.svg       | 16 ++++----
 .../clear/style-night/symbols/bank-l.svg      | 16 ++++----
 .../clear/style-night/symbols/bank-m.svg      | 17 ++++-----
 .../clear/style-night/symbols/bank-s.svg      | 16 ++++++++
 .../clear/style-night/symbols/bar-l.svg       | 16 ++++----
 .../clear/style-night/symbols/bar-m.svg       | 16 ++++----
 .../clear/style-night/symbols/bar-s.svg       | 16 ++++----
 .../clear/style-night/symbols/beer-l.svg      | 22 ++++++-----
 .../clear/style-night/symbols/beer-m.svg      | 22 ++++++-----
 .../clear/style-night/symbols/beer-s.svg      | 16 ++++----
 .../clear/style-night/symbols/buddhist-l.svg  | 16 ++++----
 .../clear/style-night/symbols/buddhist-m.svg  | 16 ++++----
 .../clear/style-night/symbols/buddhist-s.svg  | 16 ++++----
 .../clear/style-night/symbols/cafe-l.svg      | 16 ++++----
 .../clear/style-night/symbols/cafe-m.svg      | 16 ++++----
 .../clear/style-night/symbols/cafe-s.svg      | 16 ++++----
 .../clear/style-night/symbols/car-part-l.svg  | 32 ++++++++--------
 .../clear/style-night/symbols/car-part-m.svg  | 16 ++++----
 .../clear/style-night/symbols/car-part-s.svg  | 16 ++++++++
 .../style-night/symbols/car-repair-l.svg      | 22 ++++++-----
 .../style-night/symbols/car-repair-m.svg      | 22 ++++++-----
 .../style-night/symbols/car-repair-s.svg      | 16 ++++----
 .../clear/style-night/symbols/car-wash-l.svg  | 37 ++++++++++---------
 .../clear/style-night/symbols/car-wash-m.svg  | 22 ++++++-----
 .../clear/style-night/symbols/car-wash-s.svg  | 19 ++++++++++
 .../style-night/symbols/car_sharing-l.svg     | 32 ++++++++--------
 .../style-night/symbols/car_sharing-m.svg     | 18 +++++----
 .../style-night/symbols/car_sharing-s.svg     | 16 ++++++++
 .../clear/style-night/symbols/casino-l.svg    | 16 ++++----
 .../clear/style-night/symbols/casino-m.svg    | 16 ++++----
 .../clear/style-night/symbols/casino-s.svg    | 16 ++++----
 .../symbols/charging-station-l.svg            | 23 ++++++------
 .../symbols/charging-station-m.svg            | 17 +++++----
 .../symbols/charging-station-s.svg            | 17 +++++----
 .../clear/style-night/symbols/christian-l.svg | 16 ++++----
 .../clear/style-night/symbols/christian-m.svg | 17 +++++----
 .../clear/style-night/symbols/christian-s.svg | 17 +++++----
 .../clear/style-night/symbols/cinema-l.svg    | 16 ++++----
 .../clear/style-night/symbols/cinema-m.svg    | 16 ++++----
 .../clear/style-night/symbols/cinema-s.svg    | 16 ++++----
 .../clear/style-night/symbols/fastfood-l.svg  | 18 +++++----
 .../clear/style-night/symbols/fastfood-m.svg  | 16 ++++----
 .../clear/style-night/symbols/fastfood-s.svg  | 16 ++++----
 .../clear/style-night/symbols/fuel-l.svg      | 27 ++++++++++----
 .../clear/style-night/symbols/fuel-m.svg      | 16 ++++----
 .../clear/style-night/symbols/fuel-s.svg      | 16 ++++----
 .../clear/style-night/symbols/hindu-l.svg     | 16 ++++----
 .../clear/style-night/symbols/hindu-m.svg     | 16 ++++----
 .../clear/style-night/symbols/hindu-s.svg     | 16 ++++----
 .../clear/style-night/symbols/hospital-l.svg  | 16 ++++----
 .../clear/style-night/symbols/hospital-m.svg  | 16 ++++----
 .../clear/style-night/symbols/hospital-s.svg  | 16 ++++----
 .../clear/style-night/symbols/jewish-l.svg    | 16 ++++----
 .../clear/style-night/symbols/jewish-m.svg    | 16 ++++----
 .../clear/style-night/symbols/jewish-s.svg    | 16 ++++----
 .../clear/style-night/symbols/muslim-l.svg    | 17 +++++----
 .../clear/style-night/symbols/muslim-m.svg    | 18 +++++----
 .../clear/style-night/symbols/muslim-s.svg    | 17 +++++----
 .../clear/style-night/symbols/pharmacy-l.svg  | 17 +++++----
 .../clear/style-night/symbols/pharmacy-m.svg  | 16 ++++----
 .../clear/style-night/symbols/pharmacy-s.svg  | 16 ++++++++
 .../symbols/place-of-worship-l.svg            | 16 ++++----
 .../symbols/place-of-worship-m.svg            | 16 ++++----
 .../symbols/place-of-worship-s.svg            | 16 ++++----
 .../style-night/symbols/restaurant-l.svg      | 16 ++++----
 .../style-night/symbols/restaurant-m.svg      | 16 ++++----
 .../style-night/symbols/restaurant-s.svg      | 16 ++++----
 .../clear/style-night/symbols/shinto-l.svg    | 16 ++++----
 .../clear/style-night/symbols/shinto-m.svg    | 16 ++++----
 .../clear/style-night/symbols/shinto-s.svg    | 16 ++++----
 .../clear/style-night/symbols/stadium-l.svg   | 16 ++++++++
 .../clear/style-night/symbols/stadium-m.svg   | 16 ++++++++
 .../clear/style-night/symbols/stadium-s.svg   | 16 ++++++++
 .../clear/style-night/symbols/taoist-l.svg    | 22 ++++++-----
 .../clear/style-night/symbols/taoist-m.svg    | 16 ++++----
 .../clear/style-night/symbols/taoist-s.svg    | 16 ++++----
 .../style-night/symbols/tire-repair-l.svg     | 21 +++++++++++
 .../style-night/symbols/tire-repair-m.svg     | 21 +++++++++++
 .../clear/style-night/symbols/toilets-l.svg   | 16 ++++----
 .../clear/style-night/symbols/toilets-m.svg   | 16 ++++----
 .../clear/style-night/symbols/toilets-s.svg   | 16 ++++----
 .../style-night/symbols/toll_booth-l.svg      | 18 +++++----
 .../style-night/symbols/toll_booth-m.svg      | 28 +++++++-------
 .../style-night/symbols/toll_booth-s.svg      | 18 +++++----
 .../clear/style-night/symbols/tomb-l.svg      | 16 ++++----
 .../clear/style-night/symbols/tomb-m.svg      | 16 ++++----
 .../clear/style-night/symbols/tomb-s.svg      | 16 ++++++++
 .../style-night/symbols/veterinary-l.svg      | 22 ++++++-----
 .../style-night/symbols/veterinary-m.svg      | 16 ++++----
 .../style-night/symbols/veterinary-s.svg      | 16 ++++++++
 .../style-night/symbols/wayside_shrine-l.svg  | 16 ++++----
 .../style-night/symbols/wayside_shrine-m.svg  | 16 ++++----
 .../style-night/symbols/wayside_shrine-s.svg  | 16 ++++++++
 95 files changed, 1035 insertions(+), 641 deletions(-)
 create mode 100644 data/styles/clear/style-night/symbols/bank-s.svg
 create mode 100644 data/styles/clear/style-night/symbols/car-part-s.svg
 create mode 100644 data/styles/clear/style-night/symbols/car-wash-s.svg
 create mode 100644 data/styles/clear/style-night/symbols/car_sharing-s.svg
 create mode 100644 data/styles/clear/style-night/symbols/pharmacy-s.svg
 create mode 100644 data/styles/clear/style-night/symbols/stadium-l.svg
 create mode 100644 data/styles/clear/style-night/symbols/stadium-m.svg
 create mode 100644 data/styles/clear/style-night/symbols/stadium-s.svg
 create mode 100644 data/styles/clear/style-night/symbols/tire-repair-l.svg
 create mode 100644 data/styles/clear/style-night/symbols/tire-repair-m.svg
 create mode 100644 data/styles/clear/style-night/symbols/tomb-s.svg
 create mode 100644 data/styles/clear/style-night/symbols/veterinary-s.svg
 create mode 100644 data/styles/clear/style-night/symbols/wayside_shrine-s.svg

diff --git a/data/styles/clear/style-night/symbols/atm-l.svg b/data/styles/clear/style-night/symbols/atm-l.svg
index e46b71134a..215e7aa7fe 100644
--- a/data/styles/clear/style-night/symbols/atm-l.svg
+++ b/data/styles/clear/style-night/symbols/atm-l.svg
@@ -1,14 +1,16 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <svg width="27px" height="27px" viewBox="0 0 27 27" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
     <title>atm-l</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
-    <g id="POI-NIght" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="atm-l">
-            <circle id="Oval-1-Copy-39" fill-opacity="0.1" fill="#FFFFFF" cx="13.5" cy="13.5" r="13.5"></circle>
-            <path d="M13.5,26 C20.4035594,26 26,20.4035594 26,13.5 C26,6.59644063 20.4035594,1 13.5,1 C6.59644063,1 1,6.59644063 1,13.5 C1,20.4035594 6.59644063,26 13.5,26 Z" id="Oval-1-Copy-38" fill="#252522"></path>
-            <path d="M19.4998737,16.1328674 C19.3528155,16.0482507 19.1820914,16 19,16 C18.4438648,16 18,16.4477153 18,17 C18,17.5561352 18.4477153,18 19,18 C19.1827551,18 19.3533863,17.9516518 19.5001263,17.8671326 C19.6471845,17.9517493 19.8179086,18 20,18 C20.5561352,18 21,17.5522847 21,17 C21,16.4438648 20.5522847,16 20,16 C19.8172449,16 19.6466137,16.0483482 19.4998737,16.1328674 Z M6,9 C5.446,9 5,9.446 5,10 L5,19 C5,19.554 5.446,20 6,20 L21,20 C21.554,20 22,19.554 22,19 L22,10 C22,9.446 21.554,9 21,9 L6,9 Z M5.5,11 L21,11 L21,13 L5.5,13 L5.5,11 Z M6,17 L13,17 L13,18 L6,18 L6,17 Z" id="Combined-Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+    <g id="POI-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Artboard-1" transform="translate(-497.000000, -63.000000)">
+            <g id="atm-l" transform="translate(497.000000, 63.000000)">
+                <circle id="Oval-1-Copy-39" fill-opacity="0.1" fill="#FFFFFF" cx="13.5" cy="13.5" r="13.5"></circle>
+                <path d="M13.5,26 C20.4035594,26 26,20.4035594 26,13.5 C26,6.59644063 20.4035594,1 13.5,1 C6.59644063,1 1,6.59644063 1,13.5 C1,20.4035594 6.59644063,26 13.5,26 Z" id="Oval-1-Copy-38" fill="#252522"></path>
+                <path d="M17,14.7499085 C17.2089151,14.5929862 17.4685985,14.5 17.75,14.5 C18.4403559,14.5 19,15.0596441 19,15.75 C19,16.440356 18.4403559,17 17.75,17 C17.4685985,17 17.2089151,16.9070138 17,16.7500916 C16.7910849,16.9070138 16.5314015,17 16.25,17 C15.5596441,17 15,16.440356 15,15.75 C15,15.0596441 15.5596441,14.5 16.25,14.5 C16.5314015,14.5 16.7910849,14.5929862 17,14.7499085 Z M19.0081158,19 C20.1082031,19 21,18.1134452 21,16.994081 L21,12 L6,12 L6,16.9940808 C6,18.1019193 6.89339733,18.9999999 7.99188419,18.9999999 L19.0081158,19 Z M7.49309635,8 C6.66848201,8 6,8.66579724 6,9.5 L6,11 L21,11 L21,9.5 C21,8.67157288 20.3361142,8 19.5069036,8 L7.49309635,8 Z M8,16 L11,16 L11,17 L8,17 L8,16 Z" id="Combined-Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+            </g>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/atm-m.svg b/data/styles/clear/style-night/symbols/atm-m.svg
index 7e49947899..4fa7471c95 100644
--- a/data/styles/clear/style-night/symbols/atm-m.svg
+++ b/data/styles/clear/style-night/symbols/atm-m.svg
@@ -1,14 +1,16 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <svg width="23px" height="23px" viewBox="0 0 23 23" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
     <title>atm-m</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
-    <g id="POI-NIght" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="atm-m">
-            <ellipse id="Oval-1-Copy-41" fill-opacity="0.1" fill="#FFFFFF" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
-            <ellipse id="Oval-1-Copy-40" fill="#252522" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
-            <path d="M5.72222,8 C5.32211,8 5,8.3221 5,8.7223 L5,15.2778 C5,15.6779 5.32211,16 5.72222,16 L17.27778,16 C17.67789,16 18,15.6779 18,15.2778 L18,8.7223 C18,8.3221 17.67789,8 17.27778,8 L5.72222,8 Z M5.5,9.5 L17.5,9.5 L17.5,11 L5.5,11 L5.5,9.5 Z M6,13.5 L8,13.5 L8,15 L6,15 L6,13.5 Z M12,14.2777 L17,14.2777 L17,15 L12,15 L12,14.2777 Z" id="rect10401-9-copy" fill-opacity="0.7" fill="#FFFFFF"></path>
+    <g id="POI-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Artboard-1" transform="translate(-534.000000, -65.000000)">
+            <g id="atm-m" transform="translate(534.000000, 65.000000)">
+                <ellipse id="Oval-1-Copy-41" fill-opacity="0.1" fill="#FFFFFF" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
+                <ellipse id="Oval-1-Copy-40" fill="#252522" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+                <path d="M14.4503498,12.2398469 C14.6251832,12.0903116 14.8522161,12 15.1003498,12 C15.6528277,12 16.1006996,12.4477152 16.1006996,13 C16.1006996,13.5522847 15.6528277,14 15.1003498,14 C14.8522161,14 14.6251832,13.9096884 14.4503498,13.7601531 C14.2755164,13.9096884 14.0484835,14 13.8003498,14 C13.2478719,14 12.8,13.5522847 12.8,13 C12.8,12.4477152 13.2478719,12 13.8003498,12 C14.0484835,12 14.2755164,12.0903116 14.4503498,12.2398469 Z M16.5087347,16 C17.3323378,16 18,15.3255921 18,14.4971008 L18,10.5 L5,10.5 L5,14.4971007 C5,15.327129 5.66254437,15.9999999 6.4912653,15.9999999 L16.5087347,16 Z M6.24649465,7 C5.55807466,7 5,7.55483103 5,8.25 L5,9.5 L18,9.5 L18,8.25 C18,7.55964406 17.4414062,7 16.7535053,7 L6.24649465,7 Z M6.5,13 L8.5,13 L8.5,14 L6.5,14 L6.5,13 Z" id="Combined-Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+            </g>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/atm-s.svg b/data/styles/clear/style-night/symbols/atm-s.svg
index 353cf526d6..c8115caac7 100644
--- a/data/styles/clear/style-night/symbols/atm-s.svg
+++ b/data/styles/clear/style-night/symbols/atm-s.svg
@@ -1,14 +1,16 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <svg width="17px" height="17px" viewBox="0 0 17 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
     <title>atm-s</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
-    <g id="POI-NIght" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="atm-s">
-            <circle id="Oval-1-Copy-43" fill-opacity="0.1" fill="#FFFFFF" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-42" fill="#252522" cx="8.5" cy="8.5" r="7.5"></circle>
-            <path d="M4.5,5 C4.223,5 4,5.223 4,5.5 L4,10.5 C4,10.777 4.223,11 4.5,11 L12.5,11 C12.777,11 13,10.777 13,10.5 L13,5.5 C13,5.223 12.777,5 12.5,5 L4.5,5 Z M4.5,6 L12.5,6 L12.5,7 L4.5,7 L4.5,6 Z M4.5,9 L6,9 L6,10 L4.5,10 L4.5,9 Z M9,9.5 L12,9.5 L12,10 L9,10 L9,9.5 Z" id="rect10401-7-copy" fill-opacity="0.7" fill="#FFFFFF"></path>
+    <g id="POI-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Artboard-1" transform="translate(-567.000000, -68.000000)">
+            <g id="atm-s" transform="translate(567.000000, 68.000000)">
+                <circle id="Oval-1-Copy-43" fill-opacity="0.1" fill="#FFFFFF" cx="8.5" cy="8.5" r="8.5"></circle>
+                <circle id="Oval-1-Copy-42" fill="#252522" cx="8.5" cy="8.5" r="7.5"></circle>
+                <path d="M10.7502623,9.19081694 C10.8829769,9.07214998 11.0581909,9 11.2502623,9 C11.6646208,9 12.0005247,9.33578644 12.0005247,9.75 C12.0005247,10.1642136 11.6646208,10.5 11.2502623,10.5 C11.0581909,10.5 10.8829769,10.42785 10.7502623,10.3091831 C10.6175478,10.42785 10.4423338,10.5 10.2502623,10.5 C9.83590389,10.5 9.5,10.1642136 9.5,9.75 C9.5,9.33578644 9.83590389,9 10.2502623,9 C10.4423338,9 10.6175478,9.07214998 10.7502623,9.19081694 Z M12.0024554,12 C12.553384,12 13,11.5520711 13,11.0013042 L13,7.5 L4,7.5 L4,11.0013041 C4,11.5528685 4.4463114,11.9999999 4.99754465,11.9999999 L12.0024554,12 Z M5,10 L7,10 L7,10.5 L5,10.5 L5,10 Z M4.75185497,5 C4.33661694,5 4,5.33289862 4,5.75 L4,6.5 L13,6.5 L13,5.75 C13,5.33578644 12.6581793,5 12.248145,5 L4.75185497,5 Z" id="Combined-Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+            </g>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/bank-l.svg b/data/styles/clear/style-night/symbols/bank-l.svg
index 0cea3862cb..a43cf2aa40 100644
--- a/data/styles/clear/style-night/symbols/bank-l.svg
+++ b/data/styles/clear/style-night/symbols/bank-l.svg
@@ -1,14 +1,16 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <svg width="27px" height="27px" viewBox="0 0 27 27" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
     <title>bank-l</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
-    <g id="POI-NIght" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="bank-l">
-            <circle id="Oval-1-Copy-39" fill-opacity="0.1" fill="#FFFFFF" cx="13.5" cy="13.5" r="13.5"></circle>
-            <path d="M13.5,26 C20.4035594,26 26,20.4035594 26,13.5 C26,6.59644063 20.4035594,1 13.5,1 C6.59644063,1 1,6.59644063 1,13.5 C1,20.4035594 6.59644063,26 13.5,26 Z" id="Oval-1-Copy-38" fill="#252522"></path>
-            <path d="M15.3051413,10.5 L19.5,10.5 L20.0365553,19.5 C20.5521239,19.5 21,19.9477153 21,20.5 L21,21.5 L6,21.5 L6,20.5 C6,19.9438648 6.44921444,19.5 7.00334852,19.5 L7.04839683,19.5 L7.5,10.5 L11.3308038,10.5 C11.7575493,10.2165567 12.3139451,10.0536246 13,10.0112011 L13,9 L14,9 L14,10.0429192 C14.4832908,10.1119668 14.9183361,10.2643266 15.3051413,10.5 L21,10.5 L21,9.55133929 C20.99375,9.08651786 13.5,5.5 13.5,5.5 C13.5,5.5 6.00625,9.08651786 6.00397727,9.54568452 L6,10.5 L11.3308038,10.5 C11.250007,10.553665 11.1738577,10.61165 11.102356,10.673955 C10.5867284,11.1232606 10.3289185,11.6874564 10.3289185,12.3665595 C10.3289185,13.110829 10.5956801,13.6578761 11.1292114,14.007717 C11.4443172,14.2169357 12.0136474,14.4107172 12.8372192,14.5890675 L13,14.6240494 L13,16.6791338 C12.5841018,16.6204224 12.2756117,16.4742166 12.0745239,16.2405145 C11.9277133,16.0690238 11.8292442,15.8100768 11.7791138,15.4636656 L10.2000122,15.4636656 C10.2000122,16.2525227 10.4954194,16.8724522 11.0862427,17.3234727 C11.574049,17.6958525 12.2119635,17.9145044 13,17.9794324 L13,19 L14,19 L14,17.9813452 C14.7805086,17.9183206 15.4017809,17.6956013 15.8638306,17.3131833 C16.417056,16.8553032 16.6936646,16.2799606 16.6936646,15.5871383 C16.6936646,14.911465 16.4573388,14.3952858 15.9846802,14.0385852 C15.6803167,13.8087877 15.2291493,13.6252954 14.6311646,13.4881029 L14,13.3429133 L14,11.4183449 C14.078905,11.443386 14.1532254,11.4730695 14.2229614,11.5073955 C14.6096821,11.6994651 14.8173623,12.0235776 14.8460083,12.4797428 L16.4358521,12.4797428 C16.4072061,11.6737366 16.0983713,11.0589517 15.5093384,10.6353698 C15.4428358,10.5875468 15.3747702,10.5424236 15.3051413,10.5 Z M13,11.328331 L13,13.1108495 C12.6225168,13.0170127 12.3677376,12.9335468 12.2356567,12.8604502 C11.9850044,12.7266874 11.8596802,12.5243315 11.8596802,12.2533762 C11.8596802,11.9584122 11.9867948,11.7286182 12.2410278,11.5639871 C12.4409026,11.4345563 12.6938917,11.3560047 13,11.328331 Z M14,16.6758666 L14,14.8444083 C14.3279456,14.9286245 14.5795105,15.0218598 14.7546997,15.1241158 C14.9838675,15.2613083 15.0984497,15.4550899 15.0984497,15.7054662 C15.0984497,16.1341929 14.867495,16.4274376 14.4055786,16.585209 C14.2876142,16.6250886 14.1524217,16.6553077 14,16.6758666 Z" id="Imported-Layers-Copy-3" fill-opacity="0.7" fill="#FFFFFF"></path>
+    <g id="POI-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Artboard-1" transform="translate(-497.000000, -100.000000)">
+            <g id="bank-l" transform="translate(497.000000, 100.000000)">
+                <circle id="Oval-1-Copy-39" fill-opacity="0.1" fill="#FFFFFF" cx="13.5" cy="13.5" r="13.5"></circle>
+                <path d="M13.5,26 C20.4035594,26 26,20.4035594 26,13.5 C26,6.59644063 20.4035594,1 13.5,1 C6.59644063,1 1,6.59644063 1,13.5 C1,20.4035594 6.59644063,26 13.5,26 Z" id="Oval-1-Copy-38" fill="#252522"></path>
+                <path d="M6,8.5 L6,10 L8,10 L8,18 L6,18 L6,20 L21,20 L21,18 L19,18 L19,10 L21,10 L21,8.5 L13.5,5 L6,8.5 Z M16,15.0013327 C16,15.9768992 15.3022222,16.8005331 14.3333333,17.1123945 L14.3333333,18 L12.6666667,18 L12.6666667,17.1123945 C11.6977778,16.8005331 11,15.9768992 11,15.0013327 L12.6666667,15.0013327 C12.6666667,15.4131497 13.04,15.7529987 13.5022222,15.7529987 C13.9644444,15.7529987 14.3377778,15.4171479 14.3377778,15.0013327 C14.3377778,14.5855175 13.9644444,14.2496668 13.5022222,14.2496668 C12.1244444,14.2496668 11,13.2421146 11,11.9986673 C11,11.0231008 11.6977778,10.1994669 12.6666667,9.88760551 L12.6666667,9 L14.3333333,9 L14.3333333,9.88760551 C15.3022222,10.1994669 16,11.0231008 16,11.9986673 L14.3333333,11.9986673 C14.3333333,11.5868503 13.96,11.2470013 13.4977778,11.2470013 C13.0355556,11.2470013 12.6622222,11.5828521 12.6622222,11.9986673 C12.6622222,12.4144825 13.04,12.7503332 13.4977778,12.7503332 C14.8755556,12.7503332 16,13.7578854 16,15.0013327 Z" id="Combined-Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+            </g>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/bank-m.svg b/data/styles/clear/style-night/symbols/bank-m.svg
index 301c4a7743..533f0ebb5c 100644
--- a/data/styles/clear/style-night/symbols/bank-m.svg
+++ b/data/styles/clear/style-night/symbols/bank-m.svg
@@ -1,16 +1,15 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <svg width="23px" height="23px" viewBox="0 0 23 23" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
     <title>bank-m</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
-    <g id="POI-NIght" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="bank-2-m">
-            <ellipse id="Oval-1-Copy-41" fill-opacity="0.1" fill="#FFFFFF" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
-            <ellipse id="Oval-1-Copy-40" fill="#252522" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
-            <path d="M17.0365553,16 L16.5,8 L6.5,8 L6.04839683,16 L6.00334852,16 C5.44921444,16 5,16.4438648 5,17 L5,18 L18,18 L18,17 C18,16.4477153 17.5521239,16 17.0365553,16 Z M11.5,4 C11.5,4 5.00541667,6.86921429 5.00344697,7.23654762 L5,8 L18,8 L18,7.24107143 C17.9945833,6.86921429 11.5,4 11.5,4 Z" id="Combined-Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
-            <g id="Group-10" transform="translate(9.000000, 8.000000)" fill="#262622">
-                <path d="M4.91544879,4 L5,4 L5,1.99895656 C5,1.44266033 4.55237094,1 4.00019251,1 L1.50016487,1 C0.674322248,1 0,1.67157288 0,2.5 C0,3.26934284 0.571264795,3.89544943 1.30999794,3.98815918 L0,3.98815918 L0,4.99407959 C0,5.55350732 0.447629061,6 0.999807492,6 L3.49983513,6 C4.32567775,6 5,5.32842712 5,4.5 C5,4.32431533 4.97021363,4.15609997 4.91544879,4 Z M3.25,3 L5,3 L5,4 L4.91544879,4 C4.710174,3.41489114 4.15395881,3 3.5,3 L3.25,3 Z M1,2.5 C1,2.22385763 1.21505737,2 1.49047852,2 L5,2 L5,3 L1.49047852,3 C1.21959471,3 1,2.76806641 1,2.5 Z M4,4.5 C4,4.77614237 3.78494263,5 3.50952148,5 L0,5 L0,4 L3.50952148,4 C3.78040529,4 4,4.23193359 4,4.5 Z M2,0 L3,0 L3,1 L2,1 L2,0 Z M2,2 L3,2 L3,3 L2,3 L2,2 Z M2,4 L3,4 L3,5 L2,5 L2,4 Z M2,6 L3,6 L3,7 L2,7 L2,6 Z" id="Combined-Shape"></path>
+    <g id="POI-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Artboard-1" transform="translate(-534.000000, -102.000000)">
+            <g id="bank-2-m" transform="translate(534.000000, 102.000000)">
+                <ellipse id="Oval-1-Copy-41" fill-opacity="0.1" fill="#FFFFFF" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
+                <ellipse id="Oval-1-Copy-40" fill="#252522" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+                <path d="M5,7 L5,8 L6,8 L6,15.5 L5,15.5 L5,17 L18,17 L18,15.5 L17,15.5 L17,8 L18,8 L18,7 L11.5,4 L5,7 Z M14,12.334518 C14,13.2016881 13.3022222,13.9338072 12.3333333,14.2110173 L12.3333333,15 L10.6666667,15 L10.6666667,14.2110173 C9.69777778,13.9338072 9,13.2016881 9,12.334518 L10.6666667,12.334518 C10.6666667,12.7005775 11.04,13.0026655 11.5022222,13.0026655 C11.9644444,13.0026655 12.3377778,12.7041315 12.3377778,12.334518 C12.3377778,11.9649045 11.9644444,11.6663705 11.5022222,11.6663705 C10.1244444,11.6663705 9,10.7707685 9,9.66548201 C9,8.79831186 9.69777778,8.0661928 10.6666667,7.78898267 L10.6666667,7 L12.3333333,7 L12.3333333,7.78898267 C13.3022222,8.0661928 14,8.79831186 14,9.66548201 L12.3333333,9.66548201 C12.3333333,9.29942248 11.96,8.99733452 11.4977778,8.99733452 C11.0355556,8.99733452 10.6622222,9.2958685 10.6622222,9.66548201 C10.6622222,10.0350955 11.04,10.3336295 11.4977778,10.3336295 C12.8755556,10.3336295 14,11.2292315 14,12.334518 Z" id="Combined-Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
             </g>
         </g>
     </g>
diff --git a/data/styles/clear/style-night/symbols/bank-s.svg b/data/styles/clear/style-night/symbols/bank-s.svg
new file mode 100644
index 0000000000..2c3c7c8aa3
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/bank-s.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="17px" height="17px" viewBox="0 0 17 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
+    <title>bank-s</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="POI-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Artboard-1" transform="translate(-567.000000, -105.000000)">
+            <g id="atm-s" transform="translate(567.000000, 105.000000)">
+                <circle id="Oval-1-Copy-43" fill-opacity="0.1" fill="#FFFFFF" cx="8.5" cy="8.5" r="8.5"></circle>
+                <circle id="Oval-1-Copy-42" fill="#252522" cx="8.5" cy="8.5" r="7.5"></circle>
+                <path d="M4,6 L4,7 L5,7 L5,12 L4,12 L4,13 L13,13 L13,12 L12,12 L12,7 L13,7 L13,6 L8.5,4 L4,6 Z M10,9.33407375 C10,9.87605509 9.58133333,10.3336295 9,10.5068858 L9,11 L8,11 L8,10.5068858 C7.41866667,10.3336295 7,9.87605509 7,9.33407375 L8,9.33407375 C8,9.56286095 8.224,9.75166593 8.50133333,9.75166593 C8.77866667,9.75166593 9.00266667,9.56508219 9.00266667,9.33407375 C9.00266667,9.1030653 8.77866667,8.91648156 8.50133333,8.91648156 C7.67466667,8.91648156 7,8.35673034 7,7.66592625 C7,7.12394491 7.41866667,6.6663705 8,6.49311417 L8,6 L9,6 L9,6.49311417 C9.58133333,6.6663705 10,7.12394491 10,7.66592625 L9,7.66592625 C9,7.43713905 8.776,7.24833407 8.49866667,7.24833407 C8.22133333,7.24833407 7.99733333,7.43491781 7.99733333,7.66592625 C7.99733333,7.8969347 8.224,8.08351844 8.49866667,8.08351844 C9.32533333,8.08351844 10,8.64326966 10,9.33407375 Z" id="Combined-Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/bar-l.svg b/data/styles/clear/style-night/symbols/bar-l.svg
index e6c63b89c0..e9c2cb0961 100644
--- a/data/styles/clear/style-night/symbols/bar-l.svg
+++ b/data/styles/clear/style-night/symbols/bar-l.svg
@@ -1,14 +1,16 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <svg width="27px" height="27px" viewBox="0 0 27 27" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
     <title>bar-l</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
-    <g id="POI-NIght" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="bar-l">
-            <circle id="Oval-1-Copy-39" fill-opacity="0.1" fill="#FFFFFF" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#332714" cx="13.5" cy="13.5" r="12.5"></circle>
-            <path d="M7,7 C6.5,7 6,7.0006 6,7.25 C6,7.5006 6.34281,7.7979 6.5,8 L13,14.8125 L13,21 L10,22 C9.5,22.1667 9,22.5 9,23 L18,23 C18,22.5 17.5,22.1667 17,22 L14,21 L14,14.8125 L20.5,8 C20.65719,7.7979 21,7.5006 21,7.25 C21,7.0006 20.5,7 20,7 L7,7 Z" id="path15601-4" fill-opacity="0.7" fill="#FFFFFF"></path>
+    <g id="POI-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Artboard-1" transform="translate(-137.000000, -433.000000)">
+            <g id="bar-l" transform="translate(137.000000, 433.000000)">
+                <circle id="Oval-1-Copy-39" fill-opacity="0.1" fill="#FFFFFF" cx="13.5" cy="13.5" r="13.5"></circle>
+                <circle id="Oval-1-Copy-38" fill="#332714" cx="13.5" cy="13.5" r="12.5"></circle>
+                <path d="M7,7 C6.5,7 6,7.0006 6,7.25 C6,7.5006 6.34281,7.7979 6.5,8 L13,14.8125 L13,21 L10,22 C9.5,22.1667 9,22.5 9,23 L18,23 C18,22.5 17.5,22.1667 17,22 L14,21 L14,14.8125 L20.5,8 C20.65719,7.7979 21,7.5006 21,7.25 C21,7.0006 20.5,7 20,7 L7,7 Z" id="path15601-4" fill-opacity="0.7" fill="#FFFFFF"></path>
+            </g>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/bar-m.svg b/data/styles/clear/style-night/symbols/bar-m.svg
index bf960f4677..5f0a15d9a1 100644
--- a/data/styles/clear/style-night/symbols/bar-m.svg
+++ b/data/styles/clear/style-night/symbols/bar-m.svg
@@ -1,14 +1,16 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <svg width="23px" height="23px" viewBox="0 0 23 23" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
     <title>bar-m</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
-    <g id="POI-NIght" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="bar-m">
-            <ellipse id="Oval-1-Copy-41" fill-opacity="0.1" fill="#FFFFFF" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
-            <ellipse id="Oval-1-Copy-40" fill="#332714" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
-            <path d="M6,6 C5.59375,6 5,6.047 5,6.25 C5,6.4536 5.37228,6.8358 5.5,7 L11,13 L11,17 L8.1875,18.1875 C7.78125,18.3229 7.5,18.5 7.5,19 L15.5,19 C15.5,18.5 15.09375,18.3229 14.6875,18.1875 L12,17 L12,13 L17.5,7 C17.62772,6.8358 18,6.4536 18,6.25 C18,6.0474 17.40625,6 17,6 L6,6 Z" id="path15601-4-0" fill-opacity="0.7" fill="#FFFFFF"></path>
+    <g id="POI-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Artboard-1" transform="translate(-174.000000, -435.000000)">
+            <g id="bar-m" transform="translate(174.000000, 435.000000)">
+                <ellipse id="Oval-1-Copy-41" fill-opacity="0.1" fill="#FFFFFF" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
+                <ellipse id="Oval-1-Copy-40" fill="#332714" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+                <path d="M6,6 C5.59375,6 5,6.047 5,6.25 C5,6.4536 5.37228,6.8358 5.5,7 L11,13 L11,17 L8.1875,18.1875 C7.78125,18.3229 7.5,18.5 7.5,19 L15.5,19 C15.5,18.5 15.09375,18.3229 14.6875,18.1875 L12,17 L12,13 L17.5,7 C17.62772,6.8358 18,6.4536 18,6.25 C18,6.0474 17.40625,6 17,6 L6,6 Z" id="path15601-4-0" fill-opacity="0.7" fill="#FFFFFF"></path>
+            </g>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/bar-s.svg b/data/styles/clear/style-night/symbols/bar-s.svg
index 16f0e8c4a8..c9228f9934 100644
--- a/data/styles/clear/style-night/symbols/bar-s.svg
+++ b/data/styles/clear/style-night/symbols/bar-s.svg
@@ -1,14 +1,16 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <svg width="17px" height="17px" viewBox="0 0 17 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
     <title>bar-s</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
-    <g id="POI-NIght" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="bar-s">
-            <circle id="Oval-1-Copy-43" fill-opacity="0.1" fill="#FFFFFF" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-42" fill="#332714" cx="8.5" cy="8.5" r="7.5"></circle>
-            <path d="M4.5,5 C4.21875,5 4,5.0003 4,5.1406 C4,5.2816 4.19283,5.4488 4.28125,5.5625 L8,10 L8,12.5 C7,13 5.5,13.5 5.5,14 L11.5,14 C11.5,13.5 10,13 9,12.5 L9,10 L12.71875,5.5625 C12.80715,5.4488 13,5.2816 13,5.1406 C13,5.0003 12.78125,5 12.5,5 L4.5,5 Z" id="path15601-4-2" fill-opacity="0.7" fill="#FFFFFF"></path>
+    <g id="POI-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Artboard-1" transform="translate(-207.000000, -438.000000)">
+            <g id="bar-s" transform="translate(207.000000, 438.000000)">
+                <circle id="Oval-1-Copy-43" fill-opacity="0.1" fill="#FFFFFF" cx="8.5" cy="8.5" r="8.5"></circle>
+                <circle id="Oval-1-Copy-42" fill="#332714" cx="8.5" cy="8.5" r="7.5"></circle>
+                <path d="M4.5,5 C4.21875,5 4,5.0003 4,5.1406 C4,5.2816 4.19283,5.4488 4.28125,5.5625 L8,10 L8,12.5 C7,13 5.5,13.5 5.5,14 L11.5,14 C11.5,13.5 10,13 9,12.5 L9,10 L12.71875,5.5625 C12.80715,5.4488 13,5.2816 13,5.1406 C13,5.0003 12.78125,5 12.5,5 L4.5,5 Z" id="path15601-4-2" fill-opacity="0.7" fill="#FFFFFF"></path>
+            </g>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/beer-l.svg b/data/styles/clear/style-night/symbols/beer-l.svg
index 0b5d6d57c2..d1ea6f682e 100644
--- a/data/styles/clear/style-night/symbols/beer-l.svg
+++ b/data/styles/clear/style-night/symbols/beer-l.svg
@@ -1,17 +1,19 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <svg width="27px" height="27px" viewBox="0 0 27 27" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
     <title>beer-l</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
-    <g id="POI-NIght" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="beer-l">
-            <g id="Layer_2">
-                <path d="M13.5,27 C6.056,27 0,20.944 0,13.5 C0,6.056 6.056,0 13.5,0 C20.944,0 27,6.056 27,13.5 C27,20.944 20.944,27 13.5,27 L13.5,27 Z" id="Shape" fill-opacity="0.1" fill="#FFFFFF"></path>
-                <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#332714"></path>
-            </g>
-            <g id="Layer_1" transform="translate(8.000000, 3.000000)" fill-opacity="0.7" fill="#FFFFFF">
-                <path d="M7.777,2.778 C7.333,2.778 6.922,2.912 6.573,3.136 C6.231,1.659 4.914,0.555 3.333,0.555 C1.493,0.556 0,2.048 0,3.889 L0,5 L10,5 C10,3.773 9.005,2.778 7.777,2.778 L7.777,2.778 Z M11,7 L0,7 L0,18 C0,18.553 0.447,19 1,19 L9,19 C9.553,19 10,18.553 10,18 L10,16.35 L13.9,14.66 L13.9,10 C13.9,8.346 12.654,7 11,7 L11,7 Z M12,13.341 L10,14.198 L10,9 L11,9 C11.552,9 12,9.449 12,10 L12,13.341 L12,13.341 Z" id="Shape"></path>
+    <g id="POI-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Artboard-1" transform="translate(-137.000000, -470.000000)">
+            <g id="beer-l" transform="translate(137.000000, 470.000000)">
+                <g id="Layer_2">
+                    <path d="M13.5,27 C6.056,27 0,20.944 0,13.5 C0,6.056 6.056,0 13.5,0 C20.944,0 27,6.056 27,13.5 C27,20.944 20.944,27 13.5,27 L13.5,27 Z" id="Shape" fill-opacity="0.1" fill="#FFFFFF"></path>
+                    <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#332714"></path>
+                </g>
+                <g id="Layer_1" transform="translate(8.000000, 3.000000)" fill-opacity="0.7" fill="#FFFFFF">
+                    <path d="M7.777,2.778 C7.333,2.778 6.922,2.912 6.573,3.136 C6.231,1.659 4.914,0.555 3.333,0.555 C1.493,0.556 0,2.048 0,3.889 L0,5 L10,5 C10,3.773 9.005,2.778 7.777,2.778 L7.777,2.778 Z M11,7 L0,7 L0,18 C0,18.553 0.447,19 1,19 L9,19 C9.553,19 10,18.553 10,18 L10,16.35 L13.9,14.66 L13.9,10 C13.9,8.346 12.654,7 11,7 L11,7 Z M12,13.341 L10,14.198 L10,9 L11,9 C11.552,9 12,9.449 12,10 L12,13.341 L12,13.341 Z" id="Shape"></path>
+                </g>
             </g>
         </g>
     </g>
diff --git a/data/styles/clear/style-night/symbols/beer-m.svg b/data/styles/clear/style-night/symbols/beer-m.svg
index 985bcb8704..905b6f2e91 100644
--- a/data/styles/clear/style-night/symbols/beer-m.svg
+++ b/data/styles/clear/style-night/symbols/beer-m.svg
@@ -1,17 +1,19 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <svg width="23px" height="23px" viewBox="0 0 23 23" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
     <title>beer-m</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
-    <g id="POI-NIght" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="beer-m">
-            <g id="Layer_2">
-                <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" fill-opacity="0.1" fill="#FFFFFF"></path>
-                <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#332714"></path>
-            </g>
-            <g id="Layer_1" transform="translate(7.000000, 4.000000)" fill-opacity="0.7" fill="#FFFFFF">
-                <path d="M6.222,2.2 C5.868,2.2 5.537,2.307 5.259,2.487 C4.986,1.305 3.932,0.423 2.666,0.423 C1.194,0.422 0,1.616 0,3.089 L0,3.978 L8,3.978 C8,2.996 7.204,2.2 6.222,2.2 L6.222,2.2 Z M8.998,5 L0,5 L0,13 C0,13.552 0.447,14 1,14 L7,14 C7.553,14 8,13.552 8,13 L8,11.614 L10.998,10.329 L10.998,7 C10.998,5.896 10.101,5 8.998,5 L8.998,5 Z M10.098,9.67 L8,10.526 L8,6 L8.998,6 C9.81,6 10.098,6.449 10.098,7 L10.098,9.67 L10.098,9.67 Z" id="Shape"></path>
+    <g id="POI-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Artboard-1" transform="translate(-174.000000, -472.000000)">
+            <g id="beer-m" transform="translate(174.000000, 472.000000)">
+                <g id="Layer_2">
+                    <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" fill-opacity="0.1" fill="#FFFFFF"></path>
+                    <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#332714"></path>
+                </g>
+                <g id="Layer_1" transform="translate(7.000000, 4.000000)" fill-opacity="0.7" fill="#FFFFFF">
+                    <path d="M6.222,2.2 C5.868,2.2 5.537,2.307 5.259,2.487 C4.986,1.305 3.932,0.423 2.666,0.423 C1.194,0.422 0,1.616 0,3.089 L0,3.978 L8,3.978 C8,2.996 7.204,2.2 6.222,2.2 L6.222,2.2 Z M8.998,5 L0,5 L0,13 C0,13.552 0.447,14 1,14 L7,14 C7.553,14 8,13.552 8,13 L8,11.614 L10.998,10.329 L10.998,7 C10.998,5.896 10.101,5 8.998,5 L8.998,5 Z M10.098,9.67 L8,10.526 L8,6 L8.998,6 C9.81,6 10.098,6.449 10.098,7 L10.098,9.67 L10.098,9.67 Z" id="Shape"></path>
+                </g>
             </g>
         </g>
     </g>
diff --git a/data/styles/clear/style-night/symbols/beer-s.svg b/data/styles/clear/style-night/symbols/beer-s.svg
index a344c71a1c..181f0a157e 100644
--- a/data/styles/clear/style-night/symbols/beer-s.svg
+++ b/data/styles/clear/style-night/symbols/beer-s.svg
@@ -1,14 +1,16 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <svg width="17px" height="17px" viewBox="0 0 17 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
     <title>beer-s</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
-    <g id="POI-NIght" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="bar-s">
-            <circle id="Oval-1-Copy-43" fill-opacity="0.1" fill="#FFFFFF" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-42" fill="#332714" cx="8.5" cy="8.5" r="7.5"></circle>
-            <path d="M8.259,4.06400063 C7.986,2.88200063 6.666,3.00000063 6.666,3.00000063 C6.666,3.00000063 5,3.19300063 5,4.66600063 L5,5.55500063 L11,5.55500063 C11,4.57300063 10.204,3.77700063 9.222,3.77700063 C8.868,3.77700063 8.537,3.88400063 8.259,4.06400063 Z M5,6.57700063 L5,12.5770006 C5,13.1290006 5.447,13.5770006 6,13.5770006 L10,13.5770006 C10.553,13.5770006 11,13.1290006 11,12.5770006 L11,11.1910006 L12.998,9.90600063 L12.998,8.57700063 C12.998,7.47300063 12.101,6.57700063 10.998,6.57700063 L5,6.57700063 Z M11,10.1030006 L11,7.57700063 C11.81,7.57700063 12.098,8.02600063 12.098,8.57700063 L12.098,9.24700063 L11,10.1030006 Z" id="Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+    <g id="POI-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Artboard-1" transform="translate(-207.000000, -475.000000)">
+            <g id="bar-s" transform="translate(207.000000, 475.000000)">
+                <circle id="Oval-1-Copy-43" fill-opacity="0.1" fill="#FFFFFF" cx="8.5" cy="8.5" r="8.5"></circle>
+                <circle id="Oval-1-Copy-42" fill="#332714" cx="8.5" cy="8.5" r="7.5"></circle>
+                <path d="M8.259,4.06400063 C7.986,2.88200063 6.666,3.00000063 6.666,3.00000063 C6.666,3.00000063 5,3.19300063 5,4.66600063 L5,5.55500063 L11,5.55500063 C11,4.57300063 10.204,3.77700063 9.222,3.77700063 C8.868,3.77700063 8.537,3.88400063 8.259,4.06400063 Z M5,6.57700063 L5,12.5770006 C5,13.1290006 5.447,13.5770006 6,13.5770006 L10,13.5770006 C10.553,13.5770006 11,13.1290006 11,12.5770006 L11,11.1910006 L12.998,9.90600063 L12.998,8.57700063 C12.998,7.47300063 12.101,6.57700063 10.998,6.57700063 L5,6.57700063 Z M11,10.1030006 L11,7.57700063 C11.81,7.57700063 12.098,8.02600063 12.098,8.57700063 L12.098,9.24700063 L11,10.1030006 Z" id="Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+            </g>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/buddhist-l.svg b/data/styles/clear/style-night/symbols/buddhist-l.svg
index c9fa0af7ad..bb41502a47 100644
--- a/data/styles/clear/style-night/symbols/buddhist-l.svg
+++ b/data/styles/clear/style-night/symbols/buddhist-l.svg
@@ -1,14 +1,16 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <svg width="27px" height="27px" viewBox="0 0 27 27" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
     <title>buddhist-l</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
-    <g id="POI-NIght" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="buddhist-l">
-            <circle id="Oval-1-Copy-39" fill-opacity="0.1" fill="#FFFFFF" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#26160D" cx="13.5" cy="13.5" r="12.5"></circle>
-            <path d="M14,6.01644219 C17.7434388,6.26342689 20.7366781,9.26321105 20.9835354,13 L22,13 L22,14 L20.9835578,14 C20.7365731,17.7434388 17.7367889,20.7366781 14,20.9835354 L14,22 L13,22 L13,20.9835578 C9.25656116,20.7365731 6.26332187,17.7367889 6.01646459,14 L5,14 L5,13 L6.01644219,13 C6.26342689,9.25656116 9.26321105,6.26332187 13,6.01646459 L13,5 L14,5 L14,6.01644219 Z M13,7.01901598 C11.5829694,7.12719918 10.2912082,7.69128847 9.27227136,8.56516458 L12.4827462,11.7756395 C12.6420483,11.6817735 12.815745,11.6093541 13,11.5623512 L13,7.01901598 Z M14,7.01899069 C15.4184536,7.12715076 16.7096502,7.69159714 17.7277929,8.56510036 L14.5170729,11.7758203 C14.3576187,11.681924 14.1839292,11.6095411 14,11.5625325 L14,7.01899069 Z M14,19.980984 C15.4170306,19.8728008 16.7087918,19.3087115 17.7277286,18.4348354 L14.5172538,15.2243605 C14.3579517,15.3182265 14.184255,15.3906459 14,15.4376488 L14,19.980984 Z M13,19.9810093 C11.5815464,19.8728492 10.2903498,19.3084029 9.27220714,18.4348996 L12.4829271,15.2241797 C12.6423813,15.318076 12.8160708,15.3904589 13,15.4374675 L13,19.9810093 Z M15.4376488,13 L19.980984,13 C19.8728008,11.5829694 19.3087115,10.2912082 18.4348354,9.27227136 L15.2243605,12.4827462 C15.3182265,12.6420483 15.3906459,12.815745 15.4376488,13 Z M15.4374675,14 L19.9810093,14 C19.8728492,15.4184536 19.3084029,16.7096502 18.4348996,17.7277929 L15.2241797,14.5170729 C15.318076,14.3576187 15.3904589,14.1839292 15.4374675,14 Z M11.7756395,14.5172538 L8.56516458,17.7277286 C7.69128847,16.7087918 7.12719918,15.4170306 7.01901598,14 L11.5623512,14 C11.6093541,14.184255 11.6817735,14.3579517 11.7756395,14.5172538 Z M11.5625325,13 L7.01899069,13 C7.12715076,11.5815464 7.69159714,10.2903498 8.56510036,9.27220714 L11.7758203,12.4829271 C11.681924,12.6423813 11.6095411,12.8160708 11.5625325,13 Z M13,13.5 C13,13.2238576 13.2319336,13 13.5,13 C13.7761424,13 14,13.2319336 14,13.5 C14,13.7761424 13.7680664,14 13.5,14 C13.2238576,14 13,13.7680664 13,13.5 Z" id="Combined-Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+    <g id="POI-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Artboard-1" transform="translate(-317.000000, -1026.000000)">
+            <g id="buddhist-l" transform="translate(317.000000, 1026.000000)">
+                <circle id="Oval-1-Copy-39" fill-opacity="0.1" fill="#FFFFFF" cx="13.5" cy="13.5" r="13.5"></circle>
+                <circle id="Oval-1-Copy-38" fill="#26160D" cx="13.5" cy="13.5" r="12.5"></circle>
+                <path d="M14,6.01644219 C17.7434388,6.26342689 20.7366781,9.26321105 20.9835354,13 L22,13 L22,14 L20.9835578,14 C20.7365731,17.7434388 17.7367889,20.7366781 14,20.9835354 L14,22 L13,22 L13,20.9835578 C9.25656116,20.7365731 6.26332187,17.7367889 6.01646459,14 L5,14 L5,13 L6.01644219,13 C6.26342689,9.25656116 9.26321105,6.26332187 13,6.01646459 L13,5 L14,5 L14,6.01644219 Z M13,7.01901598 C11.5829694,7.12719918 10.2912082,7.69128847 9.27227136,8.56516458 L12.4827462,11.7756395 C12.6420483,11.6817735 12.815745,11.6093541 13,11.5623512 L13,7.01901598 Z M14,7.01899069 C15.4184536,7.12715076 16.7096502,7.69159714 17.7277929,8.56510036 L14.5170729,11.7758203 C14.3576187,11.681924 14.1839292,11.6095411 14,11.5625325 L14,7.01899069 Z M14,19.980984 C15.4170306,19.8728008 16.7087918,19.3087115 17.7277286,18.4348354 L14.5172538,15.2243605 C14.3579517,15.3182265 14.184255,15.3906459 14,15.4376488 L14,19.980984 Z M13,19.9810093 C11.5815464,19.8728492 10.2903498,19.3084029 9.27220714,18.4348996 L12.4829271,15.2241797 C12.6423813,15.318076 12.8160708,15.3904589 13,15.4374675 L13,19.9810093 Z M15.4376488,13 L19.980984,13 C19.8728008,11.5829694 19.3087115,10.2912082 18.4348354,9.27227136 L15.2243605,12.4827462 C15.3182265,12.6420483 15.3906459,12.815745 15.4376488,13 Z M15.4374675,14 L19.9810093,14 C19.8728492,15.4184536 19.3084029,16.7096502 18.4348996,17.7277929 L15.2241797,14.5170729 C15.318076,14.3576187 15.3904589,14.1839292 15.4374675,14 Z M11.7756395,14.5172538 L8.56516458,17.7277286 C7.69128847,16.7087918 7.12719918,15.4170306 7.01901598,14 L11.5623512,14 C11.6093541,14.184255 11.6817735,14.3579517 11.7756395,14.5172538 Z M11.5625325,13 L7.01899069,13 C7.12715076,11.5815464 7.69159714,10.2903498 8.56510036,9.27220714 L11.7758203,12.4829271 C11.681924,12.6423813 11.6095411,12.8160708 11.5625325,13 Z M13,13.5 C13,13.2238576 13.2319336,13 13.5,13 C13.7761424,13 14,13.2319336 14,13.5 C14,13.7761424 13.7680664,14 13.5,14 C13.2238576,14 13,13.7680664 13,13.5 Z" id="Combined-Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+            </g>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/buddhist-m.svg b/data/styles/clear/style-night/symbols/buddhist-m.svg
index 5d2c988090..d14aa92db0 100644
--- a/data/styles/clear/style-night/symbols/buddhist-m.svg
+++ b/data/styles/clear/style-night/symbols/buddhist-m.svg
@@ -1,14 +1,16 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <svg width="23px" height="23px" viewBox="0 0 23 23" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
     <title>buddhist-m</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
-    <g id="POI-NIght" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="buddhist-m">
-            <ellipse id="Oval-1-Copy-41" fill-opacity="0.1" fill="#FFFFFF" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
-            <ellipse id="Oval-1-Copy-40" fill="#26160D" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
-            <path d="M11.7071068,11 L11.2928932,11 L11,11.2928932 L11,11.7071068 L11.2928932,12 L11.7071068,12 L12,11.7071068 L12,11.2928932 L11.7071068,11 Z M12,10.2928932 L12,6.02247543 C13.1428751,6.12570756 14.1849399,6.57931132 15.0184299,7.27446332 L12,10.2928932 Z M15.7254729,7.98163388 C16.4209019,8.81574479 16.8742429,9.85822064 16.9774956,11 L12.7071068,11 L15.7254729,7.98163388 Z M10.2928932,12 L6.02250443,12 C6.12575708,13.1417794 6.57909808,14.1842552 7.2745271,15.0183661 L10.2928932,12 Z M7.9815701,15.7255367 C8.81506007,16.4206887 9.85712491,16.8742924 11,16.9775246 L11,12.7071068 L7.9815701,15.7255367 Z M12.7071068,12 L16.9775246,12 C16.8742924,13.1428751 16.4206887,14.1849399 15.7255367,15.0184299 L12.7071068,12 Z M15.0183661,15.7254729 C14.1842552,16.4209019 13.1417794,16.8742429 12,16.9774956 L12,12.7071068 L15.0183661,15.7254729 Z M7.27446332,7.9815701 C6.57931132,8.81506007 6.12570756,9.85712491 6.02247543,11 L10.2928932,11 L7.27446332,7.9815701 Z M7.98163388,7.2745271 C8.81574479,6.57909808 9.85822064,6.12575708 11,6.02250443 L11,10.2928932 L7.98163388,7.2745271 Z M5.01899069,11 C5.26230288,7.80910849 7.81465417,5.2622012 11,5.01901598 L11,4 L12,4 L12,5.01899069 C15.1908915,5.26230288 17.7377988,7.81465417 17.980984,11 L19,11 L19,12 L17.9810093,12 C17.7376971,15.1908915 15.1853458,17.7377988 12,17.980984 L12,19 L11,19 L11,17.9810093 C7.80910849,17.7376971 5.2622012,15.1853458 5.01901598,12 L4,12 L4,11 L5.01899069,11 Z" id="Combined-Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+    <g id="POI-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Artboard-1" transform="translate(-354.000000, -1028.000000)">
+            <g id="buddhist-m" transform="translate(354.000000, 1028.000000)">
+                <ellipse id="Oval-1-Copy-41" fill-opacity="0.1" fill="#FFFFFF" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
+                <ellipse id="Oval-1-Copy-40" fill="#26160D" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+                <path d="M11.7071068,11 L11.2928932,11 L11,11.2928932 L11,11.7071068 L11.2928932,12 L11.7071068,12 L12,11.7071068 L12,11.2928932 L11.7071068,11 Z M12,10.2928932 L12,6.02247543 C13.1428751,6.12570756 14.1849399,6.57931132 15.0184299,7.27446332 L12,10.2928932 Z M15.7254729,7.98163388 C16.4209019,8.81574479 16.8742429,9.85822064 16.9774956,11 L12.7071068,11 L15.7254729,7.98163388 Z M10.2928932,12 L6.02250443,12 C6.12575708,13.1417794 6.57909808,14.1842552 7.2745271,15.0183661 L10.2928932,12 Z M7.9815701,15.7255367 C8.81506007,16.4206887 9.85712491,16.8742924 11,16.9775246 L11,12.7071068 L7.9815701,15.7255367 Z M12.7071068,12 L16.9775246,12 C16.8742924,13.1428751 16.4206887,14.1849399 15.7255367,15.0184299 L12.7071068,12 Z M15.0183661,15.7254729 C14.1842552,16.4209019 13.1417794,16.8742429 12,16.9774956 L12,12.7071068 L15.0183661,15.7254729 Z M7.27446332,7.9815701 C6.57931132,8.81506007 6.12570756,9.85712491 6.02247543,11 L10.2928932,11 L7.27446332,7.9815701 Z M7.98163388,7.2745271 C8.81574479,6.57909808 9.85822064,6.12575708 11,6.02250443 L11,10.2928932 L7.98163388,7.2745271 Z M5.01899069,11 C5.26230288,7.80910849 7.81465417,5.2622012 11,5.01901598 L11,4 L12,4 L12,5.01899069 C15.1908915,5.26230288 17.7377988,7.81465417 17.980984,11 L19,11 L19,12 L17.9810093,12 C17.7376971,15.1908915 15.1853458,17.7377988 12,17.980984 L12,19 L11,19 L11,17.9810093 C7.80910849,17.7376971 5.2622012,15.1853458 5.01901598,12 L4,12 L4,11 L5.01899069,11 Z" id="Combined-Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+            </g>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/buddhist-s.svg b/data/styles/clear/style-night/symbols/buddhist-s.svg
index 6061351d1a..3d4acc9018 100644
--- a/data/styles/clear/style-night/symbols/buddhist-s.svg
+++ b/data/styles/clear/style-night/symbols/buddhist-s.svg
@@ -1,14 +1,16 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <svg width="17px" height="17px" viewBox="0 0 17 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
     <title>buddhist-s</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
-    <g id="POI-NIght" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="buddhist-s">
-            <circle id="Oval-1-Copy-43" fill-opacity="0.1" fill="#FFFFFF" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-42" fill="#26160D" cx="8.5" cy="8.5" r="7.5"></circle>
-            <path d="M12.0150051,5.69210173 C12.5332155,6.3397729 12.8762964,7.13324469 12.9724363,8 L14,8 L14,9 L12.9724702,9 C12.8763474,9.86753257 12.533093,10.6607387 12.0150681,11.3079613 L12.0355339,11.3284271 L11.3284271,12.0355339 L11.3078983,12.0150051 C10.6602271,12.5332155 9.86675531,12.8762964 9,12.9724363 L9,14 L8,14 L8,12.9724702 C7.13246743,12.8763474 6.33926126,12.533093 5.69203871,12.0150681 L5.67157288,12.0355339 L4.96446609,11.3284271 L4.98499495,11.3078983 C4.46678451,10.6602271 4.12370357,9.86675531 4.0275637,9 L3,9 L3,8 L4.02752977,8 C4.12365258,7.13246743 4.46690705,6.33926126 4.98493192,5.69203871 L4.96446609,5.67157288 L5.67157288,4.96446609 L5.69210173,4.98499495 C6.3397729,4.46678451 7.13324469,4.12370357 8,4.0275637 L8,3 L9,3 L9,4.02752977 C9.86753257,4.12365258 10.6607387,4.46690705 11.3079613,4.98493192 L11.3284271,4.96446609 L12.0355339,5.67157288 L12.0150051,5.69210173 Z M8.70710678,8 L8.29289322,8 L8,8.29289322 L8,8.70710678 L8.29289322,9 L8.70710678,9 L9,8.70710678 L9,8.29289322 L8.70710678,8 Z M9,7.29289322 L9,5.03552745 C9.59266786,5.12049313 10.1374388,5.3542309 10.5954237,5.69746952 L9,7.29289322 Z M11.3024689,6.40463784 C11.6458093,6.86290133 11.8794539,7.40780659 11.9644319,8 L9.70710678,8 L11.3024689,6.40463784 Z M7.29289322,9 L5.03556805,9 C5.12054612,9.59219341 5.35419071,10.1370987 5.69753106,10.5953622 L7.29289322,9 Z M6.40457631,11.3025305 C6.8625612,11.6457691 7.40733214,11.8795069 8,11.9644726 L8,9.70710678 L6.40457631,11.3025305 Z M9.70710678,9 L11.9644726,9 C11.8795069,9.59266786 11.6457691,10.1374388 11.3025305,10.5954237 L9.70710678,9 Z M10.5953622,11.3024689 C10.1370987,11.6458093 9.59219341,11.8794539 9,11.9644319 L9,9.70710678 L10.5953622,11.3024689 Z M5.69746952,6.40457631 C5.3542309,6.8625612 5.12049313,7.40733214 5.03552745,8 L7.29289322,8 L5.69746952,6.40457631 Z M6.40463784,5.69753106 C6.86290133,5.35419071 7.40780659,5.12054612 8,5.03556805 L8,7.29289322 L6.40463784,5.69753106 Z" id="Combined-Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+    <g id="POI-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Artboard-1" transform="translate(-387.000000, -1031.000000)">
+            <g id="buddhist-s" transform="translate(387.000000, 1031.000000)">
+                <circle id="Oval-1-Copy-43" fill-opacity="0.1" fill="#FFFFFF" cx="8.5" cy="8.5" r="8.5"></circle>
+                <circle id="Oval-1-Copy-42" fill="#26160D" cx="8.5" cy="8.5" r="7.5"></circle>
+                <path d="M12.0150051,5.69210173 C12.5332155,6.3397729 12.8762964,7.13324469 12.9724363,8 L14,8 L14,9 L12.9724702,9 C12.8763474,9.86753257 12.533093,10.6607387 12.0150681,11.3079613 L12.0355339,11.3284271 L11.3284271,12.0355339 L11.3078983,12.0150051 C10.6602271,12.5332155 9.86675531,12.8762964 9,12.9724363 L9,14 L8,14 L8,12.9724702 C7.13246743,12.8763474 6.33926126,12.533093 5.69203871,12.0150681 L5.67157288,12.0355339 L4.96446609,11.3284271 L4.98499495,11.3078983 C4.46678451,10.6602271 4.12370357,9.86675531 4.0275637,9 L3,9 L3,8 L4.02752977,8 C4.12365258,7.13246743 4.46690705,6.33926126 4.98493192,5.69203871 L4.96446609,5.67157288 L5.67157288,4.96446609 L5.69210173,4.98499495 C6.3397729,4.46678451 7.13324469,4.12370357 8,4.0275637 L8,3 L9,3 L9,4.02752977 C9.86753257,4.12365258 10.6607387,4.46690705 11.3079613,4.98493192 L11.3284271,4.96446609 L12.0355339,5.67157288 L12.0150051,5.69210173 Z M8.70710678,8 L8.29289322,8 L8,8.29289322 L8,8.70710678 L8.29289322,9 L8.70710678,9 L9,8.70710678 L9,8.29289322 L8.70710678,8 Z M9,7.29289322 L9,5.03552745 C9.59266786,5.12049313 10.1374388,5.3542309 10.5954237,5.69746952 L9,7.29289322 Z M11.3024689,6.40463784 C11.6458093,6.86290133 11.8794539,7.40780659 11.9644319,8 L9.70710678,8 L11.3024689,6.40463784 Z M7.29289322,9 L5.03556805,9 C5.12054612,9.59219341 5.35419071,10.1370987 5.69753106,10.5953622 L7.29289322,9 Z M6.40457631,11.3025305 C6.8625612,11.6457691 7.40733214,11.8795069 8,11.9644726 L8,9.70710678 L6.40457631,11.3025305 Z M9.70710678,9 L11.9644726,9 C11.8795069,9.59266786 11.6457691,10.1374388 11.3025305,10.5954237 L9.70710678,9 Z M10.5953622,11.3024689 C10.1370987,11.6458093 9.59219341,11.8794539 9,11.9644319 L9,9.70710678 L10.5953622,11.3024689 Z M5.69746952,6.40457631 C5.3542309,6.8625612 5.12049313,7.40733214 5.03552745,8 L7.29289322,8 L5.69746952,6.40457631 Z M6.40463784,5.69753106 C6.86290133,5.35419071 7.40780659,5.12054612 8,5.03556805 L8,7.29289322 L6.40463784,5.69753106 Z" id="Combined-Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+            </g>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/cafe-l.svg b/data/styles/clear/style-night/symbols/cafe-l.svg
index 6282750e38..c32171863f 100644
--- a/data/styles/clear/style-night/symbols/cafe-l.svg
+++ b/data/styles/clear/style-night/symbols/cafe-l.svg
@@ -1,14 +1,16 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <svg width="28px" height="27px" viewBox="0 0 28 27" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
     <title>cafe-l</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
-    <g id="POI-NIght" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="cafe-l" transform="translate(0.500000, 0.000000)">
-            <circle id="Oval-1-Copy-39" fill-opacity="0.1" fill="#FFFFFF" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#332714" cx="13.5" cy="13.5" r="12.5"></circle>
-            <path d="M8,7 C7.44599,7 7,7.446 7,8 L7,17 C7,17.554 7.44599,18 8,18 L19,18 C19.55401,18 20,17.554 20,17 L20,16 L20.5,16 C21,16 21,15.5 21,15.5 L21,15 L22,15 C23,15 24,14 24,13 L24,12 L24,10 C24,9.5 23.5,9 23,9 L20,9 L20,8 C20,7.446 19.55401,7 19,7 L8,7 Z M20,10 L22.5,10 C23,10 23,10.5 23,10.5 L23,13 C23,13.5 22.5,14 22,14 L21,14 L20,14 L20,10 Z M5,19 L6,20 L7,21 L20,21 L21,20 L22,19 L5,19 Z" id="rect9826-2-1" fill-opacity="0.7" fill="#FFFFFF"></path>
+    <g id="POI-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Artboard-1" transform="translate(-137.000000, -545.000000)">
+            <g id="cafe-l" transform="translate(137.500000, 545.000000)">
+                <circle id="Oval-1" fill-opacity="0.1" fill="#FFFFFF" cx="13.5" cy="13.5" r="13.5"></circle>
+                <circle id="Oval-1" fill="#332714" cx="13.5" cy="13.5" r="12.5"></circle>
+                <path d="M18,8 L18.0197754,7 L7,7 L7,14 C7,15.6575 8.3425,17 10,17 L15,17 C16.6444385,17 18.0197754,15.7890015 18,15.0021973 L18.9997289,15.0021973 C20.105729,15.0021973 21.0023193,14.1153641 21.0023193,12.9956486 L21.0023193,10.0065487 C21.0023193,8.89836245 20.1015245,8 18.9997289,8 L18,8 Z M18,13.5 L18,9.5 L19.5,9.5 L19.5,13.5 L18,13.5 Z M8,20 L17,20 L19,18 L6,18 L8,20 Z" id="Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+            </g>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/cafe-m.svg b/data/styles/clear/style-night/symbols/cafe-m.svg
index ba2e279440..4fa18270cf 100644
--- a/data/styles/clear/style-night/symbols/cafe-m.svg
+++ b/data/styles/clear/style-night/symbols/cafe-m.svg
@@ -1,14 +1,16 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <svg width="24px" height="23px" viewBox="0 0 24 23" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
     <title>cafe-m</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
-    <g id="POI-NIght" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="cafe-m" transform="translate(0.500000, 0.000000)">
-            <ellipse id="Oval-1-Copy-41" fill-opacity="0.1" fill="#FFFFFF" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
-            <ellipse id="Oval-1-Copy-40" fill="#332714" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
-            <path d="M7,6.3622 C6.5,6.3622 6,6.8622 6,7.3622 L6,13.3622 C6,13.8622 6.5,14.3622 7,14.3622 L14,14.3622 C14.40011,14.3622 15,13.8622 15,13.3622 L15,12.9178 L15.36111,12.9178 C15.72222,12.9178 15.72222,12.5567 15.72222,12.5567 L15.72222,12.1956 L16.16667,12.1956 C16.88889,12.1956 18,11.8622 18,10.7512 L18,8.8622 C18,8.3622 17.75,7.8622 17.25,7.8622 L15,7.8622 L15,7.3622 C15,6.8622 14.5,6.3622 14,6.3622 L7,6.3622 Z M15,8.5845 L16.88889,8.5845 C17.25,8.5845 17.25,8.8622 17.25,8.8622 L17.25,10.7512 C17.25,11.3232 16.52775,11.3576 16.16667,11.3622 L15.72222,11.3622 L15,11.3622 L15,8.5845 Z M5,15.3622 L7,17.3622 L14,17.3622 L16,15.3622 L5,15.3622 Z" id="rect9826-2-1-5-9" fill-opacity="0.7" fill="#FFFFFF"></path>
+    <g id="POI-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Artboard-1" transform="translate(-174.000000, -547.000000)">
+            <g id="cafe-m" transform="translate(174.500000, 547.000000)">
+                <ellipse id="Oval-1" fill-opacity="0.1" fill="#FFFFFF" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
+                <ellipse id="Oval-1" fill="#332714" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+                <path d="M14.9976807,7 L14.9976807,6 L5.99768066,6 L5.99768066,12.0657288 C5.99768066,13.4679565 7.00598147,14.5 8.49768066,14.5 L12.4976807,14.5 C14.0151369,14.5 14.9976807,13.3682861 14.9976807,13 L16.7441423,13 C17.4377333,13 18,12.4462891 18,11.7567961 L18,8.24320388 C18,7.55660134 17.4493284,7 16.7441423,7 L14.9976807,7 Z M14.9976807,11.75 L14.9976807,8.25 L16.7476807,8.25 L16.7476807,11.75 L14.9976807,11.75 Z M6.49768066,17 L14.4976807,17 L16,15.5 L5,15.5 L6.49768066,17 Z" id="Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+            </g>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/cafe-s.svg b/data/styles/clear/style-night/symbols/cafe-s.svg
index 454392b9b5..719300b9d2 100644
--- a/data/styles/clear/style-night/symbols/cafe-s.svg
+++ b/data/styles/clear/style-night/symbols/cafe-s.svg
@@ -1,14 +1,16 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <svg width="18px" height="17px" viewBox="0 0 18 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
     <title>cafe-s</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
-    <g id="POI-NIght" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="cafe-s" transform="translate(0.500000, 0.000000)">
-            <circle id="Oval-1-Copy-43" fill-opacity="0.1" fill="#FFFFFF" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-42" fill="#332714" cx="8.5" cy="8.5" r="7.5"></circle>
-            <path d="M5.5,5 C5.22299,5 5,5.223 5,5.5 L5,10 C5,10.277 5.22299,10.5 5.5,10.5 L11.5,10.5 C11.777,10.5 12,10.277 12,10 L12,9.5 L12.25,9.5 C12.5,9.5 12.5,9.25 12.5,9.25 L12.5,9 L13,9 C13.5,9 14,8.5 14,8 L14,7.5 L14,6.5 C14,6.25 13.75,6 13.5,6 L12,6 L12,5.5 C12,5.223 11.777,5 11.5,5 L5.5,5 Z M12,6.5 L13.25,6.5 C13.5,6.5 13.5,6.75 13.5,6.75 L13.5,8 C13.5,8.25 13.25,8.5 13,8.5 L12.5,8.5 L12,8.5 L12,6.5 Z M4,11 L6,12 L11,12 L13,11 L4,11 Z" id="rect9826-2-1-5" fill-opacity="0.7" fill="#FFFFFF"></path>
+    <g id="POI-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Artboard-1" transform="translate(-208.000000, -550.000000)">
+            <g id="cafe-s" transform="translate(208.500000, 550.000000)">
+                <circle id="Oval-1" fill-opacity="0.1" fill="#FFFFFF" cx="8.5" cy="8.5" r="8.5"></circle>
+                <circle id="Oval-1" fill="#332714" cx="8.5" cy="8.5" r="7.5"></circle>
+                <path d="M11,5.5 L11,5 L5,5 L5,8.19935069 C5,9.49127197 5.60968015,9.99907255 6.5,9.99907255 L9.5,9.99907255 C10.0395508,9.99907255 11,9.6383667 11,9 L12,9 C12.5522847,9 13,8.54243612 13,8.00640249 L13,6.49359751 C13,5.94484876 12.5561352,5.5 12,5.5 L11,5.5 Z M11,8.25 L11,6.25 L12.25,6.25 L12.25,8.25 L11,8.25 Z M5,12 L11,12 L12,11 L4,11 L5,12 Z" id="Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+            </g>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/car-part-l.svg b/data/styles/clear/style-night/symbols/car-part-l.svg
index 767b4bba05..e3de1374a3 100644
--- a/data/styles/clear/style-night/symbols/car-part-l.svg
+++ b/data/styles/clear/style-night/symbols/car-part-l.svg
@@ -1,26 +1,28 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <svg width="27px" height="27px" viewBox="0 0 27 27" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
     <title>car-part-l</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
-    <g id="POI-NIght" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="car-part-l">
-            <g id="POI">
-                <g>
-                    <g id="car-repair-l">
-                        <g id="Layer_2">
-                            <path d="M13.5,27 C6.056,27 0,20.943 0,13.5 C0,6.057 6.056,0 13.5,0 C20.944,0 27,6.057 27,13.5 C27,20.943 20.944,27 13.5,27 L13.5,27 L13.5,27 Z" id="Shape" fill-opacity="0.1" fill="#FFFFFF"></path>
-                            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 L26,13.5 Z" id="Shape" fill="#252522"></path>
-                            <g id="noun_79131_cc" transform="translate(6.000000, 4.000000)" fill="#FFFFFF" fill-opacity="0.7">
-                                <g id="Group">
-                                    <g id="Shape">
-                                        <path d="M0.208021843,2 C0.593800154,1.11704761 1.47484048,0.5 2.5,0.5 C3.52515952,0.5 4.40619985,1.11704761 4.79197816,2 L10.2080218,2 C10.5938002,1.11704761 11.4748405,0.5 12.5,0.5 C13.5251595,0.5 14.4061998,1.11704761 14.7919782,2 L12,2 L12,4 L14.7919782,4 C14.4061998,4.88295239 13.5251595,5.5 12.5,5.5 C11.4748405,5.5 10.5938002,4.88295239 10.2080218,4 L4.79197816,4 C4.40619985,4.88295239 3.52515952,5.5 2.5,5.5 C1.47484048,5.5 0.593800154,4.88295239 0.208021843,4 L3,4 L3,2 L0.208021843,2 Z M14,11 L12.5,7 C12.312,6.5 12,6 11,6 L4,6 C3,6 2.688,6.5 2.5,7 L1,11 L0,12 L0,17 L2,17 L2,18 C2,18.5 2.5,19 3,19 L4,19 C4.5,19 5,18.5 5,18 L5,17 L10,17 L10,18 C10,18.5 10.5,19 11,19 L12,19 C12.5,19 13,18.5 13,18 L13,17 L15,17 L15,12 L14,11 Z M4,15 L2,15 L2,13 L4,13 L4,15 Z M3.5,11 L4.5,8 L10.5,8 L11.5,11 L3.5,11 Z M13,15 L11,15 L11,13 L13,13 L13,15 Z" id="Combined-Shape"></path>
+    <g id="POI-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Artboard-1" transform="translate(-677.000000, -285.000000)">
+            <g id="car-part-l" transform="translate(677.000000, 285.000000)">
+                <g id="POI">
+                    <g>
+                        <g id="car-repair-l">
+                            <g id="Layer_2">
+                                <path d="M13.5,27 C6.056,27 0,20.943 0,13.5 C0,6.057 6.056,0 13.5,0 C20.944,0 27,6.057 27,13.5 C27,20.943 20.944,27 13.5,27 L13.5,27 L13.5,27 Z" id="Shape" fill-opacity="0.1" fill="#FFFFFF"></path>
+                                <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 L26,13.5 Z" id="Shape" fill="#252522"></path>
+                                <g id="noun_79131_cc" transform="translate(6.000000, 4.000000)" fill="#FFFFFF" fill-opacity="0.7">
+                                    <g id="Group">
+                                        <g id="Shape">
+                                            <path d="M0.208021843,2 C0.593800154,1.11704761 1.47484048,0.5 2.5,0.5 C3.52515952,0.5 4.40619985,1.11704761 4.79197816,2 L10.2080218,2 C10.5938002,1.11704761 11.4748405,0.5 12.5,0.5 C13.5251595,0.5 14.4061998,1.11704761 14.7919782,2 L12,2 L12,4 L14.7919782,4 C14.4061998,4.88295239 13.5251595,5.5 12.5,5.5 C11.4748405,5.5 10.5938002,4.88295239 10.2080218,4 L4.79197816,4 C4.40619985,4.88295239 3.52515952,5.5 2.5,5.5 C1.47484048,5.5 0.593800154,4.88295239 0.208021843,4 L3,4 L3,2 L0.208021843,2 Z M14,11 L12.5,7 C12.312,6.5 12,6 11,6 L4,6 C3,6 2.688,6.5 2.5,7 L1,11 L0,12 L0,17 L2,17 L2,18 C2,18.5 2.5,19 3,19 L4,19 C4.5,19 5,18.5 5,18 L5,17 L10,17 L10,18 C10,18.5 10.5,19 11,19 L12,19 C12.5,19 13,18.5 13,18 L13,17 L15,17 L15,12 L14,11 Z M4,15 L2,15 L2,13 L4,13 L4,15 Z M3.5,11 L4.5,8 L10.5,8 L11.5,11 L3.5,11 Z M13,15 L11,15 L11,13 L13,13 L13,15 Z" id="Combined-Shape"></path>
+                                        </g>
                                     </g>
                                 </g>
                             </g>
+                            <g id="Layer_1" transform="translate(6.000000, 10.000000)"></g>
                         </g>
-                        <g id="Layer_1" transform="translate(6.000000, 10.000000)"></g>
                     </g>
                 </g>
             </g>
diff --git a/data/styles/clear/style-night/symbols/car-part-m.svg b/data/styles/clear/style-night/symbols/car-part-m.svg
index 8d4073536a..594de1428b 100644
--- a/data/styles/clear/style-night/symbols/car-part-m.svg
+++ b/data/styles/clear/style-night/symbols/car-part-m.svg
@@ -1,14 +1,16 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <svg width="23px" height="23px" viewBox="0 0 23 23" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
     <title>car-part-m</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
-    <g id="POI-NIght" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="car-part-m">
-            <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" fill-opacity="0.1" fill="#FFFFFF"></path>
-            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#252522"></path>
-            <path d="M17.968,12 L16.471,7.998 C16.284,7.499 15.973,7 14.974,7 L8.027,7 C7.028,7 6.716,7.499 6.53,7.998 L5.032,12 L4,13 L4,18 L6,18 L6,18.975 C6,19.473 6.499,19.973 6.998,19.973 L8,19.973 C8.499,19.973 8.998,19.473 8.998,18.975 L8.998,18 L14.002,18 L14.002,18.975 C14.002,19.473 14.501,19.973 15,19.973 L16.002,19.973 C16.501,19.973 17,19.473 17,18.975 L17,18 L19,18 L19,13 L17.968,12 L17.968,12 Z M8.525,9 L14.474,9 L15.472,12 L7.527,12 L8.525,9 L8.525,9 Z M8.2,15.5 C8.2,15.886 7.886,16.2 7.5,16.2 L6.5,16.2 C6.114,16.2 5.8,15.886 5.8,15.5 L5.8,14.5 C5.8,14.114 6.114,13.8 6.5,13.8 L7.5,13.8 C7.886,13.8 8.2,14.114 8.2,14.5 L8.2,15.5 L8.2,15.5 Z M6.08474107,4 C6.28934383,3.41740381 6.84233723,3 7.5,3 C8.15395881,3 8.710174,3.41489114 8.91544879,4 L14.0847411,4 C14.2893438,3.41740381 14.8423372,3 15.5,3 C16.1539588,3 16.710174,3.41489114 16.9154488,4 L15,4 L15,5 L16.9152589,5 C16.7106562,5.58259619 16.1576628,6 15.5,6 C14.8460412,6 14.289826,5.58510886 14.0845512,5 L8.91525893,5 C8.71065617,5.58259619 8.15766277,6 7.5,6 C6.84604119,6 6.289826,5.58510886 6.08455121,5 L8,5 L8,4 L6.08474107,4 Z M17.2,15.5 C17.2,15.886 16.886,16.2 16.5,16.2 L15.5,16.2 C15.114,16.2 14.8,15.886 14.8,15.5 L14.8,14.5 C14.8,14.114 15.114,13.8 15.5,13.8 L16.5,13.8 C16.886,13.8 17.2,14.114 17.2,14.5 L17.2,15.5 Z" id="Combined-Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+    <g id="POI-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Artboard-1" transform="translate(-714.000000, -287.000000)">
+            <g id="car-part-m" transform="translate(714.000000, 287.000000)">
+                <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" fill-opacity="0.1" fill="#FFFFFF"></path>
+                <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#252522"></path>
+                <path d="M17.968,12 L16.471,7.998 C16.284,7.499 15.973,7 14.974,7 L8.027,7 C7.028,7 6.716,7.499 6.53,7.998 L5.032,12 L4,13 L4,18 L6,18 L6,18.975 C6,19.473 6.499,19.973 6.998,19.973 L8,19.973 C8.499,19.973 8.998,19.473 8.998,18.975 L8.998,18 L14.002,18 L14.002,18.975 C14.002,19.473 14.501,19.973 15,19.973 L16.002,19.973 C16.501,19.973 17,19.473 17,18.975 L17,18 L19,18 L19,13 L17.968,12 L17.968,12 Z M8.525,9 L14.474,9 L15.472,12 L7.527,12 L8.525,9 L8.525,9 Z M8.2,15.5 C8.2,15.886 7.886,16.2 7.5,16.2 L6.5,16.2 C6.114,16.2 5.8,15.886 5.8,15.5 L5.8,14.5 C5.8,14.114 6.114,13.8 6.5,13.8 L7.5,13.8 C7.886,13.8 8.2,14.114 8.2,14.5 L8.2,15.5 L8.2,15.5 Z M6.08474107,4 C6.28934383,3.41740381 6.84233723,3 7.5,3 C8.15395881,3 8.710174,3.41489114 8.91544879,4 L14.0847411,4 C14.2893438,3.41740381 14.8423372,3 15.5,3 C16.1539588,3 16.710174,3.41489114 16.9154488,4 L15,4 L15,5 L16.9152589,5 C16.7106562,5.58259619 16.1576628,6 15.5,6 C14.8460412,6 14.289826,5.58510886 14.0845512,5 L8.91525893,5 C8.71065617,5.58259619 8.15766277,6 7.5,6 C6.84604119,6 6.289826,5.58510886 6.08455121,5 L8,5 L8,4 L6.08474107,4 Z M17.2,15.5 C17.2,15.886 16.886,16.2 16.5,16.2 L15.5,16.2 C15.114,16.2 14.8,15.886 14.8,15.5 L14.8,14.5 C14.8,14.114 15.114,13.8 15.5,13.8 L16.5,13.8 C16.886,13.8 17.2,14.114 17.2,14.5 L17.2,15.5 Z" id="Combined-Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+            </g>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/car-part-s.svg b/data/styles/clear/style-night/symbols/car-part-s.svg
new file mode 100644
index 0000000000..9bc040c720
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/car-part-s.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="17px" height="17px" viewBox="0 0 17 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
+    <title>car-part-s</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="POI-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Artboard-1" transform="translate(-747.000000, -290.000000)">
+            <g id="car-part-s" transform="translate(747.000000, 290.000000)">
+                <path d="M8.5,17 C3.813,17 0,13.187 0,8.5 C0,3.813 3.813,0 8.5,0 C13.187,0 17,3.813 17,8.5 C17,13.187 13.187,17 8.5,17 L8.5,17 Z" id="Shape" fill-opacity="0.1" fill="#FFFFFF"></path>
+                <ellipse id="Oval" fill="#252522" cx="8.5" cy="8.5" rx="7.5" ry="7.5"></ellipse>
+                <path d="M12.452,9.249 L11.66,6.528 C11.561,6.264 11.396,6 10.867,6 L6.131,6 C5.602,6 5.437,6.264 5.338,6.528 L4.546,9.249 L4,9.779 L4,12.955 L5,12.955 L5,13.471 C5,13.735 5.265,13.999 5.529,13.999 L6.472,13.999 C6.736,13.999 7,13.734 7,13.471 L7,12.955 L10,12.955 L10,13.471 C10,13.735 10.264,13.999 10.528,13.999 L11.471,13.999 C11.735,13.999 12,13.734 12,13.471 L12,12.955 L13,12.955 L13,9.779 L12.452,9.249 L12.452,9.249 Z M5.998,11.999 L4.998,11.999 L4.998,10.999 L5.998,10.999 L5.998,11.999 L5.998,11.999 Z M5.865,8.999 L6.394,6.999 L10.602,6.999 L11.131,8.999 L5.865,8.999 L5.865,8.999 Z M4.08535285,4 C4.29127106,4.58259619 4.84689059,5 5.5,5 C6.15310941,5 6.70872894,4.58259619 6.91464715,4 L10.0853529,4 C10.2912711,4.58259619 10.8468906,5 11.5,5 C12.1531094,5 12.7087289,4.58259619 12.9146471,4 L11,4 L11,3 L12.9146471,3 C12.7087289,2.41740381 12.1531094,2 11.5,2 C10.8468906,2 10.2912711,2.41740381 10.0853529,3 L6.91464715,3 C6.70872894,2.41740381 6.15310941,2 5.5,2 C4.84689059,2 4.29127106,2.41740381 4.08535285,3 L6.08535285,3 L6.08535285,4 L4.08535285,4 Z M11.998,11.999 L10.998,11.999 L10.998,10.999 L11.998,10.999 L11.998,11.999 Z" id="Combined-Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/car-repair-l.svg b/data/styles/clear/style-night/symbols/car-repair-l.svg
index e4ebcad579..0691d75317 100644
--- a/data/styles/clear/style-night/symbols/car-repair-l.svg
+++ b/data/styles/clear/style-night/symbols/car-repair-l.svg
@@ -1,17 +1,19 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <svg width="27px" height="27px" viewBox="0 0 27 27" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
     <title>car-repair-l</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
-    <g id="POI-NIght" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="car-repair-l">
-            <g id="Layer_2">
-                <path d="M13.5,27 C6.056,27 0,20.943 0,13.5 C0,6.057 6.056,0 13.5,0 C20.944,0 27,6.057 27,13.5 C27,20.943 20.944,27 13.5,27 L13.5,27 Z" id="Shape" fill-opacity="0.1" fill="#FFFFFF"></path>
-                <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#252522"></path>
-            </g>
-            <g id="Layer_1" transform="translate(6.000000, 5.000000)" fill-opacity="0.7" fill="#FFFFFF">
-                <path d="M0,16 L6,16 L6,18 L9,18 L9,16 L15,16 L15,14 L0,14 L0,16 L0,16 Z M14,5 L12.5,1 C12.312,0.5 12,0 11,0 L4,0 C3,0 2.688,0.5 2.5,1 L1,5 L0,6 L0,11 L2,11 L2,12 C2,12.5 2.5,13 3,13 L4,13 C4.5,13 5,12.5 5,12 L5,11 L10,11 L10,12 C10,12.5 10.5,13 11,13 L12,13 C12.5,13 13,12.5 13,12 L13,11 L15,11 L15,6 L14,5 L14,5 Z M4,9 L2,9 L2,7 L4,7 L4,9 L4,9 Z M3.5,5 L4.5,2 L10.5,2 L11.5,5 L3.5,5 L3.5,5 Z M13,9 L11,9 L11,7 L13,7 L13,9 L13,9 Z" id="Shape"></path>
+    <g id="POI-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Artboard-1" transform="translate(-677.000000, -137.000000)">
+            <g id="car-repair-l" transform="translate(677.000000, 137.000000)">
+                <g id="Layer_2">
+                    <path d="M13.5,27 C6.056,27 0,20.943 0,13.5 C0,6.057 6.056,0 13.5,0 C20.944,0 27,6.057 27,13.5 C27,20.943 20.944,27 13.5,27 L13.5,27 Z" id="Shape" fill-opacity="0.1" fill="#FFFFFF"></path>
+                    <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#252522"></path>
+                </g>
+                <g id="Layer_1" transform="translate(6.000000, 5.000000)" fill-opacity="0.7" fill="#FFFFFF">
+                    <path d="M0,16 L6,16 L6,18 L9,18 L9,16 L15,16 L15,14 L0,14 L0,16 L0,16 Z M14,5 L12.5,1 C12.312,0.5 12,0 11,0 L4,0 C3,0 2.688,0.5 2.5,1 L1,5 L0,6 L0,11 L2,11 L2,12 C2,12.5 2.5,13 3,13 L4,13 C4.5,13 5,12.5 5,12 L5,11 L10,11 L10,12 C10,12.5 10.5,13 11,13 L12,13 C12.5,13 13,12.5 13,12 L13,11 L15,11 L15,6 L14,5 L14,5 Z M4,9 L2,9 L2,7 L4,7 L4,9 L4,9 Z M3.5,5 L4.5,2 L10.5,2 L11.5,5 L3.5,5 L3.5,5 Z M13,9 L11,9 L11,7 L13,7 L13,9 L13,9 Z" id="Shape"></path>
+                </g>
             </g>
         </g>
     </g>
diff --git a/data/styles/clear/style-night/symbols/car-repair-m.svg b/data/styles/clear/style-night/symbols/car-repair-m.svg
index c383352666..33ac6b94b2 100644
--- a/data/styles/clear/style-night/symbols/car-repair-m.svg
+++ b/data/styles/clear/style-night/symbols/car-repair-m.svg
@@ -1,17 +1,19 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <svg width="23px" height="23px" viewBox="0 0 23 23" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
     <title>car-repair-m</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
-    <g id="POI-NIght" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="car-repair-m">
-            <g id="Layer_2">
-                <path d="M11.5,23 C5.159,23 0,17.842 0,11.5 C0,5.158 5.159,0 11.5,0 C17.841,0 23,5.158 23,11.5 C23,17.842 17.841,23 11.5,23 L11.5,23 Z" id="Shape" fill-opacity="0.1" fill="#FFFFFF"></path>
-                <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#252522"></path>
-            </g>
-            <g id="Layer_1" transform="translate(6.000000, 5.000000)" fill-opacity="0.7" fill="#FFFFFF">
-                <path d="M0,13 L11,13 L11,11 L0,11 L0,13 L0,13 Z M10,4 L8.224,0.447 C8.1,0.2 7.776,0 7.5,0 L3.5,0 C3.224,0 2.9,0.2 2.776,0.447 L1,4 L0,5 L0,8 L1,8 L1,9.5 C1,9.776 1.224,10 1.5,10 L2.5,10 C2.776,10 3,9.776 3,9.5 L3,8 L8,8 L8,9.5 C8,9.776 8.224,10 8.5,10 L9.5,10 C9.776,10 10,9.776 10,9.5 L10,8 L11,8 L11,5 L10,4 L10,4 Z M2,7 L1,7 L1,6 L2,6 L2,7 L2,7 Z M2.118,4 L3.12,2 L7.78,2 L8.882,4 L2.118,4 L2.118,4 Z M10,7 L9,7 L9,6 L10,6 L10,7 L10,7 Z" id="Shape"></path>
+    <g id="POI-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Artboard-1" transform="translate(-714.000000, -139.000000)">
+            <g id="car-repair-m" transform="translate(714.000000, 139.000000)">
+                <g id="Layer_2">
+                    <path d="M11.5,23 C5.159,23 0,17.842 0,11.5 C0,5.158 5.159,0 11.5,0 C17.841,0 23,5.158 23,11.5 C23,17.842 17.841,23 11.5,23 L11.5,23 Z" id="Shape" fill-opacity="0.1" fill="#FFFFFF"></path>
+                    <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#252522"></path>
+                </g>
+                <g id="Layer_1" transform="translate(6.000000, 5.000000)" fill-opacity="0.7" fill="#FFFFFF">
+                    <path d="M0,13 L11,13 L11,11 L0,11 L0,13 L0,13 Z M10,4 L8.224,0.447 C8.1,0.2 7.776,0 7.5,0 L3.5,0 C3.224,0 2.9,0.2 2.776,0.447 L1,4 L0,5 L0,8 L1,8 L1,9.5 C1,9.776 1.224,10 1.5,10 L2.5,10 C2.776,10 3,9.776 3,9.5 L3,8 L8,8 L8,9.5 C8,9.776 8.224,10 8.5,10 L9.5,10 C9.776,10 10,9.776 10,9.5 L10,8 L11,8 L11,5 L10,4 L10,4 Z M2,7 L1,7 L1,6 L2,6 L2,7 L2,7 Z M2.118,4 L3.12,2 L7.78,2 L8.882,4 L2.118,4 L2.118,4 Z M10,7 L9,7 L9,6 L10,6 L10,7 L10,7 Z" id="Shape"></path>
+                </g>
             </g>
         </g>
     </g>
diff --git a/data/styles/clear/style-night/symbols/car-repair-s.svg b/data/styles/clear/style-night/symbols/car-repair-s.svg
index d7d48b8306..53b6e04293 100644
--- a/data/styles/clear/style-night/symbols/car-repair-s.svg
+++ b/data/styles/clear/style-night/symbols/car-repair-s.svg
@@ -1,14 +1,16 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <svg width="17px" height="17px" viewBox="0 0 17 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
     <title>car-repair-s</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
-    <g id="POI-NIght" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="car-repair-s">
-            <path d="M8.5,17 C3.813,17 0,13.187 0,8.5 C0,3.813 3.813,0 8.5,0 C13.187,0 17,3.813 17,8.5 C17,13.187 13.187,17 8.5,17 L8.5,17 Z" id="Shape" fill-opacity="0.1" fill="#FFFFFF"></path>
-            <ellipse id="Oval" fill="#252522" cx="8.5" cy="8.5" rx="7.5" ry="7.5"></ellipse>
-            <path d="M12.452,6.249 L11.66,3.528 C11.561,3.264 11.396,3 10.867,3 L6.131,3 C5.602,3 5.437,3.264 5.338,3.528 L4.546,6.249 L4,6.779 L4,9.955 L5,9.955 L5,10.471 C5,10.735 5.265,10.999 5.529,10.999 L6.472,10.999 C6.736,10.999 7,10.734 7,10.471 L7,9.955 L10,9.955 L10,10.471 C10,10.735 10.264,10.999 10.528,10.999 L11.471,10.999 C11.735,10.999 12,10.734 12,10.471 L12,9.955 L13,9.955 L13,6.779 L12.452,6.249 L12.452,6.249 Z M5.998,8.999 L4.998,8.999 L4.998,7.999 L5.998,7.999 L5.998,8.999 L5.998,8.999 Z M5.865,5.999 L6.394,3.999 L10.602,3.999 L11.131,5.999 L5.865,5.999 L5.865,5.999 Z M11.998,8.999 L10.998,8.999 L10.998,7.999 L11.998,7.999 L11.998,8.999 Z M4,12 L13,12 L13,13 L4,13 L4,12 Z" id="Combined-Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+    <g id="POI-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Artboard-1" transform="translate(-747.000000, -142.000000)">
+            <g id="car-repair-s" transform="translate(747.000000, 142.000000)">
+                <path d="M8.5,17 C3.813,17 0,13.187 0,8.5 C0,3.813 3.813,0 8.5,0 C13.187,0 17,3.813 17,8.5 C17,13.187 13.187,17 8.5,17 L8.5,17 Z" id="Shape" fill-opacity="0.1" fill="#FFFFFF"></path>
+                <ellipse id="Oval" fill="#252522" cx="8.5" cy="8.5" rx="7.5" ry="7.5"></ellipse>
+                <path d="M12.452,6.249 L11.66,3.528 C11.561,3.264 11.396,3 10.867,3 L6.131,3 C5.602,3 5.437,3.264 5.338,3.528 L4.546,6.249 L4,6.779 L4,9.955 L5,9.955 L5,10.471 C5,10.735 5.265,10.999 5.529,10.999 L6.472,10.999 C6.736,10.999 7,10.734 7,10.471 L7,9.955 L10,9.955 L10,10.471 C10,10.735 10.264,10.999 10.528,10.999 L11.471,10.999 C11.735,10.999 12,10.734 12,10.471 L12,9.955 L13,9.955 L13,6.779 L12.452,6.249 L12.452,6.249 Z M5.998,8.999 L4.998,8.999 L4.998,7.999 L5.998,7.999 L5.998,8.999 L5.998,8.999 Z M5.865,5.999 L6.394,3.999 L10.602,3.999 L11.131,5.999 L5.865,5.999 L5.865,5.999 Z M11.998,8.999 L10.998,8.999 L10.998,7.999 L11.998,7.999 L11.998,8.999 Z M4,12 L13,12 L13,13 L4,13 L4,12 Z" id="Combined-Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+            </g>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/car-wash-l.svg b/data/styles/clear/style-night/symbols/car-wash-l.svg
index ebce107526..ea0f8c0d30 100644
--- a/data/styles/clear/style-night/symbols/car-wash-l.svg
+++ b/data/styles/clear/style-night/symbols/car-wash-l.svg
@@ -1,32 +1,33 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <svg width="27px" height="27px" viewBox="0 0 27 27" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
     <title>car-wash-l</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
-    <g id="POI-NIght" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="car-wash-l">
-            <g id="car-part-l">
-                <g id="POI">
-                    <g id="car-repair-l">
-                        <g id="Layer_2">
-                            <path d="M13.5,27 C6.056,27 0,20.943 0,13.5 C0,6.057 6.056,0 13.5,0 C20.944,0 27,6.057 27,13.5 C27,20.943 20.944,27 13.5,27 L13.5,27 L13.5,27 Z" id="Shape" fill-opacity="0.1" fill="#FFFFFF"></path>
-                            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 L26,13.5 Z" id="Shape" fill="#252522"></path>
-                            <g id="noun_79131_cc" transform="translate(6.000000, 4.000000)" fill="#FFFFFF" fill-opacity="0.7">
-                                <g id="Group">
-                                    <g id="Shape">
-                                        <path d="M14,11 L12.5,7 C12.312,6.5 12,6 11,6 L4,6 C3,6 2.688,6.5 2.5,7 L1,11 L0,12 L0,17 L2,17 L2,18 C2,18.5 2.5,19 3,19 L4,19 C4.5,19 5,18.5 5,18 L5,17 L10,17 L10,18 C10,18.5 10.5,19 11,19 L12,19 C12.5,19 13,18.5 13,18 L13,17 L15,17 L15,12 L14,11 Z M4,15 L2,15 L2,13 L4,13 L4,15 Z M3.5,11 L4.5,8 L10.5,8 L11.5,11 L3.5,11 Z M13,15 L11,15 L11,13 L13,13 L13,15 Z" id="Combined-Shape"></path>
+    <g id="POI-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Artboard-1" transform="translate(-677.000000, -322.000000)">
+            <g id="car-wash-l" transform="translate(677.000000, 322.000000)">
+                <g id="car-part-l">
+                    <g id="POI">
+                        <g id="car-repair-l">
+                            <g id="Layer_2">
+                                <path d="M13.5,27 C6.056,27 0,20.943 0,13.5 C0,6.057 6.056,0 13.5,0 C20.944,0 27,6.057 27,13.5 C27,20.943 20.944,27 13.5,27 L13.5,27 L13.5,27 Z" id="Shape" fill-opacity="0.1" fill="#FFFFFF"></path>
+                                <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 L26,13.5 Z" id="Shape" fill="#252522"></path>
+                                <path d="M20,15 L18.5,11 C18.312,10.5 18,10 17,10 L10,10 C9,10 8.688,10.5 8.5,11 L7,15 L6,16 L6,21 L8,21 L8,22 C8,22.5 8.5,23 9,23 L10,23 C10.5,23 11,22.5 11,22 L11,21 L16,21 L16,22 C16,22.5 16.5,23 17,23 L18,23 C18.5,23 19,22.5 19,22 L19,21 L21,21 L21,16 L20,15 Z M10,19 L8,19 L8,17 L10,17 L10,19 Z M9.5,15 L10.5,12 L16.5,12 L17.5,15 L9.5,15 Z M19,19 L17,19 L17,17 L19,17 L19,19 Z" id="Combined-Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+                                <path d="M7,6.4 C7,7.28 7.675,8 8.5,8 C9.325,8 10,7.28 10,6.4 C10,5.52 8.5,4 8.5,4 C8.5,4 7,5.52 7,6.4 Z" id="Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+                                <path d="M13.5,4 C13.5,4 12,5.52 12,6.4 C12,7.28 12.675,8 13.5,8 C14.325,8 15,7.28 15,6.4 C15,5.52 13.5,4 13.5,4 L13.5,4 Z" id="Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+                                <path d="M18.5,4 C18.5,4 17,5.52 17,6.4 C17,7.28 17.675,8 18.5,8 C19.325,8 20,7.28 20,6.4 C20,5.52 18.5,4 18.5,4 L18.5,4 Z" id="Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+                                <g id="noun_79131_cc" transform="translate(6.000000, 4.000000)">
+                                    <g id="Group">
+                                        <g id="Shape"></g>
                                     </g>
                                 </g>
                             </g>
+                            <g id="Layer_1" transform="translate(6.000000, 10.000000)"></g>
                         </g>
-                        <g id="Layer_1" transform="translate(6.000000, 10.000000)"></g>
                     </g>
                 </g>
             </g>
         </g>
-        <path d="M7,6.4 C7,7.28 7.675,8 8.5,8 C9.325,8 10,7.28 10,6.4 C10,5.52 8.5,4 8.5,4 C8.5,4 7,5.52 7,6.4 Z" id="Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
-        <path d="M13.5,4 C13.5,4 12,5.52 12,6.4 C12,7.28 12.675,8 13.5,8 C14.325,8 15,7.28 15,6.4 C15,5.52 13.5,4 13.5,4 L13.5,4 Z" id="Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
-        <path d="M18.5,4 C18.5,4 17,5.52 17,6.4 C17,7.28 17.675,8 18.5,8 C19.325,8 20,7.28 20,6.4 C20,5.52 18.5,4 18.5,4 L18.5,4 Z" id="Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/car-wash-m.svg b/data/styles/clear/style-night/symbols/car-wash-m.svg
index 3dda08fd47..e23c2d6286 100644
--- a/data/styles/clear/style-night/symbols/car-wash-m.svg
+++ b/data/styles/clear/style-night/symbols/car-wash-m.svg
@@ -1,17 +1,19 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <svg width="23px" height="23px" viewBox="0 0 23 23" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
     <title>car-wash-m</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
-    <g id="POI-NIght" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="car-wash-m">
-            <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" fill-opacity="0.1" fill="#FFFFFF"></path>
-            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#252522"></path>
-            <path d="M17.968,12 L16.471,7.998 C16.284,7.499 15.973,7 14.974,7 L8.027,7 C7.028,7 6.716,7.499 6.53,7.998 L5.032,12 L4,13 L4,18 L6,18 L6,18.975 C6,19.473 6.499,19.973 6.998,19.973 L8,19.973 C8.499,19.973 8.998,19.473 8.998,18.975 L8.998,18 L14.002,18 L14.002,18.975 C14.002,19.473 14.501,19.973 15,19.973 L16.002,19.973 C16.501,19.973 17,19.473 17,18.975 L17,18 L19,18 L19,13 L17.968,12 L17.968,12 Z M8.525,9 L14.474,9 L15.472,12 L7.527,12 L8.525,9 L8.525,9 Z M8.2,15.5 C8.2,15.886 7.886,16.2 7.5,16.2 L6.5,16.2 C6.114,16.2 5.8,15.886 5.8,15.5 L5.8,14.5 C5.8,14.114 6.114,13.8 6.5,13.8 L7.5,13.8 C7.886,13.8 8.2,14.114 8.2,14.5 L8.2,15.5 L8.2,15.5 Z M17.2,15.5 C17.2,15.886 16.886,16.2 16.5,16.2 L15.5,16.2 C15.114,16.2 14.8,15.886 14.8,15.5 L14.8,14.5 C14.8,14.114 15.114,13.8 15.5,13.8 L16.5,13.8 C16.886,13.8 17.2,14.114 17.2,14.5 L17.2,15.5 L17.2,15.5 Z" id="Combined-Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
-            <path d="M11.5,3 C11.5,3 10.5,4.14 10.5,4.8 C10.5,5.46 10.95,6 11.5,6 C12.05,6 12.5,5.46 12.5,4.8 C12.5,4.14 11.5,3 11.5,3 L11.5,3 Z" id="Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
-            <path d="M15,3 C15,3 14,4.14 14,4.8 C14,5.46 14.45,6 15,6 C15.55,6 16,5.46 16,4.8 C16,4.14 15,3 15,3 L15,3 Z" id="Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
-            <path d="M8,3 C8,3 7,4.14 7,4.8 C7,5.46 7.45,6 8,6 C8.55,6 9,5.46 9,4.8 C9,4.14 8,3 8,3 L8,3 Z" id="Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+    <g id="POI-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Artboard-1" transform="translate(-714.000000, -324.000000)">
+            <g id="car-wash-m" transform="translate(714.000000, 324.000000)">
+                <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" fill-opacity="0.1" fill="#FFFFFF"></path>
+                <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#252522"></path>
+                <path d="M17.968,12 L16.471,7.998 C16.284,7.499 15.973,7 14.974,7 L8.027,7 C7.028,7 6.716,7.499 6.53,7.998 L5.032,12 L4,13 L4,18 L6,18 L6,18.975 C6,19.473 6.499,19.973 6.998,19.973 L8,19.973 C8.499,19.973 8.998,19.473 8.998,18.975 L8.998,18 L14.002,18 L14.002,18.975 C14.002,19.473 14.501,19.973 15,19.973 L16.002,19.973 C16.501,19.973 17,19.473 17,18.975 L17,18 L19,18 L19,13 L17.968,12 L17.968,12 Z M8.525,9 L14.474,9 L15.472,12 L7.527,12 L8.525,9 L8.525,9 Z M8.2,15.5 C8.2,15.886 7.886,16.2 7.5,16.2 L6.5,16.2 C6.114,16.2 5.8,15.886 5.8,15.5 L5.8,14.5 C5.8,14.114 6.114,13.8 6.5,13.8 L7.5,13.8 C7.886,13.8 8.2,14.114 8.2,14.5 L8.2,15.5 L8.2,15.5 Z M17.2,15.5 C17.2,15.886 16.886,16.2 16.5,16.2 L15.5,16.2 C15.114,16.2 14.8,15.886 14.8,15.5 L14.8,14.5 C14.8,14.114 15.114,13.8 15.5,13.8 L16.5,13.8 C16.886,13.8 17.2,14.114 17.2,14.5 L17.2,15.5 L17.2,15.5 Z" id="Combined-Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+                <path d="M11.5,3 C11.5,3 10.5,4.14 10.5,4.8 C10.5,5.46 10.95,6 11.5,6 C12.05,6 12.5,5.46 12.5,4.8 C12.5,4.14 11.5,3 11.5,3 L11.5,3 Z" id="Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+                <path d="M15,3 C15,3 14,4.14 14,4.8 C14,5.46 14.45,6 15,6 C15.55,6 16,5.46 16,4.8 C16,4.14 15,3 15,3 L15,3 Z" id="Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+                <path d="M8,3 C8,3 7,4.14 7,4.8 C7,5.46 7.45,6 8,6 C8.55,6 9,5.46 9,4.8 C9,4.14 8,3 8,3 L8,3 Z" id="Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+            </g>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/car-wash-s.svg b/data/styles/clear/style-night/symbols/car-wash-s.svg
new file mode 100644
index 0000000000..4a668286d3
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/car-wash-s.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="17px" height="17px" viewBox="0 0 17 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
+    <title>car-wash-s</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="POI-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Artboard-1" transform="translate(-747.000000, -327.000000)">
+            <g id="car-wash-s" transform="translate(747.000000, 327.000000)">
+                <path d="M8.5,17 C3.813,17 0,13.187 0,8.5 C0,3.813 3.813,0 8.5,0 C13.187,0 17,3.813 17,8.5 C17,13.187 13.187,17 8.5,17 L8.5,17 Z" id="Shape" fill-opacity="0.1" fill="#FFFFFF"></path>
+                <ellipse id="Oval" fill="#252522" cx="8.5" cy="8.5" rx="7.5" ry="7.5"></ellipse>
+                <path d="M12.452,9.249 L11.66,6.528 C11.561,6.264 11.396,6 10.867,6 L6.131,6 C5.602,6 5.437,6.264 5.338,6.528 L4.546,9.249 L4,9.779 L4,12.955 L5,12.955 L5,13.471 C5,13.735 5.265,13.999 5.529,13.999 L6.472,13.999 C6.736,13.999 7,13.734 7,13.471 L7,12.955 L10,12.955 L10,13.471 C10,13.735 10.264,13.999 10.528,13.999 L11.471,13.999 C11.735,13.999 12,13.734 12,13.471 L12,12.955 L13,12.955 L13,9.779 L12.452,9.249 L12.452,9.249 Z M5.998,11.999 L4.998,11.999 L4.998,10.999 L5.998,10.999 L5.998,11.999 L5.998,11.999 Z M5.865,8.999 L6.394,6.999 L10.602,6.999 L11.131,8.999 L5.865,8.999 L5.865,8.999 Z M11.998,11.999 L10.998,11.999 L10.998,10.999 L11.998,10.999 L11.998,11.999 L11.998,11.999 Z" id="Combined-Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+                <path d="M8.5,3 C8.5,3 8,3.76 8,4.2 C8,4.64 8.225,5 8.5,5 C8.775,5 9,4.64 9,4.2 C9,3.76 8.5,3 8.5,3 L8.5,3 Z" id="Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+                <path d="M6.5,3 C6.5,3 6,3.76 6,4.2 C6,4.64 6.225,5 6.5,5 C6.775,5 7,4.64 7,4.2 C7,3.76 6.5,3 6.5,3 L6.5,3 Z" id="Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+                <path d="M10.5,3 C10.5,3 10,3.76 10,4.2 C10,4.64 10.225,5 10.5,5 C10.775,5 11,4.64 11,4.2 C11,3.76 10.5,3 10.5,3 L10.5,3 Z" id="Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/car_sharing-l.svg b/data/styles/clear/style-night/symbols/car_sharing-l.svg
index 162fb6e470..eb79c82569 100644
--- a/data/styles/clear/style-night/symbols/car_sharing-l.svg
+++ b/data/styles/clear/style-night/symbols/car_sharing-l.svg
@@ -1,26 +1,28 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <svg width="27px" height="27px" viewBox="0 0 27 27" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
     <title>car_sharing-l</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
-    <g id="POI-NIght" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="car-sharing-l">
-            <g id="car-part-l">
-                <g id="POI">
-                    <g id="car-repair-l">
-                        <g id="Layer_2">
-                            <path d="M13.5,27 C6.056,27 0,20.943 0,13.5 C0,6.057 6.056,0 13.5,0 C20.944,0 27,6.057 27,13.5 C27,20.943 20.944,27 13.5,27 L13.5,27 L13.5,27 Z" id="Shape" fill-opacity="0.1" fill="#FFFFFF"></path>
-                            <path d="M13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 C26,20.403 20.403,26 13.5,26 Z" id="Shape" fill="#252522"></path>
-                            <g id="noun_79131_cc" transform="translate(6.000000, 4.000000)" fill="#FFFFFF" fill-opacity="0.7">
-                                <g id="Group">
-                                    <g id="Shape">
-                                        <path d="M5.79197816,1.5 L12,1.5 L12.999573,2.5 L11,4 L10,3 L9.02264404,4 L8.00115963,3 L7.0135498,4 L5.84980787,3.35545615 C5.50044266,4.31487629 4.58023094,5 3.5,5 C2.11928813,5 1,3.88071187 1,2.5 C1,1.11928813 2.11928813,0 3.5,0 C4.52515952,0 5.40619985,0.617047609 5.79197816,1.5 Z M2,2.5 C2,1.94771525 2.44386482,1.5 3,1.5 C3.55228475,1.5 4,1.94386482 4,2.5 C4,3.05228475 3.55613518,3.5 3,3.5 C2.44771525,3.5 2,3.05613518 2,2.5 Z M14,11 L12.5,7 C12.312,6.5 12,6 11,6 L4,6 C3,6 2.688,6.5 2.5,7 L1,11 L0,12 L0,17 L2,17 L2,18 C2,18.5 2.5,19 3,19 L4,19 C4.5,19 5,18.5 5,18 L5,17 L10,17 L10,18 C10,18.5 10.5,19 11,19 L12,19 C12.5,19 13,18.5 13,18 L13,17 L15,17 L15,12 L14,11 Z M4,15 L2,15 L2,13 L4,13 L4,15 Z M3.5,11 L4.5,8 L10.5,8 L11.5,11 L3.5,11 Z M13,15 L11,15 L11,13 L13,13 L13,15 Z" id="Combined-Shape"></path>
+    <g id="POI-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Artboard-1" transform="translate(-677.000000, -211.000000)">
+            <g id="car-sharing-l" transform="translate(677.000000, 211.000000)">
+                <g id="car-part-l">
+                    <g id="POI">
+                        <g id="car-repair-l">
+                            <g id="Layer_2">
+                                <path d="M13.5,27 C6.056,27 0,20.943 0,13.5 C0,6.057 6.056,0 13.5,0 C20.944,0 27,6.057 27,13.5 C27,20.943 20.944,27 13.5,27 L13.5,27 L13.5,27 Z" id="Shape" fill-opacity="0.1" fill="#FFFFFF"></path>
+                                <path d="M13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 C26,20.403 20.403,26 13.5,26 Z" id="Shape" fill="#252522"></path>
+                                <g id="noun_79131_cc" transform="translate(6.000000, 4.000000)" fill="#FFFFFF" fill-opacity="0.7">
+                                    <g id="Group">
+                                        <g id="Shape">
+                                            <path d="M5.79197816,1.5 L12,1.5 L12.999573,2.5 L11,4 L10,3 L9.02264404,4 L8.00115963,3 L7.0135498,4 L5.84980787,3.35545615 C5.50044266,4.31487629 4.58023094,5 3.5,5 C2.11928813,5 1,3.88071187 1,2.5 C1,1.11928813 2.11928813,0 3.5,0 C4.52515952,0 5.40619985,0.617047609 5.79197816,1.5 Z M2,2.5 C2,1.94771525 2.44386482,1.5 3,1.5 C3.55228475,1.5 4,1.94386482 4,2.5 C4,3.05228475 3.55613518,3.5 3,3.5 C2.44771525,3.5 2,3.05613518 2,2.5 Z M14,11 L12.5,7 C12.312,6.5 12,6 11,6 L4,6 C3,6 2.688,6.5 2.5,7 L1,11 L0,12 L0,17 L2,17 L2,18 C2,18.5 2.5,19 3,19 L4,19 C4.5,19 5,18.5 5,18 L5,17 L10,17 L10,18 C10,18.5 10.5,19 11,19 L12,19 C12.5,19 13,18.5 13,18 L13,17 L15,17 L15,12 L14,11 Z M4,15 L2,15 L2,13 L4,13 L4,15 Z M3.5,11 L4.5,8 L10.5,8 L11.5,11 L3.5,11 Z M13,15 L11,15 L11,13 L13,13 L13,15 Z" id="Combined-Shape"></path>
+                                        </g>
                                     </g>
                                 </g>
                             </g>
+                            <g id="Layer_1" transform="translate(6.000000, 10.000000)"></g>
                         </g>
-                        <g id="Layer_1" transform="translate(6.000000, 10.000000)"></g>
                     </g>
                 </g>
             </g>
diff --git a/data/styles/clear/style-night/symbols/car_sharing-m.svg b/data/styles/clear/style-night/symbols/car_sharing-m.svg
index 5f337c0f8d..c187b314e2 100644
--- a/data/styles/clear/style-night/symbols/car_sharing-m.svg
+++ b/data/styles/clear/style-night/symbols/car_sharing-m.svg
@@ -1,15 +1,17 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <svg width="23px" height="23px" viewBox="0 0 23 23" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
     <title>car_sharing-m</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
-    <g id="POI-NIght" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="car-sharing-m" transform="translate(1.000000, 0.000000)">
-            <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" fill-opacity="0.1" fill="#FFFFFF"></path>
-            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#252522"></path>
-            <path d="M9.91464715,4 L15,4 L14,5 L13,4.5 L12,5 L11,4.5 L9.96477016,4.82466609 C9.81641383,5.49701147 9.21694655,6 8.5,6 C7.67157288,6 7,5.32842712 7,4.5 C7,3.67157288 7.67157288,3 8.5,3 C9.15310941,3 9.70872894,3.41740381 9.91464715,4 Z M8,4 L9,4 L9,5 L8,5 L8,4 Z" id="Combined-Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
-            <path d="M17.968,12 L16.471,7.998 C16.284,7.499 15.973,7 14.974,7 L8.027,7 C7.028,7 6.716,7.499 6.53,7.998 L5.032,12 L4,13 L4,18 L6,18 L6,18.975 C6,19.473 6.499,19.973 6.998,19.973 L8,19.973 C8.499,19.973 8.998,19.473 8.998,18.975 L8.998,18 L14.002,18 L14.002,18.975 C14.002,19.473 14.501,19.973 15,19.973 L16.002,19.973 C16.501,19.973 17,19.473 17,18.975 L17,18 L19,18 L19,13 L17.968,12 L17.968,12 Z M8.525,9 L14.474,9 L15.472,12 L7.527,12 L8.525,9 L8.525,9 Z M8.2,15.5 C8.2,15.886 7.886,16.2 7.5,16.2 L6.5,16.2 C6.114,16.2 5.8,15.886 5.8,15.5 L5.8,14.5 C5.8,14.114 6.114,13.8 6.5,13.8 L7.5,13.8 C7.886,13.8 8.2,14.114 8.2,14.5 L8.2,15.5 L8.2,15.5 Z M17.2,15.5 C17.2,15.886 16.886,16.2 16.5,16.2 L15.5,16.2 C15.114,16.2 14.8,15.886 14.8,15.5 L14.8,14.5 C14.8,14.114 15.114,13.8 15.5,13.8 L16.5,13.8 C16.886,13.8 17.2,14.114 17.2,14.5 L17.2,15.5 L17.2,15.5 Z" id="Combined-Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+    <g id="POI-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Artboard-1" transform="translate(-713.000000, -213.000000)">
+            <g id="car-sharing-m" transform="translate(714.000000, 213.000000)">
+                <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" fill-opacity="0.1" fill="#FFFFFF"></path>
+                <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#252522"></path>
+                <path d="M9.91464715,4 L15,4 L14,5 L13,4.5 L12,5 L11,4.5 L9.96477016,4.82466609 C9.81641383,5.49701147 9.21694655,6 8.5,6 C7.67157288,6 7,5.32842712 7,4.5 C7,3.67157288 7.67157288,3 8.5,3 C9.15310941,3 9.70872894,3.41740381 9.91464715,4 Z M8,4 L9,4 L9,5 L8,5 L8,4 Z" id="Combined-Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+                <path d="M17.968,12 L16.471,7.998 C16.284,7.499 15.973,7 14.974,7 L8.027,7 C7.028,7 6.716,7.499 6.53,7.998 L5.032,12 L4,13 L4,18 L6,18 L6,18.975 C6,19.473 6.499,19.973 6.998,19.973 L8,19.973 C8.499,19.973 8.998,19.473 8.998,18.975 L8.998,18 L14.002,18 L14.002,18.975 C14.002,19.473 14.501,19.973 15,19.973 L16.002,19.973 C16.501,19.973 17,19.473 17,18.975 L17,18 L19,18 L19,13 L17.968,12 L17.968,12 Z M8.525,9 L14.474,9 L15.472,12 L7.527,12 L8.525,9 L8.525,9 Z M8.2,15.5 C8.2,15.886 7.886,16.2 7.5,16.2 L6.5,16.2 C6.114,16.2 5.8,15.886 5.8,15.5 L5.8,14.5 C5.8,14.114 6.114,13.8 6.5,13.8 L7.5,13.8 C7.886,13.8 8.2,14.114 8.2,14.5 L8.2,15.5 L8.2,15.5 Z M17.2,15.5 C17.2,15.886 16.886,16.2 16.5,16.2 L15.5,16.2 C15.114,16.2 14.8,15.886 14.8,15.5 L14.8,14.5 C14.8,14.114 15.114,13.8 15.5,13.8 L16.5,13.8 C16.886,13.8 17.2,14.114 17.2,14.5 L17.2,15.5 L17.2,15.5 Z" id="Combined-Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+            </g>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/car_sharing-s.svg b/data/styles/clear/style-night/symbols/car_sharing-s.svg
new file mode 100644
index 0000000000..834f0968a0
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/car_sharing-s.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="17px" height="17px" viewBox="0 0 17 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
+    <title>car_sharing-s</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="POI-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Artboard-1" transform="translate(-747.000000, -216.000000)">
+            <g id="car-sharing-s" transform="translate(747.000000, 216.000000)">
+                <path d="M8.5,17 C3.813,17 0,13.187 0,8.5 C0,3.813 3.813,0 8.5,0 C13.187,0 17,3.813 17,8.5 C17,13.187 13.187,17 8.5,17 L8.5,17 Z" id="Shape" fill-opacity="0.1" fill="#FFFFFF"></path>
+                <ellipse id="Oval" fill="#252522" cx="8.5" cy="8.5" rx="7.5" ry="7.5"></ellipse>
+                <path d="M12.452,9.249 L11.66,6.528 C11.561,6.264 11.396,6 10.867,6 L6.131,6 C5.602,6 5.437,6.264 5.338,6.528 L4.546,9.249 L4,9.779 L4,12.955 L5,12.955 L5,13.471 C5,13.735 5.265,13.999 5.529,13.999 L6.472,13.999 C6.736,13.999 7,13.734 7,13.471 L7,12.955 L10,12.955 L10,13.471 C10,13.735 10.264,13.999 10.528,13.999 L11.471,13.999 C11.735,13.999 12,13.734 12,13.471 L12,12.955 L13,12.955 L13,9.779 L12.452,9.249 L12.452,9.249 Z M5.998,11.999 L4.998,11.999 L4.998,10.999 L5.998,10.999 L5.998,11.999 L5.998,11.999 Z M5.865,8.999 L6.394,6.999 L10.602,6.999 L11.131,8.999 L5.865,8.999 L5.865,8.999 Z M6.91464715,3 L12,3 L11,4 L10,3.5 L9,4 L8,3.5 L6.96477016,3.82466609 C6.81641383,4.49701147 6.21694655,5 5.5,5 C4.67157288,5 4,4.32842712 4,3.5 C4,2.67157288 4.67157288,2 5.5,2 C6.15310941,2 6.70872894,2.41740381 6.91464715,3 Z M11.998,11.999 L10.998,11.999 L10.998,10.999 L11.998,10.999 L11.998,11.999 Z M5,3 L6,3 L6,4 L5,4 L5,3 Z" id="Combined-Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/casino-l.svg b/data/styles/clear/style-night/symbols/casino-l.svg
index 9944fa05c9..2ee41b31a8 100644
--- a/data/styles/clear/style-night/symbols/casino-l.svg
+++ b/data/styles/clear/style-night/symbols/casino-l.svg
@@ -1,14 +1,16 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <svg width="27px" height="27px" viewBox="0 0 27 27" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
     <title>casino-l</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
-    <g id="POI-NIght" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="casino-l">
-            <path d="M13.5,27 C6.056,27 0,20.943 0,13.5 C0,6.057 6.056,0 13.5,0 C20.944,0 27,6.057 27,13.5 C27,20.943 20.944,27 13.5,27 L13.5,27 Z" id="Shape" fill-opacity="0.1" fill="#FFFFFF"></path>
-            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#26160D"></path>
-            <path d="M21.098,7.2687044 L15.903,4.2687044 C14.946,3.7157044 13.723,4.0437044 13.171,5.0007044 L10.228,10.0987044 L14,10.0987044 C16.205,10.0987044 18,11.8927044 18,14.0987044 L18,15.9797044 C18.336,15.8097044 18.628,15.5457044 18.83,15.1967044 L21.83,10.0017044 C22.383,9.0437044 22.055,7.8217044 21.098,7.2687044 L21.098,7.2687044 Z M20.748,9.8747044 C20.352,10.5607044 19.477,10.7937044 18.791,10.3977044 C18.106,10.0027044 17.871,9.1267044 18.268,8.4427044 C18.664,7.7557044 19.539,7.5217044 20.225,7.9187044 C20.908,8.3147044 21.144,9.1887044 20.748,9.8747044 L20.748,9.8747044 Z M14,12.0987044 L8,12.0987044 C6.896,12.0987044 6,12.9947044 6,14.0987044 L6,20.0987044 C6,21.2027044 6.896,22.0987044 8,22.0987044 L14,22.0987044 C15.104,22.0987044 16,21.2027044 16,20.0987044 L16,14.0987044 C16,12.9947044 15.104,12.0987044 14,12.0987044 L14,12.0987044 Z M8.5,21.0987044 C7.672,21.0987044 7,20.4277044 7,19.5987044 C7,18.7697044 7.672,18.0987044 8.5,18.0987044 C9.328,18.0987044 10,18.7697044 10,19.5987044 C10,20.4277044 9.328,21.0987044 8.5,21.0987044 L8.5,21.0987044 Z M8.5,16.0987044 C7.672,16.0987044 7,15.4277044 7,14.5987044 C7,13.7697044 7.672,13.0987044 8.5,13.0987044 C9.328,13.0987044 10,13.7697044 10,14.5987044 C10,15.4277044 9.328,16.0987044 8.5,16.0987044 L8.5,16.0987044 Z M13.5,21.0987044 C12.672,21.0987044 12,20.4277044 12,19.5987044 C12,18.7697044 12.672,18.0987044 13.5,18.0987044 C14.328,18.0987044 15,18.7697044 15,19.5987044 C15,20.4277044 14.328,21.0987044 13.5,21.0987044 L13.5,21.0987044 Z M13.5,16.0987044 C12.672,16.0987044 12,15.4277044 12,14.5987044 C12,13.7697044 12.672,13.0987044 13.5,13.0987044 C14.328,13.0987044 15,13.7697044 15,14.5987044 C15,15.4277044 14.328,16.0987044 13.5,16.0987044 L13.5,16.0987044 Z" id="Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+    <g id="POI-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Artboard-1" transform="translate(-317.000000, -841.000000)">
+            <g id="casino-l" transform="translate(317.000000, 841.000000)">
+                <path d="M13.5,27 C6.056,27 0,20.943 0,13.5 C0,6.057 6.056,0 13.5,0 C20.944,0 27,6.057 27,13.5 C27,20.943 20.944,27 13.5,27 L13.5,27 Z" id="Shape" fill-opacity="0.1" fill="#FFFFFF"></path>
+                <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#26160D"></path>
+                <path d="M21.098,7.2687044 L15.903,4.2687044 C14.946,3.7157044 13.723,4.0437044 13.171,5.0007044 L10.228,10.0987044 L14,10.0987044 C16.205,10.0987044 18,11.8927044 18,14.0987044 L18,15.9797044 C18.336,15.8097044 18.628,15.5457044 18.83,15.1967044 L21.83,10.0017044 C22.383,9.0437044 22.055,7.8217044 21.098,7.2687044 L21.098,7.2687044 Z M20.748,9.8747044 C20.352,10.5607044 19.477,10.7937044 18.791,10.3977044 C18.106,10.0027044 17.871,9.1267044 18.268,8.4427044 C18.664,7.7557044 19.539,7.5217044 20.225,7.9187044 C20.908,8.3147044 21.144,9.1887044 20.748,9.8747044 L20.748,9.8747044 Z M14,12.0987044 L8,12.0987044 C6.896,12.0987044 6,12.9947044 6,14.0987044 L6,20.0987044 C6,21.2027044 6.896,22.0987044 8,22.0987044 L14,22.0987044 C15.104,22.0987044 16,21.2027044 16,20.0987044 L16,14.0987044 C16,12.9947044 15.104,12.0987044 14,12.0987044 L14,12.0987044 Z M8.5,21.0987044 C7.672,21.0987044 7,20.4277044 7,19.5987044 C7,18.7697044 7.672,18.0987044 8.5,18.0987044 C9.328,18.0987044 10,18.7697044 10,19.5987044 C10,20.4277044 9.328,21.0987044 8.5,21.0987044 L8.5,21.0987044 Z M8.5,16.0987044 C7.672,16.0987044 7,15.4277044 7,14.5987044 C7,13.7697044 7.672,13.0987044 8.5,13.0987044 C9.328,13.0987044 10,13.7697044 10,14.5987044 C10,15.4277044 9.328,16.0987044 8.5,16.0987044 L8.5,16.0987044 Z M13.5,21.0987044 C12.672,21.0987044 12,20.4277044 12,19.5987044 C12,18.7697044 12.672,18.0987044 13.5,18.0987044 C14.328,18.0987044 15,18.7697044 15,19.5987044 C15,20.4277044 14.328,21.0987044 13.5,21.0987044 L13.5,21.0987044 Z M13.5,16.0987044 C12.672,16.0987044 12,15.4277044 12,14.5987044 C12,13.7697044 12.672,13.0987044 13.5,13.0987044 C14.328,13.0987044 15,13.7697044 15,14.5987044 C15,15.4277044 14.328,16.0987044 13.5,16.0987044 L13.5,16.0987044 Z" id="Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+            </g>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/casino-m.svg b/data/styles/clear/style-night/symbols/casino-m.svg
index e841b0c163..8ca2d1d9d3 100644
--- a/data/styles/clear/style-night/symbols/casino-m.svg
+++ b/data/styles/clear/style-night/symbols/casino-m.svg
@@ -1,14 +1,16 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <svg width="23px" height="23px" viewBox="0 0 23 23" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
     <title>casino-m</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
-    <g id="POI-NIght" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="casino-m">
-            <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" fill-opacity="0.1" fill="#FFFFFF"></path>
-            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#26160D"></path>
-            <path d="M17.488,6.61421587 L13.331,4.21521587 C12.566,3.77221587 11.588,4.03521587 11.145,4.80121587 L9.248,8.08821587 L11.4,8.08821587 C13.384,8.08821587 15,9.70321587 15,11.6882159 L15,13.5892159 C15.272,13.4542159 15.51,13.2402159 15.674,12.9572159 L18.074,8.80121587 C18.516,8.03521587 18.254,7.05721587 17.488,6.61421587 L17.488,6.61421587 Z M17.208,8.69921587 C16.892,9.24821587 16.191,9.43421587 15.643,9.11821587 C15.095,8.80321587 14.908,8.10121587 15.224,7.55521587 C15.54,7.00521587 16.241,6.81821587 16.789,7.13521587 C17.337,7.45121587 17.524,8.15021587 17.208,8.69921587 L17.208,8.69921587 Z M11.4,10.0882159 L6.6,10.0882159 C5.717,10.0882159 5,10.8052159 5,11.6882159 L5,16.4892159 C5,17.3722159 5.717,18.0892159 6.6,18.0892159 L11.401,18.0892159 C12.284,18.0892159 13.001,17.3722159 13.001,16.4892159 L13.001,11.6882159 C13,10.8052159 12.283,10.0882159 11.4,10.0882159 L11.4,10.0882159 Z M7,17.2882159 C6.338,17.2882159 5.8,16.7502159 5.8,16.0892159 C5.8,15.4272159 6.338,14.8892159 7,14.8892159 C7.662,14.8892159 8.2,15.4272159 8.2,16.0892159 C8.2,16.7502159 7.662,17.2882159 7,17.2882159 L7,17.2882159 Z M7,13.2872159 C6.338,13.2872159 5.8,12.7492159 5.8,12.0882159 C5.8,11.4262159 6.338,10.8882159 7,10.8882159 C7.662,10.8882159 8.2,11.4262159 8.2,12.0882159 C8.2,12.7492159 7.662,13.2872159 7,13.2872159 L7,13.2872159 Z M11,17.2882159 C10.338,17.2882159 9.8,16.7502159 9.8,16.0892159 C9.8,15.4272159 10.338,14.8892159 11,14.8892159 C11.662,14.8892159 12.2,15.4272159 12.2,16.0892159 C12.2,16.7502159 11.662,17.2882159 11,17.2882159 L11,17.2882159 Z M11,13.2872159 C10.338,13.2872159 9.8,12.7492159 9.8,12.0882159 C9.8,11.4262159 10.338,10.8882159 11,10.8882159 C11.662,10.8882159 12.2,11.4262159 12.2,12.0882159 C12.2,12.7492159 11.662,13.2872159 11,13.2872159 L11,13.2872159 Z" id="Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+    <g id="POI-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Artboard-1" transform="translate(-354.000000, -843.000000)">
+            <g id="casino-m" transform="translate(354.000000, 843.000000)">
+                <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" fill-opacity="0.1" fill="#FFFFFF"></path>
+                <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#26160D"></path>
+                <path d="M17.488,6.61421587 L13.331,4.21521587 C12.566,3.77221587 11.588,4.03521587 11.145,4.80121587 L9.248,8.08821587 L11.4,8.08821587 C13.384,8.08821587 15,9.70321587 15,11.6882159 L15,13.5892159 C15.272,13.4542159 15.51,13.2402159 15.674,12.9572159 L18.074,8.80121587 C18.516,8.03521587 18.254,7.05721587 17.488,6.61421587 L17.488,6.61421587 Z M17.208,8.69921587 C16.892,9.24821587 16.191,9.43421587 15.643,9.11821587 C15.095,8.80321587 14.908,8.10121587 15.224,7.55521587 C15.54,7.00521587 16.241,6.81821587 16.789,7.13521587 C17.337,7.45121587 17.524,8.15021587 17.208,8.69921587 L17.208,8.69921587 Z M11.4,10.0882159 L6.6,10.0882159 C5.717,10.0882159 5,10.8052159 5,11.6882159 L5,16.4892159 C5,17.3722159 5.717,18.0892159 6.6,18.0892159 L11.401,18.0892159 C12.284,18.0892159 13.001,17.3722159 13.001,16.4892159 L13.001,11.6882159 C13,10.8052159 12.283,10.0882159 11.4,10.0882159 L11.4,10.0882159 Z M7,17.2882159 C6.338,17.2882159 5.8,16.7502159 5.8,16.0892159 C5.8,15.4272159 6.338,14.8892159 7,14.8892159 C7.662,14.8892159 8.2,15.4272159 8.2,16.0892159 C8.2,16.7502159 7.662,17.2882159 7,17.2882159 L7,17.2882159 Z M7,13.2872159 C6.338,13.2872159 5.8,12.7492159 5.8,12.0882159 C5.8,11.4262159 6.338,10.8882159 7,10.8882159 C7.662,10.8882159 8.2,11.4262159 8.2,12.0882159 C8.2,12.7492159 7.662,13.2872159 7,13.2872159 L7,13.2872159 Z M11,17.2882159 C10.338,17.2882159 9.8,16.7502159 9.8,16.0892159 C9.8,15.4272159 10.338,14.8892159 11,14.8892159 C11.662,14.8892159 12.2,15.4272159 12.2,16.0892159 C12.2,16.7502159 11.662,17.2882159 11,17.2882159 L11,17.2882159 Z M11,13.2872159 C10.338,13.2872159 9.8,12.7492159 9.8,12.0882159 C9.8,11.4262159 10.338,10.8882159 11,10.8882159 C11.662,10.8882159 12.2,11.4262159 12.2,12.0882159 C12.2,12.7492159 11.662,13.2872159 11,13.2872159 L11,13.2872159 Z" id="Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+            </g>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/casino-s.svg b/data/styles/clear/style-night/symbols/casino-s.svg
index 51f073f47c..ed9fda0dd0 100644
--- a/data/styles/clear/style-night/symbols/casino-s.svg
+++ b/data/styles/clear/style-night/symbols/casino-s.svg
@@ -1,14 +1,16 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <svg width="17px" height="17px" viewBox="0 0 17 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
     <title>casino-s</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
-    <g id="POI-NIght" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="casino-s">
-            <path d="M8.5,17 C3.813,17 0,13.188 0,8.5 C0,3.812 3.813,0 8.5,0 C13.187,0 17,3.812 17,8.5 C17,13.188 13.187,17 8.5,17 L8.5,17 Z" id="Shape" fill-opacity="0.1" fill="#FFFFFF"></path>
-            <ellipse id="Oval" fill="#26160D" cx="8.5" cy="8.5" rx="7.5" ry="7.5"></ellipse>
-            <path d="M12.438,5.58402093 L9.927,4.13402093 C9.448,3.85802093 8.837,4.02202093 8.561,4.50002093 L7.191,6.87302093 L8.317,6.87302093 L8.818,6.87302093 L8.901,6.87302093 C9.736,6.87302093 10.455,7.34602093 10.828,8.03302093 L10.955,8.30402093 C11.045,8.54402093 11.101,8.80102093 11.101,9.07302093 L11.101,9.74802093 C11.2,9.67202093 11.288,9.57602093 11.354,9.46102093 L12.804,6.94902093 C13.08,6.47202093 12.916,5.85902093 12.438,5.58402093 L12.438,5.58402093 Z M9.808,6.29002093 L8.942,5.79002093 L9.442,4.92402093 L10.308,5.42402093 L9.808,6.29002093 L9.808,6.29002093 Z M11.54,7.29002093 L10.674,6.79002093 L11.174,5.92402093 L12.04,6.42402093 L11.54,7.29002093 L11.54,7.29002093 Z M8.9,8.07302093 L6,8.07302093 C5.448,8.07302093 5,8.52102093 5,9.07302093 L5,11.9730209 C5,12.5250209 5.448,12.9730209 6,12.9730209 L8.9,12.9730209 C9.452,12.9730209 9.9,12.5250209 9.9,11.9730209 L9.9,9.07302093 C9.9,8.52102093 9.453,8.07302093 8.9,8.07302093 L8.9,8.07302093 Z M6.976,10.0000209 L5.976,10.0000209 L5.976,9.00002093 L6.976,9.00002093 L6.976,10.0000209 L6.976,10.0000209 Z M8.976,10.0000209 L7.976,10.0000209 L7.976,9.00002093 L8.976,9.00002093 L8.976,10.0000209 L8.976,10.0000209 Z M6.976,12.0000209 L5.976,12.0000209 L5.976,11.0000209 L6.976,11.0000209 L6.976,12.0000209 L6.976,12.0000209 Z M8.976,12.0000209 L7.976,12.0000209 L7.976,11.0000209 L8.976,11.0000209 L8.976,12.0000209 L8.976,12.0000209 Z" id="Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+    <g id="POI-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Artboard-1" transform="translate(-387.000000, -846.000000)">
+            <g id="casino-s" transform="translate(387.000000, 846.000000)">
+                <path d="M8.5,17 C3.813,17 0,13.188 0,8.5 C0,3.812 3.813,0 8.5,0 C13.187,0 17,3.812 17,8.5 C17,13.188 13.187,17 8.5,17 L8.5,17 Z" id="Shape" fill-opacity="0.1" fill="#FFFFFF"></path>
+                <ellipse id="Oval" fill="#26160D" cx="8.5" cy="8.5" rx="7.5" ry="7.5"></ellipse>
+                <path d="M12.438,5.58402093 L9.927,4.13402093 C9.448,3.85802093 8.837,4.02202093 8.561,4.50002093 L7.191,6.87302093 L8.317,6.87302093 L8.818,6.87302093 L8.901,6.87302093 C9.736,6.87302093 10.455,7.34602093 10.828,8.03302093 L10.955,8.30402093 C11.045,8.54402093 11.101,8.80102093 11.101,9.07302093 L11.101,9.74802093 C11.2,9.67202093 11.288,9.57602093 11.354,9.46102093 L12.804,6.94902093 C13.08,6.47202093 12.916,5.85902093 12.438,5.58402093 L12.438,5.58402093 Z M9.808,6.29002093 L8.942,5.79002093 L9.442,4.92402093 L10.308,5.42402093 L9.808,6.29002093 L9.808,6.29002093 Z M11.54,7.29002093 L10.674,6.79002093 L11.174,5.92402093 L12.04,6.42402093 L11.54,7.29002093 L11.54,7.29002093 Z M8.9,8.07302093 L6,8.07302093 C5.448,8.07302093 5,8.52102093 5,9.07302093 L5,11.9730209 C5,12.5250209 5.448,12.9730209 6,12.9730209 L8.9,12.9730209 C9.452,12.9730209 9.9,12.5250209 9.9,11.9730209 L9.9,9.07302093 C9.9,8.52102093 9.453,8.07302093 8.9,8.07302093 L8.9,8.07302093 Z M6.976,10.0000209 L5.976,10.0000209 L5.976,9.00002093 L6.976,9.00002093 L6.976,10.0000209 L6.976,10.0000209 Z M8.976,10.0000209 L7.976,10.0000209 L7.976,9.00002093 L8.976,9.00002093 L8.976,10.0000209 L8.976,10.0000209 Z M6.976,12.0000209 L5.976,12.0000209 L5.976,11.0000209 L6.976,11.0000209 L6.976,12.0000209 L6.976,12.0000209 Z M8.976,12.0000209 L7.976,12.0000209 L7.976,11.0000209 L8.976,11.0000209 L8.976,12.0000209 L8.976,12.0000209 Z" id="Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+            </g>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/charging-station-l.svg b/data/styles/clear/style-night/symbols/charging-station-l.svg
index 848f813364..89b8b604a8 100644
--- a/data/styles/clear/style-night/symbols/charging-station-l.svg
+++ b/data/styles/clear/style-night/symbols/charging-station-l.svg
@@ -1,18 +1,19 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <svg width="27px" height="27px" viewBox="0 0 27 27" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
     <title>charging-station-l</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
-    <g id="POI-NIght" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="charging-station-l">
-            <g id="POI">
-                <g>
-                    <g id="charging-station-l">
-                        <circle id="Oval-1-Copy-39" fill-opacity="0.1" fill="#FFFFFF" cx="13.5" cy="13.5" r="13.5"></circle>
-                        <circle id="Oval-1-Copy-38" fill="#252522" cx="13.5" cy="13.5" r="12.5"></circle>
-                        <path d="M8,4.5 C7.4459904,4.5 7,4.946 7,5.5 L7,21.5 C7,22 7.5,22.5 8,22.5 L17,22.5 C17.5,22.5 18,22 18,21.5 L18,16.5 L18.5,16.5 C19,16.5 19,17 19,17 L19,19 C19,20 19.5,20.5 20.5,20.5 C21.5,20.5 22,20 22,19 L22,13.5 C22,12.5 20,11.5 20,10.5 L20,7.5 L19,7.5 L18,6.5 L18,5.5 C18,4.946 17.55401,4.5 17,4.5 L8,4.5 L8,4.5 Z M9,6.5 L16,6.5 L16,10.5 L9,10.5 L9,6.5 L9,6.5 Z M18,9.5 L19,9.5 L19,11 C19,12 21,13 21,14 L21,19 C21,19.5 20.5,19.5 20.5,19.5 C20.5,19.5 20,19.5 20,19 L20,16.5 C20,16 19.5,15.5 19,15.5 L18,15.5 L18,9.5 L18,9.5 Z" id="rect7223-2-4-9-copy" fill-opacity="0.7" fill="#FFFFFF"></path>
-                        <polygon id="Path-1152" fill="#262622" points="12 12 15 12 13 14.9984132 15 14.9984132 9 21 12.0167446 15.9992066 9 15.9992066"></polygon>
+    <g id="POI-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Artboard-1" transform="translate(-677.000000, -100.000000)">
+            <g id="charging-station-l" transform="translate(677.000000, 69.000000)">
+                <g id="POI">
+                    <g>
+                        <g id="charging-station-l">
+                            <circle id="Oval-1-Copy-39" fill-opacity="0.1" fill="#FFFFFF" cx="13.5" cy="44.5" r="13.5"></circle>
+                            <circle id="Oval-1-Copy-38" fill="#252522" cx="13.5" cy="44.5" r="12.5"></circle>
+                            <path d="M8.99703014,37 C8.4463856,37 8,37.4499488 8,38.0068455 L8,51 L7,51 L7,52 L7.1953125,52 L17,52 L17,51 L16,51 L16,38.0068455 C16,37.4507801 15.5469637,37 15.0029699,37 L8.99703014,37 Z M11.25,49 L11.925,45.4356436 L9,45.4356436 L12.75,40 L12,43.5643564 L15,43.5643564 L11.25,49 Z M21.0602306,44.5739437 C20.9943707,44.3204225 20.9285109,44.1091549 20.9285109,43.8767606 L20.9285109,42.9260563 L20.9943707,42.9260563 L21.6529691,42.165493 C21.6529691,42.165493 21.9164084,39.7359155 18.2282577,38.3838028 L17.7452856,39.1232394 C17.7452856,39.1232394 19.5454544,40.7288732 19.5235011,42.3133803 L19.9625667,42.9260563 L19.9625667,43.8767606 C19.9625667,44.1725352 20.0284265,44.5105634 20.1162396,44.7852113 L20.9724174,48.6725352 C21.0602306,49.0739437 20.9943707,49.4542254 20.7528847,49.7711268 C20.4894453,50.0669014 20.1162396,50.2570423 19.6991273,50.2570423 C18.9746692,50.2570423 18.4038839,49.7077465 18.3599774,49.0105634 L18.7331831,45.9049296 L18.7331831,45.8415493 C18.7331831,44.9330986 17.9428651,44.1302817 16.9988741,44.1302817 L16,44.1302817 L16,45.0387324 L16.9988741,45.0387324 C17.4379397,45.0387324 17.7891922,45.3767606 17.7891922,45.7992958 L17.4379397,48.9471831 L17.4379397,49.0105634 C17.4379397,50.2359155 18.4477905,51.2077465 19.7210806,51.2077465 C20.4235855,51.2077465 21.0821838,50.9119718 21.5212494,50.3626761 C21.960315,49.7922535 22.0920346,49.0950704 21.9383617,48.4612676 L21.0602306,44.5739437 L21.0602306,44.5739437 Z" id="Combined-Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+                        </g>
                     </g>
                 </g>
             </g>
diff --git a/data/styles/clear/style-night/symbols/charging-station-m.svg b/data/styles/clear/style-night/symbols/charging-station-m.svg
index 15e07ff05e..145c6f3422 100644
--- a/data/styles/clear/style-night/symbols/charging-station-m.svg
+++ b/data/styles/clear/style-night/symbols/charging-station-m.svg
@@ -1,15 +1,16 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <svg width="23px" height="23px" viewBox="0 0 23 23" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
     <title>charging-station-m</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
-    <g id="POI-NIght" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="charging-station-m">
-            <ellipse id="Oval-1-Copy-41" fill-opacity="0.1" fill="#FFFFFF" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
-            <ellipse id="Oval-1-Copy-40" fill="#252522" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
-            <path d="M8,5 C7.5,5 7,5.5 7,6 L7,17 C7,17.5 7.5,18 8,18 L14,18 C14.5,18 15,17.5 15,17 L15,14 L15.25,14 C15.38687,14 15.5,14.096 15.5,14.25 L15.5,15 C15.5,15.5 16,16 16.5,16 L17,16 C17.5,16 18,15.5928 18,15 L18,11.5 C18,10.5 17,10.5 17,9.5002 L17,8.0002 L16,8.0002 L15,7 L15,6.0002 C15,5.5002 14.5,5.0002 14,5.0002 L8,5 Z M8,6.5 L14,6.5 L14,9 L8,9 L8,6.5 Z M15,10 L16,10 C16,11 17,11 17,12 L17,14.75 C17,15 16.75002,15 16.75002,15 C16.75002,15 16.5,15 16.50002,14.75 L16.50002,14 C16.50002,13.4094 16.00064,12.9986 15.50002,13 L14.99993,12.9998 L15,10 Z" id="rect7223-2-4-9-4-2-3-copy" fill-opacity="0.7" fill="#FFFFFF"></path>
-            <polygon id="Path-1152" fill="#262622" points="10.3333333 11 12.6666667 11 11 13 13.0419922 13 9 17.0062256 10.5 14 9 14"></polygon>
+    <g id="POI-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Artboard-1" transform="translate(-714.000000, -102.000000)">
+            <g id="charging-station-m" transform="translate(714.000000, 102.000000)">
+                <ellipse id="Oval-1-Copy-41" fill-opacity="0.1" fill="#FFFFFF" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
+                <ellipse id="Oval-1-Copy-40" fill="#252522" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+                <path d="M8.00292933,5 C7.44902676,5 7,5.45576096 7,6.00247329 L7,17 L6,17 L6,18 L15,18 L15,17 L14,17 L14,6.00247329 C14,5.44882258 13.5621186,5 12.9970707,5 L8.00292933,5 Z M18.2204225,11.5640845 C18.165493,11.3443662 18.1105634,11.1612676 18.1105634,10.9598592 L18.1105634,10.1359155 L18.165493,10.1359155 L18.7147887,9.47676056 C18.7147887,9.47676056 18.934507,7.37112676 15.8584507,6.19929577 L15.4556338,6.84014085 C15.4556338,6.84014085 16.9570423,8.23169014 16.9387324,9.60492958 L17.3049296,10.1359155 L17.3049296,10.9598592 C17.3049296,11.2161972 17.3598592,11.5091549 17.4330986,11.7471831 L18.1471831,15.1161972 C18.2204225,15.4640845 18.165493,15.793662 17.9640845,16.0683099 C17.7443662,16.3246479 17.4330986,16.4894366 17.0852113,16.4894366 C16.4809859,16.4894366 16.0049296,16.0133803 15.9683099,15.4091549 L16.2795775,12.7176056 L16.2795775,12.6626761 C16.2795775,11.8753521 15.6204225,11.1795775 14.8330986,11.1795775 L14,11.1795775 L14,11.9669014 L14.8330986,11.9669014 C15.1992958,11.9669014 15.4922535,12.2598592 15.4922535,12.6260563 L15.1992958,15.3542254 L15.1992958,15.4091549 C15.1992958,16.4711268 16.0415493,17.3133803 17.1035211,17.3133803 C17.6894366,17.3133803 18.2387324,17.0570423 18.6049296,16.5809859 C18.9711268,16.0866197 19.0809859,15.4823944 18.9528169,14.9330986 L18.2204225,11.5640845 Z M9.875,15 L10.4375,12.2277228 L8,12.2277228 L11.125,8 L10.5,10.7722772 L13,10.7722772 L9.875,15 Z" id="Combined-Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+            </g>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/charging-station-s.svg b/data/styles/clear/style-night/symbols/charging-station-s.svg
index 70c01a0f6c..2aa45dde7d 100644
--- a/data/styles/clear/style-night/symbols/charging-station-s.svg
+++ b/data/styles/clear/style-night/symbols/charging-station-s.svg
@@ -1,15 +1,16 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <svg width="17px" height="17px" viewBox="0 0 17 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
     <title>charging-station-s</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
-    <g id="POI-NIght" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="charging-station-s">
-            <circle id="Oval-1-Copy-43" fill-opacity="0.1" fill="#FFFFFF" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-42" fill="#252522" cx="8.5" cy="8.5" r="7.5"></circle>
-            <path d="M5.5,4 C5.22299,4 5,4.223 5,4.5 L5,12.5 C5,12.75 5.25,13 5.5,13 L9.5,13 C9.75,13 10,12.75 10,12.5 L10,12 L11.25,12 C11.75,12 12,11.75 12,11.25 L12,8.5 C12,8 11,7.5 11,7 L11,6.75 L11,6 L10,5 L10,4.5 C10,4.223 9.777,4 9.5,4 L5.5,4 L5.5,4 Z M6,5 L9,5 L9,7 L6,7 L6,5 L6,5 Z M10,6.5 L10.5,6.5 L10.5,7.25 C10.5,7.75 11.5,8.25 11.5,8.75 L11.5,11 L11.5,11.25 C11.5,11.5 11.25,11.5 11.25,11.5 L10.5,11.5 L10.5,10 L10,10 L10,6.5 L10,6.5 Z" id="rect7223-2-4-9-3-copy" fill-opacity="0.7" fill="#FFFFFF"></path>
-            <polygon id="Path-1152" fill="#262622" points="6.88934957 8 9 8 7.5 9.5 9 9.5 6 12.0062256 7.00051826 10.0010365 6 10.0010365"></polygon>
+    <g id="POI-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Artboard-1" transform="translate(-747.000000, -105.000000)">
+            <g id="charging-station-s" transform="translate(747.000000, 105.000000)">
+                <circle id="Oval-1-Copy-43" fill-opacity="0.1" fill="#FFFFFF" cx="8.5" cy="8.5" r="8.5"></circle>
+                <circle id="Oval-1-Copy-42" fill="#252522" cx="8.5" cy="8.5" r="7.5"></circle>
+                <path d="M5.49769878,4 C5.22282734,4 5,4.23079681 5,4.50043583 L5,12 L4.5,12 L4.5,13 L10.5,13 L10.5,12 L10,12 L10,4.50043583 C10,4.22405275 9.78515625,4 9.50230122,4 L5.49769878,4 Z M12.9518012,8.5443662 C12.9133829,8.39225352 12.8749647,8.26549296 12.8749647,8.12605634 L12.8749647,7.5556338 L12.9133829,7.5556338 L13.2975653,7.09929577 C13.2975653,7.09929577 13.4512382,5.6415493 11.299817,4.83028169 L11.0180833,5.27394366 C11.0180833,5.27394366 12.0681817,6.23732394 12.0553756,7.18802817 L12.3114972,7.5556338 L12.3114972,8.12605634 C12.3114972,8.30352113 12.3499155,8.50633803 12.4011398,8.67112676 L12.9005768,11.0035211 C12.9518012,11.2443662 12.9133829,11.4725352 12.7725161,11.6626761 C12.6188431,11.8401408 12.4011398,11.9542254 12.1578243,11.9542254 C11.7352237,11.9542254 11.4022656,11.6246479 11.3766535,11.206338 L11.5943568,9.34295775 L11.5943568,9.30492958 C11.5943568,8.75985915 11.133338,8.27816901 10.5826766,8.27816901 L10,8.27816901 L10,8.82323944 L10.5826766,8.82323944 C10.8387982,8.82323944 11.0436954,9.02605634 11.0436954,9.27957746 L10.8387982,11.1683099 L10.8387982,11.206338 C10.8387982,11.9415493 11.4278778,12.5246479 12.1706304,12.5246479 C12.5804249,12.5246479 12.9646072,12.3471831 13.2207288,12.0176056 C13.4768504,11.6753521 13.5536869,11.2570423 13.4640443,10.8767606 L12.9518012,8.5443662 Z M7.125,11 L7.4625,9.01980198 L6,9.01980198 L7.875,6 L7.5,7.98019802 L9,7.98019802 L7.125,11 Z" id="Combined-Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+            </g>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/christian-l.svg b/data/styles/clear/style-night/symbols/christian-l.svg
index 5335721556..78e0b7662a 100644
--- a/data/styles/clear/style-night/symbols/christian-l.svg
+++ b/data/styles/clear/style-night/symbols/christian-l.svg
@@ -1,14 +1,16 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <svg width="27px" height="27px" viewBox="0 0 27 27" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
     <title>christian-l</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
-    <g id="POI-NIght" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="christian-l">
-            <circle id="Oval-1-Copy-39" fill-opacity="0.1" fill="#FFFFFF" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#26160D" cx="13.5" cy="13.5" r="12.5"></circle>
-            <path d="M15,9 L15,5 L12,5 L12,9 L7,9 L7,12 L12,12 L12,22 L15,22 L15,12 L20,12 L20,9 L15,9 Z" id="Combined-Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+    <g id="POI-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Artboard-1" transform="translate(-317.000000, -952.000000)">
+            <g id="christian-l" transform="translate(317.000000, 952.000000)">
+                <circle id="Oval-1-Copy-39" fill-opacity="0.1" fill="#FFFFFF" cx="13.5" cy="13.5" r="13.5"></circle>
+                <circle id="Oval-1-Copy-38" fill="#26160D" cx="13.5" cy="13.5" r="12.5"></circle>
+                <path d="M15,9 L15,5 L12,5 L12,9 L7,9 L7,12 L12,12 L12,22 L15,22 L15,12 L20,12 L20,9 L15,9 Z" id="Combined-Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+            </g>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/christian-m.svg b/data/styles/clear/style-night/symbols/christian-m.svg
index bbe3e68c77..579aad0f98 100644
--- a/data/styles/clear/style-night/symbols/christian-m.svg
+++ b/data/styles/clear/style-night/symbols/christian-m.svg
@@ -1,14 +1,17 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <svg width="23px" height="23px" viewBox="0 0 23 23" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
     <title>christian-m</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
-    <g id="POI-NIght" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="christian-m">
-            <ellipse id="Oval-1-Copy-41" fill-opacity="0.1" fill="#FFFFFF" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
-            <ellipse id="Oval-1-Copy-40" fill="#26160D" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+    <g id="POI-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Artboard-1" transform="translate(-354.000000, -954.000000)">
+            <g id="christian-m" transform="translate(354.000000, 954.000000)">
+                <ellipse id="Oval-1-Copy-41" fill-opacity="0.1" fill="#FFFFFF" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
+                <ellipse id="Oval-1-Copy-40" fill="#26160D" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+                <rect id="Rectangle-333" fill-opacity="0.7" fill="#FFFFFF" x="10.5" y="5" width="2" height="13"></rect>
+                <rect id="Rectangle-334" fill-opacity="0.7" fill="#FFFFFF" x="7" y="8" width="9" height="2"></rect>
+            </g>
         </g>
-        <path d="M12.5,8 L12.5,5 L10.5,5 L10.5,8 L7,8 L7,10 L10.5,10 L10.5,18 L12.5,18 L12.5,10 L16,10 L16,8 L12.5,8 Z" id="Combined-Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/christian-s.svg b/data/styles/clear/style-night/symbols/christian-s.svg
index 85b873e61e..903cdcf353 100644
--- a/data/styles/clear/style-night/symbols/christian-s.svg
+++ b/data/styles/clear/style-night/symbols/christian-s.svg
@@ -1,14 +1,17 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <svg width="17px" height="17px" viewBox="0 0 17 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
     <title>christian-s</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
-    <g id="POI-NIght" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="christian-s">
-            <circle id="Oval-1-Copy-43" fill-opacity="0.1" fill="#FFFFFF" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-42" fill="#26160D" cx="8.5" cy="8.5" r="7.5"></circle>
-            <path d="M9,6 L9,3 L8,3 L8,6 L5,6 L5,7 L8,7 L8,14 L9,14 L9,7 L12,7 L12,6 L9,6 Z" id="Combined-Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+    <g id="POI-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Artboard-1" transform="translate(-387.000000, -957.000000)">
+            <g id="christian-s" transform="translate(387.000000, 957.000000)">
+                <circle id="Oval-1-Copy-43" fill-opacity="0.1" fill="#FFFFFF" cx="8.5" cy="8.5" r="8.5"></circle>
+                <circle id="Oval-1-Copy-42" fill="#26160D" cx="8.5" cy="8.5" r="7.5"></circle>
+                <rect id="Rectangle-335" fill-opacity="0.7" fill="#FFFFFF" x="8" y="3" width="1" height="11"></rect>
+                <rect id="Rectangle-336" fill-opacity="0.7" fill="#FFFFFF" x="5" y="6" width="7" height="1"></rect>
+            </g>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/cinema-l.svg b/data/styles/clear/style-night/symbols/cinema-l.svg
index d8b05db6fa..e783167da9 100644
--- a/data/styles/clear/style-night/symbols/cinema-l.svg
+++ b/data/styles/clear/style-night/symbols/cinema-l.svg
@@ -1,14 +1,16 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <svg width="27px" height="27px" viewBox="0 0 27 27" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
     <title>cinema-l</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
-    <g id="POI-NIght" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="cinema-l">
-            <circle id="Oval-1-Copy-39" fill-opacity="0.1" fill="#FFFFFF" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#26160D" cx="13.5" cy="13.5" r="12.5"></circle>
-            <path d="M19,5 L16.75,5.6563 L17.84375,8.625 L20,8 L19,5 Z M15.375,6.0313 L12.4375,6.875 L12.5,7 L13.0625,8.5313 L13.5625,9.8438 L16.5,9 L15.375,6.0313 Z M11.09375,7.25 L8.5,8 L9.625,10.9688 L12.21875,10.2188 L11.5625,8.5313 L11.09375,7.25 Z M7.15625,8.375 L5,9 L6,12 L8.25,11.3438 L7.15625,8.375 Z M6,12 L6,21 C6,21.554 6.44599,22 7,22 L20,22 C20.55401,22 21,21.554 21,21 L21,12 L6,12 Z M8,14 L19,14 L19,17 L8,17 L8,14 Z" id="rect7568-8-4-copy" fill-opacity="0.7" fill="#FFFFFF"></path>
+    <g id="POI-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Artboard-1" transform="translate(-317.000000, -804.000000)">
+            <g id="cinema-l" transform="translate(317.000000, 804.000000)">
+                <circle id="Oval-1-Copy-39" fill-opacity="0.1" fill="#FFFFFF" cx="13.5" cy="13.5" r="13.5"></circle>
+                <circle id="Oval-1-Copy-38" fill="#26160D" cx="13.5" cy="13.5" r="12.5"></circle>
+                <path d="M21,18 L21,9 L20,9 L20,7 L20.999975,7 C20.9959652,6.4449157 20.5464468,6 19.992516,6 L7.00748397,6 C6.45142662,6 6.00403105,6.44702693 6.00002709,7 L7,7 L7,9 L6,9 L6,18 L7,18 L7,20 L6.00002505,20 C6.00403476,20.5550843 6.45355321,21 7.00748397,21 L19.992516,21 C20.5485734,21 20.995969,20.5529731 20.9999729,20 L20,20 L20,18 L21,18 Z M8,7 L10,7 L10,9 L8,9 L8,7 Z M11,7 L13,7 L13,9 L11,9 L11,7 Z M14,7 L16,7 L16,9 L14,9 L14,7 Z M17,7 L19,7 L19,9 L17,9 L17,7 Z M8,18 L10,18 L10,20 L8,20 L8,18 Z M11,18 L13,18 L13,20 L11,20 L11,18 Z M14,18 L16,18 L16,20 L14,20 L14,18 Z M17,18 L19,18 L19,20 L17,20 L17,18 Z M11.5,10.802989 C11.5,10.3595104 11.7977991,10.2084594 12.1536627,10.4575639 L15.8463373,13.0424361 C16.2073452,13.2951417 16.2022009,13.7084594 15.8463373,13.9575639 L12.1536627,16.5424361 C11.7926548,16.7951417 11.5,16.6432453 11.5,16.197011 L11.5,10.802989 Z" id="Combined-Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+            </g>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/cinema-m.svg b/data/styles/clear/style-night/symbols/cinema-m.svg
index a858a818f7..387c88fbe0 100644
--- a/data/styles/clear/style-night/symbols/cinema-m.svg
+++ b/data/styles/clear/style-night/symbols/cinema-m.svg
@@ -1,14 +1,16 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <svg width="23px" height="23px" viewBox="0 0 23 23" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
     <title>cinema-m</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
-    <g id="POI-NIght" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="cinema-m">
-            <ellipse id="Oval-1-Copy-41" fill-opacity="0.1" fill="#FFFFFF" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
-            <ellipse id="Oval-1-Copy-40" fill="#26160D" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
-            <path d="M16.23529,4.65997314 L14.5147,5.16177314 L15.3511,7.43207314 L17,6.95407314 L16.23529,4.65997314 Z M13.46323,5.44857314 L11.21691,6.09377314 L12.0772,8.36397314 L14.32353,7.71877314 L13.46323,5.44857314 Z M10.18933,6.38057314 L8.20588,6.95407314 L9.06617,9.22427314 L11.04963,8.65077314 L10.18933,6.38057314 Z M7.17831,7.24087314 L5,8.01107314 L6,10.0110731 L8.0147,9.51107314 L7.17831,7.24087314 Z M6,10.0110731 L6,17.0110731 C6,17.5110731 6.5,18.0110731 7,18.0110731 L17,18.0110731 C17.5,18.0110731 18,17.5110731 18,17.0110731 L18,10.0110731 L6,10.0110731 Z M8,12.0110731 L16,12.0110731 L16,14.0110731 L8,14.0110731 L8,12.0110731 Z" id="rect7568-8-4-7-copy" fill-opacity="0.7" fill="#FFFFFF"></path>
+    <g id="POI-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Artboard-1" transform="translate(-354.000000, -806.000000)">
+            <g id="cinema-m" transform="translate(354.000000, 806.000000)">
+                <ellipse id="Oval-1-Copy-41" fill-opacity="0.1" fill="#FFFFFF" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
+                <ellipse id="Oval-1-Copy-40" fill="#26160D" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+                <path d="M5,5.99850233 C5,5.44704472 5.44748943,5 5.99850233,5 L17.0014977,5 C17.5529553,5 18,5.44748943 18,5.99850233 L18,17.0014977 C18,17.5529553 17.5525106,18 17.0014977,18 L5.99850233,18 C5.44704472,18 5,17.5525106 5,17.0014977 L5,5.99850233 Z M5,6 L6,6 L6,7.5 L5,7.5 L5,6 Z M7,6 L8.5,6 L8.5,7.5 L7,7.5 L7,6 Z M9.5,6 L11,6 L11,7.5 L9.5,7.5 L9.5,6 Z M12,6 L13.5,6 L13.5,7.5 L12,7.5 L12,6 Z M14.5,6 L16,6 L16,7.5 L14.5,7.5 L14.5,6 Z M17,6 L18,6 L18,7.5 L17,7.5 L17,6 Z M5,15.5 L6,15.5 L6,17 L5,17 L5,15.5 Z M7,15.5 L8.5,15.5 L8.5,17 L7,17 L7,15.5 Z M9.5,15.5 L11,15.5 L11,17 L9.5,17 L9.5,15.5 Z M12,15.5 L13.5,15.5 L13.5,17 L12,17 L12,15.5 Z M14.5,15.5 L16,15.5 L16,17 L14.5,17 L14.5,15.5 Z M17,15.5 L18,15.5 L18,17 L17,17 L17,15.5 Z M10,9.52566914 C10,9.0879134 10.2960744,8.93197272 10.6614448,9.17746268 L13.4554154,11.0547132 C13.8207213,11.3001598 13.8207858,11.698064 13.4554154,11.943554 L10.6614448,13.8208045 C10.2961389,14.0662511 10,13.9022429 10,13.472598 L10,9.52566914 Z" id="Combined-Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+            </g>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/cinema-s.svg b/data/styles/clear/style-night/symbols/cinema-s.svg
index 07d6b9ee13..9ea389fdc0 100644
--- a/data/styles/clear/style-night/symbols/cinema-s.svg
+++ b/data/styles/clear/style-night/symbols/cinema-s.svg
@@ -1,14 +1,16 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <svg width="17px" height="17px" viewBox="0 0 17 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
     <title>cinema-s</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
-    <g id="POI-NIght" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="cinema-s">
-            <circle id="Oval-1-Copy-43" fill-opacity="0.1" fill="#FFFFFF" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-42" fill="#26160D" cx="8.5" cy="8.5" r="7.5"></circle>
-            <path d="M11.5,4.5 L4.5,6.5 L5,8 L12,6 L11.5,4.5 L11.5,4.5 Z M5,8 L5,12.5 C5,12.8077 5.19231,13 5.5,13 L11.5,13 C11.80769,13 12,12.8077 12,12.5 L12,8 L5,8 L5,8 Z M6,9 L11,9 L11,10 L6,10 L6,9 L6,9 Z" id="rect7568-8-4-7-5-copy" fill-opacity="0.7" fill="#FFFFFF"></path>
+    <g id="POI-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Artboard-1" transform="translate(-387.000000, -809.000000)">
+            <g id="cinema-s" transform="translate(387.000000, 809.000000)">
+                <circle id="Oval-1-Copy-43" fill-opacity="0.1" fill="#FFFFFF" cx="8.5" cy="8.5" r="8.5"></circle>
+                <circle id="Oval-1-Copy-42" fill="#26160D" cx="8.5" cy="8.5" r="7.5"></circle>
+                <path d="M4,4.99754465 C4,4.44661595 4.4463114,4 4.99754465,4 L12.0024554,4 C12.553384,4 13,4.4463114 13,4.99754465 L13,12.0024554 C13,12.553384 12.5536886,13 12.0024554,13 L4.99754465,13 C4.44661595,13 4,12.5536886 4,12.0024554 L4,4.99754465 Z M4,5 L5,5 L5,6 L4,6 L4,5 Z M6,5 L7,5 L7,6 L6,6 L6,5 Z M8,5 L9,5 L9,6 L8,6 L8,5 Z M10,5 L11,5 L11,6 L10,6 L10,5 Z M12,5 L13,5 L13,6 L12,6 L12,5 Z M4,11 L5,11 L5,12 L4,12 L4,11 Z M6,11 L7,11 L7,12 L6,12 L6,11 Z M8,11 L9,11 L9,12 L8,12 L8,11 Z M10,11 L11,11 L11,12 L10,12 L10,11 Z M12,11 L13,11 L13,12 L12,12 L12,11 Z M7.5,7.3911331 C7.5,7.06357038 7.71976145,6.96749449 7.96821243,7.1590842 L9.23956321,8.13946966 C9.4981498,8.33887531 9.48801419,8.66999168 9.23956321,8.86158139 L7.96821243,9.84196685 C7.70962584,10.0413725 7.5,9.93583852 7.5,9.60991796 L7.5,7.3911331 Z" id="Combined-Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+            </g>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/fastfood-l.svg b/data/styles/clear/style-night/symbols/fastfood-l.svg
index 82080041f8..68bb0198b6 100644
--- a/data/styles/clear/style-night/symbols/fastfood-l.svg
+++ b/data/styles/clear/style-night/symbols/fastfood-l.svg
@@ -1,15 +1,17 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <svg width="28px" height="27px" viewBox="0 0 28 27" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
     <title>fastfood-l</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
-    <g id="POI-NIght" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="fastfood-l" transform="translate(0.500000, 0.000000)">
-            <circle id="Oval-1-Copy-39" fill-opacity="0.1" fill="#FFFFFF" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#332714" cx="13.5" cy="13.5" r="12.5"></circle>
-            <g id="g16674-copy" transform="translate(4.000000, 7.000000)" fill-opacity="0.7" fill="#FFFFFF">
-                <path d="M8,0 C5,0 1,1.5 1,4 L1,6 L18,6 L18,4 C17.99998,1.5 14,0 11,0 L8,0 Z M7.5,1 C7.777,1 8,1.223 8,1.5 C8,1.777 7.777,2 7.5,2 C7.223,2 7,1.777 7,1.5 C7,1.223 7.223,1 7.5,1 L7.5,1 Z M11.5,1 C11.777,1 12,1.223 12,1.5 C12,1.777 11.777,2 11.5,2 C11.223,2 11,1.777 11,1.5 C11,1.223 11.223,1 11.5,1 L11.5,1 Z M5.5,3 C5.777,3 6,3.223 6,3.5 C6,3.777 5.777,4 5.5,4 C5.223,4 5,3.777 5,3.5 C5,3.223 5.223,3 5.5,3 L5.5,3 Z M9.5,3 C9.777,3 10,3.223 10,3.5 C10,3.777 9.777,4 9.5,4 C9.223,4 9,3.777 9,3.5 C9,3.223 9.223,3 9.5,3 L9.5,3 Z M13.5,3 C13.777,3 14,3.223 14,3.5 C14,3.777 13.777,4 13.5,4 C13.223,4 13,3.777 13,3.5 C13,3.223 13.223,3 13.5,3 L13.5,3 Z M1,7 C0.49997,7 -9.99999997e-06,7.5 0,8 C9.99999997e-06,8.5 0.49997,9 1,9 L18,9 C18.50001,9 18.99999,8.5 19,8 C19,7.5 18.5,7 18,7 L1,7 Z M1,10 L1,11 C1,12 2,13 3,13 L16,13 C17,13 18,12 18,11 L18,10 L1,10 Z" id="rect13326-2-5-2-3"></path>
+    <g id="POI-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Artboard-1" transform="translate(-137.000000, -507.000000)">
+            <g id="fastfood-l" transform="translate(137.500000, 507.000000)">
+                <circle id="Oval-1" fill-opacity="0.1" fill="#FFFFFF" cx="13.5" cy="13.5" r="13.5"></circle>
+                <circle id="Oval-1" fill="#332714" cx="13.5" cy="13.5" r="12.5"></circle>
+                <g id="g16674" transform="translate(4.000000, 7.000000)" fill-opacity="0.7" fill="#FFFFFF">
+                    <path d="M8,0 C5,0 1,1.5 1,4 L1,6 L18,6 L18,4 C17.99998,1.5 14,0 11,0 L8,0 Z M7.5,1 C7.777,1 8,1.223 8,1.5 C8,1.777 7.777,2 7.5,2 C7.223,2 7,1.777 7,1.5 C7,1.223 7.223,1 7.5,1 L7.5,1 Z M11.5,1 C11.777,1 12,1.223 12,1.5 C12,1.777 11.777,2 11.5,2 C11.223,2 11,1.777 11,1.5 C11,1.223 11.223,1 11.5,1 L11.5,1 Z M5.5,3 C5.777,3 6,3.223 6,3.5 C6,3.777 5.777,4 5.5,4 C5.223,4 5,3.777 5,3.5 C5,3.223 5.223,3 5.5,3 L5.5,3 Z M9.5,3 C9.777,3 10,3.223 10,3.5 C10,3.777 9.777,4 9.5,4 C9.223,4 9,3.777 9,3.5 C9,3.223 9.223,3 9.5,3 L9.5,3 Z M13.5,3 C13.777,3 14,3.223 14,3.5 C14,3.777 13.777,4 13.5,4 C13.223,4 13,3.777 13,3.5 C13,3.223 13.223,3 13.5,3 L13.5,3 Z M1,7 C0.49997,7 -9.99999997e-06,7.5 0,8 C9.99999997e-06,8.5 0.49997,9 1,9 L18,9 C18.50001,9 18.99999,8.5 19,8 C19,7.5 18.5,7 18,7 L1,7 Z M1,10 L1,11 C1,12 2,13 3,13 L16,13 C17,13 18,12 18,11 L18,10 L1,10 Z" id="rect13326-2-5-2-3"></path>
+                </g>
             </g>
         </g>
     </g>
diff --git a/data/styles/clear/style-night/symbols/fastfood-m.svg b/data/styles/clear/style-night/symbols/fastfood-m.svg
index 1b69561c3d..3387e55c28 100644
--- a/data/styles/clear/style-night/symbols/fastfood-m.svg
+++ b/data/styles/clear/style-night/symbols/fastfood-m.svg
@@ -1,14 +1,16 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <svg width="24px" height="23px" viewBox="0 0 24 23" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
     <title>fastfood-m</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
-    <g id="POI-NIght" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="fastfood-m" transform="translate(0.500000, 0.000000)">
-            <ellipse id="Oval-1-Copy-41" fill-opacity="0.1" fill="#FFFFFF" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
-            <ellipse id="Oval-1-Copy-40" fill="#332714" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
-            <path d="M11,7 C8.94737,7 5.5,7.7895 5.5,9.5 L5.5,11 L17.5,11 L17.5,9.5 C17.5,7.7895 14.05263,7 12,7 L11,7 Z M9,8.125 C9.20711,8.125 9.375,8.2929 9.375,8.5 C9.375,8.7071 9.20711,8.875 9,8.875 C8.79289,8.875 8.625,8.7071 8.625,8.5 C8.625,8.2929 8.79289,8.125 9,8.125 L9,8.125 Z M14,8.125 C14.20711,8.125 14.375,8.2929 14.375,8.5 C14.375,8.7071 14.20711,8.875 14,8.875 C13.79289,8.875 13.625,8.7071 13.625,8.5 C13.625,8.2929 13.79289,8.125 14,8.125 L14,8.125 Z M7,9.125 C7.20711,9.125 7.375,9.2929 7.375,9.5 C7.375,9.7071 7.20711,9.875 7,9.875 C6.79289,9.875 6.625,9.7071 6.625,9.5 C6.625,9.2929 6.79289,9.125 7,9.125 L7,9.125 Z M11.375,9.125 C11.58211,9.125 11.75,9.2929 11.75,9.5 C11.75,9.7071 11.58211,9.875 11.375,9.875 C11.16789,9.875 11,9.7071 11,9.5 C11,9.2929 11.16789,9.125 11.375,9.125 L11.375,9.125 Z M16,9.125 C16.20711,9.125 16.375,9.2929 16.375,9.5 C16.375,9.7071 16.20711,9.875 16,9.875 C15.79289,9.875 15.625,9.7071 15.625,9.5 C15.625,9.2929 15.79289,9.125 16,9.125 L16,9.125 Z M5.5,12 C5.15787,12 4.99999,12.1579 5,12.5 C5.00001,12.8422 5.15787,13 5.5,13 L17.5,13 C17.84211,13 17.99999,12.8422 18,12.5 C18.00001,12.1579 17.84211,12 17.5,12 L6.5,12 L5.5,12 Z M5.5,14.625 C5.5,15.3092 6.19079,16 6.875,16 L16.125,16 C16.80921,16 17.5,15.3092 17.5,14.625 L17.5,14 L5.5,14 L5.5,14.625 Z" id="rect13326-2-5-2-3-6-copy" fill-opacity="0.7" fill="#FFFFFF"></path>
+    <g id="POI-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Artboard-1" transform="translate(-174.000000, -509.000000)">
+            <g id="fastfood-m" transform="translate(174.500000, 509.000000)">
+                <ellipse id="Oval-1" fill-opacity="0.1" fill="#FFFFFF" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
+                <ellipse id="Oval-1" fill="#332714" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+                <path d="M11,7 C8.94737,7 5.5,7.7895 5.5,9.5 L5.5,11 L17.5,11 L17.5,9.5 C17.5,7.7895 14.05263,7 12,7 L11,7 Z M9,8.125 C9.20711,8.125 9.375,8.2929 9.375,8.5 C9.375,8.7071 9.20711,8.875 9,8.875 C8.79289,8.875 8.625,8.7071 8.625,8.5 C8.625,8.2929 8.79289,8.125 9,8.125 L9,8.125 Z M14,8.125 C14.20711,8.125 14.375,8.2929 14.375,8.5 C14.375,8.7071 14.20711,8.875 14,8.875 C13.79289,8.875 13.625,8.7071 13.625,8.5 C13.625,8.2929 13.79289,8.125 14,8.125 L14,8.125 Z M7,9.125 C7.20711,9.125 7.375,9.2929 7.375,9.5 C7.375,9.7071 7.20711,9.875 7,9.875 C6.79289,9.875 6.625,9.7071 6.625,9.5 C6.625,9.2929 6.79289,9.125 7,9.125 L7,9.125 Z M11.375,9.125 C11.58211,9.125 11.75,9.2929 11.75,9.5 C11.75,9.7071 11.58211,9.875 11.375,9.875 C11.16789,9.875 11,9.7071 11,9.5 C11,9.2929 11.16789,9.125 11.375,9.125 L11.375,9.125 Z M16,9.125 C16.20711,9.125 16.375,9.2929 16.375,9.5 C16.375,9.7071 16.20711,9.875 16,9.875 C15.79289,9.875 15.625,9.7071 15.625,9.5 C15.625,9.2929 15.79289,9.125 16,9.125 L16,9.125 Z M5.5,12 C5.15787,12 4.99999,12.1579 5,12.5 C5.00001,12.8422 5.15787,13 5.5,13 L17.5,13 C17.84211,13 17.99999,12.8422 18,12.5 C18.00001,12.1579 17.84211,12 17.5,12 L6.5,12 L5.5,12 Z M5.5,14.625 C5.5,15.3092 6.19079,16 6.875,16 L16.125,16 C16.80921,16 17.5,15.3092 17.5,14.625 L17.5,14 L5.5,14 L5.5,14.625 Z" id="rect13326-2-5-2-3-6" fill-opacity="0.7" fill="#FFFFFF"></path>
+            </g>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/fastfood-s.svg b/data/styles/clear/style-night/symbols/fastfood-s.svg
index 15fa0e1942..12d81c2985 100644
--- a/data/styles/clear/style-night/symbols/fastfood-s.svg
+++ b/data/styles/clear/style-night/symbols/fastfood-s.svg
@@ -1,14 +1,16 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <svg width="18px" height="17px" viewBox="0 0 18 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
     <title>fastfood-s</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
-    <g id="POI-NIght" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="fastfood-s" transform="translate(0.500000, 0.000000)">
-            <circle id="Oval-1-Copy-43" fill-opacity="0.1" fill="#FFFFFF" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-42" fill="#332714" cx="8.5" cy="8.5" r="7.5"></circle>
-            <path d="M8.05044132,5 C6.62939132,5 4.3512,5.8723 4.44736,7.0526 L4.44736,8.25 L12.5,8.25 L12.5,7.0526 C12.5,5.8684 10.4050722,5 8.98402216,5 L8.05044132,5 Z M4,9 L4,10 L13,10 L13,9 L4,9 Z M4.49996,10.75 C4.49996,11.2237 5.02628,12 5.49996,12 L11.49996,12 C11.97364,12 12.49996,11.2237 12.49996,10.75 L4.49996,10.75 Z" id="rect13326-2-5-2-3-1-copy" fill-opacity="0.7" fill="#FFFFFF"></path>
+    <g id="POI-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Artboard-1" transform="translate(-208.000000, -512.000000)">
+            <g id="fastfood-s" transform="translate(208.500000, 512.000000)">
+                <circle id="Oval-1" fill-opacity="0.1" fill="#FFFFFF" cx="8.5" cy="8.5" r="8.5"></circle>
+                <circle id="Oval-1" fill="#332714" cx="8.5" cy="8.5" r="7.5"></circle>
+                <path d="M8.05044132,5 C6.62939132,5 4.3512,5.8723 4.44736,7.0526 L4.44736,8.25 L12.5,8.25 L12.5,7.0526 C12.5,5.8684 10.4050722,5 8.98402216,5 L8.05044132,5 Z M4,9 L4,10 L13,10 L13,9 L4,9 Z M4.49996,10.75 C4.49996,11.2237 5.02628,12 5.49996,12 L11.49996,12 C11.97364,12 12.49996,11.2237 12.49996,10.75 L4.49996,10.75 Z" id="rect13326-2-5-2-3-1" fill-opacity="0.7" fill="#FFFFFF"></path>
+            </g>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/fuel-l.svg b/data/styles/clear/style-night/symbols/fuel-l.svg
index b37de67e0b..ad9c4d010b 100644
--- a/data/styles/clear/style-night/symbols/fuel-l.svg
+++ b/data/styles/clear/style-night/symbols/fuel-l.svg
@@ -1,14 +1,27 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <svg width="27px" height="27px" viewBox="0 0 27 27" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
     <title>fuel-l</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
-    <g id="POI-NIght" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="fuel-l">
-            <circle id="Oval-1-Copy-39" fill-opacity="0.1" fill="#FFFFFF" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#252522" cx="13.5" cy="13.5" r="12.5"></circle>
-            <path d="M8,4.5 C7.4459904,4.5 7,4.946 7,5.5 L7,21.5 C7,22 7.5,22.5 8,22.5 L17,22.5 C17.5,22.5 18,22 18,21.5 L18,16.5 L18.5,16.5 C19,16.5 19,17 19,17 L19,19 C19,20 19.5,20.5 20.5,20.5 C21.5,20.5 22,20 22,19 L22,13.5 C22,12.5 20,11.5 20,10.5 L20,7.5 L19,7.5 L18,6.5 L18,5.5 C18,4.946 17.55401,4.5 17,4.5 L8,4.5 Z M9,6.5 L16,6.5 L16,10.5 L9,10.5 L9,6.5 Z M18,9.5 L19,9.5 L19,11 C19,12 21,13 21,14 L21,19 C21,19.5 20.5,19.5 20.5,19.5 C20.5,19.5 20,19.5 20,19 L20,16.5 C20,16 19.5,15.5 19,15.5 L18,15.5 L18,9.5 Z" id="rect7223-2-4-9-copy" fill-opacity="0.7" fill="#FFFFFF"></path>
+    <g id="POI-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Artboard-1" transform="translate(-677.000000, -63.000000)">
+            <g id="fuel-l" transform="translate(677.000000, 63.000000)">
+                <circle id="Oval-1-Copy-39" fill-opacity="0.1" fill="#FFFFFF" cx="13.5" cy="13.5" r="13.5"></circle>
+                <circle id="Oval-1-Copy-38" fill="#252522" cx="13.5" cy="13.5" r="12.5"></circle>
+                <g id="noun_379269_cc" transform="translate(13.500000, 13.500000) scale(-1, 1) translate(-13.500000, -13.500000) translate(6.000000, 6.000000)">
+                    <g id="Group"></g>
+                </g>
+            </g>
+            <g id="charging-station-l" transform="translate(677.000000, 69.000000)" fill="#FFFFFF" fill-opacity="0.7">
+                <g id="POI">
+                    <g>
+                        <g id="charging-station-l">
+                            <path d="M20.0029699,0 C20.5536144,0 21,0.449948758 21,1.00684547 L21,14 L22,14 L22,15 L21.8046875,15 L12,15 L12,14 L13,14 L13,1.00684547 C13,0.450780073 13.4530363,0 13.9970301,0 L20.0029699,0 L20.0029699,0 Z M20,3.0093689 C20,2.45190985 19.5490248,2 19.009222,2 L14.990778,2 C14.4435864,2 14,2.44335318 14,3.0093689 L14,4.9906311 C14,5.54809015 14.4509752,6 14.990778,6 L19.009222,6 C19.5564136,6 20,5.55664682 20,4.9906311 L20,3.0093689 L20,3.0093689 Z M7.93976944,7.57394366 C8.00562927,7.32042254 8.07148911,7.10915493 8.07148911,6.87676056 L8.07148911,5.92605634 L8.00562927,5.92605634 L7.34703094,5.16549296 C7.34703094,5.16549296 7.0835916,2.73591549 10.7717423,1.38380282 L11.2547144,2.12323944 C11.2547144,2.12323944 9.45454562,3.72887324 9.47649889,5.31338028 L9.03743334,5.92605634 L9.03743334,6.87676056 C9.03743334,7.17253521 8.9715735,7.51056338 8.88376039,7.78521127 L8.02758255,11.6725352 C7.93976944,12.0739437 8.00562927,12.4542254 8.24711533,12.7711268 C8.51055467,13.0669014 8.88376039,13.2570423 9.30087267,13.2570423 C10.0253308,13.2570423 10.5961161,12.7077465 10.6400226,12.0105634 L10.2668169,8.90492958 L10.2668169,8.8415493 C10.2668169,7.93309859 11.0571349,7.13028169 12.0011259,7.13028169 L13,7.13028169 L13,8.03873239 L12.0011259,8.03873239 C11.5620603,8.03873239 11.2108078,8.37676056 11.2108078,8.79929577 L11.5620603,11.9471831 L11.5620603,12.0105634 C11.5620603,13.2359155 10.5522095,14.2077465 9.27891939,14.2077465 C8.5764145,14.2077465 7.91781616,13.9119718 7.4787506,13.3626761 C7.03968505,12.7922535 6.90796538,12.0950704 7.06163832,11.4612676 L7.93976944,7.57394366 L7.93976944,7.57394366 Z" id="Combined-Shape" transform="translate(14.500000, 7.500000) scale(-1, 1) translate(-14.500000, -7.500000) "></path>
+                        </g>
+                    </g>
+                </g>
+            </g>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/fuel-m.svg b/data/styles/clear/style-night/symbols/fuel-m.svg
index bb48347d99..7669bfeec9 100644
--- a/data/styles/clear/style-night/symbols/fuel-m.svg
+++ b/data/styles/clear/style-night/symbols/fuel-m.svg
@@ -1,14 +1,16 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <svg width="23px" height="23px" viewBox="0 0 23 23" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
     <title>fuel-m</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
-    <g id="POI-NIght" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="fuel-m">
-            <ellipse id="Oval-1-Copy-41" fill-opacity="0.1" fill="#FFFFFF" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
-            <ellipse id="Oval-1-Copy-40" fill="#252522" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
-            <path d="M8,5 C7.5,5 7,5.5 7,6 L7,17 C7,17.5 7.5,18 8,18 L14,18 C14.5,18 15,17.5 15,17 L15,14 L15.25,14 C15.38687,14 15.5,14.096 15.5,14.25 L15.5,15 C15.5,15.5 16,16 16.5,16 L17,16 C17.5,16 18,15.5928 18,15 L18,11.5 C18,10.5 17,10.5 17,9.5002 L17,8.0002 L16,8.0002 L15,7 L15,6.0002 C15,5.5002 14.5,5.0002 14,5.0002 L8,5 Z M8,6.5 L14,6.5 L14,9 L8,9 L8,6.5 Z M15,10 L16,10 C16,11 17,11 17,12 L17,14.75 C17,15 16.75002,15 16.75002,15 C16.75002,15 16.5,15 16.50002,14.75 L16.50002,14 C16.50002,13.4094 16.00064,12.9986 15.50002,13 L14.99993,12.9998 L15,10 Z" id="rect7223-2-4-9-4-2-3-copy" fill-opacity="0.7" fill="#FFFFFF"></path>
+    <g id="POI-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Artboard-1" transform="translate(-714.000000, -65.000000)">
+            <g id="fuel-m" transform="translate(714.000000, 65.000000)">
+                <ellipse id="Oval-1-Copy-41" fill-opacity="0.1" fill="#FFFFFF" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
+                <ellipse id="Oval-1-Copy-40" fill="#252522" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+                <path d="M8.00292933,5 C7.44902676,5 7,5.45576096 7,6.00247329 L7,17 L6,17 L6,18 L15,18 L15,17 L14,17 L14,6.00247329 C14,5.44882258 13.5621186,5 12.9970707,5 L8.00292933,5 Z M8,8.0093689 C8,7.45190985 8.44371665,7 8.99980749,7 L12.0001925,7 C12.5523709,7 13,7.44335318 13,8.0093689 L13,9.9906311 C13,10.5480902 12.5562834,11 12.0001925,11 L8.99980749,11 C8.44762906,11 8,10.5566468 8,9.9906311 L8,8.0093689 Z M18.2204225,11.5640845 C18.165493,11.3443662 18.1105634,11.1612676 18.1105634,10.9598592 L18.1105634,10.1359155 L18.165493,10.1359155 L18.7147887,9.47676056 C18.7147887,9.47676056 18.934507,7.37112676 15.8584507,6.19929577 L15.4556338,6.84014085 C15.4556338,6.84014085 16.9570423,8.23169014 16.9387324,9.60492958 L17.3049296,10.1359155 L17.3049296,10.9598592 C17.3049296,11.2161972 17.3598592,11.5091549 17.4330986,11.7471831 L18.1471831,15.1161972 C18.2204225,15.4640845 18.165493,15.793662 17.9640845,16.0683099 C17.7443662,16.3246479 17.4330986,16.4894366 17.0852113,16.4894366 C16.4809859,16.4894366 16.0049296,16.0133803 15.9683099,15.4091549 L16.2795775,12.7176056 L16.2795775,12.6626761 C16.2795775,11.8753521 15.6204225,11.1795775 14.8330986,11.1795775 L14,11.1795775 L14,11.9669014 L14.8330986,11.9669014 C15.1992958,11.9669014 15.4922535,12.2598592 15.4922535,12.6260563 L15.1992958,15.3542254 L15.1992958,15.4091549 C15.1992958,16.4711268 16.0415493,17.3133803 17.1035211,17.3133803 C17.6894366,17.3133803 18.2387324,17.0570423 18.6049296,16.5809859 C18.9711268,16.0866197 19.0809859,15.4823944 18.9528169,14.9330986 L18.2204225,11.5640845 Z" id="Combined-Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+            </g>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/fuel-s.svg b/data/styles/clear/style-night/symbols/fuel-s.svg
index c3ff503bf5..77b8db80af 100644
--- a/data/styles/clear/style-night/symbols/fuel-s.svg
+++ b/data/styles/clear/style-night/symbols/fuel-s.svg
@@ -1,14 +1,16 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <svg width="17px" height="17px" viewBox="0 0 17 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
     <title>fuel-s</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
-    <g id="POI-NIght" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="fuel-s">
-            <circle id="Oval-1-Copy-43" fill-opacity="0.1" fill="#FFFFFF" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-42" fill="#252522" cx="8.5" cy="8.5" r="7.5"></circle>
-            <path d="M5.5,4 C5.22299,4 5,4.223 5,4.5 L5,12.5 C5,12.75 5.25,13 5.5,13 L9.5,13 C9.75,13 10,12.75 10,12.5 L10,12 L11.25,12 C11.75,12 12,11.75 12,11.25 L12,8.5 C12,8 11,7.5 11,7 L11,6.75 L11,6 L10,5 L10,4.5 C10,4.223 9.777,4 9.5,4 L5.5,4 L5.5,4 Z M6,5 L9,5 L9,7 L6,7 L6,5 L6,5 Z M10,6.5 L10.5,6.5 L10.5,7.25 C10.5,7.75 11.5,8.25 11.5,8.75 L11.5,11 L11.5,11.25 C11.5,11.5 11.25,11.5 11.25,11.5 L10.5,11.5 L10.5,10 L10,10 L10,6.5 L10,6.5 Z" id="rect7223-2-4-9-3-copy" fill-opacity="0.7" fill="#FFFFFF"></path>
+    <g id="POI-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Artboard-1" transform="translate(-747.000000, -68.000000)">
+            <g id="fuel-s" transform="translate(747.000000, 68.000000)">
+                <circle id="Oval-1-Copy-43" fill-opacity="0.1" fill="#FFFFFF" cx="8.5" cy="8.5" r="8.5"></circle>
+                <circle id="Oval-1-Copy-42" fill="#252522" cx="8.5" cy="8.5" r="7.5"></circle>
+                <path d="M5.49769878,4 C5.22282734,4 5,4.23079681 5,4.50043583 L5,12 L4.5,12 L4.5,13 L10.5,13 L10.5,12 L10,12 L10,4.50043583 C10,4.22405275 9.78515625,4 9.50230122,4 L5.49769878,4 Z M5.5,5.50468445 C5.5,5.22595492 5.71505737,5 5.99047852,5 L9.00952148,5 C9.28040529,5 9.5,5.21403503 9.5,5.50468445 L9.5,6.49531555 C9.5,6.77404508 9.28494263,7 9.00952148,7 L5.99047852,7 C5.71959471,7 5.5,6.78596497 5.5,6.49531555 L5.5,5.50468445 Z M12.9518012,8.5443662 C12.9133829,8.39225352 12.8749647,8.26549296 12.8749647,8.12605634 L12.8749647,7.5556338 L12.9133829,7.5556338 L13.2975653,7.09929577 C13.2975653,7.09929577 13.4512382,5.6415493 11.299817,4.83028169 L11.0180833,5.27394366 C11.0180833,5.27394366 12.0681817,6.23732394 12.0553756,7.18802817 L12.3114972,7.5556338 L12.3114972,8.12605634 C12.3114972,8.30352113 12.3499155,8.50633803 12.4011398,8.67112676 L12.9005768,11.0035211 C12.9518012,11.2443662 12.9133829,11.4725352 12.7725161,11.6626761 C12.6188431,11.8401408 12.4011398,11.9542254 12.1578243,11.9542254 C11.7352237,11.9542254 11.4022656,11.6246479 11.3766535,11.206338 L11.5943568,9.34295775 L11.5943568,9.30492958 C11.5943568,8.75985915 11.133338,8.27816901 10.5826766,8.27816901 L10,8.27816901 L10,8.82323944 L10.5826766,8.82323944 C10.8387982,8.82323944 11.0436954,9.02605634 11.0436954,9.27957746 L10.8387982,11.1683099 L10.8387982,11.206338 C10.8387982,11.9415493 11.4278778,12.5246479 12.1706304,12.5246479 C12.5804249,12.5246479 12.9646072,12.3471831 13.2207288,12.0176056 C13.4768504,11.6753521 13.5536869,11.2570423 13.4640443,10.8767606 L12.9518012,8.5443662 Z" id="Combined-Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+            </g>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/hindu-l.svg b/data/styles/clear/style-night/symbols/hindu-l.svg
index ce32336b80..3240e55ef2 100644
--- a/data/styles/clear/style-night/symbols/hindu-l.svg
+++ b/data/styles/clear/style-night/symbols/hindu-l.svg
@@ -1,14 +1,16 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <svg width="27px" height="27px" viewBox="0 0 27 27" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
     <title>hindu-l</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
-    <g id="POI-NIght" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="hindu-l">
-            <circle id="Oval-1-Copy-39" fill-opacity="0.1" fill="#FFFFFF" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#26160D" cx="13.5" cy="13.5" r="12.5"></circle>
-            <path d="M7.4384375,9.38890625 L8.40171875,11.3067188 C8.40171875,11.3067188 10.3625,9.83609375 11.5321875,10.1629688 C11.5321875,10.1629688 12.2201562,10.3028125 12.39875,10.78 C12.39875,10.78 12.9140625,11.7682813 11.4920312,12.2040625 C11.4920312,12.2040625 10.4314062,12.5739063 9.31625,12.138125 L10.13625,14.6639063 C10.13625,14.6639063 11.2370312,14.0676563 12.2260937,14.6982813 C12.2260937,14.6982813 13.5810937,15.55 12.479375,17.1914063 C12.479375,17.1914063 11.8160937,18.0570313 10.2928125,18.0570313 C10.2928125,18.0570313 6.805625,18.4289063 6.12921875,12.941875 C6.12921875,12.941875 5.536875,15.174375 6.89140625,17.6125 C6.89140625,17.6125 8.1703125,20.1204688 10.899375,20.1260938 C10.899375,20.1260938 13.7920312,20.2607813 14.1876562,17.3195313 C14.1876562,17.3195313 14.4714062,15.9092188 13.5426562,14.3609375 C13.5426562,14.3609375 14.97875,14.8254688 15.8990625,13.9567188 C15.8990625,13.9567188 16.3864062,13.5896875 17.034375,12.3454688 C17.034375,12.3454688 17.5273437,11.4625 18.2096875,11.3192188 C18.2096875,11.3192188 19.0295312,11.0842188 19.5110937,11.8409375 C19.5110937,11.8409375 20.035625,12.864375 19.8895312,13.905 C19.8895312,13.905 19.8551562,15.9604688 17.8342187,16.5539063 C17.8342187,16.5539063 15.4117187,17.2648438 15.2540625,14.799375 C15.2540625,14.799375 14.9703125,15.0860938 15.0792187,16.4220313 C15.0792187,16.4220313 15.2626562,18.52625 17.1489062,18.8873438 C17.1489062,18.8873438 18.5307812,19.196875 19.751875,17.8839063 C19.751875,17.8839063 20.835625,16.8460938 20.835625,14.805 C20.835625,14.805 20.9732812,13.148125 20.1304687,11.6 C20.1304687,11.6 19.3965625,10.2182813 18.02625,9.97171875 C18.02625,9.97171875 16.8565625,9.69078125 15.8589062,10.5795313 C15.8589062,10.5795313 15.2510937,10.9521875 14.3739062,12.7639063 C14.3739062,12.7639063 13.9439062,13.744375 13.0953125,13.7271875 C13.0953125,13.7271875 12.75125,13.7157813 12.6021875,13.5609375 C12.6021875,13.5609375 12.1092187,13.2914063 11.816875,13.2857813 C11.816875,13.2857813 12.8603125,12.8414063 13.3590625,11.5370313 C13.3590625,11.5370313 13.8521875,10.2985938 13.175625,9.2034375 C13.175625,9.2034375 12.6423437,7.93640625 10.3546875,8.1484375 C10.3545312,8.1484375 8.7478125,8.226875 7.4384375,9.38890625 Z M12.4529688,5.8378125 C12.4529688,5.8378125 12.785625,7.85609375 15.2739063,8.13125 C15.2739063,8.13125 16.8334375,8.25171875 18.266875,6.61765625 L19.5339063,8.17140625 C19.5339063,8.17140625 18.2610938,9.5990625 16.0364063,9.70796875 C16.0364063,9.70796875 14.41375,9.98890625 13.02625,8.2 C13.0264063,8.2 12.1778125,7.139375 12.4529688,5.8378125 Z M13.8289062,6.50296875 L15.2165625,5.029375 L16.6729687,6.40546875 L15.2796875,7.8159375 L13.8289062,6.50296875 Z" id="Combined-Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+    <g id="POI-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Artboard-1" transform="translate(-317.000000, -1063.000000)">
+            <g id="hindu-l" transform="translate(317.000000, 1063.000000)">
+                <circle id="Oval-1-Copy-39" fill-opacity="0.1" fill="#FFFFFF" cx="13.5" cy="13.5" r="13.5"></circle>
+                <circle id="Oval-1-Copy-38" fill="#26160D" cx="13.5" cy="13.5" r="12.5"></circle>
+                <path d="M7.4384375,9.38890625 L8.40171875,11.3067188 C8.40171875,11.3067188 10.3625,9.83609375 11.5321875,10.1629688 C11.5321875,10.1629688 12.2201562,10.3028125 12.39875,10.78 C12.39875,10.78 12.9140625,11.7682813 11.4920312,12.2040625 C11.4920312,12.2040625 10.4314062,12.5739063 9.31625,12.138125 L10.13625,14.6639063 C10.13625,14.6639063 11.2370312,14.0676563 12.2260937,14.6982813 C12.2260937,14.6982813 13.5810937,15.55 12.479375,17.1914063 C12.479375,17.1914063 11.8160937,18.0570313 10.2928125,18.0570313 C10.2928125,18.0570313 6.805625,18.4289063 6.12921875,12.941875 C6.12921875,12.941875 5.536875,15.174375 6.89140625,17.6125 C6.89140625,17.6125 8.1703125,20.1204688 10.899375,20.1260938 C10.899375,20.1260938 13.7920312,20.2607813 14.1876562,17.3195313 C14.1876562,17.3195313 14.4714062,15.9092188 13.5426562,14.3609375 C13.5426562,14.3609375 14.97875,14.8254688 15.8990625,13.9567188 C15.8990625,13.9567188 16.3864062,13.5896875 17.034375,12.3454688 C17.034375,12.3454688 17.5273437,11.4625 18.2096875,11.3192188 C18.2096875,11.3192188 19.0295312,11.0842188 19.5110937,11.8409375 C19.5110937,11.8409375 20.035625,12.864375 19.8895312,13.905 C19.8895312,13.905 19.8551562,15.9604688 17.8342187,16.5539063 C17.8342187,16.5539063 15.4117187,17.2648438 15.2540625,14.799375 C15.2540625,14.799375 14.9703125,15.0860938 15.0792187,16.4220313 C15.0792187,16.4220313 15.2626562,18.52625 17.1489062,18.8873438 C17.1489062,18.8873438 18.5307812,19.196875 19.751875,17.8839063 C19.751875,17.8839063 20.835625,16.8460938 20.835625,14.805 C20.835625,14.805 20.9732812,13.148125 20.1304687,11.6 C20.1304687,11.6 19.3965625,10.2182813 18.02625,9.97171875 C18.02625,9.97171875 16.8565625,9.69078125 15.8589062,10.5795313 C15.8589062,10.5795313 15.2510937,10.9521875 14.3739062,12.7639063 C14.3739062,12.7639063 13.9439062,13.744375 13.0953125,13.7271875 C13.0953125,13.7271875 12.75125,13.7157813 12.6021875,13.5609375 C12.6021875,13.5609375 12.1092187,13.2914063 11.816875,13.2857813 C11.816875,13.2857813 12.8603125,12.8414063 13.3590625,11.5370313 C13.3590625,11.5370313 13.8521875,10.2985938 13.175625,9.2034375 C13.175625,9.2034375 12.6423437,7.93640625 10.3546875,8.1484375 C10.3545312,8.1484375 8.7478125,8.226875 7.4384375,9.38890625 Z M12.4529688,5.8378125 C12.4529688,5.8378125 12.785625,7.85609375 15.2739063,8.13125 C15.2739063,8.13125 16.8334375,8.25171875 18.266875,6.61765625 L19.5339063,8.17140625 C19.5339063,8.17140625 18.2610938,9.5990625 16.0364063,9.70796875 C16.0364063,9.70796875 14.41375,9.98890625 13.02625,8.2 C13.0264063,8.2 12.1778125,7.139375 12.4529688,5.8378125 Z M13.8289062,6.50296875 L15.2165625,5.029375 L16.6729687,6.40546875 L15.2796875,7.8159375 L13.8289062,6.50296875 Z" id="Combined-Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+            </g>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/hindu-m.svg b/data/styles/clear/style-night/symbols/hindu-m.svg
index dc0a675398..8efdb64033 100644
--- a/data/styles/clear/style-night/symbols/hindu-m.svg
+++ b/data/styles/clear/style-night/symbols/hindu-m.svg
@@ -1,14 +1,16 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <svg width="23px" height="23px" viewBox="0 0 23 23" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
     <title>hindu-m</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
-    <g id="POI-NIght" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="hindu-m">
-            <ellipse id="Oval-1-Copy-41" fill-opacity="0.1" fill="#FFFFFF" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
-            <ellipse id="Oval-1-Copy-40" fill="#26160D" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
-            <path d="M6.25952769,8.75381883 L7.10316268,10.4051708 C7.10316268,10.4051708 8.82040118,9.13887419 9.84480532,9.42033324 C9.84480532,9.42033324 10.4473235,9.54074713 10.6037347,9.95163429 C10.6037347,9.95163429 11.0550418,10.8026039 9.80963675,11.1778378 C9.80963675,11.1778378 8.88074879,11.4962956 7.90410275,11.1210617 L8.62225302,13.2959114 C8.62225302,13.2959114 9.58630954,12.7825042 10.4525236,13.3255103 C10.4525236,13.3255103 11.6392231,14.0588914 10.6743455,15.472241 C10.6743455,15.472241 10.0934484,16.2175963 8.75936936,16.2175963 C8.75936936,16.2175963 5.70531493,16.537803 5.11292307,11.8131388 C5.11292307,11.8131388 4.59415255,13.7354557 5.78044155,15.8348281 C5.78044155,15.8348281 6.9004987,17.9943401 9.29059255,17.9991836 C9.29059255,17.9991836 11.8239607,18.1151577 12.1704463,15.5825644 C12.1704463,15.5825644 12.4189525,14.3682004 11.6055598,13.035037 C11.6055598,13.035037 12.8632807,13.4350264 13.6692839,12.6869804 C13.6692839,12.6869804 14.0960962,12.3709444 14.6635827,11.2995971 C14.6635827,11.2995971 15.0953212,10.5393079 15.6929131,10.4159341 C15.6929131,10.4159341 16.4109265,10.2135849 16.8326756,10.8651653 C16.8326756,10.8651653 17.2920564,11.7464066 17.1641085,12.6424474 C17.1641085,12.6424474 17.1340031,14.4123297 15.3640802,14.9233151 C15.3640802,14.9233151 13.2424717,15.5354751 13.1043974,13.4125581 C13.1043974,13.4125581 12.8558911,13.6594402 12.9512705,14.8097628 C12.9512705,14.8097628 13.1119238,16.6216218 14.7638883,16.9325453 C14.7638883,16.9325453 15.9741248,17.1990703 17.0435502,16.0685252 C17.0435502,16.0685252 17.9926908,15.1749062 17.9926908,13.4174016 C17.9926908,13.4174016 18.1132492,11.9907325 17.3751199,10.6577037 C17.3751199,10.6577037 16.7323699,9.46796064 15.5322598,9.25565548 C15.5322598,9.25565548 14.5078557,9.01375138 13.6341153,9.77901863 C13.6341153,9.77901863 13.1017974,10.0998981 12.3335627,11.659897 C12.3335627,11.659897 11.9569717,12.5041396 11.2137793,12.4893401 C11.2137793,12.4893401 10.9124517,12.4795187 10.7819038,12.3461889 C10.7819038,12.3461889 10.3501652,12.1141063 10.0941326,12.1092628 C10.0941326,12.1092628 11.0079679,11.7266292 11.4447697,10.6034838 C11.4447697,10.6034838 11.8766451,9.53711453 11.2841164,8.59411908 C11.2841164,8.59411908 10.8170724,7.5031289 8.81355905,7.68570057 C8.81342221,7.68570057 7.40626916,7.75323998 6.25952769,8.75381883 Z M10.6512191,5.69611335 C10.6512191,5.69611335 10.9425571,7.433975 13.1217764,7.6709011 C13.1217764,7.6709011 14.487603,7.77463194 15.7429975,6.36760577 L16.8526546,7.70547805 C16.8526546,7.70547805 15.7379344,8.93477602 13.7895686,9.02855085 C13.7895686,9.02855085 12.3684576,9.27045495 11.1532948,7.73009899 C11.1534316,7.73009899 10.4102392,6.81683701 10.6512191,5.69611335 Z M11.8562555,6.26885292 L13.0715552,5 L14.3470656,6.18489955 L13.1268396,7.39939805 L11.8562555,6.26885292 Z" id="Combined-Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+    <g id="POI-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Artboard-1" transform="translate(-354.000000, -1065.000000)">
+            <g id="hindu-m" transform="translate(354.000000, 1065.000000)">
+                <ellipse id="Oval-1-Copy-41" fill-opacity="0.1" fill="#FFFFFF" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
+                <ellipse id="Oval-1-Copy-40" fill="#26160D" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+                <path d="M6.25952769,8.75381883 L7.10316268,10.4051708 C7.10316268,10.4051708 8.82040118,9.13887419 9.84480532,9.42033324 C9.84480532,9.42033324 10.4473235,9.54074713 10.6037347,9.95163429 C10.6037347,9.95163429 11.0550418,10.8026039 9.80963675,11.1778378 C9.80963675,11.1778378 8.88074879,11.4962956 7.90410275,11.1210617 L8.62225302,13.2959114 C8.62225302,13.2959114 9.58630954,12.7825042 10.4525236,13.3255103 C10.4525236,13.3255103 11.6392231,14.0588914 10.6743455,15.472241 C10.6743455,15.472241 10.0934484,16.2175963 8.75936936,16.2175963 C8.75936936,16.2175963 5.70531493,16.537803 5.11292307,11.8131388 C5.11292307,11.8131388 4.59415255,13.7354557 5.78044155,15.8348281 C5.78044155,15.8348281 6.9004987,17.9943401 9.29059255,17.9991836 C9.29059255,17.9991836 11.8239607,18.1151577 12.1704463,15.5825644 C12.1704463,15.5825644 12.4189525,14.3682004 11.6055598,13.035037 C11.6055598,13.035037 12.8632807,13.4350264 13.6692839,12.6869804 C13.6692839,12.6869804 14.0960962,12.3709444 14.6635827,11.2995971 C14.6635827,11.2995971 15.0953212,10.5393079 15.6929131,10.4159341 C15.6929131,10.4159341 16.4109265,10.2135849 16.8326756,10.8651653 C16.8326756,10.8651653 17.2920564,11.7464066 17.1641085,12.6424474 C17.1641085,12.6424474 17.1340031,14.4123297 15.3640802,14.9233151 C15.3640802,14.9233151 13.2424717,15.5354751 13.1043974,13.4125581 C13.1043974,13.4125581 12.8558911,13.6594402 12.9512705,14.8097628 C12.9512705,14.8097628 13.1119238,16.6216218 14.7638883,16.9325453 C14.7638883,16.9325453 15.9741248,17.1990703 17.0435502,16.0685252 C17.0435502,16.0685252 17.9926908,15.1749062 17.9926908,13.4174016 C17.9926908,13.4174016 18.1132492,11.9907325 17.3751199,10.6577037 C17.3751199,10.6577037 16.7323699,9.46796064 15.5322598,9.25565548 C15.5322598,9.25565548 14.5078557,9.01375138 13.6341153,9.77901863 C13.6341153,9.77901863 13.1017974,10.0998981 12.3335627,11.659897 C12.3335627,11.659897 11.9569717,12.5041396 11.2137793,12.4893401 C11.2137793,12.4893401 10.9124517,12.4795187 10.7819038,12.3461889 C10.7819038,12.3461889 10.3501652,12.1141063 10.0941326,12.1092628 C10.0941326,12.1092628 11.0079679,11.7266292 11.4447697,10.6034838 C11.4447697,10.6034838 11.8766451,9.53711453 11.2841164,8.59411908 C11.2841164,8.59411908 10.8170724,7.5031289 8.81355905,7.68570057 C8.81342221,7.68570057 7.40626916,7.75323998 6.25952769,8.75381883 Z M10.6512191,5.69611335 C10.6512191,5.69611335 10.9425571,7.433975 13.1217764,7.6709011 C13.1217764,7.6709011 14.487603,7.77463194 15.7429975,6.36760577 L16.8526546,7.70547805 C16.8526546,7.70547805 15.7379344,8.93477602 13.7895686,9.02855085 C13.7895686,9.02855085 12.3684576,9.27045495 11.1532948,7.73009899 C11.1534316,7.73009899 10.4102392,6.81683701 10.6512191,5.69611335 Z M11.8562555,6.26885292 L13.0715552,5 L14.3470656,6.18489955 L13.1268396,7.39939805 L11.8562555,6.26885292 Z" id="Combined-Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+            </g>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/hindu-s.svg b/data/styles/clear/style-night/symbols/hindu-s.svg
index 966cd6fc0d..7ffc8020fc 100644
--- a/data/styles/clear/style-night/symbols/hindu-s.svg
+++ b/data/styles/clear/style-night/symbols/hindu-s.svg
@@ -1,14 +1,16 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <svg width="17px" height="17px" viewBox="0 0 17 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
     <title>hindu-s</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
-    <g id="POI-NIght" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="hindu-s">
-            <circle id="Oval-1-Copy-43" fill-opacity="0.1" fill="#FFFFFF" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-42" fill="#26160D" cx="8.5" cy="8.5" r="7.5"></circle>
-            <path d="M4.87198071,6.59879765 L5.4560357,7.74204135 C5.4560357,7.74204135 6.64489313,6.86537444 7.35409599,7.06023071 C7.35409599,7.06023071 7.77122399,7.14359417 7.87950863,7.42805451 C7.87950863,7.42805451 8.191952,8.01718734 7.32974852,8.27696465 C7.32974852,8.27696465 6.68667224,8.49743539 6.01053267,8.23765808 L6.50771363,9.74332326 C6.50771363,9.74332326 7.17513737,9.38788754 7.774824,9.76381483 C7.774824,9.76381483 8.59638521,10.2715402 7.92839304,11.250013 C7.92839304,11.250013 7.52623352,11.7660282 6.60264032,11.7660282 C6.60264032,11.7660282 4.48829495,11.9877098 4.07817751,8.7167884 C4.07817751,8.7167884 3.71902869,10.0476232 4.54030569,11.5010348 C4.54030569,11.5010348 5.31572987,12.9960816 6.97041023,12.9994348 C6.97041023,12.9994348 8.72428046,13.0797245 8.96415512,11.3263907 C8.96415512,11.3263907 9.13619792,10.4856772 8.57307985,9.56271795 C8.57307985,9.56271795 9.44380968,9.83963367 10.0018119,9.32175564 C10.0018119,9.32175564 10.2972973,9.10296148 10.6901726,8.36125955 C10.6901726,8.36125955 10.9890685,7.83490545 11.402786,7.74949284 C11.402786,7.74949284 11.8998722,7.60940496 12.1918523,8.06049908 C12.1918523,8.06049908 12.5098852,8.67058921 12.4213059,9.29092513 C12.4213059,9.29092513 12.4004637,10.5162283 11.1751325,10.8699874 C11.1751325,10.8699874 9.70632653,11.2937905 9.61073667,9.8240787 C9.61073667,9.8240787 9.43869387,9.99499708 9.50472572,10.7913743 C9.50472572,10.7913743 9.61594722,12.0457382 10.759615,12.2609929 C10.759615,12.2609929 11.597471,12.4455102 12.3378424,11.6628251 C12.3378424,11.6628251 12.9949398,11.0441658 12.9949398,9.82743187 C12.9949398,9.82743187 13.0784033,8.83973786 12.5673907,7.91687176 C12.5673907,7.91687176 12.12241,7.09320352 11.2915645,6.94622302 C11.2915645,6.94622302 10.5823616,6.77875096 9.97746447,7.30855136 C9.97746447,7.30855136 9.60893666,7.53069868 9.07708189,8.61069792 C9.07708189,8.61069792 8.81636505,9.19517358 8.30184718,9.18492779 C8.30184718,9.18492779 8.09323581,9.17812831 8.0028565,9.08582307 C8.0028565,9.08582307 7.70396056,8.92515048 7.52670721,8.92179731 C7.52670721,8.92179731 8.15936239,8.65689711 8.46176362,7.87933492 C8.46176362,7.87933492 8.7607543,7.14107929 8.35054211,6.48823628 C8.35054211,6.48823628 8.02720397,5.73293539 6.64015627,5.85933116 C6.64006153,5.85933116 5.66587865,5.90608922 4.87198071,6.59879765 Z M7.91238245,4.48192463 C7.91238245,4.48192463 8.114078,5.68505962 9.6227683,5.84908537 C9.6227683,5.84908537 10.5683405,5.92089904 11.4374598,4.94680399 L12.205684,5.87302326 C12.205684,5.87302326 11.4339546,6.7240757 10.085086,6.78899674 C10.085086,6.78899674 9.10123988,6.95646881 8.25997333,5.89006853 C8.26006806,5.89006853 7.7455502,5.25781024 7.91238245,4.48192463 Z M8.74663845,4.87843664 L9.58799974,4 L10.4710454,4.82031508 L9.62627358,5.66112173 L8.74663845,4.87843664 Z" id="Combined-Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+    <g id="POI-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Artboard-1" transform="translate(-387.000000, -1068.000000)">
+            <g id="hindu-s" transform="translate(387.000000, 1068.000000)">
+                <circle id="Oval-1-Copy-43" fill-opacity="0.1" fill="#FFFFFF" cx="8.5" cy="8.5" r="8.5"></circle>
+                <circle id="Oval-1-Copy-42" fill="#26160D" cx="8.5" cy="8.5" r="7.5"></circle>
+                <path d="M4.87198071,6.59879765 L5.4560357,7.74204135 C5.4560357,7.74204135 6.64489313,6.86537444 7.35409599,7.06023071 C7.35409599,7.06023071 7.77122399,7.14359417 7.87950863,7.42805451 C7.87950863,7.42805451 8.191952,8.01718734 7.32974852,8.27696465 C7.32974852,8.27696465 6.68667224,8.49743539 6.01053267,8.23765808 L6.50771363,9.74332326 C6.50771363,9.74332326 7.17513737,9.38788754 7.774824,9.76381483 C7.774824,9.76381483 8.59638521,10.2715402 7.92839304,11.250013 C7.92839304,11.250013 7.52623352,11.7660282 6.60264032,11.7660282 C6.60264032,11.7660282 4.48829495,11.9877098 4.07817751,8.7167884 C4.07817751,8.7167884 3.71902869,10.0476232 4.54030569,11.5010348 C4.54030569,11.5010348 5.31572987,12.9960816 6.97041023,12.9994348 C6.97041023,12.9994348 8.72428046,13.0797245 8.96415512,11.3263907 C8.96415512,11.3263907 9.13619792,10.4856772 8.57307985,9.56271795 C8.57307985,9.56271795 9.44380968,9.83963367 10.0018119,9.32175564 C10.0018119,9.32175564 10.2972973,9.10296148 10.6901726,8.36125955 C10.6901726,8.36125955 10.9890685,7.83490545 11.402786,7.74949284 C11.402786,7.74949284 11.8998722,7.60940496 12.1918523,8.06049908 C12.1918523,8.06049908 12.5098852,8.67058921 12.4213059,9.29092513 C12.4213059,9.29092513 12.4004637,10.5162283 11.1751325,10.8699874 C11.1751325,10.8699874 9.70632653,11.2937905 9.61073667,9.8240787 C9.61073667,9.8240787 9.43869387,9.99499708 9.50472572,10.7913743 C9.50472572,10.7913743 9.61594722,12.0457382 10.759615,12.2609929 C10.759615,12.2609929 11.597471,12.4455102 12.3378424,11.6628251 C12.3378424,11.6628251 12.9949398,11.0441658 12.9949398,9.82743187 C12.9949398,9.82743187 13.0784033,8.83973786 12.5673907,7.91687176 C12.5673907,7.91687176 12.12241,7.09320352 11.2915645,6.94622302 C11.2915645,6.94622302 10.5823616,6.77875096 9.97746447,7.30855136 C9.97746447,7.30855136 9.60893666,7.53069868 9.07708189,8.61069792 C9.07708189,8.61069792 8.81636505,9.19517358 8.30184718,9.18492779 C8.30184718,9.18492779 8.09323581,9.17812831 8.0028565,9.08582307 C8.0028565,9.08582307 7.70396056,8.92515048 7.52670721,8.92179731 C7.52670721,8.92179731 8.15936239,8.65689711 8.46176362,7.87933492 C8.46176362,7.87933492 8.7607543,7.14107929 8.35054211,6.48823628 C8.35054211,6.48823628 8.02720397,5.73293539 6.64015627,5.85933116 C6.64006153,5.85933116 5.66587865,5.90608922 4.87198071,6.59879765 Z M7.91238245,4.48192463 C7.91238245,4.48192463 8.114078,5.68505962 9.6227683,5.84908537 C9.6227683,5.84908537 10.5683405,5.92089904 11.4374598,4.94680399 L12.205684,5.87302326 C12.205684,5.87302326 11.4339546,6.7240757 10.085086,6.78899674 C10.085086,6.78899674 9.10123988,6.95646881 8.25997333,5.89006853 C8.26006806,5.89006853 7.7455502,5.25781024 7.91238245,4.48192463 Z M8.74663845,4.87843664 L9.58799974,4 L10.4710454,4.82031508 L9.62627358,5.66112173 L8.74663845,4.87843664 Z" id="Combined-Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+            </g>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/hospital-l.svg b/data/styles/clear/style-night/symbols/hospital-l.svg
index 7272023bf0..5dbb6699d9 100644
--- a/data/styles/clear/style-night/symbols/hospital-l.svg
+++ b/data/styles/clear/style-night/symbols/hospital-l.svg
@@ -1,14 +1,16 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <svg width="27px" height="27px" viewBox="0 0 27 27" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
     <title>hospital-l</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
-    <g id="POI-NIght" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="hospital-l">
-            <circle id="Oval-1-Copy-39" fill-opacity="0.1" fill="#FFFFFF" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#612C23" cx="13.5" cy="13.5" r="12.5"></circle>
-            <path d="M12,5.3622 C11.446,5.3622 11,5.8082 11,6.3622 L11,10.3622 L7,10.3622 C6.446,10.3622 6,10.8082 6,11.3622 L6,14.3622 C6,14.9162 6.446,15.3622 7,15.3622 L11,15.3622 L11,19.3622 C11,19.9162 11.446,20.3622 12,20.3622 L15,20.3622 C15.554,20.3622 16,19.9162 16,19.3622 L16,15.3622 L20,15.3622 C20.554,15.3622 21,14.9162 21,14.3622 L21,11.3622 C21,10.8082 20.554,10.3622 20,10.3622 L16,10.3622 L16,6.3622 C16,5.8082 15.554,5.3622 15,5.3622 L12,5.3622 Z" id="rect8206-4-copy" fill-opacity="0.7" fill="#FFFFFF"></path>
+    <g id="POI-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Artboard-1" transform="translate(-137.000000, -248.000000)">
+            <g id="hospital-l" transform="translate(137.000000, 248.000000)">
+                <circle id="Oval-1-Copy-39" fill-opacity="0.1" fill="#FFFFFF" cx="13.5" cy="13.5" r="13.5"></circle>
+                <circle id="Oval-1-Copy-38" fill="#612C23" cx="13.5" cy="13.5" r="12.5"></circle>
+                <path d="M16,11 L16,7.00748397 C16,6.44892021 15.5523709,6 15.0001925,6 L11.9998075,6 C11.4437166,6 11,6.45106594 11,7.00748397 L11,11 L7.00748397,11 C6.44892021,11 6,11.4476291 6,11.9998075 L6,15.0001925 C6,15.5562834 6.45106594,16 7.00748397,16 L11,16 L11,19.992516 C11,20.5510798 11.4476291,21 11.9998075,21 L15.0001925,21 C15.5562834,21 16,20.5489341 16,19.992516 L16,16 L19.992516,16 C20.5510798,16 21,15.5523709 21,15.0001925 L21,11.9998075 C21,11.4437166 20.5489341,11 19.992516,11 L16,11 Z" id="Combined-Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+            </g>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/hospital-m.svg b/data/styles/clear/style-night/symbols/hospital-m.svg
index f896997a63..59531f7345 100644
--- a/data/styles/clear/style-night/symbols/hospital-m.svg
+++ b/data/styles/clear/style-night/symbols/hospital-m.svg
@@ -1,14 +1,16 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <svg width="23px" height="23px" viewBox="0 0 23 23" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
     <title>hospital-m</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
-    <g id="POI-NIght" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="hospital-m">
-            <ellipse id="Oval-1-Copy-41" fill-opacity="0.1" fill="#FFFFFF" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
-            <ellipse id="Oval-1-Copy-40" fill="#612C23" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
-            <path d="M10,5 C9.446,5 9,5.446 9,6 L9,9 L6,9 C5.446,9 5,9.446 5,10 L5,13 C5,13.554 5.474429,14.1752 6,14 L9,14 L9,17 C9,17.554 9.446,18 10,18 L13,18 C13.554,18 14,17.554 14,17 L14,14 L17,14 C17.554,14 18,13.554 18,13 L18,10 C18,9.446 17.554,9 17,9 L14,9 L14,6 C14,5.446 13.554,5 13,5 L10,5 Z" id="rect8206-4-3-copy" fill-opacity="0.7" fill="#FFFFFF"></path>
+    <g id="POI-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Artboard-1" transform="translate(-174.000000, -250.000000)">
+            <g id="hospital-m" transform="translate(174.000000, 250.000000)">
+                <ellipse id="Oval-1-Copy-41" fill-opacity="0.1" fill="#FFFFFF" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
+                <ellipse id="Oval-1-Copy-40" fill="#612C23" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+            </g>
+            <path d="M187.5,259.5 L187.5,255.998502 C187.5,255.447489 187.04809,255 186.490631,255 L184.509369,255 C183.943353,255 183.5,255.447045 183.5,255.998502 L183.5,259.5 L179.998502,259.5 C179.447489,259.5 179,259.95191 179,260.509369 L179,262.490631 C179,263.056647 179.447045,263.5 179.998502,263.5 L183.5,263.5 L183.5,267.001498 C183.5,267.552511 183.95191,268 184.509369,268 L186.490631,268 C187.056647,268 187.5,267.552955 187.5,267.001498 L187.5,263.5 L191.001498,263.5 C191.552511,263.5 192,263.04809 192,262.490631 L192,260.509369 C192,259.943353 191.552955,259.5 191.001498,259.5 L187.5,259.5 Z" id="Combined-Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/hospital-s.svg b/data/styles/clear/style-night/symbols/hospital-s.svg
index dd9b0ea090..400264a4dd 100644
--- a/data/styles/clear/style-night/symbols/hospital-s.svg
+++ b/data/styles/clear/style-night/symbols/hospital-s.svg
@@ -1,14 +1,16 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <svg width="17px" height="17px" viewBox="0 0 17 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
     <title>hospital-s</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
-    <g id="POI-NIght" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="hospital-s">
-            <circle id="Oval-1-Copy-43" fill-opacity="0.1" fill="#FFFFFF" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-42" fill="#612C23" cx="8.5" cy="8.5" r="7.5"></circle>
-            <path d="M4,8 C4,7.446 4.446,7 5,7 L7,7 L7,5 C7,4.446 7.446,4 8,4 L9,4 C9.554,4 10,4.446 10,5 L10,7 L12,7 C12.554,7 13,7.446 13,8 L13,9 C13,9.554 12.554,10 12,10 L10,10 L10,12 C10,12.554 9.554,13 9,13 L8,13 C7.446,13 7,12.554 7,12 L7,10 L5,10 C4.446,10 4,9.554 4,9 L4,8 Z" id="path5535" fill-opacity="0.7" fill="#FFFFFF"></path>
+    <g id="POI-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Artboard-1" transform="translate(-207.000000, -253.000000)">
+            <g id="hospital-s" transform="translate(207.000000, 253.000000)">
+                <circle id="Oval-1-Copy-43" fill-opacity="0.1" fill="#FFFFFF" cx="8.5" cy="8.5" r="8.5"></circle>
+                <circle id="Oval-1-Copy-42" fill="#612C23" cx="8.5" cy="8.5" r="7.5"></circle>
+            </g>
+            <path d="M217,260 L217,257.997545 C217,257.446311 216.552752,257 216.001043,257 L214.998957,257 C214.44266,257 214,257.446616 214,257.997545 L214,260 L211.997545,260 C211.446311,260 211,260.447248 211,260.998957 L211,262.001043 C211,262.55734 211.446616,263 211.997545,263 L214,263 L214,265.002455 C214,265.553689 214.447248,266 214.998957,266 L216.001043,266 C216.55734,266 217,265.553384 217,265.002455 L217,263 L219.002455,263 C219.553689,263 220,262.552752 220,262.001043 L220,260.998957 C220,260.44266 219.553384,260 219.002455,260 L217,260 Z" id="Combined-Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/jewish-l.svg b/data/styles/clear/style-night/symbols/jewish-l.svg
index 4d13bb9f23..a954b23b73 100644
--- a/data/styles/clear/style-night/symbols/jewish-l.svg
+++ b/data/styles/clear/style-night/symbols/jewish-l.svg
@@ -1,14 +1,16 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <svg width="27px" height="27px" viewBox="0 0 27 27" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
     <title>jewish-l</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
-    <g id="POI-NIght" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="jewish-l">
-            <circle id="Oval-1-Copy-39" fill-opacity="0.1" fill="#FFFFFF" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#26160D" cx="13.5" cy="13.5" r="12.5"></circle>
-            <path d="M8.41859845,13.494755 L6.0010376,18.0122681 L8.54998779,16.4509277 L9.26771667,15.0860855 L9.9967547,16.452374 L8.54998779,16.4509277 L6.0010376,18.0065918 L10.8260699,18.0065918 L13.4901123,22.9992676 L16.1820202,18.0065918 L21.0098877,18.0065918 L18.6074889,13.5080804 L21.0431519,8.99066162 L16.1949927,8.99066162 L13.5147705,3.97192383 L10.8289777,8.99066162 L6.01525879,8.99066162 L8.44775391,10.4033203 L10.0729891,10.4033203 L9.26311062,11.916679 L8.44775391,10.4154663 L6.01525879,8.99066162 L8.41859845,13.494755 Z M16.9494132,10.4033203 L17.7473836,11.8975263 L18.5567627,10.4033203 L16.9494132,10.4033203 Z M14.4382348,18.0065918 L12.5707374,18.0065918 L13.5057373,19.7280884 L14.4382348,18.0065918 Z M11.7275316,16.4541043 L15.2772616,16.4576529 L16.9065788,13.4497477 L15.2925641,10.4033203 L11.7302401,10.4033203 L10.1122551,13.4801008 L11.7275316,16.4541043 Z M17.0162265,16.4593913 L18.5018921,16.4608765 L17.7651706,15.0703263 L17.0162265,16.4593913 Z M14.5441294,8.99066162 L13.5047607,7.02886963 L12.4731142,8.99066162 L14.5441294,8.99066162 Z" id="Combined-Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+    <g id="POI-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Artboard-1" transform="translate(-317.000000, -1137.000000)">
+            <g id="jewish-l" transform="translate(317.000000, 1137.000000)">
+                <circle id="Oval-1-Copy-39" fill-opacity="0.1" fill="#FFFFFF" cx="13.5" cy="13.5" r="13.5"></circle>
+                <circle id="Oval-1-Copy-38" fill="#26160D" cx="13.5" cy="13.5" r="12.5"></circle>
+                <path d="M18.4661062,13.3551651 L20.9856748,9.15495208 C21.0221903,9.11874334 20.9856748,9.04632588 20.9126438,9.04632588 L16.0560841,9.04632588 C16.0195686,9.04632588 16.0195686,9.04632588 15.9830531,9.01011715 L13.7556084,5.02715655 C13.7190929,4.99094782 13.6460619,4.99094782 13.6460619,5.02715655 L11.2725553,9.01011715 C11.2725553,9.04632588 11.2360398,9.04632588 11.1995243,9.04632588 L6.12387166,9.04632588 C6.05084069,9.04632588 6.05084069,9.11874334 6.05084069,9.15495208 L8.53389379,13.5724175 L8.53389379,13.6448349 L6.0143252,17.8450479 C5.97780972,17.8812567 6.0143252,17.9536741 6.08735618,17.9536741 L10.9439159,17.9536741 C10.9804314,17.9536741 10.9804314,17.9536741 11.0169469,17.9898829 L13.2443916,21.9728435 C13.2809071,22.0090522 13.3539381,22.0090522 13.3539381,21.9728435 L15.7274447,17.9898829 C15.7274447,17.9536741 15.7639602,17.9536741 15.8004757,17.9536741 L20.8761283,17.9536741 C20.9491593,17.9536741 20.9491593,17.8812567 20.9491593,17.8450479 L18.4661062,13.4275825 L18.4661062,13.3551651 L18.4661062,13.3551651 Z M19.2694469,10.1325879 L17.9914049,12.3051118 C17.9548894,12.3413206 17.8818584,12.3413206 17.8818584,12.3051118 L16.6768474,10.1325879 C16.6403319,10.0963791 16.6768474,10.0239617 16.7498783,10.0239617 L19.2694469,10.0239617 C19.2329314,10.0239617 19.2694469,10.0963791 19.2694469,10.1325879 L19.2694469,10.1325879 Z M17.2976106,13.4275825 L15.2162279,16.9398296 C15.2162279,16.9760383 15.1797124,16.9760383 15.1431969,16.9760383 L11.6011947,16.9760383 C11.5646792,16.9760383 11.5646792,16.9760383 11.5281637,16.9398296 L9.70238937,13.6448349 L9.70238937,13.5724175 L11.7837721,10.0601704 C11.7837721,10.0239617 11.8202876,10.0239617 11.8568031,10.0239617 L15.3988053,10.0239617 C15.4353208,10.0239617 15.4353208,10.0239617 15.4718363,10.0601704 L17.2976106,13.3551651 C17.3341261,13.3551651 17.3341261,13.3913738 17.2976106,13.4275825 L17.2976106,13.4275825 Z M13.7190929,6.98242812 L14.8145575,8.93769968 C14.851073,8.97390841 14.8145575,9.04632588 14.7415266,9.04632588 L12.4775664,9.04632588 C12.4045354,9.04632588 12.3680199,8.97390841 12.4045354,8.93769968 L13.6095465,6.98242812 C13.6460619,6.94621938 13.7190929,6.94621938 13.7190929,6.98242812 L13.7190929,6.98242812 Z M7.76706857,10.0239617 L10.5422456,10.0239617 C10.6152765,10.0239617 10.651792,10.0963791 10.6152765,10.1325879 L9.19117256,12.5223642 C9.15465707,12.5585729 9.0816261,12.5585729 9.0816261,12.5223642 L7.73055308,10.1325879 C7.6940376,10.0963791 7.73055308,10.0239617 7.76706857,10.0239617 L7.76706857,10.0239617 Z M7.73055308,16.8674121 L9.00859512,14.6948882 C9.04511061,14.6586794 9.11814158,14.6586794 9.11814158,14.6948882 L10.3231526,16.8674121 C10.3596681,16.9036209 10.3231526,16.9760383 10.2501217,16.9760383 L7.80358406,16.9760383 C7.76706857,16.9760383 7.73055308,16.9036209 7.73055308,16.8674121 L7.73055308,16.8674121 Z M13.2809071,20.0175719 L12.1854425,18.0623003 C12.148927,18.0260916 12.1854425,17.9536741 12.2584734,17.9536741 L14.5224336,17.9536741 C14.5954646,17.9536741 14.6319801,18.0260916 14.5954646,18.0623003 L13.3904535,20.0175719 C13.3539381,20.0537806 13.2809071,20.0537806 13.2809071,20.0175719 L13.2809071,20.0175719 Z M17.9548894,14.4776358 L19.3059624,16.8674121 C19.3424779,16.9036209 19.3059624,16.9760383 19.2329314,16.9760383 L16.4577544,16.9760383 C16.3847235,16.9760383 16.348208,16.9036209 16.3847235,16.8674121 L17.8088274,14.4776358 C17.8453429,14.4414271 17.9183739,14.4414271 17.9548894,14.4776358 L17.9548894,14.4776358 Z" id="Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+            </g>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/jewish-m.svg b/data/styles/clear/style-night/symbols/jewish-m.svg
index 0e60ef3c9a..97eb9d2a65 100644
--- a/data/styles/clear/style-night/symbols/jewish-m.svg
+++ b/data/styles/clear/style-night/symbols/jewish-m.svg
@@ -1,14 +1,16 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <svg width="23px" height="23px" viewBox="0 0 23 23" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
     <title>jewish-m</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
-    <g id="POI-NIght" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="jewish-m">
-            <ellipse id="Oval-1-Copy-41" fill-opacity="0.1" fill="#FFFFFF" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
-            <ellipse id="Oval-1-Copy-40" fill="#26160D" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
-            <path d="M9.56383683,15.0063551 L5.00933838,15.00354 L7.28999458,11.4918197 L5.03973389,8.01373291 L6.8895874,9.00537109 L7.89521432,10.5599114 L8.88977392,9.02850342 L6.8895874,9.02850342 L5.03973389,8.01373291 L9.54880779,8.01373291 L11.5117188,4.99127197 L11.5117188,6.84411621 L10.7525104,8.01373291 L12.2727433,8.01373291 L11.5117188,6.84411621 L11.5036621,4.99127197 L13.476538,8.01373291 L18.017395,8.01373291 L15.7496108,11.4960977 L18.0443115,15.0115967 L13.4620934,15.0087645 L11.5073853,18.010376 L9.56383683,15.0063551 Z M10.7720869,15.0071019 L12.2357816,15.0080066 L11.5009766,16.1338501 L10.7720869,15.0071019 Z M15.1387245,10.5602152 L14.1389176,9.02850342 L16.1384277,9.02850342 L15.1387245,10.5602152 Z M12.9330155,9.02850342 L14.533251,11.4879012 L12.9096366,13.9755486 L10.1070462,13.9790541 L8.49646104,11.4893438 L10.093814,9.02850342 L12.9330155,9.02850342 Z M15.1438379,12.4263107 L16.149231,13.9714966 L14.1359427,13.9740148 L15.1438379,12.4263107 Z M8.9001679,13.9805636 L6.87774658,13.9830933 L7.8914359,12.4214299 L8.9001679,13.9805636 Z" id="Combined-Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+    <g id="POI-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Artboard-1" transform="translate(-354.000000, -1139.000000)">
+            <g id="jewish-m" transform="translate(354.000000, 1139.000000)">
+                <ellipse id="Oval-1-Copy-41" fill-opacity="0.1" fill="#FFFFFF" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
+                <ellipse id="Oval-1-Copy-40" fill="#26160D" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+                <path d="M15.8039587,11.3722045 L17.9875848,7.66613419 C18.0192316,7.6341853 17.9875848,7.57028754 17.9242913,7.57028754 L13.7152729,7.57028754 C13.6836261,7.57028754 13.6836261,7.57028754 13.6519794,7.53833866 L11.7215273,4.02396166 C11.6898805,3.99201278 11.626587,3.99201278 11.626587,4.02396166 L9.56954793,7.53833866 C9.56954793,7.57028754 9.53790118,7.57028754 9.50625442,7.57028754 L5.10735544,7.57028754 C5.04406193,7.57028754 5.04406193,7.6341853 5.04406193,7.66613419 L7.19604129,11.5638978 L7.19604129,11.6277955 L5.01241518,15.3338658 C4.98076842,15.3658147 5.01241518,15.4297125 5.07570869,15.4297125 L9.28472713,15.4297125 C9.31637389,15.4297125 9.31637389,15.4297125 9.34802064,15.4616613 L11.2784727,18.9760383 C11.3101195,19.0079872 11.373413,19.0079872 11.373413,18.9760383 L13.4304521,15.4616613 C13.4304521,15.4297125 13.4620988,15.4297125 13.4937456,15.4297125 L17.8926446,15.4297125 C17.9559381,15.4297125 17.9559381,15.3658147 17.9559381,15.3338658 L15.8039587,11.4361022 L15.8039587,11.3722045 L15.8039587,11.3722045 Z M16.5001873,8.52875399 L15.3925509,10.4456869 C15.3609041,10.4776358 15.2976106,10.4776358 15.2976106,10.4456869 L14.2532677,8.52875399 C14.221621,8.49680511 14.2532677,8.43290735 14.3165612,8.43290735 L16.5001873,8.43290735 C16.4685406,8.43290735 16.5001873,8.49680511 16.5001873,8.52875399 L16.5001873,8.52875399 Z M14.7912625,11.4361022 L12.9873975,14.5351438 C12.9873975,14.5670927 12.9557507,14.5670927 12.924104,14.5670927 L9.85436873,14.5670927 C9.82272197,14.5670927 9.82272197,14.5670927 9.79107522,14.5351438 L8.20873745,11.6277955 L8.20873745,11.5638978 L10.0126025,8.46485623 C10.0126025,8.43290735 10.0442493,8.43290735 10.075896,8.43290735 L13.1456313,8.43290735 C13.177278,8.43290735 13.177278,8.43290735 13.2089248,8.46485623 L14.7912625,11.3722045 C14.8229093,11.3722045 14.8229093,11.4041534 14.7912625,11.4361022 L14.7912625,11.4361022 Z M11.6898805,5.74920128 L12.6392832,7.47444089 C12.6709299,7.50638978 12.6392832,7.57028754 12.5759897,7.57028754 L10.6138909,7.57028754 C10.5505973,7.57028754 10.5189506,7.50638978 10.5505973,7.47444089 L11.5949403,5.74920128 C11.626587,5.7172524 11.6898805,5.7172524 11.6898805,5.74920128 L11.6898805,5.74920128 Z M6.53145943,8.43290735 L8.93661283,8.43290735 C8.99990634,8.43290735 9.03155309,8.49680511 8.99990634,8.52875399 L7.76568288,10.6373802 C7.73403613,10.6693291 7.67074262,10.6693291 7.67074262,10.6373802 L6.49981267,8.52875399 C6.46816592,8.49680511 6.49981267,8.43290735 6.53145943,8.43290735 L6.53145943,8.43290735 Z M6.49981267,14.471246 L7.60744911,12.5543131 C7.63909586,12.5223642 7.70238937,12.5223642 7.70238937,12.5543131 L8.74673229,14.471246 C8.77837905,14.5031949 8.74673229,14.5670927 8.68343878,14.5670927 L6.56310618,14.5670927 C6.53145943,14.5670927 6.49981267,14.5031949 6.49981267,14.471246 L6.49981267,14.471246 Z M11.3101195,17.2507987 L10.3607168,15.5255591 C10.3290701,15.4936102 10.3607168,15.4297125 10.4240103,15.4297125 L12.3861091,15.4297125 C12.4494027,15.4297125 12.4810494,15.4936102 12.4494027,15.5255591 L11.4050597,17.2507987 C11.373413,17.2827476 11.3101195,17.2827476 11.3101195,17.2507987 L11.3101195,17.2507987 Z M15.3609041,12.3626198 L16.5318341,14.471246 C16.5634808,14.5031949 16.5318341,14.5670927 16.4685406,14.5670927 L14.0633872,14.5670927 C14.0000937,14.5670927 13.9684469,14.5031949 14.0000937,14.471246 L15.2343171,12.3626198 C15.2659639,12.3306709 15.3292574,12.3306709 15.3609041,12.3626198 L15.3609041,12.3626198 Z" id="Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+            </g>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/jewish-s.svg b/data/styles/clear/style-night/symbols/jewish-s.svg
index 1e99934ccc..b3fddbe6b2 100644
--- a/data/styles/clear/style-night/symbols/jewish-s.svg
+++ b/data/styles/clear/style-night/symbols/jewish-s.svg
@@ -1,14 +1,16 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <svg width="17px" height="17px" viewBox="0 0 17 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
     <title>jewish-s</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
-    <g id="POI-NIght" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="jewish-s">
-            <circle id="Oval-1-Copy-43" fill-opacity="0.1" fill="#FFFFFF" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-42" fill="#26160D" cx="8.5" cy="8.5" r="7.5"></circle>
-            <path d="M5.41450347,8.52764845 L4.02642822,11.006958 L5.73028564,9.95605469 L5.97400889,9.52321204 L6.21854854,9.95833699 L5.73028564,9.95605469 L4.02642822,11.0000029 L6.80396339,11.0000029 L8.49633789,14.0113525 L10.1976419,11.0000029 L11.2840523,11.000003 L13.0268555,10.9988403 L11.6151761,8.49093298 L13.0341187,5.97937012 L10.2014391,5.97937012 L8.51678467,2.98651123 L6.84119183,5.97937012 L4.00189209,5.97937012 L5.73083496,7.01245117 L6.26289237,7.01229927 L5.99886948,7.48388354 L5.73083496,7.01245117 L4.00189209,6.01409912 L5.41450347,8.52764845 Z M10.7821397,7.01100899 L11.0351567,7.46050434 L11.2890625,7.01086426 L10.7821397,7.01100899 Z M9.03644892,11.0000029 L7.99797148,11.0000029 L8.51898193,11.9163818 L9.03644892,11.0000029 Z M7.40889215,9.96390106 L9.61569693,9.97421642 L10.4433204,8.50858343 L9.60662865,7.0113446 L7.38802412,7.01197803 L6.5633065,8.47664325 L7.40889215,9.96390106 Z M10.7741152,9.97963126 L11.2666626,9.98193359 L11.0210878,9.5424837 L10.7741152,9.97963126 Z M9.0299374,5.97937012 L8.50170898,5.03411865 L7.96946071,5.97937012 L9.0299374,5.97937012 Z" id="Combined-Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+    <g id="POI-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Artboard-1" transform="translate(-387.000000, -1142.000000)">
+            <g id="jewish-s" transform="translate(387.000000, 1142.000000)">
+                <circle id="Oval-1-Copy-43" fill-opacity="0.1" fill="#FFFFFF" cx="8.5" cy="8.5" r="8.5"></circle>
+                <circle id="Oval-1-Copy-42" fill="#26160D" cx="8.5" cy="8.5" r="7.5"></circle>
+                <path d="M11.4796637,8.11139491 L12.9914049,5.54185294 C13.0133142,5.51970172 12.9914049,5.47539927 12.9475863,5.47539927 L10.0336504,5.47539927 C10.0117412,5.47539927 10.0117412,5.47539927 9.98983186,5.45324805 L8.65336504,3.01661342 C8.63145575,2.99446219 8.58763717,2.99446219 8.58763717,3.01661342 L7.16353318,5.45324805 C7.16353318,5.47539927 7.14162389,5.47539927 7.1197146,5.47539927 L4.074323,5.47539927 C4.03050441,5.47539927 4.03050441,5.51970172 4.03050441,5.54185294 L5.52033628,8.24430226 L5.52033628,8.2886047 L4.00859512,10.8581467 C3.98668583,10.8802979 4.00859512,10.9246003 4.05241371,10.9246003 L6.96634955,10.9246003 C6.98825885,10.9246003 6.98825885,10.9246003 7.01016814,10.9467516 L8.34663496,13.3833862 C8.36854425,13.4055374 8.41236283,13.4055374 8.41236283,13.3833862 L9.83646682,10.9467516 C9.83646682,10.9246003 9.85837611,10.9246003 9.8802854,10.9246003 L12.925677,10.9246003 C12.9694956,10.9246003 12.9694956,10.8802979 12.9694956,10.8581467 L11.4796637,8.15569736 L11.4796637,8.11139491 L11.4796637,8.11139491 Z M11.9616682,6.13993599 L11.1948429,7.46900942 C11.1729336,7.49116064 11.1291151,7.49116064 11.1291151,7.46900942 L10.4061084,6.13993599 C10.3841991,6.11778476 10.4061084,6.07348232 10.449927,6.07348232 L11.9616682,6.07348232 C11.9397589,6.07348232 11.9616682,6.11778476 11.9616682,6.13993599 L11.9616682,6.13993599 Z M10.7785664,8.15569736 L9.52973673,10.3043661 C9.52973673,10.3265173 9.50782744,10.3265173 9.48591814,10.3265173 L7.36071681,10.3265173 C7.33880752,10.3265173 7.33880752,10.3265173 7.31689823,10.3043661 L6.22143362,8.2886047 L6.22143362,8.24430226 L7.47026327,6.09563354 C7.47026327,6.07348232 7.49217256,6.07348232 7.51408186,6.07348232 L9.63928319,6.07348232 C9.66119248,6.07348232 9.66119248,6.07348232 9.68310177,6.09563354 L10.7785664,8.11139491 C10.8004757,8.11139491 10.8004757,8.13354614 10.7785664,8.15569736 L10.7785664,8.15569736 Z M8.63145575,4.21277951 L9.28873452,5.4089456 C9.31064381,5.43109682 9.28873452,5.47539927 9.24491593,5.47539927 L7.88653982,5.47539927 C7.84272124,5.47539927 7.82081195,5.43109682 7.84272124,5.4089456 L8.56572788,4.21277951 C8.58763717,4.19062828 8.63145575,4.19062828 8.63145575,4.21277951 L8.63145575,4.21277951 Z M5.06024114,6.07348232 L6.72534734,6.07348232 C6.76916592,6.07348232 6.79107522,6.11778476 6.76916592,6.13993599 L5.91470353,7.60191676 C5.89279424,7.62406799 5.84897566,7.62406799 5.84897566,7.60191676 L5.03833185,6.13993599 C5.01642256,6.11778476 5.03833185,6.07348232 5.06024114,6.07348232 L5.06024114,6.07348232 Z M5.03833185,10.2600636 L5.80515707,8.9309902 C5.82706636,8.90883897 5.87088495,8.90883897 5.87088495,8.9309902 L6.59389159,10.2600636 C6.61580088,10.2822149 6.59389159,10.3265173 6.550073,10.3265173 L5.08215043,10.3265173 C5.06024114,10.3265173 5.03833185,10.2822149 5.03833185,10.2600636 L5.03833185,10.2600636 Z M8.36854425,12.1872201 L7.71126548,10.991054 C7.68935619,10.9689028 7.71126548,10.9246003 7.75508407,10.9246003 L9.11346018,10.9246003 C9.15727876,10.9246003 9.17918805,10.9689028 9.15727876,10.991054 L8.43427212,12.1872201 C8.41236283,12.2093713 8.36854425,12.2093713 8.36854425,12.1872201 L8.36854425,12.1872201 Z M11.1729336,8.79808285 L11.9835774,10.2600636 C12.0054867,10.2822149 11.9835774,10.3265173 11.9397589,10.3265173 L10.2746527,10.3265173 C10.2308341,10.3265173 10.2089248,10.2822149 10.2308341,10.2600636 L11.0852965,8.79808285 C11.1072058,8.77593163 11.1510243,8.77593163 11.1729336,8.79808285 L11.1729336,8.79808285 Z" id="Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+            </g>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/muslim-l.svg b/data/styles/clear/style-night/symbols/muslim-l.svg
index 5620194373..d6d00e302f 100644
--- a/data/styles/clear/style-night/symbols/muslim-l.svg
+++ b/data/styles/clear/style-night/symbols/muslim-l.svg
@@ -1,14 +1,17 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <svg width="27px" height="27px" viewBox="0 0 27 27" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
     <title>muslim-l</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
-    <g id="POI-NIght" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="muslim-l">
-            <circle id="Oval-1-Copy-39" fill-opacity="0.1" fill="#FFFFFF" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#26160D" cx="13.5" cy="13.5" r="12.5"></circle>
-            <path d="M17.7931609,8.1897312 C16.4367366,6.83739076 14.565915,6 12.5,6 C8.36629279,6 5,9.35786438 5,13.5 C5,17.6337072 8.35786438,21 12.5,21 C14.5636018,21 16.4359532,20.1631733 17.7937253,18.8097031 C16.9587519,19.2504717 16.0078898,19.5 15,19.5 C11.6862915,19.5 9,16.8069658 9,13.5 C9,10.1862915 11.6930342,7.5 15,7.5 C16.0085164,7.5 16.9589171,7.74944753 17.7931609,8.1897312 Z M18.5,14.75 L16.8339945,15.5833333 L17.25,13.9166667 L16,12.6666667 L17.6666667,12.6666667 L18.5,11 L19.3333333,12.6666667 L21,12.6666667 L19.75,13.9166667 L20.1666667,15.5833333 L18.5,14.75 Z" id="Combined-Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+    <g id="POI-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Artboard-1" transform="translate(-317.000000, -989.000000)">
+            <g id="muslim-l" transform="translate(317.000000, 989.000000)">
+                <circle id="Oval-1-Copy-39" fill-opacity="0.1" fill="#FFFFFF" cx="13.5" cy="13.5" r="13.5"></circle>
+                <circle id="Oval-1-Copy-38" fill="#26160D" cx="13.5" cy="13.5" r="12.5"></circle>
+                <polygon id="Star-4" fill-opacity="0.7" fill="#FFFFFF" points="18.5 14.75 16.8339945 15.5833333 17.25 13.9166667 16 12.6666667 17.6666667 12.6666667 18.5 11 19.3333333 12.6666667 21 12.6666667 19.75 13.9166667 20.1666667 15.5833333"></polygon>
+                <path d="M17.7931609,8.1897312 C16.4367366,6.83739076 14.565915,6 12.5,6 C8.36629279,6 5,9.35786438 5,13.5 C5,17.6337072 8.35786438,21 12.5,21 C14.5636018,21 16.4359532,20.1631733 17.7937253,18.8097031 C16.9587519,19.2504717 16.0078898,19.5 15,19.5 C11.6862915,19.5 9,16.8069658 9,13.5 C9,10.1862915 11.6930342,7.5 15,7.5 C16.0085164,7.5 16.9589171,7.74944753 17.7931609,8.1897312 Z" id="Combined-Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+            </g>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/muslim-m.svg b/data/styles/clear/style-night/symbols/muslim-m.svg
index 47cd03b663..75831835f2 100644
--- a/data/styles/clear/style-night/symbols/muslim-m.svg
+++ b/data/styles/clear/style-night/symbols/muslim-m.svg
@@ -1,14 +1,18 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <svg width="23px" height="23px" viewBox="0 0 23 23" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
     <title>muslim-m</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
-    <g id="POI-NIght" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="muslim-m">
-            <ellipse id="Oval-1-Copy-41" fill-opacity="0.1" fill="#FFFFFF" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
-            <ellipse id="Oval-1-Copy-40" fill="#26160D" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
-            <path d="M14.6620095,11.4553113 L14,13 L15.5041504,12 L17,13 L16.3379905,11.4553113 L17.5,10.7000122 L16.0142909,10.7000122 L15.5,9.5 L14.9857091,10.7000122 L13.5,10.7000122 L14.6620095,11.4553113 Z M14.4931146,6.37302001 C13.3912557,5.51303837 12.0053911,5 10.5,5 C6.91745375,5 4,7.91014913 4,11.5 C4,15.0825462 6.91014913,18 10.5,18 C12.0037889,18 13.3903927,17.4872504 14.4932313,16.6267105 C13.8748641,16.8677391 13.2025457,17 12.5,17 C9.46243388,17 7,14.5313853 7,11.5 C7,8.46243388 9.46861471,6 12.5,6 C13.202972,6 13.8751411,6.13221414 14.4931146,6.37302001 Z" id="Combined-Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+    <g id="POI-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Artboard-1" transform="translate(-354.000000, -991.000000)">
+            <g id="muslim-m" transform="translate(354.000000, 991.000000)">
+                <ellipse id="Oval-1-Copy-41" fill-opacity="0.1" fill="#FFFFFF" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
+                <ellipse id="Oval-1-Copy-40" fill="#26160D" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+                <path d="M14.4931146,6.37302001 C13.3912557,5.51303837 12.0053911,5 10.5,5 C6.91745375,5 4,7.91014913 4,11.5 C4,15.0825462 6.91014913,18 10.5,18 C12.0037889,18 13.3903927,17.4872504 14.4932313,16.6267105 C13.8748641,16.8677391 13.2025457,17 12.5,17 C9.46243388,17 7,14.5313853 7,11.5 C7,8.46243388 9.46861471,6 12.5,6 C13.202972,6 13.8751411,6.13221414 14.4931146,6.37302001 Z" id="Combined-Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+                <polygon id="Path-3244" fill-opacity="0.7" fill="#FFFFFF" points="14 13 15.5 9.5 17 13 15.5041504 12"></polygon>
+                <polygon id="Path-3244" fill-opacity="0.7" fill="#FFFFFF" transform="translate(15.500000, 11.350006) scale(1, -1) translate(-15.500000, -11.350006) " points="13.5 12 15.5 10.7000122 17.5 12"></polygon>
+            </g>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/muslim-s.svg b/data/styles/clear/style-night/symbols/muslim-s.svg
index 75445fb8e8..ebac7aa932 100644
--- a/data/styles/clear/style-night/symbols/muslim-s.svg
+++ b/data/styles/clear/style-night/symbols/muslim-s.svg
@@ -1,14 +1,17 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <svg width="17px" height="17px" viewBox="0 0 17 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
     <title>muslim-s</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
-    <g id="POI-NIght" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="muslim-s">
-            <circle id="Oval-1-Copy-43" fill-opacity="0.1" fill="#FFFFFF" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-42" fill="#26160D" cx="8.5" cy="8.5" r="7.5"></circle>
-            <path d="M11.9159774,11.4294749 C11.0906808,12.3909375 9.86646746,13 8.5,13 C6.01471863,13 4,10.9852814 4,8.5 C4,6.01471863 6.01471863,4 8.5,4 C9.86646746,4 11.0906808,4.6090625 11.9159774,5.57052506 C11.3655367,5.20978526 10.7072674,5 10,5 C8.06700338,5 6.5,6.56700338 6.5,8.5 C6.5,10.4329966 8.06700338,12 10,12 C10.7072674,12 11.3655367,11.7902147 11.9159774,11.4294749 Z M12,6.58578644 L13.4142136,8 L12,9.41421356 L10.5857864,8 L12,6.58578644 Z" id="Combined-Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+    <g id="POI-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Artboard-1" transform="translate(-387.000000, -994.000000)">
+            <g id="muslim-s" transform="translate(387.000000, 994.000000)">
+                <circle id="Oval-1-Copy-43" fill-opacity="0.1" fill="#FFFFFF" cx="8.5" cy="8.5" r="8.5"></circle>
+                <circle id="Oval-1-Copy-42" fill="#26160D" cx="8.5" cy="8.5" r="7.5"></circle>
+                <rect id="Rectangle-341" fill-opacity="0.7" fill="#FFFFFF" transform="translate(12.000000, 8.000000) rotate(-315.000000) translate(-12.000000, -8.000000) " x="11" y="7" width="2" height="2"></rect>
+                <path d="M11.9159774,11.4294749 C11.0906808,12.3909375 9.86646746,13 8.5,13 C6.01471863,13 4,10.9852814 4,8.5 C4,6.01471863 6.01471863,4 8.5,4 C9.86646746,4 11.0906808,4.6090625 11.9159774,5.57052506 C11.3655367,5.20978526 10.7072674,5 10,5 C8.06700338,5 6.5,6.56700338 6.5,8.5 C6.5,10.4329966 8.06700338,12 10,12 C10.7072674,12 11.3655367,11.7902147 11.9159774,11.4294749 Z" id="Combined-Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+            </g>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/pharmacy-l.svg b/data/styles/clear/style-night/symbols/pharmacy-l.svg
index 94b24b9d1c..8edcb7b474 100644
--- a/data/styles/clear/style-night/symbols/pharmacy-l.svg
+++ b/data/styles/clear/style-night/symbols/pharmacy-l.svg
@@ -1,15 +1,16 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <svg width="27px" height="27px" viewBox="0 0 27 27" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
     <title>pharmacy-l</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
-    <g id="POI-NIght" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="pharmacy-l">
-            <ellipse id="Oval-1-Copy-41" fill-opacity="0.1" fill="#FFFFFF" cx="13.5" cy="13.5" rx="13.5" ry="13.5"></ellipse>
-            <circle id="Oval-1-Copy-40" fill="#612C23" cx="13.5" cy="13.5" r="12.5"></circle>
-            <path d="M14.7739937,14.5853641 L16.1397707,15.9497684 L19.9108436,12.0758817 C21.0870775,10.8996478 20.9030915,8.83223359 19.51447,7.44361213 C18.1286741,6.05781624 16.0519108,5.87752819 14.8822004,7.04723857 L11.0998535,10.9149168 L13.7428611,13.5552678 C13.2999247,13.098566 12.8703897,12.646917 12.3253349,12.1184257 C13.596677,10.8470836 16.1393612,8.30439936 16.1393612,8.30439936 C16.7232456,7.72051498 17.7628731,7.8098741 18.4555406,8.50254158 C19.1531186,9.2001196 19.2423376,10.2300661 18.6536828,10.8187209 C18.6536828,10.8187209 16.1427717,13.416982 14.876648,14.6831056 C14.8419742,14.6502497 14.8077672,14.6176763 14.7739937,14.5853641 Z" id="Combined-Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
-            <path d="M7.57808225,14.4315869 L11.0965507,10.9131184 L16.1251939,15.9417616 L12.6067254,19.4602301 C11.2176872,20.8492683 8.96312352,20.8467806 7.57732763,19.4609847 C6.18870617,18.0723632 6.18372939,15.8259398 7.57808225,14.4315869 Z" id="Path" fill-opacity="0.7" fill="#FFFFFF"></path>
+    <g id="POI-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Artboard-1" transform="translate(-137.000000, -322.000000)">
+            <g id="pharmacy-l" transform="translate(137.000000, 322.000000)">
+                <ellipse id="Oval-1-Copy-41" fill-opacity="0.1" fill="#FFFFFF" cx="13.5" cy="13.5" rx="13.5" ry="13.5"></ellipse>
+                <circle id="Oval-1-Copy-40" fill="#612C23" cx="13.5" cy="13.5" r="12.5"></circle>
+                <path d="M9.5,9.00723574 C9.5,6.79410055 11.2953562,5 13.5,5 C15.709139,5 17.5,6.78716697 17.5,9.00723574 L17.5,17.9927643 C17.5,20.2058994 15.7046438,22 13.5,22 C11.290861,22 9.5,20.212833 9.5,17.9927643 L9.5,9.00723574 Z M11,8.99448013 C11,7.6168168 12.1096621,6.5 13.5,6.5 C14.8807119,6.5 16,7.61738984 16,8.99448013 L16,13 L11,13 L11,8.99448013 Z" id="Combined-Shape" fill-opacity="0.7" fill="#FFFFFF" transform="translate(13.500000, 13.500000) rotate(45.000000) translate(-13.500000, -13.500000) "></path>
+            </g>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/pharmacy-m.svg b/data/styles/clear/style-night/symbols/pharmacy-m.svg
index abe9b93944..d08e8c861e 100644
--- a/data/styles/clear/style-night/symbols/pharmacy-m.svg
+++ b/data/styles/clear/style-night/symbols/pharmacy-m.svg
@@ -1,14 +1,16 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <svg width="23px" height="23px" viewBox="0 0 23 23" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
     <title>pharmacy-m</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
-    <g id="POI-NIght" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="pharmacy-m">
-            <ellipse id="Oval-1-Copy-41" fill-opacity="0.1" fill="#FFFFFF" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
-            <ellipse id="Oval-1-Copy-40" fill="#612C23" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
-            <path d="M12.8944024,12.7361945 L16.2967551,9.33384181 C16.8170053,8.81359158 16.7605934,7.92576929 16.1720503,7.33722626 C15.5876503,6.75282623 14.6914689,6.69648734 14.1754348,7.21252147 L10.7730821,10.6148742 L12.8944024,12.7361945 Z M6.50132523,17.0079514 C5.32975235,15.8363785 5.21228713,14.0543488 6.25183688,13.014799 L13.1147746,6.1518613 C14.1485589,5.11807703 15.938738,5.23216068 17.1079269,6.40134964 C18.2794998,7.57292252 18.396965,9.35495223 17.3574153,10.394502 L10.4944776,17.2574397 C9.4606933,18.291224 7.67051419,18.1771403 6.50132523,17.0079514 Z" id="Combined-Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+    <g id="POI-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Artboard-1" transform="translate(-174.000000, -324.000000)">
+            <g id="pharmacy-m" transform="translate(174.000000, 324.000000)">
+                <ellipse id="Oval-1-Copy-41" fill-opacity="0.1" fill="#FFFFFF" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
+                <ellipse id="Oval-1-Copy-40" fill="#612C23" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+                <path d="M8,7.49790272 C8,5.56606439 9.57093664,4 11.5,4 C13.4329966,4 15,5.57691203 15,7.49790272 L15,15.5020973 C15,17.4339356 13.4290634,19 11.5,19 C9.56700338,19 8,17.423088 8,15.5020973 L8,7.49790272 Z M9.5,7.49791312 C9.5,6.39449617 10.3877296,5.5 11.5,5.5 C12.6045695,5.5 13.5,6.39826062 13.5,7.49791312 L13.5,11.5 L9.5,11.5 L9.5,7.49791312 Z" id="Combined-Shape" fill-opacity="0.7" fill="#FFFFFF" transform="translate(11.500000, 11.500000) rotate(45.000000) translate(-11.500000, -11.500000) "></path>
+            </g>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/pharmacy-s.svg b/data/styles/clear/style-night/symbols/pharmacy-s.svg
new file mode 100644
index 0000000000..898654442d
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/pharmacy-s.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="17px" height="17px" viewBox="0 0 17 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
+    <title>pharmacy-s</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="POI-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Artboard-1" transform="translate(-207.000000, -327.000000)">
+            <g id="veterinary-s" transform="translate(207.000000, 327.000000)">
+                <circle id="Oval-1-Copy-43" fill-opacity="0.1" fill="#FFFFFF" cx="8.5" cy="8.5" r="8.5"></circle>
+                <circle id="Oval-1-Copy-42" fill="#612C23" cx="8.5" cy="8.5" r="7.5"></circle>
+                <path d="M6,5.49607027 C6,4.11752872 7.10966206,3 8.5,3 C9.88071187,3 11,4.11527349 11,5.49607027 L11,11.5039297 C11,12.8824713 9.89033794,14 8.5,14 C7.11928813,14 6,12.8847265 6,11.5039297 L6,5.49607027 Z M7,5.49843484 C7,4.67087213 7.66579723,4 8.5,4 C9.32842712,4 10,4.6639905 10,5.49843484 L10,8.5 L7,8.5 L7,5.49843484 Z" id="Combined-Shape" fill-opacity="0.7" fill="#FFFFFF" transform="translate(8.500000, 8.500000) rotate(45.000000) translate(-8.500000, -8.500000) "></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/place-of-worship-l.svg b/data/styles/clear/style-night/symbols/place-of-worship-l.svg
index 9cd71afcf4..940022b7d6 100644
--- a/data/styles/clear/style-night/symbols/place-of-worship-l.svg
+++ b/data/styles/clear/style-night/symbols/place-of-worship-l.svg
@@ -1,14 +1,16 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <svg width="27px" height="27px" viewBox="0 0 27 27" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
     <title>place-of-worship-l</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
-    <g id="POI-NIght" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="place-of-worship-l">
-            <circle id="Oval-1-Copy-39" fill-opacity="0.1" fill="#FFFFFF" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#26160D" cx="13.5" cy="13.5" r="12.5"></circle>
-            <path d="M13.5,5 C13.5,5 11,6 11,7 L11,9 C11,10 9,10 9,11 L9,20 L18,20 L18,11 C18,10 16,10 16,8.8125 L16,7 C16,6 13.5,5 13.5,5 L13.5,5 Z M5,13 L5,20 L7,20 L7,13 C7,12 6,12 6,12 C6,12 5,12 5,13 L5,13 Z M20,13 L20,20 L22,20 L22,13 C22,12 21,12 21,12 C21,12 20,12 20,13 L20,13 Z" id="path8846-copy" fill-opacity="0.7" fill="#FFFFFF"></path>
+    <g id="POI-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Artboard-1" transform="translate(-317.000000, -915.000000)">
+            <g id="place-of-worship-l" transform="translate(317.000000, 915.000000)">
+                <circle id="Oval-1-Copy-39" fill-opacity="0.1" fill="#FFFFFF" cx="13.5" cy="13.5" r="13.5"></circle>
+                <circle id="Oval-1-Copy-38" fill="#26160D" cx="13.5" cy="13.5" r="12.5"></circle>
+                <path d="M13.5,5 C13.5,5 11,6 11,7 L11,9 C11,10 9,10 9,11 L9,20 L18,20 L18,11 C18,10 16,10 16,8.8125 L16,7 C16,6 13.5,5 13.5,5 L13.5,5 Z M5,13 L5,20 L7,20 L7,13 C7,12 6,12 6,12 C6,12 5,12 5,13 L5,13 Z M20,13 L20,20 L22,20 L22,13 C22,12 21,12 21,12 C21,12 20,12 20,13 L20,13 Z" id="path8846-copy" fill-opacity="0.7" fill="#FFFFFF"></path>
+            </g>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/place-of-worship-m.svg b/data/styles/clear/style-night/symbols/place-of-worship-m.svg
index a6990ceed9..5fbd0f92ca 100644
--- a/data/styles/clear/style-night/symbols/place-of-worship-m.svg
+++ b/data/styles/clear/style-night/symbols/place-of-worship-m.svg
@@ -1,14 +1,16 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <svg width="23px" height="23px" viewBox="0 0 23 23" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
     <title>place-of-worship-m</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
-    <g id="POI-NIght" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="place-of-worship-m">
-            <ellipse id="Oval-1-Copy-41" fill-opacity="0.1" fill="#FFFFFF" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
-            <ellipse id="Oval-1-Copy-40" fill="#26160D" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
-            <path d="M11.5,5 L10,6.5 L10,8 L8,10 L8,16.5 L15,16.5 L15,10 L13,8 L13,6.5 L11.5,5 Z M5,11 L5,16.5 L6.5,16.5 L6.5,11 L5,11 Z M16.5,11 L16.5,16.5 L18,16.5 L18,11 L16.5,11 Z" id="path9064-copy" fill-opacity="0.7" fill="#FFFFFF"></path>
+    <g id="POI-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Artboard-1" transform="translate(-354.000000, -917.000000)">
+            <g id="place-of-worship-m" transform="translate(354.000000, 917.000000)">
+                <ellipse id="Oval-1-Copy-41" fill-opacity="0.1" fill="#FFFFFF" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
+                <ellipse id="Oval-1-Copy-40" fill="#26160D" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+                <path d="M11.5,5 L10,6.5 L10,8 L8,10 L8,16.5 L15,16.5 L15,10 L13,8 L13,6.5 L11.5,5 Z M5,11 L5,16.5 L6.5,16.5 L6.5,11 L5,11 Z M16.5,11 L16.5,16.5 L18,16.5 L18,11 L16.5,11 Z" id="path9064-copy" fill-opacity="0.7" fill="#FFFFFF"></path>
+            </g>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/place-of-worship-s.svg b/data/styles/clear/style-night/symbols/place-of-worship-s.svg
index eabe20a4c9..e9c5d56a9c 100644
--- a/data/styles/clear/style-night/symbols/place-of-worship-s.svg
+++ b/data/styles/clear/style-night/symbols/place-of-worship-s.svg
@@ -1,14 +1,16 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <svg width="17px" height="17px" viewBox="0 0 17 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
     <title>place-of-worship-s</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
-    <g id="POI-NIght" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="place-of-worship-s">
-            <circle id="Oval-1-Copy-43" fill-opacity="0.1" fill="#FFFFFF" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-42" fill="#26160D" cx="8.5" cy="8.5" r="7.5"></circle>
-            <path d="M8.5,4 L7,4.9411 L7,6 L6,7 L6,12 L11,12 L11,7 L10,6 L10,5.0404 L8.5,4 Z M4,8 L4,12 L5,12 L5,8 L4,8 Z M12,8 L12,12 L13,12 L13,8 L12,8 Z" id="path8846-6-copy" fill-opacity="0.7" fill="#FFFFFF"></path>
+    <g id="POI-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Artboard-1" transform="translate(-387.000000, -920.000000)">
+            <g id="place-of-worship-s" transform="translate(387.000000, 920.000000)">
+                <circle id="Oval-1-Copy-43" fill-opacity="0.1" fill="#FFFFFF" cx="8.5" cy="8.5" r="8.5"></circle>
+                <circle id="Oval-1-Copy-42" fill="#26160D" cx="8.5" cy="8.5" r="7.5"></circle>
+                <path d="M8.5,4 L7,4.9411 L7,6 L6,7 L6,12 L11,12 L11,7 L10,6 L10,5.0404 L8.5,4 Z M4,8 L4,12 L5,12 L5,8 L4,8 Z M12,8 L12,12 L13,12 L13,8 L12,8 Z" id="path8846-6-copy" fill-opacity="0.7" fill="#FFFFFF"></path>
+            </g>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/restaurant-l.svg b/data/styles/clear/style-night/symbols/restaurant-l.svg
index 6ecb3a5dad..a8a7a769a1 100644
--- a/data/styles/clear/style-night/symbols/restaurant-l.svg
+++ b/data/styles/clear/style-night/symbols/restaurant-l.svg
@@ -1,14 +1,16 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <svg width="27px" height="27px" viewBox="0 0 27 27" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
     <title>restaurant-l</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
-    <g id="POI-NIght" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="restaurant-l">
-            <ellipse id="Oval-1-Copy-39" fill-opacity="0.1" fill="#FFFFFF" cx="13.5" cy="13.5" rx="13.5" ry="13.5"></ellipse>
-            <ellipse id="Oval-1-Copy-38" fill="#332714" cx="13.5" cy="13.5" rx="12.5" ry="12.5"></ellipse>
-            <path d="M8.5,4 C8,4 8,4.5 8,4.5 L8,10.5 C8,11 8.5,11.5 9,12 C9.5,12.5 9.5,13 9.5,13.5 L9.5,15 C9.5,15.5 9,21.5 9,21.5 C8.9617,21.9985 9.5,23 10.5,23 C11.5,23 12.03846,22 12,21.5 C12,21.5 11.5,15.5 11.5,15 L11.5,13.5 C11.5,13 11.5,12.5 12,12 C12.46054,11.539461 13,11 13,10.5 L13,4.5 C13,4.5 13,4 12.5,4 C12,4 12,4.5 12,4.5 L12,9 C12,9 12,9.5 11.5,9.5 C11,9.5 11,9 11,9 L11,4.5 C11,4.5 11,4 10.5,4 C10,4 10,4.5 10,4.5 L10,9 C10,9 10,9.5 9.5,9.5 C9,9.5 9,9 9,9 L9,4.5 C9,4.5 9,4 8.5,4 L8.5,4 Z M19,4 C18,4 16.13246,4.2351 15.5,5.5 C15,6.5 15,9 15,10 L15,15 C15,15.5 15.5,16 16,16 L17,16 L17,22 C17,22.5 17.5,23 18,23 C18.5,23 19,22.5 19,22 L19,4 Z" id="path5304" fill-opacity="0.7" fill="#FFFFFF"></path>
+    <g id="POI-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Artboard-1" transform="translate(-137.000000, -396.000000)">
+            <g id="restaurant-l" transform="translate(137.000000, 396.000000)">
+                <ellipse id="Oval-1-Copy-39" fill-opacity="0.1" fill="#FFFFFF" cx="13.5" cy="13.5" rx="13.5" ry="13.5"></ellipse>
+                <ellipse id="Oval-1-Copy-38" fill="#332714" cx="13.5" cy="13.5" rx="12.5" ry="12.5"></ellipse>
+                <path d="M11.5,11 L11.5,6.75939238 C11.5,6.33999155 11.1671014,6 10.75,6 L10.75,6 C10.3357864,6 10,6.32806396 10,6.75939238 L10,11 L8.5,11 L8.5,6.75939238 C8.5,6.33999155 8.16710138,6 7.75,6 L7.75,6 C7.33578644,6 7,6.32806396 7,6.75939238 L7,11 C7,12.84 8.5,14 10,14 L9.7858189,19.9970707 C9.76603667,20.5509732 10.1938648,21 10.75,21 L10.75,21 C11.3022847,21 11.7343614,20.5621186 11.7141811,19.9970707 L11.5,14 C13,14 14.5,12.84 14.5,11 L14.5,6.75939238 C14.5,6.33999155 14.1671014,6 13.75,6 L13.75,6 C13.3357864,6 13,6.32806396 13,6.75939238 L13,11 L11.5,11 Z M16,15 L18,15 L18,20.009222 C18,20.5564136 18.4438648,21 19,21 L19,21 C19.5522847,21 20,20.5510798 20,19.992516 L20,6 C17.68,6 16,7.68 16,9 L16,15 Z" id="Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+            </g>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/restaurant-m.svg b/data/styles/clear/style-night/symbols/restaurant-m.svg
index 3937749496..58f560ce42 100644
--- a/data/styles/clear/style-night/symbols/restaurant-m.svg
+++ b/data/styles/clear/style-night/symbols/restaurant-m.svg
@@ -1,14 +1,16 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <svg width="23px" height="23px" viewBox="0 0 23 23" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
     <title>restaurant-m</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
-    <g id="POI-NIght" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="restaurant-m">
-            <ellipse id="Oval-1-Copy-41" fill-opacity="0.1" fill="#FFFFFF" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
-            <ellipse id="Oval-1-Copy-40" fill="#332714" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
-            <path d="M8,5 L7,5 L7,9.5 C7,10.2777 8,10.2222 8,11 L8,18 C8,18.3889 8.5,19 9,19 C9.5,19 10,18.5 10,18 L10,11 C10,10.2222 11,10.2777 11,9.5 L11,5 L10,5 L10,8 L9.5,8 L9.5,5 L8.5,5 L8.5,8 L8,8 L8,5 Z M16,5 C15.22222,5 13.99192,5.5162 13.5,6.5 C13.11111,7.2777 13,9 13,10 L13,13 C13,13.5 13.61111,14 14,14 L14,18 C14,18.5 14.5,19 15,19 C15.5,19 16,18.5 16,18 L16,5 Z" id="rect6396-83" fill-opacity="0.7" fill="#FFFFFF"></path>
+    <g id="POI-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Artboard-1" transform="translate(-174.000000, -398.000000)">
+            <g id="restaurant-m" transform="translate(174.000000, 398.000000)">
+                <ellipse id="Oval-1-Copy-41" fill-opacity="0.1" fill="#FFFFFF" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
+                <ellipse id="Oval-1-Copy-40" fill="#332714" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+                <path d="M9.75,9.55 L9.75,5.59483304 C9.75,5.26631582 9.48490715,5 9.15428734,5 L9.09571266,5 C8.76670964,5 8.5,5.27099719 8.5,5.59483304 L8.5,9.55 L7.25,9.55 L7.25,5.59483304 C7.25,5.26631582 6.98490715,5 6.65428734,5 L6.59571266,5 C6.26670964,5 6,5.27099719 6,5.59483304 L6,9.55 C6,10.928 7.25,12 8.4375,12 L8.27528708,17.1908133 C8.26132141,17.6377148 8.60413861,18 9.04307556,18 L9.20692444,18 C9.64492798,18 9.98511004,17.6426411 9.96628389,17.1908133 L9.75,12 C11,12 12.5,10.928 12.25,9.55 L12.25,5.59483304 C12.25,5.26631582 11.9849072,5 11.6542873,5 L11.5957127,5 C11.2667096,5 11,5.27099719 11,5.59483304 L11,9.55 L9.75,9.55 Z M13.5,12.8 L15.5,12.8 L15.5,17.2549668 C15.5,17.6664373 15.8328986,18 16.25,18 L16.25,18 C16.6642136,18 17,17.665586 17,17.2448743 L17,5 C14.906,5 13.45,6.456 13.5,7.6 L13.5,12.8 Z" id="Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+            </g>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/restaurant-s.svg b/data/styles/clear/style-night/symbols/restaurant-s.svg
index cd31bfa9cf..6623a2b2b9 100644
--- a/data/styles/clear/style-night/symbols/restaurant-s.svg
+++ b/data/styles/clear/style-night/symbols/restaurant-s.svg
@@ -1,14 +1,16 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <svg width="17px" height="17px" viewBox="0 0 17 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
     <title>restaurant-s</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
-    <g id="POI-NIght" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="restaurant-s">
-            <circle id="Oval-1-Copy-43" fill-opacity="0.1" fill="#FFFFFF" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-42" fill="#332714" cx="8.5" cy="8.5" r="7.5"></circle>
-            <path d="M5.5,4 L5,4 L5,7 C5,7.5 6,7.5 6,8 L6,14 L7,14 L7,8 C7,7.5 8,7.5 8,7 L8,4 L7.5,4 L7.5,6 L6.75,6 L6.75,4 L6.25,4 L6.25,6 L5.5,6 L5.5,4 Z M12,4 C11.5,4 10.56623,4.1176 10.25,4.75 C10,5.25 10,6 10,7 L10,9.5 L11,9.5 L11,14 L12,14 L12,4 Z" id="rect6396-8-copy" fill-opacity="0.7" fill="#FFFFFF"></path>
+    <g id="POI-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Artboard-1" transform="translate(-207.000000, -401.000000)">
+            <g id="restaurant-s" transform="translate(207.000000, 401.000000)">
+                <circle id="Oval-1-Copy-43" fill-opacity="0.1" fill="#FFFFFF" cx="8.5" cy="8.5" r="8.5"></circle>
+                <circle id="Oval-1-Copy-42" fill="#332714" cx="8.5" cy="8.5" r="7.5"></circle>
+                <path d="M7,7 L7,4.49538898 C7,4.2217932 6.76806641,4 6.5,4 L6.5,4 C6.22385763,4 6,4.2157526 6,4.49538898 L6,7 L5,7 L5,4.49538898 C5,4.2217932 4.76806641,4 4.5,4 L4.5,4 C4.22385763,4 4,4.2157526 4,4.49538898 L4,7 C4,7.9954834 5,9 6,9 L5.79702309,12.2476306 C5.77105295,12.6631527 6.08289862,13 6.5,13 L6.5,13 C6.91421356,13 7.22868514,12.6589622 7.20297691,12.2476306 L7,9 C8,9 9,8.00115967 9,7 L9,4.49538898 C9,4.2217932 8.76806641,4 8.5,4 L8.5,4 C8.22385763,4 8,4.2157526 8,4.49538898 L8,7 L7,7 Z M10.5,9.5 L12,9.5 L12,12.4985353 C12,12.7754866 12.2319336,13 12.5,13 L12.5,13 C12.7761424,13 13,12.7775269 13,12.4903342 L13,4 C11.858,4 10.5,4 10.5,5.98388672 L10.5,9.5 Z" id="Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+            </g>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/shinto-l.svg b/data/styles/clear/style-night/symbols/shinto-l.svg
index 4cc6a1cd5a..c313124abd 100644
--- a/data/styles/clear/style-night/symbols/shinto-l.svg
+++ b/data/styles/clear/style-night/symbols/shinto-l.svg
@@ -1,14 +1,16 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <svg width="27px" height="27px" viewBox="0 0 27 27" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
     <title>shinto-l</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
-    <g id="POI-NIght" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="shinto-l">
-            <circle id="Oval-1-Copy-39" fill-opacity="0.1" fill="#FFFFFF" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#26160D" cx="13.5" cy="13.5" r="12.5"></circle>
-            <path d="M10.9615385,10 L10.8846154,12 L16.1153846,12 L16.0384615,10 L10.9615385,10 Z M8.96153846,10 L8.88461538,12 L7,12 L7,13 L8.84615385,13 L8.76923077,15 L8,15 L8,16 L8.73076923,16 L8.5,22 L10.5,22 L10.8461538,13 L16.1538462,13 L16.5,22 L18.5,22 L18.2692308,16 L19,16 L19,15 L18.2307692,15 L18.1538462,13 L20,13 L20,12 L18.1153846,12 L18.0384615,10 L20,10 L20,9.1697067 C21.3949807,8.62008234 22,8 22,8 L22,7 C22,7 17.0047201,8 15.0070801,8 L12.0219727,8 C10.0146484,8 5,7 5,7 L5,8 C5,8 5.61071427,8.60935676 7,9.15536869 L7,10 L8.96153846,10 Z M13,10 L14,10 L14,12 L13,12 L13,10 Z" id="Combined-Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+    <g id="POI-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Artboard-1" transform="translate(-317.000000, -1100.000000)">
+            <g id="shinto-l" transform="translate(317.000000, 1100.000000)">
+                <circle id="Oval-1-Copy-39" fill-opacity="0.1" fill="#FFFFFF" cx="13.5" cy="13.5" r="13.5"></circle>
+                <circle id="Oval-1-Copy-38" fill="#26160D" cx="13.5" cy="13.5" r="12.5"></circle>
+                <path d="M10.9615385,10 L10.8846154,12 L16.1153846,12 L16.0384615,10 L10.9615385,10 Z M8.96153846,10 L8.88461538,12 L7,12 L7,13 L8.84615385,13 L8.76923077,15 L8,15 L8,16 L8.73076923,16 L8.5,22 L10.5,22 L10.8461538,13 L16.1538462,13 L16.5,22 L18.5,22 L18.2692308,16 L19,16 L19,15 L18.2307692,15 L18.1538462,13 L20,13 L20,12 L18.1153846,12 L18.0384615,10 L20,10 L20,9.1697067 C21.3949807,8.62008234 22,8 22,8 L22,7 C22,7 17.0047201,8 15.0070801,8 L12.0219727,8 C10.0146484,8 5,7 5,7 L5,8 C5,8 5.61071427,8.60935676 7,9.15536869 L7,10 L8.96153846,10 Z M13,10 L14,10 L14,12 L13,12 L13,10 Z" id="Combined-Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+            </g>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/shinto-m.svg b/data/styles/clear/style-night/symbols/shinto-m.svg
index 194e79feaf..edf404baf4 100644
--- a/data/styles/clear/style-night/symbols/shinto-m.svg
+++ b/data/styles/clear/style-night/symbols/shinto-m.svg
@@ -1,14 +1,16 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <svg width="23px" height="23px" viewBox="0 0 23 23" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
     <title>shinto-m</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
-    <g id="POI-NIght" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="shinto-m">
-            <ellipse id="Oval-1-Copy-41" fill-opacity="0.1" fill="#FFFFFF" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
-            <ellipse id="Oval-1-Copy-40" fill="#26160D" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
-            <path d="M6.23279572,6.5 L6,6.5 L6,7.5 L7.97727273,7.5 L7.90909091,9 L5,9 L5,10 L7.86363636,10 L7.5,18 L9,18 L9,10 L14,10 L14,18 L15.5,18 L15.1363636,10 L18,10 L18,9 L15.0909091,9 L15.0227273,7.5 L17,7.5 L17,6.5 L16.803093,6.5 C17.7407379,6.25 18,6 18,6 L18,5 C18,5 16.0443115,5.5 11.5283813,5.5 C7.01245117,5.5 5,5 5,5 L5,6 C5,6 5.27720642,6.25 6.23279572,6.5 Z M14,7.5 L14,9 L9,9 L9,7.5 L11,7.5 L11,9 L12,9 L12,7.5 L14,7.5 Z" id="Combined-Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+    <g id="POI-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Artboard-1" transform="translate(-354.000000, -1102.000000)">
+            <g id="shinto-m" transform="translate(354.000000, 1102.000000)">
+                <ellipse id="Oval-1-Copy-41" fill-opacity="0.1" fill="#FFFFFF" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
+                <ellipse id="Oval-1-Copy-40" fill="#26160D" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+                <path d="M6.23279572,6.5 L6,6.5 L6,7.5 L7.97727273,7.5 L7.90909091,9 L5,9 L5,10 L7.86363636,10 L7.5,18 L9,18 L9,10 L14,10 L14,18 L15.5,18 L15.1363636,10 L18,10 L18,9 L15.0909091,9 L15.0227273,7.5 L17,7.5 L17,6.5 L16.803093,6.5 C17.7407379,6.25 18,6 18,6 L18,5 C18,5 16.0443115,5.5 11.5283813,5.5 C7.01245117,5.5 5,5 5,5 L5,6 C5,6 5.27720642,6.25 6.23279572,6.5 Z M14,7.5 L14,9 L9,9 L9,7.5 L11,7.5 L11,9 L12,9 L12,7.5 L14,7.5 Z" id="Combined-Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+            </g>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/shinto-s.svg b/data/styles/clear/style-night/symbols/shinto-s.svg
index 5789b49037..2388c28b3b 100644
--- a/data/styles/clear/style-night/symbols/shinto-s.svg
+++ b/data/styles/clear/style-night/symbols/shinto-s.svg
@@ -1,14 +1,16 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <svg width="17px" height="17px" viewBox="0 0 17 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
     <title>shinto-s</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
-    <g id="POI-NIght" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="shinto-s">
-            <circle id="Oval-1-Copy-43" fill-opacity="0.1" fill="#FFFFFF" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-42" fill="#26160D" cx="8.5" cy="8.5" r="7.5"></circle>
-            <path d="M8,5.5 L7,5.5 L7,7 L10,7 L10,5.5 L9,5.5 L9,7 L8,7 L8,5.5 Z M7,8 L7,13 L6,13 L6,8 L5,8 L5,7 L6,7 L6,5.5 L5,5.5 L5,5 L12,5 L12,5.5 L11,5.5 L11,7 L12,7 L12,8 L11,8 L11,13 L10,13 L10,8 L7,8 Z M4,4 C4,4 6.97680664,4.5 8.49023438,4.5 C10.0036621,4.5 13,4 13,4 L13,5 L4,5 L4,4 Z" id="Combined-Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+    <g id="POI-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Artboard-1" transform="translate(-387.000000, -1105.000000)">
+            <g id="shinto-s" transform="translate(387.000000, 1105.000000)">
+                <circle id="Oval-1-Copy-43" fill-opacity="0.1" fill="#FFFFFF" cx="8.5" cy="8.5" r="8.5"></circle>
+                <circle id="Oval-1-Copy-42" fill="#26160D" cx="8.5" cy="8.5" r="7.5"></circle>
+                <path d="M8,5.5 L7,5.5 L7,7 L10,7 L10,5.5 L9,5.5 L9,7 L8,7 L8,5.5 Z M7,8 L7,13 L6,13 L6,8 L5,8 L5,7 L6,7 L6,5.5 L5,5.5 L5,5 L12,5 L12,5.5 L11,5.5 L11,7 L12,7 L12,8 L11,8 L11,13 L10,13 L10,8 L7,8 Z M4,4 C4,4 6.97680664,4.5 8.49023438,4.5 C10.0036621,4.5 13,4 13,4 L13,5 L4,5 L4,4 Z" id="Combined-Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+            </g>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/stadium-l.svg b/data/styles/clear/style-night/symbols/stadium-l.svg
new file mode 100644
index 0000000000..773b719ede
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/stadium-l.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="27px" height="27px" viewBox="0 0 27 27" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
+    <title>stadium-l</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="POI-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Artboard-1" transform="translate(-317.000000, -1285.000000)">
+            <g id="wayside_shrine-l" transform="translate(317.000000, 1285.000000)">
+                <path d="M13.5,27 C6.057,27 0,20.943 0,13.5 C0,6.057 6.057,0 13.5,0 C20.943,0 27,6.057 27,13.5 C27,20.943 20.943,27 13.5,27 L13.5,27 Z" id="Shape" fill-opacity="0.1" fill="#FFFFFF"></path>
+                <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#26160D"></path>
+                <path d="M15,7.84622133 L15,9.03956761 C18.4233605,9.22283939 21,10.0210716 21,10.978022 C21,10.9853574 20.9998486,10.9926835 20.9995466,11 L21,16 C20.9609227,16.970208 18.3974334,19.272165 15,19.8318236 L15,17.495389 C15,17.2157526 14.7782068,17 14.504611,17 L12.495389,17 C12.2157526,17 12,17.2217932 12,17.495389 L12,19.8318236 C8.60256661,19.272165 6.03907733,16.970208 6.00044263,16 L6,11 C6.0001514,10.9926835 6,10.9853574 6,10.978022 C6,10.0210716 8.57663952,9.22283939 12,9.03956761 L12,7.84791523 C11.4120293,7.91799245 11,8 11,8 L11,6 C11,6 12.25,5.75 13.5,5.75 C14.75,5.75 16,6 16,6 L16,8 C16,8 15.5890263,7.91666374 15,7.84622133 Z M14,7.76169435 L14,9.00432588 C13.8347382,9.00145706 13.6680143,9 13.5,9 C13.3319857,9 13.1652618,9.00145706 13,9.00432588 L13,7.76273242 C13.1684039,7.7546696 13.3400054,7.75 13.5115967,7.75 C13.6756852,7.75 13.8393868,7.75427017 14,7.76169435 Z M13.5,13.5 C17.0898509,13.5 20,12.7164983 20,11.75 C20,10.7835017 17.0898509,10 13.5,10 C9.91014913,10 7,10.7835017 7,11.75 C7,12.7164983 9.91014913,13.5 13.5,13.5 Z M11,11.5 L16,11.5 L17.2902222,12.6821289 C17.2902222,12.6821289 15.3543437,12.9495239 13.5,12.9495239 C11.6456563,12.9495239 9.79650879,12.6821289 9.79650879,12.6821289 L11,11.5 Z" id="Combined-Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/stadium-m.svg b/data/styles/clear/style-night/symbols/stadium-m.svg
new file mode 100644
index 0000000000..4582768f29
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/stadium-m.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="23px" height="23px" viewBox="0 0 23 23" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
+    <title>stadium-m</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="POI-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Artboard-1" transform="translate(-354.000000, -1287.000000)">
+            <g id="wayside_shrine-m" transform="translate(354.000000, 1287.000000)">
+                <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" fill-opacity="0.1" fill="#FFFFFF"></path>
+                <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#26160D"></path>
+                <path d="M13,6.86330785 L13,7.84518416 C15.592628,8.03362209 17.5853865,8.69977093 17.9427258,9.525 L18,9.525 L18,13.8583333 L17.9397179,13.8583333 C17.5649725,14.9058448 15.4824032,16.8070267 12.8,17.3026305 L12.8,15.2266817 C12.8,14.9480835 12.5755576,14.725 12.2986938,14.725 L10.7013062,14.725 C10.4216745,14.725 10.2,14.9496106 10.2,15.2266817 L10.2,17.3026305 C7.51759676,16.8070267 5.43502752,14.9058448 5.06028211,13.8583333 L5,13.8583333 L5,9.525 L5.05727424,9.525 C5.41461348,8.69977093 7.40737195,8.03362209 10,7.84518416 L10,6.86481354 C9.41202929,6.9271044 9,7 9,7 L9,5.22222222 C9,5.22222222 10.25,5 11.5,5 C12.75,5 14,5.22222222 14,5.22222222 L14,7 C14,7 13.5890263,6.92592332 13,6.86330785 Z M12.25,6.80073998 L12.25,7.80483645 C12.0039181,7.7961373 11.7536558,7.79166667 11.5,7.79166667 C11.2463442,7.79166667 10.9960819,7.7961373 10.75,7.80483645 L10.75,6.80197788 C10.9966652,6.78712186 11.2541424,6.77777778 11.5115967,6.77777778 C11.7618243,6.77777778 12.0111523,6.78660465 12.25,6.80073998 Z M11.5,11.6916667 C14.6112041,11.6916667 17.1333333,11.0126319 17.1333333,10.175 C17.1333333,9.33736813 14.6112041,8.65833333 11.5,8.65833333 C8.38879591,8.65833333 5.86666667,9.33736813 5.86666667,10.175 C5.86666667,11.0126319 8.38879591,11.6916667 11.5,11.6916667 Z M9.33333333,9.95833333 L13.6666667,9.95833333 L14.7848592,10.9828451 C14.7848592,10.9828451 13.1070979,11.2145874 11.5,11.2145874 C9.89290214,11.2145874 8.29030762,10.9828451 8.29030762,10.9828451 L9.33333333,9.95833333 Z" id="Combined-Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/stadium-s.svg b/data/styles/clear/style-night/symbols/stadium-s.svg
new file mode 100644
index 0000000000..68896b9fad
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/stadium-s.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="17px" height="17px" viewBox="0 0 17 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
+    <title>stadium-s</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="POI-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Artboard-1" transform="translate(-387.000000, -1290.000000)">
+            <g id="wayside_shrine-s" transform="translate(387.000000, 1290.000000)">
+                <path d="M8.5,17 C3.812,17 0,13.188 0,8.5 C0,3.812 3.812,0 8.5,0 C13.188,0 17,3.812 17,8.5 C17,13.188 13.188,17 8.5,17 L8.5,17 Z" id="Shape" fill-opacity="0.1" fill="#FFFFFF"></path>
+                <path d="M8.5,16 C12.6421356,16 16,12.6421356 16,8.5 C16,4.35786438 12.6421356,1 8.5,1 C4.35786438,1 1,4.35786438 1,8.5 C1,12.6421356 4.35786438,16 8.5,16 Z" id="Oval" fill="#26160D"></path>
+                <path d="M7.5,12.1227384 C5.73937855,11.7872564 4.37084716,10.649449 4.06442003,9.97884615 L4,9.97884615 L4,6.97884615 C4.03205888,6.21632108 5.77060664,5.59130377 8,5.5091548 L8,5 L9,5 L9,5.5091548 C11.2293934,5.59130377 12.9679411,6.21632108 12.9995616,6.97884615 L13,9.97884615 L12.93558,9.97884615 C12.6291528,10.649449 11.2606214,11.7872564 9.5,12.1227384 L9.5,10.4923639 C9.5,10.220832 9.27404508,10 8.99531555,10 L8.00468445,10 C7.71403503,10 7.5,10.2204388 7.5,10.4923639 L7.5,12.1227384 Z M8.5,8.5 C10.709139,8.5 12.5,7.94035594 12.5,7.25 C12.5,6.55964406 10.709139,6 8.5,6 C6.290861,6 4.5,6.55964406 4.5,7.25 C4.5,7.94035594 6.290861,8.5 8.5,8.5 Z M7,4 L10,4 L10,5 L7,5 L7,4 Z M7,7 L10,7 L10.7741333,7.81552907 C10.7741333,7.81552907 9.61260621,8 8.5,8 C7.38739379,8 6.27790527,7.81552907 6.27790527,7.81552907 L7,7 Z" id="Combined-Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/taoist-l.svg b/data/styles/clear/style-night/symbols/taoist-l.svg
index 3e21c14862..9fd8e5d27c 100644
--- a/data/styles/clear/style-night/symbols/taoist-l.svg
+++ b/data/styles/clear/style-night/symbols/taoist-l.svg
@@ -1,17 +1,19 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <svg width="27px" height="27px" viewBox="0 0 27 27" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
     <title>taoist-l</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
-    <g id="POI-NIght" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="taoist-l">
-            <circle id="Oval-1-Copy-39" fill-opacity="0.1" fill="#FFFFFF" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="taoist" fill="#26160D" cx="13.5" cy="13.5" r="12.5"></circle>
-            <g id="noun_65883_cc" transform="translate(13.500000, 13.500000) rotate(-90.000000) translate(-13.500000, -13.500000) translate(5.000000, 5.000000)" fill="#FFFFFF" fill-opacity="0.7">
-                <g id="Group">
-                    <g id="Combined-Shape">
-                        <path d="M14.51324,2.48676 C12.85523,0.82892 10.85093,0 8.5,0 C6.14907,0 4.14477,0.82892 2.48676,2.48676 C0.82875,4.1446 0,6.14907 0,8.5 C0,10.85093 0.82892,12.85523 2.48676,14.51324 C4.14477,16.17108 6.14907,17 8.5,17 C10.85093,17 12.85523,16.17108 14.51324,14.51324 C16.17108,12.85523 17,10.85093 17,8.5 C17,6.14907 16.17108,4.14477 14.51324,2.48676 Z M5.32984,9.29815 C5.10765,9.52425 4.84364,9.63713 4.5373,9.63713 C4.22331,9.63713 3.95522,9.52612 3.7332,9.30393 C3.51101,9.08208 3.4,8.81399 3.4,8.5 C3.4,8.18601 3.51101,7.91809 3.73303,7.69607 C3.95505,7.47388 4.22314,7.36287 4.53713,7.36287 C4.85112,7.36287 5.11717,7.47388 5.33545,7.69607 C5.55373,7.91809 5.66287,8.18618 5.66287,8.5 C5.66287,8.80634 5.55186,9.07239 5.32984,9.29815 Z M12.47443,12.46287 C11.39459,12.46287 10.47761,12.09907 9.72332,11.37164 C8.96886,10.64421 8.56511,9.73284 8.51139,8.63787 L8.5,8.36213 C8.4388,7.26716 8.03284,6.35392 7.28246,5.62258 C6.53208,4.89124 5.61697,4.52557 4.5373,4.52557 C3.40391,4.52557 2.50036,4.86251 1.82648,5.53639 C1.15243,6.21044 0.73134,7.19814 0.56287,8.5 C0.69309,6.15672 1.49515,4.24813 2.96922,2.77389 C4.44329,1.29982 6.28694,0.56287 8.5,0.56287 C10.65951,0.56287 12.5222,1.33246 14.08824,2.87181 C15.65411,4.41099 16.43713,6.24495 16.43713,8.37386 C16.43713,9.5302 16.05616,10.50073 15.29405,11.28562 C14.53228,12.07034 13.59235,12.46287 12.47443,12.46287 Z M12.47443,7.36287 C12.16027,7.36287 11.89235,7.47388 11.67033,7.69607 C11.44831,7.91809 11.3373,8.18618 11.3373,8.5 C11.3373,8.81382 11.44831,9.08208 11.67033,9.30393 C11.89252,9.52612 12.16044,9.63713 12.47443,9.63713 C12.78077,9.63713 13.04478,9.52612 13.26697,9.30393 C13.48899,9.08208 13.6,8.81399 13.6,8.5 C13.6,8.18601 13.49086,7.91809 13.27258,7.69607 C13.05447,7.47388 12.78842,7.36287 12.47443,7.36287 Z"></path>
+    <g id="POI-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Artboard-1" transform="translate(-317.000000, -1174.000000)">
+            <g id="taoist-l" transform="translate(317.000000, 1174.000000)">
+                <circle id="Oval-1-Copy-39" fill-opacity="0.1" fill="#FFFFFF" cx="13.5" cy="13.5" r="13.5"></circle>
+                <circle id="taoist" fill="#26160D" cx="13.5" cy="13.5" r="12.5"></circle>
+                <g id="noun_65883_cc" transform="translate(13.500000, 13.500000) rotate(-90.000000) translate(-13.500000, -13.500000) translate(5.000000, 5.000000)" fill="#FFFFFF" fill-opacity="0.7">
+                    <g id="Group">
+                        <g id="Combined-Shape">
+                            <path d="M14.51324,2.48676 C12.85523,0.82892 10.85093,0 8.5,0 C6.14907,0 4.14477,0.82892 2.48676,2.48676 C0.82875,4.1446 0,6.14907 0,8.5 C0,10.85093 0.82892,12.85523 2.48676,14.51324 C4.14477,16.17108 6.14907,17 8.5,17 C10.85093,17 12.85523,16.17108 14.51324,14.51324 C16.17108,12.85523 17,10.85093 17,8.5 C17,6.14907 16.17108,4.14477 14.51324,2.48676 Z M5.32984,9.29815 C5.10765,9.52425 4.84364,9.63713 4.5373,9.63713 C4.22331,9.63713 3.95522,9.52612 3.7332,9.30393 C3.51101,9.08208 3.4,8.81399 3.4,8.5 C3.4,8.18601 3.51101,7.91809 3.73303,7.69607 C3.95505,7.47388 4.22314,7.36287 4.53713,7.36287 C4.85112,7.36287 5.11717,7.47388 5.33545,7.69607 C5.55373,7.91809 5.66287,8.18618 5.66287,8.5 C5.66287,8.80634 5.55186,9.07239 5.32984,9.29815 Z M12.47443,7.36287 C12.16027,7.36287 11.89235,7.47388 11.67033,7.69607 C11.44831,7.91809 11.3373,8.18618 11.3373,8.5 C11.3373,8.81382 11.44831,9.08208 11.67033,9.30393 C11.89252,9.52612 12.16044,9.63713 12.47443,9.63713 C12.78077,9.63713 13.04478,9.52612 13.26697,9.30393 C13.48899,9.08208 13.6,8.81399 13.6,8.5 C13.6,8.18601 13.49086,7.91809 13.27258,7.69607 C13.05447,7.47388 12.78842,7.36287 12.47443,7.36287 Z M12.47443,12.46287 C11.39459,12.46287 10.47761,12.09907 9.72332,11.37164 C8.96886,10.64421 8.56511,9.73284 8.51139,8.63787 L8.5,8.36213 C8.4388,7.26716 8.03284,6.35392 7.28246,5.62258 C6.53208,4.89124 5.61697,4.52557 4.5373,4.52557 C3.40391,4.52557 2.50036,4.86251 1.82648,5.53639 C1.15243,6.21044 0.73134,7.19814 0.56287,8.5 C0.69309,6.15672 1.49515,4.24813 2.96922,2.77389 C4.44329,1.29982 6.28694,0.56287 8.5,0.56287 C10.65951,0.56287 12.5222,1.33246 14.08824,2.87181 C15.65411,4.41099 16.43713,6.24495 16.43713,8.37386 C16.43713,9.5302 16.05616,10.50073 15.29405,11.28562 C14.53228,12.07034 13.59235,12.46287 12.47443,12.46287 L12.47443,12.46287 Z"></path>
+                        </g>
                     </g>
                 </g>
             </g>
diff --git a/data/styles/clear/style-night/symbols/taoist-m.svg b/data/styles/clear/style-night/symbols/taoist-m.svg
index 0ff1a59264..644b9c6f50 100644
--- a/data/styles/clear/style-night/symbols/taoist-m.svg
+++ b/data/styles/clear/style-night/symbols/taoist-m.svg
@@ -1,14 +1,16 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <svg width="23px" height="23px" viewBox="0 0 23 23" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
     <title>taoist-m</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
-    <g id="POI-NIght" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="taoist-m">
-            <ellipse id="Oval-1-Copy-41" fill-opacity="0.1" fill="#FFFFFF" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
-            <ellipse id="Oval-1-Copy-40" fill="#26160D" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
-            <path d="M6.90164,6.90164 C5.63388,8.16953 5,9.70223 5,11.5 C5,13.29777 5.63388,14.83047 6.90164,16.09836 C8.1694,17.36625 9.70223,18 11.5,18 C13.29777,18 14.83047,17.36612 16.09836,16.09836 C17.36612,14.83047 18,13.29777 18,11.5 C18,9.70223 17.36612,8.16953 16.09836,6.90164 C14.83047,5.63388 13.29777,5 11.5,5 C9.70223,5 8.16953,5.63388 6.90164,6.90164 Z M12.11035,13.92424 C12.28325,14.09415 12.36957,14.29604 12.36957,14.5303 C12.36957,14.77041 12.28468,14.97542 12.11477,15.1452 C11.94512,15.31511 11.74011,15.4 11.5,15.4 C11.25989,15.4 11.05501,15.31511 10.88523,15.14533 C10.71532,14.97555 10.63043,14.77054 10.63043,14.53043 C10.63043,14.29032 10.71532,14.08687 10.88523,13.91995 C11.05501,13.75303 11.26002,13.66957 11.5,13.66957 C11.73426,13.66957 11.93771,13.75446 12.11035,13.92424 Z M14.53043,8.46073 C14.53043,9.28649 14.25223,9.98771 13.69596,10.56452 C13.13969,11.14146 12.44276,11.45021 11.60543,11.49129 L11.39457,11.5 C10.55724,11.5468 9.85888,11.85724 9.29962,12.43106 C8.74036,13.00488 8.46073,13.70467 8.46073,14.5303 C8.46073,15.39701 8.71839,16.08796 9.23371,16.60328 C9.74916,17.11873 10.50446,17.44074 11.5,17.56957 C9.70808,17.46999 8.24857,16.85665 7.12121,15.72942 C5.99398,14.60219 5.43043,13.19234 5.43043,11.5 C5.43043,9.84861 6.01894,8.4242 7.19609,7.22664 C8.37311,6.02921 9.77555,5.43043 11.40354,5.43043 C12.2878,5.43043 13.02997,5.72176 13.63018,6.30455 C14.23026,6.88708 14.53043,7.60585 14.53043,8.46073 Z M10.63043,8.46073 C10.63043,8.70097 10.71532,8.90585 10.88523,9.07563 C11.05501,9.24541 11.26002,9.3303 11.5,9.3303 C11.73998,9.3303 11.94512,9.24541 12.11477,9.07563 C12.28468,8.90572 12.36957,8.70084 12.36957,8.46073 C12.36957,8.22647 12.28468,8.02458 12.11477,7.85467 C11.94512,7.68489 11.74011,7.6 11.5,7.6 C11.25989,7.6 11.05501,7.68346 10.88523,7.85038 C10.71532,8.01717 10.63043,8.22062 10.63043,8.46073 Z" id="Combined-Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+    <g id="POI-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Artboard-1" transform="translate(-354.000000, -1176.000000)">
+            <g id="taoist-m" transform="translate(354.000000, 1176.000000)">
+                <ellipse id="Oval-1-Copy-41" fill-opacity="0.1" fill="#FFFFFF" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
+                <ellipse id="Oval-1-Copy-40" fill="#26160D" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+                <path d="M6.90164,6.90164 C5.63388,8.16953 5,9.70223 5,11.5 C5,13.29777 5.63388,14.83047 6.90164,16.09836 C8.1694,17.36625 9.70223,18 11.5,18 C13.29777,18 14.83047,17.36612 16.09836,16.09836 C17.36612,14.83047 18,13.29777 18,11.5 C18,9.70223 17.36612,8.16953 16.09836,6.90164 C14.83047,5.63388 13.29777,5 11.5,5 C9.70223,5 8.16953,5.63388 6.90164,6.90164 Z M12.11035,13.92424 C12.28325,14.09415 12.36957,14.29604 12.36957,14.5303 C12.36957,14.77041 12.28468,14.97542 12.11477,15.1452 C11.94512,15.31511 11.74011,15.4 11.5,15.4 C11.25989,15.4 11.05501,15.31511 10.88523,15.14533 C10.71532,14.97555 10.63043,14.77054 10.63043,14.53043 C10.63043,14.29032 10.71532,14.08687 10.88523,13.91995 C11.05501,13.75303 11.26002,13.66957 11.5,13.66957 C11.73426,13.66957 11.93771,13.75446 12.11035,13.92424 Z M14.53043,8.46073 C14.53043,9.28649 14.25223,9.98771 13.69596,10.56452 C13.13969,11.14146 12.44276,11.45021 11.60543,11.49129 L11.39457,11.5 C10.55724,11.5468 9.85888,11.85724 9.29962,12.43106 C8.74036,13.00488 8.46073,13.70467 8.46073,14.5303 C8.46073,15.39701 8.71839,16.08796 9.23371,16.60328 C9.74916,17.11873 10.50446,17.44074 11.5,17.56957 C9.70808,17.46999 8.24857,16.85665 7.12121,15.72942 C5.99398,14.60219 5.43043,13.19234 5.43043,11.5 C5.43043,9.84861 6.01894,8.4242 7.19609,7.22664 C8.37311,6.02921 9.77555,5.43043 11.40354,5.43043 C12.2878,5.43043 13.02997,5.72176 13.63018,6.30455 C14.23026,6.88708 14.53043,7.60585 14.53043,8.46073 Z M10.63043,8.46073 C10.63043,8.70097 10.71532,8.90585 10.88523,9.07563 C11.05501,9.24541 11.26002,9.3303 11.5,9.3303 C11.73998,9.3303 11.94512,9.24541 12.11477,9.07563 C12.28468,8.90572 12.36957,8.70084 12.36957,8.46073 C12.36957,8.22647 12.28468,8.02458 12.11477,7.85467 C11.94512,7.68489 11.74011,7.6 11.5,7.6 C11.25989,7.6 11.05501,7.68346 10.88523,7.85038 C10.71532,8.01717 10.63043,8.22062 10.63043,8.46073 Z" id="Combined-Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+            </g>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/taoist-s.svg b/data/styles/clear/style-night/symbols/taoist-s.svg
index fc7147ac70..63b4521ae6 100644
--- a/data/styles/clear/style-night/symbols/taoist-s.svg
+++ b/data/styles/clear/style-night/symbols/taoist-s.svg
@@ -1,14 +1,16 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <svg width="17px" height="17px" viewBox="0 0 17 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
     <title>taoist-s</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
-    <g id="POI-NIght" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="taoist-s">
-            <circle id="Oval-1-Copy-43" fill-opacity="0.1" fill="#FFFFFF" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-42" fill="#26160D" cx="8.5" cy="8.5" r="7.5"></circle>
-            <path d="M5.31652,5.31652 C4.43884,6.19429 4,7.25539 4,8.5 C4,9.74461 4.43884,10.80571 5.31652,11.68348 C6.1942,12.56125 7.25539,13 8.5,13 C9.74461,13 10.80571,12.56116 11.68348,11.68348 C12.56116,10.80571 13,9.74461 13,8.5 C13,7.25539 12.56116,6.19429 11.68348,5.31652 C10.80571,4.43884 9.74461,4 8.5,4 C7.25539,4 6.19429,4.43884 5.31652,5.31652 Z M8.92255,10.17832 C9.04225,10.29595 9.10201,10.43572 9.10201,10.5979 C9.10201,10.76413 9.04324,10.90606 8.92561,11.0236 C8.80816,11.14123 8.66623,11.2 8.5,11.2 C8.33377,11.2 8.19193,11.14123 8.07439,11.02369 C7.95676,10.90615 7.89799,10.76422 7.89799,10.59799 C7.89799,10.43176 7.95676,10.29091 8.07439,10.17535 C8.19193,10.05979 8.33386,10.00201 8.5,10.00201 C8.66218,10.00201 8.80303,10.06078 8.92255,10.17832 Z M10.59799,6.39589 C10.59799,6.96757 10.40539,7.45303 10.02028,7.85236 C9.63517,8.25178 9.15268,8.46553 8.57299,8.49397 L8.42701,8.5 C7.84732,8.5324 7.36384,8.74732 6.97666,9.14458 C6.58948,9.54184 6.39589,10.02631 6.39589,10.5979 C6.39589,11.19793 6.57427,11.67628 6.93103,12.03304 C7.28788,12.38989 7.81078,12.61282 8.5,12.70201 C7.25944,12.63307 6.24901,12.20845 5.46853,11.42806 C4.68814,10.64767 4.29799,9.67162 4.29799,8.5 C4.29799,7.35673 4.70542,6.3706 5.52037,5.54152 C6.33523,4.71253 7.30615,4.29799 8.43322,4.29799 C9.0454,4.29799 9.55921,4.49968 9.97474,4.90315 C10.39018,5.30644 10.59799,5.80405 10.59799,6.39589 Z M7.89799,6.39589 C7.89799,6.56221 7.95676,6.70405 8.07439,6.82159 C8.19193,6.93913 8.33386,6.9979 8.5,6.9979 C8.66614,6.9979 8.80816,6.93913 8.92561,6.82159 C9.04324,6.70396 9.10201,6.56212 9.10201,6.39589 C9.10201,6.23371 9.04324,6.09394 8.92561,5.97631 C8.80816,5.85877 8.66623,5.8 8.5,5.8 C8.33377,5.8 8.19193,5.85778 8.07439,5.97334 C7.95676,6.08881 7.89799,6.22966 7.89799,6.39589 Z" id="Combined-Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+    <g id="POI-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Artboard-1" transform="translate(-387.000000, -1179.000000)">
+            <g id="taoist-s" transform="translate(387.000000, 1179.000000)">
+                <circle id="Oval-1-Copy-43" fill-opacity="0.1" fill="#FFFFFF" cx="8.5" cy="8.5" r="8.5"></circle>
+                <circle id="Oval-1-Copy-42" fill="#26160D" cx="8.5" cy="8.5" r="7.5"></circle>
+                <path d="M5.31652,5.31652 C4.43884,6.19429 4,7.25539 4,8.5 C4,9.74461 4.43884,10.80571 5.31652,11.68348 C6.1942,12.56125 7.25539,13 8.5,13 C9.74461,13 10.80571,12.56116 11.68348,11.68348 C12.56116,10.80571 13,9.74461 13,8.5 C13,7.25539 12.56116,6.19429 11.68348,5.31652 C10.80571,4.43884 9.74461,4 8.5,4 C7.25539,4 6.19429,4.43884 5.31652,5.31652 Z M8.92255,10.17832 C9.04225,10.29595 9.10201,10.43572 9.10201,10.5979 C9.10201,10.76413 9.04324,10.90606 8.92561,11.0236 C8.80816,11.14123 8.66623,11.2 8.5,11.2 C8.33377,11.2 8.19193,11.14123 8.07439,11.02369 C7.95676,10.90615 7.89799,10.76422 7.89799,10.59799 C7.89799,10.43176 7.95676,10.29091 8.07439,10.17535 C8.19193,10.05979 8.33386,10.00201 8.5,10.00201 C8.66218,10.00201 8.80303,10.06078 8.92255,10.17832 Z M10.59799,6.39589 C10.59799,6.96757 10.40539,7.45303 10.02028,7.85236 C9.63517,8.25178 9.15268,8.46553 8.57299,8.49397 L8.42701,8.5 C7.84732,8.5324 7.36384,8.74732 6.97666,9.14458 C6.58948,9.54184 6.39589,10.02631 6.39589,10.5979 C6.39589,11.19793 6.57427,11.67628 6.93103,12.03304 C7.28788,12.38989 7.81078,12.61282 8.5,12.70201 C7.25944,12.63307 6.24901,12.20845 5.46853,11.42806 C4.68814,10.64767 4.29799,9.67162 4.29799,8.5 C4.29799,7.35673 4.70542,6.3706 5.52037,5.54152 C6.33523,4.71253 7.30615,4.29799 8.43322,4.29799 C9.0454,4.29799 9.55921,4.49968 9.97474,4.90315 C10.39018,5.30644 10.59799,5.80405 10.59799,6.39589 Z M7.89799,6.39589 C7.89799,6.56221 7.95676,6.70405 8.07439,6.82159 C8.19193,6.93913 8.33386,6.9979 8.5,6.9979 C8.66614,6.9979 8.80816,6.93913 8.92561,6.82159 C9.04324,6.70396 9.10201,6.56212 9.10201,6.39589 C9.10201,6.23371 9.04324,6.09394 8.92561,5.97631 C8.80816,5.85877 8.66623,5.8 8.5,5.8 C8.33377,5.8 8.19193,5.85778 8.07439,5.97334 C7.95676,6.08881 7.89799,6.22966 7.89799,6.39589 Z" id="Combined-Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+            </g>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/tire-repair-l.svg b/data/styles/clear/style-night/symbols/tire-repair-l.svg
new file mode 100644
index 0000000000..6fd9595ad8
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/tire-repair-l.svg
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="27px" height="27px" viewBox="0 0 27 27" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
+    <title>tire-repair-l</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="POI-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Artboard-1" transform="translate(-677.000000, -174.000000)">
+            <g id="tire-repair-l" transform="translate(677.000000, 174.000000)">
+                <path d="M13.5,27 C6.056,27 0,20.943 0,13.5 C0,6.057 6.056,0 13.5,0 C20.944,0 27,6.057 27,13.5 C27,20.943 20.944,27 13.5,27 L13.5,27 Z" id="Shape" fill-opacity="0.1" fill="#FFFFFF"></path>
+                <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#252522"></path>
+                <g id="Group-12" transform="translate(5.000000, 5.000000)" fill="#FFFFFF" fill-opacity="0.7">
+                    <circle id="Oval" cx="8.5" cy="8.5" r="1"></circle>
+                    <path d="M14.4410785,13.7643138 C14.4786784,13.8345337 14.5,13.9147769 14.5,14 C14.5,14.2761424 14.2761424,14.5 14,14.5 C13.7238576,14.5 13.5,14.2761424 13.5,14 C13.5,13.9147769 13.5213216,13.8345337 13.5589215,13.7643138 L14,12 L14.4410785,13.7643138 Z M13.9135802,16.9135802 C15.5704345,16.9135802 16.9135802,15.5704345 16.9135802,13.9135802 C16.9135802,12.256726 15.5704345,10.9135802 13.9135802,10.9135802 C12.256726,10.9135802 10.9135802,12.256726 10.9135802,13.9135802 C10.9135802,15.5704345 12.256726,16.9135802 13.9135802,16.9135802 Z" id="Combined-Shape" transform="translate(13.913580, 13.913580) rotate(-45.000000) translate(-13.913580, -13.913580) "></path>
+                    <path d="M11.2647537,11.0813475 C10.6820639,10.5185307 10.4131569,9.79487482 10.6407407,9.12962963 C10.9765432,8.12222222 12.2777778,7.63950617 13.6209877,8.01728395 C13.5580247,7.15679012 13.2851852,6.3382716 12.8444444,5.64567901 C11.962963,6.73703704 10.6197531,7.11481481 9.78024691,6.50617284 C8.91975309,5.87654321 8.87777778,4.49135802 9.63333333,3.31604938 C9.2345679,3.21111111 8.81481481,3.14814815 8.39506173,3.14814815 C7.97530864,3.14814815 7.55555556,3.21111111 7.15679012,3.29506173 C7.91234568,4.47037037 7.87037037,5.85555556 7.00987654,6.48518519 C6.14938272,7.11481481 4.80617284,6.71604938 3.94567901,5.62469136 C3.50493827,6.31728395 3.23209877,7.13580247 3.1691358,7.9962963 C4.51234568,7.63950617 5.8345679,8.12222222 6.14938272,9.10864198 C6.48518519,10.1160494 5.68765432,11.2703704 4.38641975,11.7740741 C4.93209877,12.4037037 5.62469136,12.9283951 6.40123457,13.2432099 C6.46419753,11.8580247 7.32469136,10.745679 8.39506173,10.745679 C9.27572125,10.745679 10.0001004,11.4986664 10.2759684,12.537072 C10.4950068,11.9799265 10.8354621,11.4838248 11.2647537,11.0813475 Z M8.5,10 C7.675,10 7,9.325 7,8.5 C7,7.675 7.675,7 8.5,7 C9.325,7 10,7.675 10,8.5 C10,9.325 9.325,10 8.5,10 L8.5,10 Z" id="Combined-Shape"></path>
+                    <path d="M10.9865602,16.6305192 C10.2000638,16.8707546 9.36512535,17 8.5,17 C3.80557963,17 0,13.1944204 0,8.5 C0,3.80557963 3.80557963,0 8.5,0 C13.1944204,0 17,3.80557963 17,8.5 C17,9.36512535 16.8707546,10.2000638 16.6305192,10.9865602 C15.9996641,10.4354129 15.1941765,10.0791528 14.3079554,10.0116784 C14.4333,9.5287345 14.5,9.02215656 14.5,8.5 C14.5,5.1862915 11.8137085,2.5 8.5,2.5 C5.1862915,2.5 2.5,5.1862915 2.5,8.5 C2.5,11.8137085 5.1862915,14.5 8.5,14.5 C9.02215656,14.5 9.5287345,14.4333 10.0116784,14.3079554 C10.0791528,15.1941765 10.4354129,15.9996641 10.9865602,16.6305192 Z" id="Combined-Shape"></path>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/tire-repair-m.svg b/data/styles/clear/style-night/symbols/tire-repair-m.svg
new file mode 100644
index 0000000000..545f9c76df
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/tire-repair-m.svg
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="23px" height="23px" viewBox="0 0 23 23" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
+    <title>tire-repair-m</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="POI-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Artboard-1" transform="translate(-714.000000, -176.000000)">
+            <g id="tire-repair-m" transform="translate(714.000000, 176.000000)">
+                <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" fill-opacity="0.1" fill="#FFFFFF"></path>
+                <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#252522"></path>
+                <g id="Group-12" transform="translate(4.000000, 4.000000)" fill="#FFFFFF" fill-opacity="0.7">
+                    <path d="M12.9410785,12.2643138 L12.5,10.5 L12.0589215,12.2643138 C12.0213216,12.3345337 12,12.4147769 12,12.5 C12,12.7761424 12.2238576,13 12.5,13 C12.7761424,13 13,12.7761424 13,12.5 C13,12.4147769 12.9786784,12.3345337 12.9410785,12.2643138 Z M12.5,15 C13.8807119,15 15,13.8807119 15,12.5 C15,11.1192881 13.8807119,10 12.5,10 C11.1192881,10 10,11.1192881 10,12.5 C10,13.8807119 11.1192881,15 12.5,15 Z" id="Combined-Shape" transform="translate(12.500000, 12.500000) rotate(-45.000000) translate(-12.500000, -12.500000) "></path>
+                    <circle id="Oval" cx="7.5" cy="7.5" r="0.5"></circle>
+                    <path d="M10.1026821,9.94991382 C9.51108794,9.45126827 9.22135698,8.77139952 9.43373494,8.15060241 C9.72289157,7.28313253 10.8433735,6.86746988 12,7.19277108 C11.9457831,6.45180723 11.7108434,5.74698795 11.3313253,5.15060241 C10.5722892,6.09036145 9.41566265,6.41566265 8.69277108,5.89156627 C7.95180723,5.34939759 7.91566265,4.15662651 8.56626506,3.14457831 C8.22289157,3.05421687 7.86144578,3 7.5,3 C7.13855422,3 6.77710843,3.05421687 6.43373494,3.12650602 C7.08433735,4.13855422 7.04819277,5.3313253 6.30722892,5.87349398 C5.56626506,6.41566265 4.40963855,6.07228916 3.6686747,5.13253012 C3.28915663,5.72891566 3.05421687,6.43373494 3,7.1746988 C4.15662651,6.86746988 5.29518072,7.28313253 5.56626506,8.13253012 C5.85542169,9 5.1686747,9.9939759 4.04819277,10.4277108 C4.51807229,10.9698795 5.11445783,11.4216867 5.78313253,11.6927711 C5.8373494,10.5 6.57831325,9.54216867 7.5,9.54216867 C8.33991358,9.54216867 9.01474187,10.3375796 9.18257869,11.3813516 C9.36846715,10.8298812 9.68800899,10.3398946 10.1026821,9.94991382 Z M7.5,8.5 C6.95,8.5 6.5,8.05 6.5,7.5 C6.5,6.95 6.95,6.5 7.5,6.5 C8.05,6.5 8.5,6.95 8.5,7.5 C8.5,8.05 8.05,8.5 7.5,8.5 L7.5,8.5 Z" id="Combined-Shape"></path>
+                    <path d="M9.74454277,14.65836 C9.03584815,14.8803498 8.28189698,15 7.5,15 C3.35786438,15 0,11.6421356 0,7.5 C0,3.35786438 3.35786438,0 7.5,0 C11.6421356,0 15,3.35786438 15,7.5 C15,8.28189698 14.8803498,9.03584815 14.65836,9.74454277 C14.0637305,9.27811428 13.3143438,9 12.5,9 C12.4222927,9 12.345177,9.00253239 12.2687307,9.00751915 C12.4189718,8.5318148 12.5,8.02536997 12.5,7.5 C12.5,4.73857625 10.2614237,2.5 7.5,2.5 C4.73857625,2.5 2.5,4.73857625 2.5,7.5 C2.5,10.2614237 4.73857625,12.5 7.5,12.5 C8.02536997,12.5 8.5318148,12.4189718 9.00751915,12.2687307 C9.00253239,12.345177 9,12.4222927 9,12.5 C9,13.3143438 9.27811428,14.0637305 9.74454277,14.65836 Z" id="Combined-Shape"></path>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/toilets-l.svg b/data/styles/clear/style-night/symbols/toilets-l.svg
index 5dc8a7c859..d74a6f7b39 100644
--- a/data/styles/clear/style-night/symbols/toilets-l.svg
+++ b/data/styles/clear/style-night/symbols/toilets-l.svg
@@ -1,14 +1,16 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <svg width="27px" height="27px" viewBox="0 0 27 27" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
     <title>toilets-l</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
-    <g id="POI-NIght" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="toilets-l">
-            <circle id="Oval-1-Copy-39" fill-opacity="0.1" fill="#FFFFFF" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#26160D" cx="13.5" cy="13.5" r="12.5"></circle>
-            <path d="M17.1678223,12.3976319 C17.3507394,11.8768716 17.6500487,11.8853788 17.829685,12.3976318 L20.6831403,20.5345836 C20.8657598,21.0553438 20.5839919,21.394364 20.0256211,21.295747 C20.0256211,21.295747 18.8173826,21.0242187 17.4990232,21.0242187 C16.1806638,21.0242187 14.9534533,21.2983536 14.9534533,21.2983536 C14.4150101,21.3972956 14.1297874,21.046837 14.3097164,20.534584 L17.1678223,12.3976319 Z M9.5,6 C8.11929,6 7,7.11929 7,8.5 C7,9.88071 8.11929,11 9.5,11 C10.88071,11 12,9.88071 12,8.5 C12,7.11929 10.88071,6 9.5,6 Z M17.5,6 C16.11929,6 15,7.11929 15,8.5 C15,9.88071 16.11929,11 17.5,11 C18.88071,11 20,9.88071 20,8.5 C20,7.11929 18.88071,6 17.5,6 Z M9.20827273,21.0670686 C9.39227764,21.5870945 9.69005297,21.5785993 9.86681574,21.0670686 L12.6746274,12.9415906 C12.8543257,12.4215647 12.5642115,12.0987841 12.0216772,12.209148 C12.0216772,12.209148 10.9608156,12.4999997 9.54144287,12.5 C8.12207019,12.5000003 6.98198578,12.2033694 6.98198578,12.2033694 C6.43965001,12.0910518 6.15217138,12.4300599 6.33317037,12.9415906 L9.20827273,21.0670686 Z" id="Combined-Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+    <g id="POI-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Artboard-1" transform="translate(-317.000000, -878.000000)">
+            <g id="toilets-l" transform="translate(317.000000, 878.000000)">
+                <circle id="Oval-1-Copy-39" fill-opacity="0.1" fill="#FFFFFF" cx="13.5" cy="13.5" r="13.5"></circle>
+                <circle id="Oval-1-Copy-38" fill="#26160D" cx="13.5" cy="13.5" r="12.5"></circle>
+                <path d="M10.6447303,9 C11.4774175,9 12.1450676,8.3325 12.1450676,7.5 C12.1450676,6.6675 11.4774175,6 10.6447303,6 C9.81204303,6 9.1443929,6.6675 9.1443929,7.5 C9.1443929,8.3325 9.81204303,9 10.6447303,9 L10.6447303,9 Z M17.5286312,9 C18.3613184,9 19.0289685,8.3325 19.0289685,7.5 C19.0289685,6.6675 18.3613184,6 17.5286312,6 C16.6959439,6 16.0282938,6.6675 16.0282938,7.5 C16.0282938,8.3325 16.6959439,9 17.5286312,9 Z M8,11.9979131 C8,10.8944962 8.89410085,10 10.0053324,10 L10.9957922,10 C12.1033067,10 13.0011246,10.8982606 13.0011246,11.9979131 L13.0011246,16 L8,16 L8,11.9979131 Z M16,11 C16,11 16.25,10 17.5,10 C18.75,10 19,11 19,11 L21,17 L14,17 L16,11 Z M16.5,17 L18.5,17 L18.5,21 L16.5,21 L16.5,17 Z M9.5,16 L11.5,16 L11.5,21 L9.5,21 L9.5,16 Z" id="Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+            </g>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/toilets-m.svg b/data/styles/clear/style-night/symbols/toilets-m.svg
index bc6cfbfee3..a8969baf6d 100644
--- a/data/styles/clear/style-night/symbols/toilets-m.svg
+++ b/data/styles/clear/style-night/symbols/toilets-m.svg
@@ -1,14 +1,16 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <svg width="23px" height="23px" viewBox="0 0 23 23" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
     <title>toilets-m</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
-    <g id="POI-NIght" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="toilets-m">
-            <ellipse id="Oval-1-Copy-41" fill-opacity="0.1" fill="#FFFFFF" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
-            <ellipse id="Oval-1-Copy-40" fill="#26160D" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
-            <path d="M14.618776,10.4258298 C14.8293202,9.91450813 15.1688123,9.90997267 15.381224,10.4258298 L18.118776,17.0741702 C18.3293202,17.5854919 18.0629214,17.91377 17.5154537,17.8126657 C17.5154537,17.8126657 16.1101982,17.5055542 15,17.5 C13.907786,17.5055542 12.474107,17.8154923 12.474107,17.8154923 C11.9361226,17.9173931 11.6688123,17.5900273 11.881224,17.0741702 L14.618776,10.4258298 Z M7.61877596,17.464781 C7.82932018,17.9761027 8.16881227,17.9806382 8.38122404,17.464781 L11.118776,10.8164407 C11.3293202,10.305119 11.0629214,9.97684083 10.5154537,10.0779452 C10.5154537,10.0779452 9.11019825,10.3850566 8,10.3906108 C6.90778603,10.3850566 5.47410701,10.0751185 5.47410701,10.0751185 C4.93612256,9.97321774 4.66881227,10.3005835 4.88122404,10.8164407 L7.61877596,17.464781 Z M8.00001,5 C6.89544,5 6.00001,5.8954 6.00001,7 C6.00001,8.1046 6.89544,9 8.00001,9 C9.10458,9 10.00001,8.1046 10.00001,7 C10.00001,5.8954 9.10458,5 8.00001,5 Z M15,5 C13.89543,5 13,5.8954 13,7 C13,8.1046 13.89543,9 15,9 C16.10457,9 17,8.1046 17,7 C17,5.8954 16.10457,5 15,5 Z" id="Combined-Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+    <g id="POI-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Artboard-1" transform="translate(-354.000000, -880.000000)">
+            <g id="toilets-m" transform="translate(354.000000, 880.000000)">
+                <ellipse id="Oval-1-Copy-41" fill-opacity="0.1" fill="#FFFFFF" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
+                <ellipse id="Oval-1-Copy-40" fill="#26160D" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+                <path d="M9,7.5 C9.69375,7.5 10.25,6.94375 10.25,6.25 C10.25,5.55625 9.69375,5 9,5 C8.30625,5 7.75,5.55625 7.75,6.25 C7.75,6.94375 8.30625,7.5 9,7.5 L9,7.5 Z M16.378534,6.25 C16.378534,5.55625 15.8012921,5 15.0813612,5 C14.3614303,5 13.7841884,5.55625 13.7841884,6.25 C13.7841884,6.94375 14.3614303,7.5 15.0813612,7.5 C15.8012921,7.5 16.378534,6.94375 16.378534,6.25 Z M7,9.50016487 C7,8.67164669 7.67854548,8 8.50083274,8 L9.49916726,8 C10.3280543,8 11,8.67432225 11,9.50016487 L11,13 L7,13 L7,9.50016487 Z M8,13 L10,13 L10,18 L8,18 L8,13 Z M13.75,9 C13.75,9 14,8 15,8 C16,8 16.25,9 16.25,9 L18,14.5 L12,14.5 L13.75,9 Z M14,14.5 L16,14.5 L16,18 L14,18 L14,14.5 Z" id="Combined-Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+            </g>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/toilets-s.svg b/data/styles/clear/style-night/symbols/toilets-s.svg
index 913d9d129b..0486f429bb 100644
--- a/data/styles/clear/style-night/symbols/toilets-s.svg
+++ b/data/styles/clear/style-night/symbols/toilets-s.svg
@@ -1,14 +1,16 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <svg width="17px" height="17px" viewBox="0 0 17 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
     <title>toilets-s</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
-    <g id="POI-NIght" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="toilets-s">
-            <circle id="Oval-1-Copy-43" fill-opacity="0.1" fill="#FFFFFF" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-42" fill="#26160D" cx="8.5" cy="8.5" r="7.5"></circle>
-            <path d="M6,4 C5.30964,4 4.75,4.55964 4.75,5.25 C4.75,5.94036 5.30964,6.5 6,6.5 C6.69036,6.5 7.25,5.94036 7.25,5.25 C7.25,4.55964 6.69036,4 6,4 L6,4 Z M11,4 C10.30964,4 9.75,4.55964 9.75,5.25 C9.75,5.94036 10.30964,6.5 11,6.5 C11.69036,6.5 12.25,5.94036 12.25,5.25 C12.25,4.55964 11.69036,4 11,4 Z M10.641777,7.47848141 C10.8395963,6.96850185 11.163995,6.97795082 11.3581551,7.47848138 L13.1418053,12.0766003 C13.3396308,12.5865799 13.0701062,12.8686308 12.533595,12.7265929 C12.533595,12.7265929 12.0094605,12.4999998 10.9999604,12.5 C9.99046034,12.5000002 9.45434435,12.7295128 9.45434435,12.7295128 C8.92727452,12.8788989 8.66402939,12.5771311 8.85818338,12.0766005 L10.641777,7.47848141 Z M5.64177705,12.4140425 C5.83959627,12.9240221 6.16399501,12.9145731 6.35815514,12.4140426 L8.14180528,7.8159236 C8.33963076,7.30594405 8.07010624,7.02389311 7.53359496,7.16593102 C7.53359496,7.16593102 7.00946051,7.39252418 5.99996043,7.39252395 C4.99046034,7.39252371 4.45434435,7.16301112 4.45434435,7.16301112 C3.92727452,7.01362506 3.66402939,7.31539283 3.85818338,7.81592341 L5.64177705,12.4140425 Z" id="Combined-Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+    <g id="POI-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Artboard-1" transform="translate(-387.000000, -883.000000)">
+            <g id="toilets-s" transform="translate(387.000000, 883.000000)">
+                <circle id="Oval-1-Copy-43" fill-opacity="0.1" fill="#FFFFFF" cx="8.5" cy="8.5" r="8.5"></circle>
+                <circle id="Oval-1-Copy-42" fill="#26160D" cx="8.5" cy="8.5" r="7.5"></circle>
+                <path d="M6.5,6 C7.055,6 7.5,5.555 7.5,5 C7.5,4.445 7.055,4 6.5,4 C5.945,4 5.5,4.445 5.5,5 C5.5,5.555 5.945,6 6.5,6 L6.5,6 Z M10.5,6 C11.055,6 11.5,5.555 11.5,5 C11.5,4.445 11.055,4 10.5,4 C9.945,4 9.5,4.445 9.5,5 C9.5,5.555 9.945,6 10.5,6 Z M5,7.49359751 C5,6.94484876 5.44266033,6.5 5.99895656,6.5 L7.00104344,6.5 C7.55275191,6.5 8,6.95756388 8,7.49359751 L8,10 L5,10 L5,7.49359751 Z M6,10 L7,10 L7,13 L6,13 L6,10 Z M9.75,7 C9.75,7 9.86706543,6.5 10.4823608,6.5 C11.0976562,6.5 11.25,7 11.25,7 L12.25,11 L8.75,11 L9.75,7 Z M10,11 L11,11 L11,13 L10,13 L10,11 Z" id="Combined-Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+            </g>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/toll_booth-l.svg b/data/styles/clear/style-night/symbols/toll_booth-l.svg
index 89007c3579..178b7a48e2 100644
--- a/data/styles/clear/style-night/symbols/toll_booth-l.svg
+++ b/data/styles/clear/style-night/symbols/toll_booth-l.svg
@@ -1,15 +1,17 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <svg width="27px" height="27px" viewBox="0 0 27 27" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
     <title>toll_booth-l</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
-    <g id="POI-NIght" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="toll_booth-l">
-            <path d="M13.5,27 C6.056,27 0,20.943 0,13.5 C0,6.057 6.056,0 13.5,0 C20.944,0 27,6.057 27,13.5 C27,20.943 20.944,27 13.5,27 L13.5,27 Z" id="Shape" fill-opacity="0.1" fill="#FFFFFF"></path>
-            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#252522"></path>
-            <path d="M21.487,6.198 C21.343,5.664 20.796,5.348 20.261,5.491 L10.999,7.972 L10.999,7.809 C10.116,7.297 9.093,6.999 7.999,6.999 C6.905,6.999 5.882,7.297 4.999,7.809 L4.999,9.58 L3.84,9.891 L4.358,11.823 L5,11.651 L5,19 L11,19 L11,10.043 L20.779,7.423 C21.313,7.28 21.63,6.732 21.487,6.198 L21.487,6.198 Z M7,12.201 C6.338,12.201 5.8,11.662 5.8,11 C5.8,10.338 6.338,9.8 7,9.8 C7.662,9.8 8.2,10.338 8.2,11 C8.2,11.662 7.662,12.201 7,12.201 L7,12.201 Z" id="Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
-            <path d="M18.7999878,12.0429192 L18.7999878,11 L17.7999878,11 L17.7999878,12.0112011 C16.9840403,12.0616568 16.3514973,12.2825733 15.9023438,12.673955 C15.3867162,13.1232606 15.1289062,13.6874564 15.1289062,14.3665595 C15.1289062,15.110829 15.3956679,15.6578761 15.9291992,16.007717 C16.244305,16.2169357 16.8136352,16.4107172 17.637207,16.5890675 L17.7999878,16.6240494 L17.7999878,18.6791338 C17.3840896,18.6204224 17.0755995,18.4742166 16.8745117,18.2405145 C16.7277011,18.0690238 16.629232,17.8100768 16.5791016,17.4636656 L15,17.4636656 C15,18.2525227 15.2954072,18.8724522 15.8862305,19.3234727 C16.3740368,19.6958525 17.0119513,19.9145044 17.7999878,19.9794324 L17.7999878,21 L18.7999878,21 L18.7999878,19.9813452 C19.5804963,19.9183206 20.2017686,19.6956013 20.6638184,19.3131833 C21.2170438,18.8553032 21.4936523,18.2799606 21.4936523,17.5871383 C21.4936523,16.911465 21.2573266,16.3952858 20.784668,16.0385852 C20.4803045,15.8087877 20.0291371,15.6252954 19.4311523,15.4881029 L18.7999878,15.3429133 L18.7999878,13.4183449 C18.8788928,13.443386 18.9532132,13.4730695 19.0229492,13.5073955 C19.4096699,13.6994651 19.6173501,14.0235776 19.6459961,14.4797428 L21.2358398,14.4797428 C21.2071939,13.6737366 20.8983591,13.0589517 20.3093262,12.6353698 C19.8733857,12.3218788 19.3702758,12.1243961 18.7999878,12.0429192 Z M18.7999878,16.8444083 L18.7999878,18.6758666 C18.9524095,18.6553077 19.087602,18.6250886 19.2055664,18.585209 C19.6674828,18.4274376 19.8984375,18.1341929 19.8984375,17.7054662 C19.8984375,17.4550899 19.7838553,17.2613083 19.5546875,17.1241158 C19.3794983,17.0218598 19.1279334,16.9286245 18.7999878,16.8444083 Z M17.7999878,15.1108495 L17.7999878,13.328331 C17.4938795,13.3560047 17.2408904,13.4345563 17.0410156,13.5639871 C16.7867826,13.7286182 16.659668,13.9584122 16.659668,14.2533762 C16.659668,14.5243315 16.7849922,14.7266874 17.0356445,14.8604502 C17.1677254,14.9335468 17.4225046,15.0170127 17.7999878,15.1108495 Z" id="Combined-Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+    <g id="POI-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Artboard-1" transform="translate(-677.000000, -248.000000)">
+            <g id="toll_booth-l" transform="translate(677.000000, 248.000000)">
+                <path d="M13.5,27 C6.056,27 0,20.943 0,13.5 C0,6.057 6.056,0 13.5,0 C20.944,0 27,6.057 27,13.5 C27,20.943 20.944,27 13.5,27 L13.5,27 Z" id="Shape" fill-opacity="0.1" fill="#FFFFFF"></path>
+                <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#252522"></path>
+                <path d="M21.487,6.198 C21.343,5.664 20.796,5.348 20.261,5.491 L10.999,7.972 L10.999,7.809 C10.116,7.297 9.093,6.999 7.999,6.999 C6.905,6.999 5.882,7.297 4.999,7.809 L4.999,9.58 L3.84,9.891 L4.358,11.823 L5,11.651 L5,19 L11,19 L11,10.043 L20.779,7.423 C21.313,7.28 21.63,6.732 21.487,6.198 L21.487,6.198 Z M7,12.201 C6.338,12.201 5.8,11.662 5.8,11 C5.8,10.338 6.338,9.8 7,9.8 C7.662,9.8 8.2,10.338 8.2,11 C8.2,11.662 7.662,12.201 7,12.201 L7,12.201 Z" id="Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+                <path d="M18.7999878,12.0429192 L18.7999878,11 L17.7999878,11 L17.7999878,12.0112011 C16.9840403,12.0616568 16.3514973,12.2825733 15.9023438,12.673955 C15.3867162,13.1232606 15.1289062,13.6874564 15.1289062,14.3665595 C15.1289062,15.110829 15.3956679,15.6578761 15.9291992,16.007717 C16.244305,16.2169357 16.8136352,16.4107172 17.637207,16.5890675 L17.7999878,16.6240494 L17.7999878,18.6791338 C17.3840896,18.6204224 17.0755995,18.4742166 16.8745117,18.2405145 C16.7277011,18.0690238 16.629232,17.8100768 16.5791016,17.4636656 L15,17.4636656 C15,18.2525227 15.2954072,18.8724522 15.8862305,19.3234727 C16.3740368,19.6958525 17.0119513,19.9145044 17.7999878,19.9794324 L17.7999878,21 L18.7999878,21 L18.7999878,19.9813452 C19.5804963,19.9183206 20.2017686,19.6956013 20.6638184,19.3131833 C21.2170438,18.8553032 21.4936523,18.2799606 21.4936523,17.5871383 C21.4936523,16.911465 21.2573266,16.3952858 20.784668,16.0385852 C20.4803045,15.8087877 20.0291371,15.6252954 19.4311523,15.4881029 L18.7999878,15.3429133 L18.7999878,13.4183449 C18.8788928,13.443386 18.9532132,13.4730695 19.0229492,13.5073955 C19.4096699,13.6994651 19.6173501,14.0235776 19.6459961,14.4797428 L21.2358398,14.4797428 C21.2071939,13.6737366 20.8983591,13.0589517 20.3093262,12.6353698 C19.8733857,12.3218788 19.3702758,12.1243961 18.7999878,12.0429192 Z M18.7999878,16.8444083 L18.7999878,18.6758666 C18.9524095,18.6553077 19.087602,18.6250886 19.2055664,18.585209 C19.6674828,18.4274376 19.8984375,18.1341929 19.8984375,17.7054662 C19.8984375,17.4550899 19.7838553,17.2613083 19.5546875,17.1241158 C19.3794983,17.0218598 19.1279334,16.9286245 18.7999878,16.8444083 Z M17.7999878,15.1108495 L17.7999878,13.328331 C17.4938795,13.3560047 17.2408904,13.4345563 17.0410156,13.5639871 C16.7867826,13.7286182 16.659668,13.9584122 16.659668,14.2533762 C16.659668,14.5243315 16.7849922,14.7266874 17.0356445,14.8604502 C17.1677254,14.9335468 17.4225046,15.0170127 17.7999878,15.1108495 Z" id="Combined-Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+            </g>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/toll_booth-m.svg b/data/styles/clear/style-night/symbols/toll_booth-m.svg
index d00a57249d..d1bd484be4 100644
--- a/data/styles/clear/style-night/symbols/toll_booth-m.svg
+++ b/data/styles/clear/style-night/symbols/toll_booth-m.svg
@@ -1,21 +1,23 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <svg width="23px" height="23px" viewBox="0 0 23 23" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
     <title>toll_booth-m</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
-    <g id="POI-NIght" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="toll_booth-m">
-            <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" fill-opacity="0.1" fill="#FFFFFF"></path>
-            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#252522"></path>
-            <g id="Group-10" transform="translate(12.000000, 10.000000)" fill="#FFFFFF" fill-opacity="0.7">
-                <path d="M0,2.5 C0,1.67157288 0.674322248,1 1.50016487,1 L4.00019251,1 C4.55237094,1 5,1.44266033 5,1.99895656 L5,4 L1.50016487,4 C0.671646689,4 0,3.33420277 0,2.5 Z M1,2.5 C1,2.22385763 1.21505737,2 1.49047852,2 L5,2 L5,3 L1.49047852,3 C1.21959471,3 1,2.76806641 1,2.5 Z M3,3 L5,3 L5,4 L3,4 L3,3 Z" id="Combined-Shape"></path>
-                <path d="M5,4.5 C5,5.32842712 4.32567775,6 3.49983513,6 L0.999807492,6 C0.447629061,6 0,5.55733967 0,5.00104344 L0,3 L3.49983513,3 C4.32835331,3 5,3.66579723 5,4.5 Z M4,4.5 C4,4.77614237 3.78494263,5 3.50952148,5 L0,5 L0,4 L3.50952148,4 C3.78040529,4 4,4.23193359 4,4.5 Z M0,3 L2,3 L2,4 L0,4 L0,3 Z M2,0 L3,0 L3,1 L2,1 L2,0 Z" id="Combined-Shape"></path>
-                <rect id="Rectangle-435" x="2" y="2" width="1" height="1"></rect>
-                <rect id="Rectangle-436" x="2" y="4" width="1" height="1"></rect>
-                <rect id="Rectangle-441" x="2" y="6" width="1" height="1"></rect>
+    <g id="POI-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Artboard-1" transform="translate(-714.000000, -250.000000)">
+            <g id="toll_booth-m" transform="translate(714.000000, 250.000000)">
+                <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" fill-opacity="0.1" fill="#FFFFFF"></path>
+                <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#252522"></path>
+                <g id="Group-10" transform="translate(12.000000, 10.000000)" fill="#FFFFFF" fill-opacity="0.7">
+                    <path d="M0,2.5 C0,1.67157288 0.674322248,1 1.50016487,1 L4.00019251,1 C4.55237094,1 5,1.44266033 5,1.99895656 L5,4 L1.50016487,4 C0.671646689,4 0,3.33420277 0,2.5 Z M1,2.5 C1,2.22385763 1.21505737,2 1.49047852,2 L5,2 L5,3 L1.49047852,3 C1.21959471,3 1,2.76806641 1,2.5 Z M3,3 L5,3 L5,4 L3,4 L3,3 Z" id="Combined-Shape"></path>
+                    <path d="M5,4.5 C5,5.32842712 4.32567775,6 3.49983513,6 L0.999807492,6 C0.447629061,6 0,5.55733967 0,5.00104344 L0,3 L3.49983513,3 C4.32835331,3 5,3.66579723 5,4.5 Z M4,4.5 C4,4.77614237 3.78494263,5 3.50952148,5 L0,5 L0,4 L3.50952148,4 C3.78040529,4 4,4.23193359 4,4.5 Z M0,3 L2,3 L2,4 L0,4 L0,3 Z M2,0 L3,0 L3,1 L2,1 L2,0 Z" id="Combined-Shape"></path>
+                    <rect id="Rectangle-435" x="2" y="2" width="1" height="1"></rect>
+                    <rect id="Rectangle-436" x="2" y="4" width="1" height="1"></rect>
+                    <rect id="Rectangle-441" x="2" y="6" width="1" height="1"></rect>
+                </g>
+                <path d="M18.116,5.59281012 C18.001,5.16481012 17.562,4.91281012 17.136,5.02781012 L9.726,7.01281012 L9.726,6.88181012 C9.019,6.47281012 8.202,6.23481012 7.326,6.23481012 C6.451,6.23481012 5.633,6.47281012 4.927,6.88181012 L4.927,8.29981012 L4,8.54781012 L4.414,10.0928101 L4.927,9.95581012 L4.927,15.8348101 L9.727,15.8348101 L9.727,8.66881012 L17.551,6.57281012 C17.977,6.45781012 18.23,6.02081012 18.116,5.59281012 L18.116,5.59281012 Z M7.843,10.8348101 L5.843,10.8348101 L5.843,8.83481012 L7.843,8.83481012 L7.843,10.8348101 L7.843,10.8348101 Z" id="Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
             </g>
-            <path d="M18.116,5.59281012 C18.001,5.16481012 17.562,4.91281012 17.136,5.02781012 L9.726,7.01281012 L9.726,6.88181012 C9.019,6.47281012 8.202,6.23481012 7.326,6.23481012 C6.451,6.23481012 5.633,6.47281012 4.927,6.88181012 L4.927,8.29981012 L4,8.54781012 L4.414,10.0928101 L4.927,9.95581012 L4.927,15.8348101 L9.727,15.8348101 L9.727,8.66881012 L17.551,6.57281012 C17.977,6.45781012 18.23,6.02081012 18.116,5.59281012 L18.116,5.59281012 Z M7.843,10.8348101 L5.843,10.8348101 L5.843,8.83481012 L7.843,8.83481012 L7.843,10.8348101 L7.843,10.8348101 Z" id="Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/toll_booth-s.svg b/data/styles/clear/style-night/symbols/toll_booth-s.svg
index 6cfc61a5a9..e84a352df7 100644
--- a/data/styles/clear/style-night/symbols/toll_booth-s.svg
+++ b/data/styles/clear/style-night/symbols/toll_booth-s.svg
@@ -1,15 +1,17 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <svg width="17px" height="17px" viewBox="0 0 17 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
     <title>toll_booth-s</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
-    <g id="POI-NIght" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="toll_booth-s">
-            <path d="M8.5,17 C3.813,17 0,13.188 0,8.5 C0,3.812 3.813,0 8.5,0 C13.187,0 17,3.812 17,8.5 C17,13.188 13.187,17 8.5,17 L8.5,17 Z" id="Shape" fill-opacity="0.1" fill="#FFFFFF"></path>
-            <ellipse id="Oval" fill="#252522" cx="8.5" cy="8.5" rx="7.5" ry="7.5"></ellipse>
-            <path d="M9,8 L12,8 L11,9 L9,9 L9,8 Z M11,11 L12,11 L12,12 L11,12 L11,11 Z M10,12 L12,12 L12,13 L10.6033325,13 L9,13 L10,12 Z M10,13 L11,13 L11,14 L10,13 Z M10,7 L11,8 L10,8 L10,7 Z M9,9 L10,9 L10,11 L9,11 L9,9 Z M10,10 L12,10 L12,11 L10,11 L10,10 Z" id="Combined-Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
-            <path d="M12.723,4.37064609 C12.652,4.10364609 12.377,3.94664609 12.111,4.01664609 L7.48,5.25764609 L7.48,5.17664609 C7.038,4.92064609 6.627,4.77164609 6.08,4.77164609 C5.533,4.77164609 5.021,4.92064609 4.58,5.17664609 L4.58,6.06164609 L4,6.21764609 L4.259,7.18264609 L4.58,7.09664609 L4.58,11.5686461 L7.48,11.5686461 L7.48,6.29364609 L12.37,4.98364609 C12.636,4.91164609 12.794,4.63764609 12.723,4.37064609 L12.723,4.37064609 Z M6.539,7.65564609 L5.539,7.65564609 L5.539,6.65564609 L6.539,6.65564609 L6.539,7.65564609 L6.539,7.65564609 Z" id="Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+    <g id="POI-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Artboard-1" transform="translate(-747.000000, -253.000000)">
+            <g id="toll_booth-s" transform="translate(747.000000, 253.000000)">
+                <path d="M8.5,17 C3.813,17 0,13.188 0,8.5 C0,3.812 3.813,0 8.5,0 C13.187,0 17,3.812 17,8.5 C17,13.188 13.187,17 8.5,17 L8.5,17 Z" id="Shape" fill-opacity="0.1" fill="#FFFFFF"></path>
+                <ellipse id="Oval" fill="#252522" cx="8.5" cy="8.5" rx="7.5" ry="7.5"></ellipse>
+                <path d="M9,8 L12,8 L11,9 L9,9 L9,8 Z M11,11 L12,11 L12,12 L11,12 L11,11 Z M10,12 L12,12 L12,13 L10.6033325,13 L9,13 L10,12 Z M10,13 L11,13 L11,14 L10,13 Z M10,7 L11,8 L10,8 L10,7 Z M9,9 L10,9 L10,11 L9,11 L9,9 Z M10,10 L12,10 L12,11 L10,11 L10,10 Z" id="Combined-Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+                <path d="M12.723,4.37064609 C12.652,4.10364609 12.377,3.94664609 12.111,4.01664609 L7.48,5.25764609 L7.48,5.17664609 C7.038,4.92064609 6.627,4.77164609 6.08,4.77164609 C5.533,4.77164609 5.021,4.92064609 4.58,5.17664609 L4.58,6.06164609 L4,6.21764609 L4.259,7.18264609 L4.58,7.09664609 L4.58,11.5686461 L7.48,11.5686461 L7.48,6.29364609 L12.37,4.98364609 C12.636,4.91164609 12.794,4.63764609 12.723,4.37064609 L12.723,4.37064609 Z M6.539,7.65564609 L5.539,7.65564609 L5.539,6.65564609 L6.539,6.65564609 L6.539,7.65564609 L6.539,7.65564609 Z" id="Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+            </g>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/tomb-l.svg b/data/styles/clear/style-night/symbols/tomb-l.svg
index 7d6988cf38..b74348851a 100644
--- a/data/styles/clear/style-night/symbols/tomb-l.svg
+++ b/data/styles/clear/style-night/symbols/tomb-l.svg
@@ -1,14 +1,16 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <svg width="27px" height="27px" viewBox="0 0 27 27" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
     <title>tomb-l</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
-    <g id="POI-NIght" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="tomb-l">
-            <path d="M13.5,27 C6.057,27 0,20.943 0,13.5 C0,6.057 6.057,0 13.5,0 C20.943,0 27,6.057 27,13.5 C27,20.943 20.943,27 13.5,27 L13.5,27 Z" id="Shape" fill-opacity="0.1" fill="#FFFFFF"></path>
-            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#26160D"></path>
-            <path d="M6,22 L6,10.9641053 C6,7.12442105 9.298,4 13.351,4 L13.65,4 C17.703,4 21.001,7.12442105 21.001,10.9641053 L21.001,22 L6,22 L6,22 Z M19,21 L19,11.351 C19,8.401 16.6,6 13.649,6 L13.35,6 C10.4,6 7.999,8.4 7.999,11.351 L7.999,21 L19,21 L19,21 Z M13.649,8 L13.35,8 C11.498,8 9.999,9.499 9.999,11.351 L9.999,20 L16.999,20 L16.999,11.351 C17,9.499 15.5,8 13.649,8 L13.649,8 Z" id="Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+    <g id="POI-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Artboard-1" transform="translate(-317.000000, -1211.000000)">
+            <g id="tomb-l" transform="translate(317.000000, 1211.000000)">
+                <path d="M13.5,27 C6.057,27 0,20.943 0,13.5 C0,6.057 6.057,0 13.5,0 C20.943,0 27,6.057 27,13.5 C27,20.943 20.943,27 13.5,27 L13.5,27 Z" id="Shape" fill-opacity="0.1" fill="#FFFFFF"></path>
+                <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#26160D"></path>
+                <path d="M6,22 L6,10.9641053 C6,7.12442105 9.298,4 13.351,4 L13.65,4 C17.703,4 21.001,7.12442105 21.001,10.9641053 L21.001,22 L6,22 L6,22 Z M19,21 L19,11.351 C19,8.401 16.6,6 13.649,6 L13.35,6 C10.4,6 7.999,8.4 7.999,11.351 L7.999,21 L19,21 L19,21 Z M13.649,8 L13.35,8 C11.498,8 9.999,9.499 9.999,11.351 L9.999,20 L16.999,20 L16.999,11.351 C17,9.499 15.5,8 13.649,8 L13.649,8 Z" id="Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+            </g>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/tomb-m.svg b/data/styles/clear/style-night/symbols/tomb-m.svg
index 8141505adb..aca7dd4d20 100644
--- a/data/styles/clear/style-night/symbols/tomb-m.svg
+++ b/data/styles/clear/style-night/symbols/tomb-m.svg
@@ -1,14 +1,16 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <svg width="23px" height="23px" viewBox="0 0 23 23" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
     <title>tomb-m</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
-    <g id="POI-NIght" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="tomb-m">
-            <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" fill-opacity="0.1" fill="#FFFFFF"></path>
-            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#26160D"></path>
-            <path d="M5,18 L5,9.9276 C5,6.65906667 7.849,4 11.35,4 L11.651,4 C15.152,4 18.001,6.65906667 18.001,9.9276 L18.001,18 L5,18 L5,18 Z M16,17.0666667 L16,9.9276 C16,7.68946667 14.049,5.86666667 11.65,5.86666667 L11.349,5.86666667 C8.951,5.86666667 6.999,7.68853333 6.999,9.9276 L6.999,17.0666667 L16,17.0666667 L16,17.0666667 Z M14,16.1333333 L14,9.9276 C14,8.718 12.946,7.73333333 11.65,7.73333333 L11.349,7.73333333 C10.053,7.73333333 8.999,8.718 8.999,9.9276 L8.999,16.1333333 L14,16.1333333 L14,16.1333333 Z" id="Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+    <g id="POI-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Artboard-1" transform="translate(-354.000000, -1213.000000)">
+            <g id="tomb-m" transform="translate(354.000000, 1213.000000)">
+                <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" fill-opacity="0.1" fill="#FFFFFF"></path>
+                <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#26160D"></path>
+                <path d="M5,18 L5,9.9276 C5,6.65906667 7.849,4 11.35,4 L11.651,4 C15.152,4 18.001,6.65906667 18.001,9.9276 L18.001,18 L5,18 L5,18 Z M16,17.0666667 L16,9.9276 C16,7.68946667 14.049,5.86666667 11.65,5.86666667 L11.349,5.86666667 C8.951,5.86666667 6.999,7.68853333 6.999,9.9276 L6.999,17.0666667 L16,17.0666667 L16,17.0666667 Z M14,16.1333333 L14,9.9276 C14,8.718 12.946,7.73333333 11.65,7.73333333 L11.349,7.73333333 C10.053,7.73333333 8.999,8.718 8.999,9.9276 L8.999,16.1333333 L14,16.1333333 L14,16.1333333 Z" id="Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+            </g>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/tomb-s.svg b/data/styles/clear/style-night/symbols/tomb-s.svg
new file mode 100644
index 0000000000..73f5ae2a5b
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/tomb-s.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="17px" height="17px" viewBox="0 0 17 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
+    <title>tomb-s</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="POI-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Artboard-1" transform="translate(-387.000000, -1216.000000)">
+            <g id="tomb-s" transform="translate(387.000000, 1216.000000)">
+                <path d="M8.5,17 C3.812,17 0,13.188 0,8.5 C0,3.812 3.812,0 8.5,0 C13.188,0 17,3.812 17,8.5 C17,13.188 13.188,17 8.5,17 L8.5,17 Z" id="Shape" fill-opacity="0.1" fill="#FFFFFF"></path>
+                <ellipse id="Oval" fill="#26160D" cx="8.5" cy="8.5" rx="7.5" ry="7.5"></ellipse>
+                <path d="M8.57,6 L8.431,6 L7.001,7.482 L7.001,11 L10.001,11 L10.001,7.482 L8.57,6 L8.57,6 Z M8.57,4 L8.431,4 C6.538,4 5,5.562 5,7.482 L5,13 L12,13 L12,7.482 C12.001,5.562 10.463,4 8.57,4 L8.57,4 Z M11.001,12 L6.001,12 L6.001,7.482 C6.001,6.113 7.092,5 8.432,5 L8.571,5 C9.911,5 11.002,6.113 11.002,7.482 L11.002,12 L11.001,12 Z" id="Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/veterinary-l.svg b/data/styles/clear/style-night/symbols/veterinary-l.svg
index 54876501af..e3a02e3e2f 100644
--- a/data/styles/clear/style-night/symbols/veterinary-l.svg
+++ b/data/styles/clear/style-night/symbols/veterinary-l.svg
@@ -1,17 +1,19 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <svg width="27px" height="27px" viewBox="0 0 27 27" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
     <title>veterinary-l</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
-    <g id="POI-NIght" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="veterinary-l">
-            <g id="POI">
-                <g>
-                    <g id="hospital-l">
-                        <circle id="Oval-1-Copy-39" fill-opacity="0.1" fill="#FFFFFF" cx="13.5" cy="13.5" r="13.5"></circle>
-                        <circle id="Oval-1-Copy-38" fill="#612C23" cx="13.5" cy="13.5" r="12.5"></circle>
-                        <path d="M18.3291762,12.8638632 C17.8922842,13.1334268 17.5636523,13.4740155 17.341997,13.8860448 C17.2333089,14.1124117 17.1669834,14.3242413 17.1430207,14.5219489 C17.1104998,14.7678374 17.1387416,15.0058342 17.2268903,15.23677 C17.3561179,15.5254397 17.5550942,15.7335311 17.824675,15.8606289 C17.9954095,15.9466068 18.1913905,16.0051714 18.4130458,16.0367382 C18.7249893,16.0641514 19.0626072,16.0138938 19.4241878,15.8876268 C19.6672384,15.7821273 19.8965961,15.6479686 20.1122607,15.4855659 C20.3998136,15.2571222 20.616334,15.0033421 20.7613942,14.7242254 L20.8606684,14.5157187 C20.9150124,14.4031582 20.953524,14.2631846 20.9753472,14.0970437 C21.0237006,13.8216653 21.0010216,13.566639 20.9064543,13.3323804 C20.7874964,13.057002 20.6005015,12.8484952 20.3446137,12.7081062 C20.183721,12.6142366 19.9975819,12.556918 19.7861963,12.5353197 C19.4579924,12.4962766 19.1237978,12.5373965 18.7836125,12.6582639 C18.6282826,12.7172439 18.4763759,12.785777 18.3291762,12.8638632 L18.3291762,12.8638632 L18.3291762,12.8638632 Z M18.667222,8.12677216 C18.4558364,8.05242413 18.2465904,8.02584159 18.0390559,8.04785525 C17.7651961,8.06114652 17.4900525,8.13674061 17.2123415,8.27339146 C16.9265002,8.41004231 16.6505008,8.60650387 16.3851991,8.86236079 C16.1652554,9.08706629 15.9786883,9.34458461 15.8233585,9.63574646 C15.7484749,9.7898421 15.6975541,9.91195562 15.6693123,10.0016717 C15.6055543,10.1852573 15.5619079,10.3754886 15.5396567,10.5731962 C15.5097033,10.8485747 15.5439358,11.1197996 15.6419263,11.3872864 C15.7608842,11.701708 15.9714139,11.9384587 16.2730877,12.0967078 C16.4438222,12.1826857 16.631673,12.2370969 16.8345004,12.2607719 C17.0843976,12.2798781 17.3591132,12.2433271 17.6586475,12.1490422 C17.9325073,12.0514345 18.2012323,11.9002463 18.4648225,11.6950623 C18.8293984,11.4117922 19.1109606,11.0732802 19.3099369,10.6786957 C19.4306064,10.4577283 19.5093411,10.2342689 19.5457131,10.0074866 C19.6081874,9.71466336 19.6150339,9.43845419 19.5666805,9.17844376 C19.4845226,8.7589381 19.2680021,8.44617795 18.917975,8.24099399 L18.9059936,8.2235492 L18.6916127,8.12677216 L18.667222,8.12677216 L18.667222,8.12677216 L18.667222,8.12677216 Z M9.47922348,12.9930377 C9.19552177,13.0727854 8.921234,13.1782848 8.65550435,13.3095361 C8.27766331,13.5068283 7.96871515,13.7294571 7.72908777,13.9774223 C7.5681951,14.1356715 7.4201396,14.3300563 7.2853492,14.559746 C7.17837269,14.7495619 7.10348913,14.9377164 7.05898691,15.1258709 C6.93403834,15.6492146 7.00763818,16.1530368 7.27935852,16.6373374 C7.44453025,16.9035781 7.66875302,17.1191458 7.95245472,17.2848713 L8.10350555,17.3642036 L8.63196952,17.5660647 C8.81725283,17.6125842 9.12791262,17.6744716 9.56480469,17.7504811 L10.4398725,17.9170373 L10.8716297,18.0549342 C11.1048385,18.1604336 11.2738614,18.2443348 11.3786984,18.3066376 C11.5858049,18.4299972 11.8104556,18.5849235 12.0517946,18.7722473 C12.2289477,18.9130517 12.4886867,19.1252966 12.8301557,19.4081514 C13.0398297,19.5664006 13.206713,19.6731461 13.3316616,19.7275572 L13.3765917,19.7483248 L13.3945638,19.7657696 L13.6179307,19.8683616 L13.639326,19.8683616 L13.7206282,19.9036665 L13.9825067,19.9647233 C14.2302643,20.0095813 14.4861521,20.0116581 14.7497422,19.9709536 C15.1138902,19.9044972 15.4305407,19.7719999 15.7005494,19.5726309 C15.9881023,19.3500021 16.2067623,19.0588403 16.3552457,18.6991453 C16.4421106,18.5001917 16.5024453,18.2663484 16.5366778,17.9988617 C16.5687708,17.6844401 16.5555057,17.3766642 16.4968826,17.0759492 C16.4331246,16.7166696 16.3270039,16.3706813 16.1802321,16.0383996 C16.0535719,15.774651 15.953014,15.4909655 15.8785583,15.186097 C15.8058143,14.8774904 15.7506144,14.5813443 15.7125308,14.2980741 L15.6004194,13.5014288 C15.5460753,13.2181586 15.479322,12.9718548 15.3980198,12.7629327 C15.2491085,12.4132062 15.0321602,12.1253671 14.7463189,11.8985849 C14.5614635,11.7598573 14.3487942,11.635667 14.1095948,11.5264294 C13.9123301,11.4479278 13.7035119,11.4001623 13.4818566,11.3827175 C13.2259688,11.3731644 12.9401275,11.4188532 12.6243329,11.5206144 C12.4112357,11.6028542 12.2032733,11.6925702 12.000018,11.7897626 C11.8125951,11.8819708 11.5421585,12.027344 11.1882802,12.2262977 C10.8224205,12.4294049 10.5121887,12.5876541 10.2584404,12.7010452 C10.0008409,12.8314658 9.74152988,12.9282428 9.47922348,12.9930377 L9.47922348,12.9930377 L9.47922348,12.9930377 Z M11.785637,7.48214565 C11.7231628,7.65950101 11.6696745,7.84225595 11.6251723,8.02999511 C11.5669771,8.40298133 11.5678329,8.73941655 11.6281676,9.04054685 C11.676521,9.3317087 11.7843533,9.59919547 11.9512367,9.84342252 C12.0984364,10.0465297 12.2636081,10.193149 12.4493193,10.2832804 C12.6662677,10.4041479 12.9041834,10.4589744 13.161355,10.4473445 C13.370601,10.4357147 13.584982,10.375904 13.8044977,10.2687431 C14.1181529,10.0951259 14.3778918,9.85671379 14.5828588,9.55350673 C14.6752865,9.43430067 14.7630073,9.28975813 14.8455931,9.11987911 L14.978244,8.73318627 C15.0488485,8.51844922 15.0937787,8.28875949 15.1113228,8.04494779 C15.1211646,7.65991636 15.060402,7.29980606 14.9268953,6.96378619 C14.8383187,6.74655702 14.7108027,6.55632574 14.5434915,6.39226165 C14.3419477,6.19123122 14.1100227,6.06911769 13.8460046,6.02633642 C13.5926843,5.9735867 13.3312337,6.00016924 13.0616529,6.10525333 C12.8344348,6.19496939 12.6256166,6.33078954 12.43691,6.51229842 C12.2054129,6.73118899 12.0154226,6.99784506 11.8660834,7.31226663 L11.785637,7.48214565 L11.785637,7.48214565 L11.785637,7.48214565 Z M9.53399545,7.83021074 C9.26655418,7.76416975 9.00082452,7.784522 8.7372344,7.8920982 C8.5177186,7.98596778 8.32130973,8.13341779 8.14843569,8.33444822 C8.07398004,8.42457964 8.00166392,8.52675626 7.93105942,8.64222415 L7.90067809,8.67462162 L7.7740179,8.93837023 L7.71368315,9.1373239 C7.63109728,9.40688743 7.5968648,9.67562026 7.6109857,9.94310703 C7.62125544,10.2475601 7.67645532,10.5183697 7.77744115,10.7547051 C7.89211997,11.0417134 8.0500173,11.2772181 8.25113314,11.4608037 C8.41801649,11.6057616 8.60501143,11.710015 8.81254587,11.7743946 C9.0983871,11.8508194 9.38294462,11.8300518 9.66664632,11.7129225 C9.88787375,11.6232064 10.087278,11.4720182 10.2644311,11.2589426 C10.3709797,11.1376598 10.4728213,10.9769185 10.5686723,10.7758881 L10.6773604,10.4946947 C10.7458254,10.2795423 10.7809137,10.0776811 10.7830532,9.88828055 C10.8031648,9.48372758 10.7368393,9.10534178 10.5840769,8.75146177 C10.4711097,8.50931147 10.319203,8.30703498 10.1283569,8.145463 C9.94735269,7.9797375 9.7496601,7.87589947 9.53399545,7.83021074 L9.53399545,7.83021074 L9.53399545,7.83021074 Z" id="Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+    <g id="POI-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Artboard-1" transform="translate(-137.000000, -285.000000)">
+            <g id="veterinary-l" transform="translate(137.000000, 285.000000)">
+                <g id="POI">
+                    <g>
+                        <g id="hospital-l">
+                            <circle id="Oval-1-Copy-39" fill-opacity="0.1" fill="#FFFFFF" cx="13.5" cy="13.5" r="13.5"></circle>
+                            <circle id="Oval-1-Copy-38" fill="#612C23" cx="13.5" cy="13.5" r="12.5"></circle>
+                            <path d="M18.3291762,12.8638632 C17.8922842,13.1334268 17.5636523,13.4740155 17.341997,13.8860448 C17.2333089,14.1124117 17.1669834,14.3242413 17.1430207,14.5219489 C17.1104998,14.7678374 17.1387416,15.0058342 17.2268903,15.23677 C17.3561179,15.5254397 17.5550942,15.7335311 17.824675,15.8606289 C17.9954095,15.9466068 18.1913905,16.0051714 18.4130458,16.0367382 C18.7249893,16.0641514 19.0626072,16.0138938 19.4241878,15.8876268 C19.6672384,15.7821273 19.8965961,15.6479686 20.1122607,15.4855659 C20.3998136,15.2571222 20.616334,15.0033421 20.7613942,14.7242254 L20.8606684,14.5157187 C20.9150124,14.4031582 20.953524,14.2631846 20.9753472,14.0970437 C21.0237006,13.8216653 21.0010216,13.566639 20.9064543,13.3323804 C20.7874964,13.057002 20.6005015,12.8484952 20.3446137,12.7081062 C20.183721,12.6142366 19.9975819,12.556918 19.7861963,12.5353197 C19.4579924,12.4962766 19.1237978,12.5373965 18.7836125,12.6582639 C18.6282826,12.7172439 18.4763759,12.785777 18.3291762,12.8638632 L18.3291762,12.8638632 L18.3291762,12.8638632 Z M18.667222,8.12677216 C18.4558364,8.05242413 18.2465904,8.02584159 18.0390559,8.04785525 C17.7651961,8.06114652 17.4900525,8.13674061 17.2123415,8.27339146 C16.9265002,8.41004231 16.6505008,8.60650387 16.3851991,8.86236079 C16.1652554,9.08706629 15.9786883,9.34458461 15.8233585,9.63574646 C15.7484749,9.7898421 15.6975541,9.91195562 15.6693123,10.0016717 C15.6055543,10.1852573 15.5619079,10.3754886 15.5396567,10.5731962 C15.5097033,10.8485747 15.5439358,11.1197996 15.6419263,11.3872864 C15.7608842,11.701708 15.9714139,11.9384587 16.2730877,12.0967078 C16.4438222,12.1826857 16.631673,12.2370969 16.8345004,12.2607719 C17.0843976,12.2798781 17.3591132,12.2433271 17.6586475,12.1490422 C17.9325073,12.0514345 18.2012323,11.9002463 18.4648225,11.6950623 C18.8293984,11.4117922 19.1109606,11.0732802 19.3099369,10.6786957 C19.4306064,10.4577283 19.5093411,10.2342689 19.5457131,10.0074866 C19.6081874,9.71466336 19.6150339,9.43845419 19.5666805,9.17844376 C19.4845226,8.7589381 19.2680021,8.44617795 18.917975,8.24099399 L18.9059936,8.2235492 L18.6916127,8.12677216 L18.667222,8.12677216 L18.667222,8.12677216 L18.667222,8.12677216 Z M9.47922348,12.9930377 C9.19552177,13.0727854 8.921234,13.1782848 8.65550435,13.3095361 C8.27766331,13.5068283 7.96871515,13.7294571 7.72908777,13.9774223 C7.5681951,14.1356715 7.4201396,14.3300563 7.2853492,14.559746 C7.17837269,14.7495619 7.10348913,14.9377164 7.05898691,15.1258709 C6.93403834,15.6492146 7.00763818,16.1530368 7.27935852,16.6373374 C7.44453025,16.9035781 7.66875302,17.1191458 7.95245472,17.2848713 L8.10350555,17.3642036 L8.63196952,17.5660647 C8.81725283,17.6125842 9.12791262,17.6744716 9.56480469,17.7504811 L10.4398725,17.9170373 L10.8716297,18.0549342 C11.1048385,18.1604336 11.2738614,18.2443348 11.3786984,18.3066376 C11.5858049,18.4299972 11.8104556,18.5849235 12.0517946,18.7722473 C12.2289477,18.9130517 12.4886867,19.1252966 12.8301557,19.4081514 C13.0398297,19.5664006 13.206713,19.6731461 13.3316616,19.7275572 L13.3765917,19.7483248 L13.3945638,19.7657696 L13.6179307,19.8683616 L13.639326,19.8683616 L13.7206282,19.9036665 L13.9825067,19.9647233 C14.2302643,20.0095813 14.4861521,20.0116581 14.7497422,19.9709536 C15.1138902,19.9044972 15.4305407,19.7719999 15.7005494,19.5726309 C15.9881023,19.3500021 16.2067623,19.0588403 16.3552457,18.6991453 C16.4421106,18.5001917 16.5024453,18.2663484 16.5366778,17.9988617 C16.5687708,17.6844401 16.5555057,17.3766642 16.4968826,17.0759492 C16.4331246,16.7166696 16.3270039,16.3706813 16.1802321,16.0383996 C16.0535719,15.774651 15.953014,15.4909655 15.8785583,15.186097 C15.8058143,14.8774904 15.7506144,14.5813443 15.7125308,14.2980741 L15.6004194,13.5014288 C15.5460753,13.2181586 15.479322,12.9718548 15.3980198,12.7629327 C15.2491085,12.4132062 15.0321602,12.1253671 14.7463189,11.8985849 C14.5614635,11.7598573 14.3487942,11.635667 14.1095948,11.5264294 C13.9123301,11.4479278 13.7035119,11.4001623 13.4818566,11.3827175 C13.2259688,11.3731644 12.9401275,11.4188532 12.6243329,11.5206144 C12.4112357,11.6028542 12.2032733,11.6925702 12.000018,11.7897626 C11.8125951,11.8819708 11.5421585,12.027344 11.1882802,12.2262977 C10.8224205,12.4294049 10.5121887,12.5876541 10.2584404,12.7010452 C10.0008409,12.8314658 9.74152988,12.9282428 9.47922348,12.9930377 L9.47922348,12.9930377 L9.47922348,12.9930377 Z M11.785637,7.48214565 C11.7231628,7.65950101 11.6696745,7.84225595 11.6251723,8.02999511 C11.5669771,8.40298133 11.5678329,8.73941655 11.6281676,9.04054685 C11.676521,9.3317087 11.7843533,9.59919547 11.9512367,9.84342252 C12.0984364,10.0465297 12.2636081,10.193149 12.4493193,10.2832804 C12.6662677,10.4041479 12.9041834,10.4589744 13.161355,10.4473445 C13.370601,10.4357147 13.584982,10.375904 13.8044977,10.2687431 C14.1181529,10.0951259 14.3778918,9.85671379 14.5828588,9.55350673 C14.6752865,9.43430067 14.7630073,9.28975813 14.8455931,9.11987911 L14.978244,8.73318627 C15.0488485,8.51844922 15.0937787,8.28875949 15.1113228,8.04494779 C15.1211646,7.65991636 15.060402,7.29980606 14.9268953,6.96378619 C14.8383187,6.74655702 14.7108027,6.55632574 14.5434915,6.39226165 C14.3419477,6.19123122 14.1100227,6.06911769 13.8460046,6.02633642 C13.5926843,5.9735867 13.3312337,6.00016924 13.0616529,6.10525333 C12.8344348,6.19496939 12.6256166,6.33078954 12.43691,6.51229842 C12.2054129,6.73118899 12.0154226,6.99784506 11.8660834,7.31226663 L11.785637,7.48214565 L11.785637,7.48214565 L11.785637,7.48214565 Z M9.53399545,7.83021074 C9.26655418,7.76416975 9.00082452,7.784522 8.7372344,7.8920982 C8.5177186,7.98596778 8.32130973,8.13341779 8.14843569,8.33444822 C8.07398004,8.42457964 8.00166392,8.52675626 7.93105942,8.64222415 L7.90067809,8.67462162 L7.7740179,8.93837023 L7.71368315,9.1373239 C7.63109728,9.40688743 7.5968648,9.67562026 7.6109857,9.94310703 C7.62125544,10.2475601 7.67645532,10.5183697 7.77744115,10.7547051 C7.89211997,11.0417134 8.0500173,11.2772181 8.25113314,11.4608037 C8.41801649,11.6057616 8.60501143,11.710015 8.81254587,11.7743946 C9.0983871,11.8508194 9.38294462,11.8300518 9.66664632,11.7129225 C9.88787375,11.6232064 10.087278,11.4720182 10.2644311,11.2589426 C10.3709797,11.1376598 10.4728213,10.9769185 10.5686723,10.7758881 L10.6773604,10.4946947 C10.7458254,10.2795423 10.7809137,10.0776811 10.7830532,9.88828055 C10.8031648,9.48372758 10.7368393,9.10534178 10.5840769,8.75146177 C10.4711097,8.50931147 10.319203,8.30703498 10.1283569,8.145463 C9.94735269,7.9797375 9.7496601,7.87589947 9.53399545,7.83021074 L9.53399545,7.83021074 L9.53399545,7.83021074 Z" id="Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+                        </g>
                     </g>
                 </g>
             </g>
diff --git a/data/styles/clear/style-night/symbols/veterinary-m.svg b/data/styles/clear/style-night/symbols/veterinary-m.svg
index 4865706112..77bfe2f7cb 100644
--- a/data/styles/clear/style-night/symbols/veterinary-m.svg
+++ b/data/styles/clear/style-night/symbols/veterinary-m.svg
@@ -1,14 +1,16 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <svg width="23px" height="23px" viewBox="0 0 23 23" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
     <title>veterinary-m</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
-    <g id="POI-NIght" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="veterinary-m">
-            <ellipse id="Oval-1-Copy-41" fill-opacity="0.1" fill="#FFFFFF" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
-            <ellipse id="Oval-1-Copy-40" fill="#612C23" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
-            <path d="M15.7107224,10.8833113 C15.3362436,11.1143658 15.0545591,11.406299 14.8645688,11.759467 C14.7714076,11.9534957 14.7145572,12.135064 14.6940177,12.3045276 C14.6661427,12.5152892 14.6903499,12.7192864 14.765906,12.9172314 C14.8766725,13.1646626 15.0472236,13.3430266 15.2782928,13.4519676 C15.4246367,13.525663 15.5926204,13.5758612 15.7826107,13.6029184 C16.0499908,13.6264155 16.3393776,13.5833375 16.6493038,13.4751087 C16.8576329,13.3846805 17.0542252,13.2696874 17.2390806,13.130485 C17.4855545,12.9346762 17.6711434,12.7171504 17.7954807,12.4779075 L17.8805729,12.2991875 C17.9271535,12.202707 17.9601634,12.0827297 17.978869,11.9403232 C18.0203148,11.7042845 18.0008756,11.4856906 17.919818,11.2848975 C17.817854,11.0488589 17.6575727,10.8701387 17.4382403,10.7498053 C17.3003323,10.6693457 17.1407845,10.6202154 16.9595968,10.6017026 C16.6782792,10.5682371 16.3918267,10.6034827 16.1002393,10.7070833 C15.9670994,10.7576376 15.8368936,10.8163803 15.7107224,10.8833113 L15.7107224,10.8833113 L15.7107224,10.8833113 Z M16.000476,6.82294756 C15.8192883,6.75922068 15.6399346,6.73643565 15.4620479,6.7553045 C15.2273109,6.76669702 14.9914736,6.83149195 14.7534356,6.94862125 C14.5084287,7.06575055 14.2718578,7.23414617 14.0444564,7.4534521 C13.8559332,7.64605682 13.6960185,7.86678681 13.5628787,8.11635411 C13.4986928,8.24843608 13.4550464,8.35310481 13.4308391,8.43000431 C13.3761894,8.5873634 13.3387782,8.7504188 13.3197057,8.91988245 C13.2940314,9.15592117 13.3233735,9.38839965 13.4073654,9.61767405 C13.5093293,9.88717828 13.6897833,10.0901075 13.9483609,10.2257495 C14.0947047,10.2994449 14.2557197,10.3460831 14.4295718,10.3663759 C14.6437694,10.3827527 14.8792399,10.3514232 15.1359836,10.2706076 C15.3707205,10.1869439 15.6010562,10.057354 15.8269907,9.88148197 C16.1394843,9.63867902 16.3808234,9.34852588 16.5513745,9.0103106 C16.6548055,8.82090997 16.7222924,8.62937334 16.7534684,8.43498851 C16.8070178,8.18399716 16.8128862,7.94724645 16.7714404,7.72438036 C16.7010194,7.36480408 16.5154304,7.09672396 16.2154071,6.92085199 L16.2051374,6.90589931 L16.0213823,6.82294756 L16.000476,6.82294756 L16.000476,6.82294756 L16.000476,6.82294756 Z M8.12504869,10.9940323 C7.8818758,11.0623875 7.646772,11.1528155 7.41900373,11.2653167 C7.09513998,11.4344243 6.83032727,11.6252489 6.62493237,11.8377905 C6.48702437,11.9734327 6.36011966,12.1400483 6.24458503,12.3369251 C6.15289088,12.4996245 6.08870497,12.6608998 6.05056021,12.822175 C5.94346143,13.2707554 6.00654701,13.702603 6.23945016,14.1177178 C6.38102593,14.3459241 6.57321687,14.5306964 6.81638976,14.6727468 L6.9458619,14.7407459 L7.39883101,14.9137697 C7.55764528,14.9536436 7.8239251,15.0066899 8.19840402,15.0718409 L8.94846214,15.2146034 L9.31853974,15.3328007 C9.518433,15.4232288 9.66330977,15.4951441 9.75317005,15.5485465 C9.93068991,15.6542833 10.1232477,15.7870773 10.3301097,15.9476405 C10.4819552,16.06833 10.7045886,16.2502542 10.9972763,16.4927012 C11.1769969,16.6283434 11.3200397,16.7198395 11.4271385,16.7664776 L11.46565,16.7842784 L11.4810547,16.7992311 L11.672512,16.8871671 L11.6908509,16.8871671 L11.7605385,16.9174284 L11.9850057,16.9697628 C12.1973694,17.0082125 12.4167018,17.0099926 12.6426362,16.9751031 C12.954763,16.9181404 13.2261777,16.8045713 13.4576138,16.6336836 C13.7040877,16.4428589 13.8915105,16.1932917 14.018782,15.8849817 C14.0932376,15.71445 14.1449531,15.5140129 14.1742952,15.2847386 C14.2018035,15.0152344 14.1904334,14.7514264 14.1401851,14.4936707 C14.0855354,14.1857168 13.9945748,13.8891554 13.8687704,13.6043425 C13.7602045,13.3782723 13.674012,13.1351133 13.6101928,12.8737974 C13.5478408,12.6092775 13.5005266,12.355438 13.4678835,12.1126349 L13.371788,11.4297961 C13.3252074,11.1869931 13.2679903,10.9758755 13.1983027,10.7967995 C13.0706644,10.4970339 12.8847087,10.2503147 12.6397019,10.0559299 C12.4812544,9.93702054 12.2989664,9.83057171 12.0939384,9.73693948 C11.9248544,9.6696524 11.7458673,9.62871054 11.5558771,9.61375785 C11.3365447,9.60556948 11.0915379,9.64473131 10.8208568,9.7319552 C10.638202,9.80244645 10.4599485,9.87934588 10.2857297,9.96265365 C10.1250815,10.0416893 9.89327871,10.1662949 9.58995445,10.3368266 C9.27636042,10.5109185 9.01044745,10.6465607 8.79294891,10.743753 C8.57214934,10.8555421 8.34988275,10.9384938 8.12504869,10.9940323 L8.12504869,10.9940323 L8.12504869,10.9940323 Z M10.1019746,6.27041056 C10.0484253,6.42242944 10.0025781,6.57907653 9.9644334,6.73999581 C9.9145518,7.05969828 9.91528534,7.34807133 9.9670008,7.60618301 C10.0084466,7.85575031 10.1008743,8.08502469 10.2439172,8.29436216 C10.3700883,8.46845403 10.5116641,8.59412771 10.6708451,8.6713832 C10.8568009,8.77498391 11.0607286,8.82197805 11.2811614,8.81200957 C11.4605151,8.80204117 11.6442703,8.75077485 11.8324266,8.65892265 C12.1012739,8.51010791 12.3239072,8.30575467 12.4995932,8.04586291 C12.578817,7.94368629 12.6540062,7.81979268 12.7247941,7.67418209 L12.8384948,7.34273109 C12.899013,7.15867076 12.9375246,6.96179385 12.9525624,6.75281239 C12.9609982,6.42278545 12.908916,6.11411948 12.7944817,5.82610245 C12.7185589,5.63990602 12.6092594,5.47685063 12.4658498,5.33622427 C12.293098,5.16391247 12.0943052,5.05924373 11.8680039,5.02257407 C11.6508723,4.97736003 11.4267717,5.00014506 11.1957025,5.09021714 C11.0009441,5.16711662 10.8219571,5.28353389 10.6602086,5.43911293 C10.4617825,5.62673342 10.2989337,5.85529577 10.1709286,6.12479997 L10.1019746,6.27041056 L10.1019746,6.27041056 L10.1019746,6.27041056 Z M8.1719961,6.56875206 C7.94276072,6.5121455 7.71499244,6.52959028 7.48905805,6.62179846 C7.30090166,6.7022581 7.1325512,6.82864382 6.98437345,7.00095562 C6.92055432,7.07821112 6.85856907,7.16579108 6.79805093,7.26476356 L6.77200979,7.29253282 L6.66344391,7.51860305 L6.61172841,7.68913477 C6.54094052,7.92018922 6.5115984,8.15053165 6.52370203,8.37980602 C6.53250466,8.6407658 6.57981884,8.87288831 6.66637813,9.07546151 C6.76467426,9.32146862 6.90001483,9.5233298 7.07239983,9.68068888 C7.2154427,9.80493851 7.37572408,9.89429857 7.55361074,9.94948108 C7.79861751,10.0149881 8.04252396,9.99718725 8.28569684,9.89679071 C8.47532035,9.8198912 8.64623828,9.69030131 8.7980838,9.50766508 C8.88941117,9.4037084 8.97670397,9.26593014 9.05886197,9.09361837 L9.1520232,8.85259545 C9.21070748,8.66817911 9.24078317,8.49515523 9.24261702,8.3328119 C9.25985554,7.98605221 9.20300511,7.66172152 9.07206591,7.3583958 C8.97523688,7.1508384 8.84503114,6.97745855 8.68144877,6.83896828 C8.5263023,6.69691786 8.35685151,6.60791383 8.1719961,6.56875206 L8.1719961,6.56875206 L8.1719961,6.56875206 Z" id="Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+    <g id="POI-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Artboard-1" transform="translate(-174.000000, -286.000000)">
+            <g id="veterinary-m" transform="translate(174.000000, 286.000000)">
+                <ellipse id="Oval-1-Copy-41" fill-opacity="0.1" fill="#FFFFFF" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
+                <ellipse id="Oval-1-Copy-40" fill="#612C23" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+                <path d="M15.7107224,10.8833113 C15.3362436,11.1143658 15.0545591,11.406299 14.8645688,11.759467 C14.7714076,11.9534957 14.7145572,12.135064 14.6940177,12.3045276 C14.6661427,12.5152892 14.6903499,12.7192864 14.765906,12.9172314 C14.8766725,13.1646626 15.0472236,13.3430266 15.2782928,13.4519676 C15.4246367,13.525663 15.5926204,13.5758612 15.7826107,13.6029184 C16.0499908,13.6264155 16.3393776,13.5833375 16.6493038,13.4751087 C16.8576329,13.3846805 17.0542252,13.2696874 17.2390806,13.130485 C17.4855545,12.9346762 17.6711434,12.7171504 17.7954807,12.4779075 L17.8805729,12.2991875 C17.9271535,12.202707 17.9601634,12.0827297 17.978869,11.9403232 C18.0203148,11.7042845 18.0008756,11.4856906 17.919818,11.2848975 C17.817854,11.0488589 17.6575727,10.8701387 17.4382403,10.7498053 C17.3003323,10.6693457 17.1407845,10.6202154 16.9595968,10.6017026 C16.6782792,10.5682371 16.3918267,10.6034827 16.1002393,10.7070833 C15.9670994,10.7576376 15.8368936,10.8163803 15.7107224,10.8833113 L15.7107224,10.8833113 L15.7107224,10.8833113 Z M16.000476,6.82294756 C15.8192883,6.75922068 15.6399346,6.73643565 15.4620479,6.7553045 C15.2273109,6.76669702 14.9914736,6.83149195 14.7534356,6.94862125 C14.5084287,7.06575055 14.2718578,7.23414617 14.0444564,7.4534521 C13.8559332,7.64605682 13.6960185,7.86678681 13.5628787,8.11635411 C13.4986928,8.24843608 13.4550464,8.35310481 13.4308391,8.43000431 C13.3761894,8.5873634 13.3387782,8.7504188 13.3197057,8.91988245 C13.2940314,9.15592117 13.3233735,9.38839965 13.4073654,9.61767405 C13.5093293,9.88717828 13.6897833,10.0901075 13.9483609,10.2257495 C14.0947047,10.2994449 14.2557197,10.3460831 14.4295718,10.3663759 C14.6437694,10.3827527 14.8792399,10.3514232 15.1359836,10.2706076 C15.3707205,10.1869439 15.6010562,10.057354 15.8269907,9.88148197 C16.1394843,9.63867902 16.3808234,9.34852588 16.5513745,9.0103106 C16.6548055,8.82090997 16.7222924,8.62937334 16.7534684,8.43498851 C16.8070178,8.18399716 16.8128862,7.94724645 16.7714404,7.72438036 C16.7010194,7.36480408 16.5154304,7.09672396 16.2154071,6.92085199 L16.2051374,6.90589931 L16.0213823,6.82294756 L16.000476,6.82294756 L16.000476,6.82294756 L16.000476,6.82294756 Z M8.12504869,10.9940323 C7.8818758,11.0623875 7.646772,11.1528155 7.41900373,11.2653167 C7.09513998,11.4344243 6.83032727,11.6252489 6.62493237,11.8377905 C6.48702437,11.9734327 6.36011966,12.1400483 6.24458503,12.3369251 C6.15289088,12.4996245 6.08870497,12.6608998 6.05056021,12.822175 C5.94346143,13.2707554 6.00654701,13.702603 6.23945016,14.1177178 C6.38102593,14.3459241 6.57321687,14.5306964 6.81638976,14.6727468 L6.9458619,14.7407459 L7.39883101,14.9137697 C7.55764528,14.9536436 7.8239251,15.0066899 8.19840402,15.0718409 L8.94846214,15.2146034 L9.31853974,15.3328007 C9.518433,15.4232288 9.66330977,15.4951441 9.75317005,15.5485465 C9.93068991,15.6542833 10.1232477,15.7870773 10.3301097,15.9476405 C10.4819552,16.06833 10.7045886,16.2502542 10.9972763,16.4927012 C11.1769969,16.6283434 11.3200397,16.7198395 11.4271385,16.7664776 L11.46565,16.7842784 L11.4810547,16.7992311 L11.672512,16.8871671 L11.6908509,16.8871671 L11.7605385,16.9174284 L11.9850057,16.9697628 C12.1973694,17.0082125 12.4167018,17.0099926 12.6426362,16.9751031 C12.954763,16.9181404 13.2261777,16.8045713 13.4576138,16.6336836 C13.7040877,16.4428589 13.8915105,16.1932917 14.018782,15.8849817 C14.0932376,15.71445 14.1449531,15.5140129 14.1742952,15.2847386 C14.2018035,15.0152344 14.1904334,14.7514264 14.1401851,14.4936707 C14.0855354,14.1857168 13.9945748,13.8891554 13.8687704,13.6043425 C13.7602045,13.3782723 13.674012,13.1351133 13.6101928,12.8737974 C13.5478408,12.6092775 13.5005266,12.355438 13.4678835,12.1126349 L13.371788,11.4297961 C13.3252074,11.1869931 13.2679903,10.9758755 13.1983027,10.7967995 C13.0706644,10.4970339 12.8847087,10.2503147 12.6397019,10.0559299 C12.4812544,9.93702054 12.2989664,9.83057171 12.0939384,9.73693948 C11.9248544,9.6696524 11.7458673,9.62871054 11.5558771,9.61375785 C11.3365447,9.60556948 11.0915379,9.64473131 10.8208568,9.7319552 C10.638202,9.80244645 10.4599485,9.87934588 10.2857297,9.96265365 C10.1250815,10.0416893 9.89327871,10.1662949 9.58995445,10.3368266 C9.27636042,10.5109185 9.01044745,10.6465607 8.79294891,10.743753 C8.57214934,10.8555421 8.34988275,10.9384938 8.12504869,10.9940323 L8.12504869,10.9940323 L8.12504869,10.9940323 Z M10.1019746,6.27041056 C10.0484253,6.42242944 10.0025781,6.57907653 9.9644334,6.73999581 C9.9145518,7.05969828 9.91528534,7.34807133 9.9670008,7.60618301 C10.0084466,7.85575031 10.1008743,8.08502469 10.2439172,8.29436216 C10.3700883,8.46845403 10.5116641,8.59412771 10.6708451,8.6713832 C10.8568009,8.77498391 11.0607286,8.82197805 11.2811614,8.81200957 C11.4605151,8.80204117 11.6442703,8.75077485 11.8324266,8.65892265 C12.1012739,8.51010791 12.3239072,8.30575467 12.4995932,8.04586291 C12.578817,7.94368629 12.6540062,7.81979268 12.7247941,7.67418209 L12.8384948,7.34273109 C12.899013,7.15867076 12.9375246,6.96179385 12.9525624,6.75281239 C12.9609982,6.42278545 12.908916,6.11411948 12.7944817,5.82610245 C12.7185589,5.63990602 12.6092594,5.47685063 12.4658498,5.33622427 C12.293098,5.16391247 12.0943052,5.05924373 11.8680039,5.02257407 C11.6508723,4.97736003 11.4267717,5.00014506 11.1957025,5.09021714 C11.0009441,5.16711662 10.8219571,5.28353389 10.6602086,5.43911293 C10.4617825,5.62673342 10.2989337,5.85529577 10.1709286,6.12479997 L10.1019746,6.27041056 L10.1019746,6.27041056 L10.1019746,6.27041056 Z M8.1719961,6.56875206 C7.94276072,6.5121455 7.71499244,6.52959028 7.48905805,6.62179846 C7.30090166,6.7022581 7.1325512,6.82864382 6.98437345,7.00095562 C6.92055432,7.07821112 6.85856907,7.16579108 6.79805093,7.26476356 L6.77200979,7.29253282 L6.66344391,7.51860305 L6.61172841,7.68913477 C6.54094052,7.92018922 6.5115984,8.15053165 6.52370203,8.37980602 C6.53250466,8.6407658 6.57981884,8.87288831 6.66637813,9.07546151 C6.76467426,9.32146862 6.90001483,9.5233298 7.07239983,9.68068888 C7.2154427,9.80493851 7.37572408,9.89429857 7.55361074,9.94948108 C7.79861751,10.0149881 8.04252396,9.99718725 8.28569684,9.89679071 C8.47532035,9.8198912 8.64623828,9.69030131 8.7980838,9.50766508 C8.88941117,9.4037084 8.97670397,9.26593014 9.05886197,9.09361837 L9.1520232,8.85259545 C9.21070748,8.66817911 9.24078317,8.49515523 9.24261702,8.3328119 C9.25985554,7.98605221 9.20300511,7.66172152 9.07206591,7.3583958 C8.97523688,7.1508384 8.84503114,6.97745855 8.68144877,6.83896828 C8.5263023,6.69691786 8.35685151,6.60791383 8.1719961,6.56875206 L8.1719961,6.56875206 L8.1719961,6.56875206 Z" id="Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+            </g>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/veterinary-s.svg b/data/styles/clear/style-night/symbols/veterinary-s.svg
new file mode 100644
index 0000000000..bd422133f1
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/veterinary-s.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="17px" height="17px" viewBox="0 0 17 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
+    <title>veterinary-s</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="POI-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Artboard-1" transform="translate(-207.000000, -289.000000)">
+            <g id="veterinary-s" transform="translate(207.000000, 289.000000)">
+                <circle id="Oval-1-Copy-43" fill-opacity="0.1" fill="#FFFFFF" cx="8.5" cy="8.5" r="8.5"></circle>
+                <circle id="Oval-1-Copy-42" fill="#612C23" cx="8.5" cy="8.5" r="7.5"></circle>
+                <path d="M11.473815,7.92220754 C11.2241624,8.07624388 11.0363727,8.270866 10.9097126,8.50631131 C10.8476051,8.63566382 10.8097048,8.75670931 10.7960118,8.86968508 C10.7774285,9.0101928 10.7935666,9.14619097 10.8439373,9.27815428 C10.9177817,9.44310839 11.0314824,9.56201777 11.1855286,9.63464508 C11.2830911,9.68377531 11.3950803,9.71724079 11.5217404,9.73527897 C11.6999939,9.75094365 11.8929184,9.72222502 12.0995359,9.65007245 C12.2384219,9.58978702 12.3694835,9.51312491 12.4927204,9.42032337 C12.6570363,9.28978411 12.7807623,9.14476691 12.8636538,8.98527165 L12.9203819,8.86612497 C12.9514356,8.80180468 12.9734423,8.72181977 12.9859127,8.62688211 C13.0135432,8.46952302 13.0005838,8.32379371 12.9465453,8.18993165 C12.8785694,8.03257257 12.7717151,7.91342582 12.6254935,7.83320354 C12.5335548,7.77956377 12.4271896,7.74681028 12.3063979,7.7344684 C12.1188528,7.71215805 11.9278844,7.73565514 11.7334928,7.80472223 C11.6447329,7.83842508 11.5579291,7.87758685 11.473815,7.92220754 L11.473815,7.92220754 L11.473815,7.92220754 Z M11.666984,5.21529838 C11.5461922,5.17281379 11.4266231,5.15762376 11.3080319,5.170203 C11.1515406,5.17779801 10.9943157,5.22099463 10.8356237,5.29908083 C10.6722858,5.37716703 10.5145719,5.48943078 10.3629709,5.63563474 C10.2372888,5.76403788 10.130679,5.9111912 10.0419191,6.0775694 C9.99912851,6.16562406 9.97003091,6.23540321 9.95389274,6.28666954 C9.91745959,6.3915756 9.89251879,6.5002792 9.87980382,6.61325497 C9.86268759,6.77061411 9.88224902,6.92559977 9.93824359,7.07844937 C10.0062195,7.25811885 10.1265222,7.39340497 10.2989073,7.48383303 C10.3964698,7.53296325 10.5038131,7.56405537 10.6197145,7.57758394 C10.7625129,7.58850177 10.9194933,7.56761548 11.0906557,7.5137384 C11.247147,7.45796257 11.4007042,7.37156931 11.5513271,7.25432131 C11.7596562,7.09245268 11.9205489,6.89901725 12.0342496,6.6735404 C12.1032036,6.54727331 12.1481949,6.41958223 12.1689789,6.28999234 C12.2046785,6.12266478 12.2085908,5.96483096 12.1809603,5.81625358 C12.1340129,5.57653606 12.0102869,5.39781597 11.8102714,5.28056799 L11.8034249,5.27059954 L11.6809215,5.21529838 L11.666984,5.21529838 L11.666984,5.21529838 L11.666984,5.21529838 Z M6.41669913,7.99602154 C6.25458387,8.04159165 6.097848,8.10187702 5.94600248,8.17687777 C5.73009332,8.28961617 5.55355151,8.41683262 5.41662158,8.55852702 C5.32468291,8.64895514 5.24007977,8.76003217 5.16305669,8.89128342 C5.10192725,8.99974965 5.05913665,9.10726651 5.03370681,9.21478337 C4.96230762,9.51383691 5.00436467,9.80173531 5.15963344,10.0784785 C5.25401728,10.2306161 5.38214458,10.3537976 5.54425984,10.4484979 L5.6305746,10.4938306 L5.93255401,10.6091798 C6.03843019,10.6357624 6.21595007,10.6711266 6.46560268,10.7145606 L6.96564143,10.8097356 L7.21235983,10.8885338 C7.345622,10.9488192 7.44220651,10.9967627 7.50211337,11.0323643 C7.62045994,11.1028555 7.74883177,11.1913849 7.88673977,11.298427 C7.98797011,11.3788867 8.1363924,11.5001695 8.33151754,11.6618008 C8.45133125,11.7522289 8.54669314,11.8132263 8.61809234,11.8443184 L8.64376668,11.8561856 L8.65403645,11.866154 L8.78167468,11.924778 L8.79390057,11.924778 L8.84035897,11.9449523 L8.99000382,11.9798419 C9.1315796,12.005475 9.2778012,12.0066618 9.42842411,11.983402 C9.63650868,11.945427 9.81745182,11.8697142 9.97174251,11.7557891 C10.1360585,11.6285726 10.261007,11.4621944 10.3458547,11.2566545 C10.3954918,11.1429667 10.4299687,11.0093419 10.4495302,10.8564924 C10.467869,10.6768229 10.460289,10.500951 10.4267901,10.3291138 C10.3903569,10.1238112 10.3297165,9.92610359 10.2458469,9.73622834 C10.1734697,9.58551485 10.116008,9.42340885 10.0734619,9.24919828 C10.0318939,9.07285165 10.0003511,8.90362531 9.97858902,8.74175662 L9.91452537,8.28653074 C9.88347159,8.12466205 9.84532685,7.98391702 9.79886845,7.86453297 C9.71377628,7.66468925 9.58980582,7.50020977 9.42646794,7.37061994 C9.32083628,7.29134703 9.19931097,7.22038114 9.0626256,7.15795965 C8.94990291,7.1131016 8.83057822,7.08580703 8.70391805,7.07583857 C8.55769645,7.07037965 8.39435857,7.09648754 8.21390451,7.1546368 C8.09213468,7.20163097 7.97329903,7.25289725 7.85715314,7.30843577 C7.75005434,7.36112617 7.59551914,7.44419657 7.39330297,7.5578844 C7.18424028,7.67394565 7.00696497,7.76437377 6.86196594,7.82916868 C6.71476623,7.90369474 6.5665885,7.95899588 6.41669913,7.99602154 L6.41669913,7.99602154 L6.41669913,7.99602154 Z M7.73464971,4.84694037 C7.69895017,4.94828629 7.66838543,5.05271768 7.6429556,5.1599972 C7.6097012,5.37313219 7.61019023,5.56538088 7.6446672,5.73745534 C7.67229771,5.90383354 7.73391617,6.05668312 7.82927811,6.19624144 C7.91339223,6.31230268 8.00777605,6.39608514 8.11389674,6.4475888 C8.23786725,6.51665594 8.37381908,6.54798537 8.52077428,6.54133971 C8.64034342,6.53469411 8.76284685,6.50051657 8.8882844,6.43928177 C9.06751594,6.34007194 9.21593817,6.20383645 9.33306217,6.03057527 C9.385878,5.96245752 9.43600417,5.87986179 9.48319605,5.78278806 L9.55899657,5.56182072 C9.59934199,5.43911384 9.62501639,5.30786256 9.63504159,5.16854159 C9.64066548,4.94852363 9.60594399,4.74274632 9.52965445,4.55073497 C9.47903925,4.42660401 9.40617297,4.31790042 9.31056657,4.22414951 C9.19539868,4.10927498 9.06287011,4.03949582 8.91200262,4.01504938 C8.76724817,3.98490669 8.61784782,4.00009671 8.46380165,4.06014476 C8.33396274,4.11141108 8.21463805,4.18902259 8.10680571,4.29274195 C7.97452165,4.41782228 7.86595577,4.57019718 7.78061908,4.74986665 L7.73464971,4.84694037 L7.73464971,4.84694037 L7.73464971,4.84694037 Z M6.4479974,5.04583471 C6.29517382,5.008097 6.1433283,5.01972686 5.99270537,5.08119897 C5.86726777,5.13483873 5.75503413,5.21909588 5.65624896,5.33397041 C5.61370288,5.38547408 5.57237938,5.44386072 5.53203395,5.50984237 L5.51467319,5.52835521 L5.44229594,5.6790687 L5.40781894,5.79275651 C5.36062702,5.94679282 5.3410656,6.10035443 5.34913468,6.25320402 C5.35500311,6.4271772 5.3865459,6.58192554 5.44425208,6.71697434 C5.50978284,6.88097908 5.60000988,7.0155532 5.71493322,7.12045925 C5.81029514,7.20329234 5.91714939,7.26286571 6.0357405,7.29965405 C6.19907834,7.34332537 6.36168264,7.33145817 6.5237979,7.26452714 C6.65021357,7.2132608 6.76415885,7.12686754 6.8653892,7.00511005 C6.92627411,6.9358056 6.98446931,6.84395343 7.03924131,6.72907891 L7.1013488,6.56839697 C7.14047165,6.44545274 7.16052211,6.33010348 7.16174468,6.2218746 C7.17323703,5.99070147 7.13533674,5.77448102 7.04804394,5.57226387 C6.98349125,5.43389227 6.89668743,5.3183057 6.78763251,5.22597886 C6.68420153,5.13127857 6.57123434,5.07194255 6.4479974,5.04583471 L6.4479974,5.04583471 L6.4479974,5.04583471 Z" id="Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/wayside_shrine-l.svg b/data/styles/clear/style-night/symbols/wayside_shrine-l.svg
index 3cb1fed9a2..33e2e99f25 100644
--- a/data/styles/clear/style-night/symbols/wayside_shrine-l.svg
+++ b/data/styles/clear/style-night/symbols/wayside_shrine-l.svg
@@ -1,14 +1,16 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <svg width="27px" height="27px" viewBox="0 0 27 27" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
     <title>wayside_shrine-l</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
-    <g id="POI-NIght" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="wayside_shrine-l">
-            <path d="M13.5,27 C6.057,27 0,20.943 0,13.5 C0,6.057 6.057,0 13.5,0 C20.943,0 27,6.057 27,13.5 C27,20.943 20.943,27 13.5,27 L13.5,27 Z" id="Shape" fill-opacity="0.1" fill="#FFFFFF"></path>
-            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#26160D"></path>
-            <path d="M13.546,4.086 L5.338,11.8590886 L6.752,13.1983292 L13.546,6.76448113 L20.338,13.1983292 L21.752,11.8590886 L13.546,4.086 L13.546,4.086 Z M8,14.6692207 L8,22 L11,22 L11,16.776583 C11,15.4771218 12.112,14.4229671 13.484,14.4229671 L13.514,14.4229671 C14.887,14.4229671 15.999,15.4771218 15.999,16.776583 L15.999,22 L18.999,22 L18.999,14.5839791 L13.545,9.41738976 L8,14.6692207 L8,14.6692207 Z" id="Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+    <g id="POI-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Artboard-1" transform="translate(-317.000000, -1248.000000)">
+            <g id="wayside_shrine-l" transform="translate(317.000000, 1248.000000)">
+                <path d="M13.5,27 C6.057,27 0,20.943 0,13.5 C0,6.057 6.057,0 13.5,0 C20.943,0 27,6.057 27,13.5 C27,20.943 20.943,27 13.5,27 L13.5,27 Z" id="Shape" fill-opacity="0.1" fill="#FFFFFF"></path>
+                <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#26160D"></path>
+                <path d="M13.546,4.086 L5.338,11.8590886 L6.752,13.1983292 L13.546,6.76448113 L20.338,13.1983292 L21.752,11.8590886 L13.546,4.086 L13.546,4.086 Z M8,14.6692207 L8,22 L11,22 L11,16.776583 C11,15.4771218 12.112,14.4229671 13.484,14.4229671 L13.514,14.4229671 C14.887,14.4229671 15.999,15.4771218 15.999,16.776583 L15.999,22 L18.999,22 L18.999,14.5839791 L13.545,9.41738976 L8,14.6692207 L8,14.6692207 Z" id="Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+            </g>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/wayside_shrine-m.svg b/data/styles/clear/style-night/symbols/wayside_shrine-m.svg
index 194270a6b7..7fe281c07c 100644
--- a/data/styles/clear/style-night/symbols/wayside_shrine-m.svg
+++ b/data/styles/clear/style-night/symbols/wayside_shrine-m.svg
@@ -1,14 +1,16 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <svg width="23px" height="23px" viewBox="0 0 23 23" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
     <title>wayside_shrine-m</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
-    <g id="POI-NIght" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="wayside_shrine-m">
-            <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" fill-opacity="0.1" fill="#FFFFFF"></path>
-            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#26160D"></path>
-            <path d="M11.545,4 L4.979,10.565 L6.111,11.696 L11.546,6.262 L16.98,11.696 L18.112,10.565 L11.545,4 L11.545,4 Z M16,12.735 L16,19 L14,19 L14,15.5 C14,14.119 12.881,13 11.5,13 C10.119,13 9,14.119 9,15.5 L9,19 L7,19 L7,12.807 L11.537,8.371 L16,12.735 L16,12.735 Z" id="Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+    <g id="POI-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Artboard-1" transform="translate(-354.000000, -1250.000000)">
+            <g id="wayside_shrine-m" transform="translate(354.000000, 1250.000000)">
+                <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" fill-opacity="0.1" fill="#FFFFFF"></path>
+                <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#26160D"></path>
+                <path d="M11.545,4 L4.979,10.565 L6.111,11.696 L11.546,6.262 L16.98,11.696 L18.112,10.565 L11.545,4 L11.545,4 Z M16,12.735 L16,19 L14,19 L14,15.5 C14,14.119 12.881,13 11.5,13 C10.119,13 9,14.119 9,15.5 L9,19 L7,19 L7,12.807 L11.537,8.371 L16,12.735 L16,12.735 Z" id="Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+            </g>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/wayside_shrine-s.svg b/data/styles/clear/style-night/symbols/wayside_shrine-s.svg
new file mode 100644
index 0000000000..63a33ab9e3
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/wayside_shrine-s.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="17px" height="17px" viewBox="0 0 17 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
+    <title>wayside_shrine-s</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="POI-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Artboard-1" transform="translate(-387.000000, -1253.000000)">
+            <g id="wayside_shrine-s" transform="translate(387.000000, 1253.000000)">
+                <path d="M8.5,17 C3.812,17 0,13.188 0,8.5 C0,3.812 3.812,0 8.5,0 C13.188,0 17,3.812 17,8.5 C17,13.188 13.188,17 8.5,17 L8.5,17 Z" id="Shape" fill-opacity="0.1" fill="#FFFFFF"></path>
+                <ellipse id="Oval" fill="#26160D" cx="8.5" cy="8.5" rx="7.5" ry="7.5"></ellipse>
+                <path d="M9.104,4 L5,8.104 L5.707,8.811 L9.103,5.415 L12.499,8.811 L13.206,8.104 L9.104,4 L9.104,4 Z M10.241,12.97 L11.604,12.97 L11.604,9.41 L9.125,6.931 L6.604,9.451 L6.604,12.97 L7.967,12.97 L10.241,12.97 L10.241,12.97 Z" id="Shape" fill-opacity="0.7" fill="#FFFFFF"></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file