diff --git a/data/search-icons/categories-icons.txt b/data/search-icons/categories-icons.txt
deleted file mode 100644
index 8826220f7d..0000000000
--- a/data/search-icons/categories-icons.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-food restaurant
-money atm
-fuel petrolStation
-shop supermarket
-transport bus_sta
-turism museum
diff --git a/data/search-icons/svg/bank.svg b/data/search-icons/svg/bank.svg
new file mode 100644
index 0000000000..f584590843
--- /dev/null
+++ b/data/search-icons/svg/bank.svg
@@ -0,0 +1,19 @@
+<?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
new file mode 100644
index 0000000000..c227eddf71
--- /dev/null
+++ b/data/search-icons/svg/entertainment.svg
@@ -0,0 +1,27 @@
+<?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/restaurant.svg b/data/search-icons/svg/food.svg
similarity index 100%
rename from data/search-icons/svg/restaurant.svg
rename to data/search-icons/svg/food.svg
diff --git a/data/search-icons/svg/petrolStation.svg b/data/search-icons/svg/fuel.svg
similarity index 100%
rename from data/search-icons/svg/petrolStation.svg
rename to data/search-icons/svg/fuel.svg
diff --git a/data/search-icons/svg/hospital.svg b/data/search-icons/svg/hospital.svg
new file mode 100644
index 0000000000..c0c859e0a2
--- /dev/null
+++ b/data/search-icons/svg/hospital.svg
@@ -0,0 +1,15 @@
+<?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
new file mode 100644
index 0000000000..d019238537
--- /dev/null
+++ b/data/search-icons/svg/hotel.svg
@@ -0,0 +1,26 @@
+<?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
new file mode 100644
index 0000000000..c41a1f482f
--- /dev/null
+++ b/data/search-icons/svg/parking.svg
@@ -0,0 +1,20 @@
+<?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
new file mode 100644
index 0000000000..04d77ad997
--- /dev/null
+++ b/data/search-icons/svg/pharmacy.svg
@@ -0,0 +1,16 @@
+<?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
new file mode 100644
index 0000000000..71901746d1
--- /dev/null
+++ b/data/search-icons/svg/police.svg
@@ -0,0 +1,23 @@
+<?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
new file mode 100644
index 0000000000..7e4c695d0b
--- /dev/null
+++ b/data/search-icons/svg/post.svg
@@ -0,0 +1,14 @@
+<?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/supermarket.svg b/data/search-icons/svg/shop.svg
similarity index 100%
rename from data/search-icons/svg/supermarket.svg
rename to data/search-icons/svg/shop.svg
diff --git a/data/search-icons/svg/toilet.svg b/data/search-icons/svg/toilet.svg
new file mode 100644
index 0000000000..4e002c0c1a
--- /dev/null
+++ b/data/search-icons/svg/toilet.svg
@@ -0,0 +1,31 @@
+<?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/museum.svg b/data/search-icons/svg/tourism.svg
similarity index 100%
rename from data/search-icons/svg/museum.svg
rename to data/search-icons/svg/tourism.svg
diff --git a/data/search-icons/svg/bus_sta.svg b/data/search-icons/svg/transport.svg
similarity index 100%
rename from data/search-icons/svg/bus_sta.svg
rename to data/search-icons/svg/transport.svg