diff --git a/data/styles/clear/style-clear/symbols/apartment-l.svg b/data/styles/clear/style-clear/symbols/apartment-l.svg
new file mode 100644
index 0000000000..81aa18e44e
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/apartment-l.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="27px" height="27px" viewBox="0 0 27 27" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 3.7.2 (28276) - http://www.bohemiancoding.com/sketch -->
+    <title>apartment-l</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="apartment-l">
+            <g id="Shape-+-Shape-+-Shape">
+                <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.6" 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="#5D4037"></path>
+                <path d="M6,6 L21,6 L21,7 L6,7 L6,6 Z M7,7 L20,7 L20,21 L7,21 L7,7 Z M12,18 L15,18 L15,21 L12,21 L12,18 Z M12.5,15 L14.5,15 L14.5,17 L12.5,17 L12.5,15 Z M12.5,12 L14.5,12 L14.5,14 L12.5,14 L12.5,12 Z M12.5,9 L14.5,9 L14.5,11 L12.5,11 L12.5,9 Z M16,9 L18,9 L18,11 L16,11 L16,9 Z M16,12 L18,12 L18,14 L16,14 L16,12 Z M16,15 L18,15 L18,17 L16,17 L16,15 Z M9,15 L11,15 L11,17 L9,17 L9,15 Z M9,12 L11,12 L11,14 L9,14 L9,12 Z M9,9 L11,9 L11,11 L9,11 L9,9 Z" id="Combined-Shape" fill="#FFFFFF"></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/apartment-m.svg b/data/styles/clear/style-clear/symbols/apartment-m.svg
new file mode 100644
index 0000000000..b888721a97
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/apartment-m.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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.7.2 (28276) - http://www.bohemiancoding.com/sketch -->
+    <title>apartment-m</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="apartment-m">
+            <g id="Shape-+-Shape-+-Shape">
+                <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.6" 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="#5D4037"></path>
+                <path d="M5,5 L18,5 L18,6 L5,6 L5,5 Z M6,6 L17,6 L17,18 L6,18 L6,6 Z M10,15 L13,15 L13,18 L10,18 L10,15 Z M7,12 L9,12 L9,14 L7,14 L7,12 Z M7,9 L9,9 L9,11 L7,11 L7,9 Z M7,6 L9,6 L9,8 L7,8 L7,6 Z M10.5,12 L12.5,12 L12.5,14 L10.5,14 L10.5,12 Z M10.5,9 L12.5,9 L12.5,11 L10.5,11 L10.5,9 Z M10.5,6 L12.5,6 L12.5,8 L10.5,8 L10.5,6 Z M14,12 L16,12 L16,14 L14,14 L14,12 Z M14,9 L16,9 L16,11 L14,11 L14,9 Z M14,6 L16,6 L16,8 L14,8 L14,6 Z" id="Combined-Shape" fill="#FFFFFF"></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/apartment-s.svg b/data/styles/clear/style-clear/symbols/apartment-s.svg
new file mode 100644
index 0000000000..7defb7ce3d
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/apartment-s.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="17px" height="17px" viewBox="0 0 17 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 3.7.2 (28276) - http://www.bohemiancoding.com/sketch -->
+    <title>apartment-s</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="apartment-s">
+            <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.6" fill="#FFFFFF"></path>
+            <ellipse id="Oval" fill="#5D4037" cx="8.5" cy="8.5" rx="7.5" ry="7.5"></ellipse>
+        </g>
+        <path d="M12,5 L13,5 L13,4 L4,4 L4,5 L5,5 L5,13 L12,13 L12,5 Z M8,9 L9,9 L9,10 L8,10 L8,9 Z M8,7 L9,7 L9,8 L8,8 L8,7 Z M8,5 L9,5 L9,6 L8,6 L8,5 Z M10,9 L11,9 L11,10 L10,10 L10,9 Z M10,7 L11,7 L11,8 L10,8 L10,7 Z M10,5 L11,5 L11,6 L10,6 L10,5 Z M6,9 L7,9 L7,10 L6,10 L6,9 Z M8,11 L9,11 L9,13 L8,13 L8,11 Z M6,7 L7,7 L7,8 L6,8 L6,7 Z M6,5 L7,5 L7,6 L6,6 L6,5 Z" id="Combined-Shape" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/atm-l.svg b/data/styles/clear/style-clear/symbols/atm-l.svg
index 8ed10e7ee3..1996d48374 100644
--- a/data/styles/clear/style-clear/symbols/atm-l.svg
+++ b/data/styles/clear/style-clear/symbols/atm-l.svg
@@ -4,13 +4,13 @@
     <title>atm-l</title>
     <desc>Created with Sketch.</desc>
     <defs>
-        <path d="M6,9 C5.446,9 5,9.446 5,10 L5,19 C5,19.554 5.446,20 6,20 L21,20 C21.554,20 22,19.554 22,19 L22,10 C22,9.446 21.554,9 21,9 L6,9 Z M5.5,11 L21,11 L21,13 L5.5,13 L5.5,11 Z M6,16 L9,16 L9,18 L6,18 L6,16 Z M14,17 L21,17 L21,18 L14,18 L14,17 Z" id="path-1"></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="path-1"></path>
     </defs>
     <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="atm-l">
             <circle id="Oval-1-Copy-39" fill-opacity="0.6" fill="#FFFFFF" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#717065" cx="13.5" cy="13.5" r="12.5"></circle>
-            <g id="rect10401-copy" fill="#FFFFFF">
+            <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="#717065"></path>
+            <g id="Combined-Shape" fill="#FFFFFF">
                 <use xlink:href="#path-1"></use>
                 <use xlink:href="#path-1"></use>
             </g>
diff --git a/data/styles/clear/style-clear/symbols/bank-l.svg b/data/styles/clear/style-clear/symbols/bank-l.svg
index 5c3e94c496..7612b17c83 100644
--- a/data/styles/clear/style-clear/symbols/bank-l.svg
+++ b/data/styles/clear/style-clear/symbols/bank-l.svg
@@ -9,7 +9,7 @@
     <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="bank-l">
             <circle id="Oval-1-Copy-39" fill-opacity="0.6" fill="#FFFFFF" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#717065" cx="13.5" cy="13.5" r="12.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="#717065"></path>
             <g id="Imported-Layers-Copy-3" fill="#FFFFFF">
                 <use xlink:href="#path-1"></use>
                 <use xlink:href="#path-1"></use>
diff --git a/data/styles/clear/style-clear/symbols/car-wash-l.svg b/data/styles/clear/style-clear/symbols/car-wash-l.svg
index 8e8cda9ab7..cd88470b55 100644
--- a/data/styles/clear/style-clear/symbols/car-wash-l.svg
+++ b/data/styles/clear/style-clear/symbols/car-wash-l.svg
@@ -1,22 +1,37 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="27px" height="28px" viewBox="0 0 27 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.6.1 (26313) - http://www.bohemiancoding.com/sketch -->
+<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.7.2 (28276) - http://www.bohemiancoding.com/sketch -->
     <title>car-wash-l</title>
     <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="car-repair-l" transform="translate(0.000000, 0.019000)">
-            <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="#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="#717065"></path>
-                <path d="M13.4999878,7 C12.9464895,7 12.2999878,6.6 12.2999878,5.6 C12.2999878,4.9 13.2428449,3.4 13.4999878,3 C13.7571306,3.4 14.6999877,4.9 14.6999877,5.6 C14.6999877,6.6 14.053486,7 13.4999878,7 L13.4999878,7 Z" id="path4133-5-copy" fill="#FFFFFF"></path>
-                <path d="M17.4999878,7 C16.9464895,7 16.2999878,6.6 16.2999878,5.6 C16.2999878,4.9 17.2428449,3.4 17.4999878,3 C17.7571306,3.4 18.6999877,4.9 18.6999877,5.6 C18.6999877,6.6 18.053486,7 17.4999878,7 L17.4999878,7 Z" id="path4133-5-copy" fill="#FFFFFF"></path>
-                <path d="M9.49998776,7 C8.94648949,7 8.29998779,6.6 8.29998779,5.6 C8.29998779,4.9 9.24284491,3.4 9.49998776,3 C9.75713061,3.4 10.6999877,4.9 10.6999877,5.6 C10.6999877,6.6 10.053486,7 9.49998776,7 L9.49998776,7 Z" id="path4133-5-copy" fill="#FFFFFF"></path>
-                <path d="M13.4999878,7 C12.9464895,7 12.2999878,6.6 12.2999878,5.6 C12.2999878,4.9 13.2428449,3.4 13.4999878,3 C13.7571306,3.4 14.6999877,4.9 14.6999877,5.6 C14.6999877,6.6 14.053486,7 13.4999878,7 L13.4999878,7 Z" id="path4133-5-copy" fill="#FFFFFF"></path>
-            </g>
-            <g id="Layer_1" transform="translate(6.000000, 9.000000)" fill="#FFFFFF">
-                <path d="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>
+    <defs>
+        <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="path-1"></path>
+    </defs>
+    <g id="POI-Clear" 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.6" 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="#717065"></path>
+                            <g id="noun_79131_cc" transform="translate(6.000000, 4.000000)" fill="#FFFFFF">
+                                <g id="Group">
+                                    <g id="Shape">
+                                        <g id="Combined-Shape">
+                                            <use xlink:href="#path-1"></use>
+                                            <use xlink:href="#path-1"></use>
+                                        </g>
+                                    </g>
+                                </g>
+                            </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="#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="#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="#FFFFFF"></path>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/car-wash-m.svg b/data/styles/clear/style-clear/symbols/car-wash-m.svg
index 2a6cb36724..136973671a 100644
--- a/data/styles/clear/style-clear/symbols/car-wash-m.svg
+++ b/data/styles/clear/style-clear/symbols/car-wash-m.svg
@@ -1,21 +1,22 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="23px" height="24px" viewBox="0 0 23 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.6.1 (26313) - http://www.bohemiancoding.com/sketch -->
+<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.7.2 (28276) - http://www.bohemiancoding.com/sketch -->
     <title>car-wash-m</title>
     <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="car-repair-m" transform="translate(0.000000, 0.019000)">
-            <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="#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="#717065"></path>
-                <path d="M11.4999756,7 C11.0848519,7 10.5999756,6.7 10.5999756,5.95 C10.5999756,5.425 11.3071184,4.3 11.4999756,4 C11.6928327,4.3 12.3999755,5.425 12.3999755,5.95 C12.3999755,6.7 11.9150993,7 11.4999756,7 L11.4999756,7 Z" id="path4133-5-copy" fill="#FFFFFF"></path>
-                <path d="M8.39999998,7 C7.98487627,7 7.5,6.7 7.5,5.95 C7.5,5.425 8.20714284,4.3 8.39999998,4 C8.59285711,4.3 9.29999995,5.425 9.29999995,5.95 C9.29999995,6.7 8.81512368,7 8.39999998,7 L8.39999998,7 Z" id="path4133-5-copy" fill="#FFFFFF"></path>
-                <path d="M14.6000122,7 C14.1848885,7 13.7000122,6.7 13.7000122,5.95 C13.7000122,5.425 14.407155,4.3 14.6000122,4 C14.7928693,4.3 15.5000122,5.425 15.5000122,5.95 C15.5000122,6.7 15.0151359,7 14.6000122,7 L14.6000122,7 Z" id="path4133-5-copy" fill="#FFFFFF"></path>
-            </g>
-            <g id="Layer_1" transform="translate(6.000000, 9.000000)" fill="#FFFFFF">
-                <path d="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>
+    <defs>
+        <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="path-1"></path>
+    </defs>
+    <g id="POI-Clear" 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.6" 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="#717065"></path>
+            <g id="Combined-Shape" fill="#FFFFFF">
+                <use xlink:href="#path-1"></use>
+                <use xlink:href="#path-1"></use>
             </g>
+            <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="#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="#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="#FFFFFF"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/car-wash-s.svg b/data/styles/clear/style-clear/symbols/car-wash-s.svg
new file mode 100644
index 0000000000..034aee5d22
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/car-wash-s.svg
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="17px" height="17px" viewBox="0 0 17 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 3.7.2 (28276) - http://www.bohemiancoding.com/sketch -->
+    <title>car-wash-s</title>
+    <desc>Created with Sketch.</desc>
+    <defs>
+        <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="path-1"></path>
+    </defs>
+    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="car-wash-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.6" fill="#FFFFFF"></path>
+            <ellipse id="Oval" fill="#717065" cx="8.5" cy="8.5" rx="7.5" ry="7.5"></ellipse>
+            <g id="Combined-Shape" fill="#FFFFFF">
+                <use xlink:href="#path-1"></use>
+                <use xlink:href="#path-1"></use>
+            </g>
+        </g>
+        <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="#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="#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="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/hostel-l.svg b/data/styles/clear/style-clear/symbols/hostel-l.svg
new file mode 100644
index 0000000000..ba06a95ac5
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/hostel-l.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="27px" height="27px" viewBox="0 0 27 27" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 3.7.2 (28276) - http://www.bohemiancoding.com/sketch -->
+    <title>hostel-l</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="hostel-l">
+            <ellipse id="Oval-1-Copy-39" fill-opacity="0.6" fill="#FFFFFF" cx="13.5" cy="13.5" rx="13.5" ry="13.5"></ellipse>
+            <ellipse id="Oval-1-Copy-38" fill="#5D4037" cx="13.5" cy="13.5" rx="12.5" ry="12.5"></ellipse>
+            <g id="Group-11" transform="translate(5.000000, 6.000000)" fill="#FFFFFF">
+                <path d="M16,2 L16,4 L1,4 L1,0 L0,0 L0,15 L1,15 L1,14 L16,14 L16,15 L17,15 L17,2 L16,2 Z M1,6 L16,6 L16,12 L1,12 L1,6 Z M3.5,11 C4.32842712,11 5,10.3284271 5,9.5 C5,8.67157288 4.32842712,8 3.5,8 C2.67157288,8 2,8.67157288 2,9.5 C2,10.3284271 2.67157288,11 3.5,11 Z M3.5,3 C4.32842712,3 5,2.32842712 5,1.5 C5,0.671572875 4.32842712,0 3.5,0 C2.67157288,0 2,0.671572875 2,1.5 C2,2.32842712 2.67157288,3 3.5,3 Z M6,0.998956561 C6,0.447248087 6.4463114,0.0495901555 6.99754465,0.110838294 L14.0024554,0.889161706 C14.553384,0.950376005 15,1.44386482 15,2 L15,3 L6,3 L6,0.998956561 Z M6,8.99895656 C6,8.44724809 6.4463114,8.04959016 6.99754465,8.11083829 L14.0024554,8.88916171 C14.553384,8.95037601 15,9.44386482 15,10 L15,11 L6,11 L6,8.99895656 Z" id="Combined-Shape"></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/hostel-m.svg b/data/styles/clear/style-clear/symbols/hostel-m.svg
new file mode 100644
index 0000000000..fe5efa49f4
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/hostel-m.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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.7.2 (28276) - http://www.bohemiancoding.com/sketch -->
+    <title>hostel-m</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="hostel-m">
+            <ellipse id="Oval-1-Copy-41" fill-opacity="0.6" fill="#FFFFFF" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
+            <ellipse id="Oval-1-Copy-40" fill="#5D4037" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+            <path d="M17,7 L17,9 L6,9 L6,5 L5,5 L5,18 L6,18 L6,17 L11.5,17 L17,17 L17,18 L18,18 L18,7 L17,7 Z M6,11 L17,11 L17,15 L6,15 L6,11 Z M8,14 C8.55228475,14 9,13.5522847 9,13 C9,12.4477153 8.55228475,12 8,12 C7.44771525,12 7,12.4477153 7,13 C7,13.5522847 7.44771525,14 8,14 Z M10,13 C10,12.4477153 10.4509752,12.0501084 10.990778,12.1100864 L15.009222,12.5565802 C15.5564136,12.6173793 16,13.1180725 16,13.6635437 L16,14 L10,14 L10,13 Z M8,8 C8.55228475,8 9,7.55228475 9,7 C9,6.44771525 8.55228475,6 8,6 C7.44771525,6 7,6.44771525 7,7 C7,7.55228475 7.44771525,8 8,8 Z M10,7 C10,6.44771525 10.4509752,6.05010835 10.990778,6.11008644 L15.009222,6.55658023 C15.5564136,6.61737929 16,7.11807251 16,7.6635437 L16,8 L10,8 L10,7 Z" id="Combined-Shape" fill="#FFFFFF"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/hostel-s.svg b/data/styles/clear/style-clear/symbols/hostel-s.svg
new file mode 100644
index 0000000000..322e9f65aa
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/hostel-s.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="17px" height="17px" viewBox="0 0 17 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 3.7.2 (28276) - http://www.bohemiancoding.com/sketch -->
+    <title>hostel-s</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="hostel-s">
+            <circle id="Oval-1-Copy-43" fill-opacity="0.6" fill="#FFFFFF" cx="8.5" cy="8.5" r="8.5"></circle>
+            <path d="M8.5,16 C12.6421356,16 16,12.6421356 16,8.5 C16,4.35786438 12.6421356,1 8.5,1 C4.35786438,1 1,4.35786438 1,8.5 C1,12.6421356 4.35786438,16 8.5,16 Z" id="Oval-1-Copy-42" fill="#5D4037"></path>
+            <path d="M12,5 L12,6 L5,6 L5,4 L4,4 L4,13 L5,13 L5,12 L10.5,12 L12,12 L12,13 L13,13 L13,5 L12,5 Z M5,7 L12,7 L12,11 L5,11 L5,7 Z M6.75,10 C7.16421356,10 7.5,9.66421356 7.5,9.25 C7.5,8.83578644 7.16421356,8.5 6.75,8.5 C6.33578644,8.5 6,8.83578644 6,9.25 C6,9.66421356 6.33578644,10 6.75,10 Z M8,9.17412429 C8,8.75883947 8.32105255,8.47846923 8.74157321,8.55219189 L10.2584268,8.81811577 C10.6679864,8.88991682 11,9.2809435 11,9.69009146 L11,10 L8,10 L8,9.17412429 Z M6.75,5 C7.16421356,5 7.5,4.66421356 7.5,4.25 C7.5,3.83578644 7.16421356,3.5 6.75,3.5 C6.33578644,3.5 6,3.83578644 6,4.25 C6,4.66421356 6.33578644,5 6.75,5 Z M8,4.17412429 C8,3.75883947 8.32105255,3.47846923 8.74157321,3.55219189 L10.2584268,3.81811577 C10.6679864,3.88991682 11,4.2809435 11,4.69009146 L11,5 L8,5 L8,4.17412429 Z" id="Combined-Shape" fill="#FFFFFF"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/lawyer-l.svg b/data/styles/clear/style-clear/symbols/lawyer-l.svg
index 8c0ddae511..088e679ad5 100644
--- a/data/styles/clear/style-clear/symbols/lawyer-l.svg
+++ b/data/styles/clear/style-clear/symbols/lawyer-l.svg
@@ -3,12 +3,23 @@
     <!-- Generator: Sketch 3.7.2 (28276) - http://www.bohemiancoding.com/sketch -->
     <title>lawyer-l</title>
     <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="bank-l">
-            <circle id="Oval-1-Copy-39" fill="#FFFFFF" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#717065" cx="13.5" cy="13.5" r="12.5"></circle>
-            <path d="M14.1875,7 L14.3280677,9.24908282 C14.7330157,9.51768404 15,9.97766326 15,10.5 C15,10.9550733 14.7973497,11.3628151 14.4773691,11.6379054 L14.9452462,19.1239394 C17.2950457,19.5603925 18,21 18,21 L9,21 C9,21 9.72877307,19.5780376 12.0542436,19.1321017 L12.5226309,11.6379054 C12.2026503,11.3628151 12,10.9550733 12,10.5 C12,9.97766326 12.2669843,9.51768404 12.6719323,9.24908282 L12.8125,7 L6.49907684,7 C6.22344431,7 6,6.76806641 6,6.5 C6,6.22385763 6.2236826,6 6.49907684,6 L12.875,6 L12.9689754,4.4963932 C12.9861098,4.22224281 13.2319336,4 13.5,4 C13.7761424,4 14.0141363,4.22618103 14.0310246,4.4963932 L14.125,6 L20.5009232,6 C20.7765557,6 21,6.23193359 21,6.5 C21,6.77614237 20.7763174,7 20.5009232,7 L14.1875,7 Z M19.75,7 L19.5,7 L19,7 L16,16 L17,16 L19,10 L19,16 L20,16 L20,10 L22,16 L23,16 L20,7 L19.75,7 Z M7.75,7 L7.5,7 L7,7 L4,16 L5,16 L7,10 L7,16 L8,16 L8,10 L10,16 L11,16 L8,7 L7.75,7 Z M11,16 C11,16 11,18 7.58349609,18 C4.16699219,18 4,16 4,16 L11,16 Z M23,16 C23,16 23,18 19.5834961,18 C16.1669922,18 16,16 16,16 L23,16 Z" id="Combined-Shape" fill="#FFFFFF"></path>
+    <defs>
+        <path d="M14.1875,7 L14.3280677,9.24908282 C14.7330157,9.51768404 15,9.97766326 15,10.5 C15,10.9550733 14.7973497,11.3628151 14.4773691,11.6379054 L14.9452462,19.1239394 C17.2950457,19.5603925 18,21 18,21 L9,21 C9,21 9.72877307,19.5780376 12.0542436,19.1321017 L12.5226309,11.6379054 C12.2026503,11.3628151 12,10.9550733 12,10.5 C12,9.97766326 12.2669843,9.51768404 12.6719323,9.24908282 L12.8125,7 L6.49907684,7 C6.22344431,7 6,6.76806641 6,6.5 C6,6.22385763 6.2236826,6 6.49907684,6 L12.875,6 L12.9689754,4.4963932 C12.9861098,4.22224281 13.2319336,4 13.5,4 C13.7761424,4 14.0141363,4.22618103 14.0310246,4.4963932 L14.125,6 L20.5009232,6 C20.7765557,6 21,6.23193359 21,6.5 C21,6.77614237 20.7763174,7 20.5009232,7 L14.1875,7 L14.1875,7 Z M19.75,7 L19.5,7 L19,7 L16,16 L17,16 L19,10 L19,16 L20,16 L20,10 L22,16 L23,16 L20,7 L19.75,7 L19.75,7 Z M7.75,7 L7.5,7 L7,7 L4,16 L5,16 L7,10 L7,16 L8,16 L8,10 L10,16 L11,16 L8,7 L7.75,7 L7.75,7 Z M11,16 C11,16 11,18 7.58349609,18 C4.16699219,18 4,16 4,16 L11,16 L11,16 Z M23,16 C23,16 23,18 19.5834961,18 C16.1669922,18 16,16 16,16 L23,16 L23,16 Z" id="path-1"></path>
+    </defs>
+    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="lawyer-l">
+            <g id="POI">
+                <g>
+                    <g id="bank-l">
+                        <circle id="Oval-1-Copy-39" fill-opacity="0.6" fill="#FFFFFF" cx="13.5" cy="13.5" r="13.5"></circle>
+                        <circle id="Oval-1-Copy-38" fill="#717065" cx="13.5" cy="13.5" r="12.5"></circle>
+                        <g id="Combined-Shape" fill="#FFFFFF">
+                            <use xlink:href="#path-1"></use>
+                            <use xlink:href="#path-1"></use>
+                        </g>
+                    </g>
+                </g>
+            </g>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/military-l.svg b/data/styles/clear/style-clear/symbols/military-l.svg
index e37a391fc1..fc851da30a 100644
--- a/data/styles/clear/style-clear/symbols/military-l.svg
+++ b/data/styles/clear/style-clear/symbols/military-l.svg
@@ -10,6 +10,7 @@
         <g id="military-l">
             <circle id="Oval-1-Copy-39" fill-opacity="0.6" fill="#FFFFFF" cx="13.5" cy="13.5" r="13.5"></circle>
             <circle id="Oval-1-Copy-38" fill="#717065" cx="13.5" cy="13.5" r="12.5"></circle>
+            <circle id="Oval-1-Copy-38" fill="#717065" cx="13.5" cy="13.5" r="12.5"></circle>
             <g id="Shape" fill="#FFFFFF">
                 <use xlink:href="#path-1"></use>
                 <use xlink:href="#path-1"></use>
diff --git a/data/styles/clear/style-clear/symbols/military-m.svg b/data/styles/clear/style-clear/symbols/military-m.svg
index b01c732f33..3f93577618 100644
--- a/data/styles/clear/style-clear/symbols/military-m.svg
+++ b/data/styles/clear/style-clear/symbols/military-m.svg
@@ -5,6 +5,7 @@
     <desc>Created with Sketch.</desc>
     <defs>
         <path d="M14.5688918,10.122 L17.4065,10.122 C18.6245,10.122 19.6125,11.511375 19.6125,13.227 L17.9542398,13.227 C17.9841874,13.337818 18,13.4531213 18,13.5715 C18,14.4277969 17.0678353,15.4963591 16.0480196,15.4963591 L6.45869491,15.4963591 C5.43887921,15.4963591 4.6115,14.4277969 4.6115,13.5715 C4.6115,13.4531123 4.6272847,13.3378103 4.65718096,13.227 L3.6115,13.227 C3.6115,11.511375 4.5995,10.122 5.8185,10.122 L6.6115,10.122 L6.6115,6.019 L13.2945,6.019 L13.9157,8.019 L20.0532028,8.019 L20.0532028,9.00950677 L14.2233514,9.00950677 L14.5688918,10.122 Z" id="path-1"></path>
+        <path d="M14.5688918,10.122 L17.4065,10.122 C18.6245,10.122 19.6125,11.511375 19.6125,13.227 L17.9542398,13.227 C17.9841874,13.337818 18,13.4531213 18,13.5715 C18,14.4277969 17.0678353,15.4963591 16.0480196,15.4963591 L6.45869491,15.4963591 C5.43887921,15.4963591 4.6115,14.4277969 4.6115,13.5715 C4.6115,13.4531123 4.6272847,13.3378103 4.65718096,13.227 L3.6115,13.227 C3.6115,11.511375 4.5995,10.122 5.8185,10.122 L6.6115,10.122 L6.6115,6.019 L13.2945,6.019 L13.9157,8.019 L20.0532028,8.019 L20.0532028,9.00950677 L14.2233514,9.00950677 L14.5688918,10.122 Z" id="path-2"></path>
     </defs>
     <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="military-m">
@@ -15,5 +16,13 @@
                 <use xlink:href="#path-1"></use>
             </g>
         </g>
+        <g id="military-m">
+            <ellipse id="Oval-1-Copy-41" fill-opacity="0.6" fill="#FFFFFF" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
+            <ellipse id="Oval-1-Copy-40" fill="#717065" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+            <g id="Shape" fill="#FFFFFF">
+                <use xlink:href="#path-2"></use>
+                <use xlink:href="#path-2"></use>
+            </g>
+        </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/motel-l.svg b/data/styles/clear/style-clear/symbols/motel-l.svg
index a8ab1e4e64..21f8941f96 100644
--- a/data/styles/clear/style-clear/symbols/motel-l.svg
+++ b/data/styles/clear/style-clear/symbols/motel-l.svg
@@ -8,7 +8,7 @@
         <g id="motel-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.6" 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="#5D4037"></path>
-            <path d="M7,14 L22,14 L22,19 L20,19 L20,16 L7,16 L7,19 L5,19 L5,14 L7,14 L7,14 L7,14 Z M7,13 C8.104,13 9,12.104 9,11 C9,9.896 8.104,9 7,9 C5.896,9 5,9.896 5,11 C5,12.104 5.896,13 7,13 L7,13 Z M21.02,10.804 L10.981,9.197 C10.44,9.089 10.001,9.448 10.001,10.001 L10.001,13.001 L22.001,13.001 L22.001,12.001 C22,11.447 21.561,10.912 21.02,10.804 L21.02,10.804 Z" id="Shape" fill="#FFFFFF"></path>
+            <path d="M22,14 L22,19 L21,19 L21,16 L6,16 L6,19 L5,19 L5,14 L7,14 L22,14 Z M7,13 C8.104,13 9,12.104 9,11 C9,9.896 8.104,9 7,9 C5.896,9 5,9.896 5,11 C5,12.104 5.896,13 7,13 L7,13 Z M21.02,10.804 L10.981,9.197 C10.44,9.089 10.001,9.448 10.001,10.001 L10.001,13.001 L22.001,13.001 L22.001,12.001 C22,11.447 21.561,10.912 21.02,10.804 L21.02,10.804 Z" id="Shape" fill="#FFFFFF"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/motel-m.svg b/data/styles/clear/style-clear/symbols/motel-m.svg
index d2f3b14bf8..e4887dc270 100644
--- a/data/styles/clear/style-clear/symbols/motel-m.svg
+++ b/data/styles/clear/style-clear/symbols/motel-m.svg
@@ -8,7 +8,7 @@
         <g id="motel-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.6" 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="#5D4037"></path>
-            <path d="M7,12 L18,12 L18,16 L16,16 L16,14 L7,14 L7,16 L5,16 L5,12 L7,12 L7,12 L7,12 Z M6.5,11 C7.328,11 8,10.328 8,9.5 C8,8.672 7.328,8 6.5,8 C5.672,8 5,8.672 5,9.5 C5,10.328 5.672,11 6.5,11 L6.5,11 Z M17.02,8.804 L9.981,8.197 C9.44,8.089 9.001,8.448 9.001,9.001 L9.001,11.001 L18.001,11.001 L18.001,10.001 C18,9.447 17.561,8.912 17.02,8.804 L17.02,8.804 Z" id="Shape" fill="#FFFFFF"></path>
+            <path d="M18,12 L18,16 L17,16 L17,14 L6,14 L6,16 L5,16 L5,12 L7,12 L18,12 Z M6.5,11 C7.328,11 8,10.328 8,9.5 C8,8.672 7.328,8 6.5,8 C5.672,8 5,8.672 5,9.5 C5,10.328 5.672,11 6.5,11 L6.5,11 Z M17.02,8.804 L9.981,8.197 C9.44,8.089 9.001,8.448 9.001,9.001 L9.001,11.001 L18.001,11.001 L18.001,10.001 C18,9.447 17.561,8.912 17.02,8.804 L17.02,8.804 Z" id="Shape" fill="#FFFFFF"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/public-building-l.svg b/data/styles/clear/style-clear/symbols/public-building-l.svg
new file mode 100644
index 0000000000..f953249530
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/public-building-l.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="27px" height="27px" viewBox="0 0 27 27" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 3.7.2 (28276) - http://www.bohemiancoding.com/sketch -->
+    <title>public-building-l</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="public-building-l">
+            <circle id="Oval-1-Copy-39" fill-opacity="0.6" fill="#FFFFFF" cx="13.5" cy="13.5" r="13.5"></circle>
+            <circle id="Oval-1-Copy-38" fill="#717065" cx="13.5" cy="13.5" r="12.5"></circle>
+            <path d="M18,14 L16.3333333,14 L16.3333333,18 L18,18 L18,14 Z M20,14 L21,14 L21,12 L6,12 L6,14 L7,14 L7,18 L6,18 L6,20 L21,20 L21,18 L20,18 L20,14 Z M14.3333333,14 L12.6666667,14 L12.6666667,18 L14.3333333,18 L14.3333333,14 Z M10.6666667,14 L9,14 L9,18 L10.6666667,18 L10.6666667,14 Z M14,8.26666667 L21,12 L6,12 L13,8.26666667 L13,4 L14,4 L14,8.26666667 Z M13.5,12 C14.0522847,12 14.5,11.5522847 14.5,11 C14.5,10.4477153 14.0522847,10 13.5,10 C12.9477153,10 12.5,10.4477153 12.5,11 C12.5,11.5522847 12.9477153,12 13.5,12 Z M14,5 L16,4.5 L18,5 L18,7 L16,6.5 L14,7 L14,5 Z" id="Combined-Shape" fill="#FFFFFF"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/public-building-m.svg b/data/styles/clear/style-clear/symbols/public-building-m.svg
new file mode 100644
index 0000000000..046668a5bd
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/public-building-m.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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.7.2 (28276) - http://www.bohemiancoding.com/sketch -->
+    <title>public-building-m</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="public-building-m">
+            <ellipse id="Oval-1-Copy-41" fill-opacity="0.6" fill="#FFFFFF" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
+            <ellipse id="Oval-1-Copy-40" fill="#717065" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+            <path d="M12,6.30769231 L18,10 L5,10 L11,6.30769231 L11,3 L12,3 L12,6.30769231 Z M5,10 L18,10 L18,11 L5,11 L5,10 Z M6,11 L7.5,11 L7.5,16 L6,16 L6,11 Z M5,16 L18,16 L18,17 L5,17 L5,16 Z M12,3.5 L14,3 L16,3.5 L16,5.5 L14,5 L12,5.5 L12,3.5 Z M9,11 L10.5,11 L10.5,16 L9,16 L9,11 Z M12.5,11 L14,11 L14,16 L12.5,16 L12.5,11 Z M15.5,11 L17,11 L17,16 L15.5,16 L15.5,11 Z M11.5,9 C11.7761424,9 12,8.77614237 12,8.5 C12,8.22385763 11.7761424,8 11.5,8 C11.2238576,8 11,8.22385763 11,8.5 C11,8.77614237 11.2238576,9 11.5,9 Z" id="Combined-Shape" fill="#FFFFFF"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/public-building-s.svg b/data/styles/clear/style-clear/symbols/public-building-s.svg
new file mode 100644
index 0000000000..c788c376f5
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/public-building-s.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="17px" height="17px" viewBox="0 0 17 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 3.7.2 (28276) - http://www.bohemiancoding.com/sketch -->
+    <title>public-building-s</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="public-building-s">
+            <circle id="Oval-1-Copy-43" fill-opacity="0.6" fill="#FFFFFF" cx="8.5" cy="8.5" r="8.5"></circle>
+            <circle id="Oval-1-Copy-42" fill="#717065" cx="8.5" cy="8.5" r="7.5"></circle>
+            <path d="M9,5.22222222 L13,7 L4,7 L8,5.22222222 L8,3 L9,3 L9,5.22222222 Z M9,3 L11,3 L11,4 L9,4 L9,3 Z M4,12 L13,12 L13,13 L4,13 L4,12 Z M4,7 L13,7 L13,8 L4,8 L4,7 Z M5,8 L6,8 L6,12 L5,12 L5,8 Z M7,8 L8,8 L8,12 L7,12 L7,8 Z M9,8 L10,8 L10,12 L9,12 L9,8 Z M11,8 L12,8 L12,12 L11,12 L11,8 Z" id="Combined-Shape" fill="#FFFFFF"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/seafood-shop-l.svg b/data/styles/clear/style-clear/symbols/seafood-shop-l.svg
index 6496561226..7464b10e1f 100644
--- a/data/styles/clear/style-clear/symbols/seafood-shop-l.svg
+++ b/data/styles/clear/style-clear/symbols/seafood-shop-l.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg width="27px" height="27px" viewBox="0 0 27 27" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 3.7.2 (28276) - http://www.bohemiancoding.com/sketch -->
-    <title>seefood-shop-l</title>
+    <title>seafood-shop-l</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
diff --git a/data/styles/clear/style-clear/symbols/seafood-shop-m.svg b/data/styles/clear/style-clear/symbols/seafood-shop-m.svg
index 0d532c76b5..f4137a2711 100644
--- a/data/styles/clear/style-clear/symbols/seafood-shop-m.svg
+++ b/data/styles/clear/style-clear/symbols/seafood-shop-m.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <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.7.2 (28276) - http://www.bohemiancoding.com/sketch -->
-    <title>seefood-shop-m</title>
+    <title>seafood-shop-m</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">