diff --git a/assets/svg/download.svg b/assets/svg/download.svg
deleted file mode 100644
index bfde059802..0000000000
--- a/assets/svg/download.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8.08 8.86C8.13 8.53 8.24 8.24 8.38 7.99C8.52 7.74 8.72 7.53 8.97 7.37C9.21 7.22 9.51 7.15 9.88 7.14C10.11 7.15 10.32 7.19 10.51 7.27C10.71 7.36 10.89 7.48 11.03 7.63C11.17 7.78 11.28 7.96 11.37 8.16C11.46 8.36 11.5 8.58 11.51 8.8H13.3C13.28 8.33 13.19 7.9 13.02 7.51C12.85 7.12 12.62 6.78 12.32 6.5C12.02 6.22 11.66 6 11.24 5.84C10.82 5.68 10.36 5.61 9.85 5.61C9.2 5.61 8.63 5.72 8.15 5.95C7.67 6.18 7.27 6.48 6.95 6.87C6.63 7.26 6.39 7.71 6.24 8.23C6.09 8.75 6 9.29 6 9.87V10.14C6 10.72 6.08 11.26 6.23 11.78C6.38 12.3 6.62 12.75 6.94 13.13C7.26 13.51 7.66 13.82 8.14 14.04C8.62 14.26 9.19 14.38 9.84 14.38C10.31 14.38 10.75 14.3 11.16 14.15C11.57 14 11.93 13.79 12.24 13.52C12.55 13.25 12.8 12.94 12.98 12.58C13.16 12.22 13.27 11.84 13.28 11.43H11.49C11.48 11.64 11.43 11.83 11.34 12.01C11.25 12.19 11.13 12.34 10.98 12.47C10.83 12.6 10.66 12.7 10.46 12.77C10.27 12.84 10.07 12.86 9.86 12.87C9.5 12.86 9.2 12.79 8.97 12.64C8.72 12.48 8.52 12.27 8.38 12.02C8.24 11.77 8.13 11.47 8.08 11.14C8.03 10.81 8 10.47 8 10.14V9.87C8 9.52 8.03 9.19 8.08 8.86V8.86ZM10 0C4.48 0 0 4.48 0 10C0 15.52 4.48 20 10 20C15.52 20 20 15.52 20 10C20 4.48 15.52 0 10 0ZM10 18C5.59 18 2 14.41 2 10C2 5.59 5.59 2 10 2C14.41 2 18 5.59 18 10C18 14.41 14.41 18 10 18Z" fill="white"/>
-</svg>
\ No newline at end of file
diff --git a/assets/svg/license_info.json b/assets/svg/license_info.json
index ee5c511a8a..ccdac7acf7 100644
--- a/assets/svg/license_info.json
+++ b/assets/svg/license_info.json
@@ -49,14 +49,6 @@
     "license": "CC0",
     "sources": []
   },
-  {
-    "authors": [
-      "Hannah"
-    ],
-    "path": "download.svg",
-    "license": "CC0",
-    "sources": []
-  },
   {
     "authors": [],
     "path": "ampersand.svg",
diff --git a/assets/themes/natuurpunt/birdshelter.svg b/assets/themes/natuurpunt/birdshelter.svg
new file mode 100644
index 0000000000..cde54f7b23
--- /dev/null
+++ b/assets/themes/natuurpunt/birdshelter.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 23 20.28"><defs><style>.cls-1,.cls-3{fill:#fff;}.cls-2{fill:none;stroke-width:1.2px;}.cls-2,.cls-3{stroke:#fff;stroke-miterlimit:10;}.cls-3{stroke-width:0.5px;}</style></defs><g id="Layer_2" data-name="Layer 2"><g id="Layer_1-2" data-name="Layer 1"><path class="cls-1" d="M18.77,10.71h0l-.1-.15-2.54-3.8h0a2.1,2.1,0,0,0-4,.89,2.22,2.22,0,0,0,0,.45h0v.26l0-.37-.48.3V8.7H11V8.29L10.49,8l0,.37V8.1h0a2.22,2.22,0,0,0,0-.45,2.09,2.09,0,0,0-4-.89h0L4,10.56a1.3,1.3,0,0,0-.1.15h0a3.56,3.56,0,0,0-.56,1.91,3.6,3.6,0,0,0,7.18.29v-1.6l.59-.53,0-.72h.41l0,.72.6.53v1.13c0,.06,0,.12,0,.18s0,.06,0,.09v.22l0,0a3.59,3.59,0,1,0,6.62-2.2Zm-11.85,4a2.14,2.14,0,1,1,2.14-2.14A2.14,2.14,0,0,1,6.92,14.76Zm8.81,0a2.14,2.14,0,1,1,2.14-2.14A2.14,2.14,0,0,1,15.73,14.76Z"/><path class="cls-2" d="M21.61,17.74V6.56a.35.35,0,0,0-.19-.3L11.58.67a.53.53,0,0,0-.52,0L1.23,6.26a.35.35,0,0,0-.19.3V17.74"/><path class="cls-3" d="M22.35,20H.65a.4.4,0,0,1,0-.8h21.7a.4.4,0,0,1,0,.8Z"/></g></g></svg>
\ No newline at end of file
diff --git a/assets/themes/natuurpunt/license_info.json b/assets/themes/natuurpunt/license_info.json
index c192defd61..97187422c9 100644
--- a/assets/themes/natuurpunt/license_info.json
+++ b/assets/themes/natuurpunt/license_info.json
@@ -116,5 +116,11 @@
     "path": "birdhide.svg",
     "license": "CC0",
     "sources": []
+  },
+  {
+    "authors": [],
+    "path": "birdshelter.svg",
+    "license": "CC0",
+    "sources": []
   }
 ]
\ No newline at end of file
diff --git a/assets/themes/natuurpunt/natuurpunt.json b/assets/themes/natuurpunt/natuurpunt.json
index 9d43a5d1a3..700ad37cca 100644
--- a/assets/themes/natuurpunt/natuurpunt.json
+++ b/assets/themes/natuurpunt/natuurpunt.json
@@ -137,7 +137,19 @@
           "isOsmCache": true
         },
         "icon": {
-          "render": "circle:#FE6F32;./assets/themes/natuurpunt/birdhide.svg"
+          "render": "circle:#FE6F32;./assets/themes/natuurpunt/birdhide.svg",
+          "mappings": [
+            {
+              "if": {
+                "or": [
+                  "building=yes",
+                  "shelter=yes",
+                  "amenity=shelter"
+                ]
+              },
+              "then": "circle:#FE6F32;./assets/themes/natuurpunt/birdshelter.svg"
+            }
+          ]
         }
       }
     },