diff --git a/iphone/Maps/Images.xcassets/Interface/Search/Categories/atm.imageset/Contents.json b/iphone/Maps/Images.xcassets/Interface/Search/Categories/atm.imageset/Contents.json
index 9a429dfc7..96e830d92 100644
--- a/iphone/Maps/Images.xcassets/Interface/Search/Categories/atm.imageset/Contents.json
+++ b/iphone/Maps/Images.xcassets/Interface/Search/Categories/atm.imageset/Contents.json
@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "atm_light.svg",
+      "filename" : "atm_dark.svg",
       "idiom" : "universal"
     },
     {
@@ -11,7 +11,7 @@
           "value" : "dark"
         }
       ],
-      "filename" : "atm_dark.svg",
+      "filename" : "atm_light.svg",
       "idiom" : "universal"
     }
   ],
diff --git a/iphone/Maps/Images.xcassets/Interface/Search/Categories/atm.imageset/atm_dark.svg b/iphone/Maps/Images.xcassets/Interface/Search/Categories/atm.imageset/atm_dark.svg
index 9bec72424..8e4b6d369 100644
--- a/iphone/Maps/Images.xcassets/Interface/Search/Categories/atm.imageset/atm_dark.svg
+++ b/iphone/Maps/Images.xcassets/Interface/Search/Categories/atm.imageset/atm_dark.svg
@@ -1 +1,7 @@
-<svg height="28" viewBox="0 0 28 28" width="28" xmlns="http://www.w3.org/2000/svg"><g fill="none" opacity=".898664"><circle cx="14" cy="14" fill="#717065" fill-rule="evenodd" r="14"/><path d="m20 8c.82725 0 1.5.67275 1.5 1.5v9c0 .82725-.67275 1.5-1.5 1.5h-13.5c.67275 0 0-.67275 0-1.5v-9c0-.82725.67275-1.5 0-1.5zm.00075 6h-12.00075v4.5h12.0015zm-6.00075 1.5v1.5h-4.5v-1.5zm6-6h-12v1.5h12z" fill="#000"/></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="28px" height="28px" viewBox="0 0 28 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>atm_dark</title>
+    <g id="atm_dark" stroke="none" fill="none" fill-rule="evenodd">
+        <path d="M14,0 C21.7319865,0 28,6.2680135 28,14 C28,21.7319865 21.7319865,28 14,28 C6.2680135,28 0,21.7319865 0,14 C0,6.2680135 6.2680135,0 14,0 Z M20,8 L8,8 C7.17275,8 6.5,8.67275 6.5,9.5 L6.5,18.5 C6.5,19.32725 7.17275,20 8,20 L20,20 C20.82725,20 21.5,19.32725 21.5,18.5 L21.5,9.5 C21.5,8.67275 20.82725,8 20,8 Z M20.00075,14 L20.0015,18.5 L8,18.5 L8,14 L20.00075,14 Z M14,15.5 L9.5,15.5 L9.5,17 L14,17 L14,15.5 Z M20,9.5 L20,11 L8,11 L8,9.5 L20,9.5 Z" id="Shape" fill="#717065"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Interface/Search/Categories/atm.imageset/atm_light.svg b/iphone/Maps/Images.xcassets/Interface/Search/Categories/atm.imageset/atm_light.svg
index 5baf4e506..569119d8f 100644
--- a/iphone/Maps/Images.xcassets/Interface/Search/Categories/atm.imageset/atm_light.svg
+++ b/iphone/Maps/Images.xcassets/Interface/Search/Categories/atm.imageset/atm_light.svg
@@ -1 +1,7 @@
-<svg height="28" viewBox="0 0 28 28" width="28" xmlns="http://www.w3.org/2000/svg"><g fill="none" opacity=".898664"><circle cx="14" cy="14" fill="#747e86" fill-rule="evenodd" r="14"/><path d="m20 8c.82725 0 1.5.67275 1.5 1.5v9c0 .82725-.67275 1.5-1.5 1.5h-12c-.82725 0-1.5-.67275-1.5-1.5v-9c0-.82725.67275-1.5 1.5-1.5zm.00075 6h-12.00075v4.5h12.0015zm-6.00075 1.5v1.5h-4.5v-1.5zm6-6h-12v1.5h12z" fill="#fff"/></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="28px" height="28px" viewBox="0 0 28 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>atm_light</title>
+    <g id="atm_light" stroke="none" fill="none" fill-rule="evenodd">
+        <path d="M14,0 C21.7319865,0 28,6.2680135 28,14 C28,21.7319865 21.7319865,28 14,28 C6.2680135,28 0,21.7319865 0,14 C0,6.2680135 6.2680135,0 14,0 Z M20,8 L8,8 C7.17275,8 6.5,8.67275 6.5,9.5 L6.5,18.5 C6.5,19.32725 7.17275,20 8,20 L20,20 C20.82725,20 21.5,19.32725 21.5,18.5 L21.5,9.5 C21.5,8.67275 20.82725,8 20,8 Z M20.00075,14 L20.0015,18.5 L8,18.5 L8,14 L20.00075,14 Z M14,15.5 L9.5,15.5 L9.5,17 L14,17 L14,15.5 Z M20,9.5 L20,11 L8,11 L8,9.5 L20,9.5 Z" id="Shape" fill="#747E86"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Interface/Search/Categories/bank.imageset/bank_dark.svg b/iphone/Maps/Images.xcassets/Interface/Search/Categories/bank.imageset/bank_dark.svg
index 03c74cc38..04c350256 100644
--- a/iphone/Maps/Images.xcassets/Interface/Search/Categories/bank.imageset/bank_dark.svg
+++ b/iphone/Maps/Images.xcassets/Interface/Search/Categories/bank.imageset/bank_dark.svg
@@ -1 +1,7 @@
-<svg height="28" viewBox="0 0 28 28" width="28" xmlns="http://www.w3.org/2000/svg"><g fill="none" opacity=".898664"><circle cx="14" cy="14" fill="#717065" fill-rule="evenodd" r="14"/><path d="m7 9.53073333 7-3.23073333 7 3.23073333v1.07692667h-1.0769267v8.07695h1.0769267v1.6153667h-14v-1.6153667h1.07692667v-8.07695h-1.07692667zm9.6923167 5.74489997c0-1.19035-1.2108834-2.1548333-2.69465-2.1548333-.4929867 0-.8998267-.3214983-.8998267-.7195417 0-.3980433.4020567-.7195416.8998267-.7195416.4977816 0 .8998266.325325.8998266.7195416h1.7949167c0-.93387-.75145-1.72235-1.7949167-2.0209v-.84967163h-1.7949166v.84967163c-1.04342.2985384-1.7949167 1.0869717-1.7949167 2.0209 0 1.19035 1.2108833 2.1548334 2.69465 2.1548334.4977817 0 .8998267.3214983.8998267.7195416 0 .3980434-.4020567.7195417-.8998267.7195417-.4977817 0-.8998267-.325325-.8998267-.7195417h-1.7949166c0 .93387.75145 1.72235 1.7949166 2.0209v.8496717h1.7949167v-.8496717c1.04342-.2985383 1.7949167-1.0869716 1.7949167-2.0209z" fill="#000"/></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="28px" height="28px" viewBox="0 0 28 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>bank_dark</title>
+    <g id="bank_dark" stroke="none" fill="none" fill-rule="evenodd">
+        <path d="M14,0 C21.7319865,0 28,6.2680135 28,14 C28,21.7319865 21.7319865,28 14,28 C6.2680135,28 0,21.7319865 0,14 C0,6.2680135 6.2680135,0 14,0 Z M14,6.3 L7,9.53073333 L7,10.60766 L8.07692667,10.60766 L8.07692667,18.68461 L7,18.68461 L7,20.2999767 L21,20.2999767 L21,18.68461 L19.9230733,18.68461 L19.9230733,10.60766 L21,10.60766 L21,9.53073333 L14,6.3 Z M14.8974933,9.53068667 L14.8974933,10.3803583 C15.94096,10.6789083 16.69241,11.4673883 16.69241,12.4012583 L14.8974933,12.4012583 C14.8974933,12.0070417 14.4954483,11.6817167 13.9976667,11.6817167 C13.4998967,11.6817167 13.09784,12.003215 13.09784,12.4012583 C13.09784,12.7993017 13.50468,13.1208 13.9976667,13.1208 C15.4814333,13.1208 16.6923167,14.0852833 16.6923167,15.2756333 C16.6923167,16.2095617 15.94082,16.997995 14.8974,17.2965333 L14.8974,18.146205 L13.1024833,18.146205 L13.1024833,17.2965333 C12.0590167,16.9979833 11.3075667,16.2095033 11.3075667,15.2756333 L13.1024833,15.2756333 C13.1024833,15.66985 13.5045283,15.995175 14.00231,15.995175 C14.50008,15.995175 14.9021367,15.6736767 14.9021367,15.2756333 C14.9021367,14.87759 14.5000917,14.5560917 14.00231,14.5560917 C12.5185433,14.5560917 11.30766,13.5916083 11.30766,12.4012583 C11.30766,11.46733 12.0591567,10.6788967 13.1025767,10.3803583 L13.1025767,9.53068667 L14.8974933,9.53068667 Z" id="Shape" fill="#717065"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Interface/Search/Categories/bank.imageset/bank_light.svg b/iphone/Maps/Images.xcassets/Interface/Search/Categories/bank.imageset/bank_light.svg
index 2a57beda7..35e69d47a 100644
--- a/iphone/Maps/Images.xcassets/Interface/Search/Categories/bank.imageset/bank_light.svg
+++ b/iphone/Maps/Images.xcassets/Interface/Search/Categories/bank.imageset/bank_light.svg
@@ -1 +1,7 @@
-<svg height="28" viewBox="0 0 28 28" width="28" xmlns="http://www.w3.org/2000/svg"><g fill="none" opacity=".898664"><circle cx="14" cy="14" fill="#747e86" fill-rule="evenodd" r="14"/><path d="m7 9.53073333 7-3.23073333 7 3.23073333v1.07692667h-1.0769267v8.07695h1.0769267v1.6153667h-14v-1.6153667h1.07692667v-8.07695h-1.07692667zm9.6923167 5.74489997c0-1.19035-1.2108834-2.1548333-2.69465-2.1548333-.4929867 0-.8998267-.3214983-.8998267-.7195417 0-.3980433.4020567-.7195416.8998267-.7195416.4977816 0 .8998266.325325.8998266.7195416h1.7949167c0-.93387-.75145-1.72235-1.7949167-2.0209v-.84967163h-1.7949166v.84967163c-1.04342.2985384-1.7949167 1.0869717-1.7949167 2.0209 0 1.19035 1.2108833 2.1548334 2.69465 2.1548334.4977817 0 .8998267.3214983.8998267.7195416 0 .3980434-.4020567.7195417-.8998267.7195417-.4977817 0-.8998267-.325325-.8998267-.7195417h-1.7949166c0 .93387.75145 1.72235 1.7949166 2.0209v.8496717h1.7949167v-.8496717c1.04342-.2985383 1.7949167-1.0869716 1.7949167-2.0209z" fill="#fff"/></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="28px" height="28px" viewBox="0 0 28 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>bank_light</title>
+    <g id="bank_light" stroke="none" fill="none" fill-rule="evenodd">
+        <path d="M14,0 C21.7319865,0 28,6.2680135 28,14 C28,21.7319865 21.7319865,28 14,28 C6.2680135,28 0,21.7319865 0,14 C0,6.2680135 6.2680135,0 14,0 Z M14,6.3 L7,9.53073333 L7,10.60766 L8.07692667,10.60766 L8.07692667,18.68461 L7,18.68461 L7,20.2999767 L21,20.2999767 L21,18.68461 L19.9230733,18.68461 L19.9230733,10.60766 L21,10.60766 L21,9.53073333 L14,6.3 Z M14.8974933,9.53068667 L14.8974933,10.3803583 C15.94096,10.6789083 16.69241,11.4673883 16.69241,12.4012583 L14.8974933,12.4012583 C14.8974933,12.0070417 14.4954483,11.6817167 13.9976667,11.6817167 C13.4998967,11.6817167 13.09784,12.003215 13.09784,12.4012583 C13.09784,12.7993017 13.50468,13.1208 13.9976667,13.1208 C15.4814333,13.1208 16.6923167,14.0852833 16.6923167,15.2756333 C16.6923167,16.2095617 15.94082,16.997995 14.8974,17.2965333 L14.8974,18.146205 L13.1024833,18.146205 L13.1024833,17.2965333 C12.0590167,16.9979833 11.3075667,16.2095033 11.3075667,15.2756333 L13.1024833,15.2756333 C13.1024833,15.66985 13.5045283,15.995175 14.00231,15.995175 C14.50008,15.995175 14.9021367,15.6736767 14.9021367,15.2756333 C14.9021367,14.87759 14.5000917,14.5560917 14.00231,14.5560917 C12.5185433,14.5560917 11.30766,13.5916083 11.30766,12.4012583 C11.30766,11.46733 12.0591567,10.6788967 13.1025767,10.3803583 L13.1025767,9.53068667 L14.8974933,9.53068667 Z" id="Shape" fill="#747E86"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Interface/Search/Categories/children.imageset/children_dark.svg b/iphone/Maps/Images.xcassets/Interface/Search/Categories/children.imageset/children_dark.svg
index c16b0748f..a5a3f702d 100644
--- a/iphone/Maps/Images.xcassets/Interface/Search/Categories/children.imageset/children_dark.svg
+++ b/iphone/Maps/Images.xcassets/Interface/Search/Categories/children.imageset/children_dark.svg
@@ -1 +1,7 @@
-<svg height="28" viewBox="0 0 28 28" width="28" xmlns="http://www.w3.org/2000/svg"><g fill="none" opacity=".898664"><circle cx="14" cy="14" fill="#7f5933" fill-rule="evenodd" r="14"/><path d="m10.7398398 14.5988166c.5368141 0 1.0342998.1680621 1.4425266.4544446-.4098863.4382013-.6588082 1.0243313-.6588082 1.67081l.0057448.1651714.0198026.1813349c.0521553.3587035.1789128.6926717.3676742.9850304l.0378701.0548615-.0403932.0235806c-.7725089.4606743-1.2766068 1.3040164-1.2766068 2.2547064l-.0006499.6842436h-4.685l.00032411-3.9650829c0-1.3857515 1.10866142-2.5091005 2.51211163-2.5091005zm3.9965404 4.1659189c.8980027 0 1.6259699.7266137 1.6259699 1.6240209l-.0003501.6842436h-4.725l.0006499-.6842436c0-.8969307.7175836-1.6240209 1.6259699-1.6240209zm4.7552267-6.3579012c1.3876447 0 2.5125409 1.1228048 2.5125409 2.5095293l-.0001478 6.1566364h-4.642l.0003501-.6842436-.0056469-.169323-.0181866-.1760574c-.1111202-.8134553-.58583-1.5086973-1.2600453-1.9104975l-.0368214-.0204091.0390275-.0549577c.2556506-.3916257.3957644-.8504536.3957644-1.3334405 0-1.0986687-.7189708-2.0230653-1.7154784-2.3401921.2397128-1.1301419 1.2361598-1.9770448 2.4548506-1.9770448zm-5.4916069 2.8596351c.8194057 0 1.4764418.6486555 1.4764418 1.4576018 0 .8089896-.6569928 1.4576019-1.4764418 1.4576019-.8194057 0-1.4764418-.6486556-1.4764418-1.4576019 0-.8089896.6570361-1.4576018 1.4764418-1.4576018zm-4.39786225-6.07244831c1.26597575 0 2.28109175 1.00216811 2.28109175 2.25198421 0 1.249883-1.015049 2.2519842-2.28109175 2.2519842-1.26597578 0-2.2810917-1.0021681-2.2810917-2.2519842 0-1.249883 1.01511592-2.25198421 2.2810917-2.25198421zm8.75157275-2.19290588c1.2661921 0 2.2814815 1.00233935 2.2814815 2.25236901 0 1.25009658-1.0152225 2.25236898-2.2814815 2.25236898-1.2661921 0-2.2814815-1.0023393-2.2814815-2.25236898 0-1.25009659 1.0152894-2.25236901 2.2814815-2.25236901z" fill="#000"/></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="28px" height="28px" viewBox="0 0 28 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>children_dark</title>
+    <g id="children_dark" stroke="none" fill="none" fill-rule="evenodd">
+        <path d="M14,0 C21.7319865,0 28,6.2680135 28,14 C28,21.7319865 21.7319865,28 14,28 C6.2680135,28 0,21.7319865 0,14 C0,6.2680135 6.2680135,0 14,0 Z M19.4916069,12.4068343 L17.215814,12.4068343 C15.9971232,12.4068343 15.0006762,13.2537372 14.7609634,14.3838791 C15.757471,14.7010059 16.4764418,15.6254025 16.4764418,16.7240712 C16.4764418,17.2070581 16.336328,17.665886 16.0806774,18.0575117 L16.0416499,18.1124694 L16.0784713,18.1328785 C16.7526866,18.5346787 17.2273964,19.2299207 17.3385166,20.043376 L17.3567032,20.2194334 L17.3623501,20.3887564 L17.362,21.073 L22.004,21.073 L22.0041478,14.9163636 C22.0041478,13.5296391 20.8792516,12.4068343 19.4916069,12.4068343 Z M10.7398398,14.5988166 L8.46443574,14.5988166 C7.06098553,14.5988166 5.95232411,15.7221656 5.95232411,17.1079171 L5.952,21.073 L10.637,21.073 L10.6376499,20.3887564 C10.6376499,19.4380664 11.1417478,18.5947243 11.9142567,18.13405 L11.9546499,18.1104694 L11.9167798,18.0556079 C11.7280184,17.7632492 11.6012609,17.429281 11.5491056,17.0705775 L11.529303,16.8892426 L11.5235582,16.7240712 C11.5235582,16.0775925 11.7724801,15.4914625 12.1823664,15.0532612 C11.7741396,14.7668787 11.2766539,14.5988166 10.7398398,14.5988166 Z M14.7363802,18.7647355 L13.2636198,18.7647355 C12.3552335,18.7647355 11.6376499,19.4918257 11.6376499,20.3887564 L11.637,21.073 L16.362,21.073 L16.3623501,20.3887564 C16.3623501,19.4913492 15.6343829,18.7647355 14.7363802,18.7647355 Z M14,15.2664694 C13.1805943,15.2664694 12.5235582,15.9150816 12.5235582,16.7240712 C12.5235582,17.5330175 13.1805943,18.1816731 14,18.1816731 C14.819449,18.1816731 15.4764418,17.5330608 15.4764418,16.7240712 C15.4764418,15.9151249 14.8194057,15.2664694 14,15.2664694 Z M9.60213775,9.19402109 C8.33616197,9.19402109 7.32104605,10.1961223 7.32104605,11.4460053 C7.32104605,12.6958214 8.33616197,13.6979895 9.60213775,13.6979895 C10.8681805,13.6979895 11.8832295,12.6958883 11.8832295,11.4460053 C11.8832295,10.1961892 10.8681135,9.19402109 9.60213775,9.19402109 Z M18.3537105,7.00111521 C17.0875184,7.00111521 16.072229,8.00338763 16.072229,9.25348422 C16.072229,10.5035139 17.0875184,11.5058532 18.3537105,11.5058532 C19.6199695,11.5058532 20.635192,10.5035808 20.635192,9.25348422 C20.635192,8.00345456 19.6199026,7.00111521 18.3537105,7.00111521 Z" id="Shape" fill="#7F5933"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Interface/Search/Categories/children.imageset/children_light.svg b/iphone/Maps/Images.xcassets/Interface/Search/Categories/children.imageset/children_light.svg
index 586395c8a..a71a3e8a5 100644
--- a/iphone/Maps/Images.xcassets/Interface/Search/Categories/children.imageset/children_light.svg
+++ b/iphone/Maps/Images.xcassets/Interface/Search/Categories/children.imageset/children_light.svg
@@ -1 +1,7 @@
-<svg height="28" viewBox="0 0 28 28" width="28" xmlns="http://www.w3.org/2000/svg"><g fill="none" opacity=".898664"><circle cx="14" cy="14" fill="#9c6136" fill-rule="evenodd" r="14"/><path d="m10.7398398 14.5988166c.5368141 0 1.0342998.1680621 1.4425266.4544446-.4098863.4382013-.6588082 1.0243313-.6588082 1.67081l.0057448.1651714.0198026.1813349c.0521553.3587035.1789128.6926717.3676742.9850304l.0378701.0548615-.0403932.0235806c-.7725089.4606743-1.2766068 1.3040164-1.2766068 2.2547064l-.0006499.6842436h-4.685l.00032411-3.9650829c0-1.3857515 1.10866142-2.5091005 2.51211163-2.5091005zm3.9965404 4.1659189c.8980027 0 1.6259699.7266137 1.6259699 1.6240209l-.0003501.6842436h-4.725l.0006499-.6842436c0-.8969307.7175836-1.6240209 1.6259699-1.6240209zm4.7552267-6.3579012c1.3876447 0 2.5125409 1.1228048 2.5125409 2.5095293l-.0001478 6.1566364h-4.642l.0003501-.6842436-.0056469-.169323-.0181866-.1760574c-.1111202-.8134553-.58583-1.5086973-1.2600453-1.9104975l-.0368214-.0204091.0390275-.0549577c.2556506-.3916257.3957644-.8504536.3957644-1.3334405 0-1.0986687-.7189708-2.0230653-1.7154784-2.3401921.2397128-1.1301419 1.2361598-1.9770448 2.4548506-1.9770448zm-5.4916069 2.8596351c.8194057 0 1.4764418.6486555 1.4764418 1.4576018 0 .8089896-.6569928 1.4576019-1.4764418 1.4576019-.8194057 0-1.4764418-.6486556-1.4764418-1.4576019 0-.8089896.6570361-1.4576018 1.4764418-1.4576018zm-4.39786225-6.07244831c1.26597575 0 2.28109175 1.00216811 2.28109175 2.25198421 0 1.249883-1.015049 2.2519842-2.28109175 2.2519842-1.26597578 0-2.2810917-1.0021681-2.2810917-2.2519842 0-1.249883 1.01511592-2.25198421 2.2810917-2.25198421zm8.75157275-2.19290588c1.2661921 0 2.2814815 1.00233935 2.2814815 2.25236901 0 1.25009658-1.0152225 2.25236898-2.2814815 2.25236898-1.2661921 0-2.2814815-1.0023393-2.2814815-2.25236898 0-1.25009659 1.0152894-2.25236901 2.2814815-2.25236901z" fill="#fff"/></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="28px" height="28px" viewBox="0 0 28 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>children_light</title>
+    <g id="children_light" stroke="none" fill="none" fill-rule="evenodd">
+        <path d="M14,0 C21.7319865,0 28,6.2680135 28,14 C28,21.7319865 21.7319865,28 14,28 C6.2680135,28 0,21.7319865 0,14 C0,6.2680135 6.2680135,0 14,0 Z M19.4916069,12.4068343 L17.215814,12.4068343 C15.9971232,12.4068343 15.0006762,13.2537372 14.7609634,14.3838791 C15.757471,14.7010059 16.4764418,15.6254025 16.4764418,16.7240712 C16.4764418,17.2070581 16.336328,17.665886 16.0806774,18.0575117 L16.0416499,18.1124694 L16.0784713,18.1328785 C16.7526866,18.5346787 17.2273964,19.2299207 17.3385166,20.043376 L17.3567032,20.2194334 L17.3623501,20.3887564 L17.362,21.073 L22.004,21.073 L22.0041478,14.9163636 C22.0041478,13.5296391 20.8792516,12.4068343 19.4916069,12.4068343 Z M10.7398398,14.5988166 L8.46443574,14.5988166 C7.06098553,14.5988166 5.95232411,15.7221656 5.95232411,17.1079171 L5.952,21.073 L10.637,21.073 L10.6376499,20.3887564 C10.6376499,19.4380664 11.1417478,18.5947243 11.9142567,18.13405 L11.9546499,18.1104694 L11.9167798,18.0556079 C11.7280184,17.7632492 11.6012609,17.429281 11.5491056,17.0705775 L11.529303,16.8892426 L11.5235582,16.7240712 C11.5235582,16.0775925 11.7724801,15.4914625 12.1823664,15.0532612 C11.7741396,14.7668787 11.2766539,14.5988166 10.7398398,14.5988166 Z M14.7363802,18.7647355 L13.2636198,18.7647355 C12.3552335,18.7647355 11.6376499,19.4918257 11.6376499,20.3887564 L11.637,21.073 L16.362,21.073 L16.3623501,20.3887564 C16.3623501,19.4913492 15.6343829,18.7647355 14.7363802,18.7647355 Z M14,15.2664694 C13.1805943,15.2664694 12.5235582,15.9150816 12.5235582,16.7240712 C12.5235582,17.5330175 13.1805943,18.1816731 14,18.1816731 C14.819449,18.1816731 15.4764418,17.5330608 15.4764418,16.7240712 C15.4764418,15.9151249 14.8194057,15.2664694 14,15.2664694 Z M9.60213775,9.19402109 C8.33616197,9.19402109 7.32104605,10.1961223 7.32104605,11.4460053 C7.32104605,12.6958214 8.33616197,13.6979895 9.60213775,13.6979895 C10.8681805,13.6979895 11.8832295,12.6958883 11.8832295,11.4460053 C11.8832295,10.1961892 10.8681135,9.19402109 9.60213775,9.19402109 Z M18.3537105,7.00111521 C17.0875184,7.00111521 16.072229,8.00338763 16.072229,9.25348422 C16.072229,10.5035139 17.0875184,11.5058532 18.3537105,11.5058532 C19.6199695,11.5058532 20.635192,10.5035808 20.635192,9.25348422 C20.635192,8.00345456 19.6199026,7.00111521 18.3537105,7.00111521 Z" id="Shape" fill="#9C6136"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Interface/Search/Categories/eat.imageset/eat_dark.svg b/iphone/Maps/Images.xcassets/Interface/Search/Categories/eat.imageset/eat_dark.svg
index 54be97722..c057afe9d 100644
--- a/iphone/Maps/Images.xcassets/Interface/Search/Categories/eat.imageset/eat_dark.svg
+++ b/iphone/Maps/Images.xcassets/Interface/Search/Categories/eat.imageset/eat_dark.svg
@@ -1 +1,7 @@
-<svg height="28" viewBox="0 0 28 28" width="28" xmlns="http://www.w3.org/2000/svg"><g fill="none" opacity=".898664"><circle cx="14" cy="14" fill="#bb9342" fill-rule="evenodd" r="14"/><path d="m12.5416667 11.1416783v-3.43909997c0-.38802166-.3092717-.70257833-.694995-.70257833h-.0683375c-.3838334 0-.694995.32498667-.694995.70257833v3.43909997h-1.45833337v-3.43909997c0-.38802166-.30927166-.70257833-.694995-.70257833h-.0683375c-.38383333 0-.694995.32498667-.694995.70257833v3.43909997c0 1.6076667 1.45833334 2.8583334 2.84374997 2.8583334l-.189245 6.0559333c-.0162936.5213833.3836584.944055.895755.944055h.1911584c.511 0 .9078883-.41692.88592-.944055l-.2523267-6.0559333c1.4583333 0 3.2083333-1.2506667 2.9166667-2.8583334v-3.43909997c0-.38802166-.3092717-.70257833-.694995-.70257833h-.0683375c-.3838334 0-.694995.32498667-.694995.70257833v3.43909997h-1.4583334zm3.7916666 3.7916667h1.75v5.1975c0 .4800483.3883834.8692017.875.8692017.483245 0 .875-.3890484.875-.8757584v-13.1238333c-2.443 0-3.5583333 1.69866667-3.5 3.0333333v4.9z" fill="#000"/></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="28px" height="28px" viewBox="0 0 28 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>eat_dark</title>
+    <g id="eat_dark" stroke="none" fill="none" fill-rule="evenodd">
+        <path d="M14,0 C21.7319865,0 28,6.2680135 28,14 C28,21.7319865 21.7319865,28 14,28 C6.2680135,28 0,21.7319865 0,14 C0,6.2680135 6.2680135,0 14,0 Z M19.8333333,7.000455 C17.3903333,7.000455 16.275,8.69912167 16.3333333,10.0337883 L16.3333333,14.9337883 L18.0833333,14.933345 L18.0833333,20.130845 C18.0833333,20.6108933 18.4717167,21.0000467 18.9583333,21.0000467 C19.4415783,21.0000467 19.8333333,20.6109983 19.8333333,20.1242883 L19.8333333,7.000455 Z M8.93001083,7 L8.86167333,7 C8.47784,7 8.16667833,7.32498667 8.16667833,7.70257833 L8.16667833,11.1416783 C8.16667833,12.749345 9.62501167,14.0000117 11.0104283,14.0000117 L10.8211833,20.055945 C10.8048897,20.5773283 11.2048417,21 11.7169383,21 L11.9080967,21 C12.4190967,21 12.815985,20.58308 12.7940167,20.055945 L12.54169,14.0000117 C14.0000233,14.0000117 15.7500233,12.749345 15.4583567,11.1416783 L15.4583567,7.70257833 C15.4583567,7.31455667 15.149085,7 14.7633617,7 L14.6950242,7 C14.3111908,7 14.0000292,7.32498667 14.0000292,7.70257833 L14.0000292,11.1416783 L12.5416958,11.1416783 L12.5416667,7.70257833 C12.5416667,7.31455667 12.232395,7 11.8466717,7 L11.7783342,7 C11.3945008,7 11.0833392,7.32498667 11.0833392,7.70257833 L11.0833392,11.1416783 L9.62500583,11.1416783 L9.62500583,7.70257833 C9.62500583,7.31455667 9.31573417,7 8.93001083,7 Z" id="Shape" fill="#BB9342"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Interface/Search/Categories/eat.imageset/eat_light.svg b/iphone/Maps/Images.xcassets/Interface/Search/Categories/eat.imageset/eat_light.svg
index 1b3bc2618..da2140d11 100644
--- a/iphone/Maps/Images.xcassets/Interface/Search/Categories/eat.imageset/eat_light.svg
+++ b/iphone/Maps/Images.xcassets/Interface/Search/Categories/eat.imageset/eat_light.svg
@@ -1 +1,7 @@
-<svg height="28" viewBox="0 0 28 28" width="28" xmlns="http://www.w3.org/2000/svg"><g fill="none" opacity=".898664"><circle cx="14" cy="14" fill="#ec955e" fill-rule="evenodd" r="14"/><path d="m12.5416667 11.1416783v-3.43909997c0-.38802166-.3092717-.70257833-.694995-.70257833h-.0683375c-.3838334 0-.694995.32498667-.694995.70257833v3.43909997h-1.45833337v-3.43909997c0-.38802166-.30927166-.70257833-.694995-.70257833h-.0683375c-.38383333 0-.694995.32498667-.694995.70257833v3.43909997c0 1.6076667 1.45833334 2.8583334 2.84374997 2.8583334l-.189245 6.0559333c-.0162936.5213833.3836584.944055.895755.944055h.1911584c.511 0 .9078883-.41692.88592-.944055l-.2523267-6.0559333c1.4583333 0 3.2083333-1.2506667 2.9166667-2.8583334v-3.43909997c0-.38802166-.3092717-.70257833-.694995-.70257833h-.0683375c-.3838334 0-.694995.32498667-.694995.70257833v3.43909997h-1.4583334zm3.7916666 3.7916667h1.75v5.1975c0 .4800483.3883834.8692017.875.8692017.483245 0 .875-.3890484.875-.8757584v-13.1238333c-2.443 0-3.5583333 1.69866667-3.5 3.0333333v4.9z" fill="#fff"/></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="28px" height="28px" viewBox="0 0 28 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>eat_light</title>
+    <g id="eat_light" stroke="none" fill="none" fill-rule="evenodd">
+        <path d="M14,0 C21.7319865,0 28,6.2680135 28,14 C28,21.7319865 21.7319865,28 14,28 C6.2680135,28 0,21.7319865 0,14 C0,6.2680135 6.2680135,0 14,0 Z M19.8333333,7.000455 C17.3903333,7.000455 16.275,8.69912167 16.3333333,10.0337883 L16.3333333,14.9337883 L18.0833333,14.933345 L18.0833333,20.130845 C18.0833333,20.6108933 18.4717167,21.0000467 18.9583333,21.0000467 C19.4415783,21.0000467 19.8333333,20.6109983 19.8333333,20.1242883 L19.8333333,7.000455 Z M8.93001083,7 L8.86167333,7 C8.47784,7 8.16667833,7.32498667 8.16667833,7.70257833 L8.16667833,11.1416783 C8.16667833,12.749345 9.62501167,14.0000117 11.0104283,14.0000117 L10.8211833,20.055945 C10.8048897,20.5773283 11.2048417,21 11.7169383,21 L11.9080967,21 C12.4190967,21 12.815985,20.58308 12.7940167,20.055945 L12.54169,14.0000117 C14.0000233,14.0000117 15.7500233,12.749345 15.4583567,11.1416783 L15.4583567,7.70257833 C15.4583567,7.31455667 15.149085,7 14.7633617,7 L14.6950242,7 C14.3111908,7 14.0000292,7.32498667 14.0000292,7.70257833 L14.0000292,11.1416783 L12.5416958,11.1416783 L12.5416667,7.70257833 C12.5416667,7.31455667 12.232395,7 11.8466717,7 L11.7783342,7 C11.3945008,7 11.0833392,7.32498667 11.0833392,7.70257833 L11.0833392,11.1416783 L9.62500583,11.1416783 L9.62500583,7.70257833 C9.62500583,7.31455667 9.31573417,7 8.93001083,7 Z" id="Shape" fill="#EC955E"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Interface/Search/Categories/entertainment.imageset/entertainment_dark.svg b/iphone/Maps/Images.xcassets/Interface/Search/Categories/entertainment.imageset/entertainment_dark.svg
index 6c9634da7..49fdd1323 100644
--- a/iphone/Maps/Images.xcassets/Interface/Search/Categories/entertainment.imageset/entertainment_dark.svg
+++ b/iphone/Maps/Images.xcassets/Interface/Search/Categories/entertainment.imageset/entertainment_dark.svg
@@ -1 +1,7 @@
-<svg height="28" viewBox="0 0 28 28" width="28" xmlns="http://www.w3.org/2000/svg"><g fill="none" opacity=".898664"><circle cx="14" cy="14" fill="#7f5933" fill-rule="evenodd" r="14"/><path d="m14.8166667 12.2166667v5.3083333c0 2.4826667-2.009 4.4916667-4.4916667 4.4916667-2.48266667 0-4.49166667-2.009-4.49166667-4.4916667v-5.3083333zm-2.45 5.7166666h-4.08333337c0 .6778334.91466667 1.225 2.04166667 1.225s2.0416667-.5471666 2.0416667-1.225zm9.8-11.4333333v5.3083333c0 2.4826667-2.009 4.4916667-4.4916667 4.4916667-.735 0-1.4291667-.1878333-2.0416667-.4981667v-4.4018333h-2.45v-4.9zm-9.8 8.1666667c-.4491667 0-.8166667.3675-.8166667.8166666 0 .4491667.3675.8166667.8166667.8166667.4491666 0 .8166666-.3675.8166666-.8166667 0-.4491666-.3675-.8166666-.8166666-.8166666zm-4.08333337 0c-.44916666 0-.81666666.3675-.81666666.8166666 0 .4491667.3675.8166667.81666666.8166667.44916667 0 .81666667-.3675.81666667-.8166667 0-.4491666-.3675-.8166666-.81666667-.8166666zm9.39166667-2.45c-1.127 0-2.0416667.5471666-2.0416667 1.225h4.0833334c0-.6778334-.9146667-1.225-2.0416667-1.225zm-2.0416667-3.20133337c-.4491666 0-.8166666.3675-.8166666.81666667 0 .4491667.3675.8166667.8166666.8166667.4491667 0 .8166667-.3593334.8166667-.8166667 0-.44916667-.3675-.81666667-.8166667-.81666667zm4.0833334 0c-.4491667 0-.8166667.3675-.8166667.81666667 0 .4491667.3675.8166667.8166667.8166667.4491666 0 .8166666-.3593334.8166666-.8166667 0-.44916667-.3675-.81666667-.8166666-.81666667z" fill="#000"/></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="28px" height="28px" viewBox="0 0 28 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>entertainment_dark</title>
+    <g id="entertainment_dark" stroke="none" fill="none" fill-rule="evenodd">
+        <path d="M14,0 C21.7319865,0 28,6.2680135 28,14 C28,21.7319865 21.7319865,28 14,28 C6.2680135,28 0,21.7319865 0,14 C0,6.2680135 6.2680135,0 14,0 Z M14.8166667,12.2166667 L5.83333333,12.2166667 L5.83333333,17.525 C5.83333333,20.0076667 7.84233333,22.0166667 10.325,22.0166667 C12.8076667,22.0166667 14.8166667,20.0076667 14.8166667,17.525 L14.8166667,12.2166667 Z M12.3666667,17.9333333 C12.3666667,18.6111667 11.452,19.1583333 10.325,19.1583333 C9.198,19.1583333 8.28333333,18.6111667 8.28333333,17.9333333 Z M22.1666667,6.5 L13.1833333,6.5 L13.1833333,11.4 L15.6333333,11.4 L15.6333333,15.8018333 C16.2458333,16.1121667 16.94,16.3 17.675,16.3 C20.1576667,16.3 22.1666667,14.291 22.1666667,11.8083333 L22.1666667,6.5 Z M12.3666667,14.6666667 C12.8158333,14.6666667 13.1833333,15.0341667 13.1833333,15.4833333 C13.1833333,15.9325 12.8158333,16.3 12.3666667,16.3 C11.9175,16.3 11.55,15.9325 11.55,15.4833333 C11.55,15.0341667 11.9175,14.6666667 12.3666667,14.6666667 Z M8.28333333,14.6666667 C8.7325,14.6666667 9.1,15.0341667 9.1,15.4833333 C9.1,15.9325 8.7325,16.3 8.28333333,16.3 C7.83416667,16.3 7.46666667,15.9325 7.46666667,15.4833333 C7.46666667,15.0341667 7.83416667,14.6666667 8.28333333,14.6666667 Z M17.675,12.2166667 C18.802,12.2166667 19.7166667,12.7638333 19.7166667,13.4416667 L15.6333333,13.4416667 C15.6333333,12.7638333 16.548,12.2166667 17.675,12.2166667 Z M15.6333333,9.01533333 C16.0825,9.01533333 16.45,9.38283333 16.45,9.832 C16.45,10.2893333 16.0825,10.6486667 15.6333333,10.6486667 C15.1841667,10.6486667 14.8166667,10.2811667 14.8166667,9.832 C14.8166667,9.38283333 15.1841667,9.01533333 15.6333333,9.01533333 Z M19.7166667,9.01533333 C20.1658333,9.01533333 20.5333333,9.38283333 20.5333333,9.832 C20.5333333,10.2893333 20.1658333,10.6486667 19.7166667,10.6486667 C19.2675,10.6486667 18.9,10.2811667 18.9,9.832 C18.9,9.38283333 19.2675,9.01533333 19.7166667,9.01533333 Z" id="Shape" fill="#7F5933"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Interface/Search/Categories/entertainment.imageset/entertainment_light.svg b/iphone/Maps/Images.xcassets/Interface/Search/Categories/entertainment.imageset/entertainment_light.svg
index b67f452ab..380c9b12c 100644
--- a/iphone/Maps/Images.xcassets/Interface/Search/Categories/entertainment.imageset/entertainment_light.svg
+++ b/iphone/Maps/Images.xcassets/Interface/Search/Categories/entertainment.imageset/entertainment_light.svg
@@ -1 +1,7 @@
-<svg height="28" viewBox="0 0 28 28" width="28" xmlns="http://www.w3.org/2000/svg"><g fill="none" opacity=".898664"><circle cx="14" cy="14.2" fill="#9c6136" fill-rule="evenodd" r="14"/><path d="m14.8166667 12.2166667v5.3083333c0 2.4826667-2.009 4.4916667-4.4916667 4.4916667-2.48266667 0-4.49166667-2.009-4.49166667-4.4916667v-5.3083333zm-2.45 5.7166666h-4.08333337c0 .6778334.91466667 1.225 2.04166667 1.225s2.0416667-.5471666 2.0416667-1.225zm9.8-11.4333333v5.3083333c0 2.4826667-2.009 4.4916667-4.4916667 4.4916667-.735 0-1.4291667-.1878333-2.0416667-.4981667v-4.4018333h-2.45v-4.9zm-9.8 8.1666667c-.4491667 0-.8166667.3675-.8166667.8166666 0 .4491667.3675.8166667.8166667.8166667.4491666 0 .8166666-.3675.8166666-.8166667 0-.4491666-.3675-.8166666-.8166666-.8166666zm-4.08333337 0c-.44916666 0-.81666666.3675-.81666666.8166666 0 .4491667.3675.8166667.81666666.8166667.44916667 0 .81666667-.3675.81666667-.8166667 0-.4491666-.3675-.8166666-.81666667-.8166666zm9.39166667-2.45c-1.127 0-2.0416667.5471666-2.0416667 1.225h4.0833334c0-.6778334-.9146667-1.225-2.0416667-1.225zm-2.0416667-3.20133337c-.4491666 0-.8166666.3675-.8166666.81666667 0 .4491667.3675.8166667.8166666.8166667.4491667 0 .8166667-.3593334.8166667-.8166667 0-.44916667-.3675-.81666667-.8166667-.81666667zm4.0833334 0c-.4491667 0-.8166667.3675-.8166667.81666667 0 .4491667.3675.8166667.8166667.8166667.4491666 0 .8166666-.3593334.8166666-.8166667 0-.44916667-.3675-.81666667-.8166666-.81666667z" fill="#fff"/></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="28px" height="28px" viewBox="0 0 28 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>entertainment_light</title>
+    <g id="entertainment_light" stroke="none" fill="none" fill-rule="evenodd">
+        <path d="M14,0.2 C21.7319865,0.2 28,6.4680135 28,14.2 C28,21.9319865 21.7319865,28.2 14,28.2 C6.2680135,28.2 0,21.9319865 0,14.2 C0,6.4680135 6.2680135,0.2 14,0.2 Z M14.8166667,12.2166667 L5.83333333,12.2166667 L5.83333333,17.525 C5.83333333,20.0076667 7.84233333,22.0166667 10.325,22.0166667 C12.8076667,22.0166667 14.8166667,20.0076667 14.8166667,17.525 L14.8166667,12.2166667 Z M12.3666667,17.9333333 C12.3666667,18.6111667 11.452,19.1583333 10.325,19.1583333 C9.198,19.1583333 8.28333333,18.6111667 8.28333333,17.9333333 Z M22.1666667,6.5 L13.1833333,6.5 L13.1833333,11.4 L15.6333333,11.4 L15.6333333,15.8018333 C16.2458333,16.1121667 16.94,16.3 17.675,16.3 C20.1576667,16.3 22.1666667,14.291 22.1666667,11.8083333 L22.1666667,6.5 Z M12.3666667,14.6666667 C12.8158333,14.6666667 13.1833333,15.0341667 13.1833333,15.4833333 C13.1833333,15.9325 12.8158333,16.3 12.3666667,16.3 C11.9175,16.3 11.55,15.9325 11.55,15.4833333 C11.55,15.0341667 11.9175,14.6666667 12.3666667,14.6666667 Z M8.28333333,14.6666667 C8.7325,14.6666667 9.1,15.0341667 9.1,15.4833333 C9.1,15.9325 8.7325,16.3 8.28333333,16.3 C7.83416667,16.3 7.46666667,15.9325 7.46666667,15.4833333 C7.46666667,15.0341667 7.83416667,14.6666667 8.28333333,14.6666667 Z M17.675,12.2166667 C18.802,12.2166667 19.7166667,12.7638333 19.7166667,13.4416667 L15.6333333,13.4416667 C15.6333333,12.7638333 16.548,12.2166667 17.675,12.2166667 Z M15.6333333,9.01533333 C16.0825,9.01533333 16.45,9.38283333 16.45,9.832 C16.45,10.2893333 16.0825,10.6486667 15.6333333,10.6486667 C15.1841667,10.6486667 14.8166667,10.2811667 14.8166667,9.832 C14.8166667,9.38283333 15.1841667,9.01533333 15.6333333,9.01533333 Z M19.7166667,9.01533333 C20.1658333,9.01533333 20.5333333,9.38283333 20.5333333,9.832 C20.5333333,10.2893333 20.1658333,10.6486667 19.7166667,10.6486667 C19.2675,10.6486667 18.9,10.2811667 18.9,9.832 C18.9,9.38283333 19.2675,9.01533333 19.7166667,9.01533333 Z" id="Shape" fill="#9C6136"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Interface/Search/Categories/food.imageset/food_dark.svg b/iphone/Maps/Images.xcassets/Interface/Search/Categories/food.imageset/food_dark.svg
index cee714d41..017d1e4e4 100644
--- a/iphone/Maps/Images.xcassets/Interface/Search/Categories/food.imageset/food_dark.svg
+++ b/iphone/Maps/Images.xcassets/Interface/Search/Categories/food.imageset/food_dark.svg
@@ -1 +1,7 @@
-<svg height="28" viewBox="0 0 28 28" width="28" xmlns="http://www.w3.org/2000/svg"><g fill="none" opacity=".898664"><circle cx="14" cy="14" fill="#8c5f93" fill-rule="evenodd" r="14"/><path d="m11.3735667 18.307716c-.742245 0-1.3428334.6057683-1.3428334 1.3461 0 .74039.6005417 1.3461 1.3428334 1.3461.742245 0 1.3494833-.6057683 1.3494833-1.3461 0-.74039-.607285-1.3461-1.3494833-1.3461zm-4.5735667-10.81966667c0 .32523167.26993167.588875.58562.588875h.81438l2.1 6.46158337c-.74345833 0-1.3461.782075-1.3461 1.7477833v-.2647633c0 .965265.785155 1.7477833 1.7484833 1.7477833h8.1061167c.3267133 0 .5915583-.2497717.5915583-.588875v.1008303c0-.3252316-.2702933-.588875-.5860866-.588875h-8.197c-.3236917 0-.5860867-.2497716-.5860867-.588875v.1008304c0-.3252317.2672133-.588875.5775817-.588875h7.4536c1.1548366 0 1.0512483-.295715 1.225-.6461467l1.42905-4.8332667c.056-.098.084-.21699997.084-.33599997 0-.385-.315-.7-.5384634-.64615833h-10.5145833l-.847-2.1539h-1.52611667c-.316925 0-.57395333.24977167-.57395333.588875v-.10083033zm11.0350333 10.81966667c-.742245 0-1.3428333.6057683-1.3428333 1.3461 0 .74039.6005417 1.3461 1.3428333 1.3461.7422917 0 1.3494834-.6057683 1.3494834-1.3461 0-.74039-.607285-1.3461-1.3494834-1.3461z" fill="#000"/></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="28px" height="28px" viewBox="0 0 28 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>food_dark</title>
+    <g id="food_dark" stroke="none" fill="none" fill-rule="evenodd">
+        <path d="M14,0 C21.7319865,0 28,6.2680135 28,14 C28,21.7319865 21.7319865,28 14,28 C6.2680135,28 0,21.7319865 0,14 C0,6.2680135 6.2680135,0 14,0 Z M11.3735667,18.307716 C10.6313217,18.307716 10.0307333,18.9134843 10.0307333,19.653816 C10.0307333,20.394206 10.631275,20.999916 11.3735667,20.999916 C12.1158117,20.999916 12.72305,20.3941477 12.72305,19.653816 C12.72305,18.913426 12.115765,18.307716 11.3735667,18.307716 Z M17.8350333,18.307716 C17.0927883,18.307716 16.4922,18.9134843 16.4922,19.653816 C16.4922,20.394206 17.0927417,20.999916 17.8350333,20.999916 C18.577325,20.999916 19.1845167,20.3941477 19.1845167,19.653816 C19.1845167,18.913426 18.5772317,18.307716 17.8350333,18.307716 Z M8.90007,7 L7.37395333,7 C7.08872083,7 6.85200463,7.20231505 6.80751372,7.48998439 L6.804,7.537 L6.80787378,7.58356913 C6.8544439,7.86337323 7.1015005,8.07692433 7.38562,8.07692433 L8.2,8.07692433 L10.3,14.5385077 C9.59784491,14.5385077 9.0212948,15.2360993 8.95940083,16.1271425 L8.958,16.146 L8.95971279,16.1648718 C9.03286093,17.0630882 9.78722142,17.769311 10.7023833,17.769311 L18.8085,17.769311 C19.102542,17.769311 19.3464707,17.566996 19.392316,17.2793266 L19.396,17.231 L19.3921743,17.1857465 C19.3455447,16.9059424 19.0981857,16.6923913 18.8139717,16.6923913 L10.6169717,16.6923913 C10.3256492,16.6923913 10.083977,16.4900763 10.0385558,16.2024069 L10.034,16.154 L10.0386773,16.1088269 C10.0847592,15.8290228 10.3291352,15.6154717 10.6084667,15.6154717 L18.0620667,15.6154717 C19.2169033,15.6154717 19.113315,15.3197567 19.2870667,14.969325 L20.7161167,10.1360583 C20.7721167,10.0380583 20.8001167,9.91905833 20.8001167,9.80005833 C20.8001167,9.41505833 20.4851167,9.10005833 20.2616533,9.1539 L9.74707,9.1539 L8.90007,7 Z" id="Shape" fill="#8C5F93"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Interface/Search/Categories/food.imageset/food_light.svg b/iphone/Maps/Images.xcassets/Interface/Search/Categories/food.imageset/food_light.svg
index 9fcec0854..1f58d31b8 100644
--- a/iphone/Maps/Images.xcassets/Interface/Search/Categories/food.imageset/food_light.svg
+++ b/iphone/Maps/Images.xcassets/Interface/Search/Categories/food.imageset/food_light.svg
@@ -1 +1,7 @@
-<svg height="28" viewBox="0 0 28 28" width="28" xmlns="http://www.w3.org/2000/svg"><g fill="none" opacity=".898664"><circle cx="14" cy="14" fill="#be75a3" fill-rule="evenodd" r="14"/><path d="m11.3735667 18.307716c-.742245 0-1.3428334.6057683-1.3428334 1.3461 0 .74039.6005417 1.3461 1.3428334 1.3461.742245 0 1.3494833-.6057683 1.3494833-1.3461 0-.74039-.607285-1.3461-1.3494833-1.3461zm-4.5735667-10.81966667c0 .32523167.26993167.588875.58562.588875h.81438l2.1 6.46158337c-.74345833 0-1.3461.782075-1.3461 1.7477833v-.2647633c0 .965265.785155 1.7477833 1.7484833 1.7477833h8.1061167c.3267133 0 .5915583-.2497717.5915583-.588875v.1008303c0-.3252316-.2702933-.588875-.5860866-.588875h-8.197c-.3236917 0-.5860867-.2497716-.5860867-.588875v.1008304c0-.3252317.2672133-.588875.5775817-.588875h7.4536c1.1548366 0 1.0512483-.295715 1.225-.6461467l1.42905-4.8332667c.056-.098.084-.21699997.084-.33599997 0-.385-.315-.7-.5384634-.64615833h-10.5145833l-.847-2.1539h-1.52611667c-.316925 0-.57395333.24977167-.57395333.588875v-.10083033zm11.0350333 10.81966667c-.742245 0-1.3428333.6057683-1.3428333 1.3461 0 .74039.6005417 1.3461 1.3428333 1.3461.7422917 0 1.3494834-.6057683 1.3494834-1.3461 0-.74039-.607285-1.3461-1.3494834-1.3461z" fill="#fff"/></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="28px" height="28px" viewBox="0 0 28 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>food_light</title>
+    <g id="food_light" stroke="none" fill="none" fill-rule="evenodd">
+        <path d="M14,0 C21.7319865,0 28,6.2680135 28,14 C28,21.7319865 21.7319865,28 14,28 C6.2680135,28 0,21.7319865 0,14 C0,6.2680135 6.2680135,0 14,0 Z M11.3735667,18.307716 C10.6313217,18.307716 10.0307333,18.9134843 10.0307333,19.653816 C10.0307333,20.394206 10.631275,20.999916 11.3735667,20.999916 C12.1158117,20.999916 12.72305,20.3941477 12.72305,19.653816 C12.72305,18.913426 12.115765,18.307716 11.3735667,18.307716 Z M17.8350333,18.307716 C17.0927883,18.307716 16.4922,18.9134843 16.4922,19.653816 C16.4922,20.394206 17.0927417,20.999916 17.8350333,20.999916 C18.577325,20.999916 19.1845167,20.3941477 19.1845167,19.653816 C19.1845167,18.913426 18.5772317,18.307716 17.8350333,18.307716 Z M8.90007,7 L7.37395333,7 C7.08872083,7 6.85200463,7.20231505 6.80751372,7.48998439 L6.804,7.537 L6.80787378,7.58356913 C6.8544439,7.86337323 7.1015005,8.07692433 7.38562,8.07692433 L8.2,8.07692433 L10.3,14.5385077 C9.59784491,14.5385077 9.0212948,15.2360993 8.95940083,16.1271425 L8.958,16.146 L8.95971279,16.1648718 C9.03286093,17.0630882 9.78722142,17.769311 10.7023833,17.769311 L18.8085,17.769311 C19.102542,17.769311 19.3464707,17.566996 19.392316,17.2793266 L19.396,17.231 L19.3921743,17.1857465 C19.3455447,16.9059424 19.0981857,16.6923913 18.8139717,16.6923913 L10.6169717,16.6923913 C10.3256492,16.6923913 10.083977,16.4900763 10.0385558,16.2024069 L10.034,16.154 L10.0386773,16.1088269 C10.0847592,15.8290228 10.3291352,15.6154717 10.6084667,15.6154717 L18.0620667,15.6154717 C19.2169033,15.6154717 19.113315,15.3197567 19.2870667,14.969325 L20.7161167,10.1360583 C20.7721167,10.0380583 20.8001167,9.91905833 20.8001167,9.80005833 C20.8001167,9.41505833 20.4851167,9.10005833 20.2616533,9.1539 L9.74707,9.1539 L8.90007,7 Z" id="Shape" fill="#BE75A3"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Interface/Search/Categories/fuel.imageset/fuel_dark.svg b/iphone/Maps/Images.xcassets/Interface/Search/Categories/fuel.imageset/fuel_dark.svg
index b7867ef50..a37a0645b 100644
--- a/iphone/Maps/Images.xcassets/Interface/Search/Categories/fuel.imageset/fuel_dark.svg
+++ b/iphone/Maps/Images.xcassets/Interface/Search/Categories/fuel.imageset/fuel_dark.svg
@@ -1 +1,7 @@
-<svg height="28" viewBox="0 0 28 28" width="28" xmlns="http://www.w3.org/2000/svg"><g fill="none" opacity=".898664"><circle cx="14" cy="14" fill="#717065" fill-rule="evenodd" r="14"/><path d="m17.846514 4.676c-.2889478.0456586-.5278773.24951065-.6184621.52766514-.0905848.2781545-.017519.58361209.1891288.79066819l2.0113333 2.01133334c.371.371.6335.8295.7688334 1.32766666h-.6743334c-1.2798333 0-2.3333333 1.05349997-2.3333333 2.33333337 0 1.2798333 1.0535 2.3333333 2.3333333 2.3333333h.776993v5.4448333c0 .4386667-.3383263.777-.776993.777-.207136.0031729-.4067361-.0776318-.5533304-.2240063s-.2276984-.3458532-.2248362-.5529937v-1.5563333c0-1.2786667-1.0535-2.3333333-2.3333334-2.3333333h-.7781666v-7.77700003c.0012429-.41294278-.1621679-.80934776-.4540543-1.10145318-.2918865-.29210542-.6881688-.45581348-1.1011124-.45488016h-6.22183335c-.4131455-.00124442-.80972842.1623263-1.10186773.45446561s-.45571002.68872223-.45447265 1.10186773v12.44366663c-.00123737.4131455.16233334.8097285.45447265 1.1018678s.68872223.45571 1.10186773.4544726h6.22183335c.4129436.0009263.8092259-.1627818 1.1011124-.4548872.2918864-.2921054.4552972-.6885104.4540543-1.1014532v-3.1103333h.7781666c.4386667 0 .7781667.3383333.7781667.777v1.5563333c0 1.2786667 1.0535 2.3333404 2.3333333 2.3333404 1.2786667 0 2.3333334-1.0546737 2.3333334-2.3333404v-9.3333333c0-1.20209323-.4775338-2.35494971-1.3276667-3.20483333l-2.0113333-2.0125c-.1761743-.17608071-.4259933-.25718514-.672-.21816667zm-9.21433331 3.10216667h4.66666671c.4316666 0 .7781666.3465.7781666.777v3.88966663h-6.22066665v-3.88966663c0-.4305.3465-.777.777-.777zm10.89083331 2.72183333c.6443322 0 1.1666667.5223345 1.1666667 1.1666667s-.5223345 1.1666666-1.1666667 1.1666666-1.1666666-.5223344-1.1666666-1.1666666.5223344-1.1666667 1.1666666-1.1666667z" fill="#000"/></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="28px" height="28px" viewBox="0 0 28 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>fuel_dark</title>
+    <g id="fuel_dark" stroke="none" fill="none" fill-rule="evenodd">
+        <path d="M14,0 C21.7319865,0 28,6.2680135 28,14 C28,21.7319865 21.7319865,28 14,28 C6.2680135,28 0,21.7319865 0,14 C0,6.2680135 6.2680135,0 14,0 Z M17.8453474,4.676 C17.5575662,4.7216586 17.3186367,4.92551065 17.2280519,5.20366514 C17.1374671,5.48181964 17.2105329,5.78727723 17.4171807,5.99433333 L19.428514,8.00566667 C19.799514,8.37666667 20.062014,8.83516667 20.1973474,9.33333333 L19.523014,9.33333333 C18.2431807,9.33333333 17.1896807,10.3868333 17.1896807,11.6666667 C17.1896807,12.9465 18.2431807,14 19.523014,14 L20.300007,14 L20.300007,19.4448333 C20.300007,19.8835 19.9616807,20.2218333 19.523014,20.2218333 C19.315878,20.2250062 19.1162779,20.1442015 18.9696836,19.997827 C18.8230893,19.8514525 18.7419852,19.6519738 18.7448474,19.4448333 L18.7448474,17.8885 C18.7448474,16.6098333 17.6913474,15.5551667 16.411514,15.5551667 L15.6333474,15.5551667 L15.6333474,7.77816667 C15.6345903,7.36522389 15.4711795,6.96881891 15.1792931,6.67671349 C14.8874066,6.38460807 14.4911243,6.22090001 14.0781807,6.22183333 L7.85634735,6.22183333 C7.44320185,6.22058891 7.04661893,6.38415963 6.75447962,6.67629894 C6.46234031,6.96843825 6.2987696,7.36502117 6.30000697,7.77816667 L6.30000697,20.2218333 C6.2987696,20.6349788 6.46234031,21.0315618 6.75447962,21.3237011 C7.04661893,21.6158404 7.44320185,21.7794111 7.85634735,21.7781737 L14.0781807,21.7781737 C14.4911243,21.7791 14.8874066,21.6153919 15.1792931,21.3232865 C15.4711795,21.0311811 15.6345903,20.6347761 15.6333474,20.2218333 L15.6333474,17.1115 L16.411514,17.1115 C16.8501807,17.1115 17.1896807,17.4498333 17.1896807,17.8885 L17.1896807,19.4448333 C17.1896807,20.7235 18.2431807,21.7781737 19.523014,21.7781737 C20.8016807,21.7781737 21.8563474,20.7235 21.8563474,19.4448333 L21.8563474,10.1115 C21.8563474,8.90940677 21.3788136,7.75655029 20.5286807,6.90666667 L18.5173474,4.89416667 C18.3411731,4.71808596 18.0913541,4.63698153 17.8453474,4.676 Z M19.523014,10.5 C20.1673462,10.5 20.6896807,11.0223345 20.6896807,11.6666667 C20.6896807,12.3109989 20.1673462,12.8333333 19.523014,12.8333333 C18.8786818,12.8333333 18.3563474,12.3109989 18.3563474,11.6666667 C18.3563474,11.0223345 18.8786818,10.5 19.523014,10.5 Z M13.2988474,7.77816667 C13.730514,7.77816667 14.077014,8.12466667 14.077014,8.55516667 L14.077014,12.4448333 L7.85634735,12.4448333 L7.85634735,8.55516667 C7.85634735,8.12466667 8.20284735,7.77816667 8.63334735,7.77816667 L13.2988474,7.77816667 Z" id="Shape" fill="#717065"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Interface/Search/Categories/fuel.imageset/fuel_light.svg b/iphone/Maps/Images.xcassets/Interface/Search/Categories/fuel.imageset/fuel_light.svg
index efec16d32..046f0b26d 100644
--- a/iphone/Maps/Images.xcassets/Interface/Search/Categories/fuel.imageset/fuel_light.svg
+++ b/iphone/Maps/Images.xcassets/Interface/Search/Categories/fuel.imageset/fuel_light.svg
@@ -1 +1,7 @@
-<svg height="28" viewBox="0 0 28 28" width="28" xmlns="http://www.w3.org/2000/svg"><g fill="none" opacity=".898664"><circle cx="14" cy="14" fill="#747e86" fill-rule="evenodd" r="14"/><path d="m17.846514 4.676c-.2889478.0456586-.5278773.24951065-.6184621.52766514-.0905848.2781545-.017519.58361209.1891288.79066819l2.0113333 2.01133334c.371.371.6335.8295.7688334 1.32766666h-.6743334c-1.2798333 0-2.3333333 1.05349997-2.3333333 2.33333337 0 1.2798333 1.0535 2.3333333 2.3333333 2.3333333h.776993v5.4448333c0 .4386667-.3383263.777-.776993.777-.207136.0031729-.4067361-.0776318-.5533304-.2240063s-.2276984-.3458532-.2248362-.5529937v-1.5563333c0-1.2786667-1.0535-2.3333333-2.3333334-2.3333333h-.7781666v-7.77700003c.0012429-.41294278-.1621679-.80934776-.4540543-1.10145318-.2918865-.29210542-.6881688-.45581348-1.1011124-.45488016h-6.22183335c-.4131455-.00124442-.80972842.1623263-1.10186773.45446561s-.45571002.68872223-.45447265 1.10186773v12.44366663c-.00123737.4131455.16233334.8097285.45447265 1.1018678s.68872223.45571 1.10186773.4544726h6.22183335c.4129436.0009263.8092259-.1627818 1.1011124-.4548872.2918864-.2921054.4552972-.6885104.4540543-1.1014532v-3.1103333h.7781666c.4386667 0 .7781667.3383333.7781667.777v1.5563333c0 1.2786667 1.0535 2.3333404 2.3333333 2.3333404 1.2786667 0 2.3333334-1.0546737 2.3333334-2.3333404v-9.3333333c0-1.20209323-.4775338-2.35494971-1.3276667-3.20483333l-2.0113333-2.0125c-.1761743-.17608071-.4259933-.25718514-.672-.21816667zm-9.21433331 3.10216667h4.66666671c.4316666 0 .7781666.3465.7781666.777v3.88966663h-6.22066665v-3.88966663c0-.4305.3465-.777.777-.777zm10.89083331 2.72183333c.6443322 0 1.1666667.5223345 1.1666667 1.1666667s-.5223345 1.1666666-1.1666667 1.1666666-1.1666666-.5223344-1.1666666-1.1666666.5223344-1.1666667 1.1666666-1.1666667z" fill="#fff"/></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="28px" height="28px" viewBox="0 0 28 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>fuel_light</title>
+    <g id="fuel_light" stroke="none" fill="none" fill-rule="evenodd">
+        <path d="M14,0 C21.7319865,0 28,6.2680135 28,14 C28,21.7319865 21.7319865,28 14,28 C6.2680135,28 0,21.7319865 0,14 C0,6.2680135 6.2680135,0 14,0 Z M17.8453474,4.676 C17.5575662,4.7216586 17.3186367,4.92551065 17.2280519,5.20366514 C17.1374671,5.48181964 17.2105329,5.78727723 17.4171807,5.99433333 L19.428514,8.00566667 C19.799514,8.37666667 20.062014,8.83516667 20.1973474,9.33333333 L19.523014,9.33333333 C18.2431807,9.33333333 17.1896807,10.3868333 17.1896807,11.6666667 C17.1896807,12.9465 18.2431807,14 19.523014,14 L20.300007,14 L20.300007,19.4448333 C20.300007,19.8835 19.9616807,20.2218333 19.523014,20.2218333 C19.315878,20.2250062 19.1162779,20.1442015 18.9696836,19.997827 C18.8230893,19.8514525 18.7419852,19.6519738 18.7448474,19.4448333 L18.7448474,17.8885 C18.7448474,16.6098333 17.6913474,15.5551667 16.411514,15.5551667 L15.6333474,15.5551667 L15.6333474,7.77816667 C15.6345903,7.36522389 15.4711795,6.96881891 15.1792931,6.67671349 C14.8874066,6.38460807 14.4911243,6.22090001 14.0781807,6.22183333 L7.85634735,6.22183333 C7.44320185,6.22058891 7.04661893,6.38415963 6.75447962,6.67629894 C6.46234031,6.96843825 6.2987696,7.36502117 6.30000697,7.77816667 L6.30000697,20.2218333 C6.2987696,20.6349788 6.46234031,21.0315618 6.75447962,21.3237011 C7.04661893,21.6158404 7.44320185,21.7794111 7.85634735,21.7781737 L14.0781807,21.7781737 C14.4911243,21.7791 14.8874066,21.6153919 15.1792931,21.3232865 C15.4711795,21.0311811 15.6345903,20.6347761 15.6333474,20.2218333 L15.6333474,17.1115 L16.411514,17.1115 C16.8501807,17.1115 17.1896807,17.4498333 17.1896807,17.8885 L17.1896807,19.4448333 C17.1896807,20.7235 18.2431807,21.7781737 19.523014,21.7781737 C20.8016807,21.7781737 21.8563474,20.7235 21.8563474,19.4448333 L21.8563474,10.1115 C21.8563474,8.90940677 21.3788136,7.75655029 20.5286807,6.90666667 L18.5173474,4.89416667 C18.3411731,4.71808596 18.0913541,4.63698153 17.8453474,4.676 Z M19.523014,10.5 C20.1673462,10.5 20.6896807,11.0223345 20.6896807,11.6666667 C20.6896807,12.3109989 20.1673462,12.8333333 19.523014,12.8333333 C18.8786818,12.8333333 18.3563474,12.3109989 18.3563474,11.6666667 C18.3563474,11.0223345 18.8786818,10.5 19.523014,10.5 Z M13.2988474,7.77816667 C13.730514,7.77816667 14.077014,8.12466667 14.077014,8.55516667 L14.077014,12.4448333 L7.85634735,12.4448333 L7.85634735,8.55516667 C7.85634735,8.12466667 8.20284735,7.77816667 8.63334735,7.77816667 L13.2988474,7.77816667 Z" id="Shape" fill="#747E86"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Interface/Search/Categories/hospital.imageset/hospital_dark.svg b/iphone/Maps/Images.xcassets/Interface/Search/Categories/hospital.imageset/hospital_dark.svg
index 5d1fbe106..88e7cad19 100644
--- a/iphone/Maps/Images.xcassets/Interface/Search/Categories/hospital.imageset/hospital_dark.svg
+++ b/iphone/Maps/Images.xcassets/Interface/Search/Categories/hospital.imageset/hospital_dark.svg
@@ -1 +1,7 @@
-<svg height="28" viewBox="0 0 28 28" width="28" xmlns="http://www.w3.org/2000/svg"><g fill="none" opacity=".898664"><circle cx="14" cy="14" fill="#c15746" fill-rule="evenodd" r="14"/><path d="m21.1291111 17.1111111h-4.0184667v4.0184667c0 .7842644-.6416666 1.4259311-1.4259311 1.4259311h-3.3704222c-.7842644 0-1.4259311-.6416667-1.4259311-1.4259311v-4.0184667h-4.01862222c-.78426445 0-1.4259-.6416667-1.4259-1.4259311v-3.3704222c0-.7842645.64166666-1.4259311 1.4259-1.4259311h4.01862222v-4.0184667c0-.78426444.6416667-1.42593111 1.4259311-1.42593111h3.3704222c.7842645 0 1.4259311.64166667 1.4259311 1.42593111v4.0184667h4.0184667c.7842645 0 1.4259311.6416666 1.4259311 1.4259311v3.3704222c0 .7842644-.6416666 1.4259311-1.4259311 1.4259311z" fill="#000"/></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="28px" height="28px" viewBox="0 0 28 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>hospital_dark</title>
+    <g id="hospital_dark" stroke="none" fill="none" fill-rule="evenodd">
+        <path d="M14,0 C21.7319865,0 28,6.2680135 28,14 C28,21.7319865 21.7319865,28 14,28 C6.2680135,28 0,21.7319865 0,14 C0,6.2680135 6.2680135,0 14,0 Z M15.6847133,5.44442889 L12.3142911,5.44442889 C11.5300267,5.44442889 10.88836,6.08609556 10.88836,6.87036 L10.88836,10.8888267 L6.86973778,10.8888267 C6.08550444,10.8888267 5.44383778,11.5304933 5.44383778,12.3147578 L5.44383778,15.68518 C5.44383778,16.4694444 6.08547333,17.1111111 6.86973778,17.1111111 L10.88836,17.1111111 L10.88836,21.1295778 C10.88836,21.9138422 11.5300267,22.5555089 12.3142911,22.5555089 L15.6847133,22.5555089 C16.4689778,22.5555089 17.1106444,21.9138422 17.1106444,21.1295778 L17.1106444,17.1111111 L21.1291111,17.1111111 C21.9133756,17.1111111 22.5550422,16.4694444 22.5550422,15.68518 L22.5550422,12.3147578 C22.5550422,11.5304933 21.9133756,10.8888267 21.1291111,10.8888267 L17.1106444,10.8888267 L17.1106444,6.87036 C17.1106444,6.08609556 16.4689778,5.44442889 15.6847133,5.44442889 Z" id="Shape" fill="#C15746"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Interface/Search/Categories/hospital.imageset/hospital_light.svg b/iphone/Maps/Images.xcassets/Interface/Search/Categories/hospital.imageset/hospital_light.svg
index c9857b433..55a06c93a 100644
--- a/iphone/Maps/Images.xcassets/Interface/Search/Categories/hospital.imageset/hospital_light.svg
+++ b/iphone/Maps/Images.xcassets/Interface/Search/Categories/hospital.imageset/hospital_light.svg
@@ -1 +1,7 @@
-<svg height="28" viewBox="0 0 28 28" width="28" xmlns="http://www.w3.org/2000/svg"><g fill="none" opacity=".898664"><circle cx="14" cy="14" fill="#d85961" fill-rule="evenodd" r="14"/><path d="m21.1291111 17.1111111h-4.0184667v4.0184667c0 .7842644-.6416666 1.4259311-1.4259311 1.4259311h-3.3704222c-.7842644 0-1.4259311-.6416667-1.4259311-1.4259311v-4.0184667h-4.01862222c-.78426445 0-1.4259-.6416667-1.4259-1.4259311v-3.3704222c0-.7842645.64166666-1.4259311 1.4259-1.4259311h4.01862222v-4.0184667c0-.78426444.6416667-1.42593111 1.4259311-1.42593111h3.3704222c.7842645 0 1.4259311.64166667 1.4259311 1.42593111v4.0184667h4.0184667c.7842645 0 1.4259311.6416666 1.4259311 1.4259311v3.3704222c0 .7842644-.6416666 1.4259311-1.4259311 1.4259311z" fill="#fff"/></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="28px" height="28px" viewBox="0 0 28 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>hospital_light</title>
+    <g id="hospital_light" stroke="none" fill="none" fill-rule="evenodd">
+        <path d="M14,0 C21.7319865,0 28,6.2680135 28,14 C28,21.7319865 21.7319865,28 14,28 C6.2680135,28 0,21.7319865 0,14 C0,6.2680135 6.2680135,0 14,0 Z M15.6847133,5.44442889 L12.3142911,5.44442889 C11.5300267,5.44442889 10.88836,6.08609556 10.88836,6.87036 L10.88836,10.8888267 L6.86973778,10.8888267 C6.08550444,10.8888267 5.44383778,11.5304933 5.44383778,12.3147578 L5.44383778,15.68518 C5.44383778,16.4694444 6.08547333,17.1111111 6.86973778,17.1111111 L10.88836,17.1111111 L10.88836,21.1295778 C10.88836,21.9138422 11.5300267,22.5555089 12.3142911,22.5555089 L15.6847133,22.5555089 C16.4689778,22.5555089 17.1106444,21.9138422 17.1106444,21.1295778 L17.1106444,17.1111111 L21.1291111,17.1111111 C21.9133756,17.1111111 22.5550422,16.4694444 22.5550422,15.68518 L22.5550422,12.3147578 C22.5550422,11.5304933 21.9133756,10.8888267 21.1291111,10.8888267 L17.1106444,10.8888267 L17.1106444,6.87036 C17.1106444,6.08609556 16.4689778,5.44442889 15.6847133,5.44442889 Z" id="Shape" fill="#D85961"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Interface/Search/Categories/hotel.imageset/hotel_dark.svg b/iphone/Maps/Images.xcassets/Interface/Search/Categories/hotel.imageset/hotel_dark.svg
index 38a9e71bd..e1f00a681 100644
--- a/iphone/Maps/Images.xcassets/Interface/Search/Categories/hotel.imageset/hotel_dark.svg
+++ b/iphone/Maps/Images.xcassets/Interface/Search/Categories/hotel.imageset/hotel_dark.svg
@@ -1 +1,7 @@
-<svg height="28" viewBox="0 0 28 28" width="28" xmlns="http://www.w3.org/2000/svg"><g fill="none" opacity=".898664"><circle cx="14" cy="14" fill="#664e42" fill-rule="evenodd" r="14"/><path d="m10.2879 14.1061667c1.2324667 0 2.2272833-.9948517 2.2272833-2.2272834 0-1.2324666-.9948516-2.2272833-2.2272833-2.2272833-1.23246667 0-2.22728333.9948517-2.22728333 2.2272833 0 1.2324667.99485166 2.2272834 2.22728333 2.2272834zm8.9091333-4.4545667h-4.4545666c-.8166667 0-1.4848167.668185-1.4848167 1.4848167v3.7121h-5.93938333v-5.93938337c0-.40833333-.33408667-.74242-.74242-.74242-.40833334 0-.74242.33408667-.74242.74242v9.65148337c0 .4083333.33408666.74242.74242.74242.40833333 0 .74242-.3340867.74242-.74242v-1.4848167h13.36416663v1.4848167c0 .4083333.3340867.74242.74242.74242.4083334 0 .74242-.3340867.74242-.74242v-5.9393834c0-1.6408-1.32895-2.96974997-2.96975-2.96974997z" fill="#000"/></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="28px" height="28px" viewBox="0 0 28 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>hotel_dark</title>
+    <g id="hotel_dark" stroke="none" fill="none" fill-rule="evenodd">
+        <path d="M14,0 C21.7319865,0 28,6.2680135 28,14 C28,21.7319865 21.7319865,28 14,28 C6.2680135,28 0,21.7319865 0,14 C0,6.2680135 6.2680135,0 14,0 Z M6.57584667,8.16671333 C6.16751333,8.16671333 5.83342667,8.5008 5.83342667,8.90913333 L5.83342667,18.5606167 C5.83342667,18.96895 6.16751333,19.3030367 6.57584667,19.3030367 C6.98418,19.3030367 7.31826667,18.96895 7.31826667,18.5606167 L7.31826667,17.0758 L20.6824333,17.0758 L20.6824333,18.5606167 C20.6824333,18.96895 21.01652,19.3030367 21.4248533,19.3030367 C21.8331867,19.3030367 22.1672733,18.96895 22.1672733,18.5606167 L22.1672733,12.6212333 C22.1672733,10.9804333 20.8383233,9.65148333 19.1975233,9.65148333 L14.7424667,9.6516 C13.9258,9.6516 13.25765,10.319785 13.25765,11.1364167 L13.25765,14.8485167 L7.31826667,14.8485167 L7.31826667,8.90913333 C7.31826667,8.5008 6.98418,8.16671333 6.57584667,8.16671333 Z M10.2879,9.6516 C9.05543333,9.6516 8.06061667,10.6464517 8.06061667,11.8788833 C8.06061667,13.11135 9.05546833,14.1061667 10.2879,14.1061667 C11.5203667,14.1061667 12.5151833,13.111315 12.5151833,11.8788833 C12.5151833,10.6464167 11.5203317,9.6516 10.2879,9.6516 Z" id="Shape" fill="#664E42"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Interface/Search/Categories/hotel.imageset/hotel_light.svg b/iphone/Maps/Images.xcassets/Interface/Search/Categories/hotel.imageset/hotel_light.svg
index 6befe367c..a225a0a68 100644
--- a/iphone/Maps/Images.xcassets/Interface/Search/Categories/hotel.imageset/hotel_light.svg
+++ b/iphone/Maps/Images.xcassets/Interface/Search/Categories/hotel.imageset/hotel_light.svg
@@ -1 +1,7 @@
-<svg height="28" viewBox="0 0 28 28" width="28" xmlns="http://www.w3.org/2000/svg"><g fill="none" opacity=".898664"><circle cx="14" cy="14" fill="#664e42" fill-rule="evenodd" r="14"/><path d="m10.2879 14.1061667c1.2324667 0 2.2272833-.9948517 2.2272833-2.2272834 0-1.2324666-.9948516-2.2272833-2.2272833-2.2272833-1.23246667 0-2.22728333.9948517-2.22728333 2.2272833 0 1.2324667.99485166 2.2272834 2.22728333 2.2272834zm8.9091333-4.4545667h-4.4545666c-.8166667 0-1.4848167.668185-1.4848167 1.4848167v3.7121h-5.93938333v-5.93938337c0-.40833333-.33408667-.74242-.74242-.74242-.40833334 0-.74242.33408667-.74242.74242v9.65148337c0 .4083333.33408666.74242.74242.74242.40833333 0 .74242-.3340867.74242-.74242v-1.4848167h13.36416663v1.4848167c0 .4083333.3340867.74242.74242.74242.4083334 0 .74242-.3340867.74242-.74242v-5.9393834c0-1.6408-1.32895-2.96974997-2.96975-2.96974997z" fill="#fff"/></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="28px" height="28px" viewBox="0 0 28 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>hotel_light</title>
+    <g id="hotel_light" stroke="none" fill="none" fill-rule="evenodd">
+        <path d="M14,0 C21.7319865,0 28,6.2680135 28,14 C28,21.7319865 21.7319865,28 14,28 C6.2680135,28 0,21.7319865 0,14 C0,6.2680135 6.2680135,0 14,0 Z M6.57584667,8.16671333 C6.16751333,8.16671333 5.83342667,8.5008 5.83342667,8.90913333 L5.83342667,18.5606167 C5.83342667,18.96895 6.16751333,19.3030367 6.57584667,19.3030367 C6.98418,19.3030367 7.31826667,18.96895 7.31826667,18.5606167 L7.31826667,17.0758 L20.6824333,17.0758 L20.6824333,18.5606167 C20.6824333,18.96895 21.01652,19.3030367 21.4248533,19.3030367 C21.8331867,19.3030367 22.1672733,18.96895 22.1672733,18.5606167 L22.1672733,12.6212333 C22.1672733,10.9804333 20.8383233,9.65148333 19.1975233,9.65148333 L14.7424667,9.6516 C13.9258,9.6516 13.25765,10.319785 13.25765,11.1364167 L13.25765,14.8485167 L7.31826667,14.8485167 L7.31826667,8.90913333 C7.31826667,8.5008 6.98418,8.16671333 6.57584667,8.16671333 Z M10.2879,9.6516 C9.05543333,9.6516 8.06061667,10.6464517 8.06061667,11.8788833 C8.06061667,13.11135 9.05546833,14.1061667 10.2879,14.1061667 C11.5203667,14.1061667 12.5151833,13.111315 12.5151833,11.8788833 C12.5151833,10.6464167 11.5203317,9.6516 10.2879,9.6516 Z" id="Shape" fill="#664E42"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Interface/Search/Categories/nightlife.imageset/nightlife_dark.svg b/iphone/Maps/Images.xcassets/Interface/Search/Categories/nightlife.imageset/nightlife_dark.svg
index 289845706..c8df9702c 100644
--- a/iphone/Maps/Images.xcassets/Interface/Search/Categories/nightlife.imageset/nightlife_dark.svg
+++ b/iphone/Maps/Images.xcassets/Interface/Search/Categories/nightlife.imageset/nightlife_dark.svg
@@ -1 +1,7 @@
-<svg height="28" viewBox="0 0 28 28" width="28" xmlns="http://www.w3.org/2000/svg"><g fill="none" opacity=".898664"><circle cx="14" cy="14" fill="#bb9342" fill-rule="evenodd" r="14"/><path d="m21 8.42778167c0-.62221834-.5055517-1.12778167-1.1277817-1.12778167h-11.7448333c-.62221833 0-1.12778167.50555167-1.12778167 1.12778167 0 .27221833.1011115.54444833.28778167.74666666l5.9344833 6.68114997v3.88885h-3.11115c-.42778163 0-.77778163.35-.77778163.7777817s.35.7777817.77778163.7777817h7.7778167c.4277817 0 .7777817-.35.7777817-.7777817s-.35-.7777817-.7777817-.7777817h-3.11115v-3.88885l5.9344833-6.68114997c.1866667-.20221833.2877817-.47444833.2877817-.74666666zm-10.5544833 1.98333333-1.3766667-1.55551667h9.87l-1.3844833 1.55551667z" fill="#000"/></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="28px" height="28px" viewBox="0 0 28 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>nightlife_dark</title>
+    <g id="nightlife_dark" stroke="none" fill="none" fill-rule="evenodd">
+        <path d="M14,0 C21.7319865,0 28,6.2680135 28,14 C28,21.7319865 21.7319865,28 14,28 C6.2680135,28 0,21.7319865 0,14 C0,6.2680135 6.2680135,0 14,0 Z M19.8722183,7.3 L8.127385,7.3 C7.50516667,7.3 6.99960333,7.80555167 6.99960333,8.42778167 C6.99960333,8.7 7.10071483,8.97223 7.287385,9.17444833 L13.2218683,15.8555983 L13.2218683,19.7444483 L10.1107183,19.7444483 C9.68293667,19.7444483 9.33293667,20.0944483 9.33293667,20.52223 C9.33293667,20.9500117 9.68293667,21.3000117 10.1107183,21.3000117 L17.888535,21.3000117 C18.3163167,21.3000117 18.6663167,20.9500117 18.6663167,20.52223 C18.6663167,20.0944483 18.3163167,19.7444483 17.888535,19.7444483 L14.777385,19.7444483 L14.777385,15.8555983 L20.7118683,9.17444833 C20.898535,8.97223 20.99965,8.7 20.99965,8.42778167 C21,7.80556333 20.4944483,7.3 19.8722183,7.3 Z M18.93885,8.85559833 L17.5543667,10.411115 L10.4455167,10.411115 L9.06885,8.85559833 L18.93885,8.85559833 Z" id="Shape" fill="#BB9342"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Interface/Search/Categories/nightlife.imageset/nightlife_light.svg b/iphone/Maps/Images.xcassets/Interface/Search/Categories/nightlife.imageset/nightlife_light.svg
index 6fdeb1a47..2eb05f748 100644
--- a/iphone/Maps/Images.xcassets/Interface/Search/Categories/nightlife.imageset/nightlife_light.svg
+++ b/iphone/Maps/Images.xcassets/Interface/Search/Categories/nightlife.imageset/nightlife_light.svg
@@ -1 +1,7 @@
-<svg height="28" viewBox="0 0 28 28" width="28" xmlns="http://www.w3.org/2000/svg"><g fill="none" opacity=".898664"><circle cx="14" cy="14" fill="#ec955e" fill-rule="evenodd" r="14"/><path d="m21 8.42778167c0-.62221834-.5055517-1.12778167-1.1277817-1.12778167h-11.7448333c-.62221833 0-1.12778167.50555167-1.12778167 1.12778167 0 .27221833.1011115.54444833.28778167.74666666l5.9344833 6.68114997v3.88885h-3.11115c-.42778163 0-.77778163.35-.77778163.7777817s.35.7777817.77778163.7777817h7.7778167c.4277817 0 .7777817-.35.7777817-.7777817s-.35-.7777817-.7777817-.7777817h-3.11115v-3.88885l5.9344833-6.68114997c.1866667-.20221833.2877817-.47444833.2877817-.74666666zm-10.5544833 1.98333333-1.3766667-1.55551667h9.87l-1.3844833 1.55551667z" fill="#fff"/></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="28px" height="28px" viewBox="0 0 28 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>nightlife_light</title>
+    <g id="nightlife_light" stroke="none" fill="none" fill-rule="evenodd">
+        <path d="M14,0 C21.7319865,0 28,6.2680135 28,14 C28,21.7319865 21.7319865,28 14,28 C6.2680135,28 0,21.7319865 0,14 C0,6.2680135 6.2680135,0 14,0 Z M19.8722183,7.3 L8.127385,7.3 C7.50516667,7.3 6.99960333,7.80555167 6.99960333,8.42778167 C6.99960333,8.7 7.10071483,8.97223 7.287385,9.17444833 L13.2218683,15.8555983 L13.2218683,19.7444483 L10.1107183,19.7444483 C9.68293667,19.7444483 9.33293667,20.0944483 9.33293667,20.52223 C9.33293667,20.9500117 9.68293667,21.3000117 10.1107183,21.3000117 L17.888535,21.3000117 C18.3163167,21.3000117 18.6663167,20.9500117 18.6663167,20.52223 C18.6663167,20.0944483 18.3163167,19.7444483 17.888535,19.7444483 L14.777385,19.7444483 L14.777385,15.8555983 L20.7118683,9.17444833 C20.898535,8.97223 20.99965,8.7 20.99965,8.42778167 C21,7.80556333 20.4944483,7.3 19.8722183,7.3 Z M18.93885,8.85559833 L17.5543667,10.411115 L10.4455167,10.411115 L9.06885,8.85559833 L18.93885,8.85559833 Z" id="Shape" fill="#EC955E"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Interface/Search/Categories/parking.imageset/parking_dark.svg b/iphone/Maps/Images.xcassets/Interface/Search/Categories/parking.imageset/parking_dark.svg
index 2f979c0d0..bf4010aa9 100644
--- a/iphone/Maps/Images.xcassets/Interface/Search/Categories/parking.imageset/parking_dark.svg
+++ b/iphone/Maps/Images.xcassets/Interface/Search/Categories/parking.imageset/parking_dark.svg
@@ -1 +1,7 @@
-<svg height="28" viewBox="0 0 28 28" width="28" xmlns="http://www.w3.org/2000/svg"><g fill="none" opacity=".898664"><circle cx="14" cy="14" fill="#2e89b0" fill-rule="evenodd" r="14"/><path d="m9.35 22.3h3.8340042v-5.920267h1.2647125c2.0466166 0 3.644925-.4564291 4.7451875-1.3899732 1.1239333-.9449405 1.6560958-2.3210274 1.6560958-4.097232 0-1.71922277-.4977967-3.02999607-1.5388917-3.89525776-1.0529208-.87666763-2.6016833-1.29727004-4.6128416-1.29727004l-5.3479792.0002873zm3.8340042-13.69574699h1.372525c.94645 0 1.6210208.18237054 2.0588833.56946382.4495542.39848964.6730279.99004707.6730279 1.82121547 0 .8083565-.2365741 1.4341221-.7807925 1.8667051-.5323733.4212536-1.34895.6713511-2.4256375.6713511h-.8980062z" fill="#000"/></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="28px" height="28px" viewBox="0 0 28 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>parking_dark</title>
+    <g id="parking_dark" stroke="none" fill="none" fill-rule="evenodd">
+        <path d="M14,0 C21.7319865,0 28,6.2680135 28,14 C28,21.7319865 21.7319865,28 14,28 C6.2680135,28 0,21.7319865 0,14 C0,6.2680135 6.2680135,0 14,0 Z M14.6982667,5.7 L9.3502875,5.7002873 L9.35,22.3 L13.1840042,22.3 L13.1840042,16.379733 L14.4487167,16.379733 C16.4953333,16.379733 18.0936417,15.9233039 19.1939042,14.9897598 C20.3178375,14.0448193 20.85,12.6687324 20.85,10.8925278 C20.85,9.17330503 20.3522033,7.86253173 19.3111083,6.99727004 C18.2581875,6.12060241 16.709425,5.7 14.6982667,5.7 Z M14.5565292,8.60425301 C15.5029792,8.60425301 16.17755,8.78662355 16.6154125,9.17371683 C17.0649667,9.57220647 17.2884404,10.1637639 17.2884404,10.9949323 C17.2884404,11.8032888 17.0518663,12.4290544 16.5076479,12.8616374 C15.9752746,13.282891 15.1586979,13.5329885 14.0820104,13.5329885 L13.1840042,13.5329885 L13.1840042,8.60425301 L14.5565292,8.60425301 Z" id="Shape" fill="#2E89B0"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Interface/Search/Categories/parking.imageset/parking_light.svg b/iphone/Maps/Images.xcassets/Interface/Search/Categories/parking.imageset/parking_light.svg
index e67611744..cd9f9e857 100644
--- a/iphone/Maps/Images.xcassets/Interface/Search/Categories/parking.imageset/parking_light.svg
+++ b/iphone/Maps/Images.xcassets/Interface/Search/Categories/parking.imageset/parking_light.svg
@@ -1 +1,7 @@
-<svg height="28" viewBox="0 0 28 28" width="28" xmlns="http://www.w3.org/2000/svg"><g fill="none" opacity=".898664"><circle cx="14" cy="14" fill="#2e89b0" fill-rule="evenodd" r="14"/><path d="m9.35 22.3h3.8340042v-5.920267h1.2647125c2.0466166 0 3.644925-.4564291 4.7451875-1.3899732 1.1239333-.9449405 1.6560958-2.3210274 1.6560958-4.097232 0-1.71922277-.4977967-3.02999607-1.5388917-3.89525776-1.0529208-.87666763-2.6016833-1.29727004-4.6128416-1.29727004l-5.3479792.0002873zm3.8340042-13.69574699h1.372525c.94645 0 1.6210208.18237054 2.0588833.56946382.4495542.39848964.6730279.99004707.6730279 1.82121547 0 .8083565-.2365741 1.4341221-.7807925 1.8667051-.5323733.4212536-1.34895.6713511-2.4256375.6713511h-.8980062z" fill="#fff"/></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="28px" height="28px" viewBox="0 0 28 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>parking_light</title>
+    <g id="parking_light" stroke="none" fill="none" fill-rule="evenodd">
+        <path d="M14,0 C21.7319865,0 28,6.2680135 28,14 C28,21.7319865 21.7319865,28 14,28 C6.2680135,28 0,21.7319865 0,14 C0,6.2680135 6.2680135,0 14,0 Z M14.6982667,5.7 L9.3502875,5.7002873 L9.35,22.3 L13.1840042,22.3 L13.1840042,16.379733 L14.4487167,16.379733 C16.4953333,16.379733 18.0936417,15.9233039 19.1939042,14.9897598 C20.3178375,14.0448193 20.85,12.6687324 20.85,10.8925278 C20.85,9.17330503 20.3522033,7.86253173 19.3111083,6.99727004 C18.2581875,6.12060241 16.709425,5.7 14.6982667,5.7 Z M14.5565292,8.60425301 C15.5029792,8.60425301 16.17755,8.78662355 16.6154125,9.17371683 C17.0649667,9.57220647 17.2884404,10.1637639 17.2884404,10.9949323 C17.2884404,11.8032888 17.0518663,12.4290544 16.5076479,12.8616374 C15.9752746,13.282891 15.1586979,13.5329885 14.0820104,13.5329885 L13.1840042,13.5329885 L13.1840042,8.60425301 L14.5565292,8.60425301 Z" id="Shape" fill="#2E89B0"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Interface/Search/Categories/pharmacy.imageset/pharmacy_dark.svg b/iphone/Maps/Images.xcassets/Interface/Search/Categories/pharmacy.imageset/pharmacy_dark.svg
index 64530f774..e044f6792 100644
--- a/iphone/Maps/Images.xcassets/Interface/Search/Categories/pharmacy.imageset/pharmacy_dark.svg
+++ b/iphone/Maps/Images.xcassets/Interface/Search/Categories/pharmacy.imageset/pharmacy_dark.svg
@@ -1 +1,7 @@
-<svg height="28" viewBox="0 0 28 28" width="28" xmlns="http://www.w3.org/2000/svg"><g fill="none" opacity=".898664"><circle cx="14" cy="14" fill="#c15746" fill-rule="evenodd" r="14"/><path d="m16.961 6.99999417c-1.0583067 0-2.11225.41071916-2.8883167 1.17973916l-5.8427833 5.81104997c-1.20458333 1.1935-1.53183333 2.92635-.94806833 4.3692834 0 0 .436555 1.0224083.85988 1.4418833.39849833.3948583.87964333.6729217 1.36698333.873845.13455167.0694132.23618.094717.352765.131075.015652.0048285.02840133.0172083.0440965.0218458 1.4026833.4145284 2.96765.0786462 4.0348-1.0267716l3.52765-3.49545 2.3150167-2.3157167c1.6227166-1.6079 1.6227166-4.18576667 0-5.72366667-.7055417-.83889166-1.7638834-1.26711666-2.8221667-1.26711666zm0 1.39813916c.7055417 0 1.4242667.27526334 1.9182333.76462167.4939667.48935833.77168 1.20155.77168 1.9006167 0 .6990783-.2778066 1.3893833-.77168 1.8788l-2.4032166 2.3812833-3.8102167-3.8003 2.3329833-2.29483333c.5644334-.559265 1.18615-.83018834 1.9623334-.83018834z" fill="#000"/></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="28px" height="28px" viewBox="0 0 28 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>pharmacy_dark</title>
+    <g id="pharmacy_dark" stroke="none" fill="none" fill-rule="evenodd">
+        <path d="M14,0 C21.7319865,0 28,6.2680135 28,14 C28,21.7319865 21.7319865,28 14,28 C6.2680135,28 0,21.7319865 0,14 C0,6.2680135 6.2680135,0 14,0 Z M16.9608565,6.99999417 C15.9026933,6.99999417 14.84875,7.41071333 14.0726833,8.17973333 L8.2299,13.9907833 C7.02531667,15.1842833 6.69806667,16.9171333 7.28183167,18.3600667 L7.3014167,18.4048176 C7.3907637,18.6062479 7.77130229,19.4349094 8.14171167,19.80195 C8.54021,20.1968083 9.021355,20.4748717 9.508695,20.675795 C9.64324667,20.7452082 9.744875,20.770512 9.86146,20.80687 L9.9055565,20.8287158 C11.3082398,21.2432442 12.8732065,20.907362 13.9403565,19.8019442 L17.4680065,16.3064942 L19.7830232,13.9907775 C21.4057398,12.3828775 21.4057398,9.80501083 19.7830232,8.26711083 C19.0774815,7.42821917 18.0191398,6.99999417 16.9608565,6.99999417 Z M16.96,8.398 C17.6665417,8.39813333 18.3852667,8.67339667 18.8792333,9.162755 C19.3732,9.65211333 19.6509133,10.364305 19.6509133,11.0633717 C19.6509133,11.76245 19.3731067,12.452755 18.8792333,12.9421717 L16.4760167,15.323455 L12.6658,11.523155 L14.9987833,9.22832167 C15.5119045,8.71989894 16.0723674,8.44977511 16.753187,8.40486353 L16.96,8.398 Z" id="Shape" fill="#C15746"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Interface/Search/Categories/pharmacy.imageset/pharmacy_light.svg b/iphone/Maps/Images.xcassets/Interface/Search/Categories/pharmacy.imageset/pharmacy_light.svg
index 2b53448b3..9616d0878 100644
--- a/iphone/Maps/Images.xcassets/Interface/Search/Categories/pharmacy.imageset/pharmacy_light.svg
+++ b/iphone/Maps/Images.xcassets/Interface/Search/Categories/pharmacy.imageset/pharmacy_light.svg
@@ -1 +1,7 @@
-<svg height="28" viewBox="0 0 28 28" width="28" xmlns="http://www.w3.org/2000/svg"><g fill="none" opacity=".898664"><circle cx="14" cy="14" fill="#d85961" fill-rule="evenodd" r="14"/><path d="m16.961 6.99999417c-1.0583067 0-2.11225.41071916-2.8883167 1.17973916l-5.8427833 5.81104997c-1.20458333 1.1935-1.53183333 2.92635-.94806833 4.3692834 0 0 .436555 1.0224083.85988 1.4418833.39849833.3948583.87964333.6729217 1.36698333.873845.13455167.0694132.23618.094717.352765.131075.015652.0048285.02840133.0172083.0440965.0218458 1.4026833.4145284 2.96765.0786462 4.0348-1.0267716l3.52765-3.49545 2.3150167-2.3157167c1.6227166-1.6079 1.6227166-4.18576667 0-5.72366667-.7055417-.83889166-1.7638834-1.26711666-2.8221667-1.26711666zm0 1.39813916c.7055417 0 1.4242667.27526334 1.9182333.76462167.4939667.48935833.77168 1.20155.77168 1.9006167 0 .6990783-.2778066 1.3893833-.77168 1.8788l-2.4032166 2.3812833-3.8102167-3.8003 2.3329833-2.29483333c.5644334-.559265 1.18615-.83018834 1.9623334-.83018834z" fill="#fff"/></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="28px" height="28px" viewBox="0 0 28 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>pharmacy_light</title>
+    <g id="pharmacy_light" stroke="none" fill="none" fill-rule="evenodd">
+        <path d="M14,0 C21.7319865,0 28,6.2680135 28,14 C28,21.7319865 21.7319865,28 14,28 C6.2680135,28 0,21.7319865 0,14 C0,6.2680135 6.2680135,0 14,0 Z M16.9608565,6.99999417 C15.9026933,6.99999417 14.84875,7.41071333 14.0726833,8.17973333 L8.2299,13.9907833 C7.02531667,15.1842833 6.69806667,16.9171333 7.28183167,18.3600667 L7.3014167,18.4048176 C7.3907637,18.6062479 7.77130229,19.4349094 8.14171167,19.80195 C8.54021,20.1968083 9.021355,20.4748717 9.508695,20.675795 C9.64324667,20.7452082 9.744875,20.770512 9.86146,20.80687 L9.9055565,20.8287158 C11.3082398,21.2432442 12.8732065,20.907362 13.9403565,19.8019442 L17.4680065,16.3064942 L19.7830232,13.9907775 C21.4057398,12.3828775 21.4057398,9.80501083 19.7830232,8.26711083 C19.0774815,7.42821917 18.0191398,6.99999417 16.9608565,6.99999417 Z M16.96,8.398 C17.6665417,8.39813333 18.3852667,8.67339667 18.8792333,9.162755 C19.3732,9.65211333 19.6509133,10.364305 19.6509133,11.0633717 C19.6509133,11.76245 19.3731067,12.452755 18.8792333,12.9421717 L16.4760167,15.323455 L12.6658,11.523155 L14.9987833,9.22832167 C15.5119045,8.71989894 16.0723674,8.44977511 16.753187,8.40486353 L16.96,8.398 Z" id="Shape" fill="#D85961"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Interface/Search/Categories/police.imageset/police_dark.svg b/iphone/Maps/Images.xcassets/Interface/Search/Categories/police.imageset/police_dark.svg
index 4e03bcde1..2af5b1575 100644
--- a/iphone/Maps/Images.xcassets/Interface/Search/Categories/police.imageset/police_dark.svg
+++ b/iphone/Maps/Images.xcassets/Interface/Search/Categories/police.imageset/police_dark.svg
@@ -1 +1,7 @@
-<svg height="28" viewBox="0 0 28 28" width="28" xmlns="http://www.w3.org/2000/svg"><g fill="none" opacity=".898664"><circle cx="14" cy="14" fill="#717065" fill-rule="evenodd" r="14"/><path d="m14 5.833275-6.68185 2.96975v4.4545667c0 4.1204333 2.8508667 7.9735833 6.68185 8.9091333 3.8308667-.9354567 6.68185-4.7885833 6.68185-8.9091333v-4.4545667zm1.85605 8.60475.668185 2.8806167-2.5242-1.5219167-2.5242 1.5219167.668185-2.87315-2.22728333-1.9229 2.94000003-.25242 1.1433333-2.7098167 1.1433333 2.7024667 2.94.25242-2.2272833 1.9229z" fill="#000"/></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="28px" height="28px" viewBox="0 0 28 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>police_dark</title>
+    <g id="police_dark" stroke="none" fill="none" fill-rule="evenodd">
+        <path d="M14,0 C21.7319865,0 28,6.2680135 28,14 C28,21.7319865 21.7319865,28 14,28 C6.2680135,28 0,21.7319865 0,14 C0,6.2680135 6.2680135,0 14,0 Z M14,5.833275 L7.31815,8.803025 L7.31815,13.2575917 C7.31815,17.378025 10.1690167,21.231175 14,22.166725 C17.8308667,21.2312683 20.68185,17.3781417 20.68185,13.2575917 L20.68185,8.803025 L14,5.833275 Z M14.00007,9.560355 L15.1434033,12.2628217 L18.0834033,12.5152417 L15.85612,14.4381417 L16.524235,17.3186417 L14.000035,15.796725 L11.475835,17.3186417 L12.14402,14.4454917 L9.91673667,12.5225917 L12.8567367,12.2701717 L14.00007,9.560355 Z" id="Shape" fill="#717065"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Interface/Search/Categories/police.imageset/police_light.svg b/iphone/Maps/Images.xcassets/Interface/Search/Categories/police.imageset/police_light.svg
index ae60c6d13..1758d1144 100644
--- a/iphone/Maps/Images.xcassets/Interface/Search/Categories/police.imageset/police_light.svg
+++ b/iphone/Maps/Images.xcassets/Interface/Search/Categories/police.imageset/police_light.svg
@@ -1 +1,7 @@
-<svg height="28" viewBox="0 0 28 28" width="28" xmlns="http://www.w3.org/2000/svg"><g fill="none" opacity=".898664"><circle cx="14" cy="14" fill="#747e86" fill-rule="evenodd" r="14"/><path d="m14 5.833275-6.68185 2.96975v4.4545667c0 4.1204333 2.8508667 7.9735833 6.68185 8.9091333 3.8308667-.9354567 6.68185-4.7885833 6.68185-8.9091333v-4.4545667zm1.85605 8.60475.668185 2.8806167-2.5242-1.5219167-2.5242 1.5219167.668185-2.87315-2.22728333-1.9229 2.94000003-.25242 1.1433333-2.7098167 1.1433333 2.7024667 2.94.25242-2.2272833 1.9229z" fill="#fff"/></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="28px" height="28px" viewBox="0 0 28 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>police_light</title>
+    <g id="police_light" stroke="none" fill="none" fill-rule="evenodd">
+        <path d="M14,0 C21.7319865,0 28,6.2680135 28,14 C28,21.7319865 21.7319865,28 14,28 C6.2680135,28 0,21.7319865 0,14 C0,6.2680135 6.2680135,0 14,0 Z M14,5.833275 L7.31815,8.803025 L7.31815,13.2575917 C7.31815,17.378025 10.1690167,21.231175 14,22.166725 C17.8308667,21.2312683 20.68185,17.3781417 20.68185,13.2575917 L20.68185,8.803025 L14,5.833275 Z M14.00007,9.560355 L15.1434033,12.2628217 L18.0834033,12.5152417 L15.85612,14.4381417 L16.524235,17.3186417 L14.000035,15.796725 L11.475835,17.3186417 L12.14402,14.4454917 L9.91673667,12.5225917 L12.8567367,12.2701717 L14.00007,9.560355 Z" id="Shape" fill="#747E86"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Interface/Search/Categories/post.imageset/post_dark.svg b/iphone/Maps/Images.xcassets/Interface/Search/Categories/post.imageset/post_dark.svg
index e33179399..5a83f73ea 100644
--- a/iphone/Maps/Images.xcassets/Interface/Search/Categories/post.imageset/post_dark.svg
+++ b/iphone/Maps/Images.xcassets/Interface/Search/Categories/post.imageset/post_dark.svg
@@ -1 +1,7 @@
-<svg height="28" viewBox="0 0 28 28" width="28" xmlns="http://www.w3.org/2000/svg"><g fill="none" opacity=".898664"><circle cx="14" cy="14" fill="#717065" fill-rule="evenodd" r="14"/><path d="m20.5333333 7.46666667h-14.69999997c.735 0 .00816667.735.00816667 1.63333333l-.00816667 9.8c0 .8983333.735 1.6333333 0 1.6333333h14.69999997c.8983334 0 1.6333334-.735 1.6333334-1.6333333v-9.8c0-.89833333-.735-1.63333333-1.6333334-1.63333333zm-.3266666 3.47083333-5.7738334 3.6096667c-.2613333.1633333-.6043333.1633333-.8656666 0l-5.77383337-3.6096667c-.20416666-.1306667-.32666666-.3511667-.32666666-.588 0-.54716667.59616666-.87383333 1.06166666-.588l5.47166667 3.4218333 5.4716667-3.4218333c.4655-.28583333 1.0616666.04083333 1.0616666.588 0 .2368333-.1225.4573333-.3266666.588z" fill="#000"/></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="28px" height="28px" viewBox="0 0 28 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>post_dark</title>
+    <g id="post_dark" stroke="none" fill="none" fill-rule="evenodd">
+        <path d="M14,28 C21.7319865,28 28,21.7319865 28,14 C28,6.2680135 21.7319865,0 14,0 C6.2680135,0 0,6.2680135 0,14 C0,21.7319865 6.2680135,28 14,28 Z M20.5333333,7 C21.4316667,7 22.1666667,7.735 22.1666667,8.63333333 L22.1666667,18.4333333 C22.1666667,19.3316667 21.4316667,20.0666667 20.5333333,20.0666667 L7.46666667,20.0666667 C6.56833333,20.0666667 5.83333333,19.3316667 5.83333333,18.4333333 L5.8415,8.63333333 C5.8415,7.735 6.56833333,7 7.46666667,7 L20.5333333,7 Z M20.5333333,9.88283333 C20.5333333,9.33566667 19.9371667,9.009 19.4716667,9.29483333 L14,12.7166667 L8.52833333,9.29483333 C8.06283333,9.009 7.46666667,9.33566667 7.46666667,9.88283333 C7.46666667,10.1196667 7.58916667,10.3401667 7.79333333,10.4708333 L13.5671667,14.0805 C13.8285,14.2438333 14.1715,14.2438333 14.4328333,14.0805 L20.2066667,10.4708333 C20.4108333,10.3401667 20.5333333,10.1196667 20.5333333,9.88283333 Z" id="Shape" fill="#717065"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Interface/Search/Categories/post.imageset/post_light.svg b/iphone/Maps/Images.xcassets/Interface/Search/Categories/post.imageset/post_light.svg
index 43ef4913b..c20a449f8 100644
--- a/iphone/Maps/Images.xcassets/Interface/Search/Categories/post.imageset/post_light.svg
+++ b/iphone/Maps/Images.xcassets/Interface/Search/Categories/post.imageset/post_light.svg
@@ -1 +1,7 @@
-<svg height="28" viewBox="0 0 28 28" width="28" xmlns="http://www.w3.org/2000/svg"><g fill="none" opacity=".898664"><circle cx="14" cy="14" fill="#747e86" fill-rule="evenodd" r="14"/><path d="m20.5333333 7.46666667h-13.06666663c-.89833334 0-1.62516667.735-1.62516667 1.63333333l-.00816667 9.8c0 .8983333.735 1.6333333 1.63333334 1.6333333h13.06666663c.8983334 0 1.6333334-.735 1.6333334-1.6333333v-9.8c0-.89833333-.735-1.63333333-1.6333334-1.63333333zm-.3266666 3.47083333-5.7738334 3.6096667c-.2613333.1633333-.6043333.1633333-.8656666 0l-5.77383337-3.6096667c-.20416666-.1306667-.32666666-.3511667-.32666666-.588 0-.54716667.59616666-.87383333 1.06166666-.588l5.47166667 3.4218333 5.4716667-3.4218333c.4655-.28583333 1.0616666.04083333 1.0616666.588 0 .2368333-.1225.4573333-.3266666.588z" fill="#fff"/></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="28px" height="28px" viewBox="0 0 28 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>post_light</title>
+    <g id="post_light" stroke="none" fill="none" fill-rule="evenodd">
+        <path d="M14,28 C21.7319865,28 28,21.7319865 28,14 C28,6.2680135 21.7319865,0 14,0 C6.2680135,0 0,6.2680135 0,14 C0,21.7319865 6.2680135,28 14,28 Z M20.5333333,7 C21.4316667,7 22.1666667,7.735 22.1666667,8.63333333 L22.1666667,18.4333333 C22.1666667,19.3316667 21.4316667,20.0666667 20.5333333,20.0666667 L7.46666667,20.0666667 C6.56833333,20.0666667 5.83333333,19.3316667 5.83333333,18.4333333 L5.8415,8.63333333 C5.8415,7.735 6.56833333,7 7.46666667,7 L20.5333333,7 Z M20.5333333,9.88283333 C20.5333333,9.33566667 19.9371667,9.009 19.4716667,9.29483333 L14,12.7166667 L8.52833333,9.29483333 C8.06283333,9.009 7.46666667,9.33566667 7.46666667,9.88283333 C7.46666667,10.1196667 7.58916667,10.3401667 7.79333333,10.4708333 L13.5671667,14.0805 C13.8285,14.2438333 14.1715,14.2438333 14.4328333,14.0805 L20.2066667,10.4708333 C20.4108333,10.3401667 20.5333333,10.1196667 20.5333333,9.88283333 Z" id="Shape" fill="#747E86"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Interface/Search/Categories/recycling.imageset/recycling_dark.svg b/iphone/Maps/Images.xcassets/Interface/Search/Categories/recycling.imageset/recycling_dark.svg
index 37f12be58..018625c75 100644
--- a/iphone/Maps/Images.xcassets/Interface/Search/Categories/recycling.imageset/recycling_dark.svg
+++ b/iphone/Maps/Images.xcassets/Interface/Search/Categories/recycling.imageset/recycling_dark.svg
@@ -1 +1,7 @@
-<svg height="28" viewBox="0 0 28 28" width="28" xmlns="http://www.w3.org/2000/svg"><g fill="none" opacity=".898664"><circle cx="14" cy="14" fill="#717065" fill-rule="evenodd" r="14"/><path d="m9.26178239 9.86916295 1.15760091-1.91854814.8338035-1.3842689c.3157104-.52618004 1.0766576-.52618004 1.3924045 0l1.1980847 1.99140439-.9957022 1.6675583-.809518 1.3114127zm12.91134321 4.71137135-1.2952628-2.1532667-2.8009589 1.6189875 1.7889854 2.9871066h.9147468c.6152347 0 1.1737993-.3480951 1.4489895-.8985606.1133316-.2266679.169998-.4695221.169998-.7204633 0-.2914251-.0809518-.5747509-.226668-.8338035zm-4.6303795 6.5003568h1.214271c.6152347 0 1.1737993-.3480951 1.4489895-.8985605l1.1737994-2.3395359h-3.8370963v-1.6189875l-3.2380964 3.2380964 3.2380964 3.2380964v-1.6189875zm-4.8570839-3.2380964h-3.48095054l-.67999175 1.1414147c-.24285419.4047529-.25904042.9066597-.04857083 1.3356981.22666796.4614229.70427716.7609472 1.23042077.7609472h2.97897095v-3.2380964zm-3.14095467-2.1452525 1.40041867.8418905-1.10903007-4.4442318-4.43609613 1.1090301 1.37613329.8257043-.33189668.5585646c-.28332585.4776092-.30761127 1.0604593-.05666639 1.5542669l1.31954826 2.6389751 1.83755626-3.0842483zm8.82374287-7.45562378-1.0523722-1.75668581c-.2995243-.48570839-.8257043-.78523261-1.3924046-.78523261h-2.8575438l2.5256836 4.20951317-1.3924045.83380343 4.4442317 1.1090301 1.1090301-4.44423173-1.3842689.83380345z" fill="#000"/></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="28px" height="28px" viewBox="0 0 28 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>recycling_dark</title>
+    <g id="recycling_dark" stroke="none" fill="none" fill-rule="evenodd">
+        <path d="M14,0 C21.7319865,0 28,6.2680135 28,14 C28,21.7319865 21.7319865,28 14,28 C6.2680135,28 0,21.7319865 0,14 C0,6.2680135 6.2680135,0 14,0 Z M17.5427097,16.2238072 L14.3046133,19.4619036 L17.5427097,22.7 L17.5427461,21.0808911 L18.7570171,21.0808911 C19.3722518,21.0808911 19.9308164,20.732796 20.2060066,20.1823306 L21.379806,17.8427947 L17.5427097,17.8427947 L17.5427097,16.2238072 Z M12.6855408,17.8427583 L9.20471166,17.8427947 L8.52471991,18.9842094 C8.28186572,19.3889623 8.26567949,19.8908691 8.47614908,20.3199075 C8.70281704,20.7813304 9.18042624,21.0808547 9.70656985,21.0808547 L12.6855408,21.0808547 L12.6855408,17.8427583 Z M9.83609613,12.0952009 L5.4,13.204231 L6.77613329,14.0299353 L6.44423661,14.5884999 C6.16091076,15.0661091 6.13662534,15.6489592 6.38757022,16.1427668 L7.70711848,18.7817419 L9.54467474,15.6974936 L10.9451262,16.5394327 L9.83609613,12.0952009 Z M20.8778628,12.4272676 L18.0769039,14.0462551 L19.8658893,17.0333617 L20.7806361,17.0333617 C21.3958708,17.0333617 21.9544354,16.6852666 22.2296256,16.1348011 C22.3429572,15.9081332 22.3996236,15.665279 22.3996236,15.4143378 C22.3996236,15.1229127 22.3186718,14.8395869 22.1729556,14.5805343 L20.8778628,12.4272676 Z M15.9236736,5.7 L13.0661298,5.7 L15.5918134,9.90951317 L14.1994089,10.7433166 L18.6436406,11.8523467 L19.7526707,7.40811497 L18.3684018,8.24191842 L17.3160782,6.48523261 C17.0165539,5.99952422 16.4903739,5.7 15.9236736,5.7 Z M12.6455913,6.56634591 C12.3298444,6.04016587 11.5688972,6.04016587 11.2531868,6.56634591 L10.4193833,7.95061481 L9.26178239,9.86916295 L12.0384558,11.5367213 L12.8479738,10.2253086 L13.843676,8.5577503 Z" id="Shape" fill="#717065"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Interface/Search/Categories/recycling.imageset/recycling_light.svg b/iphone/Maps/Images.xcassets/Interface/Search/Categories/recycling.imageset/recycling_light.svg
index e2b56ad26..e3c91ab61 100644
--- a/iphone/Maps/Images.xcassets/Interface/Search/Categories/recycling.imageset/recycling_light.svg
+++ b/iphone/Maps/Images.xcassets/Interface/Search/Categories/recycling.imageset/recycling_light.svg
@@ -1 +1,7 @@
-<svg height="28" viewBox="0 0 28 28" width="28" xmlns="http://www.w3.org/2000/svg"><g fill="none" opacity=".898664"><circle cx="14" cy="14" fill="#747e86" fill-rule="evenodd" r="14"/><path d="m9.26178239 9.86916295 1.15760091-1.91854814.8338035-1.3842689c.3157104-.52618004 1.0766576-.52618004 1.3924045 0l1.1980847 1.99140439-.9957022 1.6675583-.809518 1.3114127zm12.91134321 4.71137135-1.2952628-2.1532667-2.8009589 1.6189875 1.7889854 2.9871066h.9147468c.6152347 0 1.1737993-.3480951 1.4489895-.8985606.1133316-.2266679.169998-.4695221.169998-.7204633 0-.2914251-.0809518-.5747509-.226668-.8338035zm-4.6303795 6.5003568h1.214271c.6152347 0 1.1737993-.3480951 1.4489895-.8985605l1.1737994-2.3395359h-3.8370963v-1.6189875l-3.2380964 3.2380964 3.2380964 3.2380964v-1.6189875zm-4.8570839-3.2380964h-3.48095054l-.67999175 1.1414147c-.24285419.4047529-.25904042.9066597-.04857083 1.3356981.22666796.4614229.70427716.7609472 1.23042077.7609472h2.97897095v-3.2380964zm-3.14095467-2.1452525 1.40041867.8418905-1.10903007-4.4442318-4.43609613 1.1090301 1.37613329.8257043-.33189668.5585646c-.28332585.4776092-.30761127 1.0604593-.05666639 1.5542669l1.31954826 2.6389751 1.83755626-3.0842483zm8.82374287-7.45562378-1.0523722-1.75668581c-.2995243-.48570839-.8257043-.78523261-1.3924046-.78523261h-2.8575438l2.5256836 4.20951317-1.3924045.83380343 4.4442317 1.1090301 1.1090301-4.44423173-1.3842689.83380345z" fill="#fff"/></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="28px" height="28px" viewBox="0 0 28 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>recycling_light</title>
+    <g id="recycling_light" stroke="none" fill="none" fill-rule="evenodd">
+        <path d="M14,0 C21.7319865,0 28,6.2680135 28,14 C28,21.7319865 21.7319865,28 14,28 C6.2680135,28 0,21.7319865 0,14 C0,6.2680135 6.2680135,0 14,0 Z M17.5427097,16.2238072 L14.3046133,19.4619036 L17.5427097,22.7 L17.5427461,21.0808911 L18.7570171,21.0808911 C19.3722518,21.0808911 19.9308164,20.732796 20.2060066,20.1823306 L21.379806,17.8427947 L17.5427097,17.8427947 L17.5427097,16.2238072 Z M12.6855408,17.8427583 L9.20471166,17.8427947 L8.52471991,18.9842094 C8.28186572,19.3889623 8.26567949,19.8908691 8.47614908,20.3199075 C8.70281704,20.7813304 9.18042624,21.0808547 9.70656985,21.0808547 L12.6855408,21.0808547 L12.6855408,17.8427583 Z M9.83609613,12.0952009 L5.4,13.204231 L6.77613329,14.0299353 L6.44423661,14.5884999 C6.16091076,15.0661091 6.13662534,15.6489592 6.38757022,16.1427668 L7.70711848,18.7817419 L9.54467474,15.6974936 L10.9451262,16.5394327 L9.83609613,12.0952009 Z M20.8778628,12.4272676 L18.0769039,14.0462551 L19.8658893,17.0333617 L20.7806361,17.0333617 C21.3958708,17.0333617 21.9544354,16.6852666 22.2296256,16.1348011 C22.3429572,15.9081332 22.3996236,15.665279 22.3996236,15.4143378 C22.3996236,15.1229127 22.3186718,14.8395869 22.1729556,14.5805343 L20.8778628,12.4272676 Z M15.9236736,5.7 L13.0661298,5.7 L15.5918134,9.90951317 L14.1994089,10.7433166 L18.6436406,11.8523467 L19.7526707,7.40811497 L18.3684018,8.24191842 L17.3160782,6.48523261 C17.0165539,5.99952422 16.4903739,5.7 15.9236736,5.7 Z M12.6455913,6.56634591 C12.3298444,6.04016587 11.5688972,6.04016587 11.2531868,6.56634591 L10.4193833,7.95061481 L9.26178239,9.86916295 L12.0384558,11.5367213 L12.8479738,10.2253086 L13.843676,8.5577503 Z" id="Shape" fill="#747E86"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Interface/Search/Categories/rv.imageset/rv_dark.svg b/iphone/Maps/Images.xcassets/Interface/Search/Categories/rv.imageset/rv_dark.svg
index 728530bed..eeb7da0ea 100644
--- a/iphone/Maps/Images.xcassets/Interface/Search/Categories/rv.imageset/rv_dark.svg
+++ b/iphone/Maps/Images.xcassets/Interface/Search/Categories/rv.imageset/rv_dark.svg
@@ -1 +1,7 @@
-<svg height="28" viewBox="0 0 28 28" width="28" xmlns="http://www.w3.org/2000/svg"><g fill="none" opacity=".898664"><circle cx="14" cy="14" fill="#717065" fill-rule="evenodd" r="14"/><path d="m8.33758333 7.43983333c-1.3811 0-2.50425 1.15025167-2.50425 2.56584997v6.9340834c0 1.1097916.690515 2.0578833 1.65433334 2.41535-.02986685-.158593-.04739089-.319368-.05240667-.4808067-.00003029-.8088742.31353599-1.5846086.87167531-2.1564454.55813931-.5718368 1.31510047-.892902 2.10425799-.8925213 1.6425149.0004623 2.9737796 1.3654146 2.9737167 3.0489667-.0018818.2131092-.0255585.4254288-.0706417.6334767h10.017c.336665 0 .61068-.2815634.61068-.62664 0-.3450767-.2740266-.6243534-.61068-.6243534h-1.8571c.22582-.3854433.3554717-.8357416.3554717-1.31705v-3.5707c0-3.2706333-2.5946667-5.92920997-5.7855-5.92920997h-7.70641667zm.546875 2.16241667h2.11003337c.3367116 0 .6106916.2793.6106916.624365v2.16475c0 .3450767-.2740266.6243533-.6106916.6243533h-2.11003337c-.336665 0-.61069166-.2793-.61069166-.6243533v-2.16475c0-.34507667.27402666-.624365.61069166-.624365zm7.76346667 1.082375h.1617817c1.4561166 0 2.6387666 1.2146167 2.6387666 2.7070167v4.865h-1.21905v-4.865c0-.8032734-.63588-1.4583334-1.4196-1.4583334h-.1617816c-.783685 0-1.4196.65506-1.4196 1.4583334v4.865h-1.2213834v-4.865c0-1.4924 1.1848667-2.7070167 2.6409834-2.7070167zm-6.2367667 6.3734997c-.47011658-.0002853-.92107214.1909362-1.25358263.5315647s-.519284.8027369-.519284 1.2845856.18677351.9439571.519284 1.2845856.78346605.53185 1.25358263.5315647c.9780906-.0007264 1.7705965-.8136507 1.7705334-1.8161503.0000631-1.0024996-.7924428-1.8154239-1.7705334-1.8161503z" fill="#000"/></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="28px" height="28px" viewBox="0 0 28 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>rv_dark</title>
+    <g id="rv_dark" stroke="none" fill="none" fill-rule="evenodd">
+        <path d="M14,0 C21.7319865,0 28,6.2680135 28,14 C28,21.7319865 21.7319865,28 14,28 C6.2680135,28 0,21.7319865 0,14 C0,6.2680135 6.2680135,0 14,0 Z M10.4111583,17.0581247 C9.94104172,17.0578394 9.49008616,17.2490609 9.15757567,17.5896894 C8.82506518,17.9303179 8.63829167,18.3924263 8.63829167,18.874275 C8.63829167,19.3561237 8.82506518,19.8182321 9.15757567,20.1588606 C9.49008616,20.4994891 9.94104172,20.6907106 10.4111583,20.6904253 C11.3892489,20.6896989 12.1817548,19.8767746 12.1816917,18.874275 C12.1817548,17.8717754 11.3892489,17.0588511 10.4111583,17.0581247 Z M16.04414,7.43983333 L8.33772333,7.43983333 C6.95648333,7.43983333 5.83333333,8.590085 5.83333333,10.0056833 L5.83333333,16.9397667 C5.83333333,18.0495583 6.52384833,18.99765 7.48766667,19.3551167 C7.45779982,19.1965237 7.44027578,19.0357487 7.43526,18.87431 C7.43522971,18.0654358 7.74879599,17.2897014 8.30693531,16.7178646 C8.86507462,16.1460278 9.62203578,15.8249626 10.4111933,15.8253433 C12.0537082,15.8258056 13.3849729,17.1907579 13.38491,18.87431 C13.3830282,19.0874192 13.3593515,19.2997388 13.3142683,19.5077867 L23.3312683,19.5077867 C23.6679333,19.5077867 23.9419483,19.2262233 23.9419483,18.8811467 C23.9419483,18.53607 23.6679217,18.2567933 23.3312683,18.2567933 L21.4741683,18.2567933 C21.6999883,17.87135 21.82964,17.4210517 21.82964,16.9397433 L21.82964,13.3690433 C21.82964,10.09841 19.2349733,7.43983333 16.04414,7.43983333 Z M16.8097067,10.684625 C18.2658233,10.684625 19.4484733,11.8992417 19.4484733,13.3916417 L19.4484733,18.2566417 L18.2294233,18.2566417 L18.2294233,13.3916417 C18.2294233,12.5883683 17.5935433,11.9333083 16.8098233,11.9333083 L16.6480417,11.9333083 C15.8643567,11.9333083 15.2284417,12.5883683 15.2284417,13.3916417 L15.2284417,18.2566417 L14.0070583,18.2566417 L14.0070583,13.3916417 C14.0070583,11.8992417 15.191925,10.684625 16.6480417,10.684625 L16.8097067,10.684625 Z M10.9944917,9.60225 C11.3312033,9.60225 11.6051833,9.88155 11.6051833,10.226615 L11.6051833,12.391365 C11.6051833,12.7364417 11.3311567,13.0157183 10.9944917,13.0157183 L8.88445833,13.0157183 C8.54779333,13.0157183 8.27376667,12.7364183 8.27376667,12.391365 L8.27376667,10.226615 C8.27376667,9.88153833 8.54779333,9.60225 8.88445833,9.60225 L10.9944917,9.60225 Z" id="Shape" fill="#717065"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Interface/Search/Categories/rv.imageset/rv_light.svg b/iphone/Maps/Images.xcassets/Interface/Search/Categories/rv.imageset/rv_light.svg
index 9ce110fb6..6ee89e91c 100644
--- a/iphone/Maps/Images.xcassets/Interface/Search/Categories/rv.imageset/rv_light.svg
+++ b/iphone/Maps/Images.xcassets/Interface/Search/Categories/rv.imageset/rv_light.svg
@@ -1 +1,7 @@
-<svg height="28" viewBox="0 0 28 28" width="28" xmlns="http://www.w3.org/2000/svg"><g fill="none" opacity=".898664"><circle cx="14" cy="14" fill="#747e86" fill-rule="evenodd" r="14"/><path d="m8.33758333 7.43983333c-1.3811 0-2.50425 1.15025167-2.50425 2.56584997v6.9340834c0 1.1097916.690515 2.0578833 1.65433334 2.41535-.02986685-.158593-.04739089-.319368-.05240667-.4808067-.00003029-.8088742.31353599-1.5846086.87167531-2.1564454.55813931-.5718368 1.31510047-.892902 2.10425799-.8925213 1.6425149.0004623 2.9737796 1.3654146 2.9737167 3.0489667-.0018818.2131092-.0255585.4254288-.0706417.6334767h10.017c.336665 0 .61068-.2815634.61068-.62664 0-.3450767-.2740266-.6243534-.61068-.6243534h-1.8571c.22582-.3854433.3554717-.8357416.3554717-1.31705v-3.5707c0-3.2706333-2.5946667-5.92920997-5.7855-5.92920997h-7.70641667zm.546875 2.16241667h2.11003337c.3367116 0 .6106916.2793.6106916.624365v2.16475c0 .3450767-.2740266.6243533-.6106916.6243533h-2.11003337c-.336665 0-.61069166-.2793-.61069166-.6243533v-2.16475c0-.34507667.27402666-.624365.61069166-.624365zm7.76346667 1.082375h.1617817c1.4561166 0 2.6387666 1.2146167 2.6387666 2.7070167v4.865h-1.21905v-4.865c0-.8032734-.63588-1.4583334-1.4196-1.4583334h-.1617816c-.783685 0-1.4196.65506-1.4196 1.4583334v4.865h-1.2213834v-4.865c0-1.4924 1.1848667-2.7070167 2.6409834-2.7070167zm-6.2367667 6.3734997c-.47011658-.0002853-.92107214.1909362-1.25358263.5315647s-.519284.8027369-.519284 1.2845856.18677351.9439571.519284 1.2845856.78346605.53185 1.25358263.5315647c.9780906-.0007264 1.7705965-.8136507 1.7705334-1.8161503.0000631-1.0024996-.7924428-1.8154239-1.7705334-1.8161503z" fill="#fff"/></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="28px" height="28px" viewBox="0 0 28 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>rv_light</title>
+    <g id="rv_light" stroke="none" fill="none" fill-rule="evenodd">
+        <path d="M14,0 C21.7319865,0 28,6.2680135 28,14 C28,21.7319865 21.7319865,28 14,28 C6.2680135,28 0,21.7319865 0,14 C0,6.2680135 6.2680135,0 14,0 Z M10.4111583,17.0581247 C9.94104172,17.0578394 9.49008616,17.2490609 9.15757567,17.5896894 C8.82506518,17.9303179 8.63829167,18.3924263 8.63829167,18.874275 C8.63829167,19.3561237 8.82506518,19.8182321 9.15757567,20.1588606 C9.49008616,20.4994891 9.94104172,20.6907106 10.4111583,20.6904253 C11.3892489,20.6896989 12.1817548,19.8767746 12.1816917,18.874275 C12.1817548,17.8717754 11.3892489,17.0588511 10.4111583,17.0581247 Z M16.04414,7.43983333 L8.33772333,7.43983333 C6.95648333,7.43983333 5.83333333,8.590085 5.83333333,10.0056833 L5.83333333,16.9397667 C5.83333333,18.0495583 6.52384833,18.99765 7.48766667,19.3551167 C7.45779982,19.1965237 7.44027578,19.0357487 7.43526,18.87431 C7.43522971,18.0654358 7.74879599,17.2897014 8.30693531,16.7178646 C8.86507462,16.1460278 9.62203578,15.8249626 10.4111933,15.8253433 C12.0537082,15.8258056 13.3849729,17.1907579 13.38491,18.87431 C13.3830282,19.0874192 13.3593515,19.2997388 13.3142683,19.5077867 L23.3312683,19.5077867 C23.6679333,19.5077867 23.9419483,19.2262233 23.9419483,18.8811467 C23.9419483,18.53607 23.6679217,18.2567933 23.3312683,18.2567933 L21.4741683,18.2567933 C21.6999883,17.87135 21.82964,17.4210517 21.82964,16.9397433 L21.82964,13.3690433 C21.82964,10.09841 19.2349733,7.43983333 16.04414,7.43983333 Z M16.8097067,10.684625 C18.2658233,10.684625 19.4484733,11.8992417 19.4484733,13.3916417 L19.4484733,18.2566417 L18.2294233,18.2566417 L18.2294233,13.3916417 C18.2294233,12.5883683 17.5935433,11.9333083 16.8098233,11.9333083 L16.6480417,11.9333083 C15.8643567,11.9333083 15.2284417,12.5883683 15.2284417,13.3916417 L15.2284417,18.2566417 L14.0070583,18.2566417 L14.0070583,13.3916417 C14.0070583,11.8992417 15.191925,10.684625 16.6480417,10.684625 L16.8097067,10.684625 Z M10.9944917,9.60225 C11.3312033,9.60225 11.6051833,9.88155 11.6051833,10.226615 L11.6051833,12.391365 C11.6051833,12.7364417 11.3311567,13.0157183 10.9944917,13.0157183 L8.88445833,13.0157183 C8.54779333,13.0157183 8.27376667,12.7364183 8.27376667,12.391365 L8.27376667,10.226615 C8.27376667,9.88153833 8.54779333,9.60225 8.88445833,9.60225 L10.9944917,9.60225 Z" id="Shape" fill="#747E86"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Interface/Search/Categories/secondhand.imageset/secondhand_dark.svg b/iphone/Maps/Images.xcassets/Interface/Search/Categories/secondhand.imageset/secondhand_dark.svg
index 4630f45aa..509e1d257 100644
--- a/iphone/Maps/Images.xcassets/Interface/Search/Categories/secondhand.imageset/secondhand_dark.svg
+++ b/iphone/Maps/Images.xcassets/Interface/Search/Categories/secondhand.imageset/secondhand_dark.svg
@@ -1 +1,7 @@
-<svg height="28" viewBox="0 0 28 28" width="28" xmlns="http://www.w3.org/2000/svg"><g fill="none" opacity=".898664"><circle cx="14" cy="14" fill="#8c5f93" fill-rule="evenodd" r="14"/><path d="m13.9999526 5c-2.1466666 0-3.8896666 1.743-3.8896666 3.88966667h-1.55400003c-.85555167 0-1.54945.69848333-1.54945 1.55400003l-.00683597 9.3333333c0 .8555517.70075833 1.5563333 1.55633333 1.5563333h10.88733337c.8555516 0 1.5563333-.7007583 1.5563333-1.5563333v-9.3333333c0-.8555517-.7007583-1.55400003-1.5563333-1.55400003h-1.554c0-2.14666667-1.743-3.88966667-3.8896667-3.88966667zm0 1.55633333c1.29115 0 2.3333334 1.04221834 2.3333334 2.33333334h-4.6666667c0-1.29115 1.0422183-2.33333334 2.3333333-2.33333334zm-.56511 3.95348337c.0600413-.0069579.1202605.0114731.1661221.0508442.0458617.039371.0731988.0961049.0754129.1565074l.0387369 1.111985c.0033849.1098037-.0759196.2047736-.1845667.221025-.62468.094451-1.2255833.381255-1.7067167.8658884-1.1215633 1.1296833-1.1764666 2.9078-.19824 4.1266166l1.0595667-1.0664033c.0619856-.061316.1546788-.0795185.2352488-.0461966.08057.033322.133328.1116797.1338962.1988666l.0068355 3.1194333c.000008.0594177-.0243784.116233-.0674555.1571575-.0430772.0409245-.1010669.0623689-.1604062.0593175l-2.94629997-.1595066c-.08554145-.0040646-.16066839-.0581181-.19170792-.1379329-.03103953-.0798149-.01217055-.1704228.04814959-.2312121l.7975217-.806645c-1.57033337-1.8226834-1.51445003-4.5740334.2005266-6.3004667.7542384-.75985 1.708-1.1998 2.6933667-1.3193833zm1.73635.2460966 2.9463.1617817c.0851317.0049023.1594772.0592691.1899553.138909.0304782.0796399.0114242.1697506-.0486836.230236l-.7975217.8043583c1.5717334 1.8216334 1.5188834 4.57485-.195965 6.3026834-.0007595-.000004-.001519-.000004-.0022785 0-.754985.759465-1.7105666 1.1974666-2.6955833 1.31705-.0600413.0069578-.1202605-.0114732-.1661221-.0508442-.0458616-.0393711-.0731988-.096105-.0754129-.1565075l-.0364583-1.1096983c-.0033849-.1098037.0759195-.2047736.1845666-.221025.624225-.0943822 1.2237167-.3834484 1.7043834-.8681634.0007595.000004.001519.000004.0022785 0 1.1215633-1.128715 1.1767-2.90465.19824-4.1244l-1.0595667 1.0664034c-.0619856.061316-.1546788.0795184-.2352488.0461965s-.133328-.1116797-.1338962-.1988665l-.0068355-3.1217667c-.000008-.0594176.0243784-.1162329.0674555-.1571574.0430772-.0409245.1010669-.0623689.1604062-.0593176z" fill="#000"/></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="28px" height="28px" viewBox="0 0 28 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>secondhand_dark</title>
+    <g id="secondhand_dark" stroke="none" fill="none" fill-rule="evenodd">
+        <path d="M14,0 C21.7319865,0 28,6.2680135 28,14 C28,21.7319865 21.7319865,28 14,28 C6.2680135,28 0,21.7319865 0,14 C0,6.2680135 6.2680135,0 14,0 Z M14,5 C11.853286,5 10.110286,6.743 10.110286,8.88966667 L8.55628597,8.88966667 C7.7007343,8.88966667 7.00683597,9.58815 7.00683597,10.4436667 L7,19.777 C7,20.6325517 7.70075833,21.3333333 8.55633333,21.3333333 L19.4436667,21.3333333 C20.2992183,21.3333333 21,20.632575 21,19.777 L21,10.4436667 C21,9.588115 20.2992417,8.88966667 19.4436667,8.88966667 L17.8896667,8.88966667 C17.8896667,6.743 16.1466667,5 14,5 Z M15.1712055,10.755785 L18.1174926,10.917695 C18.2026243,10.9225973 18.2769698,10.9769641 18.3074479,11.056604 C18.3379261,11.1362439 18.3188721,11.2263546 18.2587643,11.28684 L17.4612426,12.0911983 C19.032976,13.9128317 18.980126,16.6660483 17.2652776,18.3938817 C16.5080141,19.1533467 15.5524325,19.5913483 14.5674158,19.7109317 C14.5073745,19.7178895 14.4471553,19.6994585 14.4012937,19.6600875 C14.3554321,19.6207164 14.3280949,19.5639825 14.3258808,19.50358 L14.2894225,18.3938817 C14.2860376,18.284078 14.365342,18.1891081 14.4739891,18.1728567 C15.0982141,18.0784745 15.6977058,17.7894083 16.1783725,17.3046933 C17.3022143,16.1759783 17.357351,14.4000433 16.378891,13.1802933 L15.3193243,14.2466967 C15.2573387,14.3080127 15.1646455,14.3262151 15.0840755,14.2928932 C15.0035055,14.2595713 14.9507475,14.1812135 14.9501793,14.0940267 L14.9433438,10.97226 C14.9433358,10.9128424 14.9677222,10.8560271 15.0107993,10.8151026 C15.0538765,10.7741781 15.1118662,10.7527337 15.1712055,10.755785 Z M13.4348333,10.5097117 C13.4948839,10.5028588 13.5551031,10.5212898 13.6009647,10.5606609 C13.6468264,10.6000319 13.6741635,10.6567658 13.6763776,10.7171683 L13.7151145,11.8291533 C13.7184994,11.938957 13.6391949,12.0339269 13.5305478,12.0501783 C12.9058678,12.1446293 12.3049645,12.4314333 11.8238311,12.9160667 C10.7022678,14.04575 10.6473645,15.8238667 11.6255911,17.0426833 L12.6851578,15.97628 C12.7471434,15.914964 12.8398366,15.8967615 12.9204066,15.9300834 C13.0009766,15.9634054 13.0537346,16.0417631 13.0543028,16.12895 L13.0611383,19.2483833 C13.0611463,19.307801 13.0367599,19.3646163 12.9936828,19.4055408 C12.9506056,19.4464653 12.8926159,19.4679097 12.8332766,19.4648583 L9.88697663,19.3053517 C9.80143518,19.3012871 9.72630824,19.2472336 9.69526871,19.1674188 C9.66422918,19.0876039 9.68309816,18.996996 9.7434183,18.9362067 L10.54094,18.1295617 C8.97060663,16.3068783 9.02648997,13.5555283 10.7414666,11.829095 C11.495705,11.069245 12.4494666,10.629295 13.4348333,10.5097117 Z M13.9999526,6.55633333 C15.2911026,6.55633333 16.333286,7.59855167 16.333286,8.88966667 L11.6666193,8.88966667 C11.6666193,7.59851667 12.7088376,6.55633333 13.9999526,6.55633333 Z" id="Shape" fill="#8C5F93"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Interface/Search/Categories/secondhand.imageset/secondhand_light.svg b/iphone/Maps/Images.xcassets/Interface/Search/Categories/secondhand.imageset/secondhand_light.svg
index 0dcae6be3..9d460d0e5 100644
--- a/iphone/Maps/Images.xcassets/Interface/Search/Categories/secondhand.imageset/secondhand_light.svg
+++ b/iphone/Maps/Images.xcassets/Interface/Search/Categories/secondhand.imageset/secondhand_light.svg
@@ -1 +1,7 @@
-<svg height="28" viewBox="0 0 28 28" width="28" xmlns="http://www.w3.org/2000/svg"><g fill="none" opacity=".898664"><circle cx="14" cy="14" fill="#be75a3" fill-rule="evenodd" r="14"/><path d="m13.9999526 5c-2.1466666 0-3.8896666 1.743-3.8896666 3.88966667h-1.55400003c-.85555167 0-1.54945.69848333-1.54945 1.55400003l-.00683597 9.3333333c0 .8555517.70075833 1.5563333 1.55633333 1.5563333h10.88733337c.8555516 0 1.5563333-.7007583 1.5563333-1.5563333v-9.3333333c0-.8555517-.7007583-1.55400003-1.5563333-1.55400003h-1.554c0-2.14666667-1.743-3.88966667-3.8896667-3.88966667zm0 1.55633333c1.29115 0 2.3333334 1.04221834 2.3333334 2.33333334h-4.6666667c0-1.29115 1.0422183-2.33333334 2.3333333-2.33333334zm-.56511 3.95348337c.0600413-.0069579.1202605.0114731.1661221.0508442.0458617.039371.0731988.0961049.0754129.1565074l.0387369 1.111985c.0033849.1098037-.0759196.2047736-.1845667.221025-.62468.094451-1.2255833.381255-1.7067167.8658884-1.1215633 1.1296833-1.1764666 2.9078-.19824 4.1266166l1.0595667-1.0664033c.0619856-.061316.1546788-.0795185.2352488-.0461966.08057.033322.133328.1116797.1338962.1988666l.0068355 3.1194333c.000008.0594177-.0243784.116233-.0674555.1571575-.0430772.0409245-.1010669.0623689-.1604062.0593175l-2.94629997-.1595066c-.08554145-.0040646-.16066839-.0581181-.19170792-.1379329-.03103953-.0798149-.01217055-.1704228.04814959-.2312121l.7975217-.806645c-1.57033337-1.8226834-1.51445003-4.5740334.2005266-6.3004667.7542384-.75985 1.708-1.1998 2.6933667-1.3193833zm1.73635.2460966 2.9463.1617817c.0851317.0049023.1594772.0592691.1899553.138909.0304782.0796399.0114242.1697506-.0486836.230236l-.7975217.8043583c1.5717334 1.8216334 1.5188834 4.57485-.195965 6.3026834-.0007595-.000004-.001519-.000004-.0022785 0-.754985.759465-1.7105666 1.1974666-2.6955833 1.31705-.0600413.0069578-.1202605-.0114732-.1661221-.0508442-.0458616-.0393711-.0731988-.096105-.0754129-.1565075l-.0364583-1.1096983c-.0033849-.1098037.0759195-.2047736.1845666-.221025.624225-.0943822 1.2237167-.3834484 1.7043834-.8681634.0007595.000004.001519.000004.0022785 0 1.1215633-1.128715 1.1767-2.90465.19824-4.1244l-1.0595667 1.0664034c-.0619856.061316-.1546788.0795184-.2352488.0461965s-.133328-.1116797-.1338962-.1988665l-.0068355-3.1217667c-.000008-.0594176.0243784-.1162329.0674555-.1571574.0430772-.0409245.1010669-.0623689.1604062-.0593176z" fill="#fff"/></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="28px" height="28px" viewBox="0 0 28 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>secondhand_light</title>
+    <g id="secondhand_light" stroke="none" fill="none" fill-rule="evenodd">
+        <path d="M14,0 C21.7319865,0 28,6.2680135 28,14 C28,21.7319865 21.7319865,28 14,28 C6.2680135,28 0,21.7319865 0,14 C0,6.2680135 6.2680135,0 14,0 Z M14,5 C11.853286,5 10.110286,6.743 10.110286,8.88966667 L8.55628597,8.88966667 C7.7007343,8.88966667 7.00683597,9.58815 7.00683597,10.4436667 L7,19.777 C7,20.6325517 7.70075833,21.3333333 8.55633333,21.3333333 L19.4436667,21.3333333 C20.2992183,21.3333333 21,20.632575 21,19.777 L21,10.4436667 C21,9.588115 20.2992417,8.88966667 19.4436667,8.88966667 L17.8896667,8.88966667 C17.8896667,6.743 16.1466667,5 14,5 Z M15.1712055,10.755785 L18.1174926,10.917695 C18.2026243,10.9225973 18.2769698,10.9769641 18.3074479,11.056604 C18.3379261,11.1362439 18.3188721,11.2263546 18.2587643,11.28684 L17.4612426,12.0911983 C19.032976,13.9128317 18.980126,16.6660483 17.2652776,18.3938817 C16.5080141,19.1533467 15.5524325,19.5913483 14.5674158,19.7109317 C14.5073745,19.7178895 14.4471553,19.6994585 14.4012937,19.6600875 C14.3554321,19.6207164 14.3280949,19.5639825 14.3258808,19.50358 L14.2894225,18.3938817 C14.2860376,18.284078 14.365342,18.1891081 14.4739891,18.1728567 C15.0982141,18.0784745 15.6977058,17.7894083 16.1783725,17.3046933 C17.3022143,16.1759783 17.357351,14.4000433 16.378891,13.1802933 L15.3193243,14.2466967 C15.2573387,14.3080127 15.1646455,14.3262151 15.0840755,14.2928932 C15.0035055,14.2595713 14.9507475,14.1812135 14.9501793,14.0940267 L14.9433438,10.97226 C14.9433358,10.9128424 14.9677222,10.8560271 15.0107993,10.8151026 C15.0538765,10.7741781 15.1118662,10.7527337 15.1712055,10.755785 Z M13.4348333,10.5097117 C13.4948839,10.5028588 13.5551031,10.5212898 13.6009647,10.5606609 C13.6468264,10.6000319 13.6741635,10.6567658 13.6763776,10.7171683 L13.7151145,11.8291533 C13.7184994,11.938957 13.6391949,12.0339269 13.5305478,12.0501783 C12.9058678,12.1446293 12.3049645,12.4314333 11.8238311,12.9160667 C10.7022678,14.04575 10.6473645,15.8238667 11.6255911,17.0426833 L12.6851578,15.97628 C12.7471434,15.914964 12.8398366,15.8967615 12.9204066,15.9300834 C13.0009766,15.9634054 13.0537346,16.0417631 13.0543028,16.12895 L13.0611383,19.2483833 C13.0611463,19.307801 13.0367599,19.3646163 12.9936828,19.4055408 C12.9506056,19.4464653 12.8926159,19.4679097 12.8332766,19.4648583 L9.88697663,19.3053517 C9.80143518,19.3012871 9.72630824,19.2472336 9.69526871,19.1674188 C9.66422918,19.0876039 9.68309816,18.996996 9.7434183,18.9362067 L10.54094,18.1295617 C8.97060663,16.3068783 9.02648997,13.5555283 10.7414666,11.829095 C11.495705,11.069245 12.4494666,10.629295 13.4348333,10.5097117 Z M13.9999526,6.55633333 C15.2911026,6.55633333 16.333286,7.59855167 16.333286,8.88966667 L11.6666193,8.88966667 C11.6666193,7.59851667 12.7088376,6.55633333 13.9999526,6.55633333 Z" id="Shape" fill="#BE75A3"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Interface/Search/Categories/shopping.imageset/shopping_dark.svg b/iphone/Maps/Images.xcassets/Interface/Search/Categories/shopping.imageset/shopping_dark.svg
index 6272b1585..16fdec841 100644
--- a/iphone/Maps/Images.xcassets/Interface/Search/Categories/shopping.imageset/shopping_dark.svg
+++ b/iphone/Maps/Images.xcassets/Interface/Search/Categories/shopping.imageset/shopping_dark.svg
@@ -1 +1,7 @@
-<svg height="28" viewBox="0 0 28 28" width="28" xmlns="http://www.w3.org/2000/svg"><g fill="none" opacity=".898664"><circle cx="14" cy="14" fill="#8c5f93" fill-rule="evenodd" r="14"/><path d="m19.4443861 8.88885h-1.5555166c0-2.14666667-1.7421834-3.88885-3.88885-3.88885-2.1466667 0-3.88885 1.74218333-3.88885 3.88885h-1.55551668c-.85555167 0-1.54781667.7-1.54781667 1.5555167l-.00777782 9.3333333c0 .8555517.7 1.5555167 1.55551667 1.5555167h10.88885c.8555517 0 1.5555167-.7 1.5555167-1.5555167v-9.3333333c0-.8555517-.7-1.5555167-1.5555167-1.5555167zm-5.4444833-2.33333333c1.29115 0 2.3333334 1.04221833 2.3333334 2.33333333h-4.6666667c0-1.29115 1.0422183-2.33333333 2.3333333-2.33333333zm0 7.77781663c-2.1466667 0-3.88885-1.7421833-3.88885-3.88885h1.5555167c0 1.29115 1.0422183 2.3333334 2.3333333 2.3333334s2.3333333-1.0422184 2.3333333-2.3333334h1.5555167c0 2.1466667-1.7421833 3.88885-3.88885 3.88885z" fill="#000"/></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="28px" height="28px" viewBox="0 0 28 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>shopping_dark</title>
+    <g id="shopping_dark" stroke="none" fill="none" fill-rule="evenodd">
+        <path d="M14,0 C21.7319865,0 28,6.2680135 28,14 C28,21.7319865 21.7319865,28 14,28 C6.2680135,28 0,21.7319865 0,14 C0,6.2680135 6.2680135,0 14,0 Z M14.0000195,5 C11.8533528,5 10.1111695,6.74218333 10.1111695,8.88885 L8.55565282,8.88885 C7.70010115,8.88885 7.00783615,9.58885 7.00783615,10.4443667 L7.00005833,19.7777 C7.00005833,20.6332517 7.70005833,21.3332167 8.555575,21.3332167 L19.444425,21.3332167 C20.2999767,21.3332167 20.9999417,20.6332167 20.9999417,19.7777 L20.9999417,10.4443667 C20.9999417,9.588815 20.2999417,8.88885 19.444425,8.88885 L17.8888695,8.88885 C17.8888695,6.74218333 16.1466861,5 14.0000195,5 Z M11.6665695,10.4444833 C11.6665695,11.7356333 12.7087878,12.7778167 13.9999028,12.7778167 C15.2910178,12.7778167 16.3332362,11.7355983 16.3332362,10.4444833 L17.8887528,10.4444833 C17.8887528,12.59115 16.1465695,14.3333333 13.9999028,14.3333333 C11.8532362,14.3333333 10.1110528,12.59115 10.1110528,10.4444833 L11.6665695,10.4444833 Z M13.9999028,6.55551667 C15.2910528,6.55551667 16.3332362,7.597735 16.3332362,8.88885 L11.6665695,8.88885 C11.6665695,7.5977 12.7087878,6.55551667 13.9999028,6.55551667 Z" id="Shape" fill="#8C5F93"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Interface/Search/Categories/shopping.imageset/shopping_light.svg b/iphone/Maps/Images.xcassets/Interface/Search/Categories/shopping.imageset/shopping_light.svg
index 0c98048c7..a0fad5c81 100644
--- a/iphone/Maps/Images.xcassets/Interface/Search/Categories/shopping.imageset/shopping_light.svg
+++ b/iphone/Maps/Images.xcassets/Interface/Search/Categories/shopping.imageset/shopping_light.svg
@@ -1 +1,7 @@
-<svg height="28" viewBox="0 0 28 28" width="28" xmlns="http://www.w3.org/2000/svg"><g fill="none" opacity=".898664"><circle cx="14" cy="14" fill="#be75a3" fill-rule="evenodd" r="14"/><path d="m19.4443861 8.88885h-1.5555166c0-2.14666667-1.7421833-3.88885-3.88885-3.88885s-3.88885 1.74218333-3.88885 3.88885h-1.55551668c-.85555167 0-1.54781667.7-1.54781667 1.5555167l-.00777782 9.3333333c0 .8555517.7 1.5555167 1.55551667 1.5555167h10.88885c.8555517 0 1.5555167-.7 1.5555167-1.5555167v-9.3333333c0-.8555517-.7-1.5555167-1.5555167-1.5555167zm-5.4444833-2.33333333c1.29115 0 2.3333333 1.04221833 2.3333333 2.33333333h-4.6666666c0-1.29115 1.0422183-2.33333333 2.3333333-2.33333333zm0 7.77781663c-2.1466667 0-3.88885-1.7421833-3.88885-3.88885h1.5555167c0 1.29115 1.0422183 2.3333334 2.3333333 2.3333334s2.3333333-1.0422184 2.3333333-2.3333334h1.5555167c0 2.1466667-1.7421833 3.88885-3.88885 3.88885z" fill="#fff"/></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="28px" height="28px" viewBox="0 0 28 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>shopping_light</title>
+    <g id="shopping_light" stroke="none" fill="none" fill-rule="evenodd">
+        <path d="M14,0 C21.7319865,0 28,6.2680135 28,14 C28,21.7319865 21.7319865,28 14,28 C6.2680135,28 0,21.7319865 0,14 C0,6.2680135 6.2680135,0 14,0 Z M14.0000195,5 C11.8533528,5 10.1111695,6.74218333 10.1111695,8.88885 L8.55565282,8.88885 C7.70010115,8.88885 7.00783615,9.58885 7.00783615,10.4443667 L7.00005833,19.7777 C7.00005833,20.6332517 7.70005833,21.3332167 8.555575,21.3332167 L19.444425,21.3332167 C20.2999767,21.3332167 20.9999417,20.6332167 20.9999417,19.7777 L20.9999417,10.4443667 C20.9999417,9.588815 20.2999417,8.88885 19.444425,8.88885 L17.8888695,8.88885 C17.8888695,6.74218333 16.1466861,5 14.0000195,5 Z M11.6665695,10.4444833 C11.6665695,11.7356333 12.7087878,12.7778167 13.9999028,12.7778167 C15.2910178,12.7778167 16.3332362,11.7355983 16.3332362,10.4444833 L17.8887528,10.4444833 C17.8887528,12.59115 16.1465695,14.3333333 13.9999028,14.3333333 C11.8532362,14.3333333 10.1110528,12.59115 10.1110528,10.4444833 L11.6665695,10.4444833 Z M13.9999028,6.55551667 C15.2910528,6.55551667 16.3332362,7.597735 16.3332362,8.88885 L11.6665695,8.88885 C11.6665695,7.5977 12.7087878,6.55551667 13.9999028,6.55551667 Z" id="Shape" fill="#BE75A3"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Interface/Search/Categories/toilet.imageset/toilet_dark.svg b/iphone/Maps/Images.xcassets/Interface/Search/Categories/toilet.imageset/toilet_dark.svg
index 43b7776f7..f1bb0f5df 100644
--- a/iphone/Maps/Images.xcassets/Interface/Search/Categories/toilet.imageset/toilet_dark.svg
+++ b/iphone/Maps/Images.xcassets/Interface/Search/Categories/toilet.imageset/toilet_dark.svg
@@ -1 +1,7 @@
-<svg height="28" viewBox="0 0 28 28" width="28" xmlns="http://www.w3.org/2000/svg"><g fill="none" opacity=".898664"><circle cx="14" cy="14" fill="#7f5933" fill-rule="evenodd" r="14"/><path d="m10.3454333 8.64113333c.8829567 0 1.5908667-.69888 1.5908667-1.57056666 0-.87164-.7079567-1.57056667-1.5908667-1.57056667-.88290997 0-1.59086663.69888-1.59086663 1.57056667 0 .87164.70795666 1.57056666 1.59086663 1.57056666zm8.9091334 8.79491667v4.3974h-2.5454334v-4.3974h-2.5454333l2.2272833-6.9102833s.318185-1.25638337 1.5908667-1.25638337 1.5908667 1.25638337 1.5908667 1.25638337l2.2272833 6.9102833zm-7.6364167-1.8846333v6.2820333h-2.54543333v-6.2820333h-1.27271667v-4.53215c0-.9664434.77319667-1.74988337 1.75198333-1.74988337h1.58689997c.9675984 0 1.7519834.78292667 1.7519834 1.74988337v4.53215zm8.1181333-8.48073337c0 .87164-.7346733 1.57056667-1.65095 1.57056667-.9162766 0-1.65095-.69888-1.65095-1.57056667 0-.87164.7346734-1.57056666 1.65095-1.57056666.9162767 0 1.65095.69888 1.65095 1.57056666z" fill="#000"/></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="28px" height="28px" viewBox="0 0 28 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>toilet_dark</title>
+    <g id="toilet_dark" stroke="none" fill="none" fill-rule="evenodd">
+        <path d="M14,0 C21.7319865,0 28,6.2680135 28,14 C28,21.7319865 21.7319865,28 14,28 C6.2680135,28 0,21.7319865 0,14 C0,6.2680135 6.2680135,0 14,0 Z M17.98185,9.26938333 C16.7091683,9.26938333 16.3909833,10.5257667 16.3909833,10.5257667 L14.1637,17.43605 L16.7091333,17.43605 L16.7091333,21.83345 L19.2545667,21.83345 L19.2545667,17.43605 L21.8,17.43605 L19.5727167,10.5257667 C19.5727167,10.5257667 19.2545317,9.26938333 17.98185,9.26938333 Z M11.1388833,9.26938333 L9.55198333,9.26938333 C8.57319667,9.26938333 7.8,10.0528233 7.8,11.0192667 L7.8,15.5514167 L9.07271667,15.5514167 L9.07271667,21.83345 L11.61815,21.83345 L11.61815,15.5514167 L12.8908667,15.5514167 L12.8908667,11.0192667 C12.8908667,10.05231 12.1064817,9.26938333 11.1388833,9.26938333 Z M10.3454333,5.5 C9.46252333,5.5 8.75456667,6.19888 8.75456667,7.07056667 C8.75456667,7.94220667 9.46252333,8.64113333 10.3454333,8.64113333 C11.22839,8.64113333 11.9363,7.94225333 11.9363,7.07056667 C11.9363,6.19892667 11.2283433,5.5 10.3454333,5.5 Z M18.0853333,5.50011667 C17.1690567,5.50011667 16.4343833,6.19904333 16.4343833,7.07068333 C16.4343833,7.94237 17.1690567,8.64125 18.0853333,8.64125 C19.00161,8.64125 19.7362833,7.94232333 19.7362833,7.07068333 C19.7362833,6.19899667 19.00161,5.50011667 18.0853333,5.50011667 Z" id="Shape" fill="#7F5933"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Interface/Search/Categories/toilet.imageset/toilet_light.svg b/iphone/Maps/Images.xcassets/Interface/Search/Categories/toilet.imageset/toilet_light.svg
index c85ddca8e..11967cd11 100644
--- a/iphone/Maps/Images.xcassets/Interface/Search/Categories/toilet.imageset/toilet_light.svg
+++ b/iphone/Maps/Images.xcassets/Interface/Search/Categories/toilet.imageset/toilet_light.svg
@@ -1 +1,7 @@
-<svg height="28" viewBox="0 0 28 28" width="28" xmlns="http://www.w3.org/2000/svg"><g fill="none" opacity=".898664"><circle cx="14" cy="14" fill="#9c6136" fill-rule="evenodd" r="14"/><path d="m10.3454333 8.64113333c.8829567 0 1.5908667-.69888 1.5908667-1.57056666 0-.87164-.7079567-1.57056667-1.5908667-1.57056667-.88290997 0-1.59086663.69888-1.59086663 1.57056667 0 .87164.70795666 1.57056666 1.59086663 1.57056666zm8.9091334 8.79491667v4.3974h-2.5454334v-4.3974h-2.5454333l2.2272833-6.9102833s.318185-1.25638337 1.5908667-1.25638337 1.5908667 1.25638337 1.5908667 1.25638337l2.2272833 6.9102833zm-7.6364167-1.8846333v6.2820333h-2.54543333v-6.2820333h-1.27271667v-4.53215c0-.9664434.77319667-1.74988337 1.75198333-1.74988337h1.58689997c.9675984 0 1.7519834.78292667 1.7519834 1.74988337v4.53215zm8.1181333-8.48073337c0 .87164-.7346733 1.57056667-1.65095 1.57056667-.9162766 0-1.65095-.69888-1.65095-1.57056667 0-.87164.7346734-1.57056666 1.65095-1.57056666.9162767 0 1.65095.69888 1.65095 1.57056666z" fill="#fff"/></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="28px" height="28px" viewBox="0 0 28 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>toilet_light</title>
+    <g id="toilet_light" stroke="none" fill="none" fill-rule="evenodd">
+        <path d="M14,0 C21.7319865,0 28,6.2680135 28,14 C28,21.7319865 21.7319865,28 14,28 C6.2680135,28 0,21.7319865 0,14 C0,6.2680135 6.2680135,0 14,0 Z M17.98185,9.26938333 C16.7091683,9.26938333 16.3909833,10.5257667 16.3909833,10.5257667 L14.1637,17.43605 L16.7091333,17.43605 L16.7091333,21.83345 L19.2545667,21.83345 L19.2545667,17.43605 L21.8,17.43605 L19.5727167,10.5257667 C19.5727167,10.5257667 19.2545317,9.26938333 17.98185,9.26938333 Z M11.1388833,9.26938333 L9.55198333,9.26938333 C8.57319667,9.26938333 7.8,10.0528233 7.8,11.0192667 L7.8,15.5514167 L9.07271667,15.5514167 L9.07271667,21.83345 L11.61815,21.83345 L11.61815,15.5514167 L12.8908667,15.5514167 L12.8908667,11.0192667 C12.8908667,10.05231 12.1064817,9.26938333 11.1388833,9.26938333 Z M10.3454333,5.5 C9.46252333,5.5 8.75456667,6.19888 8.75456667,7.07056667 C8.75456667,7.94220667 9.46252333,8.64113333 10.3454333,8.64113333 C11.22839,8.64113333 11.9363,7.94225333 11.9363,7.07056667 C11.9363,6.19892667 11.2283433,5.5 10.3454333,5.5 Z M18.0853333,5.50011667 C17.1690567,5.50011667 16.4343833,6.19904333 16.4343833,7.07068333 C16.4343833,7.94237 17.1690567,8.64125 18.0853333,8.64125 C19.00161,8.64125 19.7362833,7.94232333 19.7362833,7.07068333 C19.7362833,6.19899667 19.00161,5.50011667 18.0853333,5.50011667 Z" id="Shape" fill="#9C6136"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Interface/Search/Categories/tourism.imageset/tourism_dark.svg b/iphone/Maps/Images.xcassets/Interface/Search/Categories/tourism.imageset/tourism_dark.svg
index 6914118e6..709e82885 100644
--- a/iphone/Maps/Images.xcassets/Interface/Search/Categories/tourism.imageset/tourism_dark.svg
+++ b/iphone/Maps/Images.xcassets/Interface/Search/Categories/tourism.imageset/tourism_dark.svg
@@ -1 +1,7 @@
-<svg height="28" viewBox="0 0 28 28" width="28" xmlns="http://www.w3.org/2000/svg"><g fill="none" opacity=".898664"><circle cx="14" cy="14" fill="#7f5933" fill-rule="evenodd" r="14"/><path d="m22.1666667 11.3275-5.7166667-.8155-2.45-5.712-2.45 5.712-5.71666667.8155 4.08333334 4.0798333-.81666667 5.726 4.9-2.4628333 4.9 2.4476667-.8166667-5.7108334z" fill="#000"/></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="28px" height="28px" viewBox="0 0 28 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>tourism_dark</title>
+    <g id="tourism_dark" stroke="none" fill="none" fill-rule="evenodd">
+        <path d="M14,0 C21.7319865,0 28,6.2680135 28,14 C28,21.7319865 21.7319865,28 14,28 C6.2680135,28 0,21.7319865 0,14 C0,6.2680135 6.2680135,0 14,0 Z M14,4.8 L11.55,10.512 L5.83333333,11.3275 L9.91666667,15.4073333 L9.1,21.1333333 L14,18.6705 L18.9,21.1181667 L18.0833333,15.4073333 L22.1666667,11.3275 L16.45,10.512 L14,4.8 Z" id="Shape" fill="#7F5933"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Interface/Search/Categories/tourism.imageset/tourism_light.svg b/iphone/Maps/Images.xcassets/Interface/Search/Categories/tourism.imageset/tourism_light.svg
index 5b3b81ffd..d6eaf1bbe 100644
--- a/iphone/Maps/Images.xcassets/Interface/Search/Categories/tourism.imageset/tourism_light.svg
+++ b/iphone/Maps/Images.xcassets/Interface/Search/Categories/tourism.imageset/tourism_light.svg
@@ -1 +1,7 @@
-<svg height="28" viewBox="0 0 28 28" width="28" xmlns="http://www.w3.org/2000/svg"><g fill="none" opacity=".898664"><circle cx="14" cy="14" fill="#9c6136" fill-rule="evenodd" r="14"/><path d="m22.1666667 11.3275-5.7166667-.8155-2.45-5.712-2.45 5.712-5.71666667.8155 4.08333334 4.0798333-.81666667 5.726 4.9-2.4628333 4.9 2.4476667-.8166667-5.7108334z" fill="#fff"/></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="28px" height="28px" viewBox="0 0 28 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>tourism_light</title>
+    <g id="tourism_light" stroke="none" fill="none" fill-rule="evenodd">
+        <path d="M14,0 C21.7319865,0 28,6.2680135 28,14 C28,21.7319865 21.7319865,28 14,28 C6.2680135,28 0,21.7319865 0,14 C0,6.2680135 6.2680135,0 14,0 Z M14,4.8 L11.55,10.512 L5.83333333,11.3275 L9.91666667,15.4073333 L9.1,21.1333333 L14,18.6705 L18.9,21.1181667 L18.0833333,15.4073333 L22.1666667,11.3275 L16.45,10.512 L14,4.8 Z" id="Shape" fill="#9C6136"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Interface/Search/Categories/transport.imageset/transport_dark.svg b/iphone/Maps/Images.xcassets/Interface/Search/Categories/transport.imageset/transport_dark.svg
index 249965f34..53772d5b1 100644
--- a/iphone/Maps/Images.xcassets/Interface/Search/Categories/transport.imageset/transport_dark.svg
+++ b/iphone/Maps/Images.xcassets/Interface/Search/Categories/transport.imageset/transport_dark.svg
@@ -1 +1,7 @@
-<svg height="28" viewBox="0 0 28 28" width="28" xmlns="http://www.w3.org/2000/svg"><g fill="none" opacity=".898664"><circle cx="14" cy="14" fill="#2f6499" fill-rule="evenodd" r="14"/><path d="m17.7652425 5.6c1.5553364 0 2.8354747 1.22330936 2.9060196 2.77700229l.4628047 10.18176001c.0677427 1.490298-.9982843 2.769645-2.4359329 3.0032674l-.4040447.03722-8.52288834.0007503c-1.49191873 0-2.72146569-1.1230189-2.88950342-2.5698147l-.0188206-.405324.46505496-10.24778934c.07062069-1.55373656 1.35079953-2.77707196 2.9060197-2.77707196zm-7.83828253 11.6362972c-.64265813 0-1.1636297.5209715-1.1636297 1.1636296 0 .6426582.52097157 1.1636298 1.1636297 1.1636298s1.16362973-.5209716 1.16362973-1.1636298c0-.6426581-.5209716-1.1636296-1.16362973-1.1636296zm8.14540793 0c-.6426581 0-1.1636296.5209715-1.1636296 1.1636296 0 .6426582.5209715 1.1636298 1.1636296 1.1636298.6426582 0 1.1636298-.5209716 1.1636298-1.1636298 0-.6426581-.5209716-1.1636296-1.1636298-1.1636296zm-.8095592-9.45449151h-6.5263627c-.77818439 0-1.41852981.61252013-1.45307507 1.3899557l-.16304808 3.70092571c0 .8033119.65122537 1.4545372 1.45453715 1.4545372l6.9141437-.0014344c.8025262-.0356683 1.4241811-.7151524 1.3885158-1.5176641l-.1616137-3.63634287c-.0345525-.77743555-.6749053-1.38997724-1.4530971-1.38997724z" fill="#000"/></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="28px" height="28px" viewBox="0 0 28 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>transport_dark</title>
+    <g id="transport_dark" stroke="none" fill="none" fill-rule="evenodd">
+        <path d="M14,0 C21.7319865,0 28,6.2680135 28,14 C28,21.7319865 21.7319865,28 14,28 C6.2680135,28 0,21.7319865 0,14 C0,6.2680135 6.2680135,0 14,0 Z M17.7652425,5.6 L10.2339515,5.6 C8.67873133,5.6 7.39855249,6.8233354 7.3279318,8.37707196 L6.86287684,18.6248613 L6.88169744,19.0301853 C7.04973517,20.4769811 8.27928213,21.6 9.77120086,21.6 L18.2940892,21.5992497 L18.6981339,21.5620297 C20.1357825,21.3284073 21.2018095,20.0490603 21.1340668,18.5587623 L20.6712621,8.37700229 C20.6007172,6.82330936 19.3205789,5.6 17.7652425,5.6 Z M9.92695997,17.2362972 C10.5696181,17.2362972 11.0905897,17.7572687 11.0905897,18.3999268 C11.0905897,19.042585 10.5696181,19.5635566 9.92695997,19.5635566 C9.28430184,19.5635566 8.76333027,19.042585 8.76333027,18.3999268 C8.76333027,17.7572687 9.28430184,17.2362972 9.92695997,17.2362972 Z M18.0723679,17.2362972 C18.7150261,17.2362972 19.2359977,17.7572687 19.2359977,18.3999268 C19.2359977,19.042585 18.7150261,19.5635566 18.0723679,19.5635566 C17.4297098,19.5635566 16.9087383,19.042585 16.9087383,18.3999268 C16.9087383,17.7572687 17.4297098,17.2362972 18.0723679,17.2362972 Z M17.2628087,7.78180569 C18.0410005,7.78180569 18.6813533,8.39434738 18.7159058,9.17178293 L18.8775195,12.8081258 C18.9131848,13.6106375 18.2915299,14.2901216 17.4890037,14.3257899 L10.57486,14.3272243 C9.77154822,14.3272243 9.12032285,13.675999 9.12032285,12.8726871 L9.28337093,9.17176139 C9.31791619,8.39432582 9.95826161,7.78180569 10.736446,7.78180569 Z" id="Shape" fill="#2F6499"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Interface/Search/Categories/transport.imageset/transport_light.svg b/iphone/Maps/Images.xcassets/Interface/Search/Categories/transport.imageset/transport_light.svg
index d1ad6eba2..56b3c1ac8 100644
--- a/iphone/Maps/Images.xcassets/Interface/Search/Categories/transport.imageset/transport_light.svg
+++ b/iphone/Maps/Images.xcassets/Interface/Search/Categories/transport.imageset/transport_light.svg
@@ -1 +1,7 @@
-<svg height="28" viewBox="0 0 28 28" width="28" xmlns="http://www.w3.org/2000/svg"><g fill="none" opacity=".898664"><circle cx="14" cy="14" fill="#2f6499" fill-rule="evenodd" r="14"/><path d="m17.7652425 5.6c1.5553364 0 2.8354747 1.22330936 2.9060196 2.77700229l.4628047 10.18176001c.0677427 1.490298-.9982843 2.769645-2.4359329 3.0032674l-.4040447.03722-8.52288834.0007503c-1.49191873 0-2.72146569-1.1230189-2.88950342-2.5698147l-.0188206-.405324.46505496-10.24778934c.07062069-1.55373656 1.35079953-2.77707196 2.9060197-2.77707196zm-7.83828253 11.6362972c-.64265813 0-1.1636297.5209715-1.1636297 1.1636296 0 .6426582.52097157 1.1636298 1.1636297 1.1636298s1.16362973-.5209716 1.16362973-1.1636298c0-.6426581-.5209716-1.1636296-1.16362973-1.1636296zm8.14540793 0c-.6426581 0-1.1636296.5209715-1.1636296 1.1636296 0 .6426582.5209715 1.1636298 1.1636296 1.1636298.6426582 0 1.1636298-.5209716 1.1636298-1.1636298 0-.6426581-.5209716-1.1636296-1.1636298-1.1636296zm-.8095592-9.45449151h-6.5263627c-.77818439 0-1.41852981.61252013-1.45307507 1.3899557l-.16304808 3.70092571c0 .8033119.65122537 1.4545372 1.45453715 1.4545372l6.9141437-.0014344c.8025262-.0356683 1.4241811-.7151524 1.3885158-1.5176641l-.1616137-3.63634287c-.0345525-.77743555-.6749053-1.38997724-1.4530971-1.38997724z" fill="#fff"/></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="28px" height="28px" viewBox="0 0 28 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>transport_light</title>
+    <g id="transport_light" stroke="none" fill="none" fill-rule="evenodd">
+        <path d="M14,0 C21.7319865,0 28,6.2680135 28,14 C28,21.7319865 21.7319865,28 14,28 C6.2680135,28 0,21.7319865 0,14 C0,6.2680135 6.2680135,0 14,0 Z M17.7652425,5.6 L10.2339515,5.6 C8.67873133,5.6 7.39855249,6.8233354 7.3279318,8.37707196 L6.86287684,18.6248613 L6.88169744,19.0301853 C7.04973517,20.4769811 8.27928213,21.6 9.77120086,21.6 L18.2940892,21.5992497 L18.6981339,21.5620297 C20.1357825,21.3284073 21.2018095,20.0490603 21.1340668,18.5587623 L20.6712621,8.37700229 C20.6007172,6.82330936 19.3205789,5.6 17.7652425,5.6 Z M9.92695997,17.2362972 C10.5696181,17.2362972 11.0905897,17.7572687 11.0905897,18.3999268 C11.0905897,19.042585 10.5696181,19.5635566 9.92695997,19.5635566 C9.28430184,19.5635566 8.76333027,19.042585 8.76333027,18.3999268 C8.76333027,17.7572687 9.28430184,17.2362972 9.92695997,17.2362972 Z M18.0723679,17.2362972 C18.7150261,17.2362972 19.2359977,17.7572687 19.2359977,18.3999268 C19.2359977,19.042585 18.7150261,19.5635566 18.0723679,19.5635566 C17.4297098,19.5635566 16.9087383,19.042585 16.9087383,18.3999268 C16.9087383,17.7572687 17.4297098,17.2362972 18.0723679,17.2362972 Z M17.2628087,7.78180569 C18.0410005,7.78180569 18.6813533,8.39434738 18.7159058,9.17178293 L18.8775195,12.8081258 C18.9131848,13.6106375 18.2915299,14.2901216 17.4890037,14.3257899 L10.57486,14.3272243 C9.77154822,14.3272243 9.12032285,13.675999 9.12032285,12.8726871 L9.28337093,9.17176139 C9.31791619,8.39432582 9.95826161,7.78180569 10.736446,7.78180569 Z" id="Shape" fill="#2F6499"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Interface/Search/Categories/water.imageset/water_dark.svg b/iphone/Maps/Images.xcassets/Interface/Search/Categories/water.imageset/water_dark.svg
index 10f3b3851..5553108cb 100644
--- a/iphone/Maps/Images.xcassets/Interface/Search/Categories/water.imageset/water_dark.svg
+++ b/iphone/Maps/Images.xcassets/Interface/Search/Categories/water.imageset/water_dark.svg
@@ -1 +1,7 @@
-<svg height="28" viewBox="0 0 28 28" width="28" xmlns="http://www.w3.org/2000/svg"><g fill="none" opacity=".898664"><circle cx="14" cy="14" fill="#0a6074" fill-rule="evenodd" r="14"/><path d="m14 21.8749c-2.8251 0-5.4518-2.4231-5.4518-5.4518 0-3.0625 4.1394-8.5484 5.4518-10.298 1.3125 1.75 5.4518 7.2355 5.4518 10.298 0 3.0288-2.6268 5.4518-5.4518 5.4518z" fill="#000"/></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="28px" height="28px" viewBox="0 0 28 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>water_dark</title>
+    <g id="water_dark" stroke="none" fill="none" fill-rule="evenodd">
+        <path d="M14,0 C21.7319865,0 28,6.2680135 28,14 C28,21.7319865 21.7319865,28 14,28 C6.2680135,28 0,21.7319865 0,14 C0,6.2680135 6.2680135,0 14,0 Z M14,6.1251 C12.6876,7.8747 8.5482,13.3606 8.5482,16.4231 C8.5482,19.4518 11.1749,21.8749 14,21.8749 C16.825,21.8749 19.4518,19.4519 19.4518,16.4231 C19.4518,13.3606 15.3125,7.8751 14,6.1251 Z" id="Shape" fill="#0A6074"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Interface/Search/Categories/water.imageset/water_light.svg b/iphone/Maps/Images.xcassets/Interface/Search/Categories/water.imageset/water_light.svg
index 4ef1a2d43..c3903fb0b 100644
--- a/iphone/Maps/Images.xcassets/Interface/Search/Categories/water.imageset/water_light.svg
+++ b/iphone/Maps/Images.xcassets/Interface/Search/Categories/water.imageset/water_light.svg
@@ -1 +1,7 @@
-<svg height="28" viewBox="0 0 28 28" width="28" xmlns="http://www.w3.org/2000/svg"><g fill="none" opacity=".898664"><circle cx="14" cy="14" fill="#14a0c2" fill-rule="evenodd" r="14"/><path d="m14 21.8749c-2.8251 0-5.4518-2.4231-5.4518-5.4518 0-3.0625 4.1394-8.5484 5.4518-10.298 1.3125 1.75 5.4518 7.2355 5.4518 10.298 0 3.0288-2.6268 5.4518-5.4518 5.4518z" fill="#fff"/></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="28px" height="28px" viewBox="0 0 28 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>water_light</title>
+    <g id="water_light" stroke="none" fill="none" fill-rule="evenodd">
+        <path d="M14,0 C21.7319865,0 28,6.2680135 28,14 C28,21.7319865 21.7319865,28 14,28 C6.2680135,28 0,21.7319865 0,14 C0,6.2680135 6.2680135,0 14,0 Z M14,6.1251 C12.6876,7.8747 8.5482,13.3606 8.5482,16.4231 C8.5482,19.4518 11.1749,21.8749 14,21.8749 C16.825,21.8749 19.4518,19.4519 19.4518,16.4231 C19.4518,13.3606 15.3125,7.8751 14,6.1251 Z" id="Shape" fill="#14A0C2"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Interface/Search/Categories/wifi.imageset/wifi_dark.svg b/iphone/Maps/Images.xcassets/Interface/Search/Categories/wifi.imageset/wifi_dark.svg
index dbaf62613..a236e6240 100644
--- a/iphone/Maps/Images.xcassets/Interface/Search/Categories/wifi.imageset/wifi_dark.svg
+++ b/iphone/Maps/Images.xcassets/Interface/Search/Categories/wifi.imageset/wifi_dark.svg
@@ -1 +1,7 @@
-<svg height="28" viewBox="0 0 28 28" width="28" xmlns="http://www.w3.org/2000/svg"><g fill="none" opacity=".898664"><circle cx="14" cy="14" fill="#717065" fill-rule="evenodd" r="14"/><path d="m14 16.98c1.1045695 0 2.1045695.4477153 2.8284271 1.1715729l-2.8284271 2.8284271-2.8284271-2.8284271c.7238576-.7238576 1.7238576-1.1715729 2.8284271-1.1715729zm0-4.5c2.3472102 0 4.4722102.9513949 6.0104076 2.4895924l-1.7677669 1.7677669c-1.0857865-1.0857864-2.5857865-1.7573593-4.2426407-1.7573593s-3.1568542.6715729-4.24264069 1.7573593l-1.76776695-1.7677669c1.53819745-1.5381975 3.66319744-2.4895924 6.01040764-2.4895924zm0-4.5c3.5898509 0 6.8398509 1.45507456 9.1923882 3.8076118l-1.7672673 1.7682667c-1.9001657-1.9004199-4.5253718-3.0758785-7.4251209-3.0758785s-5.52495518 1.1754586-7.42512091 3.0758785l-1.76726725-1.7682667c2.35253729-2.35253724 5.60253726-3.8076118 9.19238816-3.8076118z" fill="#000"/></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="28px" height="28px" viewBox="0 0 28 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>wifi_dark</title>
+    <g id="wifi_dark" stroke="none" fill="none" fill-rule="evenodd">
+        <path d="M14,0 C21.7319865,0 28,6.2680135 28,14 C28,21.7319865 21.7319865,28 14,28 C6.2680135,28 0,21.7319865 0,14 C0,6.2680135 6.2680135,0 14,0 Z M14,16.98 C12.8954305,16.98 11.8954305,17.4277153 11.1715729,18.1515729 L14,20.98 L16.8284271,18.1515729 C16.1045695,17.4277153 15.1045695,16.98 14,16.98 Z M14,12.48 C11.6527898,12.48 9.52778981,13.4313949 7.98959236,14.9695924 L9.75735931,16.7373593 C10.8431458,15.6515729 12.3431458,14.98 14,14.98 C15.6568542,14.98 17.1568542,15.6515729 18.2426407,16.7373593 L20.0104076,14.9695924 C18.4722102,13.4313949 16.3472102,12.48 14,12.48 Z M14,7.98 C10.4101491,7.98 7.16014913,9.43507456 4.80761184,11.7876118 L6.57487909,13.5558785 C8.47504482,11.6554586 11.1002509,10.48 14,10.48 C16.8997491,10.48 19.5249552,11.6554586 21.4251209,13.5558785 L23.1923882,11.7876118 C20.8398509,9.43507456 17.5898509,7.98 14,7.98 Z" id="Shape" fill="#717065"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Interface/Search/Categories/wifi.imageset/wifi_light.svg b/iphone/Maps/Images.xcassets/Interface/Search/Categories/wifi.imageset/wifi_light.svg
index ad2f947be..57137f076 100644
--- a/iphone/Maps/Images.xcassets/Interface/Search/Categories/wifi.imageset/wifi_light.svg
+++ b/iphone/Maps/Images.xcassets/Interface/Search/Categories/wifi.imageset/wifi_light.svg
@@ -1 +1,7 @@
-<svg height="28" viewBox="0 0 28 28" width="28" xmlns="http://www.w3.org/2000/svg"><g fill="none" opacity=".898664"><circle cx="14" cy="14" fill="#747e86" fill-rule="evenodd" r="14"/><path d="m14 16.98c1.1045695 0 2.1045695.4477153 2.8284271 1.1715729l-2.8284271 2.8284271-2.8284271-2.8284271c.7238576-.7238576 1.7238576-1.1715729 2.8284271-1.1715729zm0-4.5c2.3472102 0 4.4722102.9513949 6.0104076 2.4895924l-1.7677669 1.7677669c-1.0857865-1.0857864-2.5857865-1.7573593-4.2426407-1.7573593s-3.1568542.6715729-4.24264069 1.7573593l-1.76776695-1.7677669c1.53819745-1.5381975 3.66319744-2.4895924 6.01040764-2.4895924zm0-4.5c3.5898509 0 6.8398509 1.45507456 9.1923882 3.8076118l-1.7672673 1.7682667c-1.9001657-1.9004199-4.5253718-3.0758785-7.4251209-3.0758785s-5.52495518 1.1754586-7.42512091 3.0758785l-1.76726725-1.7682667c2.35253729-2.35253724 5.60253726-3.8076118 9.19238816-3.8076118z" fill="#fff"/></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="28px" height="28px" viewBox="0 0 28 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>wifi_light</title>
+    <g id="wifi_light" stroke="none" fill="none" fill-rule="evenodd">
+        <path d="M14,0 C21.7319865,0 28,6.2680135 28,14 C28,21.7319865 21.7319865,28 14,28 C6.2680135,28 0,21.7319865 0,14 C0,6.2680135 6.2680135,0 14,0 Z M14,16.98 C12.8954305,16.98 11.8954305,17.4277153 11.1715729,18.1515729 L14,20.98 L16.8284271,18.1515729 C16.1045695,17.4277153 15.1045695,16.98 14,16.98 Z M14,12.48 C11.6527898,12.48 9.52778981,13.4313949 7.98959236,14.9695924 L9.75735931,16.7373593 C10.8431458,15.6515729 12.3431458,14.98 14,14.98 C15.6568542,14.98 17.1568542,15.6515729 18.2426407,16.7373593 L20.0104076,14.9695924 C18.4722102,13.4313949 16.3472102,12.48 14,12.48 Z M14,7.98 C10.4101491,7.98 7.16014913,9.43507456 4.80761184,11.7876118 L6.57487909,13.5558785 C8.47504482,11.6554586 11.1002509,10.48 14,10.48 C16.8997491,10.48 19.5249552,11.6554586 21.4251209,13.5558785 L23.1923882,11.7876118 C20.8398509,9.43507456 17.5898509,7.98 14,7.98 Z" id="Shape" fill="#747E86"></path>
+    </g>
+</svg>
\ No newline at end of file