diff --git a/assets/themes/natuurpunt/bench.svg b/assets/themes/natuurpunt/bench.svg
index 7aea9079e..62492b05c 100644
--- a/assets/themes/natuurpunt/bench.svg
+++ b/assets/themes/natuurpunt/bench.svg
@@ -1,6 +1,37 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="385px" height="11px" viewBox="0 0 385 11" version="1.1">
-  <g id="surface1">
-    <path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 294.691406 64.351562 L 308.769531 64.351562 L 308.769531 19.46875 L 326.480469 19.46875 L 326.480469 7.148438 L 305.03125 7.148438 L 305.03125 -3.851562 L 315.261719 -3.851562 L 315.261719 -20.898438 L 305.03125 -20.898438 L 305.03125 -34.648438 L 315.261719 -34.648438 L 315.261719 -55 L 82.5 -55 L 82.5 -34.648438 L 93.5 -34.648438 L 93.5 -20.898438 L 82.5 -20.898438 L 82.5 -4.070312 L 93.5 -4.070312 L 93.5 6.929688 L 71.5 6.929688 L 71.5 19.46875 L 89.210938 19.46875 L 89.210938 64.351562 L 103.289062 64.351562 L 103.289062 19.46875 L 294.691406 19.46875 Z M 100.761719 -34.648438 L 297.21875 -34.648438 L 297.21875 -20.898438 L 100.761719 -20.898438 Z M 100.761719 7.148438 L 100.761719 -3.851562 L 297.21875 -3.851562 L 297.21875 7.148438 Z M 100.761719 7.148438 "/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="254.98047"
+   height="119.35156"
+   viewBox="0 0 254.98047 119.35156"
+   version="1.1"
+   id="svg5"
+   sodipodi:docname="bench.svg"
+   inkscape:version="1.1.1 (1:1.1+202109281949+c3084ef5ed)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     id="namedview7"
+     pagecolor="#505050"
+     bordercolor="#eeeeee"
+     borderopacity="1"
+     inkscape:pageshadow="0"
+     inkscape:pageopacity="0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="4.1922078"
+     inkscape:cx="120.93866"
+     inkscape:cy="60.707869"
+     inkscape:current-layer="svg5" />
+  <g
+     id="surface1"
+     transform="translate(-71.5,55)">
+    <path
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       d="m 294.69141,64.351562 h 14.07812 V 19.46875 h 17.71094 V 7.148438 h -21.44922 v -11 h 10.23047 v -17.046876 h -10.23047 v -13.75 h 10.23047 V -55 H 82.5 v 20.351562 h 11 v 13.75 h -11 v 16.828126 h 11 v 11 h -22 V 19.46875 H 89.210938 V 64.351562 H 103.28906 V 19.46875 h 191.40235 z m -193.92969,-99 h 196.45703 v 13.75 H 100.76172 Z m 0,41.796876 v -11 h 196.45703 v 11 z m 0,0"
+       id="path2" />
   </g>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/assets/themes/natuurpunt/birdhide.svg b/assets/themes/natuurpunt/birdhide.svg
index 83af3c146..46a2e50db 100644
--- a/assets/themes/natuurpunt/birdhide.svg
+++ b/assets/themes/natuurpunt/birdhide.svg
@@ -1,6 +1,37 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="360px" height="9px" viewBox="0 0 360 9" version="1.1">
-  <g id="surface1">
-    <path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 281.339844 5.308594 L 280.078125 3.421875 L 246.421875 -46.980469 C 240.730469 -58.523438 227.886719 -64.675781 215.328125 -61.878906 C 202.769531 -59.078125 193.75 -48.054688 193.5 -35.191406 C 193.523438 -33.195312 193.734375 -31.207031 194.128906 -29.25 L 194.128906 -25.828125 L 194.128906 -30.691406 L 187.828125 -26.640625 L 187.828125 -21.238281 L 177.839844 -21.238281 L 177.839844 -27 L 171.539062 -31.050781 L 171.539062 -26.191406 L 171.539062 -29.25 C 171.9375 -31.207031 172.148438 -33.195312 172.171875 -35.191406 C 172.363281 -48.429688 163.222656 -59.984375 150.292969 -62.839844 C 137.359375 -65.699219 124.203125 -59.070312 118.800781 -46.980469 L 85.5 3.421875 L 84.238281 5.308594 C 73.613281 22.066406 74.472656 43.652344 86.394531 59.511719 C 98.316406 75.375 118.8125 82.199219 137.859375 76.652344 C 156.910156 71.101562 170.539062 54.34375 172.078125 34.558594 L 172.078125 31.589844 C 172.078125 31.589844 172.078125 30.871094 172.078125 30.511719 C 172.078125 30.148438 172.078125 28.800781 172.078125 27.988281 L 172.078125 13.050781 L 180 6.03125 L 180 -3.511719 L 185.398438 -3.511719 L 185.398438 6.03125 L 193.320312 13.050781 L 193.320312 27.988281 C 193.320312 28.800781 193.320312 29.609375 193.320312 30.511719 C 193.320312 31.410156 193.320312 31.230469 193.320312 31.589844 L 193.320312 34.558594 C 194.863281 54.34375 208.488281 71.101562 227.539062 76.652344 C 246.589844 82.199219 267.085938 75.375 279.007812 59.511719 C 290.925781 43.652344 291.785156 22.066406 281.160156 5.308594 Z M 124.199219 59.308594 C 112.679688 59.347656 102.277344 52.429688 97.851562 41.796875 C 93.425781 31.160156 95.855469 18.90625 104 10.761719 C 112.144531 2.613281 124.398438 0.1875 135.035156 4.613281 C 145.671875 9.039062 152.585938 19.441406 152.550781 30.960938 C 152.402344 46.527344 139.765625 59.082031 124.199219 59.128906 Z M 241.199219 59.308594 C 229.6875 59.308594 219.3125 52.371094 214.917969 41.734375 C 210.519531 31.09375 212.96875 18.855469 221.121094 10.726562 C 229.273438 2.601562 241.523438 0.191406 252.144531 4.621094 C 262.769531 9.050781 269.675781 19.449219 269.640625 30.960938 C 269.492188 46.632812 256.691406 59.230469 241.019531 59.128906 Z M 241.199219 59.308594 "/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="211.75177"
+   height="142.0576"
+   viewBox="0 0 211.75177 142.0576"
+   version="1.1"
+   id="svg5"
+   sodipodi:docname="birdhide.svg"
+   inkscape:version="1.1.1 (1:1.1+202109281949+c3084ef5ed)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     id="namedview7"
+     pagecolor="#505050"
+     bordercolor="#eeeeee"
+     borderopacity="1"
+     inkscape:pageshadow="0"
+     inkscape:pageopacity="0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="4.4833333"
+     inkscape:cx="103.27138"
+     inkscape:cy="68.141264"
+     inkscape:current-layer="svg5" />
+  <g
+     id="surface1"
+     transform="translate(-76.823531,63.500601)">
+    <path
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       d="m 281.33984,5.308594 -1.26172,-1.886719 -33.65625,-50.402344 c -5.6914,-11.542969 -18.53515,-17.695312 -31.09375,-14.898437 -12.55859,2.800781 -21.57812,13.824218 -21.82812,26.6875 0.0234,1.996094 0.23437,3.984375 0.62891,5.941406 v 3.421875 -4.863281 l -6.30079,4.050781 v 5.402344 h -9.98828 V -27 l -6.30078,-4.050781 V -26.191406 -29.25 c 0.39844,-1.957031 0.60938,-3.945312 0.63281,-5.941406 0.19141,-13.238282 -8.94921,-24.792969 -21.8789,-27.648438 -12.9336,-2.859375 -26.08984,3.769532 -31.49219,15.859375 L 85.5,3.421875 84.238281,5.308594 c -10.625,16.757812 -9.765625,38.34375 2.15625,54.203125 11.921875,15.863281 32.417969,22.6875 51.464839,17.140625 19.05079,-5.550782 32.67969,-22.308594 34.21875,-42.09375 v -2.96875 c 0,0 0,-0.71875 0,-1.078125 0,-0.363281 0,-1.710938 0,-2.523438 v -14.9375 L 180,6.03125 v -9.542969 h 5.39844 V 6.03125 l 7.92187,7.019531 v 14.9375 c 0,0.8125 0,1.621094 0,2.523438 0,0.898437 0,0.71875 0,1.078125 v 2.96875 c 1.54297,19.785156 15.16797,36.542968 34.21875,42.09375 19.05078,5.546875 39.54688,-1.277344 51.46875,-17.140625 11.91797,-15.859375 12.77735,-37.445313 2.15235,-54.203125 z m -157.14062,54 C 112.67969,59.347656 102.27734,52.429688 97.851562,41.796875 93.425781,31.160156 95.855469,18.90625 104,10.761719 112.14453,2.613281 124.39844,0.1875 135.03516,4.613281 c 10.63671,4.425781 17.55078,14.828125 17.51562,26.347657 -0.14844,15.566406 -12.78516,28.121093 -28.35156,28.167968 z m 117,0 c -11.51172,0 -21.88672,-6.9375 -26.28125,-17.574219 -4.39844,-10.640625 -1.94922,-22.878906 6.20312,-31.007813 8.15235,-8.125 20.40235,-10.535156 31.02344,-6.105468 10.625,4.429687 17.53125,14.828125 17.49609,26.339844 -0.14843,15.671874 -12.94921,28.269531 -28.62109,28.167968 z m 0,0"
+       id="path2" />
   </g>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/assets/themes/natuurpunt/drips.svg b/assets/themes/natuurpunt/drips.svg
index 45c2f6d00..98e37b975 100644
--- a/assets/themes/natuurpunt/drips.svg
+++ b/assets/themes/natuurpunt/drips.svg
@@ -1,6 +1,37 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="385px" height="11px" viewBox="0 0 385 11" version="1.1">
-  <g id="surface1">
-    <path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 258.71875 -55 L 134.96875 -55 C 130.828125 -55.058594 126.875 -53.273438 124.175781 -50.128906 C 121.476562 -46.984375 120.316406 -42.804688 121 -38.71875 L 144.539062 97.789062 C 145.464844 104.703125 151.316406 109.898438 158.289062 110 L 235.289062 110 C 242.113281 109.949219 247.933594 105.054688 249.148438 98.339844 L 272.46875 -38.71875 C 273.148438 -42.765625 272.011719 -46.910156 269.363281 -50.042969 C 266.71875 -53.179688 262.824219 -54.992188 258.71875 -55 Z M 220.878906 37.179688 C 220.878906 37.179688 220.878906 37.839844 220.878906 38.171875 C 220.652344 39.296875 220.320312 40.402344 219.890625 41.46875 L 219.890625 42.570312 C 219.441406 43.558594 218.929688 44.511719 218.351562 45.429688 C 218.160156 45.871094 217.898438 46.28125 217.578125 46.640625 C 217.019531 47.492188 216.394531 48.300781 215.710938 49.058594 L 214.5 50.269531 L 212.300781 52.140625 L 211.199219 52.910156 L 209 53.679688 C 205.324219 55.667969 201.1875 56.652344 197.011719 56.539062 C 185.726562 56.320312 176.203125 48.09375 174.351562 36.960938 C 173.296875 31.089844 174.601562 25.042969 177.980469 20.128906 C 184.03125 11 190.078125 1.648438 196.238281 -7.589844 C 196.515625 -8.160156 197.09375 -8.519531 197.726562 -8.519531 C 198.359375 -8.519531 198.933594 -8.160156 199.210938 -7.589844 C 205.261719 1.539062 211.421875 10.78125 217.359375 19.910156 L 218.238281 21.339844 C 218.636719 22.082031 218.96875 22.851562 219.230469 23.648438 L 219.230469 24.640625 C 219.675781 25.777344 220.007812 26.957031 220.21875 28.160156 C 220.269531 28.453125 220.269531 28.75 220.21875 29.039062 C 220.328125 30.246094 220.328125 31.460938 220.21875 32.671875 L 220.21875 33.660156 C 220.550781 34.808594 220.769531 35.988281 220.878906 37.179688 Z M 220.878906 37.179688 "/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="151.85362"
+   height="165.0014"
+   viewBox="0 0 151.85362 165.0014"
+   version="1.1"
+   id="svg5"
+   sodipodi:docname="drips.svg"
+   inkscape:version="1.1.1 (1:1.1+202109281949+c3084ef5ed)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     id="namedview7"
+     pagecolor="#505050"
+     bordercolor="#eeeeee"
+     borderopacity="1"
+     inkscape:pageshadow="0"
+     inkscape:pageopacity="0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="4.1922078"
+     inkscape:cx="71.799876"
+     inkscape:cy="60.707869"
+     inkscape:current-layer="svg5" />
+  <g
+     id="surface1"
+     transform="translate(-120.80792,55.001399)">
+    <path
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       d="m 258.71875,-55 h -123.75 c -4.14063,-0.05859 -8.09375,1.726562 -10.79297,4.871094 -2.69922,3.144531 -3.85937,7.324218 -3.17578,11.410156 l 23.53906,136.507812 c 0.92578,6.914068 6.77735,12.109378 13.75,12.210938 h 77 c 6.82422,-0.0508 12.64453,-4.94531 13.85938,-11.660156 L 272.46875,-38.71875 c 0.67969,-4.046875 -0.45703,-8.191406 -3.10547,-11.324219 -2.64453,-3.136719 -6.53906,-4.949219 -10.64453,-4.957031 z m -37.83984,92.179688 c 0,0 0,0.660156 0,0.992187 -0.22657,1.125 -0.5586,2.230469 -0.98829,3.296875 v 1.101562 c -0.44921,0.988282 -0.96093,1.941407 -1.53906,2.859376 -0.1914,0.441406 -0.45312,0.851562 -0.77344,1.210937 -0.55859,0.851563 -1.18359,1.660156 -1.86718,2.417969 L 214.5,50.269531 212.30078,52.140625 211.19922,52.910156 209,53.679688 c -3.67578,1.988281 -7.8125,2.972656 -11.98828,2.859374 -11.28516,-0.21875 -20.8086,-8.445312 -22.66016,-19.578124 -1.05469,-5.871094 0.25,-11.917969 3.62891,-16.832032 C 184.03125,11 190.07812,1.648438 196.23828,-7.589844 c 0.27734,-0.570312 0.85547,-0.929687 1.48828,-0.929687 0.63281,0 1.20703,0.359375 1.48438,0.929687 6.05078,9.128906 12.21093,18.371094 18.14843,27.5 l 0.87891,1.429688 c 0.39844,0.742187 0.73047,1.511718 0.99219,2.308594 v 0.992187 c 0.44531,1.136719 0.77734,2.316406 0.98828,3.519531 0.0508,0.292969 0.0508,0.589844 0,0.878906 0.10937,1.207032 0.10937,2.421876 0,3.632813 v 0.988281 c 0.33203,1.148438 0.55078,2.328125 0.66016,3.519532 z m 0,0"
+       id="path2" />
   </g>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/assets/themes/natuurpunt/information.svg b/assets/themes/natuurpunt/information.svg
index d94e914e2..0a6d6c347 100644
--- a/assets/themes/natuurpunt/information.svg
+++ b/assets/themes/natuurpunt/information.svg
@@ -1,6 +1,45 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="360px" height="9px" viewBox="0 0 360 9" version="1.1">
-  <g id="surface1">
-    <path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 214.828125 72 L 160.019531 72 L 160.019531 65.339844 L 164.429688 65.339844 C 165.699219 65.222656 166.941406 64.917969 168.121094 64.441406 C 169.71875 63.9375 171.089844 62.886719 171.988281 61.46875 C 172.796875 59.882812 173.199219 58.121094 173.160156 56.339844 L 173.160156 5.488281 C 173.195312 3.5625 172.699219 1.660156 171.71875 0 C 170.8125 -1.429688 169.617188 -2.65625 168.210938 -3.601562 C 166.699219 -4.523438 165.0625 -5.222656 163.351562 -5.671875 C 161.433594 -6.179688 159.476562 -6.511719 157.5 -6.660156 L 157.5 -13.320312 L 200.519531 -15.660156 L 201.78125 -14.308594 L 201.78125 54.71875 C 201.730469 56.523438 202.199219 58.304688 203.128906 59.851562 C 203.953125 61.300781 205.257812 62.414062 206.820312 63 C 208.039062 63.578125 209.304688 64.058594 210.601562 64.441406 C 211.988281 64.804688 213.402344 65.074219 214.828125 65.25 Z M 202.5 -46.980469 C 202.382812 -42.726562 200.449219 -38.730469 197.191406 -36 C 193.949219 -32.960938 189.664062 -31.28125 185.21875 -31.320312 C 180.726562 -31.308594 176.394531 -32.980469 173.070312 -36 C 169.804688 -38.855469 167.960938 -43.003906 168.03125 -47.339844 C 168.066406 -51.550781 169.902344 -55.546875 173.070312 -58.320312 C 176.355469 -61.40625 180.714844 -63.082031 185.21875 -63 C 189.703125 -63.097656 194.039062 -61.414062 197.28125 -58.320312 C 200.570312 -55.46875 202.472656 -51.335938 202.5 -46.980469 Z M 202.5 -46.980469 "/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   viewBox="-17.5 7 6.3699999 15.000459"
+   version="1.1"
+   id="svg10"
+   sodipodi:docname="information.svg"
+   width="6.3699999"
+   height="15.000459"
+   inkscape:version="1.1.1 (1:1.1+202109281949+c3084ef5ed)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview12"
+     pagecolor="#505050"
+     bordercolor="#eeeeee"
+     borderopacity="1"
+     inkscape:pageshadow="0"
+     inkscape:pageopacity="0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="40.35"
+     inkscape:cx="2.5030979"
+     inkscape:cy="7.4969021"
+     inkscape:current-layer="svg10" />
+  <defs
+     id="defs4">
+    <style
+       id="style2">.cls-1{fill:#fff;}</style>
+  </defs>
+  <g
+     id="Layer_2"
+     data-name="Layer 2"
+     transform="translate(-17.5,7.0004586)">
+    <g
+       id="Layer_1-2"
+       data-name="Layer 1">
+      <path
+         class="cls-1"
+         d="M 6.37,15 H 0.28 v -0.74 h 0.49 a 1.45,1.45 0 0 0 0.41,-0.1 0.79,0.79 0 0 0 0.43,-0.33 1.2,1.2 0 0 0 0.13,-0.57 V 7.61 A 1.16,1.16 0 0 0 1.58,7 1.36,1.36 0 0 0 1.19,6.6 2,2 0 0 0 0.65,6.37 3.55,3.55 0 0 0 0,6.26 V 5.52 L 4.78,5.26 4.92,5.41 v 7.67 A 1.05,1.05 0 0 0 5.07,13.65 0.79,0.79 0 0 0 5.48,14 2.85,2.85 0 0 0 5.9,14.16 3.55,3.55 0 0 0 6.37,14.25 Z M 5,1.78 A 1.65,1.65 0 0 1 4.41,3 1.92,1.92 0 0 1 3.08,3.52 2,2 0 0 1 1.73,3 1.64,1.64 0 0 1 1.17,1.74 1.64,1.64 0 0 1 1.73,0.52 1.92,1.92 0 0 1 3.08,0 1.88,1.88 0 0 1 4.42,0.52 1.68,1.68 0 0 1 5,1.78 Z"
+         id="path6" />
+    </g>
   </g>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/assets/themes/natuurpunt/information_board.svg b/assets/themes/natuurpunt/information_board.svg
index e8f11e311..222b5aba0 100644
--- a/assets/themes/natuurpunt/information_board.svg
+++ b/assets/themes/natuurpunt/information_board.svg
@@ -1,7 +1,42 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="385px" height="11px" viewBox="0 0 385 11" version="1.1">
-  <g id="surface1">
-    <path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 212.191406 40.371094 L 176.109375 40.371094 L 176.109375 35.96875 L 178.96875 35.96875 C 179.863281 35.839844 180.722656 35.542969 181.5 35.089844 C 182.53125 34.703125 183.386719 33.960938 183.921875 33 C 184.496094 31.960938 184.761719 30.777344 184.691406 29.589844 L 184.691406 -3.410156 C 184.699219 -4.640625 184.398438 -5.851562 183.808594 -6.929688 C 183.175781 -7.824219 182.394531 -8.605469 181.5 -9.238281 C 180.507812 -9.949219 179.4375 -10.539062 178.308594 -11 L 174.460938 -11 L 174.460938 -15.398438 L 202.730469 -16.828125 L 203.5 -16.058594 L 203.5 29.039062 C 203.488281 30.234375 203.792969 31.410156 204.378906 32.449219 C 204.96875 33.367188 205.808594 34.09375 206.800781 34.539062 L 209.328125 35.421875 L 212.191406 35.421875 Z M 203.5 -37.839844 C 203.488281 -34.972656 202.246094 -32.25 200.089844 -30.359375 C 195.601562 -26.277344 188.738281 -26.277344 184.25 -30.359375 C 182.335938 -32.363281 181.34375 -35.074219 181.5 -37.839844 C 181.5 -40.679688 182.746094 -43.371094 184.910156 -45.210938 C 186.984375 -47.359375 189.84375 -48.578125 192.828125 -48.578125 C 195.816406 -48.578125 198.675781 -47.359375 200.75 -45.210938 C 202.667969 -43.253906 203.667969 -40.574219 203.5 -37.839844 Z M 203.5 -37.839844 "/>
-    <path style="fill:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 0.5 0.5 L 17.639915 0.5 L 17.639915 13.069957 L 0.5 13.069957 Z M 0.5 0.5 " transform="matrix(11,0,0,11,93.5,-77)"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="199.53906"
+   height="149.26953"
+   viewBox="0 0 199.53906 149.26953"
+   version="1.1"
+   id="svg7"
+   sodipodi:docname="information_board.svg"
+   inkscape:version="1.1.1 (1:1.1+202109281949+c3084ef5ed)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs11" />
+  <sodipodi:namedview
+     id="namedview9"
+     pagecolor="#505050"
+     bordercolor="#eeeeee"
+     borderopacity="1"
+     inkscape:pageshadow="0"
+     inkscape:pageopacity="0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="4.1922078"
+     inkscape:cx="98.993185"
+     inkscape:cy="82.653346"
+     inkscape:current-layer="svg7" />
+  <g
+     id="surface1"
+     transform="translate(-93.5,77)">
+    <path
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       d="M 212.19141,40.371094 H 176.10937 V 35.96875 h 2.85938 c 0.89453,-0.128906 1.75391,-0.425781 2.53125,-0.878906 1.03125,-0.386719 1.88672,-1.128906 2.42187,-2.089844 0.57422,-1.039062 0.83985,-2.222656 0.76954,-3.410156 v -33 c 0.008,-1.230469 -0.29297,-2.441406 -0.88282,-3.519532 C 183.17578,-7.824219 182.39453,-8.605469 181.5,-9.238281 180.50781,-9.949219 179.4375,-10.539062 178.30859,-11 h -3.84765 v -4.398438 l 28.26953,-1.429687 0.76953,0.769531 v 45.097656 c -0.0117,1.195313 0.29297,2.371094 0.87891,3.410157 0.58984,0.917969 1.42968,1.644531 2.42187,2.089843 l 2.52734,0.882813 h 2.86329 z M 203.5,-37.839844 c -0.0117,2.867188 -1.25391,5.589844 -3.41016,7.480469 -4.48828,4.082031 -11.35156,4.082031 -15.83984,0 -1.91406,-2.003906 -2.90625,-4.714844 -2.75,-7.480469 0,-2.839844 1.24609,-5.53125 3.41016,-7.371094 2.07421,-2.148437 4.93359,-3.367187 7.91796,-3.367187 2.98829,0 5.84766,1.21875 7.92188,3.367187 1.91797,1.957032 2.91797,4.636719 2.75,7.371094 z m 0,0"
+       id="path2" />
+    <path
+       style="fill:none;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-opacity:1"
+       d="M 0.5,0.5 H 17.639915 V 13.069957 H 0.5 Z m 0,0"
+       transform="matrix(11,0,0,11,93.5,-77)"
+       id="path4" />
   </g>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/assets/themes/natuurpunt/nature_reserve.svg b/assets/themes/natuurpunt/nature_reserve.svg
index 1a04ca176..a5f32ac36 100644
--- a/assets/themes/natuurpunt/nature_reserve.svg
+++ b/assets/themes/natuurpunt/nature_reserve.svg
@@ -1,6 +1,37 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="360px" height="9px" viewBox="0 0 360 9" version="1.1">
-  <g id="surface1">
-    <path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 240.03125 -3.148438 C 241.113281 -6.335938 241.660156 -9.683594 241.648438 -13.050781 C 241.65625 -28.054688 230.871094 -40.890625 216.089844 -43.46875 C 214.597656 -59.378906 201.246094 -71.542969 185.265625 -71.542969 C 169.285156 -71.542969 155.929688 -59.378906 154.441406 -43.46875 C 138.253906 -42.53125 125.535156 -29.261719 125.28125 -13.050781 C 125.269531 -9.683594 125.816406 -6.335938 126.898438 -3.148438 C 116.75 2.789062 110.835938 13.964844 111.644531 25.695312 C 112.449219 37.429688 119.832031 47.691406 130.699219 52.183594 C 141.566406 56.679688 154.042969 54.628906 162.898438 46.890625 C 165.476562 49.539062 168.527344 51.675781 171.898438 53.191406 L 171.898438 106.558594 L 195.03125 106.558594 L 195.03125 54.71875 C 199.03125 53.339844 202.730469 51.203125 205.921875 48.421875 C 215.125 55.246094 227.34375 56.433594 237.6875 51.5 C 248.035156 46.570312 254.808594 36.328125 255.296875 24.878906 C 255.789062 13.429688 249.914062 2.648438 240.03125 -3.148438 Z M 240.03125 -3.148438 "/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="143.75452"
+   height="178.10156"
+   viewBox="0 0 143.75452 178.10156"
+   version="1.1"
+   id="svg5"
+   sodipodi:docname="nature_reserve.svg"
+   inkscape:version="1.1.1 (1:1.1+202109281949+c3084ef5ed)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     id="namedview7"
+     pagecolor="#505050"
+     bordercolor="#eeeeee"
+     borderopacity="1"
+     inkscape:pageshadow="0"
+     inkscape:pageopacity="0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="4.4833333"
+     inkscape:cx="68.475836"
+     inkscape:cy="76.171004"
+     inkscape:current-layer="svg5" />
+  <g
+     id="surface1"
+     transform="translate(-111.57104,71.542969)">
+    <path
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       d="m 240.03125,-3.148438 c 1.08203,-3.1875 1.62891,-6.535156 1.61719,-9.902343 0.008,-15.003907 -10.77735,-27.839844 -25.5586,-30.417969 -1.49218,-15.910156 -14.84375,-28.074219 -30.82422,-28.074219 -15.98046,0 -29.33593,12.164063 -30.82421,28.074219 -16.1875,0.9375 -28.90625,14.207031 -29.16016,30.417969 -0.0117,3.367187 0.53516,6.714843 1.61719,9.902343 -10.14844,5.9375 -16.0625,17.113282 -15.25391,28.84375 0.80469,11.734376 8.1875,21.996094 19.05469,26.488282 10.86719,4.496094 23.34375,2.445312 32.19922,-5.292969 2.57812,2.648437 5.6289,4.785156 9,6.300781 v 53.367184 h 23.13281 V 54.71875 c 4,-1.378906 7.69922,-3.515625 10.89062,-6.296875 9.20313,6.824219 21.42188,8.011719 31.76563,3.078125 10.34766,-4.929688 17.12109,-15.171875 17.60937,-26.621094 0.49219,-11.449218 -5.38281,-22.230468 -15.26562,-28.027344 z m 0,0"
+       id="path2" />
   </g>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/assets/themes/natuurpunt/parking.svg b/assets/themes/natuurpunt/parking.svg
index 6df3b6d40..411d9a887 100644
--- a/assets/themes/natuurpunt/parking.svg
+++ b/assets/themes/natuurpunt/parking.svg
@@ -1,6 +1,45 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="385px" height="11px" viewBox="0 0 385 11" version="1.1">
-  <g id="surface1">
-    <path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 266.640625 -42.019531 C 264.585938 -48.910156 260.800781 -55.160156 255.640625 -60.171875 C 249.472656 -65.792969 242.152344 -69.996094 234.191406 -72.488281 C 223.5 -75.738281 212.359375 -77.261719 201.191406 -77 L 143.769531 -77 C 140.332031 -76.941406 137.558594 -74.167969 137.5 -70.730469 L 137.5 92.289062 C 137.410156 94.019531 138.027344 95.710938 139.210938 96.976562 C 140.390625 98.242188 142.039062 98.972656 143.769531 99 L 171.929688 99 C 175.410156 99 178.25 96.210938 178.308594 92.730469 L 178.308594 38.828125 L 201.960938 38.828125 C 213.148438 39.128906 224.304688 37.53125 234.960938 34.101562 C 242.882812 31.476562 250.078125 27.03125 255.96875 21.121094 C 261.128906 15.722656 264.902344 9.15625 266.96875 1.980469 C 268.988281 -5.179688 270.023438 -12.582031 270.050781 -20.019531 C 270.089844 -27.488281 268.9375 -34.914062 266.640625 -42.019531 Z M 233.640625 -9.019531 C 232.660156 -5.359375 230.679688 -2.046875 227.921875 0.550781 C 224.777344 3.347656 221.003906 5.347656 216.921875 6.378906 C 211.636719 7.921875 206.140625 8.625 200.640625 8.46875 L 178.640625 8.46875 C 175.175781 8.46875 172.371094 5.664062 172.371094 2.199219 L 172.371094 -41.800781 C 172.371094 -45.261719 175.175781 -48.070312 178.640625 -48.070312 L 200.640625 -48.070312 C 206.085938 -48.203125 211.523438 -47.609375 216.808594 -46.308594 C 220.859375 -45.429688 224.632812 -43.578125 227.808594 -40.921875 C 230.613281 -38.589844 232.675781 -35.492188 233.75 -32.011719 C 234.785156 -28.433594 235.300781 -24.730469 235.289062 -21.011719 C 235.25 -16.945312 234.617188 -12.90625 233.421875 -9.019531 Z M 233.640625 -9.019531 "/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   viewBox="-12.5 7 12.050868 16.002609"
+   version="1.1"
+   id="svg10"
+   sodipodi:docname="parking.svg"
+   width="12.050868"
+   height="16.002609"
+   inkscape:version="1.1.1 (1:1.1+202109281949+c3084ef5ed)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview12"
+     pagecolor="#505050"
+     bordercolor="#eeeeee"
+     borderopacity="1"
+     inkscape:pageshadow="0"
+     inkscape:pageopacity="0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="46.114286"
+     inkscape:cx="5.0092937"
+     inkscape:cy="7.5139405"
+     inkscape:current-layer="svg10" />
+  <defs
+     id="defs4">
+    <style
+       id="style2">.cls-1{fill:#fff;}</style>
+  </defs>
+  <g
+     id="Layer_2"
+     data-name="Layer 2"
+     transform="translate(-12.49922,7.0026088)">
+    <g
+       id="Layer_1-2"
+       data-name="Layer 1">
+      <path
+         class="cls-1"
+         d="m 11.74,3.18 v 0 A 3.82,3.82 0 0 0 10.74,1.53 5.2,5.2 0 0 0 8.79,0.41 9.55,9.55 0 0 0 5.79,0 H 0.57 A 0.58,0.58 0 0 0 0,0.57 V 15.39 A 0.58,0.58 0 0 0 0.57,16 h 2.56 a 0.58,0.58 0 0 0 0.58,-0.57 v -4.9 h 2.15 a 9,9 0 0 0 3,-0.43 4.85,4.85 0 0 0 1.91,-1.18 4.2,4.2 0 0 0 1,-1.74 7.47,7.47 0 0 0 0.28,-2 6.39,6.39 0 0 0 -0.31,-2 z m -3,3 v 0 a 1.85,1.85 0 0 1 -0.52,0.87 2.38,2.38 0 0 1 -1,0.53 4.8,4.8 0 0 1 -1.48,0.19 h -2 A 0.57,0.57 0 0 1 3.17,7.2 v -4 A 0.57,0.57 0 0 1 3.74,2.63 h 2 a 5.59,5.59 0 0 1 1.47,0.16 2.33,2.33 0 0 1 1,0.49 1.71,1.71 0 0 1 0.54,0.81 3.56,3.56 0 0 1 0.14,1 3.83,3.83 0 0 1 -0.17,1.09 z"
+         id="path6" />
+    </g>
   </g>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/assets/themes/natuurpunt/parkingbike.svg b/assets/themes/natuurpunt/parkingbike.svg
index 12ff2669a..8071ad631 100644
--- a/assets/themes/natuurpunt/parkingbike.svg
+++ b/assets/themes/natuurpunt/parkingbike.svg
@@ -1,6 +1,76 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="360px" height="10px" viewBox="0 0 360 10" version="1.1">
-  <g id="surface1">
-    <path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 202.5 -55 C 200.984375 -59.914062 198.226562 -64.355469 194.5 -67.898438 C 190.117188 -71.9375 184.890625 -74.941406 179.199219 -76.699219 C 171.539062 -79.109375 163.527344 -80.222656 155.5 -80 L 114.5 -80 C 112.015625 -80 110 -77.984375 110 -75.5 L 110 41.199219 C 110 43.683594 112.015625 45.699219 114.5 45.699219 L 134.5 45.699219 C 136.984375 45.699219 139 43.683594 139 41.199219 L 139 2.601562 L 156.199219 2.601562 C 164.070312 2.777344 171.914062 1.628906 179.398438 -0.800781 C 185.066406 -2.675781 190.234375 -5.824219 194.5 -10 C 198.265625 -13.832031 201.015625 -18.539062 202.5 -23.699219 C 204.039062 -28.992188 204.78125 -34.488281 204.699219 -40 C 204.734375 -45.082031 203.992188 -50.140625 202.5 -55 Z M 178.699219 -31.300781 C 178.039062 -28.675781 176.613281 -26.308594 174.601562 -24.5 C 172.40625 -22.441406 169.773438 -20.902344 166.898438 -20 C 163.132812 -18.910156 159.21875 -18.40625 155.300781 -18.5 L 140 -18.5 C 137.515625 -18.5 135.5 -20.515625 135.5 -23 L 135.5 -54.601562 C 135.5 -57.085938 137.515625 -59.101562 140 -59.101562 L 155.101562 -59.101562 C 159.003906 -59.148438 162.902344 -58.714844 166.699219 -57.800781 C 169.488281 -57.046875 172.105469 -55.753906 174.398438 -54 C 176.355469 -52.289062 177.808594 -50.074219 178.601562 -47.601562 C 179.453125 -44.980469 179.921875 -42.253906 180 -39.5 C 179.890625 -36.726562 179.453125 -33.972656 178.699219 -31.300781 Z M 178.699219 -31.300781 "/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   viewBox="-11 8 16.730312 19.004028"
+   version="1.1"
+   id="svg24"
+   sodipodi:docname="parkingbike.svg"
+   width="16.730312"
+   height="19.004028"
+   inkscape:version="1.1.1 (1:1.1+202109281949+c3084ef5ed)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview26"
+     pagecolor="#505050"
+     bordercolor="#eeeeee"
+     borderopacity="1"
+     inkscape:pageshadow="0"
+     inkscape:pageopacity="0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="44.833333"
+     inkscape:cx="7.0037175"
+     inkscape:cy="8.5092937"
+     inkscape:current-layer="svg24" />
+  <defs
+     id="defs4">
+    <style
+       id="style2">.cls-1{fill:#fff;}</style>
+  </defs>
+  <g
+     id="Layer_2"
+     data-name="Layer 2"
+     transform="translate(-11,8.0028128)">
+    <g
+       id="Layer_1-2"
+       data-name="Layer 1">
+      <path
+         class="cls-1"
+         d="m 9.25,2.5 v 0 A 3,3 0 0 0 8.45,1.21 4,4 0 0 0 6.92,0.33 7.23,7.23 0 0 0 4.55,0 H 0.45 A 0.45,0.45 0 0 0 0,0.45 v 11.67 a 0.45,0.45 0 0 0 0.45,0.45 h 2 A 0.45,0.45 0 0 0 2.9,12.12 V 8.26 H 4.62 A 7,7 0 0 0 6.94,7.92 3.92,3.92 0 0 0 8.45,7 3.23,3.23 0 0 0 9.25,5.63 5.55,5.55 0 0 0 9.47,4 5,5 0 0 0 9.25,2.5 Z M 6.87,4.87 v 0 A 1.36,1.36 0 0 1 6.46,5.55 2,2 0 0 1 5.69,6 3.84,3.84 0 0 1 4.53,6.15 H 3 A 0.45,0.45 0 0 1 2.55,5.7 V 2.54 A 0.45,0.45 0 0 1 3,2.09 H 4.51 A 4.7,4.7 0 0 1 5.67,2.22 2.22,2.22 0 0 1 6.44,2.6 1.43,1.43 0 0 1 6.86,3.24 2.88,2.88 0 0 1 7,4.05 3.54,3.54 0 0 1 6.87,4.87 Z"
+         id="path6" />
+      <path
+         class="cls-1"
+         d="m 9.64,16.78 a 0.29,0.29 0 0 0 0.22,-0.12 l 3,-3.82 a 0.29300171,0.29300171 0 0 0 -0.47,-0.35 l -2.85,3.7 -3.61,-0.07 1.65,-3.48 4.74,-0.25 a 0.3,0.3 0 1 0 0,-0.59 L 7.4,12.07 a 0.3,0.3 0 0 0 -0.25,0.17 l -1.92,4 a 0.28,0.28 0 0 0 0,0.28 0.27,0.27 0 0 0 0.24,0.14 l 4.21,0.09 z"
+         id="path8" />
+      <path
+         class="cls-1"
+         d="M 5.46,19 A 2.62,2.62 0 1 1 8,16.35 2.61,2.61 0 0 1 5.46,19 Z M 5.38,14.35 a 2,2 0 1 0 2.07,2 2,2 0 0 0 -2.07,-2 z"
+         id="path10" />
+      <path
+         class="cls-1"
+         d="m 14.16,18.88 a 2.62,2.62 0 1 1 2.57,-2.66 2.62,2.62 0 0 1 -2.57,2.66 z m -0.08,-4.65 a 2,2 0 1 0 2.07,2 2,2 0 0 0 -2.07,-2 z"
+         id="path12" />
+      <path
+         class="cls-1"
+         d="m 14.12,17 h 0.09 a 0.31,0.31 0 0 0 0.18,-0.38 L 12,10 10.52,9.8 a 0.28,0.28 0 0 0 -0.32,0.25 0.29,0.29 0 0 0 0.26,0.33 l 1.15,0.13 2.22,6.26 a 0.29,0.29 0 0 0 0.29,0.19 z"
+         id="path14" />
+      <line
+         class="cls-1"
+         x1="9.54"
+         y1="16.309999"
+         x2="6.79"
+         y2="11.31"
+         id="line16" />
+      <polygon
+         class="cls-1"
+         points="7.05,11.17 6.53,11.45 9.28,16.45 9.8,16.17 "
+         id="polygon18" />
+      <path
+         class="cls-1"
+         d="m 8.61,11.23 c 0,0 0,-0.18 -0.36,-0.26 a 17.6,17.6 0 0 0 -2.17,0 v 0.57 l 2.39,0.05 c 0,0 0.27,-0.19 0.14,-0.36 z"
+         id="path20" />
+    </g>
   </g>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/assets/themes/natuurpunt/parkingmotor.svg b/assets/themes/natuurpunt/parkingmotor.svg
index 1c9f55ec5..aff11198b 100644
--- a/assets/themes/natuurpunt/parkingmotor.svg
+++ b/assets/themes/natuurpunt/parkingmotor.svg
@@ -1,6 +1,50 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="360px" height="6px" viewBox="0 0 360 6" version="1.1">
-  <g id="surface1">
-    <path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 193.5 -21 C 192.589844 -23.949219 190.9375 -26.613281 188.699219 -28.738281 C 186.070312 -31.160156 182.933594 -32.964844 179.519531 -34.019531 C 174.921875 -35.464844 170.117188 -36.132812 165.300781 -36 L 140.699219 -36 C 139.207031 -36 138 -34.792969 138 -33.300781 L 138 36.71875 C 138 38.210938 139.207031 39.421875 140.699219 39.421875 L 152.699219 39.421875 C 154.191406 39.421875 155.398438 38.210938 155.398438 36.71875 L 155.398438 13.558594 L 165.71875 13.558594 C 170.441406 13.667969 175.148438 12.976562 179.640625 11.519531 C 183.039062 10.394531 186.140625 8.507812 188.699219 6 C 190.957031 3.703125 192.609375 0.875 193.5 -2.21875 C 194.421875 -5.394531 194.867188 -8.691406 194.820312 -12 C 194.839844 -15.050781 194.394531 -18.085938 193.5 -21 Z M 179.21875 -6.78125 C 178.824219 -5.207031 177.96875 -3.785156 176.761719 -2.699219 C 175.441406 -1.464844 173.863281 -0.539062 172.140625 0 C 169.878906 0.652344 167.53125 0.957031 165.179688 0.898438 L 156 0.898438 C 154.507812 0.898438 153.300781 -0.308594 153.300781 -1.800781 L 153.300781 -20.761719 C 153.300781 -22.25 154.507812 -23.460938 156 -23.460938 L 165.058594 -23.460938 C 167.402344 -23.488281 169.742188 -23.226562 172.019531 -22.679688 C 173.695312 -22.226562 175.261719 -21.453125 176.640625 -20.398438 C 177.8125 -19.371094 178.683594 -18.046875 179.160156 -16.558594 C 179.671875 -14.988281 179.953125 -13.351562 180 -11.699219 C 179.933594 -10.035156 179.671875 -8.382812 179.21875 -6.78125 Z M 179.21875 -6.78125 "/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   viewBox="-23 6 17.859455 17.979752"
+   version="1.1"
+   id="svg11"
+   sodipodi:docname="parkingmotor.svg"
+   width="17.859455"
+   height="17.979752"
+   inkscape:version="1.1.1 (1:1.1+202109281949+c3084ef5ed)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview13"
+     pagecolor="#505050"
+     bordercolor="#eeeeee"
+     borderopacity="1"
+     inkscape:pageshadow="0"
+     inkscape:pageopacity="0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="26.9"
+     inkscape:cx="6.9888476"
+     inkscape:cy="6.4869888"
+     inkscape:current-layer="svg11" />
+  <defs
+     id="defs4">
+    <style
+       id="style2">.cls-1{fill:#fff;}</style>
+  </defs>
+  <g
+     id="Layer_2"
+     data-name="Layer 2"
+     transform="translate(-23,6.0028128)">
+    <g
+       id="Layer_1-2"
+       data-name="Layer 1">
+      <path
+         class="cls-1"
+         d="m 9.25,2.5 v 0 A 3,3 0 0 0 8.45,1.21 4,4 0 0 0 6.92,0.33 7.23,7.23 0 0 0 4.55,0 H 0.45 A 0.45,0.45 0 0 0 0,0.45 v 11.67 a 0.45,0.45 0 0 0 0.45,0.45 h 2 A 0.45,0.45 0 0 0 2.9,12.12 V 8.26 H 4.62 A 7,7 0 0 0 6.94,7.92 3.92,3.92 0 0 0 8.45,7 3.23,3.23 0 0 0 9.25,5.63 5.55,5.55 0 0 0 9.47,4 5,5 0 0 0 9.25,2.5 Z M 6.87,4.87 v 0 A 1.36,1.36 0 0 1 6.46,5.55 2,2 0 0 1 5.69,6 3.84,3.84 0 0 1 4.53,6.15 H 3 A 0.45,0.45 0 0 1 2.55,5.7 V 2.54 A 0.45,0.45 0 0 1 3,2.09 H 4.51 A 4.7,4.7 0 0 1 5.67,2.22 2.22,2.22 0 0 1 6.44,2.6 1.43,1.43 0 0 1 6.86,3.24 2.88,2.88 0 0 1 7,4.05 3.54,3.54 0 0 1 6.87,4.87 Z"
+         id="path6" />
+      <path
+         id="Icon_awesome-motorcycle"
+         data-name="Icon awesome-motorcycle"
+         class="cls-1"
+         d="m 15.37,12.93 a 2.38,2.38 0 0 0 -0.84,0.13 L 13.88,12 h 1.63 a 0.47,0.47 0 0 0 0.47,-0.47 v 0 -0.63 a 0.48,0.48 0 0 0 -0.47,-0.48 h -0.9 a 0.48,0.48 0 0 0 -0.35,0.16 l -0.74,0.82 -0.44,-0.75 a 0.5,0.5 0 0 0 -0.41,-0.23 h -1.58 a 0.33,0.33 0 0 0 -0.32,0.32 V 11 a 0.33,0.33 0 0 0 0.32,0.32 h 1.31 l 0.38,0.63 h -3 a 2.22,2.22 0 0 0 -2,-0.79 H 6.68 A 0.48,0.48 0 0 0 6.2,11.64 v 0 a 0.48,0.48 0 0 0 0.47,0.47 H 7.78 A 1,1 0 0 1 8.72,12.6 L 8.5,13 a 2.52,2.52 0 1 0 1.7,3.14 0.29,0.29 0 0 0 0,-0.09 h 1.66 a 0.48,0.48 0 0 0 0.48,-0.47 v 0 a 3,3 0 0 1 1.1,-2.47 l 0.25,0.41 a 2.53,2.53 0 1 0 3.56,0.28 2.5,2.5 0 0 0 -1.88,-0.87 z M 7.78,17 a 1.58,1.58 0 1 1 0,-3.16 h 0.24 l -0.81,1.49 a 0.47,0.47 0 0 0 0.41,0.7 h 1.6 A 1.57,1.57 0 0 1 7.78,17 Z m 9.15,-1.49 a 1.5806407,1.5806407 0 0 1 -3.16,-0.09 1.61,1.61 0 0 1 0.44,-1.09 l 1,1.63 a 0.32,0.32 0 0 0 0.44,0.11 l 0.27,-0.16 a 0.32,0.32 0 0 0 0.1,-0.44 l -1,-1.59 a 1.55,1.55 0 0 1 0.31,0 1.57,1.57 0 0 1 1.58,1.57 z" />
+    </g>
   </g>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/assets/themes/natuurpunt/parkingwheels.svg b/assets/themes/natuurpunt/parkingwheels.svg
index 253dbed2b..6bc21b96f 100644
--- a/assets/themes/natuurpunt/parkingwheels.svg
+++ b/assets/themes/natuurpunt/parkingwheels.svg
@@ -1,6 +1,49 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="360px" height="6px" viewBox="0 0 360 6" version="1.1">
-  <g id="surface1">
-    <path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 199.5 -27 C 198.589844 -29.949219 196.9375 -32.613281 194.699219 -34.738281 C 192.070312 -37.160156 188.933594 -38.964844 185.519531 -40.019531 C 180.921875 -41.464844 176.117188 -42.132812 171.300781 -42 L 146.699219 -42 C 145.207031 -42 144 -40.792969 144 -39.300781 L 144 30.71875 C 144 32.210938 145.207031 33.421875 146.699219 33.421875 L 158.699219 33.421875 C 160.191406 33.421875 161.398438 32.210938 161.398438 30.71875 L 161.398438 7.558594 L 171.71875 7.558594 C 176.441406 7.667969 181.148438 6.976562 185.640625 5.519531 C 189.039062 4.394531 192.140625 2.507812 194.699219 0 C 196.957031 -2.296875 198.609375 -5.125 199.5 -8.21875 C 200.421875 -11.394531 200.867188 -14.691406 200.820312 -18 C 200.839844 -21.050781 200.394531 -24.085938 199.5 -27 Z M 185.21875 -12.78125 C 184.824219 -11.207031 183.96875 -9.785156 182.761719 -8.699219 C 181.441406 -7.464844 179.863281 -6.539062 178.140625 -6 C 175.878906 -5.347656 173.53125 -5.042969 171.179688 -5.101562 L 162 -5.101562 C 160.507812 -5.101562 159.300781 -6.308594 159.300781 -7.800781 L 159.300781 -26.761719 C 159.300781 -28.25 160.507812 -29.460938 162 -29.460938 L 171.058594 -29.460938 C 173.402344 -29.488281 175.742188 -29.226562 178.019531 -28.679688 C 179.695312 -28.226562 181.261719 -27.453125 182.640625 -26.398438 C 183.8125 -25.371094 184.683594 -24.046875 185.160156 -22.558594 C 185.671875 -20.988281 185.953125 -19.351562 186 -17.699219 C 185.933594 -16.035156 185.671875 -14.382812 185.21875 -12.78125 Z M 185.21875 -12.78125 "/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   viewBox="-24 7 13.266731 20.714458"
+   version="1.1"
+   id="svg12"
+   sodipodi:docname="parkingwheels.svg"
+   width="13.266731"
+   height="20.714458"
+   inkscape:version="1.1.1 (1:1.1+202109281949+c3084ef5ed)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview14"
+     pagecolor="#505050"
+     bordercolor="#eeeeee"
+     borderopacity="1"
+     inkscape:pageshadow="0"
+     inkscape:pageopacity="0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="26.9"
+     inkscape:cx="5.9851301"
+     inkscape:cy="7.4907063"
+     inkscape:current-layer="svg12" />
+  <defs
+     id="defs4">
+    <style
+       id="style2">.cls-1{fill:#fff;}</style>
+  </defs>
+  <g
+     id="Layer_2"
+     data-name="Layer 2"
+     transform="translate(-24,7.0028128)">
+    <g
+       id="Layer_1-2"
+       data-name="Layer 1">
+      <path
+         class="cls-1"
+         d="m 7.54,11.73 a 1,1 0 1 1 1,-1 0.95,0.95 0 0 1 -1,1 z m 3.37,4.9 H 7.82 a 1,1 0 0 1 -1,-0.86 L 6.66,12.88 a 0.92,0.92 0 1 1 1.83,-0.11 l 0.06,1 h 1.78 a 0.44,0.44 0 0 1 0.44,0.43 0.44,0.44 0 0 1 -0.44,0.43 h -1.7 v 0.54 H 11 a 0.56,0.56 0 0 1 0.46,0.27 l 1.73,2.92 A 0.56,0.56 0 0 1 13,19.12 0.57,0.57 0 0 1 12.23,18.93 Z m 0,0.86 0.53,0.89 A 3.58,3.58 0 1 1 6.35,14 v 0.87 A 2.83,2.83 0 1 0 11,17.49 Z"
+         id="path6" />
+      <path
+         class="cls-1"
+         d="m 9.25,2.5 v 0 A 3,3 0 0 0 8.45,1.21 4,4 0 0 0 6.92,0.33 7.23,7.23 0 0 0 4.55,0 H 0.45 A 0.45,0.45 0 0 0 0,0.45 v 11.67 a 0.45,0.45 0 0 0 0.45,0.45 h 2 A 0.45,0.45 0 0 0 2.9,12.12 V 8.26 H 4.62 A 7,7 0 0 0 6.94,7.92 3.92,3.92 0 0 0 8.45,7 3.23,3.23 0 0 0 9.25,5.63 5.55,5.55 0 0 0 9.47,4 5,5 0 0 0 9.25,2.5 Z M 6.87,4.87 v 0 A 1.36,1.36 0 0 1 6.46,5.55 2,2 0 0 1 5.69,6 3.84,3.84 0 0 1 4.53,6.15 H 3 A 0.45,0.45 0 0 1 2.55,5.7 V 2.54 A 0.45,0.45 0 0 1 3,2.09 H 4.51 A 4.7,4.7 0 0 1 5.67,2.22 2.22,2.22 0 0 1 6.44,2.6 1.43,1.43 0 0 1 6.86,3.24 2.88,2.88 0 0 1 7,4.05 3.54,3.54 0 0 1 6.87,4.87 Z"
+         id="path8" />
+    </g>
   </g>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/assets/themes/natuurpunt/picnic_table.svg b/assets/themes/natuurpunt/picnic_table.svg
index 7691c17e3..a424c76eb 100644
--- a/assets/themes/natuurpunt/picnic_table.svg
+++ b/assets/themes/natuurpunt/picnic_table.svg
@@ -1,7 +1,63 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="385px" height="11px" viewBox="0 0 385 11" version="1.1">
-  <g id="surface1">
-    <path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 123.308594 86.898438 L 99 86.898438 L 162.691406 -48.730469 L 182.378906 -39.488281 Z M 123.308594 86.898438 "/>
-    <path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 273.351562 86.898438 L 214.390625 -39.488281 L 234.078125 -48.730469 L 298.210938 86.898438 Z M 273.351562 86.898438 "/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   viewBox="-7 5 22.07 12.9"
+   version="1.1"
+   id="svg16"
+   sodipodi:docname="picnic_table.svg"
+   width="22.07"
+   height="12.9"
+   inkscape:version="1.1.1 (1:1.1+202109281949+c3084ef5ed)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview18"
+     pagecolor="#505050"
+     bordercolor="#eeeeee"
+     borderopacity="1"
+     inkscape:pageshadow="0"
+     inkscape:pageopacity="0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="46.114286"
+     inkscape:cx="1.9083024"
+     inkscape:cy="5.5188971"
+     inkscape:current-layer="svg16" />
+  <defs
+     id="defs4">
+    <style
+       id="style2">.cls-1{fill:#fff;}</style>
+  </defs>
+  <g
+     id="Layer_2"
+     data-name="Layer 2"
+     transform="translate(-7,5)">
+    <g
+       id="Layer_1-2"
+       data-name="Layer 1">
+      <rect
+         class="cls-1"
+         x="4.2600002"
+         width="13.55"
+         height="1.98"
+         id="rect6"
+         y="0" />
+      <rect
+         class="cls-1"
+         y="7.4000001"
+         width="22.07"
+         height="1.98"
+         id="rect8"
+         x="0" />
+      <polygon
+         class="cls-1"
+         points="7.79,0.57 9.58,1.41 4.21,12.9 2,12.9 "
+         id="polygon10" />
+      <polygon
+         class="cls-1"
+         points="14.28,0.57 20.11,12.9 17.85,12.9 12.49,1.41 "
+         id="polygon12" />
+    </g>
   </g>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/assets/themes/natuurpunt/pushchair.svg b/assets/themes/natuurpunt/pushchair.svg
index 0d04516d2..d14bddf52 100644
--- a/assets/themes/natuurpunt/pushchair.svg
+++ b/assets/themes/natuurpunt/pushchair.svg
@@ -1,6 +1,37 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="385px" height="11px" viewBox="0 0 385 11" version="1.1">
-  <g id="surface1">
-    <path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 173.25 -28.378906 C 173.21875 -33.699219 175.320312 -38.808594 179.082031 -42.570312 C 182.84375 -46.328125 187.953125 -48.429688 193.269531 -48.398438 C 204.070312 -47.800781 212.691406 -39.179688 213.289062 -28.378906 C 213.289062 -17.324219 204.328125 -8.359375 193.269531 -8.359375 C 182.214844 -8.359375 173.25 -17.324219 173.25 -28.378906 Z M 247.28125 22 C 257.289062 19.140625 261.140625 23.210938 261.140625 23.210938 L 296.121094 50.601562 C 298.007812 52.195312 299.167969 54.492188 299.332031 56.957031 C 299.5 59.425781 298.65625 61.855469 297 63.691406 C 293.1875 67.734375 286.957031 68.300781 282.480469 65.011719 L 254.320312 43.011719 L 232.320312 25.519531 Z M 275.878906 100.429688 C 275.878906 113.976562 264.898438 124.960938 251.351562 124.960938 C 237.800781 124.960938 226.820312 113.976562 226.820312 100.429688 C 226.820312 86.882812 237.800781 75.898438 251.351562 75.898438 C 253.054688 75.957031 254.75 76.179688 256.410156 76.558594 C 257.394531 74.195312 257.625 71.582031 257.070312 69.078125 C 256.40625 66.289062 254.863281 63.78125 252.671875 61.929688 L 243.761719 55 L 198 69.410156 C 188.890625 72.390625 179.082031 67.484375 176 58.410156 L 176 55.878906 L 165.769531 79.199219 C 172.769531 83.777344 176.921875 91.628906 176.769531 99.988281 C 176.769531 113.539062 165.789062 124.519531 152.238281 124.519531 C 138.691406 124.519531 127.710938 113.539062 127.710938 99.988281 C 127.710938 86.441406 138.691406 75.460938 152.238281 75.460938 C 153.945312 75.511719 155.640625 75.730469 157.300781 76.121094 L 171.269531 44 L 149.269531 -20.789062 L 106.148438 -55 C 103.878906 -56.753906 101.097656 -57.71875 98.230469 -57.75 C 91.0625 -57.75 85.25 -51.9375 85.25 -44.769531 C 85.023438 -40.46875 86.964844 -36.339844 90.421875 -33.769531 C 92.175781 -32.261719 92.417969 -29.632812 90.96875 -27.828125 C 90.21875 -27.015625 89.164062 -26.550781 88.054688 -26.550781 C 86.945312 -26.550781 85.890625 -27.015625 85.140625 -27.828125 C 79.910156 -31.878906 76.894531 -38.15625 77 -44.769531 C 77.011719 -52.8125 81.5625 -60.15625 88.761719 -63.742188 C 95.957031 -67.332031 104.5625 -66.542969 110.988281 -61.710938 L 258.28125 55.550781 C 261.71875 58.390625 264.179688 62.238281 265.320312 66.550781 C 266.144531 70.730469 265.683594 75.066406 264 78.980469 C 271.386719 83.398438 275.898438 91.382812 275.878906 99.988281 Z M 251.351562 111.429688 C 257.425781 111.429688 262.351562 106.503906 262.351562 100.429688 C 262.351562 94.355469 257.425781 89.429688 251.351562 89.429688 C 245.273438 89.429688 240.351562 94.355469 240.351562 100.429688 C 240.808594 106.160156 245.601562 110.570312 251.351562 110.550781 Z M 152.351562 111.429688 C 158.425781 111.429688 163.351562 106.503906 163.351562 100.429688 C 163.351562 94.355469 158.425781 89.429688 152.351562 89.429688 C 146.273438 89.429688 141.351562 94.355469 141.351562 100.429688 C 141.816406 106.289062 146.804688 110.746094 152.679688 110.550781 Z M 152.351562 111.429688 "/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="222.35574"
+   height="190.93405"
+   viewBox="0 0 222.35574 190.93405"
+   version="1.1"
+   id="svg838"
+   sodipodi:docname="pushchair.svg"
+   inkscape:version="1.1.1 (1:1.1+202109281949+c3084ef5ed)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs842" />
+  <sodipodi:namedview
+     id="namedview840"
+     pagecolor="#505050"
+     bordercolor="#eeeeee"
+     borderopacity="1"
+     inkscape:pageshadow="0"
+     inkscape:pageopacity="0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="4.1922078"
+     inkscape:cx="20.991326"
+     inkscape:cy="71.680607"
+     inkscape:current-layer="svg838" />
+  <g
+     id="surface1"
+     transform="translate(-76.997323,65.973113)">
+    <path
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       d="m 173.25,-28.378906 c -0.0312,-5.320313 2.07031,-10.429688 5.83203,-14.191406 3.76172,-3.757813 8.87109,-5.859376 14.1875,-5.828126 10.80078,0.597657 19.42188,9.21875 20.01953,20.019532 0,11.054687 -8.96094,20.019531 -20.01953,20.019531 -11.05469,0 -20.01953,-8.964844 -20.01953,-20.019531 z M 247.28125,22 c 10.00781,-2.859375 13.85937,1.210938 13.85937,1.210938 l 34.98047,27.390624 c 1.88672,1.59375 3.04688,3.890626 3.21094,6.355469 0.16797,2.46875 -0.67578,4.898438 -2.33203,6.734375 -3.8125,4.042969 -10.04297,4.609375 -14.51953,1.320313 l -28.16016,-22 -22,-17.492188 z m 28.59766,78.42969 c 0,13.54687 -10.98047,24.53125 -24.52735,24.53125 -13.55078,0 -24.53125,-10.98438 -24.53125,-24.53125 0,-13.546878 10.98047,-24.531252 24.53125,-24.531252 1.70313,0.05859 3.39844,0.28125 5.0586,0.660156 0.98437,-2.363282 1.21484,-4.976563 0.66015,-7.480469 -0.66406,-2.789063 -2.20703,-5.296875 -4.39844,-7.148437 L 243.76172,55 198,69.410156 c -9.10938,2.980469 -18.91797,-1.925781 -22,-11 v -2.53125 l -10.23047,23.320313 c 7,4.578125 11.15234,12.429687 11,20.789062 0,13.550779 -10.98047,24.531249 -24.53125,24.531249 -13.54687,0 -24.52734,-10.98047 -24.52734,-24.531249 0,-13.546875 10.98047,-24.527343 24.52734,-24.527343 1.70703,0.05078 3.40234,0.269531 5.0625,0.660156 L 171.26953,44 l -22,-64.789062 L 106.14844,-55 c -2.26953,-1.753906 -5.05078,-2.71875 -7.917971,-2.75 -7.167969,0 -12.980469,5.8125 -12.980469,12.980469 -0.226562,4.300781 1.714844,8.429687 5.171875,11 1.753906,1.507812 1.996094,4.136719 0.546875,5.941406 -0.75,0.8125 -1.804688,1.277344 -2.914062,1.277344 -1.109376,0 -2.164063,-0.464844 -2.914063,-1.277344 C 79.910156,-31.878906 76.894531,-38.15625 77,-44.769531 c 0.01172,-8.042969 4.5625,-15.386719 11.761719,-18.972657 7.195312,-3.589843 15.800781,-2.800781 22.226561,2.03125 L 258.28125,55.550781 c 3.4375,2.839844 5.89844,6.6875 7.03906,11 0.82422,4.179688 0.36328,8.515625 -1.32031,12.429688 7.38672,4.417969 11.89844,12.402343 11.87891,21.007812 z m -24.52735,11 c 6.07422,0 11,-4.92578 11,-11 0,-6.074221 -4.92578,-11.000002 -11,-11.000002 -6.07812,0 -11,4.925781 -11,11.000002 0.45703,5.73047 5.25,10.14062 11,10.12109 z m -99,0 c 6.07422,0 11,-4.92578 11,-11 0,-6.074221 -4.92578,-11.000002 -11,-11.000002 -6.07812,0 -11,4.925781 -11,11.000002 0.46485,5.85937 5.45313,10.3164 11.32813,10.12109 z m 0,0"
+       id="path835" />
   </g>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/assets/themes/natuurpunt/toilets.svg b/assets/themes/natuurpunt/toilets.svg
index 0f489826d..eb0ca7e79 100644
--- a/assets/themes/natuurpunt/toilets.svg
+++ b/assets/themes/natuurpunt/toilets.svg
@@ -1,7 +1,41 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="390px" height="13px" viewBox="0 0 390 13" version="1.1">
-  <g id="surface1">
-    <path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 104 72.800781 L 78 -37.179688 L 100.75 -37.179688 L 117 39 L 137.410156 -37.179688 L 163.410156 -37.179688 L 183.039062 39.648438 L 199.941406 -37.179688 L 222.300781 -37.179688 L 196.300781 72.800781 L 171.988281 72.800781 L 150.148438 -9.359375 L 128.308594 72.800781 Z M 104 72.800781 "/>
-    <path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 303.941406 32.371094 L 325 39 C 322.609375 49.46875 316.800781 58.847656 308.488281 65.648438 C 300 71.777344 289.703125 74.890625 279.238281 74.488281 C 265.910156 74.792969 253.070312 69.460938 243.878906 59.800781 C 233.957031 48.542969 228.867188 33.832031 229.710938 18.851562 C 228.726562 3.335938 233.804688 -11.953125 243.878906 -23.789062 C 253.53125 -34.015625 267.140625 -39.5625 281.191406 -39 C 293.257812 -39.464844 305.023438 -35.171875 313.949219 -27.039062 C 319.320312 -21.398438 323.128906 -14.453125 325 -6.890625 L 302.898438 -1.558594 C 301.785156 -6.691406 298.9375 -11.28125 294.839844 -14.558594 C 290.53125 -17.894531 285.207031 -19.636719 279.761719 -19.5 C 272.277344 -19.875 265.023438 -16.867188 260 -11.308594 C 254.179688 -3.015625 251.464844 7.0625 252.328125 17.160156 C 251.398438 27.667969 254.105469 38.179688 260 46.929688 C 264.78125 52.734375 271.984375 56 279.5 55.769531 C 285.109375 55.839844 290.535156 53.796875 294.710938 50.050781 C 299.609375 45.300781 302.84375 39.101562 303.941406 32.371094 Z M 303.941406 32.371094 "/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="247"
+   height="113.56189"
+   viewBox="0 0 247 113.56189"
+   version="1.1"
+   id="svg7"
+   sodipodi:docname="toilets.svg"
+   inkscape:version="1.1.1 (1:1.1+202109281949+c3084ef5ed)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs11" />
+  <sodipodi:namedview
+     id="namedview9"
+     pagecolor="#505050"
+     bordercolor="#eeeeee"
+     borderopacity="1"
+     inkscape:pageshadow="0"
+     inkscape:pageopacity="0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="2.387605"
+     inkscape:cx="77.483502"
+     inkscape:cy="39.99824"
+     inkscape:current-layer="svg7" />
+  <g
+     id="surface1"
+     transform="translate(-78,39.038983)">
+    <path
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       d="M 104,72.800781 78,-37.179688 h 22.75 L 117,39 137.41016,-37.179688 h 26 l 19.6289,76.828126 16.90235,-76.828126 h 22.35937 l -26,109.980469 h -24.3125 L 150.14844,-9.359375 128.30859,72.800781 Z m 0,0"
+       id="path2" />
+    <path
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       d="M 303.94141,32.371094 325,39 c -2.39063,10.46875 -8.19922,19.847656 -16.51172,26.648438 -8.48828,6.128906 -18.78516,9.242187 -29.25,8.839843 -13.32812,0.304688 -26.16797,-5.027343 -35.35937,-14.6875 -9.92188,-11.257812 -15.01172,-25.96875 -14.16797,-40.949219 -0.98438,-15.515624 4.09375,-30.804687 14.16797,-42.640624 9.65234,-10.226563 23.26171,-15.773438 37.3125,-15.210938 12.0664,-0.464844 23.83203,3.828125 32.75781,11.960938 5.37109,5.640624 9.17969,12.585937 11.05078,20.148437 l -22.10156,5.332031 c -1.11328,-5.132812 -3.96094,-9.722656 -8.0586,-13 -4.30859,-3.335937 -9.63281,-5.078125 -15.07812,-4.941406 -7.48438,-0.375 -14.73828,2.632812 -19.76172,8.191406 -5.82031,8.292969 -8.53516,18.371094 -7.67188,28.46875 -0.92968,10.507813 1.77735,21.019532 7.67188,29.769532 4.78125,5.804687 11.98437,9.070312 19.5,8.839843 5.60937,0.07031 11.03516,-1.972656 15.21094,-5.71875 4.89843,-4.75 8.13281,-10.949219 9.23047,-17.679687 z m 0,0"
+       id="path4" />
   </g>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/assets/themes/natuurpunt/trail.svg b/assets/themes/natuurpunt/trail.svg
index 5f11cae5e..143f348f5 100644
--- a/assets/themes/natuurpunt/trail.svg
+++ b/assets/themes/natuurpunt/trail.svg
@@ -1,7 +1,53 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="390px" height="13px" viewBox="0 0 390 13" version="1.1">
-  <g id="surface1">
-    <path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 279.371094 0 L 279.371094 -9.878906 L 271.699219 -9.878906 L 271.699219 -1.300781 L 242.191406 -7.539062 L 219.960938 -45.5 C 219.128906 -46.898438 217.910156 -48.027344 216.449219 -48.75 C 213.125 -51.84375 209.183594 -54.191406 204.878906 -55.640625 C 187.589844 -61.488281 179.921875 -35.230469 179.921875 -35.230469 C 175.023438 -16.859375 171.632812 1.878906 169.78125 20.800781 L 169 25.21875 C 168.976562 25.480469 168.976562 25.742188 169 26 L 162.628906 62.921875 L 133.121094 104 C 130.519531 107.769531 126.878906 115.179688 134.941406 119.078125 C 137.65625 120.5 140.789062 120.914062 143.78125 120.25 C 147.90625 118.011719 151.5 114.90625 154.308594 111.148438 L 180.960938 78 L 182 76.960938 L 183.820312 73.710938 C 185.285156 71.375 186.257812 68.765625 186.679688 66.039062 L 189.671875 47.96875 L 218.269531 67.730469 L 234 115.828125 C 235.882812 122.136719 242.503906 125.738281 248.820312 123.890625 C 249.742188 123.636719 250.617188 123.242188 251.421875 122.71875 C 256.179688 119.984375 258.394531 114.308594 256.75 109.070312 L 239.070312 55.25 C 237.984375 51.691406 235.289062 48.847656 231.789062 47.578125 L 209.171875 32.761719 L 211.640625 23.660156 L 218.53125 -16.640625 L 230.359375 3.378906 C 231.429688 5.363281 233.34375 6.75 235.558594 7.148438 L 271.699219 14.820312 L 271.699219 124.539062 L 273.910156 124.539062 L 278.328125 15.988281 C 279.507812 15.839844 280.652344 15.488281 281.710938 14.949219 C 283.59375 13.769531 284.945312 11.90625 285.480469 9.75 C 285.984375 7.644531 285.621094 5.425781 284.472656 3.59375 C 283.320312 1.757812 281.484375 0.464844 279.371094 0 Z M 279.371094 0 "/>
-    <path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 158.210938 26 C 161.316406 -0.589844 167.378906 -26.753906 176.28125 -52 C 176.28125 -52 174.328125 -60.191406 160.03125 -54.730469 C 145.730469 -49.269531 131.300781 -2.988281 135.851562 13 C 140.398438 28.988281 158.210938 26 158.210938 26 Z M 158.210938 26 "/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   viewBox="-10 8 11.976725 17.589441"
+   version="1.1"
+   id="svg14"
+   sodipodi:docname="trail.svg"
+   width="11.976725"
+   height="17.589441"
+   inkscape:version="1.1.1 (1:1.1+202109281949+c3084ef5ed)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview16"
+     pagecolor="#505050"
+     bordercolor="#eeeeee"
+     borderopacity="1"
+     inkscape:pageshadow="0"
+     inkscape:pageopacity="0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="53.8"
+     inkscape:cx="5"
+     inkscape:cy="8.5037175"
+     inkscape:current-layer="svg14" />
+  <defs
+     id="defs4">
+    <style
+       id="style2">.cls-1{fill:#fff;}</style>
+  </defs>
+  <g
+     id="Layer_2"
+     data-name="Layer 2"
+     transform="translate(-10.00033,8.0094408)">
+    <g
+       id="Layer_1-2"
+       data-name="Layer 1">
+      <path
+         class="cls-1"
+         d="M 11.49,8 V 8 7.24 H 10.9 V 7.9 L 8.63,7.42 6.92,4.5 A 0.65,0.65 0 0 0 6.65,4.25 2.46,2.46 0 0 0 5.76,3.72 C 4.43,3.27 3.84,5.29 3.84,5.29 A 26.9,26.9 0 0 0 3.06,9.6 L 3,9.94 A 0.36,0.36 0 0 0 3,10 L 2.51,12.84 0.24,16 c -0.2,0.29 -0.48,0.86 0.14,1.16 a 1,1 0 0 0 0.68,0.09 2.5,2.5 0 0 0 0.81,-0.7 L 3.92,14 4,13.92 4.14,13.67 a 1.56,1.56 0 0 0 0.22,-0.59 l 0.23,-1.39 2.2,1.52 1.21,3.7 a 0.92,0.92 0 0 0 1.14,0.62 0.72,0.72 0 0 0 0.2,-0.09 0.9,0.9 0 0 0 0.41,-1.05 L 8.39,12.25 A 0.91,0.91 0 0 0 7.83,11.66 L 6.09,10.52 6.28,9.82 6.81,6.72 7.72,8.26 a 0.57,0.57 0 0 0 0.4,0.29 l 2.78,0.59 v 8.44 h 0.17 L 11.41,9.23 A 0.79,0.79 0 0 0 11.67,9.15 0.66,0.66 0 0 0 11.96,8.75 0.62,0.62 0 0 0 11.49,8 Z"
+         id="path6" />
+      <path
+         class="cls-1"
+         d="M 7,3.18 A 1.71,1.71 0 1 0 4.67,2.57 1.7,1.7 0 0 0 7,3.18 Z"
+         id="path8" />
+      <path
+         class="cls-1"
+         d="M 2.17,10 A 27.71,27.71 0 0 1 3.56,4 C 3.56,4 3.41,3.37 2.31,3.79 1.21,4.21 0.1,7.77 0.45,9 c 0.35,1.23 1.72,1 1.72,1 z"
+         id="path10" />
+    </g>
   </g>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/assets/themes/natuurpunt/urinal.svg b/assets/themes/natuurpunt/urinal.svg
index 6926fc537..65648617b 100644
--- a/assets/themes/natuurpunt/urinal.svg
+++ b/assets/themes/natuurpunt/urinal.svg
@@ -1,6 +1,37 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="385px" height="11px" viewBox="0 0 385 11" version="1.1">
-  <g id="surface1">
-    <path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 258.5 -31.128906 C 255.308594 -53.789062 243.539062 -72.050781 218.460938 -71.941406 L 169.730469 -71.941406 C 144.761719 -71.941406 132.878906 -53.789062 129.800781 -31.128906 L 115.5 88 C 115.921875 112.425781 135.84375 132.003906 160.269531 132 L 228.03125 132 C 252.457031 132.003906 272.378906 112.425781 272.800781 88 Z M 218.460938 103.730469 L 169.730469 103.730469 C 151.929688 103.730469 137.5 89.300781 137.5 71.5 L 147.839844 -13.96875 C 150.039062 -30.25 158.839844 -43.449219 176.550781 -43.339844 L 211.640625 -43.339844 C 229.679688 -43.339844 238.148438 -30.25 240.460938 -13.96875 L 250.691406 71.5 C 250.691406 89.300781 236.261719 103.730469 218.460938 103.730469 Z M 218.460938 103.730469 "/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="157.30078"
+   height="203.94189"
+   viewBox="0 0 157.30078 203.94189"
+   version="1.1"
+   id="svg904"
+   sodipodi:docname="urinal.svg"
+   inkscape:version="1.1.1 (1:1.1+202109281949+c3084ef5ed)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs908" />
+  <sodipodi:namedview
+     id="namedview906"
+     pagecolor="#505050"
+     bordercolor="#eeeeee"
+     borderopacity="1"
+     inkscape:pageshadow="0"
+     inkscape:pageopacity="0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="4.1922078"
+     inkscape:cx="-17.413259"
+     inkscape:cy="77.644052"
+     inkscape:current-layer="svg904" />
+  <g
+     id="surface1"
+     transform="translate(-115.5,71.941895)">
+    <path
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       d="m 258.5,-31.128906 c -3.19141,-22.660156 -14.96094,-40.921875 -40.03906,-40.8125 h -48.73047 c -24.96875,0 -36.85156,18.152344 -39.92969,40.8125 L 115.5,88 c 0.42188,24.42578 20.34375,44.00391 44.76953,44 h 67.76172 c 24.42578,0.004 44.34766,-19.57422 44.76953,-44 z M 218.46094,103.73047 H 169.73047 C 151.92969,103.73047 137.5,89.300781 137.5,71.5 l 10.33984,-85.46875 c 2.19922,-16.28125 11,-29.480469 28.71094,-29.371094 h 35.08984 c 18.03907,0 26.50782,13.089844 28.82032,29.371094 L 250.69141,71.5 c 0,17.800781 -14.42969,32.23047 -32.23047,32.23047 z m 0,0"
+       id="path901" />
   </g>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/assets/themes/natuurpunt/walk_wheelchair.svg b/assets/themes/natuurpunt/walk_wheelchair.svg
index 627fd6ea5..438485e46 100644
--- a/assets/themes/natuurpunt/walk_wheelchair.svg
+++ b/assets/themes/natuurpunt/walk_wheelchair.svg
@@ -1,9 +1,65 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="360px" height="9px" viewBox="0 0 360 9" version="1.1">
-  <g id="surface1">
-    <path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 175.410156 0 L 175.410156 -6.839844 L 170.101562 -6.839844 L 170.101562 -0.898438 L 149.671875 -5.21875 L 134.28125 -31.5 C 133.703125 -32.46875 132.859375 -33.25 131.851562 -33.75 C 129.546875 -35.890625 126.816406 -37.515625 123.839844 -38.519531 C 111.871094 -42.570312 106.558594 -24.390625 106.558594 -24.390625 C 103.167969 -11.671875 100.820312 1.300781 99.539062 14.398438 L 99 17.460938 C 98.984375 17.640625 98.984375 17.820312 99 18 L 94.589844 43.558594 L 74.160156 72 C 72.359375 74.609375 69.839844 79.738281 75.421875 82.441406 C 77.300781 83.421875 79.46875 83.710938 81.539062 83.25 C 84.394531 81.699219 86.882812 79.550781 88.828125 76.949219 L 107.28125 54 L 108 53.28125 L 109.261719 51.03125 C 110.273438 49.414062 110.949219 47.605469 111.238281 45.71875 L 113.308594 33.210938 L 133.109375 46.890625 L 144 80.191406 C 145.300781 84.554688 149.886719 87.050781 154.261719 85.769531 C 154.898438 85.59375 155.503906 85.320312 156.058594 84.960938 C 159.355469 83.066406 160.890625 79.136719 159.75 75.511719 L 147.511719 38.25 C 146.757812 35.785156 144.890625 33.820312 142.46875 32.941406 L 126.808594 22.679688 L 128.519531 16.378906 L 133.289062 -11.519531 L 141.480469 2.339844 C 142.222656 3.710938 143.546875 4.671875 145.078125 4.949219 L 170.101562 10.261719 L 170.101562 86.21875 L 171.628906 86.21875 L 174.691406 11.070312 C 175.503906 10.96875 176.296875 10.722656 177.03125 10.351562 C 178.332031 9.53125 179.269531 8.242188 179.640625 6.75 C 179.988281 5.292969 179.738281 3.757812 178.941406 2.488281 C 178.144531 1.21875 176.875 0.320312 175.410156 0 Z M 175.410156 0 "/>
-    <path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 91.53125 18 C 93.679688 -0.410156 97.875 -18.519531 104.039062 -36 C 104.039062 -36 102.691406 -41.671875 92.789062 -37.890625 C 82.890625 -34.109375 72.898438 -2.070312 76.050781 9 C 79.199219 20.070312 91.53125 18 91.53125 18 Z M 91.53125 18 "/>
-    <path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 230.128906 -33.570312 C 224.976562 -33.925781 220.550781 -37.367188 218.941406 -42.273438 C 217.332031 -47.183594 218.859375 -52.578125 222.800781 -55.914062 C 226.742188 -59.253906 232.3125 -59.867188 236.890625 -57.46875 C 241.464844 -55.074219 244.128906 -50.140625 243.628906 -45 C 242.964844 -38.164062 236.980469 -33.097656 230.128906 -33.570312 Z M 270.539062 34.46875 L 229.589844 31.769531 C 222.949219 31.445312 217.667969 26.085938 217.441406 19.441406 L 217.441406 -19.078125 C 217.585938 -25.832031 223.105469 -31.230469 229.859375 -31.230469 C 236.597656 -31.082031 241.972656 -25.550781 241.921875 -18.808594 L 241.921875 -5.578125 L 265.589844 -4.050781 C 267.121094 -3.933594 268.539062 -3.214844 269.535156 -2.050781 C 270.535156 -0.882812 271.023438 0.632812 270.898438 2.160156 C 270.613281 5.285156 267.914062 7.628906 264.78125 7.46875 L 242.101562 5.941406 L 242.101562 13.140625 L 273.601562 15.210938 C 276.136719 15.472656 278.371094 16.996094 279.539062 19.261719 L 299.878906 59.488281 C 301.421875 63.070312 299.914062 67.230469 296.4375 68.992188 C 292.960938 70.753906 288.714844 69.511719 286.738281 66.148438 Z M 270.539062 45.898438 L 276.839844 58.230469 C 267.914062 77.066406 247.769531 87.90625 227.128906 84.980469 C 206.492188 82.050781 190.15625 66.039062 186.820312 45.460938 C 183.484375 24.882812 193.921875 4.527344 212.578125 -4.769531 L 212.578125 6.929688 C 203.058594 13.421875 197.078125 23.957031 196.378906 35.460938 C 196.613281 54.015625 210.339844 69.628906 228.714844 72.234375 C 247.089844 74.84375 264.617188 63.660156 270 45.898438 Z M 270.539062 45.898438 "/>
-    <path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 260.910156 10.261719 L 260.910156 86.308594 L 262.351562 86.308594 L 266.128906 -6.660156 L 260.910156 -6.660156 L 260.910156 -0.898438 "/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   viewBox="-8 8 25.386618 17.599442"
+   version="1.1"
+   id="svg985"
+   sodipodi:docname="walk_wheelchair.svg"
+   width="25.386618"
+   height="17.599442"
+   inkscape:version="1.1.1 (1:1.1+202109281949+c3084ef5ed)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview987"
+     pagecolor="#505050"
+     bordercolor="#eeeeee"
+     borderopacity="1"
+     inkscape:pageshadow="0"
+     inkscape:pageopacity="0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="40.35"
+     inkscape:cx="2.1561338"
+     inkscape:cy="8.5130112"
+     inkscape:current-layer="svg985" />
+  <defs
+     id="defs969">
+    <style
+       id="style967">.cls-1{fill:#fff;}</style>
+  </defs>
+  <g
+     id="Layer_2"
+     data-name="Layer 2"
+     transform="translate(-8.0003301,8.0094408)">
+    <g
+       id="Layer_1-2"
+       data-name="Layer 1">
+      <path
+         class="cls-1"
+         d="M 11.49,8 V 8 7.24 H 10.9 V 7.9 L 8.63,7.42 6.92,4.5 A 0.65,0.65 0 0 0 6.65,4.25 2.46,2.46 0 0 0 5.76,3.72 C 4.43,3.27 3.84,5.29 3.84,5.29 A 26.9,26.9 0 0 0 3.06,9.6 L 3,9.94 A 0.36,0.36 0 0 0 3,10 L 2.51,12.84 0.24,16 c -0.2,0.29 -0.48,0.86 0.14,1.16 a 1,1 0 0 0 0.68,0.09 2.5,2.5 0 0 0 0.81,-0.7 L 3.92,14 4,13.92 4.14,13.67 a 1.56,1.56 0 0 0 0.22,-0.59 l 0.23,-1.39 2.2,1.52 1.21,3.7 a 0.92,0.92 0 0 0 1.14,0.62 0.72,0.72 0 0 0 0.2,-0.09 0.9,0.9 0 0 0 0.41,-1.05 L 8.39,12.25 A 0.91,0.91 0 0 0 7.83,11.66 L 6.09,10.52 6.28,9.82 6.81,6.72 7.72,8.26 a 0.57,0.57 0 0 0 0.4,0.29 l 2.78,0.59 v 8.44 h 0.17 L 11.41,9.23 A 0.79,0.79 0 0 0 11.67,9.15 0.66,0.66 0 0 0 11.96,8.75 0.62,0.62 0 0 0 11.49,8 Z"
+         id="path971" />
+      <path
+         class="cls-1"
+         d="M 7,3.18 A 1.71,1.71 0 1 0 4.67,2.57 1.7,1.7 0 0 0 7,3.18 Z"
+         id="path973" />
+      <path
+         class="cls-1"
+         d="M 2.17,10 A 27.71,27.71 0 0 1 3.56,4 C 3.56,4 3.41,3.37 2.31,3.79 1.21,4.21 0.1,7.77 0.45,9 c 0.35,1.23 1.72,1 1.72,1 z"
+         id="path975" />
+      <path
+         class="cls-1"
+         d="M 17.57,4.27 A 1.41,1.41 0 1 1 19.07,3 1.41,1.41 0 0 1 17.57,4.27 Z m 4.49,7.56 -4.55,-0.3 A 1.42,1.42 0 0 1 16.16,10.16 V 5.88 a 1.38,1.38 0 0 1 1.38,-1.35 1.37,1.37 0 0 1 1.34,1.38 v 1.47 l 2.63,0.17 A 0.64,0.64 0 0 1 22.1,8.24 0.65,0.65 0 0 1 21.42,8.83 L 18.9,8.66 v 0.8 l 3.5,0.23 a 0.84,0.84 0 0 1 0.66,0.45 l 2.26,4.47 a 0.82,0.82 0 0 1 -1.46,0.74 z m 0,1.27 0.7,1.37 a 5.29,5.29 0 1 1 -7.14,-7 v 1.3 a 4.14,4.14 0 0 0 -1.8,3.17 4.18,4.18 0 0 0 8.18,1.16 z"
+         id="path977" />
+      <polyline
+         class="cls-1"
+         points="20.99 9.14 20.99 17.59 21.15 17.59 21.57 7.26 20.99 7.26 20.99 7.9"
+         id="polyline979" />
+      <path
+         class="cls-1"
+         d="M 15.57,7.12 A 12.06,12.06 0 0 1 15.68,5.35 2,2 0 0 1 16.15,4.6 1,1 0 0 0 15.25,4.51 1.65,1.65 0 0 0 14.14,6.28 1.09,1.09 0 0 0 15.57,7.12 Z"
+         id="path981" />
+    </g>
   </g>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/assets/themes/natuurpunt/watermill.svg b/assets/themes/natuurpunt/watermill.svg
index ab4c6bf18..631bd5e69 100644
--- a/assets/themes/natuurpunt/watermill.svg
+++ b/assets/themes/natuurpunt/watermill.svg
@@ -1,6 +1,45 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="385px" height="11px" viewBox="0 0 385 11" version="1.1">
-  <g id="surface1">
-    <path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 212.851562 -3.410156 L 276.980469 -67.429688 L 270.378906 -74.03125 L 263.121094 -81.398438 L 205.039062 -23.210938 C 201.921875 -26.179688 197.796875 -27.867188 193.488281 -27.941406 L 190.851562 -27.941406 L 130.570312 -88 L 123.96875 -81.398438 L 116.601562 -74.140625 L 176 -14.628906 C 175.417969 -13.257812 175.011719 -11.816406 174.789062 -10.339844 L 173.691406 -5.058594 L 110 58.410156 L 116.601562 65.011719 L 123.859375 72.378906 L 166.429688 29.808594 L 149.269531 112.96875 L 136.839844 112.96875 L 136.839844 129.140625 L 253 129.140625 L 253 112.96875 L 240.128906 112.96875 L 224.730469 46.96875 L 256.410156 78.648438 L 263.011719 72.050781 L 270.378906 64.789062 L 216.261719 11 Z M 206.800781 111.761719 L 182.601562 111.761719 L 182.601562 80.191406 C 182.601562 73.566406 187.96875 68.199219 194.589844 68.199219 C 197.808594 68.140625 200.914062 69.378906 203.210938 71.632812 C 205.507812 73.886719 206.800781 76.972656 206.800781 80.191406 Z M 206.800781 111.761719 "/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   viewBox="-10 8 15.18 19.74"
+   version="1.1"
+   id="svg1054"
+   sodipodi:docname="watermill.svg"
+   width="15.18"
+   height="19.74"
+   inkscape:version="1.1.1 (1:1.1+202109281949+c3084ef5ed)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview1056"
+     pagecolor="#505050"
+     bordercolor="#eeeeee"
+     borderopacity="1"
+     inkscape:pageshadow="0"
+     inkscape:pageopacity="0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="46.114286"
+     inkscape:cx="7.5030979"
+     inkscape:cy="8.5114622"
+     inkscape:current-layer="svg1054" />
+  <defs
+     id="defs1048">
+    <style
+       id="style1046">.cls-1{fill:#fff;}</style>
+  </defs>
+  <g
+     id="Layer_2"
+     data-name="Layer 2"
+     transform="translate(-10,8)">
+    <g
+       id="Layer_1-2"
+       data-name="Layer 1">
+      <path
+         class="cls-1"
+         d="M 9.35,7.69 15.18,1.87 14.58,1.27 13.92,0.6 8.64,5.89 A 1.56,1.56 0 0 0 7.59,5.46 H 7.35 L 1.87,0 1.27,0.6 0.6,1.26 6,6.67 A 1.6,1.6 0 0 0 5.89,7.06 v 0 L 5.79,7.54 0,13.31 l 0.6,0.6 0.66,0.67 3.87,-3.87 -1.56,7.56 H 2.44 v 1.47 H 13 v -1.47 h -1.17 l -1.4,-6 2.88,2.88 0.6,-0.6 0.67,-0.66 L 9.66,9 Z M 8.8,18.16 H 6.6 V 15.29 A 1.09,1.09 0 0 1 7.69,14.2 v 0 a 1.09,1.09 0 0 1 1.11,1.09 z"
+         id="path1050" />
+    </g>
   </g>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/assets/themes/natuurpunt/wheelchair.svg b/assets/themes/natuurpunt/wheelchair.svg
index 0ab50daa7..6bcca7e49 100644
--- a/assets/themes/natuurpunt/wheelchair.svg
+++ b/assets/themes/natuurpunt/wheelchair.svg
@@ -1,6 +1,15 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="385px" height="11px" viewBox="0 0 385 11" version="1.1">
-  <g id="surface1">
-    <path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 179.300781 -87.121094 C 169.945312 -87.121094 162.359375 -94.703125 162.359375 -104.058594 C 162.359375 -113.414062 169.945312 -121 179.300781 -121 C 188.65625 -121 196.238281 -113.414062 196.238281 -104.058594 C 196.238281 -94.703125 188.65625 -87.121094 179.300781 -87.121094 Z M 239.25 0 L 184.25 0 C 175.339844 0.210938 167.789062 -6.523438 166.980469 -15.398438 L 164.121094 -66.660156 C 163.605469 -75.773438 170.574219 -83.578125 179.683594 -84.09375 C 188.796875 -84.613281 196.605469 -77.644531 197.121094 -68.53125 L 198.21875 -50.820312 L 229.570312 -50.820312 C 233.824219 -50.820312 237.269531 -47.371094 237.269531 -43.121094 C 237.152344 -38.933594 233.757812 -35.585938 229.570312 -35.53125 L 198.769531 -35.53125 L 198.769531 -25.851562 L 241.121094 -25.851562 C 244.507812 -25.71875 247.605469 -23.902344 249.371094 -21.011719 L 280.5 30.800781 C 283.054688 35.40625 281.558594 41.207031 277.089844 44 C 272.398438 46.710938 266.402344 45.199219 263.558594 40.589844 Z M 239.910156 15.289062 L 249.371094 31.128906 C 239.144531 57.003906 213.28125 73.226562 185.535156 71.164062 C 157.789062 69.105469 134.605469 49.246094 128.308594 22.144531 C 122.015625 -4.957031 134.070312 -33.003906 158.070312 -47.078125 L 158.839844 -31.570312 C 141.085938 -17.550781 134.855469 6.585938 143.605469 27.445312 C 152.351562 48.308594 173.929688 60.78125 196.375 57.949219 C 218.816406 55.117188 236.621094 37.671875 239.910156 15.289062 Z M 239.910156 15.289062 "/>
-  </g>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="-11.5 11 35 1">
+    <defs>
+        <style>.cls-1{fill:#fff;}</style>
+    </defs>
+    <g id="Layer_2" data-name="Layer 2">
+        <g id="Layer_1-2" data-name="Layer 1">
+            <path class="cls-1"
+                  d="M2.52,23.73l-1-4.07h.84L3,22.45l.75-2.79h1l.71,2.84.63-2.84h.82l-1,4.07H5l-.81-3-.81,3Z"/>
+            <path class="cls-1"
+                  d="M9.9,22.23l.79.26a1.75,1.75,0,0,1-.6,1A1.74,1.74,0,0,1,9,23.8a1.75,1.75,0,0,1-1.33-.56,2.1,2.1,0,0,1-.52-1.51,2.2,2.2,0,0,1,.52-1.57,1.78,1.78,0,0,1,1.38-.56,1.67,1.67,0,0,1,1.21.44,1.59,1.59,0,0,1,.41.74l-.81.2a.88.88,0,0,0-.3-.5A.87.87,0,0,0,9,20.3a.91.91,0,0,0-.74.32A1.65,1.65,0,0,0,8,21.67a1.69,1.69,0,0,0,.28,1.1.88.88,0,0,0,.72.32.8.8,0,0,0,.56-.2A1.22,1.22,0,0,0,9.9,22.23Z"/>
+            <path class="cls-1"
+                  d="M4.8,3.08A1.54,1.54,0,1,1,6.34,1.54,1.54,1.54,0,0,1,4.8,3.08ZM10.25,11h-5a1.54,1.54,0,0,1-1.57-1.4L3.42,4.94a1.49,1.49,0,1,1,3-.17l.1,1.61H9.37a.7.7,0,0,1,.7.7.71.71,0,0,1-.7.69H6.57l0,.88h3.85a.92.92,0,0,1,.75.44L14,13.8A.9.9,0,0,1,13.69,15a.91.91,0,0,1-1.23-.31Zm.06,1.39.86,1.44a5.78,5.78,0,1,1-8.3-7.11l.07,1.41a4.58,4.58,0,1,0,7.37,4.26Z"/>
+        </g>
+    </g>
 </svg>
\ No newline at end of file