diff --git a/data/search-icons/svg/atm.svg b/data/search-icons/svg/atm.svg
deleted file mode 100644
index 2bfe1c66ea..0000000000
--- a/data/search-icons/svg/atm.svg
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.0"
-   width="24"
-   height="24"
-   id="symbol-atm"
-   inkscape:version="0.48.2 r9819"
-   sodipodi:docname="atm.svg">
-  <title
-     id="title2983">ATM Map Icon</title>
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>ATM Map Icon</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Yury Melnichek</dc:title>
-          </cc:Agent>
-        </dc:creator>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1059"
-     inkscape:window-height="716"
-     id="namedview8"
-     showgrid="true"
-     inkscape:zoom="17.531842"
-     inkscape:cx="22.986746"
-     inkscape:cy="9.3871637"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="symbol-atm">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <defs
-     id="defs2387" />
-  <path
-     style="fill:#4d4d4d;fill-opacity:1;stroke:none"
-     d="M 3,0 3,6 21,6 21,0 3,0 z M 5,2 19,2 19,5 5,5 5,2 z"
-     id="rect2984"
-     inkscape:connector-curvature="0" />
-  <path
-     style="fill:#4d4d4d;fill-opacity:1;stroke:none"
-     d="M 19.5,21 17,3 7,3 4.5,21 z"
-     id="path3754"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="ccccc" />
-  <text
-     xml:space="preserve"
-     style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
-     x="-6.6165323"
-     y="15.044866"
-     id="text3759"
-     sodipodi:linespacing="125%"><tspan
-       sodipodi:role="line"
-       id="tspan3761"
-       x="-6.6165323"
-       y="15.044866" /></text>
-  <text
-     xml:space="preserve"
-     style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
-     x="-4.6201649"
-     y="4.6067157"
-     id="text2987"
-     sodipodi:linespacing="125%"><tspan
-       sodipodi:role="line"
-       id="tspan2989"
-       x="-4.6201649"
-       y="4.6067157" /></text>
-  <path
-     style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-     d="m 11.556391,4.875 0,0.875 C 10.878783,5.9226669 10.260423,6.3200773 9.7744362,6.84375 9.119662,7.5492994 8.669173,8.5046298 8.669173,9.541667 c 0,1.037037 0.5226976,1.906736 1.2180451,2.40625 0.4954579,0.35592 1.0744529,0.542591 1.6691729,0.631945 l 0,3.767361 C 11.296538,16.21618 11.031592,16.024783 10.81203,15.788194 10.384097,15.327077 10.112782,14.726852 10.112782,14.208333 a 0.72187669,0.77785556 0 1 0 -1.443609,0 c 0,1.037037 0.450489,1.992367 1.1052632,2.697917 C 10.260423,17.429924 10.878783,17.827333 11.556391,18 l 0,0.875 L 13,18.875 13,18 c 0.677608,-0.172667 1.295968,-0.570076 1.781955,-1.09375 0.654774,-0.70555 1.105263,-1.66088 1.105263,-2.697917 0,-1.037037 -0.522698,-1.906736 -1.218045,-2.40625 C 14.173715,11.446163 13.59472,11.259492 13,11.170138 l 0,-3.8645824 c 0.315372,0.08395 0.595588,0.2188387 0.81203,0.4131944 0.371669,0.3337422 0.631579,0.8290893 0.631579,1.822917 a 0.72187669,0.77785556 0 1 0 1.443609,0 c 0,-1.3395063 -0.461894,-2.3997147 -1.172932,-3.0381947 C 14.206587,6.0475817 13.605539,5.8248594 13,5.7256944 L 13,4.875 l -1.443609,0 z m -0.02256,2.5277777 c 0.0066,-0.00343 0.01593,0.00334 0.02256,0 l 0,3.5972223 c -0.330954,-0.07996 -0.628272,-0.200171 -0.857143,-0.364583 -0.387359,-0.278265 -0.586466,-0.575231 -0.586466,-1.09375 0,-0.518519 0.271315,-1.1187443 0.699248,-1.5798614 0.213967,-0.2305583 0.468905,-0.4282998 0.721805,-0.5590279 z M 13,12.75 c 0.330955,0.07996 0.628272,0.200171 0.857143,0.364583 0.387359,0.278265 0.586466,0.575231 0.586466,1.09375 0,0.518519 -0.271315,1.118744 -0.699248,1.579861 C 13.524799,16.024783 13.259853,16.21618 13,16.347223 L 13,12.75 z"
-     id="path2991"
-     inkscape:connector-curvature="0" />
-</svg>
diff --git a/data/search-icons/svg/bank.svg b/data/search-icons/svg/bank.svg
deleted file mode 100644
index f584590843..0000000000
--- a/data/search-icons/svg/bank.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1"
-	 id="bank" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" sodipodi:docname="bank.svg" inkscape:version="0.48.2 r9819" xmlns:svg="http://www.w3.org/2000/svg"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="18.641px"
-	 height="18.641px" viewBox="0 0 18.641 18.641" enable-background="new 0 0 18.641 18.641" xml:space="preserve">
-<sodipodi:namedview  inkscape:cx="9.3199997" inkscape:zoom="12.660945" pagecolor="#ffffff" inkscape:cy="9.3199997" borderopacity="1" objecttolerance="10" guidetolerance="10" bordercolor="#666666" gridtolerance="10" showgrid="false" inkscape:window-height="480" inkscape:current-layer="bank" inkscape:window-y="0" inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-x="0" inkscape:window-width="640" inkscape:window-maximized="0" id="namedview7">
-	</sodipodi:namedview>
-<g>
-	<path fill="#50524E" d="M10.14,11.482v1.641C11.184,12.973,11.184,11.632,10.14,11.482z"/>
-	<path fill="#50524E" d="M9.246,9.096V7.456C8.202,7.605,8.202,8.947,9.246,9.096z"/>
-	<path fill="#50524E" d="M9.693,0.045L0,7.456h2.237V18.64h14.166V7.456h2.237L9.693,0.045z M10.14,15.211
-		c0,0.895,0,1.192-0.447,1.192s-0.447-0.298-0.447-1.192c-0.746,0-2.834-0.299-2.685-1.641s1.641-0.597,2.685-0.447v-1.938
-		C8.052,10.885,6.561,9.991,6.561,8.35c0-1.64,1.491-2.684,2.685-2.684c0-0.895,0-1.193,0.447-1.193s0.447,0.299,0.447,1.193
-		c0.895,0,2.982,0.298,2.535,1.342s-1.79,0.597-2.535,0.447v1.938c1.342,0.299,2.833,1.193,2.833,2.834
-		C12.973,13.868,11.632,15.211,10.14,15.211z"/>
-</g>
-</svg>
diff --git a/data/search-icons/svg/entertainment.svg b/data/search-icons/svg/entertainment.svg
deleted file mode 100644
index c227eddf71..0000000000
--- a/data/search-icons/svg/entertainment.svg
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1"
-	 id="theatre" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" sodipodi:docname="theatre.svg" inkscape:version="0.48.2 r9819" xmlns:svg="http://www.w3.org/2000/svg"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px" height="24px"
-	 viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
-<sodipodi:namedview  inkscape:cx="12.362941" inkscape:zoom="13.240134" pagecolor="#ffffff" inkscape:cy="14.034139" borderopacity="1" objecttolerance="10" guidetolerance="10" bordercolor="#666666" gridtolerance="10" showgrid="true" inkscape:window-height="658" inkscape:current-layer="theatre" inkscape:window-y="0" inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-x="0" inkscape:window-width="977" inkscape:window-maximized="0" id="namedview33">
-	<inkscape:grid  visible="true" empspacing="2" enabled="true" snapvisiblegridlinesonly="true" type="xygrid" id="grid3014">
-		</inkscape:grid>
-</sodipodi:namedview>
-<g>
-	<path fill="#333333" d="M13.067,12.551c-0.631,2.356,4.082,3.619,4.714,1.263C16.414,14.726,13.757,14.166,13.067,12.551z"/>
-	<path fill="#333333" d="M15.352,8.067c-2.34-0.105-2.386-0.075-3.536-0.947c-0.15,0.561,0.69,2.122,1.873,2.439
-		C15.334,9.488,15.042,9.249,15.352,8.067z"/>
-	<path fill="#333333" d="M17.896,10.687c1.184,0.317,2.691-0.615,2.842-1.176c-1.432,0.181-1.457,0.131-3.535-0.947
-		C16.88,9.741,16.507,9.803,17.896,10.687z"/>
-	<path fill="#333333" d="M12.216,1.587l-0.947,3.535c-1.263,4.713-1.979,12.1,2.735,13.362c4.713,1.264,7.785-5.491,9.049-10.205
-		L24,4.744C18.654,5.838,16.299,5.207,12.216,1.587z M21.969,8.96c-0.986,3.677-3.654,9.596-7.695,8.514
-		c-4.04-1.082-3.391-7.543-2.406-11.221l0.74-2.758c3.547,2.921,5.566,3.463,10.1,2.707L21.969,8.96z"/>
-</g>
-<path fill="#666666" d="M10.365,12.617c-0.271,0.149-0.568,0.336-0.927,0.586c-0.316-1.178-0.316-1.178,0.694-2.123
-	c0.067-0.018,0.137-0.019,0.206-0.029c0.057-1.768,0.36-3.594,0.746-5.192C7.678,8.591,5.285,9.012,0.474,8.028l0.947,3.535
-	c1.263,4.713,4.336,11.468,9.049,10.205c1.718-0.46,2.708-1.739,3.22-3.4C11.433,17.583,10.532,15.293,10.365,12.617z M3.546,14.782
-	c-0.15-0.562,0.69-2.122,1.873-2.439c1.646,0.071,1.354,0.311,1.663,1.492C4.743,13.94,4.696,13.91,3.546,14.782z M7.167,18.864
-	c-0.632-2.356,4.082-3.62,4.713-1.263C10.513,16.689,7.856,17.248,7.167,18.864z"/>
-</svg>
diff --git a/data/search-icons/svg/food.svg b/data/search-icons/svg/food.svg
deleted file mode 100644
index 4cfd72de98..0000000000
--- a/data/search-icons/svg/food.svg
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   width="24"
-   id="symbol-restaurant"
-   viewBox="10 0 108 138"
-   height="24"
-   inkscape:version="0.48.2 r9819"
-   sodipodi:docname="restaurant.svg"
-   style="fill:#000000;stroke:none">
-  <title
-     id="title2986">Restaraunt Map Icon</title>
-  <metadata
-     id="metadata11">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Restaraunt Map Icon</dc:title>
-        <dc:identifier></dc:identifier>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Yury Melnichek</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:source>mapsforhumans.com</dc:source>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/by-sa/3.0/" />
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/by-sa/3.0/">
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Reproduction" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Distribution" />
-        <cc:requires
-           rdf:resource="http://creativecommons.org/ns#Notice" />
-        <cc:requires
-           rdf:resource="http://creativecommons.org/ns#Attribution" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs9" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1160"
-     inkscape:window-height="714"
-     id="namedview7"
-     showgrid="true"
-     inkscape:zoom="20.583333"
-     inkscape:cx="3.5951416"
-     inkscape:cy="12"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="symbol-restaurant">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2988"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <path
-     style="fill:#4d4d4d;fill-opacity:1;stroke:none"
-     d="m 38.125,11.5 c -1.58782,0 -2.875,1.287181 -2.875,2.875 l 0,34.5 c 0,1.587819 1.28718,2.875 2.875,2.875 l 11.5,0 11.5,0 C 62.71282,51.75 64,50.462819 64,48.875 l 0,-34.5 C 64,12.787181 62.71282,11.5 61.125,11.5 c -1.58782,0 -2.875,1.287181 -2.875,2.875 l 0,31.625 -5.75,0 0,-31.625 c 0,-1.587819 -1.28718,-2.875 -2.875,-2.875 -1.58782,0 -2.875,1.287181 -2.875,2.875 L 46.75,46 41,46 41,14.375 C 41,12.787181 39.71282,11.5 38.125,11.5 z"
-     id="use3040"
-     inkscape:connector-curvature="0" />
-  <path
-     style="fill:#4d4d4d;fill-opacity:1;stroke:none"
-     d="m 87,11.5 c -6.35127,0 -11.5,10.898725 -11.5,17.25 l 0,28.75 c 0,6.351272 8.221604,23 11.5,23 l 0,40.25 c 0,3.17564 2.57436,5.75 5.75,5.75 3.17564,0 5.75,-2.57436 5.75,-5.75 l 0,-57.5 0,-40.25 C 98.5,16.648725 93.35127,11.5 87,11.5 z"
-     id="path3083"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="ssscssscss" />
-  <path
-     style="fill:#4d4d4d;fill-opacity:1;stroke:none"
-     d="m 43.875,51.75 0,69 c 0,3.17564 2.57436,5.75 5.75,5.75 3.17564,0 5.75,-2.57436 5.75,-5.75 l 0,-69 z"
-     id="path3094"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="cssscc" />
-</svg>
diff --git a/data/search-icons/svg/fuel.svg b/data/search-icons/svg/fuel.svg
deleted file mode 100644
index 177d5926ef..0000000000
--- a/data/search-icons/svg/fuel.svg
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   width="24"
-   id="petrolStation"
-   viewBox="0 0 148.06867 148.06867"
-   height="24"
-   inkscape:version="0.48.2 r9819"
-   sodipodi:docname="petrolStation.svg"
-   style="fill:#000000;fill-rule:evenodd;stroke-width:3px">
-  <metadata
-     id="metadata9">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs7" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1007"
-     inkscape:window-height="805"
-     id="namedview5"
-     showgrid="true"
-     inkscape:zoom="55.819055"
-     inkscape:cx="19.310836"
-     inkscape:cy="16.308998"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="petrolStation">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2986"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <path
-     style="fill:#505050;fill-opacity:1;stroke:none"
-     d="M 8,2 C 6.892,2 6,2.892 6,4 l 0,16 -2,0 0,2 4,0 6,0 4,0 0,-2 -2,0 0,-8.3125 0.90625,0 0,3.3125 c 0,1.34138 0.07746,2.435661 0.53125,3.3125 0.453788,0.876839 1.400607,1.375 2.5625,1.375 1.145833,0 2.044441,-0.400462 2.5625,-1.09375 0.518059,-0.693288 0.651489,-1.527561 0.59375,-2.375 C 23.04548,14.592976 22.312386,12.90606 21.6875,11.8125 21.522922,10.478631 21.597868,9.0328279 21.625,7.78125 21.638939,7.1382039 21.649387,6.5536634 21.5625,6 21.475612,5.4463366 21.419011,4.9263158 21,4.517915 20.779494,4.3704534 20.708528,4.3959549 20.625,4.34375 L 17.46875,3.40625 16.625,3.21875 16.625,4 18.59375,4.9375 C 18.530571,5.1099864 18.4848,5.3354003 18.5,5.65625 18.512448,6.2337778 18.517865,6.7133596 19.1875,7 l 1.03125,0.3125 c 0.0097,0.1479256 0.03471,0.2780241 0.03125,0.4375 -0.02668,1.2304822 -0.147519,2.785591 0.0625,4.34375 l 0,0.125 0.09375,0.125 c 0.541113,0.915284 1.254827,2.66363 1.34375,3.96875 0.04446,0.65256 -0.08331,1.162039 -0.3125,1.46875 -0.229189,0.306711 -0.583334,0.53125 -1.4375,0.53125 -0.838108,0 -1.069224,-0.186177 -1.3125,-0.65625 C 18.444224,17.186177 18.3125,16.270974 18.3125,15 l 0,-4 0,-0.6875 -0.71875,0 L 16,10.3125 16,4 C 16,2.892 15.108,2 14,2 z m 1.0625,1.4375 3.9375,0 c 1.59375,0 1.59375,0 1.59375,2 l 0,2 c 0,2 0,2 -1.59375,2 l -3.9375,0 c -1.59375,0 -1.59375,0 -1.59375,-2 l 0,-2 c 0,-2 0,-2 1.59375,-2 z m 10.46875,1.9375 0.4375,0.21875 c 0.08298,0.1178774 0.275427,0.2295513 0.21875,0.625 -0.0065,0.045158 0.0022,0.1075691 0,0.15625 C 19.873321,6.3342149 19.610294,6.2535262 19.53125,6 z"
-     transform="scale(6.1695279,6.1695279)"
-     id="rect2988"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="ssccccccccccssssscsscccccccccscccsssssccccssssssssssssccsccc" />
-</svg>
diff --git a/data/search-icons/svg/hospital.svg b/data/search-icons/svg/hospital.svg
deleted file mode 100644
index c0c859e0a2..0000000000
--- a/data/search-icons/svg/hospital.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1"
-	 id="hospital" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" sodipodi:docname="hospital.svg" inkscape:version="0.48.2 r9819" xmlns:svg="http://www.w3.org/2000/svg"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px" height="24px"
-	 viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
-<sodipodi:namedview  inkscape:cx="7.5" inkscape:zoom="15.733333" pagecolor="#ffffff" inkscape:cy="11.25" borderopacity="1" objecttolerance="10" guidetolerance="10" bordercolor="#666666" gridtolerance="10" showgrid="true" inkscape:window-height="654" inkscape:current-layer="hospital" inkscape:window-y="0" inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-x="0" inkscape:window-width="859" inkscape:window-maximized="0" id="namedview7">
-	<inkscape:grid  visible="true" empspacing="2" enabled="true" snapvisiblegridlinesonly="true" type="xygrid" id="grid2988">
-		</inkscape:grid>
-</sodipodi:namedview>
-<path id="path2990" fill="#C70000" d="M12,2C6.477,2,2,6.477,2,12c0,5.523,4.477,10,10,10c5.523,0,10-4.477,10-10
-	C22,6.477,17.523,2,12,2z M12,4c4.418,0,8,3.582,8,8c0,4.418-3.582,8-8,8c-4.418,0-8-3.582-8-8C4,7.582,7.582,4,12,4z M10,6v4H6v4h4
-	v4h4v-4h4v-4h-4V6H10z"/>
-</svg>
diff --git a/data/search-icons/svg/hotel.svg b/data/search-icons/svg/hotel.svg
deleted file mode 100644
index d019238537..0000000000
--- a/data/search-icons/svg/hotel.svg
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1"
-	 id="hotel" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" sodipodi:docname="hotel.svg" inkscape:version="0.48.2 r9819"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px" height="24px"
-	 viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
-<title  id="title3008">Hotel Map Icon</title>
-<sodipodi:namedview  inkscape:cy="9.3199997" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1" objecttolerance="10" gridtolerance="10" guidetolerance="10" showgrid="true" inkscape:zoom="12.660945" inkscape:cx="-4.4230507" id="namedview5" inkscape:pageshadow="2" inkscape:current-layer="hotel" inkscape:window-maximized="0" inkscape:pageopacity="0" inkscape:window-width="928" inkscape:window-y="0" inkscape:window-x="0" inkscape:window-height="643">
-	<inkscape:grid  enabled="true" visible="true" empspacing="2" id="grid2986" type="xygrid" snapvisiblegridlinesonly="true">
-		</inkscape:grid>
-</sodipodi:namedview>
-<rect id="rect2988" x="2" y="8" fill="#50524E" width="2" height="12"/>
-<path id="path2990" sodipodi:ry="1" sodipodi:rx="1" sodipodi:cy="20" sodipodi:cx="3" sodipodi:type="arc" fill="#50524E" d="M4,20
-	c0,0.553-0.448,1-1,1s-1-0.447-1-1s0.448-1,1-1S4,19.447,4,20z"/>
-<path id="path2992" sodipodi:ry="1" sodipodi:rx="1" sodipodi:cy="8" sodipodi:cx="3" sodipodi:type="arc" fill="#50524E" d="M4,8
-	c0,0.552-0.448,1-1,1S2,8.552,2,8s0.448-1,1-1S4,7.448,4,8z"/>
-<rect id="rect2994" x="20" y="12" fill="#50524E" width="2" height="8"/>
-<path id="path2996" sodipodi:ry="1" sodipodi:rx="1" sodipodi:cy="20" sodipodi:cx="3" sodipodi:type="arc" fill="#50524E" d="
-	M22,20c0,0.553-0.447,1-1,1s-1-0.447-1-1s0.447-1,1-1S22,19.447,22,20z"/>
-<path id="path2998" sodipodi:ry="1" sodipodi:rx="1" sodipodi:cy="8" sodipodi:cx="3" sodipodi:type="arc" fill="#50524E" d="M22,12
-	c0,0.553-0.447,1-1,1s-1-0.447-1-1c0-0.552,0.447-1,1-1S22,11.448,22,12z"/>
-<rect id="rect3000" x="3" y="14" fill="#50524E" width="17" height="2"/>
-<path id="rect3006" fill="#50524E" d="M6,10h4c0.552,0,1,0.448,1,1v1c0,0.553-0.448,1-1,1H6c-0.552,0-1-0.447-1-1v-1
-	C5,10.448,5.448,10,6,10z"/>
-</svg>
diff --git a/data/search-icons/svg/parking.svg b/data/search-icons/svg/parking.svg
deleted file mode 100644
index c41a1f482f..0000000000
--- a/data/search-icons/svg/parking.svg
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1"
-	 id="symbol-parking" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" sodipodi:docname="parking.svg" inkscape:version="0.48.2 r9819" xmlns:svg="http://www.w3.org/2000/svg"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px" height="24px"
-	 viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
-<title  id="title2985">Parking Map Icon</title>
-<sodipodi:namedview  inkscape:cx="15.149227" inkscape:zoom="16.026026" pagecolor="#ffffff" inkscape:cy="12.641088" borderopacity="1" objecttolerance="10" guidetolerance="10" bordercolor="#666666" gridtolerance="10" showgrid="true" inkscape:window-height="612" inkscape:current-layer="symbol-parking" inkscape:window-y="0" inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-x="0" inkscape:window-width="894" inkscape:window-maximized="0" id="namedview7">
-	<inkscape:grid  visible="true" empspacing="2" enabled="true" snapvisiblegridlinesonly="true" type="xygrid" id="grid2988">
-		</inkscape:grid>
-</sodipodi:namedview>
-<path id="rect2987" fill="#F2F2F2" d="M5.4,1h13.2C21.03,1,23,2.97,23,5.4v13.2c0,2.431-1.97,4.4-4.4,4.4H5.4
-	C2.97,23,1,21.03,1,18.6V5.4C1,2.97,2.97,1,5.4,1z"/>
-<path id="rect2985" fill="#0044D8" d="M6,2h12c2.209,0,4,1.791,4,4v12c0,2.209-1.791,4-4,4H6c-2.209,0-4-1.791-4-4V6
-	C2,3.791,3.791,2,6,2z"/>
-<path id="rect3766" sodipodi:nodetypes="cccccssscccsssccc" inkscape:connector-curvature="0" fill="#FFFFFF" d="M7,5v10
-	c0,0,0,4,0,5h3v-5h3c2.762,0,5-2.238,5-5c0-2.761-2.238-5-5-5h-3H7z M10,7.531h3c1.104,0,2,1.113,2,2.469s-0.896,2.469-2,2.469h-3
-	V10V7.531z"/>
-</svg>
diff --git a/data/search-icons/svg/pharmacy.svg b/data/search-icons/svg/pharmacy.svg
deleted file mode 100644
index 04d77ad997..0000000000
--- a/data/search-icons/svg/pharmacy.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1"
-	 id="hospital" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" sodipodi:docname="pharmacy.svg" inkscape:version="0.48.2 r9819" xmlns:svg="http://www.w3.org/2000/svg"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px" height="24px"
-	 viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
-<title  id="title2987">Pharmacy Map Icon</title>
-<sodipodi:namedview  inkscape:cx="7.5" inkscape:zoom="15.733333" pagecolor="#ffffff" inkscape:cy="11.25" borderopacity="1" objecttolerance="10" guidetolerance="10" bordercolor="#666666" gridtolerance="10" showgrid="true" inkscape:window-height="654" inkscape:current-layer="hospital" inkscape:window-y="0" inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-x="0" inkscape:window-width="859" inkscape:window-maximized="0" id="namedview7">
-	<inkscape:grid  visible="true" empspacing="2" enabled="true" snapvisiblegridlinesonly="true" type="xygrid" id="grid2988">
-		</inkscape:grid>
-</sodipodi:namedview>
-<path id="path2990" fill="#43B413" d="M12,2C6.477,2,2,6.477,2,12c0,5.523,4.477,10,10,10c5.523,0,10-4.477,10-10
-	C22,6.477,17.523,2,12,2z M12,4c4.418,0,8,3.582,8,8c0,4.418-3.582,8-8,8c-4.418,0-8-3.582-8-8C4,7.582,7.582,4,12,4z M10,6v4H6v4h4
-	v4h4v-4h4v-4h-4V6H10z"/>
-</svg>
diff --git a/data/search-icons/svg/police.svg b/data/search-icons/svg/police.svg
deleted file mode 100644
index 71901746d1..0000000000
--- a/data/search-icons/svg/police.svg
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1"
-	 id="svg2" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" sodipodi:docname="police.svg" inkscape:version="0.48.2 r9819" xmlns:svg="http://www.w3.org/2000/svg"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="182.439px"
-	 height="182.439px" viewBox="0 0 182.439 182.439" enable-background="new 0 0 182.439 182.439" xml:space="preserve">
-<sodipodi:namedview  inkscape:cx="106.119" inkscape:zoom="0.74866731" pagecolor="#ffffff" inkscape:cy="62.519989" borderopacity="1" objecttolerance="10" guidetolerance="10" bordercolor="#666666" gridtolerance="10" showgrid="false" inkscape:window-height="484" inkscape:current-layer="svg2" inkscape:window-y="0" inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-x="0" inkscape:window-width="640" inkscape:window-maximized="0" id="namedview12" fit-margin-bottom="10" fit-margin-right="10" fit-margin-left="10" fit-margin-top="10">
-	</sodipodi:namedview>
-<g id="g2993">
-	<path id="path4" inkscape:connector-curvature="0" fill="#50524E" d="M125.425,28.358H57.499V16.324
-		c0-3.493,2.831-6.324,6.324-6.324h55.277c3.493,0,6.324,2.831,6.324,6.324V28.358z"/>
-	<path id="path6" inkscape:connector-curvature="0" fill="#50524E" d="M125.425,36.956c0,18.757-15.206,39.962-33.963,39.962
-		c-18.756,0-33.962-21.206-33.962-39.962C81.152,36.956,102.53,36.956,125.425,36.956z"/>
-	<g>
-		<path fill="#50524E" d="M50.724,83.94c-6.262,0-11.338,5.578-11.338,12.458v63.584c0,6.882,5.075,12.458,11.338,12.458h9.911
-			l56.788-88.5H50.724z"/>
-		<path fill="#50524E" d="M133.849,83.998L79.385,172.44h53.411c6.263,0,11.339-5.577,11.339-12.458V96.398
-			C144.135,89.908,139.617,84.582,133.849,83.998z"/>
-		<path fill="#50524E" d="M132.796,83.94c0.355,0,0.706,0.023,1.053,0.059l0.036-0.059H132.796z"/>
-	</g>
-</g>
-</svg>
diff --git a/data/search-icons/svg/post.svg b/data/search-icons/svg/post.svg
deleted file mode 100644
index 7e4c695d0b..0000000000
--- a/data/search-icons/svg/post.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1"
-	 id="postoffice" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" sodipodi:docname="postoffice.svg" inkscape:version="0.48.2 r9819" xmlns:svg="http://www.w3.org/2000/svg"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px" height="24px"
-	 viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
-<sodipodi:namedview  inkscape:cx="8.9629805" inkscape:zoom="7.2917032" pagecolor="#ffffff" inkscape:cy="8.9363231" borderopacity="1" objecttolerance="10" guidetolerance="10" bordercolor="#666666" gridtolerance="10" showgrid="true" inkscape:window-height="669" inkscape:current-layer="postoffice" inkscape:window-y="0" inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-x="0" inkscape:window-width="1125" inkscape:window-maximized="0" id="namedview7">
-	<inkscape:grid  visible="true" empspacing="5" enabled="true" snapvisiblegridlinesonly="true" type="xygrid" id="grid2988">
-		</inkscape:grid>
-</sodipodi:namedview>
-<path id="rect2990" fill="#50524E" d="M3.562,7L11,14h2l7.438-7H3.562z M2,8.438V18l6.031-4.625L2,8.438z M22,8.469l-5.969,4.875
-	L22,18V8.469z M15.25,14L14,15h-4l-1.094-0.906L3,19h18L15.25,14z"/>
-</svg>
diff --git a/data/search-icons/svg/shop.svg b/data/search-icons/svg/shop.svg
deleted file mode 100644
index 17932e2c39..0000000000
--- a/data/search-icons/svg/shop.svg
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   width="24"
-   id="symbol-supermarket"
-   viewBox="0 0 38.626611 38.626611"
-   height="24"
-   inkscape:version="0.48.2 r9819"
-   sodipodi:docname="supermarket.svg">
-  <metadata
-     id="metadata35">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs33" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1025"
-     inkscape:window-height="749"
-     id="namedview31"
-     showgrid="true"
-     inkscape:zoom="15.33316"
-     inkscape:cx="1.4984643"
-     inkscape:cy="11.843158"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="symbol-supermarket">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3012"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <path
-     style="fill:#505050;fill-opacity:1;stroke:none"
-     d="m 7.4436697,1.6094425 -4.2247855,0 c -1.1618445,0.082504 -1.6094421,0.540388 -1.6094421,1.7157589 0,1.0073373 0.5141533,1.4862134 1.6094421,1.5031254 l 1.7168339,-1e-7 c 0.534088,1e-7 0.8018467,0.2634093 0.8714825,0.7933188 L 9.4538062,28.978387 C 9.6669683,29.773918 10.080335,30.5794 11.188865,30.5794 l 19.390535,0 c 1.034227,0 1.609442,-0.556661 1.609442,-1.609442 0,-0.920663 -0.514494,-1.609442 -1.415076,-1.609442 l -18.30059,0 -0.50295,-3.218884 17.278115,0 c 1.411146,0.208141 1.445555,-0.348826 1.800506,-1.42463 1.373998,-4.14029 2.838517,-8.313734 4.056809,-11.867386 0.02055,-2.2220062 -0.173155,-2.1629918 -1.307372,-2.802405 l -1.156786,-1e-7 -23.1860257,0 L 8.5158889,2.7241044 C 8.3348035,2.0482847 8.0471154,1.6094425 7.4436697,1.6094425 z m 2.5147533,9.6566525 4.526556,0 0,3.218884 -4.023605,0 z m 7.74544,0 4.828326,0 0,3.218884 -4.828326,0 z m 8.047211,0 5.783932,0 -1.106491,3.218884 -4.677441,0 z m -14.78675,6.437768 3.520655,0 0,3.218885 -3.017704,0 z m 6.739539,0 4.828326,0 0,3.218885 -4.828326,0 z m 8.047211,0 3.570949,0 -1.106491,3.218885 -2.464458,0 z"
-     id="rect3022"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="ccccccccccccccccccccccccccccccccccccccccccccccccccc" />
-  <path
-     sodipodi:type="arc"
-     style="fill:#505050;fill-opacity:1;stroke:none"
-     id="path3034"
-     sodipodi:cx="7.5"
-     sodipodi:cy="21.5"
-     sodipodi:rx="1.5"
-     sodipodi:ry="1.5"
-     d="m 9,21.5 a 1.5,1.5 0 1 1 -3,0 1.5,1.5 0 1 1 3,0 z"
-     transform="scale(1.6094421,1.6094421)" />
-  <path
-     sodipodi:type="arc"
-     style="fill:#505050;fill-opacity:1;stroke:none"
-     id="path3036"
-     sodipodi:cx="18.5"
-     sodipodi:cy="21.5"
-     sodipodi:rx="1.5"
-     sodipodi:ry="1.5"
-     d="m 20,21.5 a 1.5,1.5 0 1 1 -3,0 1.5,1.5 0 1 1 3,0 z"
-     transform="scale(1.6094421,1.6094421)" />
-</svg>
diff --git a/data/search-icons/svg/toilet.svg b/data/search-icons/svg/toilet.svg
deleted file mode 100644
index 4e002c0c1a..0000000000
--- a/data/search-icons/svg/toilet.svg
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1"
-	 id="toilets" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" sodipodi:docname="toilets.svg" inkscape:version="0.48.2 r9819" xmlns:svg="http://www.w3.org/2000/svg"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px" height="24px"
-	 viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
-<sodipodi:namedview  inkscape:cx="23.553524" inkscape:zoom="8.4875217" pagecolor="#ffffff" inkscape:cy="13.222152" borderopacity="1" objecttolerance="10" guidetolerance="10" bordercolor="#666666" gridtolerance="10" showgrid="true" inkscape:window-height="697" inkscape:current-layer="toilets" inkscape:window-y="0" inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-x="0" inkscape:window-width="935" inkscape:window-maximized="0" id="namedview15">
-	<inkscape:grid  visible="true" empspacing="2" enabled="true" snapvisiblegridlinesonly="true" type="xygrid" id="grid2996">
-		</inkscape:grid>
-</sodipodi:namedview>
-<path id="path2998" sodipodi:nodetypes="ssscscsscccsccccscccsscscssss" inkscape:connector-curvature="0" fill="#50524E" d="
-	M2.713,7C2.135,7,1.711,7.382,1.436,7.812C1.159,8.243,1,8.78,1,9.375v5.469c0.048,0.406,0.403,0.744,0.784,0.744
-	c0.381,0,0.736-0.338,0.784-0.744V9.375c0-0.266,0.073-0.481,0.145-0.594c0.032-0.05,0.051-0.088,0.058-0.094h0.406
-	C3.154,13.222,3.119,17.324,3.119,22c0.031,0.535,0.49,0.999,0.987,0.999S5.063,22.535,5.094,22v-6h0.812v6
-	c0.031,0.535,0.49,0.999,0.987,0.999S7.85,22.535,7.881,22c0.035-4.386-0.063-9.262-0.058-13.312h0.406
-	C8.235,8.692,8.26,8.71,8.287,8.75c0.061,0.088,0.145,0.275,0.145,0.531v5.562c0.048,0.406,0.403,0.744,0.784,0.744
-	c0.38,0,0.736-0.338,0.784-0.744V9.281C10,8.69,9.852,8.166,9.564,7.75C9.277,7.334,8.828,7,8.287,7H2.713z"/>
-<path id="path3776" sodipodi:ry="2" sodipodi:rx="2" sodipodi:cy="5" sodipodi:type="arc" sodipodi:cx="4" fill="#50524E" d="M7.5,4
-	c0,1.104-0.896,2-2,2s-2-0.896-2-2s0.896-2,2-2S7.5,2.896,7.5,4z"/>
-<rect id="rect3787" x="10.905" y="2" fill="#50524E" width="2.191" height="21"/>
-<path id="path3804" fill="#50524E" d="M16.406,7.25c-0.784,0-1.399,0.561-1.594,1.312l-1.531,6.25
-	c-0.159,0.383,0.021,0.821,0.404,0.98c0.383,0.16,0.821-0.021,0.98-0.404c0.027-0.064,0.045-0.132,0.053-0.201l1.562-6.281
-	c0.054-0.079,0.174-0.156,0.125-0.156h0.375h0.062L15,18h1.156c-0.01,1.31-0.031,2.596-0.031,4c0.031,0.535,0.471,1,0.969,1
-	s0.969-0.465,1-1v-4h0.812v4c0.031,0.535,0.502,1,1,1s0.938-0.465,0.969-1c0.01-1.293,0.004-2.653,0-4H22l-1.844-9.25h0.531
-	c0.107,0,0.13-0.002,0.156,0c0.001,0.012,0.043,0.071,0.062,0.125C20.924,8.925,20.879,8.87,20.938,9l1.344,6.156
-	c0.007,0.414,0.349,0.744,0.763,0.737s0.744-0.349,0.737-0.763c-0.002-0.099-0.023-0.196-0.062-0.287l-1.375-6.312V8.469
-	l-0.031-0.062c0.01,0.022-0.01-0.281-0.281-0.625S21.24,7.25,20.688,7.25h-0.625h-3.281H16.406z"/>
-<path id="path3791" sodipodi:ry="2" sodipodi:rx="2" sodipodi:cy="5" sodipodi:type="arc" sodipodi:cx="4" fill="#50524E" d="
-	M20.562,4c0,1.104-0.896,2-2,2s-2-0.896-2-2s0.896-2,2-2S20.562,2.896,20.562,4z"/>
-</svg>
diff --git a/data/search-icons/svg/tourism.svg b/data/search-icons/svg/tourism.svg
deleted file mode 100644
index 8800cc153a..0000000000
--- a/data/search-icons/svg/tourism.svg
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   width="24"
-   id="symbol-museum"
-   viewBox="0 0 257.51074 283.26181"
-   height="24"
-   inkscape:version="0.48.2 r9819"
-   sodipodi:docname="museum.svg">
-  <title
-     id="title3768">Museum Map Icon</title>
-  <metadata
-     id="metadata19">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Museum Map Icon</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Yury Melnichek</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:source>mapsforhumans.com</dc:source>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs17" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="973"
-     inkscape:window-height="641"
-     id="namedview15"
-     showgrid="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:zoom="12.660945"
-     inkscape:cx="11.927728"
-     inkscape:cy="12.018669"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="symbol-museum">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2983"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <path
-     style="fill:#4d4d4d;fill-opacity:1;stroke:none"
-     d="M 12,1 3.0000001,8.0000003 5,8 l 1,0 0,10 -1,0 -1,0 0,2 -2,0 0,2 20,0 0,-2 -2,0 0,-2 -2,0 0,-10 3.000001,3e-7 z m -3,7 1.5,0 0,10 -1.5,0 z m 4.5,0 1.5,0 0,10 -1.5,0 z"
-     transform="matrix(11.802575,0,0,11.802575,-12.875535,0)"
-     id="path2985"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="cccccccccccccccccccccccccccc" />
-</svg>
diff --git a/data/search-icons/svg/transport.svg b/data/search-icons/svg/transport.svg
deleted file mode 100644
index 0a34c32a29..0000000000
--- a/data/search-icons/svg/transport.svg
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   width="24"
-   height="24"
-   id="symbol-bus"
-   viewBox="0 0 51.502147 51.502147"
-   inkscape:version="0.48.2 r9819"
-   sodipodi:docname="bus.svg">
-  <title
-     id="title2983">Bus Stop Map Icon</title>
-  <metadata
-     id="metadata23">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Bus Stop Map Icon</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Yury Melnichek</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:source>mapsforhumans.comz</dc:source>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs21" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="876"
-     inkscape:window-height="731"
-     id="namedview19"
-     showgrid="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:zoom="19.136028"
-     inkscape:cx="13.705802"
-     inkscape:cy="11.531081"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="symbol-bus">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <path
-     style="fill:#50524e;fill-opacity:1;stroke:none"
-     d="m 25.727523,4.2918456 c -0.575781,0.00255 -1.153939,0.026963 -1.742641,0.097989 C 19.839349,4.7174337 14.259303,6.0670571 12.021876,7.9667178 9.3601267,10.226653 9.8089334,12.408173 8.6307892,23.989194 l -0.047098,1.81294 0,17.002439 2.6375135,0 0,2.008932 c 0.0022,0.133747 0,0.46258 0,0.538982 0,1.528072 1.168694,2.792908 2.637512,2.792908 1.468816,0 2.68461,-1.264836 2.68461,-2.792908 0,-0.116727 -0.0021,-0.378837 0,-0.538982 0.0048,-0.363963 -7.71e-4,-0.709908 0,-1.224959 l 0,-0.783973 7.441555,0 3.532382,0 7.441555,0 0,0.783973 c 7.73e-4,0.515051 -0.0048,0.860996 0,1.224959 0.0021,0.160145 0,0.422248 0,0.538982 0,1.528072 1.215794,2.792908 2.68461,2.792908 1.46882,0 2.637514,-1.264836 2.637514,-2.792908 0,-0.0764 -0.0022,-0.405235 0,-0.538982 l 0,-2.008932 2.637513,0 0,-17.00244 -0.0471,-1.812939 C 41.693212,12.408173 42.142019,10.226653 39.480268,7.9667244 37.234571,6.06004 31.667453,4.710847 27.517264,4.3898418 26.876717,4.3085708 26.303307,4.2892846 25.727523,4.2918523 z m -6.264092,3.4788848 12.575283,0 c 0.620263,0 1.083265,0.4816779 1.083265,1.1269618 0,0.6452854 -0.463002,1.1759608 -1.083265,1.1759608 l -12.575283,0 c -0.620262,0 -1.083264,-0.5306754 -1.083264,-1.1759608 0,-0.6452839 0.463002,-1.1269618 1.083264,-1.1269618 z m -5.604714,4.3608556 10.173263,0 3.438185,0 10.126165,0 c 0.834963,0 1.417765,0.704297 1.50715,1.567948 l 1.130363,10.534653 c 0.08939,0.863652 -0.672188,1.567946 -1.507149,1.567946 l -11.256529,0 -3.438185,0 -11.256527,0 c -0.834962,0 -1.643636,-0.704294 -1.554249,-1.567946 l 1.130362,-10.534653 c 0.08939,-0.863651 0.672188,-1.567948 1.507151,-1.567948 z m 0,19.844343 c 1.468817,0 2.68461,1.215839 2.68461,2.74391 0,1.528071 -1.215793,2.792907 -2.68461,2.792907 -1.468819,0 -2.637513,-1.264836 -2.637513,-2.792907 0,-1.528071 1.168694,-2.74391 2.637513,-2.74391 z m 23.784712,0 c 1.468819,0 2.637514,1.215839 2.637514,2.74391 0,1.528071 -1.168695,2.792907 -2.637514,2.792907 -1.468818,0 -2.637513,-1.264836 -2.637513,-2.792907 0,-1.528071 1.168695,-2.74391 2.637513,-2.74391 z"
-     id="path3057"
-     inkscape:connector-curvature="0" />
-  <path
-     transform="matrix(1.83704,0,0,1.83704,-7.2464453,27.624254)"
-     d="m 12.992518,26.492094 a 2.0613129,2.0613129 0 1 1 -4.1226261,0 2.0613129,2.0613129 0 1 1 4.1226261,0 z"
-     sodipodi:ry="2.0613129"
-     sodipodi:rx="2.0613129"
-     sodipodi:cy="26.492094"
-     sodipodi:cx="10.931205"
-     id="path3833"
-     style="fill:#ffffff;fill-opacity:1;stroke:none"
-     sodipodi:type="arc" />
-</svg>