diff --git a/lib/Icons/icons.gresource.xml b/lib/Icons/icons.gresource.xml
index cba975180..6b135a47e 100644
--- a/lib/Icons/icons.gresource.xml
+++ b/lib/Icons/icons.gresource.xml
@@ -31,20 +31,6 @@
     <file alias="scalable/actions/view-sidebar-start-rtl-symbolic.svg" compressed="true" preprocess="xml-stripblanks">scalable/view-sidebar-end-symbolic.svg</file>
     <file alias="scalable/actions/view-sidebar-start-symbolic.svg" compressed="true" preprocess="xml-stripblanks">scalable/view-sidebar-start-symbolic.svg</file>
 
-    <file alias="scalable/categories/appointment-symbolic.svg" compressed="true" preprocess="xml-stripblanks">scalable/appointment-symbolic.svg</file>
-    <file alias="scalable/categories/office-calendar-symbolic.svg" compressed="true" preprocess="xml-stripblanks">scalable/office-calendar-symbolic.svg</file>
-
-    <file alias="scalable/categories/emoji-activities-symbolic.svg" compressed="true" preprocess="xml-stripblanks">scalable/emoji-activities.svg</file>
-    <file alias="scalable/categories/emoji-body-symbolic.svg" compressed="true" preprocess="xml-stripblanks">scalable/emoji-body.svg</file>
-    <file alias="scalable/categories/emoji-flag-symbolic.svg" compressed="true" preprocess="xml-stripblanks">scalable/emoji-flag.svg</file>
-    <file alias="scalable/categories/emoji-food-symbolic.svg" compressed="true" preprocess="xml-stripblanks">scalable/emoji-food.svg</file>
-    <file alias="scalable/categories/emoji-nature-symbolic.svg" compressed="true" preprocess="xml-stripblanks">scalable/emoji-nature.svg</file>
-    <file alias="scalable/categories/emoji-objects-symbolic.svg" compressed="true" preprocess="xml-stripblanks">scalable/emoji-objects.svg</file>
-    <file alias="scalable/categories/emoji-people-symbolic.svg" compressed="true" preprocess="xml-stripblanks">scalable/emoji-people.svg</file>
-    <file alias="scalable/categories/emoji-recent-symbolic.svg" compressed="true" preprocess="xml-stripblanks">scalable/emoji-recent.svg</file>
-    <file alias="scalable/categories/emoji-symbols-symbolic.svg" compressed="true" preprocess="xml-stripblanks">scalable/emoji-symbols.svg</file>
-    <file alias="scalable/categories/emoji-travel-symbolic.svg" compressed="true" preprocess="xml-stripblanks">scalable/emoji-travel.svg</file>
-
     <file alias="scalable/status/adw-tab-counter-symbolic.svg" compressed="true" preprocess="xml-stripblanks">scalable/adw-tab-counter-symbolic.svg</file>
     <file alias="scalable/status/adw-tab-icon-missing-symbolic.svg" compressed="true" preprocess="xml-stripblanks">scalable/adw-tab-icon-missing-symbolic.svg</file>
     <file alias="scalable/status/adw-tab-overflow-symbolic.svg" compressed="true" preprocess="xml-stripblanks">scalable/adw-tab-overflow-symbolic.svg</file>
@@ -74,4 +60,33 @@
     <file alias="16x16@2/status/emblem-mixed.svg" compressed="true" preprocess="xml-stripblanks">16/emblem-mixed.svg</file>
     <file alias="16x16@2/status/emblem-warning.svg" compressed="true" preprocess="xml-stripblanks">16/emblem-warning.svg</file>
   </gresource>
+
+  <gresource prefix="/io/elementary/granite/scalable/categories">
+    <file alias="appointment-symbolic.svg" compressed="true" preprocess="xml-stripblanks">scalable/appointment-symbolic.svg</file>
+    <file alias="office-calendar-symbolic.svg" compressed="true" preprocess="xml-stripblanks">scalable/office-calendar-symbolic.svg</file>
+
+    <file alias="emoji-activities-symbolic.svg" compressed="true" preprocess="xml-stripblanks">scalable/emoji-activities.svg</file>
+    <file alias="emoji-body-symbolic.svg" compressed="true" preprocess="xml-stripblanks">scalable/emoji-body.svg</file>
+    <file alias="emoji-flag-symbolic.svg" compressed="true" preprocess="xml-stripblanks">scalable/emoji-flag.svg</file>
+    <file alias="emoji-food-symbolic.svg" compressed="true" preprocess="xml-stripblanks">scalable/emoji-food.svg</file>
+    <file alias="emoji-nature-symbolic.svg" compressed="true" preprocess="xml-stripblanks">scalable/emoji-nature.svg</file>
+    <file alias="emoji-objects-symbolic.svg" compressed="true" preprocess="xml-stripblanks">scalable/emoji-objects.svg</file>
+    <file alias="emoji-people-symbolic.svg" compressed="true" preprocess="xml-stripblanks">scalable/emoji-people.svg</file>
+    <file alias="emoji-recent-symbolic.svg" compressed="true" preprocess="xml-stripblanks">scalable/emoji-recent.svg</file>
+    <file alias="emoji-symbols-symbolic.svg" compressed="true" preprocess="xml-stripblanks">scalable/emoji-symbols.svg</file>
+    <file alias="emoji-travel-symbolic.svg" compressed="true" preprocess="xml-stripblanks">scalable/emoji-travel.svg</file>
+
+    <file alias="poi-airport-symbolic.svg" compressed="true" preprocess="xml-stripblanks">scalable/poi-airport.svg</file>
+    <file alias="poi-bar-symbolic.svg" compressed="true" preprocess="xml-stripblanks">scalable/poi-bar.svg</file>
+    <file alias="poi-building-symbolic.svg" compressed="true" preprocess="xml-stripblanks" >scalable/poi-building.svg</file>
+    <file alias="poi-bus-stop-symbolic.svg" compressed="true" preprocess="xml-stripblanks" >scalable/poi-bus.svg</file>
+    <file alias="poi-car-symbolic.svg" compressed="true" preprocess="xml-stripblanks" >scalable/poi-street.svg</file>
+    <file alias="poi-light-rail-station-symbolic.svg" compressed="true" preprocess="xml-stripblanks">scalable/poi-light-rail.svg</file>
+    <file alias="poi-marker-symbolic.svg" compressed="true" preprocess="xml-stripblanks" >scalable/poi-marker.svg</file>
+    <file alias="poi-place-of-worship-symbolic.svg" compressed="true" preprocess="xml-stripblanks">scalable/poi-place-of-worship.svg</file>
+    <file alias="poi-railway-station-symbolic.svg" compressed="true" preprocess="xml-stripblanks">scalable/poi-train.svg</file>
+    <file alias="poi-restaurant-symbolic.svg" compressed="true" preprocess="xml-stripblanks">scalable/poi-restaurant.svg</file>
+    <file alias="poi-school-symbolic.svg" compressed="true" preprocess="xml-stripblanks">scalable/poi-school.svg</file>
+    <file alias="poi-town-symbolic.svg" compressed="true" preprocess="xml-stripblanks">scalable/poi-town.svg</file>
+  </gresource>
 </gresources>
diff --git a/lib/Icons/scalable/poi-airport.svg b/lib/Icons/scalable/poi-airport.svg
new file mode 100644
index 000000000..ec36c2a8c
--- /dev/null
+++ b/lib/Icons/scalable/poi-airport.svg
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   height="16"
+   width="16"
+   version="1.1"
+   id="svg1"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1" />
+  <g
+     transform="translate(-473 349)"
+     id="g1"
+     style="fill:#555761">
+    <path
+       d="M474-339.497c.001.794.034.781 1.031.532l4.97-1.625v4.5l-1.782 1.218c-.209.14-.219.123-.219.344v.219c0 .428.438.281.438.281l2.562-.281 2.563.281s.437.14.437-.25v-.25c0-.211-.009-.204-.219-.344l-1.78-1.218v-4.5l4.937 1.625c1.047.261 1.062.264 1.062-.532 0-.432-.011-.433-.5-.718l-5.5-3.688v-3.094c0-.554-.446-1-1-1s-1 .446-1 1v3.094l-5.5 3.688c-.457.266-.498.283-.5.656z"
+       fill="#666"
+       id="path1"
+       style="fill:#555761" />
+  </g>
+</svg>
diff --git a/lib/Icons/scalable/poi-bar.svg b/lib/Icons/scalable/poi-bar.svg
new file mode 100644
index 000000000..0c5c71245
--- /dev/null
+++ b/lib/Icons/scalable/poi-bar.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <metadata>
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <path d="m1.9395 2a0.65748 0.6489 0 0 0-0.48242 1.0918l5.543 5.8789v5.0293h-2.4922c-0.66667 0-0.66667 1 0 1h6c0.66667 0 0.66667-1 0-1h-2.5078v-5.0273l5.582-5.8848a0.6548 0.64625 0 0 0-0.47852-1.0879h-11.164zm0.8125 1h9.5469l-1.8848 2h-5.7891l-1.873-2z" color="#000000" fill="#555761" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+</svg>
diff --git a/lib/Icons/scalable/poi-building.svg b/lib/Icons/scalable/poi-building.svg
new file mode 100644
index 000000000..2972cbe51
--- /dev/null
+++ b/lib/Icons/scalable/poi-building.svg
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16" height="16" version="1.1" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><path d="m3 0c-1.108 0-2 0.892-2 2v12c0 1.108 0.892 2 2 2h10c1.108 0 2-0.892 2-2v-12c0-1.108-0.892-2-2-2h-10zm0.25 2h1.5c0.1385 0 0.25 0.1115 0.25 0.25v1.5c0 0.1385-0.1115 0.25-0.25 0.25h-1.5c-0.1385 0-0.25-0.1115-0.25-0.25v-1.5c0-0.1385 0.1115-0.25 0.25-0.25zm4 0h1.5c0.1385 0 0.25 0.1115 0.25 0.25v1.5c0 0.1385-0.1115 0.25-0.25 0.25h-1.5c-0.1385 0-0.25-0.1115-0.25-0.25v-1.5c0-0.1385 0.1115-0.25 0.25-0.25zm4 0h1.5c0.1385 0 0.25 0.1115 0.25 0.25v1.5c0 0.1385-0.1115 0.25-0.25 0.25h-1.5c-0.1385 0-0.25-0.1115-0.25-0.25v-1.5c0-0.1385 0.1115-0.25 0.25-0.25zm-8 3h1.5c0.1385 0 0.25 0.1115 0.25 0.25v1.5c0 0.1385-0.1115 0.25-0.25 0.25h-1.5c-0.1385 0-0.25-0.1115-0.25-0.25v-1.5c0-0.1385 0.1115-0.25 0.25-0.25zm4 0h1.5c0.1385 0 0.25 0.1115 0.25 0.25v1.5c0 0.1385-0.1115 0.25-0.25 0.25h-1.5c-0.1385 0-0.25-0.1115-0.25-0.25v-1.5c0-0.1385 0.1115-0.25 0.25-0.25zm4 0h1.5c0.1385 0 0.25 0.1115 0.25 0.25v1.5c0 0.1385-0.1115 0.25-0.25 0.25h-1.5c-0.1385 0-0.25-0.1115-0.25-0.25v-1.5c0-0.1385 0.1115-0.25 0.25-0.25zm-8 3h1.5c0.1385 0 0.25 0.1115 0.25 0.25v1.5c0 0.1385-0.1115 0.25-0.25 0.25h-1.5c-0.1385 0-0.25-0.1115-0.25-0.25v-1.5c0-0.1385 0.1115-0.25 0.25-0.25zm4 0h1.5c0.1385 0 0.25 0.1115 0.25 0.25v1.5c0 0.1385-0.1115 0.25-0.25 0.25h-1.5c-0.1385 0-0.25-0.1115-0.25-0.25v-1.5c0-0.1385 0.1115-0.25 0.25-0.25zm4 0h1.5c0.1385 0 0.25 0.1115 0.25 0.25v1.5c0 0.1385-0.1115 0.25-0.25 0.25h-1.5c-0.1385 0-0.25-0.1115-0.25-0.25v-1.5c0-0.1385 0.1115-0.25 0.25-0.25zm-8 3h1.5c0.1385 0 0.25 0.1115 0.25 0.25v1.5c0 0.1385-0.1115 0.25-0.25 0.25h-1.5c-0.1385 0-0.25-0.1115-0.25-0.25v-1.5c0-0.1385 0.1115-0.25 0.25-0.25zm8 0h1.5c0.1385 0 0.25 0.1115 0.25 0.25v1.5c0 0.1385-0.1115 0.25-0.25 0.25h-1.5c-0.1385 0-0.25-0.1115-0.25-0.25v-1.5c0-0.1385 0.1115-0.25 0.25-0.25zm-4.25 1h2v3h-2v-3z" fill="#555761" style="-inkscape-stroke:none"/></svg>
diff --git a/lib/Icons/scalable/poi-bus.svg b/lib/Icons/scalable/poi-bus.svg
new file mode 100644
index 000000000..5047cbeb8
--- /dev/null
+++ b/lib/Icons/scalable/poi-bus.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <metadata>
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <path d="m4 0c-1.662 0-3 1.338-3 3v0.99805 0.0019531 7c0 1.2896 0.80574 2.3848 1.9434 2.8105l0.056641 0.009765v1.5195c0 0.36608 0.29407 0.66016 0.66016 0.66016h0.67969c0.36608 0 0.66016-0.29407 0.66016-0.66016v-1.3398h6v1.3398c0 0.36608 0.29407 0.66016 0.66016 0.66016h0.67969c0.36608 0 0.66016-0.29407 0.66016-0.66016v-1.5195l0.056641-0.009765c1.1375-0.42567 1.9434-1.5209 1.9434-2.8105v-7-0.0019531-0.99805c0-1.662-1.338-3-3-3h-1.0742-5.8516-1.0742zm2.5 1h3c0.277 0 0.5 0.223 0.5 0.5s-0.223 0.5-0.5 0.5h-3c-0.277 0-0.5-0.223-0.5-0.5s0.223-0.5 0.5-0.5zm-2.4785 2h7.957c1.1204 0 2.0247 1.1068 2.0215 2.4824l-0.005859 2.5254c4.95e-4 0.55189-0.56306 0.99219-1.1152 0.99219h-9.7578c-0.55228 0-1.1185-0.43898-1.1191-0.99023l-0.0019531-2.5273c-0.00106-1.3756 0.90099-2.4824 2.0215-2.4824zm8.168 7.4805c0.39181 0.0149 0.69878 0.21622 0.77734 0.50976 0.10788 0.40075-0.23874 0.8419-0.77344 0.98438-0.5332 0.14302-1.0525-0.065063-1.1602-0.46484-0.10788-0.40075 0.23874-0.8419 0.77344-0.98438 0.08413-0.02279 0.17014-0.037229 0.25586-0.042969 0.04262-0.0028 0.085033-0.003453 0.12695-0.001953zm-8.3789 0.001953c0.12636-0.0052 0.25642 0.009399 0.38281 0.042969 0.5347 0.14247 0.88132 0.58362 0.77344 0.98438-0.10767 0.39975-0.62683 0.60786-1.1602 0.46484-0.5347-0.14247-0.88132-0.58362-0.77344-0.98438 0.079469-0.2927 0.38625-0.49311 0.77734-0.50781z" fill="#555761" style="-inkscape-stroke:none;font-variation-settings:normal"/>
+</svg>
diff --git a/lib/Icons/scalable/poi-light-rail.svg b/lib/Icons/scalable/poi-light-rail.svg
new file mode 100644
index 000000000..e2be5097a
--- /dev/null
+++ b/lib/Icons/scalable/poi-light-rail.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <metadata>
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <path d="m4.4805 0c-0.2667 0-0.48047 0.21376-0.48047 0.48047v0.039062c0 0.2667 0.21376 0.48047 0.48047 0.48047h1.5215l0.26367 1h-0.19141c-2.2575 0-4.0742 2.2475-4.0742 5.0391v1.5586 0.36328 2.0391c0 1.2896 0.8059 2.3848 1.9434 2.8105l-0.87109 1.4297a0.5 0.5 0 0 0 0.16797 0.6875 0.5 0.5 0 0 0 0.6875-0.16797l1.0723-1.7598h1.0742 3.8516 1.0742l1.0723 1.7598a0.5 0.5 0 0 0 0.6875 0.16797 0.5 0.5 0 0 0 0.16797-0.6875l-0.87109-1.4297c1.1375-0.42574 1.9434-1.5209 1.9434-2.8105v-2.0391-0.36328-1.5586c0-2.7915-1.8167-5.0391-4.0742-5.0391h-0.18359l0.26367-1h1.5137c0.2667 0 0.48047-0.21376 0.48047-0.48047v-0.039062c0-0.2667-0.21376-0.48047-0.48047-0.48047h-7.0391zm2.5566 1h1.9336l-0.26367 1h-1.4062l-0.26367-1zm2.7598 2c1.9908-0.043163 3.2009 2.0955 3.1953 3.8809l0.001953 2.127c4.13e-4 0.55189-0.56295 0.99219-1.1152 0.99219h-7.7578c-0.55228 0-1.1185-0.43898-1.1191-0.99023l-0.0019531-1.6289c-0.11668-1.8085 0.80706-4.0373 2.7793-4.3613l4.0176-0.019531zm1.3926 7.9805a0.75 1 75 0 1 0.77734 0.50976 0.75 1 75 0 1-0.77344 0.98438 0.75 1 75 0 1-1.1602-0.46484 0.75 1 75 0 1 0.77344-0.98438 0.75 1 75 0 1 0.25586-0.042969 0.75 1 75 0 1 0.12695-0.001953zm-6.3789 0.001953a1 0.75 15 0 1 0.38281 0.042969 1 0.75 15 0 1 0.77344 0.98438 1 0.75 15 0 1-1.1602 0.46484 1 0.75 15 0 1-0.77344-0.98438 1 0.75 15 0 1 0.77734-0.50781z" fill="#555761" stop-color="#000000" style="-inkscape-stroke:none;font-variation-settings:normal"/>
+</svg>
diff --git a/lib/Icons/scalable/poi-marker.svg b/lib/Icons/scalable/poi-marker.svg
new file mode 100644
index 000000000..b5d0f0e6d
--- /dev/null
+++ b/lib/Icons/scalable/poi-marker.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   height="16"
+   width="16"
+   version="1.1"
+   id="svg1"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1" />
+  <path
+     id="rect52-9"
+     style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#555761;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none;marker:none;stop-color:#000000;stop-opacity:1"
+     d="M 8 1 C 4.6865522 1.0001697 2.0001676 3.7130482 2 7.0585938 C 1.9999666 8.7588441 2.7067691 10.379686 3.9492188 11.527344 L 6.9570312 14.564453 A 1.4756448 1.4899393 0 0 0 9.0429688 14.564453 L 12.050781 11.527344 C 13.293232 10.379686 14.000033 8.7588451 14 7.0585938 C 13.999833 3.7127747 11.31372 0.99978308 8 1 z M 8 5 A 2 2 0 0 1 10 7 A 2 2 0 0 1 8 9 A 2 2 0 0 1 6 7 A 2 2 0 0 1 8 5 z " />
+</svg>
diff --git a/lib/Icons/scalable/poi-place-of-worship.svg b/lib/Icons/scalable/poi-place-of-worship.svg
new file mode 100644
index 000000000..a12411661
--- /dev/null
+++ b/lib/Icons/scalable/poi-place-of-worship.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   height="16"
+   width="16"
+   version="1.1"
+   id="svg1158"
+   xml:space="preserve"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+     id="defs1162" /><path
+     id="path1047-9-3"
+     style="font-variation-settings:normal;vector-effect:none;fill:#555761;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;stop-color:#000000"
+     d="M 7.9589844,1 C 7.5714601,1.016107 7.2273575,1.2489665 7.0722656,1.5996094 L 5.5625,5 H 1.6660156 C 0.7343129,5.00098 0.29618593,6.1371288 0.9921875,6.7480469 L 4.0273438,9.3984375 2.484375,13.662109 c -0.3190234,0.886996 0.6671138,1.676501 1.4824219,1.1875 L 8,12.419922 l 4.033203,2.429687 c 0.815309,0.488999 1.801446,-0.300504 1.482422,-1.1875 L 11.972656,9.3984375 15.007812,6.7480469 C 15.703814,6.1371288 15.265687,5.0010375 14.333984,5 H 10.4375 L 8.9277344,1.5996094 C 8.7605447,1.2217142 8.3766825,0.98353667 7.9589844,1 Z" /></svg>
diff --git a/lib/Icons/scalable/poi-restaurant.svg b/lib/Icons/scalable/poi-restaurant.svg
new file mode 100644
index 000000000..ef0f008cc
--- /dev/null
+++ b/lib/Icons/scalable/poi-restaurant.svg
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16" height="16" version="1.1" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"><metadata><rdf:RDF><cc:Work rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/></cc:Work></rdf:RDF></metadata><path transform="scale(1,-1)" d="m2.5 0c-0.20172 0-0.3964-0.22252-0.41211-0.49805-0.057674-1.0116-0.087891-3.1281-0.087891-3.502v-1.0742c0-1.3582 0.41644-2.5091 1-2.9355v-6.4902c0-0.831 0.669-1.5 1.5-1.5s1.5 0.669 1.5 1.5v6.4902c0.58404 0.42592 1 1.5766 1 2.9355v1.0742c0 0.37409-0.032086 2.4932-0.089844 3.5039-0.015674 0.27426-0.26878 0.49609-0.54492 0.49609a0.43783 0.43783 0 0 1-0.36523-0.5v-3.5c0-0.277-0.223-0.5-0.5-0.5s-0.5 0.223-0.5 0.5v3.5a0.5 0.5 0 0 1-0.5 0.5 0.5 0.5 0 0 1-0.5-0.5v-3.4355c0-0.277-0.223-0.5-0.5-0.5s-0.5 0.223-0.5 0.5v3.4355a0.5 0.5 0 0 1-0.5 0.5zm10 0c-1.933 0-3-3.5147-3-6 0-1.74 0.52299-2.6922 1.5-3v-6.0215c0-0.54242 0.4361-0.97852 0.97852-0.97852h0.042968c0.54242 0 0.97852 0.4361 0.97852 0.97852v14.521a0.5 0.5 0 0 1-0.5 0.5z" fill="#555761" stroke-width=".99999" style="-inkscape-stroke:none"/></svg>
diff --git a/lib/Icons/scalable/poi-school.svg b/lib/Icons/scalable/poi-school.svg
new file mode 100644
index 000000000..91c965b77
--- /dev/null
+++ b/lib/Icons/scalable/poi-school.svg
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16" height="16" version="1.1" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><path transform="scale(1,-1)" d="m8-2c-0.5314 0-1.0635-0.11693-1.4707-0.34961l-4.918-2.8105c-0.81437-0.46535-0.81437-1.2143 0-1.6797l4.918-2.8105c0.81437-0.46535 2.127-0.46535 2.9414 0l1.5293 0.87305v0.070313l-1.9766 1.9766a1.5 1 0 0 0-1.0234-0.26953 1.5 1 0 0 0-1.5 1 1.5 1 0 0 0 1.5 1 1.5 1 0 0 0 1.4492-0.74219v-0.0019531l2.4941-2.4922 2.4453 1.3965c0.81437 0.46535 0.81437 1.2143 0 1.6797l-4.918 2.8105c-0.40718 0.23268-0.93931 0.34961-1.4707 0.34961zm-5-7.1953v-1.8555c0-1.6338 2.23-2.9492 5-2.9492 1.1274 0 2.1654 0.21732 3 0.58594v3.0762l-1.5293-0.875c-0.81437-0.46535-2.127-0.46535-2.9414 0l-3.5293 2.0176zm10 0-1-0.57227v-3.0508c0.62509 0.49231 1 1.1025 1 1.7676v1.8555zm-1.041-3.6582c-0.1216-0.092953-0.24943-0.18181-0.38867-0.26562 0.13968 0.083847 0.26675 0.17239 0.38867 0.26562z" fill="#555761" style="-inkscape-stroke:none"/><path d="m11.943 8.2363-0.94336 0.54102v1.5605l1-0.57031v-1.4746l-0.056641-0.056641zm0.056641 4.5879c-0.28433 0.2231-0.62121 0.42254-1 0.58984v0.87891l-0.85352 0.85352a0.5 0.5 0 0 0 0 0.70703 0.5 0.5 0 0 0 0.70703 0l0.64648-0.64648 0.64648 0.64648a0.5 0.5 0 0 0 0.70703 0 0.5 0.5 0 0 0 0-0.70703l-0.85352-0.85352v-1.4688z" fill="#555761" stop-color="#000000" stroke-linecap="round"/></svg>
diff --git a/lib/Icons/scalable/poi-street.svg b/lib/Icons/scalable/poi-street.svg
new file mode 100644
index 000000000..6456362f1
--- /dev/null
+++ b/lib/Icons/scalable/poi-street.svg
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16" height="16" version="1.1" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><path d="m4 0c-1.108 0-1.908 0.89583-2 2l-1 12c-0.092014 1.1042 0.892 2 2 2h10c1.108 0 2.092-0.89583 2-2l-1-12c-0.092014-1.1042-0.892-2-2-2zm-0.27734 1h0.0625c0.277 0 0.4827 0.22103 0.46289 0.49609l-0.93555 13.008c-0.019806 0.27507-0.25816 0.49609-0.53516 0.49609h-0.0625c-0.277 0-0.4827-0.22103-0.46289-0.49609l0.93555-13.008c0.019806-0.27507 0.25816-0.49609 0.53516-0.49609zm3.7773 0h1c0.277 0 0.5 0.223 0.5 0.5v1.5h-2v-1.5c0-0.277 0.223-0.5 0.5-0.5zm4.7148 0h0.0625c0.277 0 0.51535 0.22103 0.53516 0.49609l0.93555 13.008c0.019806 0.27507-0.18589 0.49609-0.46289 0.49609h-0.0625c-0.277 0-0.51535-0.22103-0.53516-0.49609l-0.93555-13.008c-0.019806-0.27507 0.18589-0.49609 0.46289-0.49609zm-5.2148 3h2v2h-2zm0 3h2v2h-2zm0 3h2v2h-2zm0 3h2v1.5c0 0.277-0.223 0.5-0.5 0.5h-1c-0.277 0-0.5-0.223-0.5-0.5z" fill="#555761" style="-inkscape-stroke:none"/></svg>
diff --git a/lib/Icons/scalable/poi-town.svg b/lib/Icons/scalable/poi-town.svg
new file mode 100644
index 000000000..98939f136
--- /dev/null
+++ b/lib/Icons/scalable/poi-town.svg
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16" height="16" version="1.1" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><path d="m4.9707 0.021484c-0.1858 0.012594-0.34406 0.13967-0.39648 0.31836l-2.2383 7.6602h1.668c5.873e-4 -0.61338-7.49e-5 -1.2267-0.0039062-1.8398 0-1.158 0.48363-2.1292 1.5586-2.1543 0.31171-0.002487 0.62376-0.0048016 0.93555-0.0058594l-1.0684-3.6602c-0.058579-0.19948-0.2476-0.33172-0.45508-0.31836zm4.6895 1.9785c-0.36608 0-0.66016 0.29407-0.66016 0.66016v1.3398c0.4166 4.816e-4 0.83344 3.256e-4 1.25 0-0.1385 0-0.25-0.1115-0.25-0.25v-0.5c0-0.1385 0.1115-0.25 0.25-0.25h0.5c0.1385 0 0.25 0.1115 0.25 0.25v0.5c0 0.1095-0.07034 0.20234-0.16797 0.23633 0.82825-0.10538 1.7524 0.26676 2.0586 1.0566 0.084243 0.19045 0.10938 0.42598 0.10938 0.70703l-0.003906 1.2344c0.3518-0.00572 0.68918 0.13655 1.0039 0.32227v-4.6465c-6e-6 -0.36608-0.29407-0.66016-0.66016-0.66016h-3.6797zm2.5898 1h0.5c0.1385 0 0.25 0.1115 0.25 0.25v0.5c0 0.1385-0.1115 0.25-0.25 0.25h-0.5c-0.1385 0-0.25-0.1115-0.25-0.25v-0.5c0-0.1385 0.1115-0.25 0.25-0.25zm-6.5898 2c-0.36608 0-0.66016 0.29407-0.66016 0.66016v2.3398h1.5c0.831 0 1.5 0.669 1.5 1.5v0.75c0-0.1385 0.1115-0.25 0.25-0.25h0.5c0.1385 0 0.25 0.1115 0.25 0.25v0.5c0 0.1385-0.1115 0.25-0.25 0.25h-0.5c-0.1385 0-0.25-0.1115-0.25-0.25v1.5c0-0.1385 0.1115-0.25 0.25-0.25h0.5c0.1385 0 0.25 0.1115 0.25 0.25v0.5c0 0.1385-0.1115 0.25-0.25 0.25h-0.5c-0.1385 0-0.25-0.1115-0.25-0.25v1.5c0-0.1385 0.1115-0.25 0.25-0.25h0.5c0.1385 0 0.25 0.1115 0.25 0.25v0.5c0 0.1385-0.1115 0.25-0.25 0.25h-0.5c-0.1385 0-0.25-0.1115-0.25-0.25v0.75c0 0.17548-0.029094 0.34374-0.083984 0.5h3.4238c0.36608 0 0.66016-0.29407 0.66016-0.66016v-9.6797c0-0.36608-0.29407-0.66016-0.66016-0.66016h-5.6797zm0.58984 1h0.5c0.1385 0 0.25 0.1115 0.25 0.25v0.5c0 0.1385-0.1115 0.25-0.25 0.25h-0.5c-0.1385 0-0.25-0.1115-0.25-0.25v-0.5c0-0.1385 0.1115-0.25 0.25-0.25zm2 0h0.5c0.1385 0 0.25 0.1115 0.25 0.25v0.5c0 0.1385-0.1115 0.25-0.25 0.25h-0.5c-0.1385 0-0.25-0.1115-0.25-0.25v-0.5c0-0.1385 0.1115-0.25 0.25-0.25zm2 0h0.5c0.1385 0 0.25 0.1115 0.25 0.25v0.5c0 0.1385-0.1115 0.25-0.25 0.25h-0.5c-0.1385 0-0.25-0.1115-0.25-0.25v-0.5c0-0.1385 0.1115-0.25 0.25-0.25zm2.7539 1.9922c0.003093 0.75248-0.001867 1.5051-0.003906 2.2578v0.5c-0.0016 0.48709-7.06e-4 0.97387-0.001953 1.4609 0.0019 0.012419 0.001953 0.026102 0.001953 0.039062v0.5c0 0.01532-0.001306 0.030382-0.003906 0.044922-6.08e-4 0.47295 1.56e-4 0.94514 0.001953 1.418 0.0017 0.0119 0.001953 0.024709 0.001953 0.037109v0.49023 0.009766c0.06544 0.41499 0.01707 0.86378-0.15039 1.25h2.6504c0.27614-3.1e-5 0.5-0.22386 0.5-0.5v-5.1582c0-0.31237-0.15611-0.60407-0.41602-0.77734l-2.168-1.4453c-0.12198-0.081748-0.26527-0.12589-0.41211-0.12695zm-4.7539 0.0078125h0.5c0.1385 0 0.25 0.1115 0.25 0.25v0.5c0 0.1385-0.1115 0.25-0.25 0.25h-0.5c-0.1385 0-0.25-0.1115-0.25-0.25v-0.5c0-0.1385 0.1115-0.25 0.25-0.25zm2 0h0.5c0.1385 0 0.25 0.1115 0.25 0.25v0.5c0 0.1385-0.1115 0.25-0.25 0.25h-0.5c-0.1385 0-0.25-0.1115-0.25-0.25v-0.5c0-0.1385 0.1115-0.25 0.25-0.25zm-9.5898 1c-0.36608 0-0.66016 0.29407-0.66016 0.66016v5.6797c0 0.36608 0.29407 0.66016 0.66016 0.66016h5.6797c0.36608 0 0.66016-0.29407 0.66016-0.66016v-5.6797c0-0.36608-0.29407-0.66016-0.66016-0.66016h-5.6797zm0.58984 1h0.5c0.1385 0 0.25 0.1115 0.25 0.25v0.5c0 0.1385-0.1115 0.25-0.25 0.25h-0.5c-0.1385 0-0.25-0.1115-0.25-0.25v-0.5c0-0.1385 0.1115-0.25 0.25-0.25zm2 0h0.5c0.1385 0 0.25 0.1115 0.25 0.25v0.5c0 0.1385-0.1115 0.25-0.25 0.25h-0.5c-0.1385 0-0.25-0.1115-0.25-0.25v-0.5c0-0.1385 0.1115-0.25 0.25-0.25zm2 0h0.5c0.1385 0 0.25 0.1115 0.25 0.25v0.5c0 0.1385-0.1115 0.25-0.25 0.25h-0.5c-0.1385 0-0.25-0.1115-0.25-0.25v-0.5c0-0.1385 0.1115-0.25 0.25-0.25zm5 0h0.5c0.1385 0 0.25 0.1115 0.25 0.25v0.5c0 0.1385-0.1115 0.25-0.25 0.25h-0.5c-0.1385 0-0.25-0.1115-0.25-0.25v-0.5c0-0.1385 0.1115-0.25 0.25-0.25zm4 0h0.5c0.1385 0 0.25 0.1115 0.25 0.25v0.5c0 0.1385-0.1115 0.25-0.25 0.25h-0.5c-0.1385 0-0.25-0.1115-0.25-0.25v-0.5c0-0.1385 0.1115-0.25 0.25-0.25zm-13 2h0.5c0.1385 0 0.25 0.1115 0.25 0.25v0.5c0 0.1385-0.1115 0.25-0.25 0.25h-0.5c-0.1385 0-0.25-0.1115-0.25-0.25v-0.5c0-0.1385 0.1115-0.25 0.25-0.25zm2 0h0.5c0.1385 0 0.25 0.1115 0.25 0.25v0.5c0 0.1385-0.1115 0.25-0.25 0.25h-0.5c-0.1385 0-0.25-0.1115-0.25-0.25v-0.5c0-0.1385 0.1115-0.25 0.25-0.25zm2 0h0.5c0.1385 0 0.25 0.1115 0.25 0.25v0.5c0 0.1385-0.1115 0.25-0.25 0.25h-0.5c-0.1385 0-0.25-0.1115-0.25-0.25v-0.5c0-0.1385 0.1115-0.25 0.25-0.25zm5 0h0.5c0.1385 0 0.25 0.1115 0.25 0.25v0.5c0 0.1385-0.1115 0.25-0.25 0.25h-0.5c-0.1385 0-0.25-0.1115-0.25-0.25v-0.5c0-0.1385 0.1115-0.25 0.25-0.25zm4 0h0.5c0.1385 0 0.25 0.1115 0.25 0.25v0.5c0 0.1385-0.1115 0.25-0.25 0.25h-0.5c-0.1385 0-0.25-0.1115-0.25-0.25v-0.5c0-0.1385 0.1115-0.25 0.25-0.25zm-13 2h0.5c0.1385 0 0.25 0.1115 0.25 0.25v0.5c0 0.1385-0.1115 0.25-0.25 0.25h-0.5c-0.1385 0-0.25-0.1115-0.25-0.25v-0.5c0-0.1385 0.1115-0.25 0.25-0.25zm2 0h0.5c0.1385 0 0.25 0.1115 0.25 0.25v0.5c0 0.1385-0.1115 0.25-0.25 0.25h-0.5c-0.1385 0-0.25-0.1115-0.25-0.25v-0.5c0-0.1385 0.1115-0.25 0.25-0.25zm2 0h0.5c0.1385 0 0.25 0.1115 0.25 0.25v0.5c0 0.1385-0.1115 0.25-0.25 0.25h-0.5c-0.1385 0-0.25-0.1115-0.25-0.25v-0.5c0-0.1385 0.1115-0.25 0.25-0.25zm5 0h0.5c0.1385 0 0.25 0.1115 0.25 0.25v0.5c0 0.1385-0.1115 0.25-0.25 0.25h-0.5c-0.1385 0-0.25-0.1115-0.25-0.25v-0.5c0-0.1385 0.1115-0.25 0.25-0.25zm4 0h0.5c0.1385 0 0.25 0.1115 0.25 0.25v0.5c0 0.1385-0.1115 0.25-0.25 0.25h-0.5c-0.1385 0-0.25-0.1115-0.25-0.25v-0.5c0-0.1385 0.1115-0.25 0.25-0.25z" fill="#555761" style="-inkscape-stroke:none"/></svg>
diff --git a/lib/Icons/scalable/poi-train.svg b/lib/Icons/scalable/poi-train.svg
new file mode 100644
index 000000000..4cf835023
--- /dev/null
+++ b/lib/Icons/scalable/poi-train.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <metadata>
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <path d="m6.0742 0c-2.2575 0-4.0742 1.2064-4.0742 3.998v7.002c0 1.2896 0.80582 2.3848 1.9434 2.8105l-0.87109 1.4297c-0.14372 0.23619-0.068473 0.54419 0.16797 0.6875 0.23619 0.14372 0.54419 0.068472 0.6875-0.16797l1.0723-1.7598h6l1.0723 1.7598c0.14331 0.23644 0.45131 0.31169 0.6875 0.16797 0.23644-0.14331 0.31169-0.45131 0.16797-0.6875l-0.87109-1.4297c1.1375-0.42574 1.9434-1.5209 1.9434-2.8105v-7.002c0-2.7915-1.8167-3.998-4.0742-3.998h-3.8516zm0.42578 1h3c0.277 0 0.5 0.223 0.5 0.5s-0.223 0.5-0.5 0.5h-3c-0.277 0-0.5-0.223-0.5-0.5s0.223-0.5 0.5-0.5zm-1.4785 2h5.957c1.1204 0 2.0247 1.1068 2.0215 2.4824l-0.005859 2.5254c4.54e-4 0.55189-0.56298 0.99219-1.1152 0.99219h-7.7578c-0.55228 0-1.1185-0.43898-1.1191-0.99023l-0.0019531-2.5273c-0.001063-1.3756 0.90103-2.4824 2.0215-2.4824zm6.168 7.4805c0.39181 0.0149 0.69878 0.21622 0.77734 0.50976 0.10788 0.40075-0.23874 0.8419-0.77344 0.98438-0.5332 0.14302-1.0525-0.065053-1.1602-0.46484-0.10788-0.40075 0.23874-0.8419 0.77344-0.98438 0.08413-0.02279 0.17014-0.037229 0.25586-0.042969 0.04262-0.0028 0.085023-0.003453 0.12695-0.001953zm-6.3789 0.001953c0.12636-0.0052 0.25642 0.009399 0.38281 0.042969 0.5347 0.14247 0.88132 0.58362 0.77344 0.98438-0.10767 0.39975-0.62691 0.60786-1.1602 0.46484-0.5347-0.14247-0.88132-0.58362-0.77344-0.98438 0.079469-0.2927 0.38625-0.49311 0.77734-0.50781z" fill="#555761" style="-inkscape-stroke:none;font-variation-settings:normal"/>
+</svg>