diff --git a/app/assets/images/browse/amenity_advertising_column.svg b/app/assets/images/browse/amenity_advertising_column.svg
new file mode 100644
index 00000000000..b20421afcd8
--- /dev/null
+++ b/app/assets/images/browse/amenity_advertising_column.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 4,3 L 4,2 7,0 10,2 10,3 Z"/>
+  <rect x="4.5" y="4" width="5" height="8" opacity=".27"/>
+  <rect x="4" y="13" width="6" height="1"/>
+</svg>
diff --git a/app/assets/images/browse/amenity_aerodrome.svg b/app/assets/images/browse/amenity_aerodrome.svg
new file mode 100644
index 00000000000..0f07a1232d3
--- /dev/null
+++ b/app/assets/images/browse/amenity_aerodrome.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="12" height="12" viewBox="0 0 12 12">
+  <path d="M 6 0 C 5.254644 0 5 2 5 2 L 5 3.96875 L 0 7.5 L 0 8.5 L 5 7.25 L 5 9.65625 L 3 11 L 3 12 L 6 11.25 L 9 12 L 9 11 L 7 9.65625 L 7 7.25 L 12 8.5 L 12 7.5 L 7 3.96875 L 7 2 C 7 2 6.745356 0 6 0 z"/>
+</svg>
diff --git a/app/assets/images/browse/amenity_arts_centre.svg b/app/assets/images/browse/amenity_arts_centre.svg
new file mode 100644
index 00000000000..1120439de03
--- /dev/null
+++ b/app/assets/images/browse/amenity_arts_centre.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 14 0.001953125 C 13.33277 0.091718085 12.665921 0.2004374 12 0.3046875 L 12 10.171875 L 11.492188 10.132812 C 10.176877 10.039022 8.7861312 10.693032 8.1757812 11.691406 C 7.9510942 12.058924 7.92742 12.6419 8.125 12.958984 C 8.433456 13.453997 9.1660816 13.86832 9.9628906 14.001953 C 11.795196 13.948773 13.108043 13.301828 13.998047 11.96875 C 14.000047 7.9999604 14 4.0006148 14 0.001953125 z M 7.1074219 0.005859375 C 4.6531858 -0.057768225 2.2414122 1.1902481 0.92773438 3.4648438 C -0.98306826 6.7733444 0.15132769 11.003898 3.4609375 12.914062 C 4.0136496 13.233064 4.7160491 13.044714 5.0351562 12.492188 C 5.1850995 12.232567 5.2253285 11.942446 5.1640625 11.671875 C 5.1094545 11.405148 5.1488545 11.125432 5.296875 10.869141 C 5.6159834 10.316614 6.3183817 10.128266 6.8710938 10.447266 L 7.1230469 10.591797 C 7.8455247 9.6392494 8.9273718 9.1409493 10.099609 8.9199219 A 1.3733846 1.3729251 0 0 1 9.9589844 7.3496094 A 1.3733846 1.3729251 0 0 1 10.5 6.828125 L 10.5 5.5507812 A 1.3733846 1.3729251 0 0 1 10.017578 5.3828125 A 1.3733846 1.3729251 0 0 1 9.5175781 3.5078125 A 1.3733846 1.3729251 0 0 1 10.5 2.8378906 L 10.5 1.0078125 C 10.459351 0.9833678 10.422133 0.95546217 10.380859 0.93164062 C 9.3466072 0.33471386 8.2229837 0.034781005 7.1074219 0.005859375 z M 7.2949219 0.9140625 A 1.3733846 1.3729251 0 0 1 8.0488281 1.0957031 A 1.3733846 1.3729251 0 0 1 8.5507812 2.9746094 A 1.3733846 1.3729251 0 0 1 6.6738281 3.4765625 A 1.3733846 1.3729251 0 0 1 6.171875 1.6015625 A 1.3733846 1.3729251 0 0 1 7.2949219 0.9140625 z M 3.7558594 2.4355469 A 1.3733846 1.3729251 0 0 1 4.5078125 2.6171875 A 1.3733846 1.3729251 0 0 1 5.0097656 4.4941406 A 1.3733846 1.3729251 0 0 1 3.1347656 4.9980469 A 1.3733846 1.3729251 0 0 1 2.6308594 3.1210938 A 1.3733846 1.3729251 0 0 1 3.7558594 2.4355469 z"/>
+</svg>
diff --git a/app/assets/images/browse/amenity_atm.svg b/app/assets/images/browse/amenity_atm.svg
new file mode 100644
index 00000000000..b3960defd6c
--- /dev/null
+++ b/app/assets/images/browse/amenity_atm.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 0,0 C 0,1 0,2 0,3 H 1 V 1 h 12 v 2 h 1 V 0 C 9.3333333,0 4.6666667,0 0,0 Z m 2,2 c 0,3 0,6 0,9 0,0.599243 0.400757,1 1,1 h 8 c 0.527334,0 1,-0.448696 1,-1 0,-3 0,-6 0,-9 h -1 c 0,2.3333333 0,4.6666667 0,7 -1,0 -2,1 -2,2 H 5 C 5,10 4,9 3,9 3,6.6666667 3,4.3333333 3,2 Z M 7,4 C 5.429204,4 4,4.9528024 4,6 4,7.047198 5.429204,8 7,8 8.570796,8 10,7.047198 10,6 10,4.9528024 8.570796,4 7,4 Z M 2,12.5 C 2,13.554668 2.424727,14 3,14 h 8 c 0.527334,0 1,-0.445332 1,-1.5 -0.305085,0.271186 -0.496636,0.49272 -1,0.46875 l -8,0.0625 C 2.520606,13.00728 2.305085,12.805085 2,12.5 Z"/>
+</svg>
diff --git a/app/assets/images/browse/amenity_bank.svg b/app/assets/images/browse/amenity_bank.svg
new file mode 100644
index 00000000000..1359ce1c647
--- /dev/null
+++ b/app/assets/images/browse/amenity_bank.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="m 0,2 0,7 c 0,0.627119 0.423729,1 1,1 l 12,0 c 0.576271,0 1,-0.423729 1,-1 L 14,2 0,2 z m 3,1 8,0 c 0,1 1,2 2,2 l 0,2 C 12,7 11,8 11,9 L 3,9 C 3,8 2,7 1,7 L 1,5 C 2,5 3,4 3,3 z M 7,4 C 5.343146,4 4,4.8954305 4,6 4,7.10457 5.343146,8 7,8 8.656855,8 10,7.10457 10,6 10,4.8954305 8.656855,4 7,4 z M 0,10.5 C 0,11.626577 0.448696,12 1,12 l 12,0 c 0.551304,0 1,-0.445333 1,-1.5 -0.288136,0.271186 -0.559322,0.5 -1,0.5 L 1,11 C 0.559322,11 0.271186,10.754237 0,10.5 z"/>
+</svg>
diff --git a/app/assets/images/browse/amenity_bar.svg b/app/assets/images/browse/amenity_bar.svg
new file mode 100644
index 00000000000..bf6c2c327c8
--- /dev/null
+++ b/app/assets/images/browse/amenity_bar.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="12" height="12" viewBox="0 0 12 12">
+  <path d="m0,0 l5.5,6 v4 c0,0 -4.5,1 -4.5,2 h10 c0,-1 -4.5,-2 -4.5,-2 v-4 l5.5,-6 z"/>
+</svg>
diff --git a/app/assets/images/browse/amenity_bbq.svg b/app/assets/images/browse/amenity_bbq.svg
new file mode 100644
index 00000000000..db3c3d35a03
--- /dev/null
+++ b/app/assets/images/browse/amenity_bbq.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 4,0 C 3,0.5 2,0.5 2,1.5 2,2.5 3.5,3 3.5,3.5 3.5,4 2.8333335,4.5 2.5,5 4,4.5 4.5,4.5 4.5,3.5 4.5,2.5 3.5,2 3,1.5 3,1 3.8333335,0.6666665 4,0 Z m 3.75,0 c -1,0.5 -2,0.5 -2,1.5 0,1 1.5,1.5 1.5,2 0,0.5 -0.6666665,1 -1,1.5 1.5,-0.5 2,-0.5 2,-1.5 0,-1 -1,-1.5 -1.5,-2 0,-0.5 0.8333335,-0.8333335 1,-1.5 z m 3.75,0 c -1,0.5 -2,0.5 -2,1.5 0,1 1.5,1.5 1.5,2 0,0.5 -0.666666,1 -1,1.5 1.5,-0.5 2,-0.5 2,-1.5 0,-1 -1,-1.5 -1.5,-2 0,-0.5 0.833334,-0.8333335 1,-1.5 z M 1,6 v 8 h 1 v -2 h 10 v 2 h 1 V 6 C 9,6 5,6 1,6 Z m 1,1 h 10 v 4 H 2 Z M 4,8 C 3.4477153,8 3,8.4477153 3,9 3,9.5522847 3.4477153,10 4,10 4.5522847,10 5,9.5522847 5,9 5,8.4477153 4.5522847,8 4,8 Z M 7,8 C 6.4477153,8 6,8.4477153 6,9 6,9.5522847 6.4477153,10 7,10 7.5522847,10 8,9.5522847 8,9 8,8.4477153 7.5522847,8 7,8 Z m 3,0 C 9.4477153,8 9,8.4477153 9,9 c 0,0.5522847 0.4477153,1 1,1 0.552285,0 1,-0.4477153 1,-1 0,-0.5522847 -0.447715,-1 -1,-1 z"/>
+</svg>
diff --git a/app/assets/images/browse/amenity_bench.svg b/app/assets/images/browse/amenity_bench.svg
new file mode 100644
index 00000000000..42ded62d45b
--- /dev/null
+++ b/app/assets/images/browse/amenity_bench.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="m1,5 a.75,.75 0 0 0 0,1.5 h12 a.75,.75 0 0 0 0,-1.5 z m1,2 v3 h1.5 v-3 z m8.5,0 v3 h1.5 v-3 z"/>
+</svg>
diff --git a/app/assets/images/browse/amenity_bicycle_parking.svg b/app/assets/images/browse/amenity_bicycle_parking.svg
new file mode 100644
index 00000000000..93c7816b433
--- /dev/null
+++ b/app/assets/images/browse/amenity_bicycle_parking.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="m 0,0 0,10 2.000077,0 0,-3.5 2.500097,0 c 1.976154,3e-7 3.500135,-1 3.500135,-3.25 C 8.000309,1 6.4871,2e-7 4.968942,0 z m 2.000077,2 2.500097,0 c 0.963608,0 1.500058,0.5254308 1.500058,1.25 0,0.7245692 -0.631804,1.25 -1.500058,1.25 l -2.500097,0 z M 9,7 9,7.5938559 9.500367,8 l 0,0.75 -3.000116,0 0,-0.25 0.50002,0 c 0.479412,0 0.455442,-0.5 0,-0.5 L 5.500213,8 c -0.50002,0 -0.50002,0.452061 0,0.5 l 0.500019,0 0,0.25 -0.562522,1.28125 C 5.296384,10.001436 5.147956,10 5.000193,10 c -1.02182,0 -2.000077,0.793929 -2.000077,2 0,1.206071 0.978257,2 2.000077,2 1.02182,0 1.937575,-0.856429 1.937575,-2.0625 0,-0.150759 -0.0039,-0.302075 -0.03125,-0.4375 l 0.843783,0 1.821945,-2 0.365639,0.78125 C 9.383285,10.615837 9.000348,11.229684 9.000348,12 c 0,1.206071 0.978257,2 2.000077,2 C 12.022246,14 12.938,13.143571 12.938,11.9375 12.938,10.731429 12.022246,10 11.000425,10 c -0.15008,0 -0.292278,0.02946 -0.437517,0.0625 L 10.000386,8.75 10,7.8 z m -2.593502,2.5 2.193834,0 -1.193796,1.25 -0.843782,0 C 6.422636,10.56342 6.258266,10.401358 6.062734,10.28125 z M 5.000193,11 c 0.635098,0 1.000039,0.549217 1.000039,1 0,0.450783 -0.364941,1 -1.000039,1 -0.635098,0 -1.000038,-0.549217 -1.000038,-1 0,-0.450783 0.36494,-1 1.000038,-1 z m 6.000232,0 c 0.635099,0 1.000039,0.549217 1.000039,1 0,0.450783 -0.36494,1 -1.000039,1 -0.635098,0 -1.000039,-0.549217 -1.000039,-1 0,-0.450783 0.364941,-1 1.000039,-1 z"/>
+</svg>
diff --git a/app/assets/images/browse/amenity_bicycle_repair_station.svg b/app/assets/images/browse/amenity_bicycle_repair_station.svg
new file mode 100644
index 00000000000..abf0e7c4665
--- /dev/null
+++ b/app/assets/images/browse/amenity_bicycle_repair_station.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 2.7441406 0 C 2.0338765 0.0003935 1.3740289 0.4117078 1 1 L 3.3691406 1 L 3.9921875 2 L 3.3691406 3 L 1.0019531 3 C 1.3756288 3.5877381 2.0345467 3.9989723 2.7441406 4 C 3.5023764 3.9999999 4.1562562 3.595766 4.5117188 3 L 9.1777344 3 C 9.533156 3.5959232 10.188909 4.0000003 10.947266 4 C 12.080957 4.0000002 13 3.1045696 13 2 C 13 0.89543042 12.080957 -2e-007 10.947266 0 C 10.188909 -2.6757065e-007 9.533156 0.40407683 9.1777344 1 L 4.5117188 1 C 4.1562561 0.40423404 3.5023764 6.6882009e-008 2.7441406 0 z M 10.322266 1 L 11.572266 1 L 12.195312 2 L 11.572266 3 L 10.322266 3 L 9.6992188 2 L 10.322266 1 z M 7.9824219 5.4511719 L 8.0136719 6.4492188 L 8.9785156 7.0117188 L 8.9785156 8.0097656 L 5.2382812 8.0097656 L 4.9902344 8.0097656 L 4.9902344 7.0117188 L 5.4882812 7.0117188 C 6.4856837 7.0117188 6.4856836 6.0136719 5.4882812 6.0136719 L 3.4941406 6.0136719 C 2.4967381 6.0136719 2.4967381 7.0117188 3.4941406 7.0117188 L 3.9921875 7.0117188 L 3.9921875 8.0097656 L 3.4316406 9.3828125 C 3.3901026 9.3805525 3.348685 9.3828125 3.3066406 9.3828125 C 2.0394441 9.3828125 1 10.422942 1 11.691406 C 1 12.959871 2.0394441 14 3.3066406 14 C 4.5738362 14 5.6132812 12.959871 5.6132812 11.691406 C 5.6132812 11.451775 5.5576715 11.222456 5.4882812 11.003906 L 5.9863281 11.003906 L 6.984375 11.003906 L 9.1347656 9.0078125 L 9.4160156 9.7265625 C 8.7780386 10.142801 8.3554687 10.88276 8.3554688 11.691406 C 8.3554688 12.959871 9.3949129 14 10.662109 14 C 11.929306 14 13 12.959871 13 11.691406 C 13 10.422942 11.929306 9.3828125 10.662109 9.3828125 C 10.620048 9.3828125 10.578652 9.3805525 10.537109 9.3828125 L 9.9765625 8.0097656 L 9.9765625 6.6367188 L 7.9824219 5.4511719 z M 4.8339844 9.0078125 L 7.9375 9.0078125 L 6.6347656 10.255859 L 5.0839844 10.255859 C 4.9305231 10.068437 4.755997 9.859178 4.5527344 9.7265625 L 4.8339844 9.0078125 z M 3.3066406 10.505859 C 3.9674208 10.505859 4.4902344 11.029965 4.4902344 11.691406 C 4.4902344 12.352848 3.9674208 12.876953 3.3066406 12.876953 C 2.6458595 12.876953 2.1230469 12.352848 2.1230469 11.691406 C 2.1230469 11.029965 2.6458595 10.505859 3.3066406 10.505859 z M 10.662109 10.505859 C 11.322889 10.505859 11.847656 11.029965 11.847656 11.691406 C 11.847656 12.352848 11.322889 12.876953 10.662109 12.876953 C 10.001328 12.876953 9.5097656 12.352848 9.5097656 11.691406 C 9.5097656 11.029965 10.001328 10.505859 10.662109 10.505859 z"/>
+</svg>
diff --git a/app/assets/images/browse/amenity_biergarten.svg b/app/assets/images/browse/amenity_biergarten.svg
new file mode 100644
index 00000000000..d7be1ad66a6
--- /dev/null
+++ b/app/assets/images/browse/amenity_biergarten.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 3,0 C 2,0 1,1 1,2 l 0,10 c 0,1 -1,2 -1,2 l 11,0 c 0,0 -1,-1 -1,-2 l 3,0 c 1,0 1,-1 1,-1 L 14,5 C 14,4 13,3 12,3 L 10,3 10,2 C 10,0.7603028 9.263667,0 8,0 z M 4,1 7,1 C 8.380981,1 9,1.3528175 9,2 6,2 3.85459,2.19773 4,5 4,7 2,7 2,5 L 2,3 C 2,1.4966359 2.496636,1 4,1 z m 6,3.5 1,0 c 0.690253,0 1.5,0.027334 1.5,1.5 l 0,4.5 -2.5,0 z m -8,7.5 7,0 0,1 -7,0 z"/>
+</svg>
diff --git a/app/assets/images/browse/amenity_boat_rental.svg b/app/assets/images/browse/amenity_boat_rental.svg
new file mode 100644
index 00000000000..8c010597abc
--- /dev/null
+++ b/app/assets/images/browse/amenity_boat_rental.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 3.5,0 C 2.1192879,0 1,1.1192882 1,2.5 1,3.8807119 2.1192879,5 3.5,5 4.4253419,5 5.223985,4.4972377 5.65625,3.75 H 7 l 1,-1 1,1 1,-1 1,1 h 0.5 L 13,2.5 11.5,1.25 H 5.65625 C 5.223985,0.50276224 4.4253419,0 3.5,0 Z m -1,2 C 2.776142,2 3,2.2238576 3,2.5 3,2.7761424 2.776142,3 2.5,3 2.223858,3 2,2.7761424 2,2.5 2,2.2238576 2.223858,2 2.5,2 Z M 5.2324219,5.4296875 V 8.0253906 H 0 L 1.4648438,10.566406 H 12.535156 L 14,8.0253906 H 8.7675781 V 5.4296875 Z M 3,11.5 c -0.533898,0 -1.492285,1 -2,1 V 14 c 0.537184,0 1.525424,-1 2,-1 0.504237,0 1.466102,1 2,1 0.475502,0 1.492285,-1 2,-1 0.504237,0 1.521731,1 2,1 0.504237,0 1.525424,-1 2,-1 0.474576,0 1.495763,1 2,1 v -1.5 c -0.415254,0 -1.466102,-1.029661 -2,-1 -0.47827,0 -1.465278,1 -2,1 -0.444915,0 -1.495763,-1 -2,-1 -0.504237,0 -1.554097,1 -2,1 -0.475502,0 -1.466102,-1 -2,-1 z"/>
+</svg>
diff --git a/app/assets/images/browse/amenity_bureau_de_change.svg b/app/assets/images/browse/amenity_bureau_de_change.svg
new file mode 100644
index 00000000000..e2815fe2845
--- /dev/null
+++ b/app/assets/images/browse/amenity_bureau_de_change.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="m1.0586 9.998c-0.03552 0.16696-0.053837 0.33712-0.054688 0.50781 9.901e-4 1.3405 1.0591 2.4416 2.3984 2.4961v0.99805l2.5977-1.5-2.5977-1.5v1c-0.78627-0.05336-1.3972-0.70606-1.3984-1.4941 4.082e-4 -0.17319 0.030805-0.345 0.089844-0.50781z"/>
+  <path d="m12.07 5c-0.79765 0-1.5275 0.1732-2.1895 0.52148-1.0731 0.56201-1.5826 1.2435-1.9922 2.4785h-0.7168l-0.17188 1h0.80859c2.362e-4 0.33875-0.015931 0.65968 0.011719 1h-0.64844l-0.17188 1h0.94336c0.094567 0.42744 0.1028 0.49413 0.23438 0.79492 0.65374 1.4881 2.0146 2.2051 3.873 2.2051 0.62085 0 1.1892-0.1142 1.7031-0.34375v-1.2227c-0.43172 0.38786-1.0319 0.58008-1.8008 0.58008-0.55096 0-1.0643-0.13512-1.5371-0.4082-0.65786-0.37995-1.0715-0.69914-1.2441-1.6055h3.668l0.17383-1h-3.9727c-0.00279-0.33314-0.012641-0.6668 0-1h4.1387l0.16602-1h-4.2051c0.041116-0.32454 0.099828-0.39961 0.33008-0.75977 0.22614-0.34828 0.55635-0.58346 0.83594-0.77344 0.46872-0.32058 1.0475-0.48047 1.7383-0.48047 0.6373 0 1.2074 0.19987 1.709 0.59961l0.24609-1.1055c-0.52217-0.32058-1.1649-0.48047-1.9297-0.48047z"/>
+  <path d="m10.598 0-2.5977 1.5 2.5977 1.5v-1.002c0.78627 0.053358 1.3972 0.70606 1.3984 1.4941-4.08e-4 0.17319-0.030804 0.345-0.089844 0.50781h1.0352c0.03552-0.16696 0.05384-0.33712 0.05469-0.50781-9.92e-4 -1.3405-1.0591-2.4416-2.3984-2.4961z"/>
+  <path d="m3 0v1.0293c-0.42067 0.029208-0.82096 0.086442-1.1816 0.20117-0.48386 0.15391-0.85354 0.38109-1.1055 0.67969-0.25193 0.29551-0.37695 0.61339-0.37695 0.95508 0 0.31091 0.1027 0.59328 0.30664 0.8457 0.20794 0.24934 0.52153 0.45765 0.94141 0.62695 0.27973 0.11431 0.77542 0.23715 1.416 0.36523v2.4453c-0.23113-0.033071-0.44941-0.082571-0.6543-0.15039-0.39989-0.13544-0.69673-0.31186-0.88867-0.52734-0.18795-0.21856-0.30739-0.49537-0.35938-0.83398l-1.0977 0.072266c0.015995 0.45251 0.17656 0.86054 0.48047 1.2207 0.30791 0.35708 0.72978 0.62419 1.2656 0.80273 0.3559 0.1177 0.78677 0.18255 1.2539 0.22266v1.0449h1v-1.0195c0.5239-0.021235 1.012-0.093395 1.4414-0.24414 0.50386-0.17854 0.88833-0.42512 1.1562-0.74219 0.26792-0.32014 0.40234-0.66133 0.40234-1.0215 0-0.36324-0.1213-0.68389-0.36523-0.96094-0.24393-0.28012-0.62291-0.50979-1.1348-0.69141-0.286-0.10007-0.82043-0.21724-1.5-0.34375v-2.1387c0.4092 0.045257 0.76461 0.12473 1.0078 0.2793 0.3479 0.21856 0.5533 0.54282 0.61328 0.9707l1.1152-0.066406c-0.019994-0.3971-0.16372-0.75242-0.43164-1.0664-0.26792-0.31398-0.65249-0.55087-1.1523-0.71094-0.34236-0.11264-0.73564-0.17216-1.1523-0.20703v-1.0371zm0 1.8281v1.9434c-0.58505-0.12453-1.0311-0.24603-1.2012-0.36523-0.22793-0.15699-0.3418-0.35838-0.3418-0.60156 0-0.28012 0.16056-0.51783 0.48047-0.71484 0.23896-0.14761 0.61679-0.223 1.0625-0.26172zm1 3.0859c0.29468 0.060768 0.71815 0.13946 0.8457 0.17773 0.36789 0.10774 0.63301 0.24032 0.79297 0.40039 0.15995 0.15699 0.24023 0.34229 0.24023 0.55469 1e-7 0.20932-0.084001 0.40349-0.25195 0.58203-0.16395 0.17546-0.41596 0.31443-0.75586 0.41602-0.2573 0.076897-0.55422 0.11413-0.87109 0.13281z"/>
+</svg>
diff --git a/app/assets/images/browse/amenity_bus_station.svg b/app/assets/images/browse/amenity_bus_station.svg
new file mode 100644
index 00000000000..e8a502a85ca
--- /dev/null
+++ b/app/assets/images/browse/amenity_bus_station.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <rect width="14" height="14" rx="1.4" fill="#0092da"/>
+  <path d="m 7.0000055,0.4619362 c -1.205409,0.00954 -2.839825,0.350732 -3.521484,0.6347656 -0.691424,0.288102 -1.150891,0.574682 -1.294922,1.294922 l -0.519531,3.994141 v 5.5019532 h 0.894531 v 0.861328 c 0,1.052024 1.537109,1.052024 1.537109,0 v -0.861328 h 2.84375 0.0078 2.955079 v 0.861328 c 0,1.052024 1.5390625,1.052024 1.5390625,0 v -0.861328 h 0.894532 V 6.3857648 l -0.51953,-3.994141 C 11.672344,1.6713838 11.21292,1.3848038 10.521489,1.0967018 9.8397675,0.8126426 8.2054405,0.4714262 7.0000055,0.4619362 Z m -2.195312,1.0078126 h 2.142578 2.248047 c 0.432157,6e-6 0.432157,0.648437 0,0.648437 h -2.251953 -2.138672 c -0.432157,0 -0.432157,-0.648437 0,-0.648437 z m -1.166016,1.302734 h 3.304688 3.4160155 c 0.456506,0 0.577387,0.23408 0.632812,0.585938 l 0.402343,2.896484 c 0.03761,0.277582 -0.04227,0.550781 -0.425781,0.550781 H 6.9472715 3.0312555 c -0.383494,0 -0.463418,-0.273199 -0.425781,-0.550781 l 0.402344,-2.896484 c 0.05542,-0.351858 0.174355,-0.585938 0.630859,-0.585938 z m -0.310547,5.914063 c 0.40781,0 0.738281,0.330461 0.738281,0.738281 1e-6,0.407828 -0.330471,0.7363282 -0.738281,0.7363282 -0.407815,0 -0.738281,-0.3285002 -0.738281,-0.7363282 0,-0.40782 0.330466,-0.738281 0.738281,-0.738281 z m 7.3437505,0 c 0.407808,0 0.738281,0.330461 0.738281,0.738281 0,0.407828 -0.330473,0.7363282 -0.738281,0.7363282 -0.407815,0 -0.7382815,-0.3285002 -0.7382815,-0.7363282 0,-0.40782 0.3304665,-0.738281 0.7382815,-0.738281 z" fill="#ffffff"/>
+</svg>
diff --git a/app/assets/images/browse/amenity_cafe.svg b/app/assets/images/browse/amenity_cafe.svg
new file mode 100644
index 00000000000..94109ba573c
--- /dev/null
+++ b/app/assets/images/browse/amenity_cafe.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 1,1 1,7 C 1,9 3,10 5.5,10 8,10 10,9 10,7 l 2,0 c 1,0 2,-1 2,-2 L 14,4 C 14,3 13,2 12,2 l -2,0 0,-1 z m 9,2.25 1.75,0 c 0.667788,0 1,0.5628359 1,1.25 0,0.6871641 -0.388201,1.25 -1,1.25 L 10,5.75 z M 0,11 c 0,1 1,2 2,2 l 7,0 c 1,0 2,-1 2,-2 z"/>
+</svg>
diff --git a/app/assets/images/browse/amenity_car_wash.svg b/app/assets/images/browse/amenity_car_wash.svg
new file mode 100644
index 00000000000..f19fdfeb48d
--- /dev/null
+++ b/app/assets/images/browse/amenity_car_wash.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 5,2 3,5 2,5 4,2 Z m 4,0 2,3 1,0 -2,-3 z m -2.5,0 1,0 0,3 -1,0 z M 6,0 4,1 10,1 8,0 Z M 4,6 3,9 C 2.527334,9 2,9.3842954 2,10 l 0,3 1,0 c 0,0 0,1 1,1 1,0 1,-1 1,-1 l 4,0 c 0,0 0,1 1,1 1,0 1,-1 1,-1 l 1,0 0,-3 C 12,9.4793944 11.544575,9 11,9 L 10,6 4,6 Z M 5,7 9,7 9.625,9 4.375,9 5,7 Z m -1,3.25 c 0.414214,0 0.75,0.335786 0.75,0.75 0,0.414214 -0.335786,0.75 -0.75,0.75 -0.414214,0 -0.75,-0.335786 -0.75,-0.75 0,-0.414214 0.335786,-0.75 0.75,-0.75 z m 6,0 c 0.414214,0 0.75,0.335786 0.75,0.75 0,0.414214 -0.335786,0.75 -0.75,0.75 -0.414214,0 -0.75,-0.335786 -0.75,-0.75 0,-0.414214 0.335786,-0.75 0.75,-0.75 z"/>
+</svg>
diff --git a/app/assets/images/browse/amenity_casino.svg b/app/assets/images/browse/amenity_casino.svg
new file mode 100644
index 00000000000..adbf592781a
--- /dev/null
+++ b/app/assets/images/browse/amenity_casino.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 3.8671777,1.0634361 C 3.2272339,1.1084121 2.6197181,1.4636089 2.2734031,2.0634145 L 0.27344635,5.532158 C -0.2805518,6.4917336 0.03263971,7.6967117 0.99219263,8.2508989 L 4.4609362,10.250856 c 0.1411074,0.08088 0.2881145,0.174525 0.4374764,0.218745 V 6.969677 c 0,-1.6446466 1.3552885,-2.9999351 2.9999351,-2.9999351 H 9.117121 C 8.9518853,3.7233151 8.7361858,3.5037681 8.4608875,3.3447648 L 4.992144,1.344808 C 4.6323135,1.1369435 4.2511365,1.036734 3.8671777,1.0635646 Z M 4.1718616,1.7723935 C 4.7329274,1.7777452 5.2216537,2.1562766 5.3671264,2.6981426 5.5460741,3.3647319 5.1508827,4.0502186 4.4843501,4.229291 3.8177609,4.4082387 3.1322741,4.0130473 2.9532017,3.3465147 2.7742541,2.6799255 3.1694455,1.9944387 3.835978,1.8153663 3.9454851,1.7858712 4.0585033,1.7714146 4.1719108,1.7723973 Z M 2.0508099,5.446099 C 2.6124048,5.4516926 3.1012823,5.8311538 3.2460747,6.3738134 3.4236391,7.0403649 3.027688,7.7247934 2.3613331,7.9030721 1.6953863,8.0807763 1.0112602,7.6858457 0.83207439,7.0202958 0.65312671,6.3537065 1.0483181,5.6682198 1.7148507,5.4891474 1.8243577,5.4596674 1.9373759,5.4451954 2.0507834,5.4461784 Z M 7.8983855,4.969656 c -1.1079585,0 -1.9999568,0.8919605 -1.9999568,1.9999568 v 3.9998382 c 0,1.107958 0.8919605,1.999957 1.9999568,1.999957 h 3.9998375 c 1.107959,0 1.999957,-0.891961 1.999957,-1.999957 V 6.9696128 c 0,-1.1079585 -0.89196,-1.9999568 -1.999957,-1.9999568 z M 11.898223,5.7196587 A 1.2499541,1.2499541 0 0 1 13.148178,6.9696128 1.2499541,1.2499541 0 0 1 11.898223,8.2195669 1.2499541,1.2499541 0 0 1 10.648269,6.9696128 1.2499541,1.2499541 0 0 1 11.898223,5.7196587 Z M 7.8983855,9.7194967 A 1.2499541,1.2499541 0 0 1 9.1483396,10.969451 1.2499541,1.2499541 0 0 1 7.8983855,12.219405 1.2499541,1.2499541 0 0 1 6.6484314,10.969451 1.2499541,1.2499541 0 0 1 7.8983855,9.7194967 Z"/>
+</svg>
diff --git a/app/assets/images/browse/amenity_charging_station.svg b/app/assets/images/browse/amenity_charging_station.svg
new file mode 100644
index 00000000000..6fb843e1840
--- /dev/null
+++ b/app/assets/images/browse/amenity_charging_station.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 2,1 C 0.8344723,1 0,1.7955215 0,3 L 0,14 7,14 7,6.125 C 7,6.125 7.875,6 7.875,7 l 0,4 c 0,2 1.864698,2.125 2.125,2.125 0.275652,0 2.125,-0.124975 2.125,-2.125 l 0,-4 c 0,0 1.387558,0.017377 1.375,-2.96875 l -0.75,0 0,-2 C 12.75,1.4640917 12,1.4675079 12,2 l 0,2 -1,0 0,-2 C 11,1.4538157 10.25,1.4548128 10.25,2 l 0,2 -0.75,0 c 0.01252,2.9863904 1.375,3 1.375,3 l 0,4 c 0,0.874159 -0.767136,0.875 -0.875,0.875 -0.107864,0 -0.875,-0.04279 -0.875,-0.875 l 0,-4 C 9.125,5.7190916 8,4.875 7,4.875 L 7,3 C 7,1.7775442 6.1835046,1 5,1 Z m 0.96875,2 2.75,0 L 4,5.6666667 l 2.0625,0 L 2.28125,11 1.59375,11 2.96875,7 1.25,7 Z"/>
+</svg>
diff --git a/app/assets/images/browse/amenity_cinema.svg b/app/assets/images/browse/amenity_cinema.svg
new file mode 100644
index 00000000000..631439acb8a
--- /dev/null
+++ b/app/assets/images/browse/amenity_cinema.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 1,1 C 0.446,1 0,1.446 0,2 l 0,11 c 0,0.554 0.446,1 1,1 l 12,0 c 0.554,0 1,-0.446 1,-1 L 14,2 C 14,1.446 13.554,1 13,1 L 1,1 Z m 0.25,1 0.5,0 C 1.8885,2 2,2.1115 2,2.25 l 0,0.5 C 2,2.8885 1.8885,3 1.75,3 L 1.25,3 C 1.1115,3 1,2.8885 1,2.75 L 1,2.25 C 1,2.1115 1.1115,2 1.25,2 Z M 4,2 10,2 10,7 4,7 4,2 Z m 8.25,0 0.5,0 C 12.8885,2 13,2.1115 13,2.25 l 0,0.5 C 13,2.8885 12.8885,3 12.75,3 l -0.5,0 C 12.1115,3 12,2.8885 12,2.75 l 0,-0.5 C 12,2.1115 12.1115,2 12.25,2 Z m -11,2 0.5,0 C 1.8885,4 2,4.1115 2,4.25 l 0,0.5 C 2,4.8885 1.8885,5 1.75,5 L 1.25,5 C 1.1115,5 1,4.8885 1,4.75 L 1,4.25 C 1,4.1115 1.1115,4 1.25,4 Z m 11,0 0.5,0 C 12.8885,4 13,4.1115 13,4.25 l 0,0.5 C 13,4.8885 12.8885,5 12.75,5 l -0.5,0 C 12.1115,5 12,4.8885 12,4.75 l 0,-0.5 C 12,4.1115 12.1115,4 12.25,4 Z m -11,2 0.5,0 C 1.8885,6 2,6.1115 2,6.25 l 0,0.5 C 2,6.8885 1.8885,7 1.75,7 L 1.25,7 C 1.1115,7 1,6.8885 1,6.75 L 1,6.25 C 1,6.1115 1.1115,6 1.25,6 Z m 11,0 0.5,0 C 12.8885,6 13,6.1115 13,6.25 l 0,0.5 C 13,6.8885 12.8885,7 12.75,7 l -0.5,0 C 12.1115,7 12,6.8885 12,6.75 l 0,-0.5 C 12,6.1115 12.1115,6 12.25,6 Z m -11,2 0.5,0 C 1.8885,8 2,8.1115 2,8.25 l 0,0.5 C 2,8.8885 1.8885,9 1.75,9 L 1.25,9 C 1.1115,9 1,8.8885 1,8.75 L 1,8.25 C 1,8.1115 1.1115,8 1.25,8 Z M 4,8 l 6,0 0,5 -6,0 0,-5 z m 8.25,0 0.5,0 C 12.8885,8 13,8.1115 13,8.25 l 0,0.5 C 13,8.8885 12.8885,9 12.75,9 l -0.5,0 C 12.1115,9 12,8.8885 12,8.75 l 0,-0.5 C 12,8.1115 12.1115,8 12.25,8 Z m -11,2 0.5,0 C 1.8885,10 2,10.1115 2,10.25 l 0,0.5 C 2,10.8885 1.8885,11 1.75,11 l -0.5,0 C 1.1115,11 1,10.8885 1,10.75 l 0,-0.5 C 1,10.1115 1.1115,10 1.25,10 Z m 11,0 0.5,0 c 0.1385,0 0.25,0.1115 0.25,0.25 l 0,0.5 C 13,10.8885 12.8885,11 12.75,11 l -0.5,0 C 12.1115,11 12,10.8885 12,10.75 l 0,-0.5 C 12,10.1115 12.1115,10 12.25,10 Z m -11,2 0.5,0 C 1.8885,12 2,12.1115 2,12.25 l 0,0.5 C 2,12.8885 1.8885,13 1.75,13 l -0.5,0 C 1.1115,13 1,12.8885 1,12.75 l 0,-0.5 C 1,12.1115 1.1115,12 1.25,12 Z m 11,0 0.5,0 c 0.1385,0 0.25,0.1115 0.25,0.25 l 0,0.5 C 13,12.8885 12.8885,13 12.75,13 l -0.5,0 C 12.1115,13 12,12.8885 12,12.75 l 0,-0.5 C 12,12.1115 12.1115,12 12.25,12 Z"/>
+</svg>
diff --git a/app/assets/images/browse/amenity_community_centre.svg b/app/assets/images/browse/amenity_community_centre.svg
new file mode 100644
index 00000000000..1ef9d97a5e8
--- /dev/null
+++ b/app/assets/images/browse/amenity_community_centre.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 11.473506,2.5 C 11.473506,3.328427 10.813795,4 10,4 9.1862051,4 8.5264938,3.328427 8.5264938,2.5 8.5264938,1.6715729 9.1862051,1 10,1 c 0.813795,0 1.473506,0.6715729 1.473506,1.5 z M 3,6 5,6 5,9 3,9 Z M 5.4735062,2.5 C 5.4735062,3.328427 4.8137949,4 4,4 3.1862051,4 2.5264938,3.328427 2.5264938,2.5 2.5264938,1.6715729 3.1862051,1 4,1 4.8137949,1 5.4735062,1.6715729 5.4735062,2.5 Z M 0,5 7,5 7,6 0,6 Z M 1,13 3,9 4,9 2,13 Z M 7,13 5,9 4,9 6,13 Z M 9,6 11,6 11,9 9,9 Z M 7,5 14,5 14,6 7,6 Z m 0,8 2,-4 1,0 -2,4 z m 6,0 -2,-4 -1,0 2,4 z"/>
+</svg>
diff --git a/app/assets/images/browse/amenity_courthouse.svg b/app/assets/images/browse/amenity_courthouse.svg
new file mode 100644
index 00000000000..9030c1f49f0
--- /dev/null
+++ b/app/assets/images/browse/amenity_courthouse.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 7,0 C 6,0 6,1 6,1 L 2.25,2 2.25,3 0,8 C 0,9 0.792008,10 2.5,10 4.207992,10 5,9 5,8 L 2.75,3 6,3 6,13 2,13 1,14 13,14 12,13 8,13 8,3 11.25,3 9,8 c 0,1 0.77294,2 2.5,2 C 13.22706,10 14,9 14,8 L 11.75,3 11.75,2 8,1 C 8,1 8,0 7,0 z M 2.5,4 4.25,8 0.75,8 z m 9,0 1.75,4 -3.5,0 z"/>
+</svg>
diff --git a/app/assets/images/browse/amenity_dentist.svg b/app/assets/images/browse/amenity_dentist.svg
new file mode 100644
index 00000000000..357145af8cf
--- /dev/null
+++ b/app/assets/images/browse/amenity_dentist.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="m 7,8 c 2,0 2,1 2,3 0,1 -1.009121,3 0,3 1,0 1.751359,-1.142963 2,-3 C 11.248641,9.142963 11,8 11,7 11,5 12,3 12,2 12,1 11.599761,0.21742 11,0 9,0 9,1 7,1 5,1 5,0 3,0 2.400799,0.21742 2,1 2,2 2,3 3,5 3,7 3,8 2.87761,9.57334 3,11 3.12239,12.42666 4,14 5,14 6.008702,14 5,12 5,11 5,9 5,8 7,8 z"/>
+</svg>
diff --git a/app/assets/images/browse/amenity_doctors.svg b/app/assets/images/browse/amenity_doctors.svg
new file mode 100644
index 00000000000..5b7d436ca04
--- /dev/null
+++ b/app/assets/images/browse/amenity_doctors.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 7,1 C 5.83929,1 4.667834,1.5047052 3.875,2.5 3.187514,3.3630449 3,4 2.90625,5.0000004 0.01009,5.0238004 0,6.0817104 0,13 l 14,0 C 14,6.0817104 13.9899,5.0237504 11.09375,5.0000004 11,4 10.795537,3.3460958 10.125,2.5 9.334655,1.5027279 8.16071,1 7,1 z M 7,3 C 8.281412,2.99511 9,4 9.0625,5.0000004 l -4.125,0 C 5,4 5.718588,3.0048937 7,3 z m -1,3.0000004 2,0 L 8,8 l 2,0 0,2 -2,0 0,2 -2,0 0,-2 -2,0 0,-2 2,0 z"/>
+</svg>
diff --git a/app/assets/images/browse/amenity_drinking_water.svg b/app/assets/images/browse/amenity_drinking_water.svg
new file mode 100644
index 00000000000..22f148a440c
--- /dev/null
+++ b/app/assets/images/browse/amenity_drinking_water.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="m 1,6 1.5,8 5,0 L 9,6 z M 2.18,7 7.81,7 7.44,9 2.55,9 M 4,5 C 4,3 5,2 7,2 L 8,2 8,1 7,1 C 6,1 6,0 7,0 l 3,0 c 1,0 1,1 0,1 l -1,0 0,1 4,0 0,1.5 -6,0 C 5.91526,3.49111 5.5,3.9824765 5.5,5 z"/>
+</svg>
diff --git a/app/assets/images/browse/amenity_emergency_phone.svg b/app/assets/images/browse/amenity_emergency_phone.svg
new file mode 100644
index 00000000000..5d1b6d6579d
--- /dev/null
+++ b/app/assets/images/browse/amenity_emergency_phone.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 2,1 C 1,1 0,2 0,3 l 0,1 4,0 1,-1 4,0 1,1 4,0 0,-1 C 14,2 13,1 12,1 z M 0,4.75 0,5.25 C 0,5.25 0.37037551,6 1,6 L 3,6 C 3.5663545,5.9811215 4,5.25 4,5.25 l 0,-0.5 z m 10,0 0,0.5 c 0,0 0.433715,0.75 1,0.75 l 2,0 c 0.566673,0 1,-0.75 1,-0.75 l 0,-0.5 z M 1.5,8 C 0.70762712,8 0,8.573533 0,9.5 0,10.478901 0.72245763,11 1.5,11 l 1,0 C 2.5,11 3,11 3,11.5 3,12 2.5,12 2.5,12 l -2,0 0,1 2,0 C 3.2775424,13 4,12.396919 4,11.46875 4,10.593015 3.2627119,10 2.5,10 l -1,0 C 1.5,10 1,10 1,9.5 1,9 1.5,9 1.5,9 l 2,0 0,-1 z m 5,0 C 5,8 5,9.5 5,9.5 l 0,2 c 0,0 0,1.5 1.5,1.5 l 1,0 C 9,13 9,11.5 9,11.5 l 0,-2 C 9,9.5 9,8 7.5,8 z m 5,0 C 10.707627,8 10,8.573533 10,9.5 c 0,0.978901 0.722458,1.5 1.5,1.5 l 1,0 c 0,0 0.5,0 0.5,0.5 0,0.5 -0.5,0.5 -0.5,0.5 l -2,0 0,1 2,0 C 13.277542,13 14,12.396919 14,11.46875 14,10.593015 13.262712,10 12.5,10 l -1,0 C 11.5,10 11,10 11,9.5 11,9 11.5,9 11.5,9 l 2,0 0,-1 z M 6,9.75 C 6,9.75 6,9 6.75,9 l 0.5,0 C 8,9 8,9.75 8,9.75 l 0,1.5 C 8,11.25 8,12 7.25,12 l -0.5,0 C 6,12 6,11.25 6,11.25 z"/>
+</svg>
diff --git a/app/assets/images/browse/amenity_entrance.svg b/app/assets/images/browse/amenity_entrance.svg
new file mode 100644
index 00000000000..a2ec45acd1e
--- /dev/null
+++ b/app/assets/images/browse/amenity_entrance.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="10" height="10" viewBox="0 0 10 10">
+  <path d="m 2.75,0 0,2.5 1.25,0 0,-1.25 4.75,0 0,7.5 L 4,8.75 4,7.5 2.75,7.5 2.75,10 10,10 10,0 z M 5,2.5 l 0,1.75 -4,0 0,1.5 4,0 L 5,7.5 8,5 z"/>
+</svg>
diff --git a/app/assets/images/browse/amenity_excrement_bags.svg b/app/assets/images/browse/amenity_excrement_bags.svg
new file mode 100644
index 00000000000..cc1cad857a2
--- /dev/null
+++ b/app/assets/images/browse/amenity_excrement_bags.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 0,0 C 0,1 0,2 0,3 H 1 V 1 h 12 v 2 h 1 V 0 C 9.3333333,0 4.6666667,0 0,0 Z m 2,2 v 10 l -1,2 c 4,0 8,0 12,0 L 12,12 V 2 C 8.6666667,2 5.3333333,2 2,2 Z m 1,1 h 8 V 4 H 3 Z m 0,2 h 8 c 0,2.5 0,5 0,7.5 0,0.277 -0.223,0.5 -0.5,0.5 h -7 C 3.223,13 3,12.777 3,12.5 3,10 3,7.5 3,5 Z M 7,6 C 7,7 6.7426357,7.5622251 6,8 5.4460001,8 5,8.4460001 5,9 5,9.5539999 5.4460001,10 6,10 H 5 c -0.554,0 -1,0.446 -1,1 0,0.554 0.446,1 1,1 h 4 c 0.554,0 1,-0.446 1,-1 0,-0.554 -0.446,-1 -1,-1 H 8 C 8.5539999,10 9,9.5539999 9,9 9,8.4460001 8.5539999,8 8,8 8.000334,7 7.7168863,6.4764131 7,6 Z"/>
+</svg>
diff --git a/app/assets/images/browse/amenity_fast_food.svg b/app/assets/images/browse/amenity_fast_food.svg
new file mode 100644
index 00000000000..fcf1b892943
--- /dev/null
+++ b/app/assets/images/browse/amenity_fast_food.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 5,3 C 2,3 0.960032,5.000799 1,6 L 1,7 13,7 13,6 C 13,5 12,3 9,3 z M 1,8 C 0,8 0,9 1,9 l 12,0 c 1,0 1,-1 0,-1 z m 0,2.03125 0,0.625 C 1,11.34045 1.81579,12 2.5,12 l 9,0 c 0.68421,0 1.5,-0.65955 1.5,-1.34375 l 0,-0.625 z"/>
+</svg>
diff --git a/app/assets/images/browse/amenity_ferry.svg b/app/assets/images/browse/amenity_ferry.svg
new file mode 100644
index 00000000000..b9628079145
--- /dev/null
+++ b/app/assets/images/browse/amenity_ferry.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 7,0 C 6.1253946,0 5.4140625,0.7026661 5.4140625,1.5683594 5.4140625,2.2059534 5.8015873,2.75498 6.3535156,3 6.3465545,3.3334053 6.3389743,3.6665943 6.3320312,4 H 2 v 1 h 4.3125 c -0.040833,1.9652474 -0.082466,3.9292782 -0.1230469,5.894531 -0.00265,0.125895 0.00195,1.393427 -1.6992187,0.517578 C 2.7844231,10.534906 3.7469006,9.5408232 3.8613281,9.5117188 2.8591762,9.1963061 1.9523583,8.3194572 1.21875,7.4199219 0.49872446,9.0233829 1.7874594,10.736126 1.8496094,10.980469 2.0043881,10.811256 2.2350285,10.837639 2.3769531,10.861328 4.1133097,13.566717 6.3891016,13.241925 7,14 c 0.6108984,-0.758075 2.8870879,-0.433283 4.623047,-3.138672 0.141793,-0.02369 0.3723,-0.05007 0.527344,0.119141 0.06228,-0.244343 1.351083,-1.9570861 0.630859,-3.5605471 C 12.047775,8.3194572 11.140492,9.1963061 10.138672,9.5117188 10.252636,9.5408232 11.2172,10.534906 9.5117188,11.412109 7.8102142,12.287958 7.8131976,11.020426 7.8105469,10.894531 7.7711086,8.9292552 7.7285215,6.9652436 7.6875,5 H 12 V 4 H 7.6679688 C 7.6610735,3.6665933 7.6532838,3.3334086 7.6464844,3 8.1990762,2.75498 8.5859375,2.2059534 8.5859375,1.5683594 8.5859375,0.7026661 7.8752682,0 7,0 Z m 0,0.99414062 c 0.3100882,0 0.5625,0.25745228 0.5625,0.57421878 C 7.5625,1.8844493 7.3100882,2.140625 7,2.140625 6.6899138,2.140625 6.4375,1.8844493 6.4375,1.5683594 6.4375,1.2515929 6.6899138,0.99414062 7,0.99414062 Z"/>
+</svg>
diff --git a/app/assets/images/browse/amenity_firestation.svg b/app/assets/images/browse/amenity_firestation.svg
new file mode 100644
index 00000000000..1f74f9ebefd
--- /dev/null
+++ b/app/assets/images/browse/amenity_firestation.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 7,0 C 3.424161,1.2414283 2,5 2,8 2,11 3.744933,13.259763 6,14 4,10.741416 4,8 7,6 6.495078,7.352818 7,10 8,11 8.431455,10.599243 9,9.575273 9,9 c 2,2 0.562898,3.633261 0,5 1.08818,-0.559102 3,-2 3,-5 C 12,6 10,5 10,2 8.616484,2.5992431 8,4 8,5 7.047939,4.4434404 6,2.2464256 7,0 z"/>
+</svg>
diff --git a/app/assets/images/browse/amenity_fountain.svg b/app/assets/images/browse/amenity_fountain.svg
new file mode 100644
index 00000000000..b3b368ba36f
--- /dev/null
+++ b/app/assets/images/browse/amenity_fountain.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="m 0,11 14,0 C 13,13 9,14 7,14 5,14 1.3014827,13 0,11 Z M 9,0.06093585 c -1,0 -1.6751539,1.03509635 -2.0117188,1.81368585 C 6.6507147,1.058013 6,0.015234 5,0.015234 c -1.500366,0 -2,1.9238302 -2,2.9238302 0,1 1,0.6746464 1,0.030468 1,-2 2,-1.6140036 2.2421875,1.5476678 l 0,0.3496094 C 5.8591901,4.6775997 5.4301952,4.5582155 5,4.5582155 c -1.467057,0 -2.75,1.0324775 -2.75,3 l 0,1 c 0,1 1.5,1 1.5,0 l 0,-1 c 0,-0.9659595 0.683016,-1.5 1.25,-1.5 0.5494724,0 1.2020386,0.5361786 1.2421875,1.4179688 l 0,0.041016 0,2.4827997 C 7,9.4218205 7,9.4058077 7.7269357,10 L 7.75,7.5582105 l 0,-0.125 C 7.791048,6.5526081 8.4431284,6.0171949 8.9921875,6.0171949 c 0.566984,0 1.2500005,0.5340405 1.2500005,1.5 l 0,1 c 0,1 1.5,1 1.5,0 l 0,-1 c 0,-1.9675225 -1.282943,-3 -2.7500005,-3 C 8.5617665,4.5171999 8.13315,4.6383647 7.75,4.8277467 7.75,4.737903 7.7332947,4.6464926 7.75,4.5582155 8,1.8140074 9,1 10,3 c 0,0.5277476 1,0.9238303 1,-0.07617 0,-1 -0.499634,-2.86289445 -2,-2.86289415 z"/>
+</svg>
diff --git a/app/assets/images/browse/amenity_fuel.svg b/app/assets/images/browse/amenity_fuel.svg
new file mode 100644
index 00000000000..9256b011c10
--- /dev/null
+++ b/app/assets/images/browse/amenity_fuel.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="m 10.78125,0 -0.625,0.71875 1.1875,1.09375 c 0.03621,0.036212 0.0856,0.084693 0.125,0.125 l -0.25,0.28125 C 10.818532,2.6189681 11.105689,3.1369332 11.25,3.28125 L 12,4.03125 12,10 c 0,1 -0.392136,1 -0.5,1 C 11.392136,11 11,11 11,10 L 11,6 C 11,4.7190916 10,4 9,4 L 9,2 C 9,1.4486964 8.575273,1 8,1 L 2,1 C 1.400757,1 1,1.4247267 1,2 l 0,12 8,0 0,-9 c 0,0 1,0 1,1 l 0,4 c 0,2 1.239698,2 1.5,2 0.275652,0 1.5,0 1.5,-2 L 13,3 C 13,2 12.713983,1.7907839 12.375,1.46875 L 10.78125,0 z M 2,3 8,3 8,6 2,6 2,3 z"/>
+</svg>
diff --git a/app/assets/images/browse/amenity_helipad.svg b/app/assets/images/browse/amenity_helipad.svg
new file mode 100644
index 00000000000..259a464b079
--- /dev/null
+++ b/app/assets/images/browse/amenity_helipad.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="16" height="16" viewBox="0 0 16 16">
+  <path d="m8,.5 a7.5,7.5 0 0 0 0,15 a7.5,7.5 0 0 0 0,-15 z m0,1 a6.5,6.5 0 0 1 0,13 a6.5,6.5 0 0 1 0,-13 z m-3,1.5 l-.75,.75 v8.5 l.75,.75 h1 v-4 h4 v4 h1 l.75,-.75 v-8.5 l-.75,-.75 h-1 v4 h-4 v-4 z"/>
+</svg>
diff --git a/app/assets/images/browse/amenity_hospital.svg b/app/assets/images/browse/amenity_hospital.svg
new file mode 100644
index 00000000000..d227306597c
--- /dev/null
+++ b/app/assets/images/browse/amenity_hospital.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M7,0 A7,7 0 0 0 7,14 7,7 0 0 0 7,0 Z M6,3 H8 V6 H11 V8 H8 V11 H6 V8 H3 V6 h3 z"/>
+</svg>
diff --git a/app/assets/images/browse/amenity_hunting_stand.svg b/app/assets/images/browse/amenity_hunting_stand.svg
new file mode 100644
index 00000000000..7af4526da55
--- /dev/null
+++ b/app/assets/images/browse/amenity_hunting_stand.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="m 3,0 0,1.25 8,2 L 11,2 z M 4,2.5 4,7 10,7 10,4 z M 3,8 l 0,1 1,0 -1,5 1.5,0 1,-5 3,0 1.03125,5 1.5,0 L 10,9 11,9 11,8 z"/>
+</svg>
diff --git a/app/assets/images/browse/amenity_ice_cream.svg b/app/assets/images/browse/amenity_ice_cream.svg
new file mode 100644
index 00000000000..84cece8cee0
--- /dev/null
+++ b/app/assets/images/browse/amenity_ice_cream.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 5,0 C 3.3431457,0 2,1.3431457 2,3 2,3.3555333 2.0739786,3.6835283 2.1875,4 l 5.625,0 C 7.9260214,3.6835283 8,3.3555333 8,3 8,1.3431457 6.6568543,0 5,0 z M 9,0 C 8.5961418,0 8.2266723,0.105305 7.875,0.25 8.5629725,0.96841289 9,1.9267594 9,3 9,3.3467764 8.931082,3.6790098 8.84375,4 L 11.8125,4 C 11.926021,3.6835283 12,3.3555333 12,3 12,1.3431457 10.656854,0 9,0 z M 3.25,5 7,14 10.75,5 3.25,5 z"/>
+</svg>
diff --git a/app/assets/images/browse/amenity_internet_cafe.svg b/app/assets/images/browse/amenity_internet_cafe.svg
new file mode 100644
index 00000000000..3c7bc3351d0
--- /dev/null
+++ b/app/assets/images/browse/amenity_internet_cafe.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 7.7613518,9.6777548 Q 7.2808871,10.223493 6.6821541,10.558212 6.090813,10.885655 5.4920802,10.885655 q -0.6578671,0 -1.2787752,-0.378379 Q 3.5923967,10.128898 3.2006332,9.3430354 2.8162615,8.5571727 2.8162615,7.6185033 q 0,-1.1569647 0.5987329,-2.3139293 Q 4.021119,4.1403329 4.9155225,3.5582124 5.809926,2.9760918 6.6525871,2.9760918 q 0.6430835,0 1.2270328,0.3347193 0.5839494,0.3274428 1.00528,1.0041579 l 0.25132,-1.1278585 H 10.459346 L 9.3949316,8.0696467 q -0.2217529,1.018711 -0.2217529,1.1278586 0,0.1964656 0.1478353,0.3419958 0.155227,0.1382537 0.3695882,0.1382537 0.3917628,0 1.0274558,-0.443867 0.84266,-0.5821205 1.330517,-1.5571725 0.495248,-0.9823285 0.495248,-2.022869 0,-1.2151766 -0.635692,-2.2702701 Q 11.279832,2.3284826 10.023232,1.6954265 8.7740234,1.0623704 7.2587118,1.0623704 q -1.7296729,0 -3.1636751,0.8004158 -1.4266104,0.7931393 -2.2175292,2.2848232 -0.7835271,1.4844074 -0.7835271,3.18711 0,1.7827443 0.7835271,3.0706866 0.7909188,1.287941 2.2766633,1.899168 1.4931364,0.618503 3.3041186,0.618503 1.9366422,0 3.2449846,-0.640333 1.308342,-0.640332 1.958818,-1.557172 H 14 q -0.376979,0.764033 -1.293558,1.557172 -0.916579,0.793139 -2.18057,1.251559 Q 9.2618798,14 7.4804647,14 5.8394931,14 4.4498414,13.585239 3.0675815,13.170478 2.0918686,12.333679 1.1161557,11.504158 0.62090754,10.419958 -6.5049796e-7,9.0446986 -6.5049796e-7,7.4511436 -6.5049796e-7,5.6756759 0.73917577,4.0675678 1.640971,2.0956344 3.2967261,1.0478174 4.9598731,4.0565056e-7 7.3252376,4.0565056e-7 q 1.8331576,0 3.2893354,0.74220371434944 1.463569,0.73492728 2.306231,2.19750508 0.717,1.2588358 0.717,2.7359667 0,2.110187 -1.50792,3.7474011 -1.345301,1.469854 -2.9419218,1.469854 -0.5100317,0 -0.8278776,-0.152807 Q 8.0496305,10.587318 7.9017952,10.303535 7.8057023,10.121622 7.7613518,9.6777548 Z M 4.1837378,7.7058213 q 0,0.9968815 0.4804647,1.5498961 0.4804647,0.5530145 1.1013729,0.5530145 0.4139388,0 0.8722282,-0.2401247 Q 7.0960929,9.3212059 7.5100318,8.8409564 7.9313623,8.3607069 8.1974658,7.6257798 8.4635693,6.8835761 8.4635693,6.1413723 q 0,-0.9896049 -0.50264,-1.535343 -0.4952481,-0.545738 -1.2122493,-0.545738 -0.4730729,0 -0.8944034,0.2401247 Q 5.4403378,4.5332643 5.0485743,5.0571728 4.6568108,5.5810813 4.4202743,6.3305615 4.1837378,7.0800417 4.1837378,7.7058213 Z"/>
+</svg>
diff --git a/app/assets/images/browse/amenity_library.svg b/app/assets/images/browse/amenity_library.svg
new file mode 100644
index 00000000000..3e8d002f3a7
--- /dev/null
+++ b/app/assets/images/browse/amenity_library.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 2.5917969,0.8769531 C 2.39328,0.8849528 2.1958998,0.9246486 2,1 L 2,9 C 2,9 5.1875,8.875 6,12 L 6,3.5996094 C 5.38001,2.2940108 3.9814151,0.8209552 2.5917969,0.8769531 Z M 6,12 C 3.9375,10.40625 1,10 1,10 L 1,2.4003906 0,2 l 0,9 6,2 2,0 6,-2 0,-9 -1,0.4003906 0,8.0000004 L 8,12 C 7.333333,11.74532 6.556181,11.790637 6,12 Z M 12,1 C 10.00748,0.8934496 7.7073046,2.0896818 6.5,3.1191406 l 0,8.4648434 C 7.6147712,10.659345 9.613583,9.442711 12,9.199219 Z"/>
+</svg>
diff --git a/app/assets/images/browse/amenity_motorcycle_parking.svg b/app/assets/images/browse/amenity_motorcycle_parking.svg
new file mode 100644
index 00000000000..e577fef2198
--- /dev/null
+++ b/app/assets/images/browse/amenity_motorcycle_parking.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="m 12.105361,8.592849 c 0.230087,0.143493 0.364242,0.301579 0.429688,0.501953 0.02151,0.06588 0.02287,0.07941 0.02344,0.214845 5.18e-4,0.124653 -9.69e-4,0.157343 -0.01758,0.226563 -0.0326,0.135857 -0.09294,0.287657 -0.164063,0.419922 l -0.03125,0.06055 -0.107422,0.0059 c -0.390788,0.02031 -0.705242,0.09063 -0.978515,0.220703 -0.586101,0.278965 -0.954254,0.803082 -1.136719,1.615234 l -0.01563,0.06445 -0.07617,0.07031 c -0.04224,0.03811 -0.09913,0.08395 -0.126953,0.101562 -0.25285,0.159974 -0.61576,0.255702 -1.1308592,0.300782 -0.231244,0.02027 -0.386206,0.02425 -1.1328129,0.03125 -0.437753,0.0041 -0.79828,0.0095 -0.800781,0.01172 -0.0024,0.0022 -0.01933,0.0039 -0.03711,0.0039 -0.03876,0 -0.03611,0.01501 -0.01367,-0.164063 0.03467,-0.276763 0.03081,-0.597928 -0.0098,-0.830078 -0.116705,-0.667751 -0.529609,-1.106155 -1.230468,-1.30664 -0.307931,-0.08809 -0.578847,-0.119854 -1.041015,-0.126954 l -0.294922,-0.0059 -0.01953,-0.01953 c -0.09851,-0.107393 -0.148973,-0.271617 -0.121093,-0.396485 0.01318,-0.05897 0.05869,-0.14436 0.09766,-0.18164 L 5,8.567429 c 1.800073,-0.0057 2.2804989,0.0029 4,0.01804 0.09552,0.02254 0.530574,0.893996 0.576069,0.966343 0.02459,0.03911 0.05871,0.125409 0.06641,0.167968 0.0031,0.01729 0.0065,0.03125 0.0078,0.03125 0.01158,0 0.172029,-0.06386 0.253906,-0.101562 0.2191,-0.10089 0.493987,-0.496233 0.632984,-0.658177 0.13236,-1.558212 -2.0367482,-5.6944352 1.568192,-0.39844 z m -0.08398,1.607423 c 0.523975,-0.03617 1.039797,0.151361 1.40625,0.511719 0.509464,0.500985 0.629257,1.249973 0.298828,1.867188 -0.274749,0.513212 -0.817804,0.859649 -1.425781,0.910156 -0.228152,0.01895 -0.501646,-0.01028 -0.716797,-0.07813 -0.532054,-0.167785 -0.946151,-0.556792 -1.11914,-1.050781 -0.159622,-0.455811 -0.09845,-0.963138 0.164062,-1.365235 0.302901,-0.463965 0.811688,-0.754832 1.392578,-0.794917 z m -7.1308591,0.0039 c 0.21405,2.09e-4 0.274639,0.0063 0.429688,0.04297 0.699153,0.165416 1.22009,0.708323 1.320312,1.375 0.01845,0.123009 0.01862,0.33875 0,0.455078 -0.08894,0.555696 -0.453095,1.016019 -0.992188,1.257813 -0.171038,0.07671 -0.385955,0.134507 -0.580078,0.154297 -0.111584,0.01137 -0.351707,0.0031 -0.46875,-0.01563 -0.751784,-0.120297 -1.321792,-0.651835 -1.455078,-1.357422 -0.02528,-0.133428 -0.02834,-0.378255 -0.0059,-0.511719 0.06045,-0.358874 0.231586,-0.670689 0.503906,-0.923828 0.264009,-0.245414 0.575625,-0.397401 0.957031,-0.462891 0.0674,-0.01168 0.125886,-0.01386 0.291016,-0.01367 z m 7.1972651,0.564453 c -0.346496,0.01551 -0.659813,0.171497 -0.871093,0.43164 -0.06588,0.08111 -0.15436,0.245759 -0.183594,0.341797 -0.118945,0.390768 -0.0035,0.795222 0.306641,1.076172 0.07855,0.07115 0.195216,0.151726 0.279296,0.191406 0.06567,0.031 0.201039,0.0752 0.28125,0.0918 0.09932,0.02069 0.325537,0.0269 0.423829,0.01172 0.472284,-0.07286 0.840454,-0.398574 0.949218,-0.835938 0.02497,-0.100427 0.03054,-0.297319 0.01172,-0.40039 -0.100713,-0.551529 -0.605424,-0.934703 -1.197267,-0.908207 z m -7.1933591,0.0039 c -0.208258,-4.04e-4 -0.359351,0.03295 -0.533203,0.117187 -0.121062,0.05866 -0.209687,0.118618 -0.304687,0.210938 -0.156024,0.151631 -0.250332,0.317708 -0.300782,0.527344 -0.02082,0.08654 -0.02455,0.291915 -0.0078,0.390625 0.04305,0.253741 0.196733,0.503047 0.408203,0.662109 0.16276,0.122423 0.348512,0.201029 0.542969,0.230469 0.09631,0.01462 0.298145,0.01471 0.384765,0 0.685663,-0.116446 1.104889,-0.74447 0.914063,-1.369141 -0.09845,-0.32227 -0.378411,-0.597567 -0.722656,-0.710937 -0.131809,-0.0434 -0.229492,-0.05828 -0.38086,-0.05859 z M 1,3.491e-4 l 0,9.9999999 2,0 0,-3.4999999 2.5,0 c 1.9760775,3e-7 3.5,-1 3.5,-3.25 0,-2.25 -1.5131511,-3.2499998 -3.03125,-3.25 z m 2,2 2.5,0 c 0.9635709,0 1.5,0.5254308 1.5,1.25 0,0.7245692 -0.6317798,1.25 -1.5,1.25 l -2.5,0 z"/>
+</svg>
diff --git a/app/assets/images/browse/amenity_nightclub.svg b/app/assets/images/browse/amenity_nightclub.svg
new file mode 100644
index 00000000000..00513cd3217
--- /dev/null
+++ b/app/assets/images/browse/amenity_nightclub.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 13.006803,0.00308957 3.0068028,2.0030896 l 0,8.5624994 c -0.385369,-0.06933 -0.787572,-0.07549 -1.1875,0.03125 -1.15478198,0.308194 -2.01331698,1.387352 -1.78124998,2.25 0.232067,0.862648 1.50146898,1.370694 2.65624998,1.0625 1.154781,-0.308194 1.8125,-1.336236 1.8125,-2.25 l 0,-6.9687494 7.0000002,-1.375 0,5.6249997 c -0.385334,-0.06124 -0.787622,-0.04422 -1.1875,0.0625 -1.1546372,0.308156 -2.0130612,1.3561497 -1.7812502,2.2187497 0.232265,0.862479 1.5016132,1.370655 2.6562502,1.0625 1.154637,-0.308156 1.8125,-1.28125 1.8125,-2.28125 z"/>
+</svg>
diff --git a/app/assets/images/browse/amenity_parcel_locker.svg b/app/assets/images/browse/amenity_parcel_locker.svg
new file mode 100644
index 00000000000..c06f71c27f2
--- /dev/null
+++ b/app/assets/images/browse/amenity_parcel_locker.svg
@@ -0,0 +1,8 @@
+<svg version="1.1" width="14" height="14" viewBox="0 0 14 14" xmlns="http://www.w3.org/2000/svg">
+ <path d="m2 5.0723v5.9258l6 2.9336v-5.9316z"/>
+ <path d="m14 4-4.9995 3.3456-4.897e-4 5.922 5-3.2676z"/>
+ <path d="m7.5 0-5.5 4 6.0058 2.8751 5.9942-3.8732v-0.00391z"/>
+ <path d="m0 14h3v-1h-2v-12h2v-1h-3z"/>
+ <path d="m2 4 6.9987 3.3474"/>
+ <path d="m8.4973 6.4726 1e-4 7.5274"/>
+</svg>
diff --git a/app/assets/images/browse/amenity_parking.svg b/app/assets/images/browse/amenity_parking.svg
new file mode 100644
index 00000000000..d23c6f507fc
--- /dev/null
+++ b/app/assets/images/browse/amenity_parking.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="12" height="12" viewBox="0 0 12 12">
+  <path d="m2,0 v12 h1.75 v-5 h4.25 a3,3.5 0 0 0 0,-7 z m1.75,1.75 h3.75 a1.58,1.75 0 0 1 0,3.5 h-3.75 z"/>
+</svg>
diff --git a/app/assets/images/browse/amenity_parking_entrance_multistorey.svg b/app/assets/images/browse/amenity_parking_entrance_multistorey.svg
new file mode 100644
index 00000000000..59666774fb0
--- /dev/null
+++ b/app/assets/images/browse/amenity_parking_entrance_multistorey.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="m0,0 v10 h2 v-4 h2.3807 c3.5045,-0.023785 3.5045,-6 0,-6z m2,4 v-2 h2 c1.5622,0 1.5728,2 0,2 z M5,11 h5 v3 l4,-4 -4,-4 v3 h-5 v2 z"/>
+</svg>
diff --git a/app/assets/images/browse/amenity_parking_entrance_underground.svg b/app/assets/images/browse/amenity_parking_entrance_underground.svg
new file mode 100644
index 00000000000..cf31c7ae3e0
--- /dev/null
+++ b/app/assets/images/browse/amenity_parking_entrance_underground.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="m0,0 v10 h2 v-4 h2.3807 c3.5045,-0.023785 3.5045,-6 0,-6z m2,4 v-2 h2 c1.5622,0 1.5728,2 0,2 z M8.3438,6.9297 l-1.4141,1.4141 3.3633,3.3633 -2.293,2.293 h6 v-6 l-2.293,2.293 -3.3633,-3.3633 z"/>
+</svg>
diff --git a/app/assets/images/browse/amenity_parking_subtle.svg b/app/assets/images/browse/amenity_parking_subtle.svg
new file mode 100644
index 00000000000..212be363cff
--- /dev/null
+++ b/app/assets/images/browse/amenity_parking_subtle.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" viewBox="0 0 7 7" height="7" width="7">
+  <path d="m1,0 v7 h1 v-3 h2.41 a1.7,2 0 0 0 0,-4z m1,1 h2.12 a.9,1 0 0 1 0,2 h-2.12z"/>
+</svg>
diff --git a/app/assets/images/browse/amenity_parking_tickets.svg b/app/assets/images/browse/amenity_parking_tickets.svg
new file mode 100644
index 00000000000..948dd6b2ec1
--- /dev/null
+++ b/app/assets/images/browse/amenity_parking_tickets.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="m0,0 v3 h1 v-2 h12 v2 h1 v-3 z m3,2 v12 h3 v-1 a1,1 0 0 1 2,0 v1 h3 v-12 h-1 v11 h-1 a2,2 0 0 0 -4,0 h-1 v-11 z m2,2 v6 h1 v-2.5 h1.6666 c 1.7777,0 1.7777,-3.5 0,-3.5 z m1,0.875 h1.4453 c0.9364,0 0.9364,1.75 0,1.75 h-1.4453 z"/>
+</svg>
diff --git a/app/assets/images/browse/amenity_pharmacy.svg b/app/assets/images/browse/amenity_pharmacy.svg
new file mode 100644
index 00000000000..7c4b9c3c283
--- /dev/null
+++ b/app/assets/images/browse/amenity_pharmacy.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="m 4,4 -2,2 0,8 10,0 0,-8 -2,-2 z m 2,2 2,0 0,2 2,0 0,2 -2,0 0,2 -2,0 0,-2 -2,0 0,-2 2,0 z M 4,0 4,3 10,3 10,0 z"/>
+</svg>
diff --git a/app/assets/images/browse/amenity_place_of_worship.svg b/app/assets/images/browse/amenity_place_of_worship.svg
new file mode 100644
index 00000000000..0ae69e847c8
--- /dev/null
+++ b/app/assets/images/browse/amenity_place_of_worship.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="m 6.4996451,0 c -0.828427,0 -1.5,0.6715729 -1.5,1.5 0,0.8284271 0.671573,1.5 1.5,1.5 0.828428,0 1.5,-0.6715729 1.5,-1.5 0,-0.8284271 -0.671573,-1.5 -1.5,-1.5 z M 1.1674331,4.573171 2.4996451,7 l 3,-1 1,4 -2,2 c -0.271186,0.305085 -0.466101,0.45872 -0.5,1 0,1 1,1 1,1 l 5.9999999,0 c 0,0 1,0 1,-1 0,-1 -1,-1 -1,-1 l -2.9999999,0 1,-1 c 1,-1 0.928985,-1.472666 0.8125,-2 l -0.8125,-4 c -0.23939,-0.8934168 -0.862211,-1.3296509 -2,-1.15 l -1,0.15 -3,1.5 -1,-1.5 C 1.5584831,3.412383 0.81642814,3.918233 1.1674331,4.573171 z"/>
+</svg>
diff --git a/app/assets/images/browse/amenity_police.svg b/app/assets/images/browse/amenity_police.svg
new file mode 100644
index 00000000000..f30ffd24bce
--- /dev/null
+++ b/app/assets/images/browse/amenity_police.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 5,0 4,1 4,2 10,2 10,1 9,0 z M 4,3 C 3.9667,3.168726 4,3.3395259 4,3.5185186 4,4.9503556 5.61931,6 7,6 8.38069,6 10,4.9503556 10,3.5185186 10,3.3395259 10,3 10,3 z M 4,7 C 2.581094,7 2.01415,8.876578 2,10 L 2,14 3.53125,14 9,7 z M 10.5,7 5.03125,14 12,14 12,10 C 12,8.876474 11.727158,7 10.5,7 z"/>
+</svg>
diff --git a/app/assets/images/browse/amenity_post_box.svg b/app/assets/images/browse/amenity_post_box.svg
new file mode 100644
index 00000000000..3104c0b85d8
--- /dev/null
+++ b/app/assets/images/browse/amenity_post_box.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="12" height="12" viewBox="0 0 12 12">
+  <path d="m1,0 a1,1 0 0 0 -1,1 v1 a1,1 0 0 0 1,1 v-2 h10 v2 a1,1 0 0 0 1,-1 v-1 a1,1 0 0 0 -1,-1 z M 7.5,12 2,12 2,2 7.5,2 4.5,7 Z M 10,12 9,12 6,7 9,2 10,2 Z"/>
+</svg>
diff --git a/app/assets/images/browse/amenity_post_office.svg b/app/assets/images/browse/amenity_post_office.svg
new file mode 100644
index 00000000000..2fe91d8493b
--- /dev/null
+++ b/app/assets/images/browse/amenity_post_office.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="m 0,2 0,1 7,4 7,-4 0,-1 z m 0,3 0,7 14,0 0,-7 -7,4 z"/>
+</svg>
diff --git a/app/assets/images/browse/amenity_prison.svg b/app/assets/images/browse/amenity_prison.svg
new file mode 100644
index 00000000000..8cd63efd74b
--- /dev/null
+++ b/app/assets/images/browse/amenity_prison.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 0,0 0,14 14,14 14,0 0,0 z m 1,1 3,0 0,12 -0.5,0 0,-4.21875 C 3.200928,9.13501 3,9.5625 3,10 L 3,13 1,13 1,1 z m 4,0 4,0 0,12 -0.5,0 0,-5 -3,0 0,5 L 5,13 5,1 z m 5,0 3,0 0,12 -2,0 0,-3 C 11,9.5625 10.799072,9.13501 10.5,8.78125 L 10.5,13 10,13 10,1 z M 7,3 C 6.399152,3 5.866615,3.2680514 5.5,3.6875 l 0,2.625 C 5.866615,6.7319486 6.399152,7 7,7 7.600847,7 8.133385,6.7319486 8.5,6.3125 l 0,-2.625 C 8.133385,3.2680514 7.600847,3 7,3 z"/>
+</svg>
diff --git a/app/assets/images/browse/amenity_pub.svg b/app/assets/images/browse/amenity_pub.svg
new file mode 100644
index 00000000000..4489ff1c0be
--- /dev/null
+++ b/app/assets/images/browse/amenity_pub.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="12" height="12" viewBox="0 0 12 12">
+  <path d="m1,0 2,12 6,0 2,-12 z m 1.25,1 7.5,0 -0.33,2 -6.86,0 z"/>
+</svg>
diff --git a/app/assets/images/browse/amenity_public_bath.svg b/app/assets/images/browse/amenity_public_bath.svg
new file mode 100644
index 00000000000..ac83c83fb61
--- /dev/null
+++ b/app/assets/images/browse/amenity_public_bath.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 1.65421264,11.0000406 C 1.2278399,11.0000406 0.597367898,11.3624969 0.016138571,11.650988 L 0,13.6777956 C 0.60987926,13.3856384 1.26337235,13.0000135 1.65421378,13.0000135 2.32305249,13.0000135 3.59890634,14 4.30708821,14 4.93781155,14 6.28651045,13.0000135 6.95996245,13.0000135 7.62880117,13.0000135 8.97844268,14 9.6128367,14 10.2816765,14 11.6362175,13.0000135 12.2657132,13.0000135 12.6597037,13.0000135 13.3377157,13.3917234 13.9538671,13.6848255 L 14,11.6613061 C 13.4001924,11.3615898 12.7025208,10.9756248 12.2657166,11.0000406 11.6313211,11.0000406 10.3221171,12.000027 9.61284048,12.000027 9.0226892,12.000027 7.62880495,11.0000406 6.95996623,11.0000406 6.29112752,11.0000406 4.898554,12.000027 4.30709161,12.000027 3.67636846,12.000027 2.36239961,11.0000406 1.65421264,11.0000406 Z M 4.75,4.00031835 C 3.94354839,4.0003754 3,5 3,6.5 V 10 H 4.25 V 6 C 4.25,5.39764301 4.48208677,5.3 4.75,5.3 V 10 H 9.25 V 5.3 C 9.52068931,5.3 9.71255839,5.40093421 9.75,6 V 10 H 11 V 6.5 C 11,5 10.0564516,3.99994295 9.25,4 Z M 6.99999967,0.25 C 6.03349795,0.25 5.25,1.03352486 5.25,2.00000005 5.25,2.96647524 6.03349795,3.75 6.99999967,3.75 7.96650205,3.75 8.75,2.96647524 8.75,2.00000005 8.75,1.03352486 7.96650205,0.25 6.99999967,0.25 Z"/>
+</svg>
diff --git a/app/assets/images/browse/amenity_public_bookcase.svg b/app/assets/images/browse/amenity_public_bookcase.svg
new file mode 100644
index 00000000000..9c7c2103e15
--- /dev/null
+++ b/app/assets/images/browse/amenity_public_bookcase.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 7 0 L 0 2 L 0 3 L 7 1 L 14 3 L 14 2 L 7 0 z M 3.5371094 3.5722656 C 3.3811324 3.5784856 3.2261866 3.6093727 3.0722656 3.6679688 L 3.0722656 9.8886719 C 3.0722656 9.8886719 5.5764507 9.7925362 6.2148438 12.222656 L 6.2148438 5.6894531 C 5.7277087 4.6741673 4.6289524 3.5287194 3.5371094 3.5722656 z M 6.2148438 12.222656 C 4.5943077 10.983292 2.2851562 10.667969 2.2851562 10.667969 L 2.2851562 4.7578125 L 1.5 4.4453125 L 1.5 11.445312 L 6.2148438 13 L 7.7851562 13 L 12.5 11.445312 L 12.5 4.4453125 L 11.714844 4.7578125 L 11.714844 10.978516 L 7.7851562 12.222656 C 7.2613473 12.024606 6.6518427 12.059846 6.2148438 12.222656 z M 10.927734 3.6679688 C 9.3621834 3.5851111 7.5560179 4.515858 6.6074219 5.3164062 L 6.6074219 11.898438 C 7.4833139 11.1794 9.0526934 10.234271 10.927734 10.044922 L 10.927734 3.6679688 z"/>
+</svg>
diff --git a/app/assets/images/browse/amenity_public_transport_tickets.svg b/app/assets/images/browse/amenity_public_transport_tickets.svg
new file mode 100644
index 00000000000..4f9d6282290
--- /dev/null
+++ b/app/assets/images/browse/amenity_public_transport_tickets.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="m0,0 v3 h1 v-2 h12 v2 h1 v-3 z m3,2 v12 h3 v-1 a1,1 0 0 1 2,0 v1 h3 v-12 h-1 v6 h-6 v-6 z m1,7 h6 v4 h-1 a2,2 0 0 0 -4,0 h-1 z"/>
+</svg>
diff --git a/app/assets/images/browse/amenity_recycling.svg b/app/assets/images/browse/amenity_recycling.svg
new file mode 100644
index 00000000000..2fbbcb21cde
--- /dev/null
+++ b/app/assets/images/browse/amenity_recycling.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 5.111113,8.690628 3.513352,5.804047 0.3,5.804047 1.60621,6.5880837 0.798678,8.031102 c -0.06887,0.130859 -0.103304,0.267511 -0.103301,0.409961 -3e-6,0.142456 0.03443,0.27911 0.103301,0.40996 l 1.271077,2.298282 c 0.05733,-0.166376 0.11466,-0.309011 0.171995,-0.427902 L 3.82273,7.906591 5.111113,8.690628 z m -2.38799,2.316224 c -0.09194,0.154416 -0.137914,0.320611 -0.13791,0.498585 -4e-6,0.273307 0.09456,0.504931 0.283685,0.694868 0.189119,0.189939 0.415298,0.284906 0.678537,0.284906 l 3.161963,0 0,-2.654413 -3.333432,0 C 3.352886,9.878288 3.266892,10.0327 3.117975,10.294041 l -0.394852,0.712811 z m 4.278351,-6.5745954 3.196047,0 L 11.812587,1.54622 10.506901,2.3302555 9.698844,0.8866933 C 9.549912,0.6137609 9.320934,0.4772893 9.011916,0.4772767 l -2.543205,0 c 0.10312,0.1185426 0.189116,0.2372528 0.257992,0.3561331 L 8.289856,3.6482199 8.032389,3.8086154 7.001474,4.4322566 z M 5.437797,0.6197306 C 5.07108,0.6197421 4.796134,0.7859374 4.61296,1.1183163 L 3.015198,3.9690109 C 3.622066,4.3372941 4.360906,4.7767964 5.231719,5.2875185 5.746994,4.372999 6.302478,3.3752843 6.898173,2.2943703 L 6.262635,1.1183163 C 6.079446,0.7859374 5.804501,0.6197421 5.437797,0.6197306 l 0,0 z m 4.106882,9.1751824 0,-0.320793 0,-1.228795 L 7.946393,11.131363 9.544679,14 l 0,-1.55013 1.597761,0 c 0.309366,0 0.54411,-0.136653 0.704231,-0.409962 l 1.271602,-2.298279 c -0.171656,0.04749 -0.314811,0.07123 -0.42946,0.07123 L 9.544679,9.794909 z m 2.37121,-4.88147 c -0.05735,0.035533 -0.79636,0.4750321 -2.217045,1.3185066 0.710337,1.2708484 1.271764,2.2745434 1.684282,3.0110934 l 1.288383,0 c 0.378233,2e-6 0.658946,-0.166373 0.842142,-0.499132 0.171629,-0.320788 0.165862,-0.647379 -0.01731,-0.979774 l -1.58045,-2.850694 z"/>
+</svg>
diff --git a/app/assets/images/browse/amenity_rental_bicycle.svg b/app/assets/images/browse/amenity_rental_bicycle.svg
new file mode 100644
index 00000000000..29fddbab60f
--- /dev/null
+++ b/app/assets/images/browse/amenity_rental_bicycle.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 3.5,0 C 2.119288,0 1,1.1192881 1,2.5 1,3.8807119 2.119288,5 3.5,5 4.425342,5 5.223985,4.4972377 5.65625,3.75 L 7,3.75 l 1,-1 1,1 1,-1 1,1 0.5,0 L 13,2.5 11.5,1.25 5.65625,1.25 C 5.223985,0.5027623 4.425342,0 3.5,0 z m -1,2 C 2.776142,2 3,2.2238576 3,2.5 3,2.7761424 2.776142,3 2.5,3 2.223858,3 2,2.7761424 2,2.5 2,2.2238576 2.223858,2 2.5,2 z m 5.5,3.4375 0.03125,1 L 9,7 9,8 5.25,8 5,8 5,7 5.5,7 c 1,0 1,-1 0,-1 l -2,0 c -1,0 -1,1 0,1 L 4,7 4,8 3.4375,9.375 c -0.04165,-0.0023 -0.08284,0 -0.125,0 C 2.042004,9.375 1,10.417004 1,11.6875 1,12.957996 2.042004,14 3.3125,14 4.582996,14 5.625,12.957996 5.625,11.6875 5.625,11.447485 5.56957,11.218899 5.5,11 L 6,11 7,11 9.156,9 9.15625,9 9.4375,9.71875 C 8.797861,10.135655 8.375,10.877559 8.375,11.6875 8.375,12.957996 9.417004,14 10.6875,14 c 1.270496,0 2.34375,-1.042004 2.34375,-2.3125 0,-1.270496 -1.073254,-2.3125 -2.34375,-2.3125 -0.04216,0 -0.08335,-0.0023 -0.125,0 L 10,8 10,6.625 z M 4.84375,9 7.956,9 6.65,10.25 l -1.55625,0 C 4.939889,10.062277 4.766292,9.851578 4.5625,9.71875 z M 3.3125,10.5 C 3.975001,10.5 4.5,11.024999 4.5,11.6875 4.5,12.350001 3.975001,12.875 3.3125,12.875 2.649999,12.875 2.125,12.350001 2.125,11.6875 2.125,11.024999 2.649999,10.5 3.3125,10.5 z m 7.375,0 c 0.662501,0 1.1875,0.524999 1.1875,1.1875 0,0.662501 -0.524999,1.1875 -1.1875,1.1875 -0.662501,0 -1.15625,-0.524999 -1.15625,-1.1875 0,-0.662501 0.493749,-1.1875 1.15625,-1.1875 z"/>
+</svg>
diff --git a/app/assets/images/browse/amenity_rental_car.svg b/app/assets/images/browse/amenity_rental_car.svg
new file mode 100644
index 00000000000..5e7cb9c2ad2
--- /dev/null
+++ b/app/assets/images/browse/amenity_rental_car.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 3.5,0 C 2.119288,0 1,1.1192881 1,2.5 1,3.8807119 2.119288,5 3.5,5 4.425342,5 5.223985,4.4972377 5.65625,3.75 L 7,3.75 l 1,-1 1,1 1,-1 1,1 0.5,0 L 13,2.5 11.5,1.25 5.65625,1.25 C 5.223985,0.5027623 4.425342,0 3.5,0 z m -1,2 C 2.776142,2 3,2.2238576 3,2.5 3,2.7761424 2.776142,3 2.5,3 2.223858,3 2,2.7761424 2,2.5 2,2.2238576 2.223858,2 2.5,2 z M 4,6 3,9 C 2.527334,9 2,9.384295 2,10 l 0,3 1,0 c 0,0 0,1 1,1 1,0 1,-1 1,-1 l 4,0 c 0,0 0,1 1,1 1,0 1,-1 1,-1 l 1,0 0,-3 C 12,9.479394 11.544575,9 11,9 L 10,6 z m 1,1 4,0 0.625,2 -5.25,0 z m -1,3.25 c 0.414214,0 0.75,0.335786 0.75,0.75 0,0.414214 -0.335786,0.75 -0.75,0.75 -0.414214,0 -0.75,-0.335786 -0.75,-0.75 0,-0.414214 0.335786,-0.75 0.75,-0.75 z m 6,0 c 0.414214,0 0.75,0.335786 0.75,0.75 0,0.414214 -0.335786,0.75 -0.75,0.75 -0.414214,0 -0.75,-0.335786 -0.75,-0.75 0,-0.414214 0.335786,-0.75 0.75,-0.75 z"/>
+</svg>
diff --git a/app/assets/images/browse/amenity_restaurant.svg b/app/assets/images/browse/amenity_restaurant.svg
new file mode 100644
index 00000000000..ea9a27fd309
--- /dev/null
+++ b/app/assets/images/browse/amenity_restaurant.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 1.5 0 C 1.25 0 1 0.25 1 0.75 L 1 7 C 1 8 2.75 8 2.75 9 L 2.25 14 L 4.75 14 L 4.25 9 C 4.25 8 6 8 6 7 L 6 0.75 C 6 -0.25 5 -0.25 5 0.75 L 5 6 C 5 6.5632885 4 6.5632884 4 6 L 4 0.75 C 4 -0.25 3 -0.25 3 0.75 L 3 6 C 3 6.5273339 2 6.5273339 2 6 L 2 0.75 C 2 0.25 1.75 0 1.5 0 z M 10 0 C 9 0 7 2 7 5 C 7 8 9.25 9 9.25 9 L 8.75 14 L 11.25 14 L 10.75 9 C 10.75 9 13 8 13 5 C 13 2 11 0 10 0 z"/>
+</svg>
diff --git a/app/assets/images/browse/amenity_shelter.svg b/app/assets/images/browse/amenity_shelter.svg
new file mode 100644
index 00000000000..ced80765834
--- /dev/null
+++ b/app/assets/images/browse/amenity_shelter.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 4.0078125 0 L 3.0078125 2 L 3.4765625 2 L 4.5234375 0 L 4.0078125 0 z M 8.0078125 0 L 7.0078125 2 L 7.4765625 2 L 8.5234375 0 L 8.0078125 0 z M 12.007812 0 L 11.007812 2 L 11.476562 2 L 12.523438 0 L 12.007812 0 z M 1 2 L 0 4 L 0.46875 4 L 1.5175781 2 L 1 2 z M 5.0078125 2 L 4.0078125 4 L 4.4765625 4 L 5.5234375 2 L 5.0078125 2 z M 9.0078125 2 L 8.0078125 4 L 8.4765625 4 L 9.5234375 2 L 9.0078125 2 z M 13.007812 2 L 12.007812 4 L 12.476562 4 L 13.523438 2 L 13.007812 2 z M 2.5 4 L 1.5 6 L 1.96875 6 L 3.0175781 4 L 2.5 4 z M 10.482422 4 L 9.4824219 6 L 9.9511719 6 L 11 4 L 10.482422 4 z M 7 5 L 0 9 L 2 9 L 3 8.5996094 L 3 13.482422 L 3 13.5 A 0.5 0.5 0 0 0 3.2402344 13.927734 A 0.5 0.5 0 0 0 3.7441406 13.935547 A 0.5 0.5 0 0 0 4 13.5 L 4 8.1992188 L 7 7 L 10 8.1992188 L 10 13.5 A 0.5 0.5 0 0 0 10.240234 13.927734 A 0.5 0.5 0 0 0 10.744141 13.935547 A 0.5 0.5 0 0 0 11 13.5 L 11 8.5996094 L 12 9 L 14 9 L 7 5 z"/>
+</svg>
diff --git a/app/assets/images/browse/amenity_shower.svg b/app/assets/images/browse/amenity_shower.svg
new file mode 100644
index 00000000000..3349d135199
--- /dev/null
+++ b/app/assets/images/browse/amenity_shower.svg
@@ -0,0 +1,12 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+<path d="M 6.8417969 0 C 6.5080632 0.0089554703 6.214521 0.24656385 6.1503906 0.58789062 L 5.8476562 2.1933594 C 4.6012255 2.2351741 3.5074523 3.1334887 3.2675781 4.4101562 L 8.6171875 5.4160156 C 8.8407092 4.2264228 8.2526189 3.0728712 7.2441406 2.5234375 L 7.4375 1.5 L 14 1.5 L 14 0 L 6.8417969 0 z"/>
+<circle cx="5.3478" cy="7.8193" r=".855"/>
+<circle cx="4.8835" cy="10.4283" r=".855"/>
+<circle cx="4.3322" cy="13.0403" r=".855"/>
+<circle cx="7.9656" cy="7.7734" r=".855"/>
+<circle cx="7.9252" cy="10.4407" r=".855"/>
+<circle cx="7.9875" cy="13.145" r=".855"/>
+<circle cx="2.9883" cy="6.8756" r=".855"/>
+<circle cx="1.9097" cy="9.32" r=".855"/>
+<circle cx="0.855" cy="11.7795" r=".855"/>
+</svg>
diff --git a/app/assets/images/browse/amenity_social_facility.svg b/app/assets/images/browse/amenity_social_facility.svg
new file mode 100644
index 00000000000..ac558114d72
--- /dev/null
+++ b/app/assets/images/browse/amenity_social_facility.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 7.0078125 0.041015625 C 6.1796632 0.041015535 5.5082053 0.6932389 5.5078125 1.4980469 C 5.507095 2.3036176 6.1788781 2.9570315 7.0078125 2.9570312 C 7.8367469 2.9570315 8.50853 2.3036176 8.5078125 1.4980469 C 8.5074197 0.6932389 7.8359618 0.041015535 7.0078125 0.041015625 z M 1.5 1.5 A 0.5 0.5 0 0 0 1 2 L 1 8 C 1 9 0.99942295 9 2.1679688 10 C 2.999423 11 3 11 3 12 L 3 14 L 6 14 L 6 11 C 6 10.210871 5.5867649 10.262622 5 10 C 3.2611238 9 2 8 2 7 L 2 2 A 0.5 0.5 0 0 0 1.5 1.5 z M 12.5 1.5 A 0.5 0.5 0 0 0 12 2 L 12 7 C 12 8.0000002 10.738876 9 9 10 C 8.4132351 10.262622 8 10.210871 8 11 L 8 14 L 11 14 L 11 12 C 11 11 11.000577 11 11.832031 10 C 13.000577 9 13 9 13 8 L 13 2 A 0.5 0.5 0 0 0 12.5 1.5 z M 7 4 C 5 4 5 5 5 6 L 5 9 L 9 9 L 9 6 C 9 5 9 4 7 4 z"/>
+</svg>
diff --git a/app/assets/images/browse/amenity_taxi.svg b/app/assets/images/browse/amenity_taxi.svg
new file mode 100644
index 00000000000..cf999a391a3
--- /dev/null
+++ b/app/assets/images/browse/amenity_taxi.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 5.96875,0 C 5.429431,0 5,0.4876472 5,1 L 4.96875,2 3,2 1.75,6 C 0.989697,6 0,6.4966359 0,8 l 0,4 2,0 0,1 c 0,0 0,1 1,1 1,0 1,-1 1,-1 L 4,12 10,11.96875 10,13 c 0,0 0,1 1,1 1,0 1,-1 1,-1 l 0,-1 2,0 0,-4 C 14,6.4726661 13,6 12,6 L 11,2 9,2 9,1 C 9,0.4337153 8.566285,0 8,0 L 5.96875,0 z M 6,1 8,1 8,2 6,2 6,1 z M 4,3.5 10,3.5 10.59375,6 3.3125,6 4,3.5 z M 3,8 C 3.552285,8 4,8.447715 4,9 4,9.552285 3.552285,10 3,10 2.447715,10 2,9.552285 2,9 2,8.447715 2.447715,8 3,8 z m 8,0 c 0.552285,0 1,0.447715 1,1 0,0.552285 -0.447715,1 -1,1 -0.552285,0 -1,-0.447715 -1,-1 0,-0.552285 0.447715,-1 1,-1 z"/>
+</svg>
diff --git a/app/assets/images/browse/amenity_telephone.svg b/app/assets/images/browse/amenity_telephone.svg
new file mode 100644
index 00000000000..8097d4fe9a9
--- /dev/null
+++ b/app/assets/images/browse/amenity_telephone.svg
@@ -0,0 +1,3 @@
+<svg width="12" height="12" version="1.1" viewBox="0 0 12 12" xmlns="http://www.w3.org/2000/svg">
+ <path d="m1,7 c-0.98818,0.98818 -1.44,2.5736 -0.45127,3.553 l0.45127,0.44703 3,-3 v-1.5 l2.5,-2.5 h1.5 l3,-3 -0.51059,-0.48729 c-0.97553,-0.93101 -2.5086,-0.49348 -3.4894,0.48729 z m0.54515,4.5376 0.33879,0.35289 s0.85017,0.07591 1.2889,-0.35617 l1.3937,-1.3725 c0.38187,-0.40198 0.30732,-1.3046 0.30732,-1.3046 l-0.33879,-0.35289 z m7.0079,-7.0172 0.33879,0.35289 s0.85017,0.07591 1.2889,-0.35617 l1.3937,-1.3725 c0.38187,-0.40198 0.30732,-1.3046 0.30732,-1.3046 l-0.33879,-0.35289 z"/>
+</svg>
diff --git a/app/assets/images/browse/amenity_theatre.svg b/app/assets/images/browse/amenity_theatre.svg
new file mode 100644
index 00000000000..a619b0ca870
--- /dev/null
+++ b/app/assets/images/browse/amenity_theatre.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="m 0,0 0,7 c 0,0 0,4 4,4 0.487694,0 0.905229,-0.08308 1.28125,-0.1875 C 5.222862,10.329209 5.25,10 5.25,10 l 0,-0.21875 C 4.906989,9.915179 4.490013,10 4,10 1,10 1,7 1,7 L 1,1.5 c 2,0.9520605 4,0.9520605 6,0 L 7,2.65625 C 7.334486,2.7893793 7.676632,2.9137483 8,3 L 8,0 C 5,1.3728814 3,1.3050847 0,0 z m 2.5,3 c -0.552285,0 -1,0.4477153 -1,1 0,0.5522847 0.447715,1 1,1 0.552285,0 1,-0.4477153 1,-1 0,-0.5522847 -0.447715,-1 -1,-1 z M 6,3 6,10 c 0,0 0,4 4,4 4,0 4,-4 4,-4 L 14,3 C 11,4.3728814 9,4.3050847 6,3 z m 2.5,3 c 0.552285,0 1,0.4477153 1,1 0,0.552285 -0.447715,1 -1,1 -0.552285,0 -1,-0.447715 -1,-1 0,-0.5522847 0.447715,-1 1,-1 z m 3,0 c 0.552285,0 1,0.4477153 1,1 0,0.552285 -0.447715,1 -1,1 -0.552285,0 -1,-0.447715 -1,-1 0,-0.5522847 0.447715,-1 1,-1 z M 4,6.5 c -1.46224,0 -2,1.016949 -2,2 l 3.25,0 0,-1.65625 C 4.945701,6.6221969 4.545878,6.5 4,6.5 z m 4,3.5 4,0 c 0,1 -1,2 -2,2 -1,0 -2,-1 -2,-2 z"/>
+</svg>
diff --git a/app/assets/images/browse/amenity_toilets.svg b/app/assets/images/browse/amenity_toilets.svg
new file mode 100644
index 00000000000..761855a4159
--- /dev/null
+++ b/app/assets/images/browse/amenity_toilets.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="m 6.25,0 0,14 1.5,0 0,-14 -1.5,0 z M 2.5,1 C 1.671573,1 1,1.6715729 1,2.5 1,3.3284271 1.671573,4 2.5,4 3.328427,4 4,3.3284271 4,2.5 4,1.6715729 3.328427,1 2.5,1 z m 9,0 C 10.671573,1 10,1.6715729 10,2.5 10,3.3284271 10.671573,4 11.5,4 12.328427,4 13,3.3284271 13,2.5 13,1.6715729 12.328427,1 11.5,1 z m -10,4 c -0.599722,0 -1,0.568545 -1,1 0,0.5273339 1.25,1.496636 1.25,2 C 1.75,8.555974 0,9 0,11 l 1.75,0 0,3 1.5,0 0,-3 L 5,11 C 5,9 3.25,8.529509 3.25,8 3.25,7.470492 4.5,6.5513036 4.5,6 4.5,5.5925147 4.075273,5 3.5,5 l -2,0 z M 10,5 C 9.472666,5 9,5.4804699 9,6 c 0,1 1.75,4.016073 1.75,5 l 0,3 1.5,0 0,-3 C 12.25,10.035543 14,7 14,6 14,5.446616 13.551304,5 13,5 l -3,0 z"/>
+</svg>
diff --git a/app/assets/images/browse/amenity_town_hall.svg b/app/assets/images/browse/amenity_town_hall.svg
new file mode 100644
index 00000000000..18477bfa711
--- /dev/null
+++ b/app/assets/images/browse/amenity_town_hall.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 7,0 C 6.75,0.0032 6.5,0.1644239 6.5,0.5 L 6.5,4.375 1,7 13,7 7.5,4.375 7.5,0.5 C 7.5,0.1516409 7.25,-0.0031957 7,0 z M 8,0 8,3 12,3 10,1.5 12,0 z m -7,8 0,1 1,0 0,4 -1,0 0,1 12,0 0,-1 -1,0 0,-4 1,0 0,-1 z m 6,1.5 c 1,0 2,0.5 2,1.5 l 0,2 -4,0 0,-2 C 5,10 6,9.5 7,9.5 z"/>
+</svg>
diff --git a/app/assets/images/browse/amenity_vehicle_inspection.svg b/app/assets/images/browse/amenity_vehicle_inspection.svg
new file mode 100644
index 00000000000..d58d81f9d1f
--- /dev/null
+++ b/app/assets/images/browse/amenity_vehicle_inspection.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 2.5 0 C 2.223 0 2 0.223 2 0.5 C 2 0.777 2.223 1 2.5 1 L 6.5 1 C 6.777 1 7 0.777 7 0.5 C 7 0.223 6.777 0 6.5 0 L 2.5 0 z M 11 0 L 9.5449219 3.6367188 L 9 2 L 8 2 L 9 5 L 10 5 L 12 0 L 11 0 z M 2.5 2 C 2.223 2 2 2.223 2 2.5 C 2 2.777 2.223 3 2.5 3 L 6.5 3 C 6.777 3 7 2.777 7 2.5 C 7 2.223 6.777 2 6.5 2 L 2.5 2 z M 2.5 4 C 2.223 4 2 4.223 2 4.5 C 2 4.777 2.223 5 2.5 5 L 6.5 5 C 6.777 5 7 4.777 7 4.5 C 7 4.223 6.777 4 6.5 4 L 2.5 4 z M 4 6 L 3 9 C 2.527334 9 2 9.384295 2 10 L 2 13 L 3 13 C 3 13 3 14 4 14 C 5 14 5 13 5 13 L 9 13 C 9 13 9 14 10 14 C 11 14 11 13 11 13 L 12 13 L 12 10 C 12 9.479394 11.544575 9 11 9 L 10 6 L 4 6 z M 5 7 L 9 7 L 9.625 9 L 4.375 9 L 5 7 z M 4 10.25 C 4.414214 10.25 4.75 10.585786 4.75 11 C 4.75 11.414214 4.414214 11.75 4 11.75 C 3.585786 11.75 3.25 11.414214 3.25 11 C 3.25 10.585786 3.585786 10.25 4 10.25 z M 10 10.25 C 10.414214 10.25 10.75 10.585786 10.75 11 C 10.75 11.414214 10.414214 11.75 10 11.75 C 9.585786 11.75 9.25 11.414214 9.25 11 C 9.25 10.585786 9.585786 10.25 10 10.25 z"/>
+</svg>
diff --git a/app/assets/images/browse/amenity_veterinary.svg b/app/assets/images/browse/amenity_veterinary.svg
new file mode 100644
index 00000000000..39edf8b0dad
--- /dev/null
+++ b/app/assets/images/browse/amenity_veterinary.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="m 4.939089,0.12499997 c -1.4191217,0 -1.6451859,1.93046953 -1.28125,2.90625003 C 3.8887816,3.6542301 4.5922019,4.2560356 5.314089,4 6.2476315,3.5384628 6.5113975,2.3550377 6.251589,1.4375 6.1256004,0.82627427 5.6379877,0.12499997 4.939089,0.12499997 z m 3.96875,0 c -0.698899,0 -1.186511,0.7012743 -1.3125,1.31250003 C 7.335531,2.3550377 7.599299,3.5384628 8.532839,4 9.254726,4.2560356 9.9581461,3.6542301 10.189089,3.03125 10.553025,2.0554695 10.326961,0.12499997 8.907839,0.12499997 z M 0.87500002,3.21875 C 0.31441965,3.7793304 0.38782815,5.3925169 1.40625,6.0625 2.0663312,6.4008798 2.7362694,5.963358 2.96875,5.4375 3.3613536,4.6906363 3.2534654,3.6290239 2.5625,3.09375 1.9011225,2.6523191 1.3930884,2.7006617 0.87500002,3.21875 z M 11.4375,3.09375 c -0.482178,0.2783854 -0.798854,1.5968863 -0.40625,2.34375 0.232481,0.5258585 0.933669,0.9633798 1.59375,0.625 1.018422,-0.6699831 1.071545,-2.272205 0.5,-2.84375 -0.531945,-0.4452677 -1.16164,-0.4286055 -1.6875,-0.125 z M 7,4.5 C 4.5147186,4.5 2.5,6.5147186 2.5,9 c 0,2.485281 2.0147186,4.5 4.5,4.5 2.485281,0 4.5,-2.014719 4.5,-4.5 C 11.5,6.5147186 9.485281,4.5 7,4.5 z M 6,6 8,6 8,8 10,8 10,9.9999998 8,10.03125 8,12 6,12 6,9.9999998 l -2,0 L 4,8 6,8 z"/>
+</svg>
diff --git a/app/assets/images/browse/amenity_waste_basket.svg b/app/assets/images/browse/amenity_waste_basket.svg
new file mode 100644
index 00000000000..df6bd403cb2
--- /dev/null
+++ b/app/assets/images/browse/amenity_waste_basket.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="8" height="8" viewBox="0 0 8 8">
+  <path d="m4,0 l1,1 h1 l1,1 h-6 l1,-1 h1 z m-3,3 l1,5 h4 l1,-5 z"/>
+</svg>
diff --git a/app/assets/images/browse/amenity_waste_disposal.svg b/app/assets/images/browse/amenity_waste_disposal.svg
new file mode 100644
index 00000000000..a4b06ba5f23
--- /dev/null
+++ b/app/assets/images/browse/amenity_waste_disposal.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 6 1 L 6 2 L 3 2 L 3 3 L 11 3 L 11 2 L 8 2 L 8 1 L 6 1 z M 3 5 L 4 14 L 10 14 L 11 5 L 3 5 z M 5 6 L 6 6 L 6 13 L 5 13 L 5 6 z M 8 6 L 9 6 L 9 13 L 8 13 L 8 6 z"/>
+</svg>
diff --git a/app/assets/images/browse/barrier_cattle_grid.svg b/app/assets/images/browse/barrier_cattle_grid.svg
new file mode 100644
index 00000000000..1cb7dc438fe
--- /dev/null
+++ b/app/assets/images/browse/barrier_cattle_grid.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="10" height="10" viewBox="0 0 10 10">
+  <rect y="2" width="10" height="1"/>
+  <rect y="4" width="10" height="1"/>
+  <rect y="6" width="10" height="1"/>
+  <rect y="8" width="10" height="1"/>
+</svg>
diff --git a/app/assets/images/browse/barrier_cycle_barrier.svg b/app/assets/images/browse/barrier_cycle_barrier.svg
new file mode 100644
index 00000000000..803211c98ca
--- /dev/null
+++ b/app/assets/images/browse/barrier_cycle_barrier.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="10" height="10" viewBox="0 0 10 10">
+  <rect x="3" y="3" width="7" height="1"/>
+  <rect x="0" y="6" width="7" height="1"/>
+</svg>
diff --git a/app/assets/images/browse/barrier_full-height_turnstile.svg b/app/assets/images/browse/barrier_full-height_turnstile.svg
new file mode 100644
index 00000000000..d30d16c65b7
--- /dev/null
+++ b/app/assets/images/browse/barrier_full-height_turnstile.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="12" height="12" viewBox="0 0 12 12">
+  <path d="m5,0 v1 h-3 v1 h3 v2 h-3 v1 h3 v2 h-3 v1 h3 v2 h-3 v1 h3 v1 h2 v-1 h3 v-1 h-3 v-2 h3 v-1 h-3 v-2 h3 v-1 h-3 v-2 h3 v-1 h-3 v-1 h-2 z"/>
+</svg>
diff --git a/app/assets/images/browse/barrier_gate.svg b/app/assets/images/browse/barrier_gate.svg
new file mode 100644
index 00000000000..ff6818bb39d
--- /dev/null
+++ b/app/assets/images/browse/barrier_gate.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+
+<svg xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="6"
+   height="5">
+	<path d="M 0,0 6,0 6,5 0,5 z" fill="#ffffff" />
+	<path d="M 0,1 6,1 6,2 0,2 z" fill="#3f3f3f" />
+	<path d="M 0,3 6,3 6,4 0,4 z" fill="#3f3f3f" />
+	<path d="M 4,0 1,5 2,5 5,0 z" fill="#3f3f3f" />
+</svg>
diff --git a/app/assets/images/browse/barrier_kissing_gate.svg b/app/assets/images/browse/barrier_kissing_gate.svg
new file mode 100644
index 00000000000..c63a289c49e
--- /dev/null
+++ b/app/assets/images/browse/barrier_kissing_gate.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="12" height="12" viewBox="0 0 12 12">
+  <path d="M 4,0 3.4003906,1 H 0 V 2 H 2.7988281 L 2.1992188,3 H 0 V 4 H 1.5996094 L 1,5 H 2 L 2.5996094,4 H 6 V 3 H 3.1992188 L 3.7988281,2 H 6 V 1 H 4.4003906 L 5,0 Z M 6,2 V 3 H 7 A 4,4 0 0 1 11,7 4,4 0 0 1 7,11 4,4 0 0 1 3.5410156,9 H 2.4199219 A 5,5 0 0 0 7,12 5,5 0 0 0 12,7 5,5 0 0 0 7,2 Z"/>
+</svg>
diff --git a/app/assets/images/browse/barrier_level_crossing.svg b/app/assets/images/browse/barrier_level_crossing.svg
new file mode 100644
index 00000000000..38eb2fac936
--- /dev/null
+++ b/app/assets/images/browse/barrier_level_crossing.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="7" height="7" viewBox="0 0 7 7">
+  <rect id="mapnik_workaround" width="7" height="7" fill="none"/>
+  <path d="m.25,.25 h.8536 l2.3964,2.3964 2.3964,-2.3964 h.8536 v.8536 l-2.3964,2.3964 2.3964,2.3964 v.8536 h-.8536 l-2.3964,-2.3964 -2.3964,2.3964 h-.8536 v-.8536 l2.3964,-2.3964 -2.3964,-2.3964 z" stroke="#ffffff" stroke-width=".5"/>
+</svg>
diff --git a/app/assets/images/browse/barrier_level_crossing2.svg b/app/assets/images/browse/barrier_level_crossing2.svg
new file mode 100644
index 00000000000..19b94ed73d2
--- /dev/null
+++ b/app/assets/images/browse/barrier_level_crossing2.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="11" height="11" viewBox="0 0 11 11">
+  <rect id="mapnik_workaround" width="11" height="11" fill="none"/>
+  <path d="m.65,.65 h1.495 l3.355,3.355 3.355,-3.355 h1.495 v1.495 l-3.355,3.355 3.355,3.355 v1.495 h-1.495 l-3.355,-3.355 -3.355,3.355 h-1.495 v-1.495 l3.355,-3.355 -3.355,-3.355 z" stroke="#ffffff" stroke-width=".7"/>
+</svg>
diff --git a/app/assets/images/browse/barrier_lift_gate.svg b/app/assets/images/browse/barrier_lift_gate.svg
new file mode 100644
index 00000000000..8b55ef1be26
--- /dev/null
+++ b/app/assets/images/browse/barrier_lift_gate.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="6" height="5" viewBox="0 0 6 5">
+  <path d="m0,0 v5 h2 v-3 h4 v-1 h-4 v-1 z" />
+</svg>
diff --git a/app/assets/images/browse/barrier_motorcycle_barrier.svg b/app/assets/images/browse/barrier_motorcycle_barrier.svg
new file mode 100644
index 00000000000..3b060e489b6
--- /dev/null
+++ b/app/assets/images/browse/barrier_motorcycle_barrier.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 5 0 L 5 4 L 3 10 L 3 14 L 4 14 L 4 10 L 6 4 L 6 0 L 5 0 z M 8 0 L 8 4 L 10 10 L 10 14 L 11 14 L 11 10 L 9 4 L 9 0 L 8 0 z"/>
+</svg>
diff --git a/app/assets/images/browse/barrier_stile.svg b/app/assets/images/browse/barrier_stile.svg
new file mode 100644
index 00000000000..4e0e5e89fbf
--- /dev/null
+++ b/app/assets/images/browse/barrier_stile.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="10" height="10" viewBox="0 0 10 10">
+  <path d="m2,.5 a.5,.5 0 0 1 1,0 v3.5 h4 v-3.5 a.5,.5 0 0 1 1,0 v9.5 h-1 v-1 h-4 v1 h-1 z m1,4.5 v1 h4 v-1 z m0,2 v1 h4 v-1 z"/>
+</svg>
diff --git a/app/assets/images/browse/barrier_toll_booth.svg b/app/assets/images/browse/barrier_toll_booth.svg
new file mode 100644
index 00000000000..2919f531b98
--- /dev/null
+++ b/app/assets/images/browse/barrier_toll_booth.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <rect id="mapnik_workaround" width="14" height="14" fill="none"/>
+  <path d="m7.168,2.5 -7.168,1.45 v8 h6 v-2.5 a1,1 0 0 0 1,-0.93945 l6.7266,-3.3633 -0.44531,-0.89453 -6.7246,3.3633 a1,1 0 0 0,-0.55273 -0.16602 v-2.7305 l1.6035,-1.3906 z m-6.168,2.5 h4 v3 h-4z"/>
+</svg>
diff --git a/app/assets/images/browse/highway_bus_stop.svg b/app/assets/images/browse/highway_bus_stop.svg
new file mode 100644
index 00000000000..0b299e12f3a
--- /dev/null
+++ b/app/assets/images/browse/highway_bus_stop.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="10" height="10" viewBox="0 0 10 10">
+  <path d="M 2,0 1,1 v 8 h 0.65625 c 0,0 0.1011489,1 0.81275,1 C 3.1581295,10 3.25,9 3.25,9 h 3.5 c 0,0 0.1143421,1 0.781,1 0.8164686,0 0.81275,-1 0.81275,-1 H 9 V 1 L 8,0 Z M 3,1 H 7 V 2 H 3 Z M 2,3 H 8 V 6 H 2 Z M 2,7 H 3 V 8 H 2 Z M 7,7 H 8 V 8 H 7 Z"/>
+</svg>
diff --git a/app/assets/images/browse/highway_elevator.svg b/app/assets/images/browse/highway_elevator.svg
new file mode 100644
index 00000000000..f377c3b51d9
--- /dev/null
+++ b/app/assets/images/browse/highway_elevator.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="12" height="12" viewBox="0 0 12 12">
+  <path d="m 8,0 0,1 2,0 0,10 -1.7440812,0 -0.027057,1 L 12,12 12,0 Z M 3,7 6,12 9,7 7,7 7,5 9,5 6,0 3,5 5,5 5,7 Z M 3.5817362,12 3.6223224,11 2,11 2,1 4,1 4,0 0,0 0,12 Z"/>
+</svg>
diff --git a/app/assets/images/browse/highway_ford.svg b/app/assets/images/browse/highway_ford.svg
new file mode 100644
index 00000000000..403e91fb913
--- /dev/null
+++ b/app/assets/images/browse/highway_ford.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+ <path d="m5 1-4 3.5 4 3.5v-2h4v2l4-3.5-4-3.5v2h-4z"/>
+ <path d="m0 9c0.7479 0 2.134 2 2.8002 2 0.62422 0 2.0943-2 2.8002-2s2.1772 2 2.8002 2c0.74906 0 2.1293-2 2.7991-2 0.7479-0.029 2.2192 2 2.8002 2v3c-0.70472 0-2.1352-2-2.8002-2-0.66389 0-2.0943 2-2.7991 2-0.66972 0-2.0943-2-2.8002-2-0.71056 0-2.134 2-2.8002 2-0.74673 0-2.0932-2-2.8002-2z"/>
+</svg>
diff --git a/app/assets/images/browse/highway_traffic_light.svg b/app/assets/images/browse/highway_traffic_light.svg
new file mode 100644
index 00000000000..d88cf83a511
--- /dev/null
+++ b/app/assets/images/browse/highway_traffic_light.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="5" height="13" viewBox="0 0 5 13">
+  <path d="m0,2.5 a2.5,2.5 0 0 1 5,0 v8 a2.5,2.5 0 0 1 -5,0z m2.5,-1.5 a1.5,1.5 0 0 0 0,3 a1.5,1.5 0 0 0 0,-3z m0,4 a1.5,1.5 0 0 0 0,3 a1.5,1.5 0 0 0 0,-3z m0,4 a1.5,1.5 0 0 0 0,3 a1.5,1.5 0 0 0 0,-3z"/>
+</svg>
diff --git a/app/assets/images/browse/historic_archaeological_site.svg b/app/assets/images/browse/historic_archaeological_site.svg
new file mode 100644
index 00000000000..78b49a9436f
--- /dev/null
+++ b/app/assets/images/browse/historic_archaeological_site.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 3,0 3,1 4,1 C 4.5988688,1 4.8411383,2.0430706 4.9375,2.90625 3.9652283,2.1499026 3.0249855,1.8795933 2.21875,2.03125 1.1884439,2.2250555 0.5,3.1743045 0.5,4.25 c 0,0.8419164 0.31211643,1.5788561 0.84375,2.34375 0.464621,0.6684787 1.1198438,1.4400576 1.9375,2.375 C 3.6476993,10.327756 4.3223039,11.572304 5,12.25 L 5,13 4,13.5 4,14 10,14 10,13.5 9,13 9,12.25 c 0.6776961,-0.677696 1.352301,-1.922244 1.71875,-3.28125 0.817656,-0.9349424 1.472879,-1.7065213 1.9375,-2.375 C 13.187884,5.8288561 13.5,5.0919164 13.5,4.25 13.5,3.1743045 12.811556,2.2250555 11.78125,2.03125 10.975015,1.8795933 10.034772,2.1499026 9.0625,2.90625 9.1588617,2.0430706 9.4011312,1 10,1 L 11,1 11,0 3,0 z M 2.375,3.03125 c 0.5098367,-0.095903 1.3604039,0.1012462 2.34375,1 C 3.603741,4.1696287 3,5.1495633 3,7 3,7.0311958 2.9995172,7.0624382 3,7.09375 2.6594765,6.6981019 2.3761871,6.3476871 2.15625,6.03125 1.6878836,5.3573824 1.5,4.8627724 1.5,4.25 1.5,3.5496757 1.8109254,3.1373551 2.375,3.03125 z m 8.75,0 c 0.188111,-0.027114 0.358981,-0.026526 0.5,0 C 12.189075,3.1373551 12.5,3.5496757 12.5,4.25 12.5,4.8627724 12.312116,5.3573824 11.84375,6.03125 11.623813,6.3476871 11.340524,6.6981019 11,7.09375 11.000483,7.0624382 11,7.0311958 11,7 11,5.1495633 10.396259,4.1696287 9.28125,4.03125 c 0.7113567,-0.6501623 1.351767,-0.9290858 1.84375,-1 z"/>
+</svg>
diff --git a/app/assets/images/browse/historic_bust.svg b/app/assets/images/browse/historic_bust.svg
new file mode 100644
index 00000000000..8eab884813d
--- /dev/null
+++ b/app/assets/images/browse/historic_bust.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M7,0 A2,2 0 0 0 7,4 A2,2 0 0 0 7,0 z M6.9570312,4.6816406 C5.2902834,4.6850809 3.6375829,5.2168626 2,6.2675781 C3.353007,7.1708985 4.4623594,8.2534157 4.4355469,9.7753906 L9.5410156,9.7753906 C9.4718986,8.2352704 10.815039,7.1150008 12,6.2675781 C10.304574,5.2031015 8.6237792,4.6782004 6.9570312,4.6816406 z M5,11 v1 h4 v-1 z M3,13 v1 h8 v-1 z"/>
+</svg>
diff --git a/app/assets/images/browse/historic_castle.svg b/app/assets/images/browse/historic_castle.svg
new file mode 100644
index 00000000000..773832cfa01
--- /dev/null
+++ b/app/assets/images/browse/historic_castle.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 1 1 L 0 2.5 L 0 3 L 5 3 L 5 2.5 L 4 1 L 1 1 z M 10 1 L 9 2.5 L 9 3 L 14 3 L 14 2.5 L 13 1 L 10 1 z M 0 4 L 0 13 L 5 13 C 5 12 5 10 7 10 C 9 10 9 12 9 13 L 14 13 L 14 4 L 9 4 L 9 6 L 7 6 L 5 6 L 5 4 L 0 4 z M 2 6 L 3 6 L 3 7 L 2.5 8 L 2 7 L 2 6 z M 11 6 L 12 6 L 12 7 L 11.5 8 L 11 7 L 11 6 z"/>
+</svg>
diff --git a/app/assets/images/browse/historic_city_gate.svg b/app/assets/images/browse/historic_city_gate.svg
new file mode 100644
index 00000000000..85fa38433f0
--- /dev/null
+++ b/app/assets/images/browse/historic_city_gate.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 0,1 0,4 14,4 14,1 12,1 12,3 10,3 10,1 8,1 8,3 6,3 6,1 4,1 4,3 2,3 2,1 0,1 z m 0,4 0,8 2.5,0 C 2.5,10 3.487647,6.5 7,6.5 10.404489,6.473034 11.5,10 11.5,13 L 14,13 14,5 0,5 z M 7,8 C 5,8 4,10 4,13 l 6,0 C 10,10 9,8 7,8 z"/>
+</svg>
diff --git a/app/assets/images/browse/historic_fort.svg b/app/assets/images/browse/historic_fort.svg
new file mode 100644
index 00000000000..ee066fa23ee
--- /dev/null
+++ b/app/assets/images/browse/historic_fort.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 1 1 L 1 3 L 6 3 L 6 1 L 5 1 L 5 2 L 4 2 L 4 1 L 3 1 L 3 2 L 2 2 L 2 1 L 1 1 z M 8 1 L 8 3 L 13 3 L 13 1 L 12 1 L 12 2 L 11 2 L 11 1 L 10 1 L 10 2 L 9 2 L 9 1 L 8 1 z M 1 4 L 1 10 L 13 10 L 13 4 L 8 4 L 8 6 L 6 6 L 6 4 L 1 4 z M 3 6 L 4 6 L 4 7 L 3.5 8 L 3 7 L 3 6 z M 10 6 L 11 6 L 11 7 L 10.5 8 L 10 7 L 10 6 z M 1 11 L 0 14 L 14 14 L 13 11 L 1 11 z"/>
+</svg>
diff --git a/app/assets/images/browse/historic_fortress.svg b/app/assets/images/browse/historic_fortress.svg
new file mode 100644
index 00000000000..04a7fcdf453
--- /dev/null
+++ b/app/assets/images/browse/historic_fortress.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 6,13 H 8 C 8,12 8,10 7,10 6,10 6,12 6,13 Z M 0,1 V 3 H 5 V 1 H 4 V 2 H 3 V 1 H 2 V 2 H 1 V 1 Z m 9,0 v 2 h 5 V 1 H 13 V 2 H 12 V 1 H 11 V 2 H 10 V 1 Z M 0,4 v 9 h 5 c 0,-1 0,-4 2,-4 2,0 2,3 2,4 h 5 V 4 H 9 V 6 H 7 5 V 4 Z M 2,6 H 3 V 7 L 2.5,8 2,7 Z m 9,0 h 1 V 7 L 11.5,8 11,7 Z"/>
+</svg>
diff --git a/app/assets/images/browse/historic_manor.svg b/app/assets/images/browse/historic_manor.svg
new file mode 100644
index 00000000000..be9bf2b4253
--- /dev/null
+++ b/app/assets/images/browse/historic_manor.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="m 9,7 h 1 V 8 H 9 Z M 4,7 H 5 V 8 H 4 Z M 7,6.9277978 6,7.9241877 V 13 H 8 V 8 Z M 9,8 v 5 h 5 V 8 Z m 2,1 h 2 v 2 H 11 Z M 0,8 v 5 H 5 V 8 Z m 1,1 h 2 v 2 H 1 Z M 7,1 1,4 0,7 H 5 L 7,5 9,7 h 5 L 13,4 Z"/>
+</svg>
diff --git a/app/assets/images/browse/historic_memorial.svg b/app/assets/images/browse/historic_memorial.svg
new file mode 100644
index 00000000000..6137c41e6e4
--- /dev/null
+++ b/app/assets/images/browse/historic_memorial.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 6,2 C 5,2 4,3 4,4 l 0,8 8,0 0,-8 C 12,3 11,2 10,2 z M 7,4 9,4 9,5 7,5 z m -2,2 6,0 0,1 -6,0 z m 1,2 4,0 0,1 -4,0 z m -3,5 -1,1 0,1 12,0 0,-1 -1,-1 z"/>
+</svg>
diff --git a/app/assets/images/browse/historic_monument.svg b/app/assets/images/browse/historic_monument.svg
new file mode 100644
index 00000000000..6f4344a8a06
--- /dev/null
+++ b/app/assets/images/browse/historic_monument.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 7,0 C 7,0 5,1.4966359 5,2 l 0,8 4,0 0,-8 C 9,1.5206056 7,0 7,0 z M 4,11 c -1,0 -1,1 -1,2 l -1,0 -1,1 12,0 -1,-1 -1,0 c 0,-1 0,-2 -1,-2 z"/>
+</svg>
diff --git a/app/assets/images/browse/historic_obelisk.svg b/app/assets/images/browse/historic_obelisk.svg
new file mode 100644
index 00000000000..68cfedf10b2
--- /dev/null
+++ b/app/assets/images/browse/historic_obelisk.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M7,0 L5.7988281,2 L5.546875,12 L8.453125,12 L8.2011719,2 L7,0 z M3,13 v1 h8 v-1 z"/>
+</svg>
diff --git a/app/assets/images/browse/historic_palace.svg b/app/assets/images/browse/historic_palace.svg
new file mode 100644
index 00000000000..99a9b650e72
--- /dev/null
+++ b/app/assets/images/browse/historic_palace.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 12,2 11,3.5 V 4 h 3 V 3.5 L 13,2 Z M 1,2 0,3.5 V 4 H 3 V 3.5 L 2,2 Z m 3,2 h 6 V 3 L 7,0 4,3 Z M 0,5 v 8 h 5 c 0,-1 0,-3 2,-3 2,0 2,2 2,3 h 5 V 5 H 11.018051 L 11,6 H 10 L 10.03249,5 H 4.0433213 L 4,6 H 3 V 5 Z m 3,3 c 1,0 1,1 1,2 H 2 C 2,9 2,8 3,8 Z m 8,0 c 1,0 1,0.7301391 1,2 l -2,0.02539 C 9.9645368,8.7473493 10,8 11,8 Z" />
+</svg>
diff --git a/app/assets/images/browse/historic_plaque.svg b/app/assets/images/browse/historic_plaque.svg
new file mode 100644
index 00000000000..7b9f3604e0f
--- /dev/null
+++ b/app/assets/images/browse/historic_plaque.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="12" height="12" viewBox="0 0 12 12">
+  <path d="m1.5,1 a1.5,1.5 0 0 0 -1.5,1.5 v7 a1.5,1.5 0 0 0 1.5,1.5 h9 a1.5,1.5 0 0 0 1.5,-1.5 v-7 a1.5,1.5 0 0 0 -1.5,-1.5 z m0,1 a.5,.5 0 0 1 0,1 a.5,.5 0 0 1 0,-1 z m0,7 a.5,.5 0 0 1 0,1 a.5,.5 0 0 1 0,-1 z m9,0 a.5,.5 0 0 1 0,1 a.5,.5 0 0 1 0,-1 z m0,-7 a.5,.5 0 0 1 0,1 a.5,.5 0 0 1 0,-1 z m-6.5,1 h1 v1 h-1 z m2,0 h2 v1 h-2 z m-4,2 h8 v1 h-8 z m2,2 h4 v1 h-4 z"/>
+</svg>
diff --git a/app/assets/images/browse/historic_shrine.svg b/app/assets/images/browse/historic_shrine.svg
new file mode 100644
index 00000000000..aac414d1a2d
--- /dev/null
+++ b/app/assets/images/browse/historic_shrine.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 7 0 L 5 3 L 5 12 L 9 12 L 9 3 L 7 0 z M 7 3.9980469 A 1 1 0 0 1 8 4.9980469 A 1 1 0 0 0 8 5 L 8 8 L 6 8 L 6 5 A 1 1 0 0 0 6 4.9980469 A 1 1 0 0 1 7 3.9980469 z M 4 13 L 4 14 L 10 14 L 10 13 L 4 13 z"/>
+</svg>
diff --git a/app/assets/images/browse/historic_statue.svg b/app/assets/images/browse/historic_statue.svg
new file mode 100644
index 00000000000..abd7f857249
--- /dev/null
+++ b/app/assets/images/browse/historic_statue.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 7 0 C 6.4264737 0 5.9609375 0.46553614 5.9609375 1.0390625 C 5.9609375 1.612589 6.4264736 2.0761719 7 2.0761719 C 7.5735264 2.0761719 8.0390625 1.612589 8.0390625 1.0390625 C 8.0390625 0.46553614 7.5735265 0 7 0 z M 5.9609375 2.7695312 C 5.5958601 2.7695312 5.2695312 3.1012631 5.2695312 3.4609375 C 5.2695312 4.1532453 6.4804687 6.2426478 6.4804688 6.9238281 L 6.4804688 9 L 7.5195312 9 L 7.5195312 6.9238281 C 7.5195312 6.2561271 8.7304688 4.1532453 8.7304688 3.4609375 C 8.7304688 3.0778259 8.4207347 2.7695312 8.0390625 2.7695312 L 5.9609375 2.7695312 z M 4 10 L 4 11 L 10 11 L 10 10 L 4 10 z M 5 12 L 5 14 L 9 14 L 9 12 L 5 12 z"/>
+</svg>
diff --git a/app/assets/images/browse/historic_stone.svg b/app/assets/images/browse/historic_stone.svg
new file mode 100644
index 00000000000..882a60df6df
--- /dev/null
+++ b/app/assets/images/browse/historic_stone.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 6,2 C 1.5761781,1.9981574 0,3.9915246 0,7.9389842 0,11 3,12 7.738275,11.99037 c 3.993429,0 6.278049,-2.4152505 6.261719,-4.5667636 C 14,5 9,2 6,2 Z M 4,4 H 5 V 5 H 4 Z M 6,4 H 9 V 5 H 6 Z M 2,7 h 9 V 8 H 2 Z m 2,2 h 5 v 1 H 4 Z"/>
+</svg>
diff --git a/app/assets/images/browse/leisure_amusement_arcade.svg b/app/assets/images/browse/leisure_amusement_arcade.svg
new file mode 100644
index 00000000000..572c1edaf73
--- /dev/null
+++ b/app/assets/images/browse/leisure_amusement_arcade.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="m0,1 h4 v2 h-4z m10,0 h4 v2 h-4z m-6,2 v2 h-2 v2 h-2 v7 h2 v-2 h2 v2 h2 v-2 h2 v2 h2 v-2 h2 v2 h2 v-7 h-2 v-2 h-2 v-2 h-2 v2 h-2 v-2z m0,4 h2 v2 h-2 z m4,0 h2 v2 h-2 z"/>
+</svg>
diff --git a/app/assets/images/browse/leisure_beach_resort.svg b/app/assets/images/browse/leisure_beach_resort.svg
new file mode 100644
index 00000000000..b527f4a6ecc
--- /dev/null
+++ b/app/assets/images/browse/leisure_beach_resort.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path id="water" d="M 4.1219331,13.626631 C 3.9041098,13.56795 3.7043745,13.480474 3.043201,13.154183 2.3936171,12.833614 2.1711099,12.749242 1.9125179,12.725438 c -0.2427544,-0.02235 -0.5196116,0.06876 -1.14937063,0.378208 -0.26989319,0.132619 -0.49218946,0.237405 -0.49399252,0.232857 -0.00182,-0.0045 7.8464e-4,-0.433243 0.005749,-0.952658 l 0.009006,-0.944389 0.38017662,-0.185017 c 1.15315213,-0.561185 1.19548523,-0.560485 2.43880113,0.04037 0.8838929,0.42716 1.0026169,0.470972 1.2795678,0.472194 0.2818461,0.0012 0.3448758,-0.02131 1.2435659,-0.444869 1.1260299,-0.530712 1.2555358,-0.561327 1.7184309,-0.406244 0.1552075,0.052 0.5768071,0.235762 0.936884,0.408357 0.8200156,0.39306 1.0515942,0.474216 1.2955255,0.454014 0.2646417,-0.0219 0.4915744,-0.108543 1.2724044,-0.485714 0.38696,-0.186918 0.802843,-0.369632 0.924181,-0.406031 0.388711,-0.116607 0.656592,-0.0544 1.492087,0.346521 L 13.7208,11.4515 13.7067,12.075507 c -0.01779,0.787184 -0.03672,1.241291 -0.05247,1.257018 -0.0067,0.0067 -0.233062,-0.09626 -0.502957,-0.228881 -0.537206,-0.263973 -0.887158,-0.389157 -1.087879,-0.389157 -0.214721,0 -0.504309,0.107863 -1.244075,0.463394 -0.38696,0.185971 -0.818081,0.374552 -0.9580454,0.419069 C 9.450256,13.727681 9.327195,13.699966 8.4391821,13.276656 7.1925745,12.682408 7.0230904,12.63995 6.5417987,12.80136 6.387424,12.853135 5.9563033,13.042152 5.5837526,13.221405 4.650768,13.670312 4.4700271,13.720414 4.1219083,13.626632 Z"/>
+  <path id="umberella" d="M 6.016584,6.0236978 C 5.932851,5.9378471 3.6378765,6.9862878 2.6954763,7.54092 2.3320484,7.7548096 1.9622319,7.9298097 1.8736625,7.9298097 c -0.3712658,0 -0.5631356,-0.466656 -0.5631356,-1.369629 0,-1.2413424 0.4715626,-2.5062381 1.3248694,-3.5537599 C 2.9552391,2.6137791 3.8490947,1.901672 4.2094811,1.752395 4.4083272,1.6700224 4.427748,1.6355879 4.427748,1.3652619 c 0,-0.57579519 0.4995253,-0.77136879 0.8590791,-0.3363459 0.1844817,0.2232084 0.2021353,0.2293406 0.4962343,0.1723666 0.56587,-0.1096231 1.6331075,-0.075006 2.2084841,0.071633 1.423478,0.3627823 2.6680185,1.2677261 3.3659235,2.4474707 0.290568,0.4911787 0.304338,0.5856862 0.119537,0.8206211 C 11.360975,4.6885149 11.241145,4.7266698 10.579112,4.826878 9.3184207,5.0177079 7.1177258,5.5455436 7.0367873,5.6765064 7.7998478,8.049374 8.316546,9.5526837 9.1731183,11.887264 L 7.8557307,11.350409 C 7.1233116,9.1319033 6.7915691,8.1461674 6.016584,6.0236978 Z"/>
+</svg>
diff --git a/app/assets/images/browse/leisure_bird_hide.svg b/app/assets/images/browse/leisure_bird_hide.svg
new file mode 100644
index 00000000000..5583f5b407e
--- /dev/null
+++ b/app/assets/images/browse/leisure_bird_hide.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 3.0710695,0.10833 V 2.015194 H 5.7318342 V 0.10833 Z m 5.2096283,0 V 2.015194 H 10.945605 V 0.10833 Z m 0,2.5037956 v 5.2646027 c 0,0.2525691 0.2033707,0.4559935 0.4558908,0.4559935 h 0.033149 0.4227382 v 5.1029302 c 0,0.244081 0.1994286,0.443555 0.4434623,0.443555 h 3.9124009 c 0.244028,0 0.443463,-0.19947 0.443463,-0.443555 v -3.17534 L 14,9.7960303 12.3049,2.6121256 Z M 1.6992419,2.6204383 0,9.8043411 0.00831104,10.272767 v 3.175343 c 7.43e-6,0.244086 0.19944083,0.44356 0.44346846,0.44356 h 3.9124021 c 0.2482716,0 0.4476051,-0.19947 0.4476051,-0.443553 V 8.3493131 h 0.4185857 0.033155 c 0.2525149,0 0.455894,-0.2075714 0.455894,-0.4601346 V 2.6204164 Z m 4.6086768,0 V 7.5160781 H 7.6880332 V 2.6204164 Z"/>
+</svg>
diff --git a/app/assets/images/browse/leisure_bowling_alley.svg b/app/assets/images/browse/leisure_bowling_alley.svg
new file mode 100644
index 00000000000..5878d4d10ae
--- /dev/null
+++ b/app/assets/images/browse/leisure_bowling_alley.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 11 0 C 9.8954305 -1e-007 8.9999999 0.8954305 9 2 C 9.00107 2.3513949 9.3232274 2.6963044 9.5 3 L 12.5 3 C 12.67609 2.696115 12.999519 2.3512172 13 2 C 13 0.8954303 12.104569 -3e-007 11 0 z M 9.5 4 L 9.5 5 L 12.5 5 L 12.5 4 L 9.5 4 z M 9.5 6 C 9.2156306 6.5752845 8.8489337 7.2576044 8.5488281 8 A 4.2222223 4.4444442 0 0 1 9 10 A 4.2222223 4.4444442 0 0 1 8.3730469 12.318359 C 8.578129 12.913881 8.8249294 13.482017 9 14 L 13 14 C 13.350634 12.956902 13.999701 11.716901 14 10.445312 C 13.999882 8.7729298 13.076063 7.1701786 12.5 6 L 9.5 6 z M 4 6.0546875 A 4 4 0 0 0 0 10.054688 A 4 4 0 0 0 4 14.054688 A 4 4 0 0 0 8 10.054688 A 4 4 0 0 0 4 6.0546875 z M 4 7 A 1 1 0 0 1 5 8 A 1 1 0 0 1 4 9 A 1 1 0 0 1 3 8 A 1 1 0 0 1 4 7 z M 6 9 A 1 1 0 0 1 7 10 A 1 1 0 0 1 6 11 A 1 1 0 0 1 5 10 A 1 1 0 0 1 6 9 z M 3.5 9.5 A 1 1 0 0 1 4.5 10.5 A 1 1 0 0 1 3.5 11.5 A 1 1 0 0 1 2.5 10.5 A 1 1 0 0 1 3.5 9.5 z "/>
+</svg>
diff --git a/app/assets/images/browse/leisure_firepit.svg b/app/assets/images/browse/leisure_firepit.svg
new file mode 100644
index 00000000000..e92a49d393d
--- /dev/null
+++ b/app/assets/images/browse/leisure_firepit.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 5.8613281 -0.01171875 C 7.4948435 3.3410494 -1.0755672 5.5380484 6.3769531 10.130859 L 6.6992188 10.013672 C 4.8436378 7.328355 12.374438 4.1804808 5.8613281 -0.01171875 z M 9.25 3.4238281 C 10.300411 6.5115557 6.7139152 7.3962701 7.8398438 9.5976562 L 9.5292969 8.984375 C 10.207099 7.3309044 11.943051 5.9976828 9.25 3.4238281 z M 1.4746094 8.9980469 A 0.50005 0.50005 0 0 0 1.3300781 9.9707031 L 5.5449219 11.503906 L 1.3320312 13.035156 A 0.49426052 0.49426052 0 0 0 1.6679688 13.964844 L 6.9902344 12.029297 L 12.330078 13.970703 A 0.50043461 0.50043461 0 0 0 12.669922 13.029297 L 8.4550781 11.496094 L 12.667969 9.9648438 A 0.49422068 0.49422068 0 0 0 12.509766 9.0039062 A 0.49422068 0.49422068 0 0 0 12.332031 9.0351562 L 7.0097656 10.970703 L 1.6699219 9.0292969 A 0.50005 0.50005 0 0 0 1.4746094 8.9980469 z" />
+</svg>
diff --git a/app/assets/images/browse/leisure_fishing.svg b/app/assets/images/browse/leisure_fishing.svg
new file mode 100644
index 00000000000..e0459a3abac
--- /dev/null
+++ b/app/assets/images/browse/leisure_fishing.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 0 0 L 0 5 A 3 3 0 0 0 3 8 A 3 3 0 0 0 6 5 L 6 3 L 4 5 L 5 5 A 2 2 0 0 1 3 7 A 2 2 0 0 1 1 5 L 1 0 L 0 0 z M 5.5 9 C 3.1428576 8.9999999 0.78571479 10.25 0 11.5 C 0.78571457 12.75 3.142857 14 5.5 14 C 7.8571441 14.000001 10.214284 12.75 11 11.5 C 10.214286 10.25 7.8571436 9.0000001 5.5 9 z M 11 11.5 L 14 14 L 14 9 L 11 11.5 z M 3 10 A 1 1 0 0 1 4 11 A 1 1 0 0 1 3 12 A 1 1 0 0 1 2 11 A 1 1 0 0 1 3 10 z"/>
+</svg>
diff --git a/app/assets/images/browse/leisure_fitness.svg b/app/assets/images/browse/leisure_fitness.svg
new file mode 100644
index 00000000000..ba326ff6792
--- /dev/null
+++ b/app/assets/images/browse/leisure_fitness.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14.933333" height="14.933333" viewBox="0 0 14 14">
+  <path d="M 8.5372267,1.2755905 A 1.2677165,1.2598426 0 0 0 9.8049431,2.5354332 1.2677165,1.2598426 0 0 0 11.07266,1.2755905 1.2677165,1.2598426 0 0 0 9.8049431,0.01574798 1.2677165,1.2598426 0 0 0 8.5372267,1.2755905 Z m -6.8521549,8.5590563 2.681077,0.6891092 c 0.1095105,0.02815 0.3520751,0.0033 0.4439037,-0.01932 0.2353372,-0.04563 0.3030067,-0.154948 0.3951006,-0.269256 L 6.4744703,8.1436871 8.0702194,9.8565596 7.4259242,13.059105 c -0.020606,0.06867 -0.030908,0.125809 -0.030908,0.171443 0,0.205576 0.06647,0.382584 0.1994435,0.531025 0.1329742,0.148441 0.2915382,0.222679 0.4757602,0.222679 0.3477057,0 0.5626041,-0.199862 0.6447278,-0.59955 L 9.4973678,9.4969405 C 9.589462,9.0857519 9.5485828,8.7831202 9.3746971,8.589009 L 7.9784575,7.0302906 9.4974007,5.0607914 10.479298,6.1568624 c 0.102364,0.1139368 0.22005,0.1709239 0.353057,0.1709239 0.173852,0 0.342553,-0.085555 0.506136,-0.256627 l 1.59575,-1.7813601 C 13.016,4.1754915 13.056846,4.0498678 13.056912,3.9129284 13.056828,3.7418565 13.003204,3.5991666 12.895788,3.4848589 12.788439,3.3705882 12.663076,3.3134163 12.519833,3.3134163 c -0.14331,0 -0.255844,0.045634 -0.337602,0.1369386 l -1.3195,1.4734604 -1.5957491,-1.781323 C 9.1443112,3.0051817 8.9868819,2.8964026 8.8067089,2.9365084 L 5.3328033,3.7097878 C 5.1825403,3.7432359 5.0725688,3.8848954 4.960201,4.0222057 L 4.1885612,5.3519223 c -0.1226707,0.1139369 -0.184056,0.2566264 -0.1840228,0.4280696 -2.45e-5,0.1599419 0.051082,0.2969925 0.1533468,0.4111144 0.1021978,0.1140852 0.2249683,0.1711462 0.3682777,0.1711462 0.1532472,0 0.2862541,-0.068488 0.3989206,-0.2054272 l 0.8959802,-1.50064 1.45563,-0.246662 L 4.2570354,9.0973169 1.7965727,8.3909191 c -0.1944583,0 -0.3718955,0.039275 -0.5049023,0.1763999 C 1.1587305,8.7044064 1.023622,8.8259892 1.023622,9.0427316 c 0,0.2055763 0.084747,0.3840352 0.2176873,0.5267625 0.1329734,0.1427266 0.2647139,0.2191324 0.4437625,0.2651527 z"/>
+</svg>
diff --git a/app/assets/images/browse/leisure_golf.svg b/app/assets/images/browse/leisure_golf.svg
new file mode 100644
index 00000000000..95794909768
--- /dev/null
+++ b/app/assets/images/browse/leisure_golf.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="20" height="20" viewBox="0 0 20 20">
+  <path d="M 10.255722,1.25 9.5556113,2.2668282 C 9.3825471,2.5061111 9.4247604,2.7108452 9.6778523,2.8835927 9.9171215,3.0296005 10.121551,2.9900288 10.294617,2.7641298 L 10.694681,2.1668123 16.923447,6.2535722 11.83375,7.170384 c -0.186473,0.039757 -0.336941,0.1360572 -0.450071,0.2889348 -0.113146,0.1528975 -0.14213,0.3134364 -0.0889,0.4861884 l 1.097396,4.2867918 -3.5950144,5.361962 c -0.066629,0.11923 -0.1000208,0.244819 -0.1000151,0.377838 -5.6e-6,0.212502 0.077435,0.397196 0.230592,0.550087 0.1531469,0.152887 0.3372105,0.227811 0.5500874,0.227814 0.2794857,-3e-6 0.5048197,-0.131648 0.6778851,-0.397285 l 3.753373,-5.642563 0.200032,0.777901 -0.558422,4.225671 c -0.02682,0.212502 0.01906,0.403261 0.138911,0.569535 0.11983,0.16627 0.287197,0.268637 0.500079,0.308383 0.213264,0.03974 0.40941,-0.0044 0.588981,-0.130581 0.179546,-0.126128 0.281558,-0.295508 0.308382,-0.508414 l 0.580648,-4.325686 c 0.01337,-0.146398 -0.002,-0.299026 -0.04168,-0.458407 l -1.277981,-5.0813624 3.33664,-0.6000953 c 0.173044,-0.026358 0.313061,-0.11381 0.419512,-0.266709 0.106412,-0.152879 0.146266,-0.3161959 0.11947,-0.4889665 -0.03983,-0.1727463 -0.14041,-0.3193083 -0.30005,-0.4389532 z M 1.768264,1.6500635 V 2.0084538 18.397166 H 2.8934427 V 6.4008183 L 8.4498803,4.1449041 2.8934427,2.0806875 v -0.430624 z m 9.823781,2.5476266 c -0.359124,1.13e-5 -0.663732,0.1235539 -0.916812,0.3695032 -0.253095,0.245973 -0.380622,0.5495843 -0.380615,0.9084776 -7e-6,0.3585095 0.127521,0.6597485 0.380615,0.9056997 0.25308,0.2459697 0.557688,0.3695107 0.916812,0.3695022 0.359514,8.5e-6 0.671106,-0.1235396 0.930704,-0.3695022 0.259577,-0.2459512 0.38894,-0.5471902 0.38895,-0.9056997 -10e-6,-0.3588933 -0.129373,-0.6625046 -0.38895,-0.9084776 C 12.263151,4.321244 11.951559,4.1977014 11.592045,4.1976901 Z" />
+</svg>
diff --git a/app/assets/images/browse/leisure_golf_pin.svg b/app/assets/images/browse/leisure_golf_pin.svg
new file mode 100644
index 00000000000..253e37e086f
--- /dev/null
+++ b/app/assets/images/browse/leisure_golf_pin.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="9" height="23" version="1.1" viewBox="0 0 9 23">
+  <rect id="mapnik_workaround" width="9" height="23" fill="none"/>
+  <path d="m4,1 v9.77344 a2.10716,0.75 0 1 0 1,0 v-6.77344 l4,-1.5 -4,-1.5 z"/>
+</svg>
diff --git a/app/assets/images/browse/leisure_miniature_golf.svg b/app/assets/images/browse/leisure_miniature_golf.svg
new file mode 100644
index 00000000000..e8b3b97d756
--- /dev/null
+++ b/app/assets/images/browse/leisure_miniature_golf.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="20" height="20" viewBox="0 0 20 20">
+  <path d="m3.0956 17.663 1.2291-8.0762 0.96362-0.57698 0.94261 0.59237s1.0687 8.1587 0.96838 8.1098c-0.10033-0.04893-4.0837 0.02447-4.1038-0.04893z" fill-opacity=".33333"/>
+  <path d="m2.4462 6.1308c-0.052923 0.00317-0.10306 0.024801-0.14168 0.061119l-1.1196 1.0474c-0.099372 0.092638-0.09547 0.2513 0.00833 0.33893l3.2977 2.8198-3.2977 2.8226c-0.10381 0.08764-0.10771 0.24629-0.00833 0.33893l1.1196 1.0474c0.099888 0.09345 0.25916 0.07778 0.33893-0.03334l2.6393-3.5977 2.6393 3.5977c0.079709 0.1091 0.23657 0.12466 0.33616 0.03334l1.1196-1.0474c0.099372-0.09264 0.09547-0.2513-0.00834-0.33893l-3.2977-2.8226 3.2977-2.8198c0.10381-0.087641 0.10771-0.24629 0.0083353-0.33893l-1.1196-1.0474c-0.044255-0.041488-0.10329-0.063503-0.1639-0.061119-0.068786 0.00367-0.13217 0.03843-0.17224 0.094456l-2.6393 3.5977-2.6393-3.5977c-0.045202-0.063226-0.11965-0.098877-0.19724-0.094456zm2.8364 4.1311 0.14168 0.13613-0.14446 0.13891-0.14168-0.13613z"/>
+  <path d="m13.578 5.4759c-1e-5 -0.35889-0.12958-0.6613-0.3887-0.90726-0.25915-0.24595-0.56815-0.36891-0.92704-0.36893-0.3585 1.12e-5 -0.66406 0.12299-0.91669 0.36893-0.25265 0.24596-0.37897 0.54839-0.37897 0.90726-7e-6 0.3585 0.12632 0.66072 0.37897 0.90667 0.25263 0.24596 0.55821 0.36894 0.91669 0.36893 0.35889 8.2e-6 0.6679-0.12297 0.92704-0.36893 0.25912-0.24595 0.38868-0.54816 0.3887-0.90667zm-3.4283 13.275c0.27899-3e-6 0.50488-0.13281 0.67763-0.39843l3.747-5.6412 0.19952 0.7774-0.55781 4.2258c-0.02678 0.21249 0.01966 0.40187 0.1393 0.56815 0.11962 0.16626 0.28569 0.26926 0.4982 0.30902 0.21289 0.03974 0.40897-0.0034 0.58822-0.12957 0.17922-0.12612 0.28223-0.29563 0.30902-0.50854l0.57788-4.325c0.01337-0.14639 1.37e-4 -0.29927-0.03954-0.45865l-1.2762-5.0829 3.3291-0.59795c0.17274-0.026351 0.31224-0.11597 0.4185-0.26886 0.10624-0.15288 0.14598-0.31569 0.11922-0.48845-0.039756-0.17275-0.13931-0.31894-0.29868-0.43858l-7.6541-5.0427-0.69772 1.0165c-0.17276 0.23928-0.13282 0.44528 0.11983 0.61802 0.23885 0.14601 0.44466 0.10606 0.61742-0.11983l0.39904-0.59795 6.2186 4.0866-5.0822 0.91669c-0.18615 0.039752-0.33569 0.13606-0.44861 0.28895-0.11295 0.15289-0.14285 0.31572-0.08972 0.48845l1.0961 4.2854-3.5877 5.3622c-0.066513 0.11923-0.099767 0.24534-0.099761 0.37836-5.6e-6 0.21249 0.076437 0.39518 0.22932 0.54808 0.15288 0.15288 0.33557 0.22932 0.54808 0.22932z"/>
+</svg>
diff --git a/app/assets/images/browse/leisure_outdoor_seating.svg b/app/assets/images/browse/leisure_outdoor_seating.svg
new file mode 100644
index 00000000000..1bd5ea7a97d
--- /dev/null
+++ b/app/assets/images/browse/leisure_outdoor_seating.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 7.0078125,0 0,3 V 4 H 6.5 V 8 H 2 v 1 h 4.5 v 5 h 1 V 9 H 12 V 8 H 7.5 V 4 H 14 V 3 Z M 0,6 c 0,2.6666667 0,5.333333 0,8 h 1 v -2 h 2 v 2 H 4 C 4,13 4,12 4,11 3,11 2,11 1,11 V 6 Z m 13,0 v 5 c -1,0 -2,0 -3,0 0,1 0,2 0,3 h 1 v -2 h 2 v 2 h 1 c 0,-2.666667 0,-5.3333333 0,-8 z"/>
+</svg>
diff --git a/app/assets/images/browse/leisure_playground.svg b/app/assets/images/browse/leisure_playground.svg
new file mode 100644
index 00000000000..e1a5eba6d2b
--- /dev/null
+++ b/app/assets/images/browse/leisure_playground.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 3.40625,1 C 2.65262,1.047193 1.998524,1.7448953 2,2.5 2.000287,3.2852156 2.714784,3.9994517 3.5,3.9994517 4.285216,3.9994517 4.999713,3.2852156 5,2.5 5.0016,1.6823545 4.222298,0.9488955 3.40625,1 z m 8,3 C 10.65262,4.0471927 9.998524,4.7448953 10,5.5 c 2.87e-4,0.7852156 0.714784,1.4994517 1.5,1.4994517 0.785216,0 1.499713,-0.7142361 1.5,-1.4994517 C 13.001599,4.6823545 12.222298,3.9488956 11.40625,4 z M 3,4.5 C 1.52901,4.5 1.134165,6.3734067 1.03125,7.375 L 0,7 0,8 5.96875,10.125 5,14 9,14 8.0625,10.875 14,13 14,12 13.0625,11.65625 C 13.226562,10.794922 13.75,7.5 12,7.5 c -1.638462,0 -1.915209,2.244501 -1.96875,3.09375 l -5.9375,-2.125 C 4.285012,7.337531 4.614,4.5 3,4.5 z"/>
+</svg>
diff --git a/app/assets/images/browse/leisure_sauna.svg b/app/assets/images/browse/leisure_sauna.svg
new file mode 100644
index 00000000000..a1ee41cc387
--- /dev/null
+++ b/app/assets/images/browse/leisure_sauna.svg
@@ -0,0 +1,8 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="m0.82924 10.095h3.3722l-0.44665 3.9051h-2.5459z"/>
+  <path d="m1.3678 0.069465c-3.9978 2.6001 3.2253 3.0269-1.2178 6.1111l0.87772-0.01179c4.1676-3.2915-3.0949-3.5323 1.3044-6.1262z"/>
+  <path d="m4.4017 0.070365c-3.9978 2.6001 3.2253 3.0269-1.2178 6.1111l0.87772-0.01179c4.1676-3.2915-3.0949-3.5323 1.3044-6.1262z"/>
+  <circle cx="10.209" cy="2.2245" r="1.3921"/>
+  <rect x="10.591" y="12.1" width="3.409" height=".7292"/>
+  <path d="m 12.012084,4.5000232 1.948347,5.4212786 c 0.124144,0.3454322 -0.05394,0.7236182 -0.399293,0.8479502 -0.345352,0.124332 -0.723323,-0.05367 -0.847467,-0.399099 L 10.765324,4.9488743 c -0.124145,-0.3454327 0.05394,-0.7236185 0.399292,-0.8479503 0.345353,-0.1243317 0.723323,0.053667 0.847468,0.3990992 z m -2.6535202,5.0144122 3.9987192,0.00719 c 0.3563,6.409e-4 0.642957,0.2879967 0.642729,0.6442966 v 2e-5 c -2.28e-4,0.356299 -0.287252,0.642624 -0.643552,0.641983 l -3.9987191,-0.0072 C 9.0014412,10.800095 8.7147843,10.512738 8.7150121,10.156439 v -2e-5 C 8.7152403,9.8001198 9.002264,9.5137944 9.3585638,9.5144354 Z M 11.60604,4.9131212 10.35726,7.3715539 C 10.237924,7.6064871 9.953429,7.6981661 9.7193796,7.577116 9.4853291,7.4560631 9.3929781,7.1694754 9.5123143,6.9345424 L 10.761094,4.4761077 c 0.119336,-0.2349327 0.40383,-0.3266124 0.637881,-0.2055595 0.23405,0.1210529 0.326401,0.4076403 0.207065,0.642573 z M 7.076307,7.6922509 9.7187228,6.7883867 c 0.2522056,-0.08627 0.5250372,0.047198 0.6117292,0.299255 0.0867,0.2520547 -0.04655,0.5244277 -0.29876,0.6106975 L 7.3892755,8.6022015 C 7.1370564,8.6884338 6.8642382,8.555003 6.777546,8.3029468 6.6908493,8.0508913 6.8241008,7.7785191 7.0763065,7.6922497 Z M 6.3566408,12.803778 8.8589656,9.7803838 C 9.1022707,9.4864144 9.5167363,9.4656079 9.7882602,9.7337316 10.059784,10.001855 10.082502,10.454371 9.8391969,10.74834 L 7.336872,13.771735 c -0.2433051,0.293969 -0.6577707,0.314776 -0.9292945,0.04665 -0.2715239,-0.268124 -0.294242,-0.72064 -0.050937,-1.014609 z"/>
+</svg>
diff --git a/app/assets/images/browse/leisure_slipway.svg b/app/assets/images/browse/leisure_slipway.svg
new file mode 100644
index 00000000000..832f0d7dc4e
--- /dev/null
+++ b/app/assets/images/browse/leisure_slipway.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 6.546875,1.9990235 5.859375,4.4091797 1,3.022461 1.6875,5.7705078 11.966797,8.7041016 14,6.7314454 9.140625,5.3466797 9.828125,2.9345704 Z M 0,7.0009766 v 5.0000004 h 14 v -1 z"/>
+</svg>
diff --git a/app/assets/images/browse/leisure_water_park.svg b/app/assets/images/browse/leisure_water_park.svg
new file mode 100644
index 00000000000..edc19eda269
--- /dev/null
+++ b/app/assets/images/browse/leisure_water_park.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="m 8.7083337,0.54178023 c -0.1252548,0.009961 -0.2461931,0.0506323 -0.375,0.12499897 L 4.2916666,2.8334275 C 3.77896,3.0760921 3.5785334,3.8362857 3.9166666,4.2917486 L 5,6.0000675 0.3333334,8.6667117 0.375,9.5000379 c 0,0 0.6238766,-0.4999957 1.2916666,-0.4999957 0.6317149,0 1.8976382,0.9999918 2.6666668,0.9999918 0.6711521,0 1.9949321,-0.9999918 2.6666666,-0.9999918 0.6991169,0 1.9675497,0.9999918 2.666666,0.9999918 H 10.125 L 6.3333334,4.0000843 9.125,2.5417633 C 9.722322,2.1969018 9.915373,1.5975422 9.666666,1.166775 9.437251,0.76941954 9.084096,0.51189611 8.7083337,0.54178023 Z M 11,4.0000843 c -1.104574,0 -2,0.8954591 -2,1.9999832 0,1.104524 0.895426,1.9999831 2,1.9999831 1.104574,0 2,-0.8954591 2,-1.9999831 C 13,4.8955434 12.104574,4.0000843 11,4.0000843 Z M 1.6666666,11.000025 c -0.4285893,0 -1.06233914,0.362481 -1.64659015,0.650968 L 0.00386128,13.67779 C 0.61690291,13.385497 1.2737936,13.000008 1.6666666,13.000008 2.3389826,13.000008 3.6214694,14 4.3333334,14 4.967336,14 6.3230466,13.000008 7,13.000008 7.672316,13.000008 9.028974,14 9.666666,14 c 0.672317,0 2.0339,-0.999992 2.666668,-0.999992 0.396039,0 1.077576,0.391727 1.696931,0.68483 l 0.04637,-2.023556 c -0.602924,-0.299517 -1.304223,-0.685649 -1.743298,-0.661257 -0.637694,0 -1.953704,0.999992 -2.666668,0.999992 -0.593219,0 -1.99435,-0.999992 -2.666666,-0.999992 -0.672316,0 -2.0721294,0.999992 -2.6666666,0.999992 -0.6340028,0 -1.9548028,-0.999992 -2.6666668,-0.999992 z"/>
+</svg>
diff --git a/app/assets/images/browse/man_made_bell_tower.svg b/app/assets/images/browse/man_made_bell_tower.svg
new file mode 100644
index 00000000000..ba32358c288
--- /dev/null
+++ b/app/assets/images/browse/man_made_bell_tower.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 7 0 L 3 3 L 3 14 L 4 14 L 4 6 A 3 3 0 0 1 7 3 A 3 3 0 0 1 10 6 L 10 14 L 11 14 L 11 3 L 7 0 z M 6.6425781 4.5 C 5.1713456 5.5990112 5.6263833 6.1171551 5.125 8.0292969 C 5.0267045 8.1297436 4.5 8.4517303 4.5 8.7597656 L 4.5 9 L 9.5 9 L 9.5 8.7597656 C 9.5065855 8.4517303 8.9283731 8.1297433 8.8300781 8.0292969 C 8.3366263 6.1474042 8.7614816 5.3429388 7.3574219 4.5 L 6.6425781 4.5 z M 7 9.75 A 0.75 0.75 0 0 0 6.25 10.5 A 0.75 0.75 0 0 0 7 11.25 A 0.75 0.75 0 0 0 7.75 10.5 A 0.75 0.75 0 0 0 7 9.75 z"/>
+</svg>
diff --git a/app/assets/images/browse/man_made_bunker.svg b/app/assets/images/browse/man_made_bunker.svg
new file mode 100644
index 00000000000..43f0fda1d26
--- /dev/null
+++ b/app/assets/images/browse/man_made_bunker.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 5,3 C 3.0000002,3 3,3 2,5 L 0,11 H 2 L 4,5 h 6 l 2,6 h 2 L 12,5 C 11,3 11,3 9,3 Z M 7.0136719,6.5 C 6.2592778,6.4940661 5.5029349,6.9941165 5,8 l -1,3 h 6 L 9,8 C 8.502935,7.005871 7.7592604,6.5075591 7.0136719,6.5 Z"/>
+</svg>
diff --git a/app/assets/images/browse/man_made_chimney.svg b/app/assets/images/browse/man_made_chimney.svg
new file mode 100644
index 00000000000..bac279cf89f
--- /dev/null
+++ b/app/assets/images/browse/man_made_chimney.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="m2 4v9.0039l-1 0.99609h1 2 1l-1-1.0039v-8.9961h-2z"/>
+  <path d="m3 3c1-0.66667 1.4697-1 3-1 1.9996 0.021928 2.7623 0.97624 4 1 1.5581 0 2-1 3-3-1 1-1 1-3 1s-2-1-4-1c-1 0-2 0.76562-3 3z"/>
+</svg>
diff --git a/app/assets/images/browse/man_made_communications_tower.svg b/app/assets/images/browse/man_made_communications_tower.svg
new file mode 100644
index 00000000000..9210a52ba86
--- /dev/null
+++ b/app/assets/images/browse/man_made_communications_tower.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 6 0 L 6 3.2714844 A 2 2 0 0 0 5 5 A 2 2 0 0 0 6 6.7304688 L 6 14 L 8 14 L 8 6.7285156 A 2 2 0 0 0 9 5 A 2 2 0 0 0 8 3.2695312 L 8 0 L 6 0 z M 11.005859 0 L 11.005859 1.28125 C 12.202359 1.99175 12.953125 3.1940094 12.953125 4.7246094 C 12.953125 6.2552094 12.202359 7.477 11.005859 8.1875 L 11.005859 9.4863281 C 12.774559 8.6847681 14.003906 6.8309094 14.003906 4.7246094 C 14.003906 2.6183094 12.774459 0.8015 11.005859 0 z M 3 0.00390625 C 1.2313 0.80546625 0.00390625 2.6358875 0.00390625 4.7421875 C 0.00390625 6.8484875 1.2314 8.7024063 3 9.5039062 L 3 8.2792969 C 1.8035 7.5687969 1.0351562 6.2006219 1.0351562 4.6699219 C 1.0351562 3.1393219 1.80345 1.944875 3 1.234375 L 3 0.00390625 z M 4 1.859375 C 2.842 2.288135 2 3.4085875 2 4.7421875 C 2 6.0758875 2.84197 7.2079188 4 7.6367188 L 4 6.4921875 C 3.4026 6.1376275 3.0722656 5.4717313 3.0722656 4.7070312 C 3.0722656 3.9422412 3.4026 3.3662188 4 3.0117188 L 4 1.859375 z M 10.005859 1.8691406 L 10.005859 2.9746094 C 10.603259 3.3291694 11.023437 3.9773875 11.023438 4.7421875 C 11.023438 5.5069775 10.603279 6.0458906 10.005859 6.4003906 L 10.005859 7.5253906 C 11.163859 7.0966306 11.970703 6.0758875 11.970703 4.7421875 C 11.970703 3.4084875 11.163889 2.2978406 10.005859 1.8691406 z M4,14 h6 l-3,-3z"/>
+</svg>
diff --git a/app/assets/images/browse/man_made_crane.svg b/app/assets/images/browse/man_made_crane.svg
new file mode 100644
index 00000000000..0eecb2e2dd6
--- /dev/null
+++ b/app/assets/images/browse/man_made_crane.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 1,0 C 0.446,0 0,0.446 0,1 0,2 0,3 0,4 h 1 v 10 h 1 v -3 l 3,3 H 6 V 4 h 5 V 9 H 9 v 2 h 5 V 9 H 12 V 4 h 2 L 13,2 H 6 L 5,0 C 3.6666667,0 2.3333333,0 1,0 Z M 1,1 C 2.3333333,1 3.6666667,1 5,1 L 5.5,2 H 1 Z M 2,4 H 5 V 7 Z M 2,5 4.5,7.5 2,10 Z m 3,3 v 5 L 2.5,10.5 Z"/>
+</svg>
diff --git a/app/assets/images/browse/man_made_cross.svg b/app/assets/images/browse/man_made_cross.svg
new file mode 100644
index 00000000000..bb22bbb9fbb
--- /dev/null
+++ b/app/assets/images/browse/man_made_cross.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="7" height="7" viewBox="0 0 7 7">
+  <path d="m3,2 h-2 v1 h2 v4 h1 v-4 h2 v-1 h-2 v-1.5 a.5,.5 0 0 0 -1,0 z"/>
+</svg>
diff --git a/app/assets/images/browse/man_made_generator_wind.svg b/app/assets/images/browse/man_made_generator_wind.svg
new file mode 100644
index 00000000000..7bef1578d8c
--- /dev/null
+++ b/app/assets/images/browse/man_made_generator_wind.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 12 0 C 9.5776054 1.453437 8.7344237 2.0062586 7.5644531 3.0820312 A 2 2 0 0 1 8.9179688 4.4355469 C 10.000256 3.2607453 10.536088 2.4398548 12 0 z M 3.71875 3.6542969 C 2.7974228 3.6764675 1.760434 3.7900279 0 4 C 2.6016345 5.0128073 3.5611756 5.3446455 5.0976562 5.609375 A 2 2 0 0 1 5 5 A 2 2 0 0 1 5.4589844 3.7265625 C 4.8432712 3.6727363 4.2823162 3.6407354 3.71875 3.6542969 z M 7 4 A 1 1 0 0 0 6 5 A 1 1 0 0 0 7 6 A 1 1 0 0 0 8 5 A 1 1 0 0 0 7 4 z M 8.9199219 5.5585938 A 2 2 0 0 1 7 7 A 2 2 0 0 1 6.2871094 6.8652344 L 5.828125 13 L 4 13 L 4 14 L 10 14 L 10 13 L 8 13 L 7.6679688 7.0097656 C 8.8055629 8.0515261 9.5932978 8.5527989 12 10 C 10.537555 7.5572175 10.002684 6.7357296 8.9199219 5.5585938 z"/>
+</svg>
diff --git a/app/assets/images/browse/man_made_lighthouse.svg b/app/assets/images/browse/man_made_lighthouse.svg
new file mode 100644
index 00000000000..e668dd0d50b
--- /dev/null
+++ b/app/assets/images/browse/man_made_lighthouse.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="m 7.0003065,0 -3,1.5 c -0.465049,1.5 -0.465049,2.5 0,4.5 l 1,0 -1,8 6.0000005,0 -1,-8 1,0 c 0.530187,-2 0.530187,-3 0,-4.5 L 7.0003065,0 Z m -6.28125,1.46875 c -0.167266,0.084188 -0.229367,0.3762768 0,0.46875 l 1.875,0.75 c 0.306429,0.1235421 0.493322,-0.3454524 0.1875,-0.46875 l -1.875,-0.75 c -0.07646,-0.030824 -0.131745,-0.028062 -0.1875,0 z m 12.3750005,0 -1.875,0.75 c -0.305822,0.1232976 -0.118929,0.5922921 0.1875,0.46875 l 1.875,-0.75 C 13.58738,1.8142024 13.399879,1.3454524 13.094057,1.46875 Z M 4.5003065,2 9.500307,2 c 0.259083,1 0.259083,2 0,3 L 4.5003065,5 c -0.259083,-1 -0.259083,-2 0,-3 z m -3.75,1.25 c -0.329742,0 -0.329742,0.5 0,0.5 l 2,0 c 0.330396,0 0.329742,-0.5 0,-0.5 l -2,0 z m 10.5000005,0 c -0.329742,0 -0.330396,0.5 0,0.5 l 2,0 c 0.329741,0 0.329741,-0.5 0,-0.5 l -2,0 z m -8.6562505,1.125 -1.875,0.75 c -0.305822,0.1232976 -0.118929,0.5922921 0.1875,0.46875 l 1.875,-0.75 C 3.0873785,4.7204524 2.8998785,4.2517024 2.5940565,4.375 Z m 8.6250005,0 c -0.167266,0.084187 -0.229367,0.3762768 0,0.46875 l 1.875,0.75 c 0.306429,0.1235421 0.493322,-0.3454524 0.1875,-0.46875 l -1.875,-0.75 c -0.07645,-0.030824 -0.131745,-0.028062 -0.1875,0 z"/>
+</svg>
diff --git a/app/assets/images/browse/man_made_mast.svg b/app/assets/images/browse/man_made_mast.svg
new file mode 100644
index 00000000000..893ff199e4b
--- /dev/null
+++ b/app/assets/images/browse/man_made_mast.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 7,1 C 6.4022075,1 6,1.4692172 6,2 L 6,9 3.1132812,14 4.2675781,14 6,11 6,14 8,14 8,11 9.7324219,14 10.886719,14 8,9 8,2 C 8,1.5039063 7.5977925,1 7,1 Z"/>
+</svg>
diff --git a/app/assets/images/browse/man_made_mast_communications.svg b/app/assets/images/browse/man_made_mast_communications.svg
new file mode 100644
index 00000000000..0ae0ac9e730
--- /dev/null
+++ b/app/assets/images/browse/man_made_mast_communications.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 4 0.40625 C 2.23276 1.1855669 0.96875 2.9521023 0.96875 5 C 0.96875 7.047898 2.23276 8.814433 4 9.59375 L 4 8.4375 C 2.80447 7.746709 2 6.4881502 2 5 C 2 3.5118498 2.80447 2.2532914 4 1.5625 L 4 0.40625 z M 10 0.40625 L 10 1.5625 C 11.19553 2.2532914 12 3.5118498 12 5 C 12 6.4881502 11.19553 7.746709 10 8.4375 L 10 9.59375 C 11.76724 8.814433 13.03125 7.047898 13.03125 5 C 13.03125 2.9521023 11.76724 1.1855669 10 0.40625 z M 5 2.1875 C 3.842954 2.6043642 3 3.7033306 3 5 C 3 6.2966694 3.842954 7.395636 5 7.8125 L 5 6.71875 C 4.403081 6.3740292 4 5.7435697 4 5 C 4 4.2564303 4.403081 3.6259708 5 3.28125 L 5 2.1875 z M 9 2.1875 L 9 3.28125 C 9.596919 3.6259708 10 4.2564303 10 5 C 10 5.7435697 9.596919 6.3740292 9 6.71875 L 9 7.8125 C 10.157046 7.395636 11 6.2966694 11 5 C 11 3.7033306 10.157046 2.6043642 9 2.1875 z M 7 4 C 6.4022075 4 6 4.4692172 6 5 L 6 9 L 3.1132812 14 L 4.2675781 14 L 6 11 L 6 14 L 8 14 L 8 11 L 9.7324219 14 L 10.886719 14 L 8 9 L 8 5 C 8 4.5039063 7.5977925 4 7 4 z"/>
+</svg>
diff --git a/app/assets/images/browse/man_made_mast_lighting.svg b/app/assets/images/browse/man_made_mast_lighting.svg
new file mode 100644
index 00000000000..1fca7daac8a
--- /dev/null
+++ b/app/assets/images/browse/man_made_mast_lighting.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 7 1 C 6.4022075 1 6 1.4692172 6 2 L 6 9 L 3.1132812 14 L 4.2675781 14 L 6 11 L 6 14 L 8 14 L 8 11 L 9.7324219 14 L 10.886719 14 L 8 9 L 8 2 C 8 1.5039063 7.5977925 1 7 1 z M 2.7148438 1.5449219 C 2.5475777 1.6291099 2.4854766 1.9211987 2.7148438 2.0136719 L 4.5898438 2.7636719 C 4.8962727 2.887214 5.0831658 2.4182195 4.7773438 2.2949219 L 2.9023438 1.5449219 C 2.8258838 1.5140979 2.7705987 1.5168599 2.7148438 1.5449219 z M 11 1.5957031 L 9.125 2.3457031 C 8.819178 2.4690007 9.006071 2.9379952 9.3125 2.8144531 L 11.1875 2.0644531 C 11.493323 1.9411555 11.305822 1.4724055 11 1.5957031 z M 2.7460938 3.3261719 C 2.4163518 3.3261719 2.4163518 3.8261719 2.7460938 3.8261719 L 4.7460938 3.8261719 C 5.0764898 3.8261719 5.0758357 3.3261719 4.7460938 3.3261719 L 2.7460938 3.3261719 z M 9.15625 3.3769531 C 8.826508 3.3769531 8.825854 3.8769531 9.15625 3.8769531 L 11.15625 3.8769531 C 11.485991 3.8769531 11.485991 3.3769531 11.15625 3.3769531 L 9.15625 3.3769531 z M 4.5898438 4.4511719 L 2.7148438 5.2011719 C 2.4090217 5.3244695 2.5959147 5.793464 2.9023438 5.6699219 L 4.7773438 4.9199219 C 5.0831658 4.7966243 4.8956656 4.3278743 4.5898438 4.4511719 z M 9.125 4.5019531 C 8.957734 4.5861401 8.895633 4.8782299 9.125 4.9707031 L 11 5.7207031 C 11.306429 5.8442452 11.493322 5.3752507 11.1875 5.2519531 L 9.3125 4.5019531 C 9.23605 4.4711291 9.180755 4.4738911 9.125 4.5019531 z"/>
+</svg>
diff --git a/app/assets/images/browse/man_made_power_tower.svg b/app/assets/images/browse/man_made_power_tower.svg
new file mode 100644
index 00000000000..3788a748a79
--- /dev/null
+++ b/app/assets/images/browse/man_made_power_tower.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="7" height="7" viewBox="0 0 7 7">
+	<rect width="7" height="7" fill="#868686" />
+	<circle cx="3.5" cy="3.5" r="2.5" fill="white" />
+	<path d="M 0.625,1 6,6.375 6.375,6 1,0.625 z" fill="#868686" />
+	<path d="M 6,0.625 0.625,6 1,6.375 6.375,1 z" fill="#868686" />
+</svg>
diff --git a/app/assets/images/browse/man_made_power_tower_small.svg b/app/assets/images/browse/man_made_power_tower_small.svg
new file mode 100644
index 00000000000..789a6ac4be2
--- /dev/null
+++ b/app/assets/images/browse/man_made_power_tower_small.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="3" height="3" viewBox="0 0 3 3">
+	<rect width="3" height="3" fill="#868686" />
+	<circle cx="1.5" cy="1.5" r="0.5" fill="white" />
+</svg>
diff --git a/app/assets/images/browse/man_made_storage_tank.svg b/app/assets/images/browse/man_made_storage_tank.svg
new file mode 100644
index 00000000000..cb5cc26e22c
--- /dev/null
+++ b/app/assets/images/browse/man_made_storage_tank.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 5.4511719 0 C 4.1792667 -0.0065223625 2.9230628 0.6531739 2 2 L 2 14 L 9 14 L 9 6 L 11 6 L 11 14 L 12 14 L 12 2 L 11 2 L 11 4.9414062 L 9 4.9414062 L 9 2 C 8.0106834 0.67926335 6.723077 0.0065223625 5.4511719 0 z"/>
+</svg>
diff --git a/app/assets/images/browse/man_made_telescope_dish.svg b/app/assets/images/browse/man_made_telescope_dish.svg
new file mode 100644
index 00000000000..e1902c30f64
--- /dev/null
+++ b/app/assets/images/browse/man_made_telescope_dish.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 4.0507812 0 C 1.5789894 2.539636 1.5789894 6.6576312 4.0507812 9.1972656 C 6.5225734 11.736904 10.528207 11.736904 13 9.1972656 C 12.343388 8.5209988 12.562756 8.7485174 12.095703 8.2675781 L 12.447266 1.8925781 A 1 1 0 0 0 13 1 A 1 1 0 0 0 12 0 A 1 1 0 0 0 11.103516 0.55859375 L 4.9648438 0.93945312 C 4.513421 0.47588035 4.6907678 0.6575524 4.0507812 0 z M 10.777344 1.5722656 L 8.1425781 4.2070312 C 7.8109554 3.8671766 6.6384106 2.6582437 5.8808594 1.8808594 L 10.777344 1.5722656 z M 11.429688 2.3339844 L 11.152344 7.296875 C 10.349853 6.4708947 9.1820827 5.2709305 8.8417969 4.921875 L 11.429688 2.3339844 z M 3.2832031 10.142578 L 1 14 L 10 14 L 10 12.228516 C 7.7228562 12.609275 5.0575401 11.916032 3.2832031 10.142578 z"/>
+</svg>
diff --git a/app/assets/images/browse/man_made_telescope_dome.svg b/app/assets/images/browse/man_made_telescope_dome.svg
new file mode 100644
index 00000000000..aae66383bb8
--- /dev/null
+++ b/app/assets/images/browse/man_made_telescope_dome.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 6 0 L 6 1 L 7 1 A 6 6 0 0 1 13 7 L 13 8 L 14 8 L 14 7 A 7 7 0 0 0 12.599609 2.8144531 L 14 1.4140625 L 12.585938 0 L 11.185547 1.4003906 A 7 7 0 0 0 7 0 L 6 0 z M 6 2 A 5.9999999 6 0 0 0 0 8 L 12 8 A 5.9999999 6 0 0 0 6 2 z M 0 9 L 0 14 L 12 14 L 12 9 L 0 9 z"/>
+</svg>
diff --git a/app/assets/images/browse/man_made_tower_cantilever_communication.svg b/app/assets/images/browse/man_made_tower_cantilever_communication.svg
new file mode 100644
index 00000000000..ff9e31efa7b
--- /dev/null
+++ b/app/assets/images/browse/man_made_tower_cantilever_communication.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 4 0.40625 C 2.23276 1.1855669 0.96875 2.9521023 0.96875 5 C 0.96875 7.047898 2.23276 8.814433 4 9.59375 L 4 8.4375 C 2.80447 7.746709 2 6.4881502 2 5 C 2 3.5118498 2.80447 2.2532914 4 1.5625 L 4 0.40625 z M 10 0.40625 L 10 1.5625 C 11.19553 2.2532914 12 3.5118498 12 5 C 12 6.4881502 11.19553 7.746709 10 8.4375 L 10 9.59375 C 11.76724 8.814433 13.03125 7.047898 13.03125 5 C 13.03125 2.9521023 11.76724 1.1855669 10 0.40625 z M 5 2.1875 C 3.842954 2.6043642 3 3.7033306 3 5 C 3 6.2966694 3.842954 7.395636 5 7.8125 L 5 6.71875 C 4.403081 6.3740292 4 5.7435697 4 5 C 4 4.2564303 4.403081 3.6259708 5 3.28125 L 5 2.1875 z M 9 2.1875 L 9 3.28125 C 9.596919 3.6259708 10 4.2564303 10 5 C 10 5.7435697 9.596919 6.3740292 9 6.71875 L 9 7.8125 C 10.157046 7.395636 11 6.2966694 11 5 C 11 3.7033306 10.157046 2.6043642 9 2.1875 z M 7 4 C 6.4022075 4 6 4.469217 6 5 L 6 11 L 5 11 L 5 12 L 3 12 L 3 14 L 11 14 L 11 12 L 9 12 L 9 11 L 8 11 L 8 5 C 8 4.503906 7.597793 4 7 4 z"/>
+</svg>
diff --git a/app/assets/images/browse/man_made_tower_cooling.svg b/app/assets/images/browse/man_made_tower_cooling.svg
new file mode 100644
index 00000000000..0191e3b7761
--- /dev/null
+++ b/app/assets/images/browse/man_made_tower_cooling.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="m3,1 l1,2 v5 l-2,6 h10 l-2,-6 v-5 l1,-2 z"/>
+</svg>
diff --git a/app/assets/images/browse/man_made_tower_defensive.svg b/app/assets/images/browse/man_made_tower_defensive.svg
new file mode 100644
index 00000000000..819c4776b84
--- /dev/null
+++ b/app/assets/images/browse/man_made_tower_defensive.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="m 2.5,0 0,3 9,0 0,-3 L 10,0 10,1 8,1 8,0 6,0 6,1 4,1 4,0 z M 3,4 2.5,13 1,13 1,14 5.5,14 C 5.5,13 5.7770449,11.5 7,11.5 8.2738548,11.52672 8.5,13 8.5,14 L 13,14 13,13 11.5,13 11,4 z M 7,6 C 8,6 8,7 8,7 L 8,8 6,8 6,7 C 6,7 6,6 7,6 z"/>
+</svg>
diff --git a/app/assets/images/browse/man_made_tower_dish.svg b/app/assets/images/browse/man_made_tower_dish.svg
new file mode 100644
index 00000000000..4a77a5982ae
--- /dev/null
+++ b/app/assets/images/browse/man_made_tower_dish.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 8.0685044,0.05217521 C 7.5102106,0.08185002 6.9559019,0.19918572 6.4298325,0.40262664 L 7.2794418,1.2495509 c 1.3855212,-0.36956358 2.9010802,-0.038252 3.9941402,1.0513543 1.09306,1.0896057 1.425423,2.6003758 1.054687,3.9815176 l 0.84961,0.8469243 C 13.903519,5.2647886 13.533641,3.0468811 12.029441,1.5474346 11.089316,0.61028076 9.8680989,0.11516028 8.6270981,0.05217521 c -0.1861501,-0.0094477 -0.3724959,-0.0098916 -0.5585937,0 z M 8.0470204,2.4021467 c -0.4702958,-0.00363 -0.9414804,0.098546 -1.375,0.3017777 L 7.4747548,3.5041217 C 8.1663982,3.3194652 8.9266412,3.4853662 9.4728016,4.0297989 10.01896,4.5742318 10.185386,5.3320738 10.000145,6.0215312 l 0.802734,0.8001974 C 11.346549,5.6693305 11.159591,4.2471506 10.207176,3.2977448 9.6119171,2.7043661 8.8308463,2.4081948 8.0470204,2.4021467 Z M 2.9981918,2.7545451 c -2.05459658,2.0481034 -2.05459658,5.3697857 0,7.4178879 2.0545969,2.048105 5.3848563,2.048105 7.4394532,0 L 7.2110825,6.9560684 8.5685044,5.6048834 7.8380356,4.8767231 6.4825668,6.2279081 Z M 2.3614731,10.933692 0.46303563,14.044922 H 7.7325668 V 12.615859 C 5.8397654,12.922925 3.836333,12.363904 2.3614731,10.933692 Z"/>
+</svg>
diff --git a/app/assets/images/browse/man_made_tower_dome.svg b/app/assets/images/browse/man_made_tower_dome.svg
new file mode 100644
index 00000000000..eaf48c9f995
--- /dev/null
+++ b/app/assets/images/browse/man_made_tower_dome.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <circle cx="7" cy="2" r="2"/>
+  <rect x="6" y="2" width="2" height="12" rx="0" ry="0"/>
+  <path d="m4 14 3-3 3 3h-6" fill-rule="evenodd"/>
+</svg>
diff --git a/app/assets/images/browse/man_made_tower_generic.svg b/app/assets/images/browse/man_made_tower_generic.svg
new file mode 100644
index 00000000000..be6b938ef74
--- /dev/null
+++ b/app/assets/images/browse/man_made_tower_generic.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="m 6,2 0,9 -1,0 0,1 -2,0 0,2 8,0 0,-2 -2,0 0,-1 -1,0 0,-9 C 8,1.5039063 7.5977925,1 7,1 6.4022075,1 6,1.4692172 6,2 Z"/>
+</svg>
diff --git a/app/assets/images/browse/man_made_tower_lattice.svg b/app/assets/images/browse/man_made_tower_lattice.svg
new file mode 100644
index 00000000000..fffc3b3e6c2
--- /dev/null
+++ b/app/assets/images/browse/man_made_tower_lattice.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 6.471776,0 5.2011719,10 2.5996094,14 H 4 L 4.6660156,13 H 9.3339844 L 10,14 h 1.400391 L 8.8573766,9.9245397 C 9,10 7.5592457,0 7.5592457,0 Z M 7,4 7.75,10 h -1.5 z m -1,7 h 2 l 0.6660156,1 H 5.3339844 Z"/>
+</svg>
diff --git a/app/assets/images/browse/man_made_tower_lattice_communication.svg b/app/assets/images/browse/man_made_tower_lattice_communication.svg
new file mode 100644
index 00000000000..0ee76170e22
--- /dev/null
+++ b/app/assets/images/browse/man_made_tower_lattice_communication.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 4 0.40625 C 2.23276 1.1855669 0.96875 2.9521023 0.96875 5 C 0.96875 7.047898 2.23276 8.814433 4 9.59375 L 4 8.4375 C 2.80447 7.746709 2 6.4881502 2 5 C 2 3.5118498 2.80447 2.2532914 4 1.5625 L 4 0.40625 z M 10 0.40625 L 10 1.5625 C 11.19553 2.2532914 12 3.5118498 12 5 C 12 6.4881502 11.19553 7.746709 10 8.4375 L 10 9.59375 C 11.76724 8.814433 13.03125 7.047898 13.03125 5 C 13.03125 2.9521023 11.76724 1.1855669 10 0.40625 z M 5 2.1875 C 3.842954 2.6043642 3 3.7033306 3 5 C 3 6.2966694 3.842954 7.395636 5 7.8125 L 5 6.71875 C 4.403081 6.3740292 4 5.7435697 4 5 C 4 4.2564303 4.403081 3.6259708 5 3.28125 L 5 2.1875 z M 9 2.1875 L 9 3.28125 C 9.596919 3.6259708 10 4.2564303 10 5 C 10 5.7435697 9.596919 6.3740292 9 6.71875 L 9 7.8125 C 10.157046 7.395636 11 6.2966694 11 5 C 11 3.7033306 10.157046 2.6043642 9 2.1875 z M 7 3 L 5.2011719 10 L 2.5996094 14 L 4 14 L 4.6660156 13 L 9.3339844 13 L 10 14 L 11.400391 14 L 8.8007812 10 L 7 3 z M 7 7 L 7.75 10 L 6.25 10 L 7 7 z M 6 11 L 8 11 L 8.6660156 12 L 5.3339844 12 L 6 11 z"/>
+</svg>
diff --git a/app/assets/images/browse/man_made_tower_lattice_lighting.svg b/app/assets/images/browse/man_made_tower_lattice_lighting.svg
new file mode 100644
index 00000000000..d69d2d2f524
--- /dev/null
+++ b/app/assets/images/browse/man_made_tower_lattice_lighting.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 6.4726562 0 L 5.2011719 10 L 2.5996094 14 L 4 14 L 4.6660156 13 L 9.3339844 13 L 10 14 L 11.400391 14 L 8.8574219 9.9238281 C 9.0000453 9.9992881 7.5585937 0 7.5585938 0 L 6.4726562 0 z M 2.7148438 1.5449219 C 2.5475777 1.6291099 2.4854765 1.9211987 2.7148438 2.0136719 L 4.5898438 2.7636719 C 4.8962727 2.887214 5.0831658 2.4182195 4.7773438 2.2949219 L 2.9023438 1.5449219 C 2.8258838 1.5140979 2.7705987 1.5168599 2.7148438 1.5449219 z M 11 1.5957031 L 9.125 2.3457031 C 8.819178 2.4690007 9.006071 2.9379952 9.3125 2.8144531 L 11.1875 2.0644531 C 11.493323 1.9411555 11.305822 1.4724055 11 1.5957031 z M 2.7460938 3.3261719 C 2.4163518 3.3261719 2.4163518 3.8261719 2.7460938 3.8261719 L 4.7460938 3.8261719 C 5.0764898 3.8261719 5.0758357 3.3261719 4.7460938 3.3261719 L 2.7460938 3.3261719 z M 9.15625 3.3769531 C 8.826508 3.3769531 8.825854 3.8769531 9.15625 3.8769531 L 11.15625 3.8769531 C 11.485991 3.8769531 11.485991 3.3769531 11.15625 3.3769531 L 9.15625 3.3769531 z M 7 4 L 7.75 10 L 6.25 10 L 7 4 z M 4.5898438 4.4511719 L 2.7148438 5.2011719 C 2.4090217 5.3244695 2.5959147 5.793464 2.9023438 5.6699219 L 4.7773438 4.9199219 C 5.0831658 4.7966243 4.8956656 4.3278743 4.5898438 4.4511719 z M 9.125 4.5019531 C 8.957734 4.5861401 8.895633 4.8782299 9.125 4.9707031 L 11 5.7207031 C 11.306429 5.8442452 11.493322 5.3752507 11.1875 5.2519531 L 9.3125 4.5019531 C 9.23605 4.4711291 9.180755 4.4738911 9.125 4.5019531 z M 6 11 L 8 11 L 8.6660156 12 L 5.3339844 12 L 6 11 z"/>
+</svg>
diff --git a/app/assets/images/browse/man_made_tower_lighting.svg b/app/assets/images/browse/man_made_tower_lighting.svg
new file mode 100644
index 00000000000..2819255b30e
--- /dev/null
+++ b/app/assets/images/browse/man_made_tower_lighting.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 7 1 C 6.4022075 1 6 1.4692172 6 2 L 6 11 L 5 11 L 5 12 L 3 12 L 3 14 L 11 14 L 11 12 L 9 12 L 9 11 L 8 11 L 8 2 C 8 1.5039063 7.5977925 1 7 1 z M 2.7148438 1.5449219 C 2.5475777 1.6291099 2.4854767 1.9211987 2.7148438 2.0136719 L 4.5898438 2.7636719 C 4.8962727 2.887214 5.0831658 2.4182195 4.7773438 2.2949219 L 2.9023438 1.5449219 C 2.8258838 1.5140979 2.7705987 1.5168599 2.7148438 1.5449219 z M 11 1.5957031 L 9.125 2.3457031 C 8.819178 2.4690007 9.006071 2.9379952 9.3125 2.8144531 L 11.1875 2.0644531 C 11.493323 1.9411555 11.305822 1.4724055 11 1.5957031 z M 2.7460938 3.3261719 C 2.4163518 3.3261719 2.4163518 3.8261719 2.7460938 3.8261719 L 4.7460938 3.8261719 C 5.0764898 3.8261719 5.0758357 3.3261719 4.7460938 3.3261719 L 2.7460938 3.3261719 z M 9.15625 3.3769531 C 8.826508 3.3769531 8.825854 3.8769531 9.15625 3.8769531 L 11.15625 3.8769531 C 11.485991 3.8769531 11.485991 3.3769531 11.15625 3.3769531 L 9.15625 3.3769531 z M 4.5898438 4.4511719 L 2.7148438 5.2011719 C 2.4090217 5.3244695 2.5959147 5.793464 2.9023438 5.6699219 L 4.7773438 4.9199219 C 5.0831658 4.7966243 4.8956657 4.3278743 4.5898438 4.4511719 z M 9.125 4.5019531 C 8.957734 4.5861401 8.895633 4.8782299 9.125 4.9707031 L 11 5.7207031 C 11.306429 5.8442452 11.493322 5.3752507 11.1875 5.2519531 L 9.3125 4.5019531 C 9.23605 4.4711291 9.180755 4.4738911 9.125 4.5019531 z"/>
+</svg>
diff --git a/app/assets/images/browse/man_made_tower_observation.svg b/app/assets/images/browse/man_made_tower_observation.svg
new file mode 100644
index 00000000000..3b53fbe332a
--- /dev/null
+++ b/app/assets/images/browse/man_made_tower_observation.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 7 0 L 2 2 L 2 6 L 12 6 L 12 2 L 7 0 z M 3 3 L 5 3 L 5 5 L 3 5 L 3 3 z M 6 3 L 8 3 L 8 5 L 6 5 L 6 3 z M 9 3 L 11 3 L 11 5 L 9 5 L 9 3 z M 3.90625 6.625 L 3 14 L 4.5 14 L 4.6875 12.53125 L 7 11 L 9.3125 12.5625 L 9.5 14 L 11 14 L 10.09375 6.65625 L 3.90625 6.625 z M 5.34375 7.1875 L 8.65625 7.21875 L 8.84375 8.78125 L 7 10 L 5.15625 8.78125 L 5.34375 7.1875 z M 5.03125 9.6875 L 6.25 10.5 L 4.8125 11.46875 L 5.03125 9.6875 z M 8.96875 9.6875 L 9.1875 11.46875 L 7.75 10.5 L 8.96875 9.6875 z"/>
+</svg>
diff --git a/app/assets/images/browse/man_made_water_tower.svg b/app/assets/images/browse/man_made_water_tower.svg
new file mode 100644
index 00000000000..d30c0cffa83
--- /dev/null
+++ b/app/assets/images/browse/man_made_water_tower.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 2,0 2,3.5 C 2,4.9469172 2.7905512,5.9802716 3.90625,6.625 L 3,14 4.5,14 4.6875,12.53125 7,11 9.3125,12.5625 9.5,14 11,14 10.09375,6.65625 C 11.21821,6.0132746 12,4.9628112 12,3.5 l 0,-3.5 -1.5,0 0,1.5 -0.5,0 C 8.8728814,2 8,2 7,1.5 6,1 5.0381356,1 4,1.5 l -0.5,0 0,-1.5 z m 3.34375,7.1875 c 1.069224,0.2671613 2.2426846,0.2935662 3.3125,0.03125 L 8.84375,8.78125 7,10 5.15625,8.78125 z m -0.3125,2.5 L 6.25,10.5 4.8125,11.46875 z m 3.9375,0 L 9.1875,11.46875 7.75,10.5 z"/>
+</svg>
diff --git a/app/assets/images/browse/man_made_windmill.svg b/app/assets/images/browse/man_made_windmill.svg
new file mode 100644
index 00000000000..40809d9e06d
--- /dev/null
+++ b/app/assets/images/browse/man_made_windmill.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 2.71875,0 1,1.71875 5.96875,6 1,10.28125 2.71875,12 7,7.03125 11.28125,12 13,10.28125 8.03125,6 13,1.71875 11.28125,0 7,4.96875 2.71875,0 z M 7,2 C 6.5846058,2 6.2371923,2.0902004 5.9375,2.21875 L 7,3.4375 8.0625,2.21875 C 7.7644902,2.0832701 7.4104059,2 7,2 z M 7,5.5 C 7.2761424,5.5 7.5,5.7238576 7.5,6 7.5,6.2761424 7.2761424,6.5 7,6.5 6.7238576,6.5 6.5,6.2761424 6.5,6 6.5,5.7238576 6.7238576,5.5 7,5.5 z M 4.1875,5.78125 4.15625,6.25 4.4375,6 4.1875,5.78125 z m 5.625,0 L 9.5625,6 9.84375,6.25 9.8125,5.78125 z M 7,8.5625 3.625,12.46875 3.5,14 10.5,14 10.375,12.46875 7,8.5625 z"/>
+</svg>
diff --git a/app/assets/images/browse/office_consulate.svg b/app/assets/images/browse/office_consulate.svg
new file mode 100644
index 00000000000..0294776ada6
--- /dev/null
+++ b/app/assets/images/browse/office_consulate.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="m 2.5,0 c -0.25,0 -0.5,0.221572 -0.5,0.666016 V 11.333984 c 0,0.888888 1,0.888888 1,0 V 0.66601587 C 3,0.22157187 2.75,0 2.5,0 Z m 6.1347661,0.0059 c -0.514161,-0.03826 -1.1535161,0.08454 -1.8847661,0.574219 -1.95,1.30581203 -3.25,0 -3.25,0 V 5.1504319 c 0,0 1.3,1.305811 3.25,0 1.9500001,-1.3058131 3.25,0 3.25,0 V 0.58011887 c 0,0 -0.508301,-0.510458 -1.3652339,-0.574219 z M 9.5,5.9999999 a 1.5,1.5 0 0 0 -1.5,1.5 1.5,1.5 0 0 0 1.5,1.5 1.5,1.5 0 0 0 1.5,-1.5 1.5,1.5 0 0 0 -1.5,-1.5 z m 0.828125,3.509766 c -0.129799,-0.01707 -0.26298,-0.0091 -0.3945311,0.02539 -0.1632798,0.0428 -0.2925939,0.13083 -0.4023439,0.236328 -0.01244,0.01053 -0.02745,0.0154 -0.03906,0.02734 L 7.833986,11.503902 6.025393,12.013668 c -0.266643,0.07505 -0.420754,0.348596 -0.345703,0.615234 0.07505,0.266643 0.350549,0.420753 0.617187,0.345703 L 8.220705,12.43359 c 0.01754,-0.0049 0.03034,-0.01684 0.04687,-0.02344 0.03211,-0.01089 0.06004,-0.02927 0.08984,-0.04687 0.01916,-0.01265 0.03963,-0.02215 0.05664,-0.03711 0.01708,-0.01352 0.03712,-0.02105 0.05273,-0.03711 L 9.4843631,11.242186 10,14 h 2 L 11.201172,10.214844 C 11.068723,9.8289579 10.717524,9.5609659 10.328125,9.5097659 Z"/>
+</svg>
diff --git a/app/assets/images/browse/office_embassy.svg b/app/assets/images/browse/office_embassy.svg
new file mode 100644
index 00000000000..ab8dcbc386f
--- /dev/null
+++ b/app/assets/images/browse/office_embassy.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 8,1 C 5,3 3,1 3,1 l 0,7 c 0,0 2,2 5,0 3,-2 5,0 5,0 L 13,1 C 13,1 11,-1 8,1 z M 1.5,0.25 C 1.25,0.25 1,0.5 1,1 l 0,12 c 0,1 1,1 1,0 L 2,1 C 2,0.5 1.75,0.25 1.5,0.25 z"/>
+</svg>
diff --git a/app/assets/images/browse/shop_alcohol.svg b/app/assets/images/browse/shop_alcohol.svg
new file mode 100644
index 00000000000..5971c9a693d
--- /dev/null
+++ b/app/assets/images/browse/shop_alcohol.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 3,0 C 2,0 2,0.4670568 2,1 L 2,3 C 2,4 0,4 0,6 l 0,7 c 0,0.566252 0.467057,1 1,1 l 4,0 c 0.599561,0 1,-0.400439 1,-1 L 6,6 C 6,4 4,4 4,3 L 4,1 C 4,0.4337479 4,0 3,0 z m 4,5 c 0,3 0.47106,5 3,5 l 0,2 c 0,0.666911 -1,1 -1.5,1 -1,0 -1.5,0 -1.5,1 l 7,0 C 14,13 13.5,13 12.5,13 12,13 11,12.633602 11,12 l 0,-2 c 2.47106,0 3,-2 3,-5 L 7,5 z"/>
+</svg>
diff --git a/app/assets/images/browse/shop_art.svg b/app/assets/images/browse/shop_art.svg
new file mode 100644
index 00000000000..ff0eaf7b6b9
--- /dev/null
+++ b/app/assets/images/browse/shop_art.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path
+     d="M 7,-9.9999999e-8 C 3.134444,-9.9999999e-8 0,3.1344439 0,7 c 0,3.865556 3.134444,7 7,7 0.645556,0 1.1660156,-0.520461 1.1660156,-1.166016 0,-0.303333 -0.1121788,-0.577093 -0.3027344,-0.783203 -0.1827769,-0.206111 -0.2910156,-0.473992 -0.2910156,-0.773437 0,-0.645556 0.5204596,-1.166016 1.1660156,-1.166016 l 1.3730468,0 C 12.257994,10.111328 14,8.369323 14,6.222656 c 0,-3.4377778 -3.134445,-6.2226561 -7,-6.2226561 z M 8.9335938,1.3046874 A 1.3891786,1.3891786 0 0 1 10.322266,2.6933593 1.3891786,1.3891786 0 0 1 8.9335938,4.0839843 1.3891786,1.3891786 0 0 1 7.5449219,2.6933593 1.3891786,1.3891786 0 0 1 8.9335938,1.3046874 Z M 5.0390625,1.3242187 A 1.3891786,1.3891786 0 0 1 6.4296875,2.7148437 1.3891786,1.3891786 0 0 1 5.0390625,4.1035155 1.3891786,1.3891786 0 0 1 3.6503906,2.7148437 1.3891786,1.3891786 0 0 1 5.0390625,1.3242187 Z M 2.7070312,4.4472655 A 1.3891786,1.3891786 0 0 1 4.0957031,5.83789 1.3891786,1.3891786 0 0 1 2.7070312,7.226562 1.3891786,1.3891786 0 0 1 1.3183594,5.83789 1.3891786,1.3891786 0 0 1 2.7070312,4.4472655 Z m 8.5585938,0 A 1.3891786,1.3891786 0 0 1 12.654297,5.83789 1.3891786,1.3891786 0 0 1 11.265625,7.226562 1.3891786,1.3891786 0 0 1 9.8769531,5.83789 1.3891786,1.3891786 0 0 1 11.265625,4.4472655 Z"/>
+</svg>
diff --git a/app/assets/images/browse/shop_bag.svg b/app/assets/images/browse/shop_bag.svg
new file mode 100644
index 00000000000..db5a59a6758
--- /dev/null
+++ b/app/assets/images/browse/shop_bag.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 6,1 C 5,1 4,2.0209735 4,3 l 0,1 -0.75,0 0,9 7.5,0 0,-9 L 10,4 10,3 C 10,2 8.9895132,1 8,1 z m 0.5,1.25 1,0 c 0.8599138,0 1.25,0.5994182 1.25,1.25 l 0,0.5 -3.5,0 0,-0.5 C 5.25,2.8707948 5.5557891,2.25 6.5,2.25 z M 2,4 C 0.64345039,4 0,4.6434504 0,6 l 0,5 c 0,1.35655 0.74831793,2 2,2 z m 10,0 0,9 c 1.251682,0 2,-0.748318 2,-2 L 14,6 C 14,4.6853974 13.377523,4 12,4 z"/>
+</svg>
diff --git a/app/assets/images/browse/shop_bakery.svg b/app/assets/images/browse/shop_bakery.svg
new file mode 100644
index 00000000000..528daf37be4
--- /dev/null
+++ b/app/assets/images/browse/shop_bakery.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 6.75,3 8.25,7 6.75,7 5.25,3 C 5.25,3 3.494833,3 3.5,3 L 5,7 3.5,7 2.176907,3.5762712 C 1.291044,4.2640693 0,6.1983848 0,8 l 0,2 c 0,0.59322 0.423729,1 1,1 l 12,0 c 0.576271,0 1,-0.423729 1,-1 L 14,8 C 14,5.5355945 12.272623,3.5853602 10,3 L 11.5,7 10,7 8.5,3 c 0,0 -1.743955,0 -1.75,0 z"/>
+</svg>
diff --git a/app/assets/images/browse/shop_beauty.svg b/app/assets/images/browse/shop_beauty.svg
new file mode 100644
index 00000000000..2b998dd514d
--- /dev/null
+++ b/app/assets/images/browse/shop_beauty.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 5,1 C 4,1 3,1.46875 2,2.46875 c -1,1 -2,2 -2,3 0.66666667,0 1.3333333,0.375 2,0.375 1.5237901,0 1.9342025,-1.3092025 3,-2.375 C 5.5389586,3.1175528 5.9898446,2.7619014 7.46875,2.9375 9.0284017,3.2709486 12,4.4600154 14,5.875 12.391103,4.2253627 10.510265,2.4108539 8,1.46875 7,0.9738806 6,1 5,1 Z m 7.34375,5.15625 -4.03125,1.75 C 4.9738455,8.4535704 1.1352801,7.1709309 1.25,7.3125 1.294552,7.367479 1.331618,7.4143303 1.375,7.46875 V 7.5 L 0,11 2.59375,9 3,13 4.96875,9.8125 c 0.1817584,0.031017 0.3580292,0.072019 0.5625,0.09375 L 7,13 8.09375,9.90625 C 8.430848,9.847145 8.7302067,9.734821 9.03125,9.625 L 11,12 11.03125,8.34375 C 11.08839,8.285104 11.133409,8.2170497 11.1875,8.15625 L 14,10 12.125,6.71875 c 0.07989,-0.1809565 0.15928,-0.3770034 0.21875,-0.5625 z"/>
+</svg>
diff --git a/app/assets/images/browse/shop_bed.svg b/app/assets/images/browse/shop_bed.svg
new file mode 100644
index 00000000000..882b104cef7
--- /dev/null
+++ b/app/assets/images/browse/shop_bed.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+	<path d="M13.301,1.531c-0.275,0-0.699,0.21-0.699,0.469v6H0v3h1.4V9.398h11.201V11H14V2C14,1.741,13.576,1.531,13.301,1.531z M0.5,4.6C0.224,4.6,0,4.824,0,5.1V7h11.602V4.6H0.5z"/>
+</svg>
diff --git a/app/assets/images/browse/shop_beverages.svg b/app/assets/images/browse/shop_beverages.svg
new file mode 100644
index 00000000000..66d40d61d42
--- /dev/null
+++ b/app/assets/images/browse/shop_beverages.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 3,0 C 2,0 2,0.50227551 2,2 2,3 0,7 0,8 l 0,5 c 0,0.566252 0.467057,1 1,1 l 4,0 c 0.599561,0 1,-0.400439 1,-1 L 6,8 C 6,7 4,3 4,2 4,0.46896661 4,0 3,0 z m 7.875,1 -1,4 L 11,5 11.75,2 14,2 14,1 z M 7,6 8,13 c 0,0 0,1 1,1 l 2,0 c 1,0 1,-1 1,-1 l 1,-7 z"/>
+</svg>
diff --git a/app/assets/images/browse/shop_bicycle.svg b/app/assets/images/browse/shop_bicycle.svg
new file mode 100644
index 00000000000..f012d77b140
--- /dev/null
+++ b/app/assets/images/browse/shop_bicycle.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 8,1.5 8,2.375 9.25,3.15625 9.25,4.25 5,4.25 5,3.5 l 0.5,0 c 1,0 1,-1 0,-1 l -2,0 c -1,0 -1,1 0,1 L 4,3.5 4,4.25 3.0625,6 C 3.0416,5.9995343 3.02098,6 3,6 1.387717,6 0,7.3877166 0,9 0,10.612283 1.387717,12 3,12 4.612283,12 6,10.612283 6,9 6,8.654031 5.92843,8.313419 5.8125,8 L 6.25,8 C 7,8 7.172746,7.546004 7.4375,7.28125 L 9.21875,5.25 9.75,6.28125 C 8.727462,6.7659158 8,7.824875 8,9 c 0,1.612283 1.387717,3 3,3 1.612283,0 3,-1.387717 3,-3 C 14,7.3877166 12.612283,6 11,6 10.96853,6 10.93754,5.99895 10.90625,6 L 10,4.25 10,2.65625 8,1.5 z m -3.21875,3.75 3.125,0 L 6.34375,7 5.21875,7 C 5.20027,7 5.17516,7.00212 5.15625,7 4.892847,6.7170527 4.599522,6.4803791 4.25,6.3125 4.23775,6.29387 4.22991,6.268546 4.21875,6.25 l 0.5625,-1 z M 3,7 C 4.005711,7 5,7.9942895 5,9 5,10.005711 4.005711,11 3,11 1.994289,11 1,10.005711 1,9 1,7.9942895 1.994289,7 3,7 z m 8,0 c 1.00571,0 2,0.9942895 2,2 0,1.005711 -0.99429,2 -2,2 C 9.994289,11 9,10.005711 9,9 9,7.9942895 9.994289,7 11,7 z"/>
+</svg>
diff --git a/app/assets/images/browse/shop_bookmaker.svg b/app/assets/images/browse/shop_bookmaker.svg
new file mode 100644
index 00000000000..a6ef40b3298
--- /dev/null
+++ b/app/assets/images/browse/shop_bookmaker.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="m0 0v3h.01953c.5707-.0002268.9805.4476.9805 1-3.235e-5.5524-.4293 1-1 1v3h2v-1h-1v-1.283c.5935-.348.9999-.983 1-1.717-.0001081-.7339-.4063-1.369-1-1.717v-1.283h12v1.283c-.5937.3479-.9999.9829-1 1.717 8.3e-5.7436.4024 1.386 1 1.73v1.27h-1v1h2v-3h-.03126c-.5707.000189-.9687-.4476-.9688-1-6e-6-.5524.3804-1 .9512-1 .0076.0006047.01757.00195.01757.00195v-.00195h.03126v-3z" stroke-width="3.78"/>
+  <path d="m7 3c-1.178 0-2.134 1.176-2.134 2.624 0 1.031.4844 1.924 1.189 2.352.2121.1288-.01935.4621-.1751.2461-.3911-.5426-.9616-.8849-1.597-.8849-1.178 0-2.134 1.176-2.134 2.624 0 1.448.9564 2.622 2.134 2.622 1.169 0 2.122-1.156 2.134-2.589.00215-.2542.3194-.2805.3194.06153 0 .5386-.4211 3.399-.6465 3.944.2461-.0763.6562-.1396.9102-.1396.2539 0 .6641.06329.9102.1396-.2255-.5454-.6465-3.406-.6465-3.944 0-.342.3172-.3157.3194-.06153.01232 1.433.9654 2.589 2.134 2.589 1.178 0 2.134-1.174 2.134-2.622 0-1.448-.9564-2.624-2.134-2.624-.6356 0-1.206.3424-1.597.8849-.1557.216-.3872-.1173-.1751-.2461.7048-.4279 1.189-1.32 1.189-2.352 0-1.448-.9564-2.624-2.134-2.624z" stroke-width="3.78"/>
+</svg>
diff --git a/app/assets/images/browse/shop_butcher.svg b/app/assets/images/browse/shop_butcher.svg
new file mode 100644
index 00000000000..3a94fd6026c
--- /dev/null
+++ b/app/assets/images/browse/shop_butcher.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="m 6.2677549,9.8682448 c 0,0 -1.0360627,-1.2128355 -2.1133438,-2.9771358 C 3.2996742,5.4913559 2.50916,3.6476446 2.4367653,3.4517488 3.0202661,3.0282239 5.9979756,1.6895383 6.6016987,1.5583477 6.7772482,2.235353 7.0520765,3.561113 7.6327387,4.8491026 8.232651,6.1798161 8.954803,7.2172665 9.2235836,7.567882 8.5803974,8.1735258 6.2677549,9.8682448 6.2677549,9.8682448 Z M 8.2968156,9.1263796 c 0.074859,0.6201947 2.1684664,3.5038334 2.8763084,4.0268154 0.273219,0.201855 0.464245,0.03715 0.928303,-0.29009 0.464043,-0.327473 0.638743,-0.60634 0.469638,-1.000609 C 12.223974,11.053217 10.705696,8.1477521 9.9928621,7.6821223 9.3070184,6.6855384 8.7323371,5.9320633 8.16718,4.5503441 7.582438,3.1207926 7.2092411,1.6685632 6.9854835,0.81539884 6.189452,1.0459692 4.871228,1.6037032 4.0602279,1.9770739 3.1566447,2.3930138 2.5102595,2.7991241 1.7922277,3.1835628 2.0193494,3.8428438 2.5624001,5.4666657 3.6964956,7.2209042 4.5926052,8.6070352 5.3459785,9.7106614 6.1955245,10.550281 Z M 5.1485567,3.3580966 c 0,-0.3206623 0.2750144,-0.5807989 0.6142623,-0.5807989 0.3392479,0 0.614263,0.2601366 0.614263,0.5807989 0,0.3208944 -0.2750151,0.581031 -0.614263,0.581031 -0.3392479,0 -0.6142623,-0.2601366 -0.6142623,-0.581031 z"/>
+</svg>
diff --git a/app/assets/images/browse/shop_car.svg b/app/assets/images/browse/shop_car.svg
new file mode 100644
index 00000000000..eb7f6d1cfda
--- /dev/null
+++ b/app/assets/images/browse/shop_car.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="m11,11 v2 h2 v-2.0858 a1.5,1.5 0 0 0 1,-1.4142 v-3 a1.5,1.5 0 0 0 -1.5,-1.5 h-0.5 v-2.5 a1.5,1.5 0 0 0 -1.5,-1.5 h-7 a1.5,1.5 0 0 0 -1.5,1.5 v2.5 h-0.5 a1.5,1.5 0 0 0 -1.5,1.5 v3 a1.5,1.5 0 0 0 1,1.4142 v2.0858 h2 v-2 z M3.5,5 v-1.5 a1,1 0 0 1 1,-1 h5 a1,1 0 0 1 1,1 v1.5 z M2.5,6.6 a.9,.9 0 0 1 0,1.8 a.9,.9 0 0 1 0,-1.8 z m9,0 a.9,.9 0 0 1 0,1.8 a.9,.9 0 0 1 0,-1.8 z" />
+</svg>
diff --git a/app/assets/images/browse/shop_car_parts.svg b/app/assets/images/browse/shop_car_parts.svg
new file mode 100644
index 00000000000..5c90cec24a5
--- /dev/null
+++ b/app/assets/images/browse/shop_car_parts.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="m 9,3 0,-2 3,0 0,2 z M 2,3 2,1 5,1 5,3 z M 0,3 0,13 14,13 14,3 z M 3.4455611,5 5,5 l 0,2 2,0 0,1.5778894 -2,0 L 5,10.60134 3.4370847,10.634261 3.4615242,8.5300029 1.3911725,8.5459664 1.4221106,7 3.4295976,7 z M 9,7 13,7 13,8.6108059 9,8.5948424 z"/>
+</svg>
diff --git a/app/assets/images/browse/shop_car_repair.svg b/app/assets/images/browse/shop_car_repair.svg
new file mode 100644
index 00000000000..5f016e88670
--- /dev/null
+++ b/app/assets/images/browse/shop_car_repair.svg
@@ -0,0 +1,37 @@
+<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"
+   width="14"
+   height="14"
+   id="svg3800"
+   version="1.1"
+   viewBox="0 0 14 14">
+  <defs
+     id="defs3802" />
+  <metadata
+     id="metadata3805">
+    <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></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(1.5520395,2.8104498)"
+     id="g97">
+    <g
+       id="g105">
+      <path
+         id="repair-car"
+         transform="translate(-1.5520395,-2.8104498)"
+         d="M 2.7441406 0 C 2.0338764 0.0003935 1.3740289 0.4117078 1 1 L 3.3691406 1 L 3.9921875 2 L 3.3691406 3 L 1.0019531 3 C 1.3756288 3.5877381 2.0345466 3.9989723 2.7441406 4 C 3.5023764 3.9999999 4.1562562 3.595766 4.5117188 3 L 9.1777344 3 C 9.533156 3.5959232 10.188909 4.0000003 10.947266 4 C 12.080957 4.0000002 13 3.1045696 13 2 C 13 0.8954304 12.080957 -2e-007 10.947266 0 C 10.188909 -2.6757065e-007 9.533156 0.40407682 9.1777344 1 L 4.5117188 1 C 4.1562561 0.40423403 3.5023764 6.6882008e-008 2.7441406 0 z M 10.322266 1 L 11.572266 1 L 12.195312 2 L 11.572266 3 L 10.322266 3 L 9.6992188 2 L 10.322266 1 z M 4 6 L 3 9 C 2.527344 9 2 9.384295 2 10 L 2 13 L 3 13 C 3 13 3.0000219 14 4 14 C 4.9999789 14 5 13 5 13 L 9 13 C 9 13 9.0000214 14 10 14 C 10.999979 14 11 13 11 13 L 12 13 L 12 10 C 12 9.479394 11.544563 9 11 9 L 10 6 L 4 6 z M 5 7 L 9 7 L 9.625 9 L 4.375 9 L 5 7 z M 4 10.25 C 4.414205 10.25 4.75 10.585786 4.75 11 C 4.75 11.414214 4.414205 11.75 4 11.75 C 3.585795 11.75 3.25 11.414214 3.25 11 C 3.25 10.585786 3.585795 10.25 4 10.25 z M 10 10.25 C 10.414205 10.25 10.75 10.585786 10.75 11 C 10.75 11.414214 10.414205 11.75 10 11.75 C 9.5857948 11.75 9.25 11.414214 9.25 11 C 9.25 10.585786 9.5857948 10.25 10 10.25 z " />
+    </g>
+  </g>
+</svg>
diff --git a/app/assets/images/browse/shop_carpet.svg b/app/assets/images/browse/shop_carpet.svg
new file mode 100644
index 00000000000..b634332d3d3
--- /dev/null
+++ b/app/assets/images/browse/shop_carpet.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 12 0 C 10.892 0 10 0.892 10 2 L 10 12 C 10 13.108 10.892 14 12 14 C 13.108 14 14 13.108 14 12 L 14 2 C 14 0.892 13.108 0 12 0 z M 0 2 L 0 3 L 1 3 L 1 4.1992188 L 0 4.1992188 L 0 5.1992188 L 1 5.1992188 L 1 6.4003906 L 0 6.4003906 L 0 7.4003906 L 1 7.4003906 L 1 8.5996094 L 0 8.5996094 L 0 9.5996094 L 1 9.5996094 L 1 10.800781 L 0 10.800781 L 0 11.800781 L 1 11.800781 L 1 13 L 0 13 L 0 14 L 9 14 L 9 2 L 0 2 z M 2 3 L 4 4 L 6 3 L 8 4 L 8 5 L 6 4 L 4 5 L 2 4 L 2 3 z M 2 5.6660156 L 4 6.6660156 L 6 5.6660156 L 8 6.6660156 L 8 7.6660156 L 6 6.6660156 L 4 7.6660156 L 2 6.6660156 L 2 5.6660156 z M 2 8.3339844 L 4 9.3339844 L 6 8.3339844 L 8 9.3339844 L 8 10.333984 L 6 9.3339844 L 4 10.333984 L 2 9.3339844 L 2 8.3339844 z M 2 11 L 4 12 L 6 11 L 8 12 L 8 13 L 6 12 L 4 13 L 2 12 L 2 11 z M 12 11 C 12.552285 11 13 11.447715 13 12 C 13 12.552285 12.552285 13 12 13 C 11.447715 13 11 12.552285 11 12 C 11 11.447715 11.447715 11 12 11 z"/>
+</svg>
diff --git a/app/assets/images/browse/shop_charity.svg b/app/assets/images/browse/shop_charity.svg
new file mode 100644
index 00000000000..26de6290688
--- /dev/null
+++ b/app/assets/images/browse/shop_charity.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 5 0 C 4 0 4 0 4 1 L 4.0097656 4 L 1 4 L 1 13 C 1 14 1 14 2 14 L 12 14 C 13 14 13 14 13 13 L 13 4 L 10.039062 4 L 10 1 C 10 0 10 0 9 0 L 5 0 z M 5 1 L 9 1 L 9 4 L 5 4 L 5 1 z M 5.1777344 5.4980469 C 5.6948144 5.4951869 5.8032568 5.5555569 6.1074219 5.7226562 C 6.4776429 5.9260446 6.8587292 6.6814598 6.9375 6.9902344 L 6.9863281 7.1816406 L 7.1054688 6.9179688 C 7.8374226 5.3155896 9.9453218 4.8690109 10.701172 6.6347656 C 10.910591 7.1239934 10.967755 8.1253493 10.755859 8.6972656 C 10.479448 9.4433093 9.9599004 10.013184 8.7597656 10.884766 C 7.9726964 11.456366 7.0815411 12.319938 7.0195312 12.441406 C 6.9475482 12.582409 7.0151826 12.463679 6.6972656 12.107422 C 6.5296439 11.919585 6.1115092 11.554652 5.7675781 11.294922 C 4.7485372 10.525363 4.6110174 10.414187 4.1972656 10.033203 C 3.4344883 9.3308342 3.110218 8.624774 3.1113281 7.6679688 C 3.1118698 7.2008944 3.1426367 7.02141 3.2734375 6.7460938 C 3.4953509 6.2789969 3.8223062 5.9310322 4.2402344 5.71875 C 4.5362383 5.5683985 4.6834278 5.5007797 5.1777344 5.4980469 z"/>
+</svg>
diff --git a/app/assets/images/browse/shop_chemist.svg b/app/assets/images/browse/shop_chemist.svg
new file mode 100644
index 00000000000..315691f33e3
--- /dev/null
+++ b/app/assets/images/browse/shop_chemist.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <rect id="mapnik_workaround" width="14" height="14" fill="none"/>
+  <path d="m 13.515914,13 c 0,-12 0.02345,-10.0477231 0.02345,-12 0,-1 -0.0469,-1 -1.539364,-1 l 0,13.038526 C 12.048052,14.003111 12.000001,14 12.718594,14 c 0.765494,0 0.79732,0 0.79732,-1 z M 2.5075377,11.624791 c 1.9893914,0.633166 3.1278615,0.633166 5.0938024,-0.07035 L 7,4 C 5,4.281407 5,4.3048576 3,4 z M 4.319933,0 5.718593,0 6.2730319,3 c -1,0.3048576 -1.5544389,0.3048576 -2.5544389,0 z m -2.2964824,14 0.2345058,-1 5.4991626,0 0.2579562,1 z m 7.4606365,-14 1.9597989,0 0,0.6097152 -1.9597989,0 z m 0,1 1.9597989,0 0,0.6097152 -1.9597989,0 z m 0,1 1.9597989,0 0,0.6097152 -1.9597989,0 z m 0,1 1.9597989,0 0,0.6097152 -1.9597989,0 z m 0,1 1.9597989,0 0,0.6097152 -1.9597989,0 z"/>
+</svg>
diff --git a/app/assets/images/browse/shop_clothes.svg b/app/assets/images/browse/shop_clothes.svg
new file mode 100644
index 00000000000..ca9862a00f9
--- /dev/null
+++ b/app/assets/images/browse/shop_clothes.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 3,1 0,3 1,6.35 3,5 3,13 11,13 11,5 13,6.35 14,3 11,1 9,1 C 9,2 8,3 7,3 6,3 5,2 5,1 z"/>
+</svg>
diff --git a/app/assets/images/browse/shop_coffee.svg b/app/assets/images/browse/shop_coffee.svg
new file mode 100644
index 00000000000..d79ab3cff5a
--- /dev/null
+++ b/app/assets/images/browse/shop_coffee.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="m 12.384493,0.563045 c 0,0 -0.755812,-0.70671723 -2.001266,-0.5366193 C 9.1377731,0.19652406 5.67408,1.8563585 4.064323,3.2842072 2.4545656,4.7120561 0.24023006,7.0019767 0.09832664,8.5231653 -0.04357662,10.044353 -0.27583032,10.704286 1.4065218,12.384527 c 1.682352,1.68024 5.6574649,0.07602 5.6574649,0.07602 0,0 3.4984663,-1.595396 5.2184953,-4.5534894 1.720029,-2.9580935 1.659359,-4.2103848 1.659359,-4.2103848 0,0 0.238751,-1.0939281 -0.251224,-2.0514304 -0.489975,-0.95750278 -1.190211,-0.86740234 -1.190211,-0.86740234 0,0 -0.856345,0.56083534 -1.51043,1.28160934 C 10.335891,2.7802191 10.347482,2.8016983 10.021522,3.089753 9.6955626,3.377807 9.1935682,3.4883404 8.8190778,3.8351436 8.4445872,4.1819464 7.5293897,6.4431776 5.8447773,7.831436 4.1601647,9.219694 3.2974366,9.5538448 2.8775571,10.014777 2.4576774,10.475711 2.3710167,10.959398 2.0546963,10.868839 1.7383761,10.77828 1.8685889,9.1196905 2.4719773,8.6023301 3.0753657,8.0849698 3.2366672,8.1856306 4.1068688,7.6175314 4.9770706,7.0494326 5.9789286,4.3045137 8.4250892,2.4441751 10.87125,0.58383589 12.384493,0.563045 12.384493,0.563045 Z" />
+</svg>
diff --git a/app/assets/images/browse/shop_computer.svg b/app/assets/images/browse/shop_computer.svg
new file mode 100644
index 00000000000..23ce2566f7a
--- /dev/null
+++ b/app/assets/images/browse/shop_computer.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 3 1 C 2.5154074 1 2 1.5166276 2 2 L 2 8 C 2 8.4833725 2.5166276 9 3 9 L 11 9 C 11.483372 9 12 8.4833725 12 8 L 12 2 C 12 1.5166127 11.483372 1 11 1 L 3 1 z M 3 2 L 11 2 L 11 8 L 3 8 L 3 2 z M 2 10 C 1.7492735 10 1.6780977 10.147712 1.5527344 10.398438 L 0.46484375 13.529297 C 0.27854468 13.779151 0.74927346 14 1 14 L 13 14 C 13.250727 14 13.619365 13.749684 13.535156 13.529297 L 12.416016 10.367188 C 12.290653 10.147801 12.250727 10 12 10 L 2 10 z"/>
+</svg>
diff --git a/app/assets/images/browse/shop_confectionery.svg b/app/assets/images/browse/shop_confectionery.svg
new file mode 100644
index 00000000000..80c04f8001f
--- /dev/null
+++ b/app/assets/images/browse/shop_confectionery.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 0.40106652,7 C 0.38814368,6 2,4 4,4 5,4.0319271 6,5.5872292 7,5.5393387 8,5.6564044 9,3.9946789 10,4 12,4 13.571453,6 13.574494,7 13.265866,7 12.839985,7 12.531357,7 12,6 11,5.4873703 10,5.4455611 9,5.5519845 8,7.0053211 7,7 6,7.0266058 5,5.6085387 4,5.5393635 3,5.5119975 2,6 1.5793983,7 1.2335222,7 0.7469426,7 0.40106652,7 z M 9,2 C 9,3.1045695 8.1045695,4 7,4 5.8954305,4 5,3.1045695 5,2 5,0.8954305 5.8954305,0 7,0 7.9169484,0 8.7164405,0.62354577 8.939772,1.5128812 M 3,13 1,8 C 1.7198259,8.1439652 2.386627,8.8974868 3,9 3.4051047,9.067705 4.6285639,7.9642005 5,8 5.9356113,8.090175 6.2760392,8.9169674 7,9 7.7579429,9.08693 8.0697208,8.192843 9,8 c 0.4492744,-0.093133 1.378386,0.9467524 2,1 0.767967,0.065784 1.251963,-0.8503927 2,-1 l -2,5 c -1,1 -2,1 -4,1 -2,0 -3,0 -4,-1 z"/>
+</svg>
diff --git a/app/assets/images/browse/shop_convenience.svg b/app/assets/images/browse/shop_convenience.svg
new file mode 100644
index 00000000000..ef0f522b8b0
--- /dev/null
+++ b/app/assets/images/browse/shop_convenience.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <rect id="mapnik_workaround" y=".5" width="13" height="13" fill="none"/>
+  <path d="M2,12 11,12 13,5 7.1,5 8.780928,2.473755 A0.497925,0.497925 0 0 0 7.951841,1.922094 L5.9,5 0,5 z M1.55,7 1.25,6 3,6 3,7 z M3.5,7 3.5,6 5,6 5,7 z M5.5,7 5.5,6 7.5,6 7.5,7 z M8,7 8,6 9.5,6 9.5,7 z M10,7 10,6 11.75,6 11.45,7 z M2.15,9 1.7,7.5 3,7.5 3,9 z M3.5,9 3.5,7.5 5,7.5 5,9 z M5.5,9 5.5,7.5 7.5,7.5 7.5,9 z M8,9 8,7.5 9.5,7.5 9.5,9 z M10,9 10,7.5 11.3,7.5 10.85,9 z M2.75,11 2.3,9.5 3,9.5 3,11 z M3.5,11 3.5,9.5 5,9.5 5,11 z M5.5,11 5.5,9.5 7.5,9.5 7.5,11 z M8,11 8,9.5 9.5,9.5 9.5,11 z M10,11 10,9.5 10.7,9.5 10.25,11 z"/>
+</svg>
diff --git a/app/assets/images/browse/shop_copyshop.svg b/app/assets/images/browse/shop_copyshop.svg
new file mode 100644
index 00000000000..6dbd8d7577f
--- /dev/null
+++ b/app/assets/images/browse/shop_copyshop.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 9.03125,-0.03125 1,0 1,10 4,10 4,9 2,9 2,1 l 6,0 0,2 1.03125,0 0,-3.03125 z M 3,2 3,2.5 7,2.5 7,2 3,2 z M 3,3 3,3.5 4,3.5 4,3 3,3 z M 3,4 3,4.5 4,4.5 4,4 3,4 z M 5,4 5,14 13,14 13,7.28125 9.71875,4 5,4 z M 3,5 3,5.5 4,5.5 4,5 3,5 z m 3,0 3,0 0,3 3,0 0,5 -6,0 0,-8 z M 10,5.6875 11.3125,7 10,7 10,5.6875 z M 3,6 3,6.5 4,6.5 4,6 3,6 z M 7,6 7,6.5 8,6.5 8,6 7,6 z M 3,7 3,7.5 4,7.5 4,7 3,7 z M 7,7 7,7.5 8,7.5 8,7 7,7 z M 7,8 7,8.5 8,8.5 8,8 7,8 z m 0,1 0,0.5 4,0 L 11,9 7,9 z m 0,1 0,0.5 4,0 0,-0.5 -4,0 z m 0,1 0,0.5 4,0 0,-0.5 -4,0 z"/>
+</svg>
diff --git a/app/assets/images/browse/shop_dairy.svg b/app/assets/images/browse/shop_dairy.svg
new file mode 100644
index 00000000000..ffea5f72ead
--- /dev/null
+++ b/app/assets/images/browse/shop_dairy.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 1.296875,0 C 1.1185507,0 0.97265625,0.14597801 0.97265625,0.32421875 V 2.6484375 L 0.03320312,4.7871094 C 0.01699212,4.8357204 0,4.8674044 0,4.9160156 V 13.675781 C 0,13.854022 0.14589435,14 0.32421875,14 H 14 V 8.2441406 H 7.5039062 c 9.973e-4,-1.1089434 0.00195,-2.2182945 0.00195,-3.328125 0,-0.048611 -0.015039,-0.096499 -0.03125,-0.1289062 L 6.5332031,2.6484375 V 0.32421875 C 6.5332031,0.14597801 6.3873087,0 6.2089844,0 Z M 1.6210938,0.6640625 H 5.8847656 V 2.5664062 H 1.6210938 Z M 1.5722656,2.890625 h 4.3457032 l 0.015625,0.033203 c -0.3011572,0.6819043 -0.6144176,1.379414 -0.875,1.9589844 V 8.2441406 H 3.4316406 V 13.339844 H 0.65625 C 0.64061686,10.582371 0.648437,7.7724441 0.648437,4.9960938 Z m 4.5390625,0.4375 0.7304688,1.6679688 V 8.2441406 H 5.3808594 V 4.9550781 c 6.682e-4,-0.00142 0.00129,-0.00447 0.00195,-0.00586 z M 5.3085938,9.0800781 C 5.8344157,9.080702 6.2602203,9.507381 6.2597656,10.033203 6.2602203,10.559025 5.8344157,10.985704 5.3085938,10.986328 4.782009,10.986783 4.3550136,10.559788 4.3554688,10.033203 4.3550137,9.5066182 4.782009,9.0796229 5.3085938,9.0800781 Z m 6.4179682,0.4082031 c 0.71825,3.653e-4 1.300416,0.5825308 1.300782,1.3007808 -3.65e-4,0.718251 -0.582531,1.300417 -1.300782,1.300782 -0.719013,7.13e-4 -1.302369,-0.581769 -1.302734,-1.300782 3.66e-4,-0.719013 0.583722,-1.3014935 1.302734,-1.3007808 z M 8.0976562,11.021484 c 0.608407,-7.4e-5 1.1016368,0.493156 1.1015626,1.101563 7.36e-5,0.608407 -0.493156,1.101636 -1.1015626,1.101562 -0.6084065,7.4e-5 -1.101636,-0.493155 -1.1015624,-1.101562 -7.42e-5,-0.608407 0.4931555,-1.101637 1.1015624,-1.101563 z"/>
+</svg>
diff --git a/app/assets/images/browse/shop_deli.svg b/app/assets/images/browse/shop_deli.svg
new file mode 100644
index 00000000000..e0cc4d48a47
--- /dev/null
+++ b/app/assets/images/browse/shop_deli.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+ <path d="m6 0h2c2 0 3 0 3 1v1h-8v-1c0-1 1-1 3-1zm-2 3c-1e-7 2-2.0219 1-2.0156 3l0.015625 5c0.00312 1 1 3 3 3h4c2 0 3-2 3-3v-5c0-2-2-1-2-3zm6 4v3h-6v-3z"/>
+</svg>
diff --git a/app/assets/images/browse/shop_department_store.svg b/app/assets/images/browse/shop_department_store.svg
new file mode 100644
index 00000000000..ad5a475ca6e
--- /dev/null
+++ b/app/assets/images/browse/shop_department_store.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 5 0 C 4 0 4 0 4 1 L 4.0097656 4 L 1 4 L 1 13 C 1 14 1 14 2 14 L 12 14 C 13 14 13 14 13 13 L 13 4 L 10.039062 4 L 10 1 C 10 0 10 0 9 0 L 5 0 z M 5 1 L 9 1 L 9 4 L 5 4 L 5 1 z M 6.5683594 5.5 C 7.3324736 5.5 7.8930989 5.6496197 8.2519531 5.9453125 C 8.6108082 6.2410052 8.7890625 6.5950746 8.7890625 7.0078125 C 8.7890625 7.2388225 8.7363691 7.4593457 8.625 7.671875 C 8.5167249 7.8844042 8.3851479 8.0570074 8.2304688 8.1894531 C 8.0757896 8.321899 7.799462 8.5194386 7.4003906 8.78125 C 7.731404 9.1108243 8.0747386 9.4177996 8.4335938 9.7011719 C 8.5294954 9.5102039 8.6116295 9.3082323 8.6796875 9.0957031 L 10.154297 9.421875 C 10.076958 9.6929269 10.002795 9.9109708 9.9316406 10.074219 C 9.8604887 10.237466 9.7607896 10.430574 9.6308594 10.652344 L 10.339844 11.136719 C 10.426468 11.192163 10.539663 11.258938 10.675781 11.335938 L 9.6582031 12.5 C 9.4725884 12.401436 9.2792081 12.287569 9.078125 12.158203 C 8.8801358 12.028837 8.7026949 11.916629 8.5449219 11.824219 C 8.2170034 12.039828 7.8884653 12.198315 7.5605469 12.296875 C 7.1057911 12.432408 6.5902182 12.5 6.0117188 12.5 C 5.105301 12.5 4.4306627 12.311325 3.9882812 11.935547 C 3.5458997 11.559771 3.3242188 11.104303 3.3242188 10.568359 C 3.3242187 10.183343 3.4549833 9.8204104 3.7148438 9.4785156 C 3.9747044 9.1335408 4.3993605 8.842639 4.9902344 8.6054688 C 4.7427483 8.3066957 4.5732757 8.0487676 4.4804688 7.8300781 C 4.3876628 7.6083084 4.3417969 7.3822268 4.3417969 7.1542969 C 4.3417969 6.6737961 4.5244424 6.2798435 4.8925781 5.96875 C 5.2607138 5.6576564 5.8197136 5.5000001 6.5683594 5.5 z M 6.6464844 6.515625 C 6.4546827 6.515625 6.2983841 6.5727088 6.1777344 6.6835938 C 6.0570852 6.7944786 5.9980469 6.9252454 5.9980469 7.0761719 C 5.9980469 7.2671402 6.1675197 7.5447474 6.5078125 7.9082031 C 6.7522057 7.7757575 6.9411942 7.6325223 7.0742188 7.4785156 C 7.2072429 7.3214287 7.2734375 7.1718092 7.2734375 7.0332031 C 7.2734375 6.8884368 7.2187922 6.7684859 7.1074219 6.6699219 C 6.9960531 6.5682783 6.8413799 6.515625 6.6464844 6.515625 z M 5.8339844 9.5527344 C 5.5741249 9.7344624 5.4030262 9.8901663 5.3164062 10.019531 C 5.2328775 10.148897 5.1894531 10.284921 5.1894531 10.429688 C 5.1894531 10.654536 5.2875274 10.855682 5.4824219 11.03125 C 5.6773172 11.206818 5.9316895 11.294922 6.2441406 11.294922 C 6.5813408 11.294922 6.960133 11.162203 7.3808594 10.900391 C 6.9786942 10.592379 6.4619816 10.14412 5.8339844 9.5527344 z"/>
+</svg>
diff --git a/app/assets/images/browse/shop_diy.svg b/app/assets/images/browse/shop_diy.svg
new file mode 100644
index 00000000000..239d3cabc2f
--- /dev/null
+++ b/app/assets/images/browse/shop_diy.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 9,0 C 8.248808,0.4909181 7.75,1.3481516 7.75,2.3125 c 0,1.0641992 0.615654,1.9803063 1.5,2.4375 l 0,7.75 c 0,0.877754 0.521186,1.5 1.25,1.5 0.728813,0 1.25,-0.603432 1.25,-1.5 l 0,-7.75 C 12.634346,4.2928063 13.25,3.3766992 13.25,2.3125 13.25,1.3481516 12.751192,0.4909181 12,0 L 12,1.5 10.5,3 9,1.5 C 9,1.5 9,-0.0023227 9,0 z M 4,0 C 3.447507,0 3,0.3804513 3,0.75 l -1.5,0 -1.25,1.75 1.25,1.75 1.5,0 0,8.5 C 3,13.434896 3.376848,14 4,14 4.623152,14 5,13.471763 5,12.75 l 0,-8.5 2,0 0,-3.5 -2,0 C 5,0.3724769 4.623152,0 4,0 z m 6.5,12 C 10.776142,12 11,12.223858 11,12.5 11,12.776142 10.776142,13 10.5,13 10.223857,13 10,12.776142 10,12.5 10,12.223858 10.223857,12 10.5,12 z"/>
+</svg>
diff --git a/app/assets/images/browse/shop_electronics.svg b/app/assets/images/browse/shop_electronics.svg
new file mode 100644
index 00000000000..e54974d61e9
--- /dev/null
+++ b/app/assets/images/browse/shop_electronics.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 9.375,0.03125 C 9.228609,0.0143576 9.069653,0.0553473 8.9375,0.1875 L 6.03125,3.125 4.125,1.1875 C 3.913054,0.9017344 3.437513,0.8725487 3.1875,1.125 2.937487,1.3774513 2.966994,1.8484875 3.25,2.0625 L 5.15625,4 2,4 C 1,4 0,5 0,6 l 0,6 c 0,1 1,2 2,2 l 10,0 c 1,0 2,-1 2,-2 L 14,6 C 14,5 13,4 12,4 L 6.90625,4 9.8125,1.0625 C 10.20002,0.6749802 9.814172,0.0819271 9.375,0.03125 z M 6,6 c 3,0 4,0 4,3 0,3 -1,3 -4,3 C 3,12 2,12 2,9 2,6 3,6 6,6 z m 6,0.125 c 0.483249,0 0.875,0.3917508 0.875,0.875 0,0.4832492 -0.391751,0.875 -0.875,0.875 -0.483249,0 -0.875,-0.3917508 -0.875,-0.875 0,-0.4832492 0.391751,-0.875 0.875,-0.875 z m 0,3 c 0.483249,0 0.875,0.391751 0.875,0.875 0,0.483249 -0.391751,0.875 -0.875,0.875 -0.483249,0 -0.875,-0.391751 -0.875,-0.875 0,-0.483249 0.391751,-0.875 0.875,-0.875 z"/>
+</svg>
diff --git a/app/assets/images/browse/shop_fabric.svg b/app/assets/images/browse/shop_fabric.svg
new file mode 100644
index 00000000000..1c759325878
--- /dev/null
+++ b/app/assets/images/browse/shop_fabric.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 2,0 V 1 H 3 V 0 Z M 5,0 C 5,1.3333333 5,2.6666667 5,4 H 6 C 6,2.6666667 6,1.3333333 6,0 Z M 8,0 V 1 H 9 V 0 Z m 3,0 c 0,1.3333333 0,2.6666667 0,4 h 1 C 12,2.6666667 12,1.3333333 12,0 Z M 0,2 V 3 C 1.3333333,3 2.6666667,3 4,3 V 2 C 2.6666667,2 1.3333333,2 0,2 Z m 7,0 v 1 c 1,0 2,0 3,0 V 2 C 9,2 8,2 7,2 Z m 6,0 v 1 h 1 V 2 Z M 2,4 C 2,5.3333333 2,6.6666667 2,8 H 3 C 3,6.6666667 3,5.3333333 3,4 Z M 8,4 C 8,5.3333333 8,6.6666667 8,8 H 9 C 9,6.6666667 9,5.3333333 9,4 Z M 0,5 V 6 H 1 V 5 Z M 4,5 V 6 C 5,6 6,6 7,6 V 5 C 6,5 5,5 4,5 Z m 6,0 v 1 c 1.333333,0 2.666667,0 4,0 V 5 C 12.666667,5 11.333333,5 10,5 Z M 5,7 V 8 H 6 V 7 Z m 6,0 v 1 h 1 V 7 Z M 1.5,9 C 0.669,9 0,9.669 0,10.5 v 2 c 0,0.831 0.669,1.5 1.5,1.5 4,0 8,0 12,0 0.277,0 0.5,-0.223 0.5,-0.5 0,-0.277 -0.223,-0.5 -0.5,-0.5 -4,0 -8,0 -12,0 C 1.223,13 1,12.777 1,12.5 v -2 C 1,10.223 1.223,10 1.5,10 h 9 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 H 2 v 1 c 2.8333333,0 5.6666667,0 8.5,0 C 11.331,12 12,11.331 12,10.5 12,9.669 11.331,9 10.5,9 Z"/>
+</svg>
diff --git a/app/assets/images/browse/shop_florist.svg b/app/assets/images/browse/shop_florist.svg
new file mode 100644
index 00000000000..0cc80e3c9e6
--- /dev/null
+++ b/app/assets/images/browse/shop_florist.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 3,0 C 3.944406,2.8332196 2.233819,6.4334035 6.25,6.938 l 0,5.562 C 6.25,11.033993 3.997226,8 1,8 c 3,2 1,6 5,6 2,0 0,0 2,0 4,0 2,-4 5,-6 -2.997226,0 -5.25,2.944994 -5.25,4.5 l 0,-5.562 C 11.753428,6.4504075 10.055593,2.8332196 11,0 10,0 8.75,3 8.75,3 8.75,3 8,1 7,0 6,1 5.25,3 5.25,3 5.25,3 4,0 3,0 z"/>
+</svg>
diff --git a/app/assets/images/browse/shop_furniture.svg b/app/assets/images/browse/shop_furniture.svg
new file mode 100644
index 00000000000..bae89f35a37
--- /dev/null
+++ b/app/assets/images/browse/shop_furniture.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 3,2 C 2,2 1,3 1,4 3,4 4,5.5760463 4,7 l 6,0 C 10,5.4818344 11,4 13,4 13,3 12,2 11,2 z M 1,5 C 0,5 0,6 0,6 0,6.5181656 0.481834,7 1,7 l 0,3 c 0,0.645252 0.423351,1 1,1 l 0.5,0 c 0,0 0,1 1,1 1,0 1,-1 1,-1 l 5,0 c 0,0 0,1 1,1 1,0 1,-1 1,-1 l 0.5,0 c 0.509491,0 1,-0.48425 1,-1 l 0,-3 c 0.494613,0 1,-0.3876224 1,-1 0,0 0,-1 -1,-1 -1,0 -2,1 -2,3 L 3,8 C 3,6 2,5 1,5 z"/>
+</svg>
diff --git a/app/assets/images/browse/shop_garden_centre.svg b/app/assets/images/browse/shop_garden_centre.svg
new file mode 100644
index 00000000000..948cd85290b
--- /dev/null
+++ b/app/assets/images/browse/shop_garden_centre.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 10,1 C 8.001165,0.9317471 5.5133754,2.3911196 6,6 L 6.7504188,9 3.5393635,7 3.494936,5 2.6951424,4 C 2,4 0,6.3539922 0,7.2495812 L 1.3059259,8 3,7.7035176 8,14 c 1.5857062,0 2.836405,0 4.422111,0 L 14,6 C 14,1 10.686767,1.0234505 10,1 z m 0,1.39866 C 12,2.417906 13,4 12.530988,6 L 7.5159129,6 C 7,4 7.4606365,2.39866 10,2.39866 z"/>
+</svg>
diff --git a/app/assets/images/browse/shop_gift.svg b/app/assets/images/browse/shop_gift.svg
new file mode 100644
index 00000000000..b4450b056db
--- /dev/null
+++ b/app/assets/images/browse/shop_gift.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 4.375,0.5 C 3.5,0.5 2.625,1.1125001 2.625,2.25 2.625,3.386625 3.144625,4 4.28125,4 l 2.5625,0 0.25,0 2.5625,0 C 10.792,4 11.375,3.4169999 11.375,2.28125 11.374125,1.14375 10.499999,0.5 9.625,0.5 8.2985,0.5 7.333375,1.3032501 7,2.46875 6.66575,1.3032501 5.730375,0.5 4.375,0.5 z m 0,0.875 c 1.416625,0 1.656375,1.120875 1.75,1.75 l -1.75,0 C 3.455375,3.125 3.5,2.287625 3.5,2.25 3.5,2.212375 3.45538,1.375 4.375,1.375 z m 5.25,0 c 0.874999,0 0.875,0.837375 0.875,0.875 0,0.037625 0.04462,0.875 -0.875,0.875 l -1.75,0 C 7.96863,2.495875 8.206625,1.375 9.625,1.375 z M 4,5 C 3,5 2,6 2,7 l 0,1.75 4.25,0 L 6.25,5 4,5 z m 3.75,0 0,3.75 4.25,0 L 12,7 C 12,6 11,5 10,5 L 7.75,5 z M 2,10.25 2,12 c 0,1 1,2 2,2 l 2.25,0 0,-3.75 -4.25,0 z m 5.75,0 0,3.75 2.25,0 c 1,0 2,-1 2,-2 l 0,-1.75 -4.25,0 z"/>
+</svg>
diff --git a/app/assets/images/browse/shop_greengrocer.svg b/app/assets/images/browse/shop_greengrocer.svg
new file mode 100644
index 00000000000..585a8952962
--- /dev/null
+++ b/app/assets/images/browse/shop_greengrocer.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 7.6811441,0.3845339 C 7.1074871,0.9581909 6.6438573,1.7807134 6.5,2.5 6.4213803,2.8930985 6.38606,3.8255659 6.375,4.281125 6.5830531,4.4032096 6.7911853,4.499514 7,4.656125 7.2211442,4.4902669 7.4360105,4.3770848 7.65625,4.249875 7.6737853,3.8551732 7.6944029,3.0279856 7.75,2.75 7.8561427,2.2192866 8.1298011,1.6858769 8.5561441,1.2595339 z M 0.5,1 C 1.0359156,3 3.3537505,4 5.5,3 4.5967177,1 3,0.36207008 0.5,1 z M 2,5.25 C 1.3855932,5.8940678 1,7 1,8 c 0,2 2,5.5 4,5.5 0.5635593,0 1,-0.25 2,-0.75 1,0.5 1.4364407,0.75 2,0.75 2,0 4,-3.5 4,-5.5 C 13,7 12.673729,5.8940678 12,5.25 10.977751,4.2727555 9,4.24975 7,5.74975 5,4.3360985 3,4.1445974 2,5.25 z"/>
+</svg>
diff --git a/app/assets/images/browse/shop_hairdresser.svg b/app/assets/images/browse/shop_hairdresser.svg
new file mode 100644
index 00000000000..376bba6b52f
--- /dev/null
+++ b/app/assets/images/browse/shop_hairdresser.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 4,0 4,9.53125 C 3.580263,9.212414 3.064535,9 2.5,9 1.12521,9 0,10.12521 0,11.5 0,12.87479 1.12521,14 2.5,14 3.702941,14 4.703332,13.136374 4.9375,12 l 0.125,0 C 5.296668,13.136374 6.297059,14 7.5,14 8.87479,14 10,12.87479 10,11.5 10,10.12521 8.87479,9 7.5,9 6.935465,9 6.419737,9.212414 6,9.53125 L 6,0 z m 4,0 0,2 4,0 0,1 -4,0 0,1 4,0 0,1 -4,0 0,1 4,0 0,1 -4,0 0,1 4,0 0,6 2,0 0,-12 C 14,1 13,0 12,0 z M 2.5,10 C 3.334349,10 4,10.665651 4,11.5 4,12.334349 3.334349,13 2.5,13 1.665651,13 1,12.334349 1,11.5 1,10.665651 1.665651,10 2.5,10 z m 5,0 C 8.334349,10 9,10.665651 9,11.5 9,12.334349 8.334349,13 7.5,13 6.665651,13 6,12.334349 6,11.5 6,10.665651 6.665651,10 7.5,10 z"/>
+</svg>
diff --git a/app/assets/images/browse/shop_hearing_aids.svg b/app/assets/images/browse/shop_hearing_aids.svg
new file mode 100644
index 00000000000..12b6db7550d
--- /dev/null
+++ b/app/assets/images/browse/shop_hearing_aids.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="m4.58513,2.8263c1.46072,-0.10333 3.13452,1.23444 3.63246,2.94008c0.49794,1.70564 -0.04394,3.40863 -0.66342,4.27188c-0.61948,0.86325 -1.33674,0.77076 -1.94384,1.21188c-0.60709,0.44112 -0.53931,1.8297 -1.50273,2.36063c-0.96343,0.53093 -2.82327,0.24927 -2.42665,-1.47846c0.39662,-1.72773 0.63357,-2.3001 -0.76858,-2.96611l0.51491,-0.72984c1.43113,0.08965 1.44162,0.87832 1.71334,1.57934c0.27172,0.70101 0.36715,1.51445 0.98562,1.051c0.30924,-0.23173 0.32183,-0.74699 0.63097,-0.96843c0.30914,-0.22143 0.91483,-0.14903 1.20458,-0.25906c0.57949,-0.22006 0.84928,-1.23319 0.6778,-3.40324c-0.17148,-2.17005 -1.62807,-2.25618 -2.39611,-2.20584c-0.76804,0.05034 -0.63737,0.58252 -1.4715,1.18749l-0.40457,-0.99381c0.9105,-0.69673 0.75702,-1.49416 2.21773,-1.59749l0,-0.00001l-0.00001,-0.00001z M4.34019,9.30065c-0.91236,0 -1.65137,-0.73901 -1.65137,-1.65137c0,-0.91236 0.73901,-1.65137 1.65137,-1.65137c0.91236,0 1.65137,0.73901 1.65137,1.65137c0,0.91236 -0.73901,1.65137 -1.65137,1.65137z M12.57809,0.02714c-1.7687,0.80156 -2.99609,2.63198 -2.99609,4.73828c0,2.1063 1.22749,3.96022 2.99609,4.76172l0,-1.22461c-1.1965,-0.7105 -1.96484,-2.07868 -1.96484,-3.60938c0,-1.5306 0.76829,-2.72504 1.96484,-3.43554l0,-1.23047z M13.49371,1.90885c-1.158,0.42876 -2,1.54921 -2,2.88281c0,1.3337 0.84197,2.46573 2,2.89453l0,-1.14453c-0.5974,-0.35456 -0.92773,-1.02046 -0.92773,-1.78516c0,-0.76479 0.33033,-1.34081 0.92773,-1.69531l0,-1.15234z M9.36082,0.55115l-0.96154,2.37629l-4.84258,-0.8755c-1.08525,0.31007 -1.84219,1.08525 -1.83307,2.16138c0.07296,1.04877 0.61102,1.74187 1.31324,2.62649l-0.30095,0.95757c-1.25852,-1.21293 -1.86043,-2.50793 -1.77835,-3.83029c0.20975,-1.58684 1.15821,-2.0793 2.43497,-2.70856l0.38303,-1.01229" />
+</svg>
diff --git a/app/assets/images/browse/shop_hifi.svg b/app/assets/images/browse/shop_hifi.svg
new file mode 100644
index 00000000000..ab2032e75ff
--- /dev/null
+++ b/app/assets/images/browse/shop_hifi.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="m 8.5118375,9.5349493 a 1.5,1.5 0 0 1 -1.5,1.4999997 1.5,1.5 0 0 1 -1.5,-1.4999997 1.5,1.5 0 0 1 1.5,-1.5 1.5,1.5 0 0 1 1.5,1.5 z M 2,0 2,14 12,14 12,0 2,0 Z m 5.0703125,0.96875 c 1.1045695,0 2,0.8954305 2,2 0,1.1045695 -0.8954305,2 -2,2 -1.1045695,0 -2,-0.8954305 -2,-2 0,-1.1045695 0.8954305,-2 2,-2 z m -0.060547,5.0195312 a 3.5,3.5 0 0 1 3.5000004,3.5 3.5,3.5 0 0 1 -3.5000004,3.4999998 3.5,3.5 0 0 1 -3.5,-3.4999998 3.5,3.5 0 0 1 3.5,-3.5 z"/>
+</svg>
diff --git a/app/assets/images/browse/shop_houseware.svg b/app/assets/images/browse/shop_houseware.svg
new file mode 100644
index 00000000000..f5b837ab227
--- /dev/null
+++ b/app/assets/images/browse/shop_houseware.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <rect id="mapnik_workaround" width="14" height="14" fill="none"/>
+  <path d="M10,3H4.827C4.522,3.721,3.589,4.25,2.471,4.25C1.106,4.25,0,3.466,0,2.5s1.106-1.75,2.471-1.75 c1.118,0,2.051,0.529,2.355,1.25H10V3z M1,8.402V12c0,1.104,0.896,2,2,2h4c1.104,0,2-0.896,2-2V8.402H1z M10,8V7H7 c0-0.551-0.447-1-1-1H4C3.447,6,3,6.449,3,7H0v1H10z M12,14v-3h1.5c0-4.021-0.5-8-2.5-10v13H12z"/>
+</svg>
diff --git a/app/assets/images/browse/shop_interior_decoration.svg b/app/assets/images/browse/shop_interior_decoration.svg
new file mode 100644
index 00000000000..d31b5d1bc47
--- /dev/null
+++ b/app/assets/images/browse/shop_interior_decoration.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 1.3066406 0 L 0 4.8125 L 2.8613281 4.8125 L 2.8613281 12.878906 L 1.515625 12.878906 L 1.515625 14 L 5.3300781 14 L 5.3300781 12.878906 L 3.984375 12.878906 L 3.984375 4.8125 L 6.8457031 4.8125 L 5.5273438 0 L 1.3066406 0 z M 11.246094 0.54296875 A 1.1890712 1.1890712 0 0 0 10.105469 1.4023438 A 1.1890712 1.1890712 0 0 0 9.8222656 1.3671875 A 1.1890712 1.1890712 0 0 0 8.6328125 2.5566406 A 1.1890712 1.1890712 0 0 0 9.1152344 3.5097656 A 1.1890712 1.1890712 0 0 0 8.6328125 4.4648438 A 1.1890712 1.1890712 0 0 0 9.8222656 5.6542969 A 1.1890712 1.1890712 0 0 0 10.121094 5.6152344 A 1.1890712 1.1890712 0 0 0 10.837891 6.3554688 L 10.837891 8.65625 L 8.5429688 8.65625 L 9.5957031 14 L 12.958984 14 L 14 8.65625 L 11.650391 8.65625 L 11.650391 6.3574219 A 1.1890712 1.1890712 0 0 0 12.408203 5.4941406 A 1.1890712 1.1890712 0 0 0 12.810547 5.5683594 A 1.1890712 1.1890712 0 0 0 14 4.3789062 A 1.1890712 1.1890712 0 0 0 13.625 3.515625 A 1.1890712 1.1890712 0 0 0 14 2.6503906 A 1.1890712 1.1890712 0 0 0 12.810547 1.4609375 A 1.1890712 1.1890712 0 0 0 12.417969 1.53125 A 1.1890712 1.1890712 0 0 0 11.246094 0.54296875 z M 11.316406 2.6015625 A 0.88447553 0.88447553 0 0 1 12.201172 3.4863281 A 0.88447553 0.88447553 0 0 1 11.316406 4.3710938 A 0.88447553 0.88447553 0 0 1 10.431641 3.4863281 A 0.88447553 0.88447553 0 0 1 11.316406 2.6015625 z"/>
+</svg>
diff --git a/app/assets/images/browse/shop_jewelry.svg b/app/assets/images/browse/shop_jewelry.svg
new file mode 100644
index 00000000000..c5f94b0ddd3
--- /dev/null
+++ b/app/assets/images/browse/shop_jewelry.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="m 5.5001761,-0.03125 -1.5000755,2 6.0003024,0 -1.500076,-2 -3.0001509,0 z m -1.5000755,3 3.000151,2.75 3.0001514,-2.75 -6.0003024,0 z m -0.1250063,2.125 C 2.7594552,6.0221898 2,7.4228958 2,8.96875 2,11.716935 4.3397727,14 6.969,14 9.598227,14 11.938,11.716935 11.938,8.96875 11.938,7.4345438 11.195755,6.0534671 10.094157,5.125 L 8.9691006,6.15625 c 0.9205844,0.6728387 1.5625784,1.7640005 1.5625784,2.8125 0,1.711475 -1.7320219,3.46875 -3.562679,3.46875 -1.8306571,0 -3.5314277,-1.757275 -3.5314277,-3.46875 0,-1.0559982 0.6627104,-2.1406148 1.5938302,-2.8125 L 3.8750943,5.09375 z"/>
+</svg>
diff --git a/app/assets/images/browse/shop_laundry.svg b/app/assets/images/browse/shop_laundry.svg
new file mode 100644
index 00000000000..11ce2675722
--- /dev/null
+++ b/app/assets/images/browse/shop_laundry.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 9.5,8.5 C 9.5,9.8807119 8.380712,11 7,11 5.619509,11 4.500312,9.8810564 4.5,8.5005654 M 1,0 1,14 13,14 13,0 1,0 Z M 3,1 8,1 8,3 3,3 3,1 Z m 7,0 2,0 0,2 -2,0 0,-2 z M 7,5 c 1.60466,0 3.01542,1.0999131 3.40625,2.65625 L 10.5,8.5 C 10.5,10.432997 8.932997,12 7,12 5.067003,12 3.5,10.432997 3.5,8.5 3.5,6.5670034 5.067003,5 7,5 Z"/>
+</svg>
diff --git a/app/assets/images/browse/shop_marketplace.svg b/app/assets/images/browse/shop_marketplace.svg
new file mode 100644
index 00000000000..1dbd86e56dc
--- /dev/null
+++ b/app/assets/images/browse/shop_marketplace.svg
@@ -0,0 +1,3 @@
+<svg version="1.1" width="14" height="14" viewBox="0 0 14 14" xmlns="http://www.w3.org/2000/svg">
+  <path d="m0 0v1 1a2 2 0 0 0 2 2 2 2 0 0 0 2-2h1a2 2 0 0 0 2 2 2 2 0 0 0 2-2h1a2 2 0 0 0 2 2 2 2 0 0 0 2-2v-1-1h-2-12z m0 5v4 2 3h2v-3h10v3h2v-3-2-4h-2v4h-10v-4h-2z"/>
+</svg>
diff --git a/app/assets/images/browse/shop_massage.svg b/app/assets/images/browse/shop_massage.svg
new file mode 100644
index 00000000000..3533e5b89eb
--- /dev/null
+++ b/app/assets/images/browse/shop_massage.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+ <path d="M 5.5449219 1 A 1.5 1.5 0 0 0 4.0449219 2.5 A 1.5 1.5 0 0 0 5.5449219 4 A 1.5 1.5 0 0 0 7.0449219 2.5 A 1.5 1.5 0 0 0 5.5449219 1 z M 4.3300781 4.5097656 C 3.9406791 4.5609641 3.5894805 4.8289578 3.4570312 5.2148438 L 2.1582031 9 L 4.2265625 9 L 5.1738281 6.2421875 L 6.1914062 7.2890625 C 6.2070166 7.3051225 6.2270579 7.3126522 6.2441406 7.3261719 C 6.261156 7.3411298 6.2816192 7.3506327 6.3007812 7.3632812 C 6.330583 7.3808944 6.3585151 7.399261 6.390625 7.4101562 C 6.4071604 7.416766 6.4199583 7.4286562 6.4375 7.4335938 L 8.3613281 7.9746094 C 8.6279666 8.0496622 8.9034628 7.8955447 8.9785156 7.6289062 C 9.0535685 7.3622678 8.899451 7.0887247 8.6328125 7.0136719 L 6.8242188 6.5039062 L 5.1660156 4.7988281 C 5.154409 4.7868872 5.1393915 4.7820212 5.1269531 4.7714844 C 5.0172038 4.665986 4.8878893 4.5779543 4.7246094 4.5351562 C 4.5930588 4.5006749 4.4598778 4.4926995 4.3300781 4.5097656 z M 11.5 8 A 1.5 1.5 0 0 0 10 9.5 A 1.5 1.5 0 0 0 11.5 11 A 1.5 1.5 0 0 0 13 9.5 A 1.5 1.5 0 0 0 11.5 8 z M 1 10 C 0.446 10 0 10.446 0 11 C 0 11.554 0.446 12 1 12 L 5.5390625 12 L 7 12 L 9.1953125 12 L 11.253906 12.949219 C 11.320888 12.980138 11.391036 12.992352 11.458984 12.992188 C 11.473179 12.993388 11.485484 13 11.5 13 L 13.5 13 C 13.777 13 14 12.777 14 12.5 C 14 12.223 13.777 12 13.5 12 L 11.560547 12 L 7.34375 10.052734 C 7.2612144 10.014635 7.1762784 10.011013 7.09375 10.019531 C 7.0613102 10.016383 7.0332933 10 7 10 L 3.8828125 10 L 1.8144531 10 L 1 10 z"/>
+</svg>
diff --git a/app/assets/images/browse/shop_medical_supply.svg b/app/assets/images/browse/shop_medical_supply.svg
new file mode 100644
index 00000000000..7abf1a2c739
--- /dev/null
+++ b/app/assets/images/browse/shop_medical_supply.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 13.819407,1.9040845e-7 10.474988,0.24220688 v 0.006858 l -0.0092,-0.002289 L 9.9343609,4.6453386 H 4.6153841 V 6.0620208 H 6.9518954 A 4.232613,4.2103869 0 0 0 4.9818957,8.2441653 H 2.0429309 v 0.052555 L 1.4244427,10.350905 A 1.8668557,1.8570526 0 0 0 0.04773353,12.14232 1.8668557,1.8570526 0 0 0 1.9146519,14 1.8668557,1.8570526 0 0 0 3.7815703,12.14232 1.8668557,1.8570526 0 0 0 2.8538379,10.540559 L 2.9752447,10.133834 H 4.6978492 A 4.232613,4.2103869 0 0 0 8.9150232,14 4.232613,4.2103869 0 0 0 13.148232,9.7888039 4.232613,4.2103869 0 0 0 11.615755,6.5510039 L 12.222791,1.5354988 13.952267,1.4098255 Z M 8.9425117,7.2387792 A 2.6226422,2.6160828 0 0 1 11.56536,9.8550673 2.6226422,2.6160828 0 0 1 8.9425117,12.471356 2.6226422,2.6160828 0 0 1 6.3196629,9.8550673 2.6226422,2.6160828 0 0 1 8.9425117,7.2387792 Z"/>
+</svg>
diff --git a/app/assets/images/browse/shop_mobile_phone.svg b/app/assets/images/browse/shop_mobile_phone.svg
new file mode 100644
index 00000000000..f09cd84e13a
--- /dev/null
+++ b/app/assets/images/browse/shop_mobile_phone.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 6,0 C 5.517164,0 5,0.3876224 5,1 L 5,2 C 3.8815,2.0818 3,2.90528 3,4 l 0,8 c 0,1.1488 0.803333,2 2,2 l 4,0 c 1.196667,0 2,-0.8512 2,-2 L 11,4 C 11,2.8512 10.196667,2 9,2 L 7,2 7,1 C 7,0.3640694 6.482836,0 6,0 z m -2,4 6,0 0,7 -6,0 0,-7 z m 2,8 2,0 0,1 -2,0 0,-1 z"/>
+</svg>
diff --git a/app/assets/images/browse/shop_motorcycle.svg b/app/assets/images/browse/shop_motorcycle.svg
new file mode 100644
index 00000000000..0cb157304e3
--- /dev/null
+++ b/app/assets/images/browse/shop_motorcycle.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="m 11.656176,5.8256161 c 0.298589,0.2100571 0.472688,0.4414767 0.557618,0.7348004 0.02791,0.096441 0.02967,0.116247 0.03043,0.3145082 6.72e-4,0.1824775 -0.0013,0.2303319 -0.02282,0.331662 -0.04231,0.1988789 -0.12061,0.4210966 -0.212909,0.6147172 l -0.04055,0.088638 -0.139406,0.00864 C 11.321401,7.9483119 10.913322,8.0512522 10.558686,8.241664 9.7980817,8.6500367 9.3203179,9.4172822 9.0835261,10.60618 l -0.020273,0.09435 -0.098852,0.102933 c -0.054816,0.05578 -0.1286446,0.122894 -0.1647515,0.148676 -0.3281323,0.234183 -0.7990935,0.374318 -1.4675559,0.440309 -0.3000935,0.02968 -0.501193,0.0355 -1.4700912,0.04575 -0.5680876,0.0061 -1.0359562,0.0139 -1.0392018,0.01717 -0.00311,0.0032 -0.025085,0.0058 -0.048159,0.0058 -0.0503,0 -0.046861,0.02197 -0.01774,-0.240169 0.04498,-0.405175 0.039971,-0.875322 -0.012732,-1.215165 C 4.592715,9.0282302 4.0568749,8.3864584 3.1473456,8.0929715 2.7477326,7.9640179 2.3961554,7.9175192 1.7963837,7.9071256 L 1.413653,7.8984856 1.3883094,7.8698956 C 1.2604682,7.7126881 1.1949808,7.4722832 1.2311615,7.2894908 1.2482657,7.2031656 1.3073257,7.0781645 1.3578983,7.0235909 L 2.4352965,5.7884036 c 2.3360181,-0.00835 2.9594838,0.00427 5.1909411,0.026406 0.1239596,0.032996 0.6885446,1.3087067 0.747585,1.4146142 0.031912,0.057253 0.076189,0.1835844 0.086182,0.2458858 0.00402,0.02531 0.00844,0.045746 0.010125,0.045746 0.015029,0 0.2232482,-0.093484 0.3295027,-0.1486753 C 9.083967,7.2246893 9.4406996,6.645953 9.6210797,6.4088852 9.7928469,4.1278438 6.9779187,-1.927108 11.656179,5.8256163 Z M 11.54719,8.1786966 c 0.679982,-0.052948 1.349382,0.2215749 1.824941,0.7490968 0.661149,0.7333838 0.816608,1.8298176 0.387799,2.7333476 -0.356552,0.751284 -1.061293,1.258429 -1.850286,1.332365 -0.296082,0.02774 -0.651004,-0.01504 -0.930213,-0.114375 C 10.288966,12.633514 9.7515777,12.064052 9.5270851,11.340909 9.3199378,10.673656 9.3993216,9.9309859 9.7399919,9.3423632 10.133078,8.6631724 10.793349,8.2373763 11.54719,8.1786966 Z m -9.2539672,0.0057 c 0.2777804,3.059e-4 0.3564089,0.00923 0.5576214,0.062902 0.9073154,0.2421499 1.5833539,1.0369036 1.7134153,2.0128424 0.023943,0.180069 0.024164,0.495889 0,0.66618 C 4.448839,11.739795 3.9762622,12.413657 3.2766624,12.767615 3.0547002,12.879911 2.7757949,12.964519 2.5238745,12.99349 2.379068,13.01014 2.067452,12.99789 1.9155611,12.97061 0.93994444,12.794509 0.20022497,12.0164 0.02725513,10.983501 -0.00555125,10.788179 -0.00952264,10.429781 0.01960008,10.234405 0.09804804,9.7090502 0.32013721,9.2525892 0.67353649,8.8820232 1.0161487,8.5227701 1.4205438,8.3002792 1.9155078,8.2044093 2.0029748,8.1873113 2.0788745,8.1841203 2.2931694,8.1843983 Z m 9.3401452,0.8262966 c -0.449661,0.02271 -0.856262,0.251053 -1.130448,0.631871 -0.08549,0.118735 -0.200319,0.3597628 -0.238257,0.5003518 -0.15436,0.572038 -0.0045,1.164114 0.39794,1.575392 0.101934,0.104152 0.253337,0.22211 0.36245,0.280195 0.08522,0.04538 0.260896,0.110084 0.364989,0.134384 0.128891,0.03029 0.422462,0.03938 0.550017,0.01717 0.612901,-0.106658 1.090689,-0.583466 1.231835,-1.223717 0.0324,-0.147014 0.03963,-0.43524 0.01522,-0.586123 C 13.056417,9.5328412 12.401435,8.9719187 11.633381,9.0107062 Z m -9.3350763,0.0057 c -0.2702636,-5.9e-4 -0.4663422,0.04823 -0.6919562,0.171548 -0.1571065,0.08587 -0.2721182,0.173637 -0.395403,0.308784 -0.202478,0.22197 -0.32486473,0.4650867 -0.39033542,0.7719708 -0.0270196,0.126684 -0.0318593,0.427329 -0.0101253,0.571829 0.055867,0.371448 0.25530728,0.736403 0.52973938,0.969251 0.2112195,0.179213 0.4522764,0.294282 0.7046301,0.33738 0.1249849,0.02141 0.3869133,0.02154 0.4993231,0 C 3.4339761,11.976684 3.9780205,11.057329 3.7303788,10.142882 3.602617,9.6711542 3.2393018,9.2681502 2.7925629,9.1021892 2.6215096,9.0386622 2.494743,9.0168752 2.2983073,9.0164162 Z"/>
+</svg>
diff --git a/app/assets/images/browse/shop_music.svg b/app/assets/images/browse/shop_music.svg
new file mode 100644
index 00000000000..3ef937ac4aa
--- /dev/null
+++ b/app/assets/images/browse/shop_music.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 6.0702169,0 4.1261099,0.30664062 C 4.1110424,3.5941871 4.0981627,6.8823665 4.0851608,10.169922 L 3.537223,10.130859 c -1.3286234,-0.09376 -2.73349869,0.560555 -3.35002602,1.558594 -0.22696225,0.367395 -0.25027762,0.950601 -0.0506989,1.267578 C 0.44807488,13.451881 1.1879837,13.866411 1.9928571,14 3.8437076,13.94684 5.1692552,13.299428 6.068267,11.966797 6.068267,7.9261386 6.0700268,3.5834362 6.0702169,0 Z m 0.9398793,0.01953125 a 6.9904018,6.9852977 0 0 0 -0.02145,0.0019531 V 1.0039062 A 5.9889132,6.005722 0 0 1 12.967214,7.0097656 5.9889132,6.005722 0 0 1 6.9769468,13.015625 5.9889132,6.005722 0 0 1 6.4855578,12.990234 L 5.6178269,13.845703 A 6.9904018,6.9852977 0 0 0 7.0100962,13.990234 6.9904018,6.9852977 0 0 0 14.000692,7.0058594 6.9904018,6.9852977 0 0 0 7.0100962,0.01953125 Z M 3.0263342,1.2675781 A 6.9904018,6.9852977 0 0 0 0.02145065,7.0058594 6.9904018,6.9852977 0 0 0 0.66688638,9.921875 L 1.5404671,9.5078125 A 5.9889132,6.005722 0 0 1 0.98862927,7.0097656 5.9889132,6.005722 0 0 1 3.0263342,2.5058594 Z M 6.9886466,5 v 1 a 1.0331354,1.0000075 0 0 1 0.01755,0 1.0331354,1.0000075 0 0 1 1.0334772,1 1.0331354,1.0000075 0 0 1 -1.0334772,1 1.0331354,1.0000075 0 0 1 -0.01755,-0.00195 V 9 A 1.9997346,2.0002759 0 0 0 8.9756527,7 1.9997346,2.0002759 0 0 0 6.9886466,5 Z"/>
+</svg>
+
diff --git a/app/assets/images/browse/shop_musical_instrument.svg b/app/assets/images/browse/shop_musical_instrument.svg
new file mode 100644
index 00000000000..eea4b6b2760
--- /dev/null
+++ b/app/assets/images/browse/shop_musical_instrument.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="m 11,6 c 1,0 2,1 2,2 l 0,2 c 0.0034,0.946601 -1,2 -2,2 L 6,12 C 5,12 4,11 4,10 L 4,8 C 4,7 5,6 6,6 L 7,6 C 5,7 5,7 5,9 5,9.558061 5.5149841,9.961494 6,10 l 5,0 c 0.605412,0 1,-0.441939 1,-1 0,-2 0,-2 -2,-3.0047349 z M 7,3 7,4.9882812 5,5 5,6 7,6 7,8 8,8 8,6 l 1,0 0,2 1,0 0,-2 3,0 c 0,1 1,1 1,1 l 0,-3 c 0,0 -1,4.76e-4 -1,0.953125 L 10,4.9707031 10,3 9,3 9,4.9765625 8,4.9824219 8,3 7,3 Z M 0,10 0,1 C 3,1 3,5 5,5 L 5,6 C 3,6 3,10 0,10 Z"/>
+</svg>
diff --git a/app/assets/images/browse/shop_newsagent.svg b/app/assets/images/browse/shop_newsagent.svg
new file mode 100644
index 00000000000..ef63eff9b77
--- /dev/null
+++ b/app/assets/images/browse/shop_newsagent.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="m 7,11 4,0 0,0.536839 -4,0.02177 z m 0,-1 4,0 0,0.536839 -4,0.02177 z M 7,6 11,6 11,9 7,9 Z M 2,6 6,6.023451 6,6.5602898 2,6.5586098 Z m 0,5 4,0 0,0.536839 -4,0.02177 z m 0,-1 4,0 0,0.536839 -4,0.02177 z M 2,9 6,9.023451 6,9.5602901 2,9.5586101 Z M 2,8 6,8.023451 6,8.5602898 2,8.5586098 Z M 2,7 6,7 6,7.5368388 2,7.5586062 Z M 2,2 2,4.510373 11,4.5572742 11,2 Z M 0,0 c 0,1.5606474 0,8.9375328 0,11 0,2 0,0 0,3 l 10,0 3,0 0,-14 z m 1,1 11,0 0,12 -9,0 c -1.4082984,0 0,0 -2,0 z"/>
+</svg>
diff --git a/app/assets/images/browse/shop_optician.svg b/app/assets/images/browse/shop_optician.svg
new file mode 100644
index 00000000000..fe17848f1f6
--- /dev/null
+++ b/app/assets/images/browse/shop_optician.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 5,3 0,6 c 0,2 0.25,5 1.25,5 L 5,11 C 6,11 6.25,7.5 6.25,7.5 6.76702,7.25 7.23298,7.25 7.75,7.5 7.75,7.5 8,11 9,11 l 3.75,0 C 13.75,11 14,8 14,6 L 9,3 C 8.521411,2.7236864 8.12726,3.746123 9,4.25 L 12,6 2,6 5,4.25 C 5.922502,3.7173932 5.364967,2.789286 5,3 z m -3.75,4.25 3.75,0 -0.5,2.5 -2.75,0 z m 7.75,0 3.75,0 -0.5,2.5 -2.75,0 z"/>
+</svg>
diff --git a/app/assets/images/browse/shop_outdoor.svg b/app/assets/images/browse/shop_outdoor.svg
new file mode 100644
index 00000000000..3fe5c64b985
--- /dev/null
+++ b/app/assets/images/browse/shop_outdoor.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 5.5 1.015625 A 1.5 1.5 0 0 0 4 2.515625 A 1.5 1.5 0 0 0 5.5 4.015625 A 1.5 1.5 0 0 0 7 2.515625 A 1.5 1.5 0 0 0 5.5 1.015625 z M 10 2 L 8 3 L 11 9 L 13 8 L 10 2 z M 8 4 L 6 5 L 6.2949219 6.4707031 L 4 8 L 1 7 L 1 8 L 4 10 L 6.6464844 8.234375 L 7 10 L 10 9 L 8 4 z M 1 9 L 1 14 L 2 14 L 2 9 L 1 9 z M 10 10 L 7 11 L 5 14 L 6.8339844 14 L 8.3652344 12 L 9 14 L 11 14 L 10 10 z"/>
+</svg>
diff --git a/app/assets/images/browse/shop_paint.svg b/app/assets/images/browse/shop_paint.svg
new file mode 100644
index 00000000000..b93715b9ed7
--- /dev/null
+++ b/app/assets/images/browse/shop_paint.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 1,0 C 0.446,0 0,0.446 0,1 v 2 c 0,0.554 0.446,1 1,1 h 10 c 0.554,0 1,-0.446 1,-1 V 2.5 h 1 V 5 C 10.666667,5 8.3333333,5 6,5 V 7 H 5 v 7 H 8 V 7 H 7 V 6 c 2.3333333,0 4.666667,0 7,0 V 1.5 c -0.666667,0 -1.333333,0 -2,0 V 1 C 12,0.446 11.554,0 11,0 Z"/>
+</svg>
diff --git a/app/assets/images/browse/shop_perfumery.svg b/app/assets/images/browse/shop_perfumery.svg
new file mode 100644
index 00000000000..3a745182769
--- /dev/null
+++ b/app/assets/images/browse/shop_perfumery.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 14,2.5 C 14,3.6605381 12.880712,4.6013401 11.5,4.6013401 10.119288,4.6013401 9,3.6605381 9,2.5 9,1.3394619 10.119288,0.39865994 11.5,0.39865994 12.880712,0.39865994 14,1.3394619 14,2.5 Z M 8,2 10,2 10,3 8,3 Z M 3,-5.0000001e-8 l 1,0 L 4,1 3,1 Z M 1,0 2,0 2,1 1,1 Z M 1,4 2,4 2,5 1,5 Z M 3,4 4,4 4,5 3,5 Z M 4,2 5,2 5,3 4,3 Z M 2,2 3,2 3,3 2,3 Z M 0,2 1,2 1,3 0,3 Z M 6,5.4221106 8,5.39866 8,2 C 8,1 8,1 7,1 6.0336003,1.0168001 6,1 6,2 Z M 5,6 C 3,6 1.46875,9 1.46875,11 1.46875,12 4,14 5,14 l 4,0 c 1,0 3.414063,-2 3.414062,-3 C 12.414062,9 11,6 9,6 Z"/>
+</svg>
diff --git a/app/assets/images/browse/shop_pet.svg b/app/assets/images/browse/shop_pet.svg
new file mode 100644
index 00000000000..2a21bb8888d
--- /dev/null
+++ b/app/assets/images/browse/shop_pet.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 9.412959,0.00215164 C 8.1693111,0.14587964 7.4631991,1.5093558 7.3733471,2.6936522 7.2264421,3.7464942 7.6860601,5.0899481 8.7918901,5.3320382 9.750208,5.4175142 10.512633,4.5171926 10.825819,3.6583651 11.195679,2.5833906 11.206482,1.147845 10.309038,0.34250684 10.059753,0.12647084 9.739671,-0.00476426 9.412959,0.00215164 z m -5.0729339,0.056367 c -1.034807,0.074858 -1.5652,1.27744256 -1.493223,2.24276386 0.0088,1.2907239 0.717612,2.7424122 2.010186,3.0488129 0.963956,0.1042448 1.606661,-0.9181087 1.66656,-1.812036 0.123011,-1.3680543 -0.483132,-3.02530546 -1.855765,-3.43834986 -0.106687,-0.029465 -0.217332,-0.044089 -0.327758,-0.041191 z M 12.655043,4.2036246 c -1.388365,0.1017608 -2.266355,1.5813816 -2.326691,2.9184062 -0.07305,0.8707439 0.489487,1.9657608 1.436683,1.9057498 C 13.181597,8.8776256 14.035636,7.298817 14.00043,5.9270567 13.99133,5.1373276 13.490879,4.2365389 12.655043,4.2036246 z M 0.01075614,6.0085263 c -0.12855096,1.481506 0.908149,3.1560203 2.41413596,3.2493013 0.912778,-0.06096 1.343188,-1.121093 1.238576,-1.9598358 C 3.5801081,6.0604403 2.7526501,4.7931558 1.6775691,4.6275979 0.60248914,4.4620399 -0.00628982,5.221568 0.01075614,6.0085263 z M 7.1593651,7.2723472 c -1.411887,0.00329 -2.70277,0.9264694 -3.392913,2.1755314 -0.578235,0.9334254 -1.050947,1.9901564 -1.140853,3.1053424 0.01967,0.860048 0.840276,1.575842 1.663122,1.404534 1.173683,-0.152345 2.222485,-0.967418 3.44297,-0.8147 1.014283,0.08097 1.8507729,0.867482 2.8748439,0.856051 0.994345,0.03734 1.56796,-1.102139 1.188753,-1.994632 C 11.387234,10.726579 10.596107,9.6151936 9.746977,8.6142466 9.069618,7.87643 8.1824521,7.2396817 7.1593651,7.2723472 z"/>
+</svg>
diff --git a/app/assets/images/browse/shop_photo.svg b/app/assets/images/browse/shop_photo.svg
new file mode 100644
index 00000000000..8d0f706e5e1
--- /dev/null
+++ b/app/assets/images/browse/shop_photo.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 1.8994152,3.9828765 C 0,4 0,4.1964912 8.78837e-4,5.9898537 L 0.015625,12.03284 C 0,14 0,14 1.9308491,14.034854 L 12.052666,13.998501 C 14,14 14,14 14.050419,11.981131 l -0.0013,-5.9842195 C 14,4 14,4 12.052028,3.9919077 Z M 8,5.015625 c 2.209139,1e-7 4,1.790861 4,4 0,2.209139 -1.790861,4 -4,4 -2.209139,0 -4,-1.790861 -4,-4 0,-2.209139 1.790861,-4 4,-4 z m -6.0163743,-3.0343384 1.0327485,-1e-7 C 4,2 4,3 4.0315789,3.4888892 L 1.0502924,3.5216379 C 1,3 1,2 1.9836257,1.9812866 Z m 8.5228073,7.0567248 c 0,1.3807116 -1.1192882,2.5000006 -2.5000002,2.5000006 -1.3807121,0 -2.5000003,-1.119288 -2.5,-2.5000006 0,-1.3807119 1.1192881,-2.5 2.5,-2.5 1.3807118,10e-8 2.5000002,1.1192882 2.5000002,2.5 z M 9.0011696,0.98245613 8.9840466,3.5867713 14.015626,3.5708513 14.032746,0.86783625 C 14,0 14,0 13.017551,0.00195099 L 10.056599,0.01423822 C 9,0 9,0 9.0011696,0.98245613 Z m 1.1029014,0.0483393 2.913507,-0.017123 0.03349,1.9859078 -2.915006,0.01592 z"/>
+</svg>
diff --git a/app/assets/images/browse/shop_seafood.svg b/app/assets/images/browse/shop_seafood.svg
new file mode 100644
index 00000000000..6d669c75839
--- /dev/null
+++ b/app/assets/images/browse/shop_seafood.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 6,3 C 3,3 0,5 0,7 0,9 3,11 6,11 8.2433092,10.977189 11,9 11,7 11,5 8,3 6,3 Z m 5,4 c 0,2 1.634385,3.274211 3,4 C 14,9 13.333333,8.3333333 13,7 13.333333,5.6666667 14,5 14,3 12.771491,3.6648531 11,5 11,7 Z M 2.9824219,5 A 1,1 0 0 1 4,5.9765625 L 4,6 A 1,1 0 0 1 3.0058594,7 1,1 0 0 1 2,6.0117188 1,1 0 0 1 2.9824219,5 Z"/>
+</svg>
diff --git a/app/assets/images/browse/shop_second_hand.svg b/app/assets/images/browse/shop_second_hand.svg
new file mode 100644
index 00000000000..ab7d0754ce9
--- /dev/null
+++ b/app/assets/images/browse/shop_second_hand.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 5 0 C 4 0 4 0 4 1 L 4.0097656 4 L 1 4 L 1 13 C 1 14 1 14 2 14 L 12 14 C 13 14 13 14 13 13 L 13 4 L 10.039062 4 L 10 1 C 10 0 10 0 9 0 L 5 0 z M 5 1 L 9 1 L 9 4 L 5 4 L 5 1 z M 7.5058594 5 L 7.7089844 5.0371094 C 9.127416 5.2898435 10.312583 6.2814255 10.802734 7.6289062 C 10.92386 7.9618667 10.997929 8.3050881 11.027344 8.6464844 C 11.10874 9.5911796 10.79949 10.505123 10.261719 11.275391 L 10.628906 11.275391 C 10.896171 11.275879 11.117833 11.495542 11.117188 11.761719 L 11.115234 12.134766 C 11.114596 12.400627 10.894277 12.619637 10.626953 12.619141 L 8.2871094 12.615234 C 8.1229556 12.614907 7.985863 12.478206 7.9863281 12.314453 L 7.9902344 9.9863281 C 7.9907095 9.7203155 8.2131374 9.5014573 8.4804688 9.5019531 L 8.8554688 9.5039062 C 9.1227401 9.5043956 9.3422952 9.7241955 9.3417969 9.9902344 L 9.3417969 10.115234 C 9.6441071 9.4824952 9.7864932 8.7764922 9.5351562 8.0859375 C 9.2090275 7.1890315 8.4157004 6.5277685 7.4707031 6.359375 L 7.2675781 6.3242188 L 7.5058594 5 z M 3.3730469 5.3808594 L 5.7128906 5.3867188 C 5.8768459 5.3871794 6.0140065 5.522003 6.0136719 5.6855469 L 6.0078125 8.0136719 C 6.0073128 8.2796454 5.7867778 8.5003236 5.5195312 8.5 L 5.1445312 8.4980469 C 4.8772592 8.4975502 4.6598241 8.2775935 4.6601562 8.0117188 L 4.6582031 7.8828125 C 4.3544146 8.5162943 4.2131087 9.2202828 4.4648438 9.9121094 C 4.7911367 10.80884 5.5824543 11.474181 6.5273438 11.642578 L 6.7324219 11.677734 L 6.4941406 13 L 6.2890625 12.962891 C 4.8704482 12.71008 3.687413 11.716612 3.1972656 10.369141 C 2.7403868 9.112724 3.0285796 7.7766811 3.7636719 6.7265625 L 3.3691406 6.7265625 C 3.101876 6.7260652 2.8823236 6.5062597 2.8828125 6.2402344 L 2.8828125 5.8671875 C 2.8834574 5.6013473 3.1058056 5.3805353 3.3730469 5.3808594 z"/>
+</svg>
diff --git a/app/assets/images/browse/shop_shoes.svg b/app/assets/images/browse/shop_shoes.svg
new file mode 100644
index 00000000000..8006709dd56
--- /dev/null
+++ b/app/assets/images/browse/shop_shoes.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 0.75,3 C 0.75,3 0,5.25 0,8.25 l 5.5,0 c 0.5,0 1.306389,1 1.3,1 l 7.2,0 C 14,6.25 11,6 10,6 L 8,6 C 7,4 5,3 5,3 L 4.75,3 C 4,4.508412 2.016472,4.508412 1,3 z M 5.5,4 C 5.776142,4 6,4.2238577 6,4.5 6,4.7761423 5.776142,5 5.5,5 5.223858,5 5,4.7761423 5,4.5 5,4.2238577 5.223858,4 5.5,4 z m 1,1 C 6.776142,5 7,5.2238577 7,5.5 7,5.7761423 6.776142,6 6.5,6 6.223858,6 6,5.7761423 6,5.5 6,5.2238577 6.223858,5 6.5,5 z M 0,9 l 0,2 5.25,0 0,-2 z m 7.3,1 c 0,0 0.7,1 1.2,1 l 5.5,0 0,-1 z"/>
+</svg>
diff --git a/app/assets/images/browse/shop_sports.svg b/app/assets/images/browse/shop_sports.svg
new file mode 100644
index 00000000000..51ad34f7800
--- /dev/null
+++ b/app/assets/images/browse/shop_sports.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 5.5433072,1.2755905 A 1.2677165,1.2598426 0 0 1 4.2755908,2.5354332 1.2677165,1.2598426 0 0 1 3.0078741,1.2755905 1.2677165,1.2598426 0 0 1 4.2755908,0.01574798 1.2677165,1.2598426 0 0 1 5.5433072,1.2755905 Z M 12.395462,9.8346468 9.714385,10.523756 c -0.1095105,0.02815 -0.3520751,0.0033 -0.4439036,-0.01932 C 9.0351441,10.4588 8.9674746,10.349486 8.8753807,10.235178 L 7.6060635,8.1436871 6.0103144,9.8565596 6.6546096,13.059105 c 0.020606,0.06867 0.030909,0.125809 0.030909,0.171443 0,0.205576 -0.06647,0.382584 -0.1994434,0.531025 -0.1329742,0.148441 -0.2915382,0.222679 -0.4757603,0.222679 -0.3477056,0 -0.562604,-0.199862 -0.6447278,-0.59955 L 4.583166,9.4969405 C 4.4910718,9.0857519 4.531951,8.7831202 4.7058367,8.589009 L 6.1020763,7.0302906 4.5831331,5.0607914 3.6012359,6.1568624 C 3.4988717,6.2707992 3.3811861,6.3277863 3.2481793,6.3277863 c -0.1738526,0 -0.3425539,-0.085555 -0.5061367,-0.256627 L 1.1462927,4.2897992 C 1.0645342,4.1754915 1.0236885,4.0498678 1.023622,3.9129284 1.0236951,3.7418565 1.0773298,3.5991666 1.1847455,3.4848589 1.292095,3.3705882 1.4174577,3.3134163 1.5607009,3.3134163 c 0.1433097,0 0.2558438,0.045634 0.3376019,0.1369386 L 3.2178026,4.9238153 4.813552,3.1424923 C 4.9362227,3.0051817 5.0936519,2.8964026 5.273825,2.9365084 l 3.4739056,0.7732794 c 0.1502629,0.033448 0.2602345,0.1751076 0.3726022,0.3124179 l 0.7716399,1.3297166 c 0.1226703,0.1139369 0.1840563,0.2566264 0.1840223,0.4280696 2.5e-5,0.1599419 -0.05108,0.2969925 -0.1533463,0.4111144 -0.1021978,0.1140852 -0.2249683,0.1711462 -0.3682778,0.1711462 -0.1532472,0 -0.286254,-0.068488 -0.3989206,-0.2054272 l -0.8959802,-1.50064 -1.45563,-0.246662 3.0196583,4.6877936 2.4604626,-0.7063978 c 0.194458,0 0.371896,0.039275 0.504903,0.1763999 0.132939,0.1370874 0.268048,0.2586702 0.268048,0.4754126 0,0.2055763 -0.08475,0.3840352 -0.217687,0.5267625 -0.132974,0.1427266 -0.264714,0.2191324 -0.443763,0.2651527 z"/>
+</svg>
diff --git a/app/assets/images/browse/shop_stationery.svg b/app/assets/images/browse/shop_stationery.svg
new file mode 100644
index 00000000000..0c9501f909c
--- /dev/null
+++ b/app/assets/images/browse/shop_stationery.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 5,10 C 5,9.2808818 5,4.6666667 5,2 5,1 5,1 6,1 l 1,0 c 1,0 1,0 1,1 l -0.010634,7.0084269 -1,0 L 7,3 6,3 C 6,4.6666667 5.9893664,7.3417602 5.9893664,9.0084269 5.9893664,10.008427 5.9893679,9.991392 7,10 l 0.9893664,0.0084 c 1,0 1,0 1,-1.0000001 L 9,2 C 9.0030345,2.3020714e-6 9,0 7,0 6,0 7,0 6,0 4,0 4,0 4,2 4,5 4,7 4,10 4,11 4,11 6.654504,13.668971 6.8617369,13.968351 7,14 7.5370581,14 8,14 8.195636,14.016316 8.5031967,13.68551 11,11 11,11 11,10 11,6.6666667 11,5.3333333 11,2 l -1,0 0,8 C 10,10.489168 8,13.223489 7.5628142,13 7,13.159635 5,10.648803 5,10 z"/>
+</svg>
diff --git a/app/assets/images/browse/shop_supermarket.svg b/app/assets/images/browse/shop_supermarket.svg
new file mode 100644
index 00000000000..36722d32857
--- /dev/null
+++ b/app/assets/images/browse/shop_supermarket.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="m0 3 1 6 9 0.9v1.1h-8.5a0.5 0.5 0 1 0 0 1h1.0202a1 1 0 1 0 1.9596 0h4.0404a1 1 0 1 0 1.9596 0h0.5202v-2l1.5846-7.3946 1.037-0.36342a0.5534 0.5534 0 1 0-0.38487-1.0371l-1.4687 0.54508-0.268 1.25z M5.5 7h-1.5v-1.5h1.5z M7.5 7h-1.5v-1.5h1.5z M9.5 7h-1.5v-1.5h1.5z M10.652 7h-0.65172v-1.5h0.96886z M1.3458 5l-0.17878-1h2.333v1z M10.25 8.9l-0.25-0.023952v-1.376h0.546z M9.5 8.8281l-1.5-0.14371v-1.1844h1.5z M7.5 8.6365l-1.5-0.14371v-0.99282h1.5z M5.5 8.4449l-1.5-0.14371v-0.8012h1.5z M1.7033 7l-0.26817-1.5h2.0648v1.5z M11.075 5h-1.0746v-1h1.286z M9.5 5h-1.5v-1h1.5z M7.5 5h-1.5v-1h1.5z M5.5 5h-1.5v-1h1.5z M1.9 8.1l-0.10727-0.6h1.7073v0.75329z"/>
+</svg>
diff --git a/app/assets/images/browse/shop_tea.svg b/app/assets/images/browse/shop_tea.svg
new file mode 100644
index 00000000000..1b24c869aad
--- /dev/null
+++ b/app/assets/images/browse/shop_tea.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 6.8320312,1.8984375 A 1.2055479,0.94874388 0 0 0 5.6269531,2.8476562 1.2055479,0.94874388 0 0 0 6.4667969,3.7519531 C 5.0890082,3.8629576 3.899133,4.5711593 3.2011719,5.6171875 c -0.014037,-0.00629 -0.026946,-0.019665 -0.041016,-0.025391 -0.648797,-0.26404 -1.6220121,-0.3965713 -2.25195308,0.011719 -0.61338999,0.39758 -0.87117,1.1088738 -0.90624999,1.9960938 -0.07125,1.80296 1.28012817,2.1642531 2.62695307,2.3457031 0.109103,0.014698 0.2167003,0.00673 0.3242188,0.00195 0.295793,0.8537896 0.7371669,1.6556536 1.3066406,2.0566406 l 5.1464844,0 c 0.6129603,-0.432304 1.0763173,-1.329351 1.3691413,-2.2558593 0.233932,0.046863 0.48724,0.00182 0.83789,-0.2773438 0.609155,-0.48495 1.2457,-1.4462856 1.453125,-1.9160156 C 13.440666,6.7433175 14,3.8300781 14,3.8300781 c 0,0 -0.881381,0.2391938 -1.583984,-0.00391 -0.154784,0.52722 -0.346971,1.5225268 -0.638672,1.9980469 C 11.526215,6.2336187 11.357756,6.5891431 10.943359,6.6542969 10.462151,5.0696208 8.9923554,3.8964674 7.1953125,3.7519531 A 1.2055479,0.94874388 0 0 0 8.0371094,2.8476562 1.2055479,0.94874388 0 0 0 6.8320312,1.8984375 Z m -4.8535156,4.25 C 2.3013945,6.138394 2.5705254,6.2407385 2.8125,6.3789062 2.6441871,6.8124674 2.5370318,7.2751841 2.5371094,7.7636719 2.537755,8.1551626 2.6033657,8.6361304 2.71875,9.1347656 1.9446816,9.121606 1.0325069,9.0231889 1.0859375,7.671875 c 0.0298,-0.7536 0.2326369,-1.4086112 0.6074219,-1.4882812 0.099248,-0.021098 0.1937357,-0.032313 0.2851562,-0.035156 z"/>
+</svg>
diff --git a/app/assets/images/browse/shop_ticket.svg b/app/assets/images/browse/shop_ticket.svg
new file mode 100644
index 00000000000..f4ab7b3fbc3
--- /dev/null
+++ b/app/assets/images/browse/shop_ticket.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="m0,3 v3 h1 a1,1 0 0 1 0,2 h-1 v3 h14 v-3 h-1 a1,1 0 0 1 0,-2 h1 v-3 z m8,1 h1 v6 h-1 z"/>
+</svg>
diff --git a/app/assets/images/browse/shop_tobacco.svg b/app/assets/images/browse/shop_tobacco.svg
new file mode 100644
index 00000000000..8e6b245b165
--- /dev/null
+++ b/app/assets/images/browse/shop_tobacco.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="m 2,11 1,0 0,3 -1,0 z M 1,10 C 1.6666667,9 3,8 3,7 3,6 0,5 0,3 0,1 2,1 4,0 3.6666667,1.3333333 2,2 2,3 3,4 5,5 5,7 5,9 4,9 1,10 Z m -1,1 1,0 0,3 -1,0 z m 14,3 -10,0 0,-3 10,0 z"/>
+</svg>
diff --git a/app/assets/images/browse/shop_toys.svg b/app/assets/images/browse/shop_toys.svg
new file mode 100644
index 00000000000..ca6cc8faeaf
--- /dev/null
+++ b/app/assets/images/browse/shop_toys.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 3,0 3,2 C 2.303,2.367 0.5205,3.74 0.3125,4 0.1125,4.249 0.0935,6.054 0.4375,6 1.0385,5.908 3.07175,4.264 3.59375,4.625 4.11475,4.985 3.965,6.677 4,8 3.2885823,8.9155412 3.0486761,9.914732 2.375,10.65625 2.043673,10.355285 1.6921391,10.067139 1.3125,9.6875 1.2346732,9.5966801 0.85929648,9.3748654 0.50753769,9.6954041 0.28592558,10 0.25660799,10.372075 0.5233459,10.617358 c 2.0149553,2.014955 3.9296858,3.077784 6.7580611,3.077784 2.729723,0 4.081027,-1.080817 6.101445,-3.101235 0.218707,-0.148136 0.296182,-0.735221 0.109401,-0.9220058 C 13.305464,9.4851165 12.835636,9.468793 12.6875,9.6875 12.338186,10.036814 12.031335,10.310916 11.71875,10.59375 10.780615,9.3277043 10.903153,9.005972 10,6 12.132286,5.4529673 12.593498,7.7107513 14,8.3433836 L 14,6 C 14,5 11.703,5.0285 10,5.4375 9.6716918,5 9,4 6.6331658,4.4216918 6.3366834,3 5.8442211,2.6482412 4.5159129,2 z m 2,8 c 1,0.6651977 3.3048576,0.6097152 4,0 0.8391024,0.541273 1.548615,2.063392 2.03125,3.1875 C 9.85044,12.114113 8.7360922,12.5625 7,12.5625 5.2862369,12.5625 4.2140649,12.170774 3.125,11.34375 3.9438812,10.07268 4.0659871,9.8680258 5,8 z"/>
+</svg>
diff --git a/app/assets/images/browse/shop_trade.svg b/app/assets/images/browse/shop_trade.svg
new file mode 100644
index 00000000000..420c17f3fd1
--- /dev/null
+++ b/app/assets/images/browse/shop_trade.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="m 3,0 v 4 h 7 V 0 H 7 V 2 H 6 V 0 Z M 0,5 v 5 H 5 V 5 H 3 V 7 H 2 V 5 Z m 6,0 v 5 h 8 V 5 Z m -6,6 c 0,1 0,2 0,3 h 2 v -2 h 4 v 2 h 2 v -2 h 4 v 2 h 2 c 0,-1 0,-2 0,-3 z"/>
+</svg>
diff --git a/app/assets/images/browse/shop_travel_agency.svg b/app/assets/images/browse/shop_travel_agency.svg
new file mode 100644
index 00000000000..e653d01858a
--- /dev/null
+++ b/app/assets/images/browse/shop_travel_agency.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 0,9 C 0,8 0,8 1,8 c 2.3333333,0 4.6666667,0 7,0 1,0 1,0 1,1 0,1.333333 0,2.666667 0,4 0,1 0,1 -1,1 C 5.6666667,14 3.3333333,14 1,14 0,14 0,14 0,13 0,11.666667 0,10.333333 0,9 z M 13,4.03125 13,7 l 1,0 0,-2.96875 -1,0 z M 11.21875,3.6875 9.59375,6.15625 10.40625,6.6875 12.0625,4.25 11.21875,3.6875 z M 9.9375,2.03125 7.125,3.1875 7.5,4.09375 10.3125,2.96875 9.9375,2.03125 z M 7,-0.03125 l 0,1 L 10.09375,1 l 0,-1 L 7,-0.03125 z M 3,8 3,6.2964824 l 3,0 L 6,8 7,8 7,6 C 7,5 7,5 6,5 5,5 4,5 3,5 2,5 2,5 2,6 L 2,8 z M 14.726968,1.4871188 c 0,1.1045695 -0.89543,2 -2,2 -1.104569,0 -2,-0.8954305 -2,-2 0,-1.10456946 0.895431,-1.99999996 2,-1.99999996 0.916949,0 1.716441,0.62354577 1.939772,1.51288116"/>
+</svg>
diff --git a/app/assets/images/browse/shop_tyres.svg b/app/assets/images/browse/shop_tyres.svg
new file mode 100644
index 00000000000..c6d4753bd68
--- /dev/null
+++ b/app/assets/images/browse/shop_tyres.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="m 8.7688269,0.02678201 c 2.2520171,0 4.0755221,3.12883669 4.0755221,6.98660949 C 12.844349,10.868834 11.020844,14 8.7688269,14 6.5179742,14 4.6933047,10.868834 4.6933047,7.0133915 c 0,-3.8577728 1.8246695,-6.98660949 4.0755222,-6.98660949 z M 7.0221746,7.0133915 c 0,2.2124262 0.9129168,3.9893535 2.037761,3.9893535 1.1644354,0 2.0377604,-1.787408 2.0377604,-3.9916833 0,-2.2054397 -0.911752,-3.9928473 -2.0377604,-3.9928473 -1.1644349,0 -2.037761,1.7874076 -2.037761,3.9928473 z m 2.037761,-3.4933048 c -0.3272062,0 -0.6276304,0.2701489 -0.8709973,0.7103054 0.358646,0.7196207 0.5798886,1.6989105 0.5798886,2.7829994 0,1.1644348 -0.2224071,2.0610497 -0.5822175,2.7829994 0.2456958,0.4424851 0.5449556,0.7103051 0.8733262,0.7103051 0.8046246,0 1.4555434,-1.5603427 1.4555434,-3.4933045 0,-1.930633 -0.6520834,-3.4933048 -1.4555434,-3.4933048 z M 4.1110873,7.0133915 c 0,-3.6796143 1.5417118,-6.69550077 3.4933047,-6.98660949 V 0 H 5.8577397 v 0 c 0,0 0,0 0,0 C 3.2831741,0.02678201 1.2,3.1474676 1.2,7.0133915 1.2,10.869999 3.2831741,14 5.8577397,14 c 0,0 0,0 0,0 h 1.7245281 v 0 C 5.6527991,13.703069 4.1110873,10.693006 4.1110873,7.0133915 Z"/>
+</svg>
diff --git a/app/assets/images/browse/shop_variety_store.svg b/app/assets/images/browse/shop_variety_store.svg
new file mode 100644
index 00000000000..05d5ea9d9cb
--- /dev/null
+++ b/app/assets/images/browse/shop_variety_store.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 5,0 C 4,0 4,0 4,1 L 4.0097656,4 1,4 1,13 c 0,1 0,1 1,1 l 10,0 c 1,0 1,0 1,-1 L 13,4 10.039062,4 10,1 C 10,0 10,0 9,0 Z M 9,1 9,4 5,4 5,1 Z M 5,5 8,5 8,12 5,12 5,11 7,11 7,9 5,9 Z m 4,0 3,0 0,7 -3,0 0,-1 2,0 0,-2 -2,0 z M 6,6 6,8 7,8 7,6 Z m 4,0 0,2 1,0 0,-2 z m -8,5 2,0 0,2.48929 -1,0 L 3,12 2,12 Z"/>
+</svg>
diff --git a/app/assets/images/browse/shop_video.svg b/app/assets/images/browse/shop_video.svg
new file mode 100644
index 00000000000..dc439ddcacd
--- /dev/null
+++ b/app/assets/images/browse/shop_video.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 13.990234,0.01757813 C 10.129073,0.01746474 6.9994428,3.1455756 6.9999999,7.0039062 7.0005082,10.861481 10.139592,14.000113 14,14 c 0.01008,-0.988687 -0.02305,-0.01498 0,-1 -3.308167,7.56e-4 -5.9668722,-2.672792 -5.966797,-5.9902344 -7.97e-5,-3.3128692 2.674918,-5.9983003 5.978516,-6.0058594 V 0.02148438 l -0.02149,-0.0019531 z M -6.5301839e-8,1 V 14 H 0.99999993 1.9999999 h 1 5.6640625 V 13 H 2.9999999 V 8 h 3 V 7 h -3 V 2 h 5 V 1 h -5 -1 -0.99999997 z M 0.99999993,2 H 1.9999999 V 3 H 0.99999993 Z m 0,2 H 1.9999999 V 5 H 0.99999993 Z M 14.011719,5 c -1.099332,0.00699 -1.986185,0.9003465 -1.986328,2 1.22e-4,1.0996535 0.886981,1.9924409 1.986328,2 V 7.9980469 c -0.0059,7.181e-4 -0.01172,0.00135 -0.01758,0.00195 -0.570726,1.89e-4 -1.033214,-0.4475843 -1.033203,-1 1.1e-5,-0.5524157 0.462492,-1.000189 1.033203,-1 0.0059,-3.78e-5 0.01172,-3.78e-5 0.01758,0 z M 0.99999993,6 H 1.9999999 V 7 H 0.99999993 Z m 0,2 H 1.9999999 V 9 H 0.99999993 Z m 0,2 H 1.9999999 v 1 H 0.99999993 Z m 0,2 H 1.9999999 v 1 H 0.99999993 Z"/>
+</svg>
diff --git a/app/assets/images/browse/shop_video_games.svg b/app/assets/images/browse/shop_video_games.svg
new file mode 100644
index 00000000000..fc8c2e33b21
--- /dev/null
+++ b/app/assets/images/browse/shop_video_games.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 3.219845,3.8253628 C 2.7468854,3.9379881 2.4597076,4.1012638 2.0993258,4.467284 1.6882935,4.8783163 1.3786096,5.351276 1.1477682,5.9425466 0.84111673,6.5927121 0.62936992,7.3021042 0.47770254,7.9583345 0.13418848,9.4730183 0.05292964,10.990119 0.13418848,11.70278 c 0.18582926,0.844618 0.39980299,1.317578 0.79396761,1.706104 0.40539401,0.405441 0.70384851,0.534934 1.29507171,0.563079 0.5799465,0.02814 1.0134849,-0.07884 1.430203,-0.354744 0.3209606,-0.213973 1.159893,-1.086736 1.6554535,-1.734248 l 0.33219,-0.439224 1.4696242,-0.01123 c 0.8108353,-0.0057 1.4696242,0 1.4696242,0.01687 0.3103472,0.452538 0.6896815,0.884513 1.0416768,1.306348 0.7432695,0.867125 1.4076965,1.227506 2.2579535,1.227506 0.608138,0 0.979749,-0.157684 1.407697,-0.591223 0.630644,-0.641921 0.782643,-1.148663 0.777052,-2.561999 0,-1.0473149 -0.05634,-1.5878875 -0.275948,-2.6746239 C 13.499112,7.0047868 13.103716,5.7716424 12.443032,4.8783163 12.274118,4.6530659 12.020723,4.3659355 11.868676,4.2420335 11.012829,3.5381851 9.2673035,3.588883 8.366349,4.3490204 8.2039735,4.4645359 7.9621869,4.5992882 7.814547,4.669981 7.6785628,4.7346564 7.5304964,4.798242 7.4710329,4.816389 7.3753228,4.8895931 6.9192782,4.8951841 6.7615934,4.8220274 6.6940278,4.7882446 6.5223181,4.7432798 6.3674288,4.6643426 5.8230183,4.3509156 5.2578547,3.9712497 4.7683116,3.8422779 4.2727985,3.718376 3.6815753,3.7127376 3.2198924,3.8253628 Z m 1.3457696,2.2297616 c 0.1182636,0.1126253 0.129493,0.1689142 0.129493,0.6644273 0,0.3435141 0.016678,0.6479386 0.016678,0.6479386 0,0 0.3098734,0.027765 0.6365197,0.027765 0.4335385,0 0.5349343,0.016915 0.6644273,0.1182636 0.078795,0.061927 0.1351313,0.1351313 0.1182162,0.1632758 0.030703,0.1988117 0.020469,0.37308 -0.1238546,0.5180192 -0.1182636,0.1126252 -0.2141159,0.089077 -0.7152673,0.1116302 l -0.5968143,0.016584 9.48e-5,0.6657065 C 4.6726015,9.5180305 4.5810136,9.6253016 4.485256,9.6928199 4.1981257,9.8665196 3.9293318,9.8277617 3.7829238,9.5293546 3.7097197,9.3885375 3.6842286,9.2027083 3.6815753,8.8423265 l -0.00403,-0.5508544 c 0,0 -0.7570103,-0.00426 -1.1164918,-0.029708 C 2.26824,8.1603681 2.1838066,7.8119264 2.3865036,7.5472548 2.4991288,7.4065325 2.53855,7.4008467 3.0790753,7.383979 L 3.6929942,7.3671113 3.711615,6.7958829 C 3.751036,6.1483707 3.734405,6.1412162 3.9575237,5.9594143 4.1433056,5.8524275 4.3967005,5.8918483 4.5656146,6.0551244 Z M 10.682624,6.2280281 C 11.233621,6.917141 10.207423,7.7473221 9.6401892,7.0868606 9.0335812,6.4394954 10.04301,5.4923726 10.682624,6.2280281 Z M 9.5167042,7.3269035 C 10.109946,8.0225645 9.1347449,8.9637267 8.4824283,8.2860659 7.766834,7.542673 8.892442,6.5948585 9.5167042,7.3269035 Z M 11.871372,7.215586 C 12.583143,7.8898686 11.624824,8.8827901 10.940501,8.2142169 10.212033,7.5025174 11.228882,6.6069407 11.871372,7.215586 Z m -0.895197,1.7417869 c 0.01476,1.005378 -1.3811259,0.9279333 -1.3992967,-0.00761 -0.021852,-0.9213758 1.3475557,-0.9150741 1.3992967,0.00761 z"/>
+  <path d="M 1.3323441,-0.05994706 C 1.3037034,0.46829033 1.5988154,0.8602857 1.9556111,1.2257321 2.3124068,1.5911784 2.7809586,1.9232693 3.3052364,2.1771513 3.8295142,2.4310332 4.4091673,2.6077204 4.9971727,2.6144098 5.5851781,2.6210994 6.2019586,2.4353176 6.6548686,1.9642133 7.3006205,1.2925201 7.8716641,1.2713612 8.1749553,1.392862 8.3266009,1.453612 8.4115592,1.547706 8.4475827,1.637079 8.4828147,1.724488 8.4913537,1.8183987 8.4071417,1.9753182 8.1290121,2.420017 7.7222881,2.8532272 7.354205,3.3345678 6.9826914,3.820394 6.632027,4.3898033 6.6354349,5.0970206 l 1.0423878,-0.005 C 7.6761122,4.7373326 7.8597454,4.3893747 8.1821738,3.9677368 8.5046018,3.546099 8.9465262,3.085291 9.3017406,2.512059 l 0.00676,-0.01092 0.0062,-0.011197 C 9.5361011,2.0899957 9.5677338,1.6278949 9.414364,1.2473868 9.2609937,0.86687861 8.9450953,0.57851102 8.5625192,0.42524805 7.7973675,0.11872205 6.7667406,0.3436558 5.9033391,1.2417417 5.6729949,1.4813394 5.3878508,1.5764247 5.009018,1.5721149 4.6301852,1.5678051 4.1780433,1.4416345 3.7595226,1.2389655 3.3410019,1.0362965 2.9557429,0.75802938 2.7014031,0.49752296 2.4470633,0.23701656 2.3737406,-0.01252926 2.3732509,-0.00349674 Z"/>
+</svg>
diff --git a/app/assets/images/browse/tourism_alpinehut.svg b/app/assets/images/browse/tourism_alpinehut.svg
new file mode 100644
index 00000000000..84fea316048
--- /dev/null
+++ b/app/assets/images/browse/tourism_alpinehut.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 7 0 L 0 3.5 L 0 5.5 L 1.5 4.8496094 L 1.5 14 L 3 14 L 3 4.1992188 L 7 2.5 L 11 4.1992188 L 11 14 L 12.5 14 L 12.5 4.8496094 L 14 5.5 L 14 3.5 L 7 0 z M 6.9726562 5.0488281 C 6.5840971 5.0488281 6.2675781 5.3630448 6.2675781 5.7519531 C 6.2675781 6.1417342 6.584097 6.4550781 6.9726562 6.4550781 C 7.361041 6.4550781 7.6757812 6.1417342 7.6757812 5.7519531 C 7.6757812 5.3630448 7.3608664 5.0488281 6.9726562 5.0488281 z M 5.0488281 6.1875 C 4.9393822 6.162539 4.8312529 6.2261094 4.8066406 6.3339844 L 4.3144531 8.375 C 4.2879211 8.483224 4.3541425 8.5899565 4.4628906 8.6171875 L 5.0488281 8.7578125 C 5.1556558 8.7859125 5.2664033 8.7195541 5.2910156 8.6113281 L 5.7832031 6.5722656 C 5.8095609 6.4640416 5.7430227 6.355181 5.6367188 6.328125 L 5.0488281 6.1875 z M 6.7675781 6.5644531 C 6.1938161 6.5499631 6.0488281 7.1523437 6.0488281 7.1523438 L 4.5605469 13.40625 C 4.5553069 13.43959 4.5527344 13.472519 4.5527344 13.505859 C 4.5527344 13.78026 4.7744278 14 5.0488281 14 C 5.2720838 14 5.4610884 13.85019 5.5214844 13.646484 L 6.3730469 10.126953 L 7.1816406 13.625 C 7.2340066 13.841273 7.4308241 14 7.6621094 14 C 7.9354624 14 8.1542969 13.780085 8.1542969 13.505859 C 8.1542969 13.468499 8.1525944 13.431918 8.1464844 13.396484 L 7.0332031 8.7480469 L 7.1269531 8.3398438 L 7.1992188 8.6621094 C 7.2652007 8.8720994 7.4570312 8.890625 7.4570312 8.890625 L 8.6015625 9.1835938 C 8.6249525 9.1875937 8.648315 9.1894531 8.671875 9.1894531 C 8.859346 9.1894531 9.0097656 9.0406386 9.0097656 8.8535156 C 9.0097656 8.6934486 8.900292 8.5569194 8.75 8.5214844 L 7.7578125 8.2734375 L 7.4863281 7.1660156 C 7.3564592 6.5486156 6.7675781 6.5644531 6.7675781 6.5644531 z M 9.8300781 7.2792969 C 9.7478581 7.2792969 9.6872029 7.3408519 9.6699219 7.4199219 L 8.4882812 13.826172 C 8.4882812 13.830372 8.4863281 13.833837 8.4863281 13.835938 C 8.4863281 13.925487 8.5592405 13.998047 8.6484375 13.998047 C 8.7296075 13.998047 8.7993749 13.935444 8.8105469 13.857422 L 9.9902344 7.4511719 L 9.9902344 7.4394531 C 9.9902344 7.3521731 9.9192711 7.2792969 9.8300781 7.2792969 z"/>
+</svg>
diff --git a/app/assets/images/browse/tourism_apartment.svg b/app/assets/images/browse/tourism_apartment.svg
new file mode 100644
index 00000000000..2a26aaa674f
--- /dev/null
+++ b/app/assets/images/browse/tourism_apartment.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 0.5,3 C 0.223,3 0,3.223 0,3.5 V 4 8 9 9.5 11 H 1 V 9.5 9 H 13 V 10.5 11 H 13.5 14 V 10.5 9 8 6 5.5 C 14,5.223 13.777,5 13.5,5 13.223,5 13,5.223 13,5.5 V 6 8 H 1 V 4 3.5 C 1,3.223 0.777,3 0.5,3 Z m 3,1 C 2.671573,4 2,4.671573 2,5.5 2,6.328427 2.671573,7 3.5,7 4.328427,7 5,6.328427 5,5.5 5,4.671573 4.328427,4 3.5,4 Z M 6,5 v 2 h 6 C 12,6 10.963825,5 10,5 Z" />
+  <rect width="14" height="2" opacity="0.5"/>
+  <rect y="12" width="14" height="2" opacity="0.5"/>
+</svg>
diff --git a/app/assets/images/browse/tourism_artwork.svg b/app/assets/images/browse/tourism_artwork.svg
new file mode 100644
index 00000000000..48345343422
--- /dev/null
+++ b/app/assets/images/browse/tourism_artwork.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 4 0 L 5 2 L 6 2 L 5 4 L 6 6 L 5 8 L 6 10 L 5 12 L 9 12 L 8 10 L 9 8 L 8 6 L 9 4 L 8 2 L 9 2 L 10 0 L 4 0 z M 7 3 A 1 1 0 0 1 8 4 A 1 1 0 0 1 7 5 A 1 1 0 0 1 6 4 A 1 1 0 0 1 7 3 z M 7 7 A 1 1 0 0 1 8 8 A 1 1 0 0 1 7 9 A 1 1 0 0 1 6 8 A 1 1 0 0 1 7 7 z M 3 13 L 3 14 L 11 14 L 11 13 L 3 13 z"/>
+</svg>
diff --git a/app/assets/images/browse/tourism_audioguide.svg b/app/assets/images/browse/tourism_audioguide.svg
new file mode 100644
index 00000000000..efa80a90218
--- /dev/null
+++ b/app/assets/images/browse/tourism_audioguide.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 7 1 A 5 5 0 0 0 2 6 C 0.892 6 0 6.892 0 8 L 0 10 C 0 11.108 0.892 12 2 12 L 3 12 L 3 6 A 4 4 0 0 1 7 2 A 4 4 0 0 1 11 6 L 11 12 L 12 12 C 13.108 12 14 11.108 14 10 L 14 8 C 14 6.892 13.108 6 12 6 A 5 5 0 0 0 7 1 z M 7 4.9550781 A 1.138829 1.138829 0 0 0 5.8613281 6.09375 A 1.138829 1.138829 0 0 0 7 7.2324219 A 1.138829 1.138829 0 0 0 8.1386719 6.09375 A 1.138829 1.138829 0 0 0 7 4.9550781 z M 7.7519531 7.9824219 L 5.4960938 8.734375 L 5.4960938 9.4863281 L 6.1875 9.4863281 L 6.2480469 13.248047 L 5.4960938 13.248047 L 5.4960938 14 L 8.5039062 14 L 8.5039062 13.248047 L 7.7519531 13.248047 L 7.7519531 7.9824219 z"/>
+</svg>
diff --git a/app/assets/images/browse/tourism_board.svg b/app/assets/images/browse/tourism_board.svg
new file mode 100644
index 00000000000..a6ff136213f
--- /dev/null
+++ b/app/assets/images/browse/tourism_board.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="m 0,0 c 0,4.6666667 0,9.3333333 0,14 h 1 v -3 h 12 v 3 h 1 C 14,9.3333333 14,4.6666667 14,0 9.3333333,0 4.6666667,0 0,0 Z m 1,1 h 12 v 9 H 1 Z m 3,2 v 1 h 6 V 3 Z M 2,5 V 6 H 12 V 5 Z M 2,7 V 8 H 12 V 7 Z"/>
+</svg>
diff --git a/app/assets/images/browse/tourism_camping.svg b/app/assets/images/browse/tourism_camping.svg
new file mode 100644
index 00000000000..79a0d81275e
--- /dev/null
+++ b/app/assets/images/browse/tourism_camping.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 14,14 8.000001,2.9999992 9.000001,0 l -1,0 -1,1.9999995 L 6,0 5,0 6,2.9999992 0,14 z m -6.999999,-7.0000008 3,6.0000018 -6.000001,0 z"/>
+</svg>
diff --git a/app/assets/images/browse/tourism_caravan_park.svg b/app/assets/images/browse/tourism_caravan_park.svg
new file mode 100644
index 00000000000..22d3b9ef451
--- /dev/null
+++ b/app/assets/images/browse/tourism_caravan_park.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 2,2 C 1,2 0,3 0,4 l 0,4 c 0,1 1,2 2,2 l 1.0625,0 C 3.295616,8.860792 4.291877,8 5.5,8 6.708123,8 7.704384,8.860792 7.9375,10 L 14,10 c 0,0 0,-1 -1,-1 l -1.5,0 0,-5 c 0,-0.9606645 -1.024338,-2 -2,-2 z M 2.84375,4 C 2.9375,3.984375 3,4 3,4 L 5,4 C 5,4 6,4 6,5 6,6 5,6 5,6 L 3,6 C 3,6 2,6 2,5 2,4.25 2.5625,4.046875 2.84375,4 z M 8,4 8.5,4 c 0,0 1,0 1,1 0,1 -1,1 -1,1 L 8,6 C 8,6 7,6 7,5 7,4 8,4 8,4 z M 5.5,9 C 4.671573,9 4,9.671573 4,10.5 4,11.328427 4.671573,12 5.5,12 6.328427,12 7,11.328427 7,10.5 7,9.671573 6.328427,9 5.5,9 z"/>
+</svg>
diff --git a/app/assets/images/browse/tourism_chalet.svg b/app/assets/images/browse/tourism_chalet.svg
new file mode 100644
index 00000000000..d67d70d1bfe
--- /dev/null
+++ b/app/assets/images/browse/tourism_chalet.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 4.2421875,0.73339625 0,4.5927712 H 0.49023438 V 11.221678 H 3.0859375 V 7.5068337 h 2.3125 v 2.7402343 l -2.2519531,2.587891 c -0.1403231,0.161407 -0.026373,0.413047 0.1875,0.414063 l 10.4140626,0.01758 c 0.1788,10e-4 0.300849,-0.180512 0.232422,-0.345703 l -3.375,-8.1074226 c -0.03944,-0.095231 -0.133278,-0.1564947 -0.236328,-0.1542969 -0.07059,0.00144 -0.137274,0.032655 -0.183594,0.085937 L 7.9941406,7.2626931 V 4.5927712 H 8.484375 Z M 10.296875,5.3779275 13.373047,12.7666 3.8828125,12.74902 5.3984375,11.006832 v 0.214844 H 7.9941406 V 8.0244118 Z"/>
+  <path d="M 10.296875,5.3779275 7.9941406,8.0244118 V 11.221678 H 5.3984375 v -0.214844 l -1.515625,1.742188 9.4902345,0.01758 z" opacity=".2"/>
+</svg>
diff --git a/app/assets/images/browse/tourism_guest_house.svg b/app/assets/images/browse/tourism_guest_house.svg
new file mode 100644
index 00000000000..a23fca066e0
--- /dev/null
+++ b/app/assets/images/browse/tourism_guest_house.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M7,0.85331316 1,5 h 2 v 8 H 6 V 8 h 2 v 5 h 3 V 5 h 2 z" opacity="0.27"/>
+  <path d="m 0.5,6 c -0.277,0 -0.5,0.223 -0.5,0.5 v 0.5 V 11 12 12.5 14 H 1 V 12.5 12 H 13 V 13.5 14 H 13.5 14 V 13.5 12 11 9 v -0.5 c 0,-0.277 -0.223,-0.5 -0.5,-0.5 -0.277,0 -0.5,0.223 -0.5,0.5 v 0.5 V 11 H 1 v -4 -0.5 c 0,-0.277 -0.223,-0.5 -0.5,-0.5 z m 3,1 c -0.828427,0 -1.5,0.671573 -1.5,1.5 C 2,9.3284274 2.671573,10 3.5,10 4.328427,10 5,9.3284274 5,8.5 c 0,-0.828427 -0.671573,-1.5 -1.5,-1.5 z m 2.5,1 V 10 h 6 C 12,9 10.963825,8 10,8 Z"/>
+</svg>
diff --git a/app/assets/images/browse/tourism_guidepost.svg b/app/assets/images/browse/tourism_guidepost.svg
new file mode 100644
index 00000000000..1c8013ab155
--- /dev/null
+++ b/app/assets/images/browse/tourism_guidepost.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 7,0.25 C 6.625,0.25 6.25,0.5 6.25,1 l 0,13 1.5,0 0,-13 C 7.75,0.5 7.375,0.25 7,0.25 z M 2,1 0,2.5 2,4 6,4 6,1 2,1 z M 8,4 8,7 12,7 14,5.5 12,4 8,4 z"/>
+</svg>
diff --git a/app/assets/images/browse/tourism_hostel.svg b/app/assets/images/browse/tourism_hostel.svg
new file mode 100644
index 00000000000..92b7126a165
--- /dev/null
+++ b/app/assets/images/browse/tourism_hostel.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 3.5,1 C 2.671573,1 2,1.671573 2,2.5 2,3.328427 2.671573,4 3.5,4 4.328427,4 5,3.328427 5,2.5 5,1.671573 4.328427,1 3.5,1 Z M 6,2 v 2 h 6 C 12,3 10.963825,2 10,2 Z M 3.5,7 C 2.671573,7 2,7.671573 2,8.5 2,9.328427 2.671573,10 3.5,10 4.328427,10 5,9.328427 5,8.5 5,7.671573 4.328427,7 3.5,7 Z M 6,8 v 2 l 6,0.01288 C 12,9 10.963825,8 10,8 Z"/>
+  <path d="m1,.5 a.5,.5 0 0 0 -1,0 v14.5 h1 v-3 h12 v3 h1 v-12.5 a.5,.5 0 0 0 -1,0 v2.5 h-12 z m0,5.5 h12 v5 h-12 z"/>
+</svg>
diff --git a/app/assets/images/browse/tourism_hotel.svg b/app/assets/images/browse/tourism_hotel.svg
new file mode 100644
index 00000000000..4d90a3b5fcd
--- /dev/null
+++ b/app/assets/images/browse/tourism_hotel.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 0.5 3 C 0.223 3 0 3.223 0 3.5 L 0 4 L 0 8 L 0 9 L 0 9.5 L 0 11 L 1 11 L 1 9.5 L 1 9 L 13 9 L 13 10.5 L 13 11 L 13.5 11 L 14 11 L 14 10.5 L 14 9 L 14 8 L 14 6 L 14 5.5 C 14 5.223 13.777 5 13.5 5 C 13.223 5 13 5.223 13 5.5 L 13 6 L 13 8 L 1 8 L 1 4 L 1 3.5 C 1 3.223 0.777 3 0.5 3 z M 3.5 4 C 2.671573 4 2 4.671573 2 5.5 C 2 6.328427 2.671573 7 3.5 7 C 4.328427 7 5 6.328427 5 5.5 C 5 4.671573 4.328427 4 3.5 4 z M 6 5 L 6 7 L 12 7 C 12 6 10.963825 5 10 5 L 6 5 z"/>
+</svg>
diff --git a/app/assets/images/browse/tourism_map.svg b/app/assets/images/browse/tourism_map.svg
new file mode 100644
index 00000000000..9b0326efb8d
--- /dev/null
+++ b/app/assets/images/browse/tourism_map.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 4.46875 1 C 4.4340322 1.0022386 4.3999788 1.0179371 4.3652344 1.0273438 C 4.3418638 1.0339809 4.316744 1.0351181 4.2949219 1.0449219 C 4.2885174 1.047763 4.2817055 1.0476262 4.2753906 1.0507812 L 0.26953125 3.0527344 L 0.26953125 3.0625 C 0.11092462 3.1461425 1.7200928e-017 3.3075506 0 3.5 L 0 12.5 C 0 12.506925 0.0036301406 12.512676 0.00390625 12.519531 C 0.0049226003 12.548659 0.015193262 12.576414 0.021484375 12.605469 C 0.029297893 12.640912 0.033967723 12.676843 0.048828125 12.708984 C 0.051160273 12.714062 0.05021735 12.719572 0.052734375 12.724609 C 0.057548363 12.734245 0.068889393 12.736913 0.07421875 12.746094 C 0.11252692 12.812404 0.16311445 12.867716 0.2265625 12.910156 C 0.24394949 12.921797 0.25873495 12.934044 0.27734375 12.943359 C 0.34493696 12.977339 0.4189124 13 0.5 13 C 0.50559327 13 0.51007716 12.996274 0.515625 12.996094 C 0.52112479 12.995922 0.52574277 13.000355 0.53125 13 C 0.56458184 12.99784 0.59746685 12.983341 0.63085938 12.974609 C 0.65568191 12.967785 0.68198201 12.965459 0.70507812 12.955078 C 0.71148258 12.952237 0.71829451 12.952374 0.72460938 12.949219 L 4.4804688 11.072266 L 9.2949219 12.957031 C 9.3575728 12.98518 9.4266323 13.001953 9.5 13.001953 C 9.5034625 13.001953 9.5082735 13.000069 9.5117188 13 C 9.5159353 12.999892 9.5192334 12.996309 9.5234375 12.996094 C 9.5234375 12.996094 9.5253906 12.996094 9.5253906 12.996094 C 9.5274954 12.995985 9.5291443 12.998183 9.53125 12.998047 C 9.5436937 12.997241 9.5558318 12.989957 9.5683594 12.988281 C 9.6199239 12.980974 9.6696667 12.970917 9.7148438 12.949219 C 9.7179464 12.947755 9.7215288 12.948805 9.7246094 12.947266 L 13.730469 10.945312 L 13.730469 10.939453 C 13.889075 10.855811 14 10.694403 14 10.501953 L 14 1.5019531 C 14 1.4950281 13.99637 1.4892767 13.996094 1.4824219 C 13.995111 1.4506304 13.983837 1.4203589 13.976562 1.3886719 C 13.968805 1.3559969 13.964963 1.3227753 13.951172 1.2929688 C 13.94859 1.2872909 13.950078 1.281019 13.947266 1.2753906 C 13.940914 1.2626773 13.927164 1.2580133 13.919922 1.2460938 C 13.883967 1.1871805 13.837653 1.1390577 13.78125 1.0996094 C 13.759186 1.0840303 13.740911 1.0683639 13.716797 1.0566406 C 13.650587 1.0243878 13.578865 1.0019531 13.5 1.0019531 C 13.495872 1.0019531 13.492385 1.0038077 13.488281 1.0039062 C 13.481483 1.0040656 13.475561 0.99956083 13.46875 1 C 13.42481 1.0028331 13.381452 1.0205924 13.337891 1.0351562 C 13.325152 1.0395525 13.31107 1.0395515 13.298828 1.0449219 C 13.291219 1.0482218 13.282876 1.0470413 13.275391 1.0507812 L 9.515625 2.9296875 L 4.7480469 1.0644531 L 4.7460938 1.0625 C 4.7442842 1.0614801 4.7420557 1.0615436 4.7402344 1.0605469 L 4.7089844 1.0488281 C 4.6450389 1.0192405 4.5753327 1 4.5 1 C 4.4945399 1 4.4897918 1.0017811 4.484375 1.0019531 C 4.4835103 1.0019754 4.4832861 1.0038795 4.4824219 1.0039062 C 4.4775719 1.0040769 4.4736055 0.9996869 4.46875 1 z M 5 2.2363281 L 9 3.8027344 L 9 11.767578 L 5 10.201172 L 5 2.2363281 z M 4 2.3066406 L 4 10.195312 L 1 11.693359 L 1 3.8046875 L 4 2.3066406 z M 13 2.3066406 L 13 10.193359 L 10 11.691406 L 10 3.8046875 L 13 2.3066406 z"/>
+</svg>
diff --git a/app/assets/images/browse/tourism_motel.svg b/app/assets/images/browse/tourism_motel.svg
new file mode 100644
index 00000000000..1c70fb10a83
--- /dev/null
+++ b/app/assets/images/browse/tourism_motel.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 0.5,0 C 0.223,0 0,0.223 0,0.5 V 1 6 H 1 V 5 h 12 v 1 h 1 V 2 1.5 C 14,1.223 13.777,1 13.5,1 13.223,1 13,1.223 13,1.5 V 2 4 H 1 V 1 0.5 C 1,0.223 0.777,0 0.5,0 Z m 3,0 C 2.671573,0 2,0.671573 2,1.5 2,2.328427 2.671573,3 3.5,3 4.328427,3 5,2.328427 5,1.5 5,0.671573 4.328427,0 3.5,0 Z M 6,1 v 2 h 6 C 12,2 10.963825,1 10,1 Z M 4,6 3,9 C 2.527334,9 2,9.384295 2,10 v 3 h 1 c 0,0 0,1 1,1 1,0 1,-1 1,-1 h 4 c 0,0 0,1 1,1 1,0 1,-1 1,-1 h 1 V 10 C 12,9.479394 11.544575,9 11,9 L 10,6 Z m 1,1 h 4 l 0.625,2 h -5.25 z m -1,3.25 c 0.414214,0 0.75,0.335786 0.75,0.75 0,0.414214 -0.335786,0.75 -0.75,0.75 -0.414214,0 -0.75,-0.335786 -0.75,-0.75 0,-0.414214 0.335786,-0.75 0.75,-0.75 z m 6,0 c 0.414214,0 0.75,0.335786 0.75,0.75 0,0.414214 -0.335786,0.75 -0.75,0.75 -0.414214,0 -0.75,-0.335786 -0.75,-0.75 0,-0.414214 0.335786,-0.75 0.75,-0.75 z"/>
+</svg>
diff --git a/app/assets/images/browse/tourism_museum.svg b/app/assets/images/browse/tourism_museum.svg
new file mode 100644
index 00000000000..167ae32b0a9
--- /dev/null
+++ b/app/assets/images/browse/tourism_museum.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 7,1 1,3 1,4 13,4 13,3 z m -6,4 0,1 1,0 0,5 -1,0 -1,2 14,0 -1,-2 -1,0 0,-5 1,0 0,-1 z M 5,6 C 5.497372,6 6,6.5325904 6,7 L 6,11 4,11 4,7 C 4,6.4726661 4.502628,6 5,6 z m 4,0 c 0.503364,0 1,0.4726661 1,1 l 0,4 -2,0 0,-4 C 8,6.4726661 8.496636,6 9,6 z"/>
+</svg>
diff --git a/app/assets/images/browse/tourism_office.svg b/app/assets/images/browse/tourism_office.svg
new file mode 100644
index 00000000000..409aa09b186
--- /dev/null
+++ b/app/assets/images/browse/tourism_office.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 7 0 A 7 7 0 0 0 0 7 A 7 7 0 0 0 7 14 A 7 7 0 0 0 14 7 A 7 7 0 0 0 7 0 z M 7 1.5 A 5.5 5.5 0 0 1 12.5 7 A 5.5 5.5 0 0 1 7 12.5 A 5.5 5.5 0 0 1 1.5 7 A 5.5 5.5 0 0 1 7 1.5 z M 7 2.8691406 A 1.0399773 1.0399773 0 0 0 5.9609375 3.9101562 A 1.0399773 1.0399773 0 0 0 7 4.9492188 A 1.0399773 1.0399773 0 0 0 8.0390625 3.9101562 A 1.0399773 1.0399773 0 0 0 7 2.8691406 z M 7.6875 5.6347656 L 5.6269531 6.3222656 L 5.6269531 7.0078125 L 6.2597656 7.0078125 L 6.3125 10.443359 L 5.6269531 10.443359 L 5.6269531 11.130859 L 8.3730469 11.130859 L 8.3730469 10.443359 L 7.6875 10.443359 L 7.6875 5.6347656 z"/>
+</svg>
diff --git a/app/assets/images/browse/tourism_picnic.svg b/app/assets/images/browse/tourism_picnic.svg
new file mode 100644
index 00000000000..c621a4060fa
--- /dev/null
+++ b/app/assets/images/browse/tourism_picnic.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="m 2.9995255,2 c -1.322034,0 -1.322034,1.5 0,1.5 l 8.0000005,0 c 1.33909,0 1.338983,-1.5 0,-1.5 L 2.9995255,2 z m 1,2 -0.75,3 -2.25,0 c -1.322034,0 -1.322034,1.5 0,1.5 l 1.875,0 -0.875,3.5 1.5,0 0.875,-3.5 5.25,0 0.8750005,3.5 1.5,0 -0.875,-3.5 1.875,0 c 1.33909,0 1.338983,-1.5 0,-1.5 l -2.25,0 -0.7500005,-3 -1.5,0 0.75,3 -4.5,0 0.75,-3 -1.5,0 z"/>
+</svg>
diff --git a/app/assets/images/browse/tourism_terminal.svg b/app/assets/images/browse/tourism_terminal.svg
new file mode 100644
index 00000000000..8b3a06bca52
--- /dev/null
+++ b/app/assets/images/browse/tourism_terminal.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 3 0 L 3 1 L 3 11 L 3 14 L 11 14 L 11 11 L 11 1 L 11 0 L 10 0 L 4 0 L 3 0 z M 4 1 L 10 1 L 10 11 L 4 11 L 4 1 z M 7 1.9941406 A 1.0112764 1.0072076 0 0 0 5.9882812 3.0019531 A 1.0112764 1.0072076 0 0 0 7 4.0097656 A 1.0112764 1.0072076 0 0 0 8.0117188 3.0019531 A 1.0112764 1.0072076 0 0 0 7 1.9941406 z M 7.6679688 4.6738281 L 5.6640625 5.3378906 L 5.6640625 6.0019531 L 6.2792969 6.0019531 L 6.3320312 9.3300781 L 5.6640625 9.3300781 L 5.6640625 9.9941406 L 8.3359375 9.9941406 L 8.3359375 9.3300781 L 7.6679688 9.3300781 L 7.6679688 4.6738281 z"/>
+</svg>
diff --git a/app/assets/images/browse/tourism_viewpoint.svg b/app/assets/images/browse/tourism_viewpoint.svg
new file mode 100644
index 00000000000..50618aa5165
--- /dev/null
+++ b/app/assets/images/browse/tourism_viewpoint.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="m 9.65625,0.59375 c -0.3024732,0.0462641 -0.5739493,0.24857188 -0.75,0.5 C 8.4915325,1.6542533 8.3846231,2.3479287 8.1875,3 7.9662603,3.8420605 7.7522058,4.7006473 7.625,5.5625 7.6044,5.8106582 7.7926492,5.8644805 8.03125,5.625 8.8564261,4.8565483 9.6689927,4.0447405 10.46875,3.25 10.66307,3.0435127 10.857947,2.8397801 11,2.59375 c 0.22114,-0.3696454 0.325018,-0.8581921 0.09375,-1.25 -0.238762,-0.3960416 -0.675926,-0.6652283 -1.125,-0.75 -0.1037376,-0.0197567 -0.2116756,-0.0154214 -0.3125,0 z m -5.4375,0.0625 C 3.756376,0.664435 3.298377,0.9038402 3,1.25 2.7236959,1.5695061 2.7337489,2.0351336 2.90625,2.40625 3.1835185,3.0459969 3.721958,3.5026801 4.1875,4 4.8053738,4.6133884 5.4428785,5.2080755 6.125,5.75 6.3294366,5.8921706 6.4627003,5.7639689 6.375,5.4375 6.1234386,4.3383434 5.8495515,3.246582 5.5625,2.15625 5.4811703,1.8846207 5.3917386,1.5899614 5.25,1.34375 5.0409086,0.9671579 4.6737053,0.6524279 4.21875,0.65625 z M 1,5.65625 C 0.6728589,5.7133884 0.35581084,5.8906685 0.1875,6.1875 -0.03684961,6.5918816 -0.05657638,7.0996758 0.09375,7.53125 0.23204898,7.9303783 0.65487609,8.1823302 1.0625,8.21875 1.7551236,8.2989321 2.398939,8.029096 3.0625,7.875 3.9027885,7.6471232 4.7519195,7.4130156 5.5625,7.09375 5.787908,6.9879268 5.7327889,6.7749958 5.40625,6.6875 4.3287785,6.3551066 3.2438454,6.0472518 2.15625,5.75 1.8803888,5.6844434 1.596594,5.6567822 1.3125,5.65625 1.2048302,5.6543848 1.109047,5.6372039 1,5.65625 z m 11.6875,0 C 12.403405,5.6567822 12.119611,5.684443 11.84375,5.75 10.756155,6.0472518 9.6712203,6.3551066 8.59375,6.6875 8.2672114,6.7749958 8.21209,6.9879301 8.4375,7.09375 c 0.8105812,0.3192656 1.659711,0.5533732 2.5,0.78125 0.663559,0.154096 1.307371,0.4239353 2,0.34375 0.407624,-0.03642 0.830451,-0.2883717 0.96875,-0.6875 C 14.056568,7.0996758 14.036852,6.5918816 13.8125,6.1875 13.588087,5.7917247 13.118179,5.64879 12.6875,5.65625 z M 6.28125,8.0625 C 6.24107,8.0647215 6.1761092,8.0894573 6.125,8.125 5.4428785,8.6669264 4.8053738,9.2928641 4.1875,9.90625 3.721958,10.403571 3.1835185,10.829001 2.90625,11.46875 2.7337489,11.839865 2.7236959,12.305494 3,12.625 3.298377,12.97116 3.756376,13.241771 4.21875,13.25 4.6737053,13.253823 5.0409086,12.90784 5.25,12.53125 5.3917386,12.285037 5.48117,12.02163 5.5625,11.75 5.8495515,10.659668 6.1234386,9.5366567 6.375,8.4375 6.4407752,8.1926478 6.4017899,8.0558356 6.28125,8.0625 z M 7.75,8.125 C 7.676409,8.138699 7.6147,8.21967 7.625,8.34375 c 0.1272058,0.8618534 0.3412603,1.689188 0.5625,2.53125 0.1971231,0.652072 0.3040361,1.376995 0.71875,1.9375 0.2347344,0.335235 0.6475495,0.54778 1.0625,0.46875 0.449074,-0.08477 0.886238,-0.353959 1.125,-0.75 C 11.325022,12.139441 11.22114,11.650893 11,11.28125 10.857947,11.035219 10.66307,10.831485 10.46875,10.625 9.6689927,9.8302564 8.8564261,9.0496977 8.03125,8.28125 7.9119496,8.1615102 7.8235913,8.1113005 7.75,8.125 z"/>
+</svg>
diff --git a/app/assets/images/browse/tourism_wilderness_hut.svg b/app/assets/images/browse/tourism_wilderness_hut.svg
new file mode 100644
index 00000000000..e8ce032630e
--- /dev/null
+++ b/app/assets/images/browse/tourism_wilderness_hut.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 8,0 8,2 7,1.5 0,5 0,7 1.5,6.3496094 1.5,14 3,14 3,5.6992188 7,4 8,4.4257812 8,9 4.5,9 c 0.025314,1.65157 -0.034277,3.38952 0,5 l 5,0 C 9.518206,11.046736 9.50603,8.0503867 9.5,5.0625 L 11,5.6992188 11,14 12.5,14 12.5,6.3496094 14,7 14,5 9.5,2.75 C 9.4984477,1.8314022 9.5,0.9158261 9.5,0 L 8,0 Z M 7,11 c 0,0 1,0 1,1 l 0,1 -2,0 0,-1 c 0,-1 1,-1 1,-1 z"/>
+</svg>
diff --git a/app/assets/stylesheets/browse.scss b/app/assets/stylesheets/browse.scss
index 2dac602fed3..4f47770df95 100644
--- a/app/assets/stylesheets/browse.scss
+++ b/app/assets/stylesheets/browse.scss
@@ -1,72 +1,19 @@
 $map-sidebar-icons: (
 
   /* Nodes (and ways as areas) */
-
   ".aeroway.aerodrome": ("filename": "aerodrome.p.16.png"),
-  
-  ".amenity.atm": ("filename": "amenity_atm.16.png", "invert": true),
-  ".amenity.bank": ("filename": "amenity_bank.16.png", "invert": true),
-  ".amenity.bar": ("filename": "amenity_bar.16.png", "invert": true),
-  ".amenity.bench": ("filename": "amenity_bench.16.png", "invert": true),
-  ".amenity.biergarten": ("filename": "amenity_biergarten.16.png", "invert": true),
-  ".amenity.bicycle_parking": ("filename": "amenity_bicycle_parking.16.png"),
-  ".amenity.bicycle_rental": ("filename": "transport_rental_bicycle.16.png"),
-  ".amenity.bus_station": ("filename": "bus_station.n.16.png"),
-  ".amenity.cafe": ("filename": "amenity_cafe.16.png", "invert": true),
-  ".amenity.car_rental": ("filename": "transport_rental_car.16.png"),
-  ".amenity.car_sharing": ("filename": "car_share.p.16.png"),
+
   ".amenity.childcare": ("filename": "amenity_childcare.p.16.png"),
-  ".amenity.cinema": ("filename": "amenity_cinema.16.png", "invert": true),
-  ".amenity.courthouse": ("filename": "amenity_courthouse.16.png", "invert": true),
-  ".amenity.dentist": ("filename": "amenity_dentist.16.png"),
-  ".amenity.doctors": ("filename": "amenity_doctors.16.png"),
-  ".amenity.drinking_water": ("filename": "amenity_drinking_water.16.png", "invert": true),
-  ".amenity.fast_food": ("filename": "amenity_fast_food.16.png", "invert": true),
-  ".amenity.fire_station": ("filename": "amenity_fire_station.16.png", "invert": true),
-  ".amenity.fuel": ("filename": "amenity_fuel.16.png"),
-  ".amenity.hospital": ("filename": "amenity_hospital.16.png"),
   ".amenity.kindergarten": ("filename": "amenity_childcare.p.16.png"),
-  ".amenity.library": ("filename": "library.p.16.png", "invert": true),
-  ".amenity.nightclub": ("filename": "amenity_nightclub.16.png", "invert": true),
-  ".amenity.parking": ("filename": "parking.p.16.png"),
-  ".amenity.pharmacy": ("filename": "amenity_pharmacy.16.png"),
-  ".amenity.place_of_worship": ("filename": "amenity_place_of_worship.16.png", "invert": true),
-  ".amenity.police": ("filename": "amenity_police.16.png", "invert": true),
-  ".amenity.post_box": ("filename": "post_box.p.16.png", "invert": true),
-  ".amenity.post_office": ("filename": "post_office.p.16.png", "invert": true),
-  ".amenity.prison": ("filename": "amenity_prison.16.png", "invert": true),
-  ".amenity.pub": ("filename": "amenity_pub.16.png", "invert": true),
-  ".amenity.restaurant": ("filename": "amenity_restaurant.16.png", "invert": true),
-  ".amenity.recycling": ("filename": "amenity_recycling.16.png", "invert": true),
-  ".amenity.school": ("filename": "education_school.p.16.png"),
-  ".amenity.shelter": ("filename": "shelter2.p.16.png"),
-  ".amenity.taxi": ("filename": "amenity_taxi.16.png"),
-  ".amenity.telephone": ("filename": "telephone.p.16.png", "invert": true),
-  ".amenity.theatre": ("filename": "amenity_theatre.16.png", "invert": true),
-  ".amenity.toilets": ("filename": "amenity_toilets.16.png", "invert": true),
-  ".amenity.townhall": ("filename": "amenity_townhall.16.png", "invert": true),
-  ".amenity.university": ("filename": "education_university.p.16.png"),
-  ".amenity.veterinary": ("filename": "health_veterinary.p.16.png"),
-  ".amenity.waste_basket": ("filename": "amenity_waste_basket.16.png", "invert": true),
 
   ".barrier.gate": ("filename": "gate2.p.16.png", "invert": true),
 
-  ".highway.bus_stop": ("filename": "highway_bus_stop.16.png"),
   ".highway.mini_roundabout": ("filename": "mini_round.p.16.png"),
   ".highway.traffic_signals": ("filename": "traffic_light.png", "invert": true),
   ".highway.turning_circle": ("filename": "turning_circle.p.16.png"),
 
-  ".historic.archaeological_site": ("filename": "historic_archaeological_site.16.png", "invert": true),
-  ".historic.castle": ("filename": "tourist_castle.p.16.png", "invert": true),
-  ".historic.memorial": ("filename": "historic_memorial.16.png", "invert": true),
-  ".historic.monument": ("filename": "historic_monument.16.png", "invert": true),
-  ".historic.ruins": ("filename": "tourist_ruins.p.16.png", "invert": true),
   ".historic.wreck": ("filename": "tourist_wreck.p.16.png", "invert": true),
 
-  ".man_made.lighthouse": ("filename": "man_made_lighthouse.16.png"),
-  ".man_made.water_tower": ("filename": "man_made_water_tower.16.png", "invert": true),
-  ".man_made.windmill": ("filename": "man_made_windmill.16.png", "invert": true),
-
   ".natural.tree": ("filename": "tree.p.16.png"),
 
   ".office.diplomatic": ("filename": "office_diplomatic.16.png"),
@@ -76,48 +23,7 @@ $map-sidebar-icons: (
   ".railway.station": ("filename": "station.p.16.png"),
   ".railway.level_crossing": ("filename": "level_crossing.p.16.png", "invert": true),
 
-  ".shop": ("filename": "shop_convenience.p.16.png"),
-  ".shop.alcohol": ("filename": "shop_alcohol.16.png"),
-  ".shop.bakery": ("filename": "shop_bakery.16.png"),
-  ".shop.bicycle": ("filename": "shop_bicycle.16.png"),
-  ".shop.books": ("filename": "shop_books.16.png"),
-  ".shop.butcher": ("filename": "shop_butcher.p.16.png"),
-  ".shop.clothes": ("filename": "shop_clothes.16.png"),
-  ".shop.car_parts": ("filename": "shop_car_parts.16.png"),
-  ".shop.car_repair": ("filename": "shop_car_repair.16.png"),
-  ".shop.convenience": ("filename": "shop_convenience.p.16.png"),
-  ".shop.doityourself": ("filename": "shop_doityourself.16.png"),
-  ".shop.electronics": ("filename": "shop_electronics.16.png"),
-  ".shop.estate_agent": ("filename": "shop_estateagent.16.png"),
-  ".shop.fashion": ("filename": "shop_clothes.16.png"),
-  ".shop.florist": ("filename": "shop_florist.16.png"),
-  ".shop.furniture": ("filename": "shop_furniture.16.png"),
-  ".shop.garden_centre": ("filename": "shop_florist.16.png"),
-  ".shop.gift": ("filename": "shop_gift.16.png"),
-  ".shop.greengrocer": ("filename": "shop_greengrocer.p.16.png"),
-  ".shop.hardware": ("filename": "shop_doityourself.16.png"),
-  ".shop.hairdresser": ("filename": "shop_hairdresser.16.png"),
-  ".shop.jewelry": ("filename": "shop_jewelry.16.png"),
-  ".shop.mobile_phone": ("filename": "shop_mobile_phone.16.png"),
-  ".shop.optician": ("filename": "shop_optician.16.png"),
-  ".shop.pet": ("filename": "shop_pet.16.png"),
-  ".shop.seafood": ("filename": "shop_seafood.16.png"),
-  ".shop.shoes": ("filename": "shop_shoes.16.png"),
-  ".shop.supermarket": ("filename": "shop_supermarket.p.16.png"),
-
-  ".tourism.alpine_hut": ("filename": "tourism_alpine_hut.16.png"),
-  ".tourism.camp_site": ("filename": "tourism_camp_site.16.png"),
-  ".tourism.caravan_site": ("filename": "tourism_caravan_site.16.png"),
-  ".tourism.hostel": ("filename": "tourism_hostel.16.png"),
-  ".tourism.hotel": ("filename": "tourism_hotel.16.png"),
-  ".tourism.motel": ("filename": "tourism_motel.16.png"),
-  ".tourism.museum": ("filename": "tourism_museum.16.png", "invert": true),
-  ".tourism.picnic_site": ("filename": "tourism_picnic_site.16.png", "invert": true),
-  ".tourism.viewpoint": ("filename": "view_point.p.16.png", "invert": true),
-  ".tourism.wilderness_hut": ("filename": "tourism_wilderness_hut.16.png"),
-
   /* Ways */
-
   ".aeroway.runway": ("filename": "runway.20.png"),
   ".aeroway.taxiway": ("filename": "taxiway.20.png"),
 
@@ -158,13 +64,9 @@ $map-sidebar-icons: (
   ".landuse.retail": ("filename": "retail.png"),
   ".landuse.tourism": ("filename": "tourism.png"),
 
-  ".leisure.golf_course": ("filename": "golf.png"),
   ".leisure.park": ("filename": "park.png"),
-  ".leisure.picnic_table": ("filename": "tourism_picnic_site.16.png", "invert": true),
-  ".leisure.playground": ("filename": "leisure_playground.16.png", "invert": true),
   ".leisure.pitch": ("filename": "pitch.png"),
   ".leisure.nature_reserve": ("filename": "reserve.png"),
-  ".leisure.water_park": ("filename": "leisure_water_park.16.png", "invert": true),
 
   ".natural.grassland": ("filename": "grassland.png"),
   ".natural.heath": ("filename": "heathland.png"),
diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 321b0bcb9af..d4265ffd298 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -954,3 +954,50 @@ img.trace_image {
     }
   }
 }
+
+.browse-section {
+
+  .svg_icon {
+    overflow: hidden;
+    display: inline-block;
+    margin-left: -25px;
+    width: 25px;
+    height: 25px;
+  }
+
+  .amenity-brown,
+  .culture,
+  .public-service,
+  .memorials {
+    fill: #734a08;
+  }
+
+  .barrier {
+    fill: #3f3f3f;
+  }
+
+  .gastronomy {
+    fill: #C77400;
+  }
+
+  .health {
+    fill: #BF0000;
+  }
+
+  .leisure {
+    fill: #0c8416;
+  }
+
+  .man-made {
+    fill: #666666;
+  }
+
+  .shop {
+    fill: #ac39ac;
+  }
+
+  .transportation,
+  .accommodation {
+    fill: #0092da;
+  }
+}
diff --git a/app/helpers/browse_helper.rb b/app/helpers/browse_helper.rb
index c8fc8245c5e..a4391568b1b 100644
--- a/app/helpers/browse_helper.rb
+++ b/app/helpers/browse_helper.rb
@@ -9,7 +9,10 @@ def element_single_current_link(type, object)
 
   def element_list_item(type, object, &block)
     tag.li :class => element_class(type, object), :title => element_title(object) do
-      element_strikethrough object, &block
+      elem_icon = icon_tags(object).map { |k, v| "#{k}_#{v}" }.last
+      elem_icon_detail = BROWSE_IMAGE[elem_icon.to_sym] if elem_icon
+      concat external_svg(elem_icon_detail[:image], "#{elem_icon_detail[:fill]} svg_icon") if elem_icon_detail
+      concat element_strikethrough object, &block
     end
   end
 
@@ -105,6 +108,17 @@ def sidebar_classic_pagination(pages, page_param)
     end
   end
 
+  def external_svg(identifier, fill, attributes = {})
+    file_name, fragment = identifier.split("#")
+    fragment ||= "icon"
+    attributes[:xmlns] = "http://www.w3.org/2000/svg"
+    attributes[:class] = fill
+    file_name = "browse/#{file_name}"
+    content_tag :svg, attributes do
+      tag.use :href => "#{image_path(file_name)}##{fragment}"
+    end
+  end
+
   private
 
   ICON_TAGS = %w[aeroway amenity barrier building highway historic landuse leisure man_made natural office railway shop tourism waterway].freeze
diff --git a/config/browse_image.yml b/config/browse_image.yml
new file mode 100644
index 00000000000..cdfddc3d24a
--- /dev/null
+++ b/config/browse_image.yml
@@ -0,0 +1,436 @@
+# browse: svg images only
+amenity_advertising_column:
+  image: amenity_advertising_column.svg
+  fill: amenity-brown
+amenity_aerodrome:
+  image: amenity_aerodrome.svg
+  fill: amenity-brown
+amenity_arts_centre:
+  image: amenity_arts_centre.svg
+  fill: amenity-brown
+amenity_atm:
+  image: amenity_atm.svg
+  fill: amenity-brown
+amenity_bank:
+  image: amenity_bank.svg
+  fill: amenity-brown
+amenity_bar:
+  image: amenity_bar.svg
+  fill: gastronomy
+amenity_bbq:
+  image: amenity_bbq.svg
+  fill: amenity-brown
+amenity_bench:
+  image: amenity_bench.svg
+  fill: man-made
+amenity_bicycle_parking:
+  image: amenity_bicycle_parking.svg
+  fill: amenity-brown
+amenity_bicycle_rental:
+  image: amenity_rental_bicycle.svg
+  fill: transportation
+amenity_bicycle_repair_station:
+  image: amenity_bicycle_repair_station.svg
+  fill: amenity-brown
+amenity_biergarten:
+  image: amenity_biergarten.svg
+  fill: gastronomy
+amenity_boat_rental:
+  image: amenity_boat_rental.svg
+  fill: transportation
+amenity_bureau_de_change:
+  image: amenity_bureau_de_change.svg
+  fill: amenity-brown
+amenity_bus_station:
+  image: amenity_bus_station.svg
+  fill: amenity-brown
+amenity_cafe:
+  image: amenity_cafe.svg
+  fill: gastronomy
+amenity_car_rental:
+  image: transport_rental_car.svg
+  fill: transportation
+amenity_car_sharing:
+  image: car_share.svg
+  fill: amenity-brown
+amenity_car_wash:
+  image: amenity_car_wash.svg
+  fill: amenity-brown
+amenity_casino:
+  image: amenity_casino.svg
+  fill: amenity-brown
+amenity_charging_station:
+  image: amenity_charging_station.svg
+  fill: amenity-brown
+amenity_cinema:
+  image: amenity_cinema.svg
+  fill: culture
+amenity_community_centre:
+  image: amenity_community_centre.svg
+  fill: culture
+amenity_courthouse:
+  image: amenity_courthouse.svg
+  fill: amenity-brown
+amenity_dentist:
+  image: amenity_dentist.svg
+  fill: health
+amenity_doctors:
+  image: amenity_doctors.svg
+  fill: health
+amenity_drinking_water:
+  image: amenity_drinking_water.svg
+  fill: amenity-brown
+amenity_emergency_phone:
+  image: amenity_emergency_phone.svg
+  fill: amenity-brown
+amenity_entrance:
+  image: amenity_entrance.svg
+  fill: amenity-brown
+amenity_excrement_bags:
+  image: amenity_excrement_bags.svg
+  fill: amenity-brown
+amenity_fast_food:
+  image: amenity_fast_food.svg
+  fill: gastronomy
+amenity_ferry:
+  image: amenity_ferry.svg
+  fill: amenity-brown
+amenity_fire_station:
+  image: amenity_firestation.svg
+  fill: amenity-brown
+amenity_firestation:
+  image: amenity_firestation.svg
+  fill: amenity-brown
+amenity_fountain:
+  image: amenity_fountain.svg
+  fill: amenity-brown
+amenity_fuel:
+  image: amenity_fuel.svg
+  fill: amenity-brown
+amenity_helipad:
+  image: amenity_helipad.svg
+  fill: amenity-brown
+amenity_hospital:
+  image: amenity_hospital.svg
+  fill: health
+amenity_hunting_stand:
+  image: amenity_hunting_stand.svg
+  fill: amenity-brown
+amenity_ice_cream:
+  image: amenity_ice_cream.svg
+  fill: amenity-brown
+amenity_internet_cafe:
+  image: amenity_internet_cafe.svg
+  fill: amenity-brown
+amenity_library:
+  image: amenity_library.svg
+  fill: amenity-brown
+amenity_motorcycle_parking:
+  image: amenity_motorcycle_parking.svg
+  fill: amenity-brown
+amenity_nightclub:
+  image: amenity_nightclub.svg
+  fill: amenity-brown
+amenity_parcel_locker:
+  image: amenity_parcel_locker.svg
+  fill: amenity-brown
+amenity_parking_entrance_multistorey:
+  image: amenity_parking_entrance_multistorey.svg
+  fill: amenity-brown
+amenity_parking_entrance_underground:
+  image: amenity_parking_entrance_underground.svg
+  fill: amenity-brown
+amenity_parking:
+  image: amenity_parking.svg
+  fill: amenity-brown
+amenity_parking_subtle:
+  image: amenity_parking_subtle.svg
+  fill: amenity-brown
+amenity_parking_tickets:
+  image: amenity_parking_tickets.svg
+  fill: amenity-brown
+amenity_pharmacy:
+  image: amenity_pharmacy.svg
+  fill: health
+amenity_place_of_worship:
+  image: amenity_place_of_worship.svg
+  fill: amenity-brown
+amenity_police:
+  image: amenity_police.svg
+  fill: public-service
+amenity_post_box:
+  image: amenity_post_box.svg
+  fill: amenity-brown
+amenity_post_office:
+  image: amenity_post_office.svg
+  fill: public-service
+amenity_prison:
+  image: amenity_prison.svg
+  fill: amenity-brown
+amenity_pub:
+  image: amenity_pub.svg
+  fill: gastronomy
+amenity_public_bath:
+  image: amenity_public_bath.svg
+  fill: amenity-brown
+amenity_public_bookcase:
+  image: amenity_public_bookcase.svg
+  fill: amenity-brown
+amenity_public_transport_tickets:
+  image: amenity_public_transport_tickets.svg
+  fill: amenity-brown
+amenity_recycling:
+  image: amenity_recycling.svg
+  fill: amenity-brown
+amenity_rental_bicycle:
+  image: amenity_rental_bicycle.svg
+  fill: amenity-brown
+amenity_rental_car:
+  image: amenity_rental_car.svg
+  fill: amenity-brown
+amenity_restaurant:
+  image: amenity_restaurant.svg
+  fill: gastronomy
+amenity_school:
+  image: education_school.svg
+  fill: public-service
+amenity_shelter:
+  image: amenity_shelter.svg
+  fill: amenity-brown
+amenity_shower:
+  image: amenity_shower.svg
+  fill: amenity-brown
+amenity_social_facility:
+  image: amenity_social_facility.svg
+  fill: amenity-brown
+amenity_taxi:
+  image: amenity_taxi.svg
+  fill: transportation
+amenity_telephone:
+  image: amenity_telephone.svg
+  fill: amenity-brown
+amenity_theatre:
+  image: amenity_theatre.svg
+  fill: culture
+amenity_toilets:
+  image: amenity_toilets.svg
+  fill: amenity-brown
+amenity_townhall:
+  image: amenity_townhall.svg
+  fill: public-service
+amenity_town_hall:
+  image: amenity_town_hall.svg
+  fill: public-service
+amenity_university:
+  image: education_university.svg
+  fill: public-service
+amenity_vehicle_inspection:
+  image: amenity_vehicle_inspection.svg
+  fill: amenity-brown
+amenity_veterinary:
+  image: amenity_veterinary.svg
+  fill: health
+amenity_waste_basket:
+  image: amenity_waste_basket.svg
+  fill: amenity-brown
+amenity_waste_disposal:
+  image: amenity_waste_disposal.svg
+  fill: amenity-brown
+highway_bus_stop:
+  image: highway_bus_stop.svg
+  fill: transportation
+historic_archaeological_site:
+  image: historic_archaeological_site.svg
+  fill: memorials
+historic_castle:
+  image: historic_castle.svg
+  fill: memorials
+historic_memorial:
+  image: historic_memorial.svg
+  fill: memorials
+historic_monument:
+  image: historic_monument.svg
+  fill: memorials
+historic_ruins:
+  image: historic_ruins.svg
+  fill: memorials
+leisure_amusement_arcade:
+  image: leisure_amusement_arcade.svg
+  fill: leisure
+leisure_beach_resort:
+  image: leisure_beach_resort.svg
+  fill: leisure
+leisure_bird_hide:
+  image: leisure_bird_hide.svg
+  fill: leisure
+leisure_bowling_alley:
+  image: leisure_bowling_alley.svg
+  fill: leisure
+leisure_dog_park:
+  image: shop_pet.svg
+  fill: leisure
+leisure_firepit:
+  image: leisure_firepit.svg
+  fill: amenity-brown
+leisure_fishing:
+  image: leisure_fishing.svg
+  fill: leisure
+leisure_leisure_fitness_centre:
+  image: leisure_fitness.svg
+  fill: leisure
+leisure_leisure_fitness_station:
+  image: leisure_fitness.svg
+  fill: leisure
+leisure_golf_course:
+  image: leisure_golf.svg
+  fill: leisure
+leisure_miniature_golf:
+  image: leisure_miniature_golf.svg
+  fill: leisure
+leisure_outdoor_seating:
+  image: leisure_outdoor_seating.svg
+  fill: leisure
+leisure_picnic_table:
+  image: tourism_picnic.svg
+  fill: man-made
+leisure_playground:
+  image: leisure_playground.svg
+  fill: leisure
+leisure_sauna:
+  image: leisure_sauna.svg
+  fill: leisure
+leisure_slipway:
+  image: leisure_slipway.svg
+  fill: leisure
+leisure_water_park:
+  image: leisure_water_park.svg
+  fill: leisure
+man_made_lighthouse:
+  image: man_made_lighthouse.svg
+  fill: man-made
+man_made_water_tower:
+  image: man_made_water_tower.svg
+  fill: man-made
+man_made_windmill:
+  image: man_made_windmill.svg
+  fill: man-made
+shop:
+  image: shop_convenience.svg
+  fill: shop
+shop_alcohol:
+  image: shop_alcohol.svg
+  fill: shop
+shop_bakery:
+  image: shop_bakery.svg
+  fill: shop
+shop_bicycle:
+  image: shop_bicycle.svg
+  fill: shop
+shop_books:
+  image: shop_books.svg
+  fill: shop
+shop_butcher:
+  image: shop_butcher.svg
+  fill: shop
+shop_clothes:
+  image: shop_clothes.svg
+  fill: shop
+shop_car_parts:
+  image: shop_car_parts.svg
+  fill: shop
+shop_car_repair:
+  image: shop_car_repair.svg
+  fill: shop
+shop_convenience:
+  image: shop_convenience.svg
+  fill: shop
+shop_doityourself:
+  image: shop_doityourself.svg
+  fill: shop
+shop_electronics:
+  image: shop_electronics.svg
+  fill: shop
+shop_estate_agent:
+  image: shop_estateagent.svg
+  fill: shop
+shop_fashion:
+  image: shop_clothes.svg
+  fill: shop
+shop_florist:
+  image: shop_florist.svg
+  fill: shop
+shop_furniture:
+  image: shop_furniture.svg
+  fill: shop
+shop_garden_centre:
+  image: shop_florist.svg
+  fill: shop
+shop_gift:
+  image: shop_gift.svg
+  fill: shop
+shop_greengrocer:
+  image: shop_greengrocer.svg
+  fill: shop
+shop_hardware:
+  image: shop_doityourself.svg
+  fill: shop
+shop_hairdresser:
+  image: shop_hairdresser.svg
+  fill: shop
+shop_jewelry:
+  image: shop_jewelry.svg
+  fill: shop
+shop_mobile_phone:
+  image: shop_mobile_phone.svg
+  fill: shop
+shop_optician:
+  image: shop_optician.svg
+  fill: shop
+shop_pet:
+  image: shop_pet.svg
+  fill: shop
+shop_seafood:
+  image: shop_seafood.svg
+  fill: shop
+shop_shoes:
+  image: shop_shoes.svg
+  fill: shop
+shop_supermarket:
+  image: shop_supermarket.svg
+  fill: shop
+tourism_alpine_hut:
+  image: tourism_alpinehut.svg
+  fill: man-made
+tourism_apartment:
+  image: tourism_apartment.svg
+  fill: accommodation
+tourism_artwork:
+  image: tourism_artwork.svg
+  fill: amenity-brown
+tourism_camp_site:
+  image: tourism_camping.svg
+  fill: accommodation
+tourism_caravan_site:
+  image: tourism_caravan_site.svg
+  fill: accommodation
+tourism_hostel:
+  image: tourism_hostel.svg
+  fill: accommodation
+tourism_hotel:
+  image: tourism_hotel.svg
+  fill: accommodation
+tourism_motel:
+  image: tourism_motel.svg
+  fill: accommodation
+tourism_museum:
+  image: tourism_museum.svg
+  fill: culture
+tourism_picnic_site:
+  image: tourism_picnic.svg
+  fill: leisure
+tourism_viewpoint:
+  image: tourism_viewpoint.svg
+  fill: amenity-brown
+tourism_wilderness_hut:
+  image: tourism_wilderness_hut.svg
+  fill: amenity-brown
diff --git a/config/initializers/browse_image.rb b/config/initializers/browse_image.rb
new file mode 100644
index 00000000000..ca71a10e978
--- /dev/null
+++ b/config/initializers/browse_image.rb
@@ -0,0 +1,5 @@
+begin
+  BROWSE_IMAGE = YAML.load_file(Rails.root.join("config/browse_image.yml")).deep_symbolize_keys
+rescue StandardError
+  BROWSE_IMAGE = {}.freeze
+end