diff --git a/assets/layers/police_call_box/license_info.json b/assets/layers/police_call_box/license_info.json
index a42fda503..6c3b844dd 100644
--- a/assets/layers/police_call_box/license_info.json
+++ b/assets/layers/police_call_box/license_info.json
@@ -10,377 +10,7 @@
     ]
   },
   {
-    "path": "Edinburgh_City_police_box_001.jpg",
-    "license": "CC-BY 3.0",
-    "authors": [
-      "Brian McNeil"
-    ],
-    "sources": [
-      "https://commons.wikimedia.org/wiki/File:Edinburgh_City_police_box_001.jpg"
-    ]
-  },
-  {
-    "path": "Edinburgh_City_police_box_001.jpg",
-    "license": "CC-BY 3.0",
-    "authors": [
-      "Brian McNeil"
-    ],
-    "sources": [
-      "https://commons.wikimedia.org/wiki/File:Edinburgh_City_police_box_001.jpg"
-    ]
-  },
-  {
-    "path": "Edinburgh_City_police_box_001.jpg",
-    "license": "CC-BY 3.0",
-    "authors": [
-      "Brian McNeil"
-    ],
-    "sources": [
-      "https://commons.wikimedia.org/wiki/File:Edinburgh_City_police_box_001.jpg"
-    ]
-  },
-  {
-    "path": "Edinburgh_City_police_box_001.jpg",
-    "license": "CC-BY 3.0",
-    "authors": [
-      "Brian McNeil"
-    ],
-    "sources": [
-      "https://commons.wikimedia.org/wiki/File:Edinburgh_City_police_box_001.jpg"
-    ]
-  },
-  {
-    "path": "Edinburgh_City_police_box_001.jpg",
-    "license": "CC-BY 3.0",
-    "authors": [
-      "Brian McNeil"
-    ],
-    "sources": [
-      "https://commons.wikimedia.org/wiki/File:Edinburgh_City_police_box_001.jpg"
-    ]
-  },
-  {
-    "path": "Edinburgh_City_police_box_001.jpg",
-    "license": "CC-BY 3.0",
-    "authors": [
-      "Brian McNeil"
-    ],
-    "sources": [
-      "https://commons.wikimedia.org/wiki/File:Edinburgh_City_police_box_001.jpg"
-    ]
-  },
-  {
-    "path": "Edinburgh_City_police_box_001.jpg",
-    "license": "CC-BY 3.0",
-    "authors": [
-      "Brian McNeil"
-    ],
-    "sources": [
-      "https://commons.wikimedia.org/wiki/File:Edinburgh_City_police_box_001.jpg"
-    ]
-  },
-  {
-    "path": "Edinburgh_City_police_box_001.jpg",
-    "license": "CC-BY 3.0",
-    "authors": [
-      "Brian McNeil"
-    ],
-    "sources": [
-      "https://commons.wikimedia.org/wiki/File:Edinburgh_City_police_box_001.jpg"
-    ]
-  },
-  {
-    "path": "Edinburgh_City_police_box_001.jpg",
-    "license": "CC-BY 3.0",
-    "authors": [
-      "Brian McNeil"
-    ],
-    "sources": [
-      "https://commons.wikimedia.org/wiki/File:Edinburgh_City_police_box_001.jpg"
-    ]
-  },
-  {
-    "path": "Edinburgh_City_police_box_001.jpg",
-    "license": "CC-BY 3.0",
-    "authors": [
-      "Brian McNeil"
-    ],
-    "sources": [
-      "https://commons.wikimedia.org/wiki/File:Edinburgh_City_police_box_001.jpg"
-    ]
-  },
-  {
-    "path": "Edinburgh_City_police_box_001.jpg",
-    "license": "CC-BY 3.0",
-    "authors": [
-      "Brian McNeil"
-    ],
-    "sources": [
-      "https://commons.wikimedia.org/wiki/File:Edinburgh_City_police_box_001.jpg"
-    ]
-  },
-  {
-    "path": "Edinburgh_City_police_box_001.jpg",
-    "license": "CC-BY 3.0",
-    "authors": [
-      "Brian McNeil"
-    ],
-    "sources": [
-      "https://commons.wikimedia.org/wiki/File:Edinburgh_City_police_box_001.jpg"
-    ]
-  },
-  {
-    "path": "Edinburgh_City_police_box_001.jpg",
-    "license": "CC-BY 3.0",
-    "authors": [
-      "Brian McNeil"
-    ],
-    "sources": [
-      "https://commons.wikimedia.org/wiki/File:Edinburgh_City_police_box_001.jpg"
-    ]
-  },
-  {
-    "path": "Edinburgh_City_police_box_001.jpg",
-    "license": "CC-BY 3.0",
-    "authors": [
-      "Brian McNeil"
-    ],
-    "sources": [
-      "https://commons.wikimedia.org/wiki/File:Edinburgh_City_police_box_001.jpg"
-    ]
-  },
-  {
-    "path": "Edinburgh_City_police_box_001.jpg",
-    "license": "CC-BY 3.0",
-    "authors": [
-      "Brian McNeil"
-    ],
-    "sources": [
-      "https://commons.wikimedia.org/wiki/File:Edinburgh_City_police_box_001.jpg"
-    ]
-  },
-  {
-    "path": "Edinburgh_City_police_box_001.jpg",
-    "license": "CC-BY 3.0",
-    "authors": [
-      "Brian McNeil"
-    ],
-    "sources": [
-      "https://commons.wikimedia.org/wiki/File:Edinburgh_City_police_box_001.jpg"
-    ]
-  },
-  {
-    "path": "Edinburgh_City_police_box_001.jpg",
-    "license": "CC-BY 3.0",
-    "authors": [
-      "Brian McNeil"
-    ],
-    "sources": [
-      "https://commons.wikimedia.org/wiki/File:Edinburgh_City_police_box_001.jpg"
-    ]
-  },
-  {
-    "path": "Edinburgh_City_police_box_001.jpg",
-    "license": "CC-BY 3.0",
-    "authors": [
-      "Brian McNeil"
-    ],
-    "sources": [
-      "https://commons.wikimedia.org/wiki/File:Edinburgh_City_police_box_001.jpg"
-    ]
-  },
-  {
-    "path": "Edinburgh_City_police_box_001.jpg",
-    "license": "CC-BY 3.0",
-    "authors": [
-      "Brian McNeil"
-    ],
-    "sources": [
-      "https://commons.wikimedia.org/wiki/File:Edinburgh_City_police_box_001.jpg"
-    ]
-  },
-  {
-    "path": "Edinburgh_City_police_box_001.jpg",
-    "license": "CC-BY 3.0",
-    "authors": [
-      "Brian McNeil"
-    ],
-    "sources": [
-      "https://commons.wikimedia.org/wiki/File:Edinburgh_City_police_box_001.jpg"
-    ]
-  },
-  {
-    "path": "Edinburgh_City_police_box_001.jpg",
-    "license": "CC-BY 3.0",
-    "authors": [
-      "Brian McNeil"
-    ],
-    "sources": [
-      "https://commons.wikimedia.org/wiki/File:Edinburgh_City_police_box_001.jpg"
-    ]
-  },
-  {
-    "path": "Haiku_OS_–_Misc_TARDIS.svg",
-    "license": "MIT",
-    "authors": [
-      "<ul><li>Haiku Inc. (source icons)</li>\n<li>darealshinji (conversion and SVG code)</li></ul>"
-    ],
-    "sources": [
-      "https://commons.wikimedia.org/wiki/File:Haiku_OS_%E2%80%93_Misc_TARDIS.svg"
-    ]
-  },
-  {
-    "path": "Haiku_OS_–_Misc_TARDIS.svg",
-    "license": "MIT",
-    "authors": [
-      "<ul><li>Haiku Inc. (source icons)</li>\n<li>darealshinji (conversion and SVG code)</li></ul>"
-    ],
-    "sources": [
-      "https://commons.wikimedia.org/wiki/File:Haiku_OS_%E2%80%93_Misc_TARDIS.svg"
-    ]
-  },
-  {
-    "path": "Haiku_OS_–_Misc_TARDIS.svg",
-    "license": "MIT",
-    "authors": [
-      "<ul><li>Haiku Inc. (source icons)</li>\n<li>darealshinji (conversion and SVG code)</li></ul>"
-    ],
-    "sources": [
-      "https://commons.wikimedia.org/wiki/File:Haiku_OS_%E2%80%93_Misc_TARDIS.svg"
-    ]
-  },
-  {
-    "path": "Haiku_OS_–_Misc_TARDIS.svg",
-    "license": "MIT",
-    "authors": [
-      "<ul><li>Haiku Inc. (source icons)</li>\n<li>darealshinji (conversion and SVG code)</li></ul>"
-    ],
-    "sources": [
-      "https://commons.wikimedia.org/wiki/File:Haiku_OS_%E2%80%93_Misc_TARDIS.svg"
-    ]
-  },
-  {
-    "path": "Haiku_OS_–_Misc_TARDIS.svg",
-    "license": "MIT",
-    "authors": [
-      "<ul><li>Haiku Inc. (source icons)</li>\n<li>darealshinji (conversion and SVG code)</li></ul>"
-    ],
-    "sources": [
-      "https://commons.wikimedia.org/wiki/File:Haiku_OS_%E2%80%93_Misc_TARDIS.svg"
-    ]
-  },
-  {
-    "path": "Haiku_OS_–_Misc_TARDIS.svg",
-    "license": "MIT",
-    "authors": [
-      "<ul><li>Haiku Inc. (source icons)</li>\n<li>darealshinji (conversion and SVG code)</li></ul>"
-    ],
-    "sources": [
-      "https://commons.wikimedia.org/wiki/File:Haiku_OS_%E2%80%93_Misc_TARDIS.svg"
-    ]
-  },
-  {
-    "path": "Haiku_OS_–_Misc_TARDIS.svg",
-    "license": "MIT",
-    "authors": [
-      "<ul><li>Haiku Inc. (source icons)</li>\n<li>darealshinji (conversion and SVG code)</li></ul>"
-    ],
-    "sources": [
-      "https://commons.wikimedia.org/wiki/File:Haiku_OS_%E2%80%93_Misc_TARDIS.svg"
-    ]
-  },
-  {
-    "path": "Haiku_OS_–_Misc_TARDIS.svg",
-    "license": "MIT",
-    "authors": [
-      "<ul><li>Haiku Inc. (source icons)</li>\n<li>darealshinji (conversion and SVG code)</li></ul>"
-    ],
-    "sources": [
-      "https://commons.wikimedia.org/wiki/File:Haiku_OS_%E2%80%93_Misc_TARDIS.svg"
-    ]
-  },
-  {
-    "path": "Haiku_OS_–_Misc_TARDIS.svg",
-    "license": "MIT",
-    "authors": [
-      "<ul><li>Haiku Inc. (source icons)</li>\n<li>darealshinji (conversion and SVG code)</li></ul>"
-    ],
-    "sources": [
-      "https://commons.wikimedia.org/wiki/File:Haiku_OS_%E2%80%93_Misc_TARDIS.svg"
-    ]
-  },
-  {
-    "path": "Haiku_OS_–_Misc_TARDIS.svg",
-    "license": "MIT",
-    "authors": [
-      "<ul><li>Haiku Inc. (source icons)</li>\n<li>darealshinji (conversion and SVG code)</li></ul>"
-    ],
-    "sources": [
-      "https://commons.wikimedia.org/wiki/File:Haiku_OS_%E2%80%93_Misc_TARDIS.svg"
-    ]
-  },
-  {
-    "path": "Haiku_OS_–_Misc_TARDIS.svg",
-    "license": "MIT",
-    "authors": [
-      "<ul><li>Haiku Inc. (source icons)</li>\n<li>darealshinji (conversion and SVG code)</li></ul>"
-    ],
-    "sources": [
-      "https://commons.wikimedia.org/wiki/File:Haiku_OS_%E2%80%93_Misc_TARDIS.svg"
-    ]
-  },
-  {
-    "path": "Haiku_OS_–_Misc_TARDIS.svg",
-    "license": "MIT",
-    "authors": [
-      "<ul><li>Haiku Inc. (source icons)</li>\n<li>darealshinji (conversion and SVG code)</li></ul>"
-    ],
-    "sources": [
-      "https://commons.wikimedia.org/wiki/File:Haiku_OS_%E2%80%93_Misc_TARDIS.svg"
-    ]
-  },
-  {
-    "path": "Haiku_OS_–_Misc_TARDIS.svg",
-    "license": "MIT",
-    "authors": [
-      "<ul><li>Haiku Inc. (source icons)</li>\n<li>darealshinji (conversion and SVG code)</li></ul>"
-    ],
-    "sources": [
-      "https://commons.wikimedia.org/wiki/File:Haiku_OS_%E2%80%93_Misc_TARDIS.svg"
-    ]
-  },
-  {
-    "path": "Haiku_OS_–_Misc_TARDIS.svg",
-    "license": "MIT",
-    "authors": [
-      "<ul><li>Haiku Inc. (source icons)</li>\n<li>darealshinji (conversion and SVG code)</li></ul>"
-    ],
-    "sources": [
-      "https://commons.wikimedia.org/wiki/File:Haiku_OS_%E2%80%93_Misc_TARDIS.svg"
-    ]
-  },
-  {
-    "path": "Haiku_OS_–_Misc_TARDIS.svg",
-    "license": "MIT",
-    "authors": [
-      "<ul><li>Haiku Inc. (source icons)</li>\n<li>darealshinji (conversion and SVG code)</li></ul>"
-    ],
-    "sources": [
-      "https://commons.wikimedia.org/wiki/File:Haiku_OS_%E2%80%93_Misc_TARDIS.svg"
-    ]
-  },
-  {
-    "path": "Haiku_OS_–_Misc_TARDIS.svg",
-    "license": "MIT",
-    "authors": [
-      "<ul><li>Haiku Inc. (source icons)</li>\n<li>darealshinji (conversion and SVG code)</li></ul>"
-    ],
-    "sources": [
-      "https://commons.wikimedia.org/wiki/File:Haiku_OS_%E2%80%93_Misc_TARDIS.svg"
-    ]
-  },
-  {
-    "path": "Haiku_OS_–_Misc_TARDIS.svg",
+    "path": "police_call_box.svg",
     "license": "MIT",
     "authors": [
       "<ul><li>Haiku Inc. (source icons)</li>\n<li>darealshinji (conversion and SVG code)</li></ul>"
diff --git a/assets/layers/police_call_box/police_call_box.json b/assets/layers/police_call_box/police_call_box.json
index c2d5cc1f9..966b08bc8 100644
--- a/assets/layers/police_call_box/police_call_box.json
+++ b/assets/layers/police_call_box/police_call_box.json
@@ -24,7 +24,7 @@
       "anchor": "bottom",
       "marker": [
         {
-          "icon": "./assets/layers/police_call_box/Haiku_OS_–_Misc_TARDIS.svg",
+          "icon": "./assets/layers/police_call_box/police_call_box.svg",
           "color": "#d00000"
         }
       ]
@@ -129,4 +129,4 @@
     "enableRelocation": false
   },
   "credits": "osmuser63783"
-}
\ No newline at end of file
+}
diff --git a/assets/layers/police_call_box/Haiku_OS_–_Misc_TARDIS.svg b/assets/layers/police_call_box/police_call_box.svg
similarity index 100%
rename from assets/layers/police_call_box/Haiku_OS_–_Misc_TARDIS.svg
rename to assets/layers/police_call_box/police_call_box.svg
diff --git a/assets/layers/police_call_box/police_call_box.svg.license b/assets/layers/police_call_box/police_call_box.svg.license
new file mode 100644
index 000000000..0e6805220
--- /dev/null
+++ b/assets/layers/police_call_box/police_call_box.svg.license
@@ -0,0 +1,3 @@
+SPDX-FileCopyrightText: <ul><li>Haiku Inc. (source icons)</li>
+<li>darealshinji (conversion and SVG code)</li></ul>
+SPDX-License-Identifier: MIT
\ No newline at end of file
diff --git a/assets/layers/questions/license_info.json b/assets/layers/questions/license_info.json
index 4dc7d4438..c67dd8740 100644
--- a/assets/layers/questions/license_info.json
+++ b/assets/layers/questions/license_info.json
@@ -170,16 +170,6 @@
       "https://www.onlinewebfonts.com/icon/1059"
     ]
   },
-  {
-    "path": "phone.svg",
-    "license": "CC-BY-3.0",
-    "authors": [
-      "@ tyskrat"
-    ],
-    "sources": [
-      "https://www.onlinewebfonts.com/icon/1059"
-    ]
-  },
   {
     "path": "qrcode.svg",
     "license": "MIT",
@@ -196,12 +186,6 @@
     "authors": [],
     "sources": []
   },
-  {
-    "path": "send_email.svg",
-    "license": "TRIVIAL",
-    "authors": [],
-    "sources": []
-  },
   {
     "path": "smartphone.svg",
     "license": "CC-BY-3.0",
diff --git a/assets/svg/license_info.json b/assets/svg/license_info.json
index c19b3d9c2..90ca8bed0 100644
--- a/assets/svg/license_info.json
+++ b/assets/svg/license_info.json
@@ -27,16 +27,6 @@
       "https://mapcomplete.org"
     ]
   },
-  {
-    "path": "SocialImageForeground.svg",
-    "license": "CC-BY-SA-4.0",
-    "authors": [
-      "Pieter Vander Vennet"
-    ],
-    "sources": [
-      "https://mapcomplete.org"
-    ]
-  },
   {
     "path": "add.svg",
     "license": "CC0-1.0",
@@ -45,22 +35,6 @@
     ],
     "sources": []
   },
-  {
-    "path": "add.svg",
-    "license": "CC0-1.0",
-    "authors": [
-      "Pieter Vander Vennet"
-    ],
-    "sources": []
-  },
-  {
-    "path": "addSmall.svg",
-    "license": "CC0-1.0",
-    "authors": [
-      "Pieter Vander Vennet"
-    ],
-    "sources": []
-  },
   {
     "path": "addSmall.svg",
     "license": "CC0-1.0",
@@ -95,14 +69,6 @@
     ],
     "sources": []
   },
-  {
-    "path": "back.svg",
-    "license": "CC0-1.0",
-    "authors": [
-      "Pieter Vander Vennet"
-    ],
-    "sources": []
-  },
   {
     "path": "blocked.svg",
     "license": "CC0-1.0",
@@ -146,17 +112,6 @@
       " https://github.com/primer/octicons"
     ]
   },
-  {
-    "path": "bug.svg",
-    "license": "MIT",
-    "authors": [
-      "Github"
-    ],
-    "sources": [
-      "https://commons.wikimedia.org/wiki/File:Octicons-bug.svg",
-      " https://github.com/primer/octicons"
-    ]
-  },
   {
     "path": "center.svg",
     "license": "CC0-1.0",
@@ -173,22 +128,6 @@
     ],
     "sources": []
   },
-  {
-    "path": "checkmark.svg",
-    "license": "CC0-1.0",
-    "authors": [
-      "Pieter Vander Vennet"
-    ],
-    "sources": []
-  },
-  {
-    "path": "circle.svg",
-    "license": "CC0-1.0",
-    "authors": [
-      "Pieter Vander Vennet"
-    ],
-    "sources": []
-  },
   {
     "path": "circle.svg",
     "license": "CC0-1.0",
@@ -205,20 +144,6 @@
     ],
     "sources": []
   },
-  {
-    "path": "clock.svg",
-    "license": "CC0-1.0",
-    "authors": [
-      "Pieter Vander Vennet"
-    ],
-    "sources": []
-  },
-  {
-    "path": "close.svg",
-    "license": "TRIVIAL",
-    "authors": [],
-    "sources": []
-  },
   {
     "path": "close.svg",
     "license": "TRIVIAL",
@@ -239,12 +164,6 @@
     "authors": [],
     "sources": []
   },
-  {
-    "path": "compass.svg",
-    "license": "TRIVIAL",
-    "authors": [],
-    "sources": []
-  },
   {
     "path": "compass_arrow.svg",
     "license": "CC0-1.0",
@@ -283,12 +202,6 @@
     "authors": [],
     "sources": []
   },
-  {
-    "path": "cross_bottom_right.svg",
-    "license": "TRIVIAL",
-    "authors": [],
-    "sources": []
-  },
   {
     "path": "crosshair-locked.svg",
     "license": "TRIVIAL",
@@ -301,22 +214,6 @@
     "authors": [],
     "sources": []
   },
-  {
-    "path": "crosshair.svg",
-    "license": "TRIVIAL",
-    "authors": [],
-    "sources": []
-  },
-  {
-    "path": "delete_icon.svg",
-    "license": "CC-BY-SA-4.0",
-    "authors": [
-      "Dave Gandy"
-    ],
-    "sources": [
-      "https://commons.wikimedia.org/wiki/File:Trash_font_awesome.svg\rT"
-    ]
-  },
   {
     "path": "delete_icon.svg",
     "license": "CC-BY-SA-4.0",
@@ -333,20 +230,6 @@
     "authors": [],
     "sources": []
   },
-  {
-    "path": "direction_gradient.svg",
-    "license": "TRIVIAL",
-    "authors": [],
-    "sources": []
-  },
-  {
-    "path": "direction_stroke.svg",
-    "license": "CC0-1.0",
-    "authors": [
-      "Pieter Vander Vennet"
-    ],
-    "sources": []
-  },
   {
     "path": "direction_stroke.svg",
     "license": "CC0-1.0",
@@ -389,12 +272,6 @@
     "authors": [],
     "sources": []
   },
-  {
-    "path": "envelope.svg",
-    "license": "TRIVIAL",
-    "authors": [],
-    "sources": []
-  },
   {
     "path": "eye.svg",
     "license": "CC-BY-SA-3.0",
@@ -432,27 +309,6 @@
       " http://tango.freedesktop.org/Tango_Desktop_Project"
     ]
   },
-  {
-    "path": "floppy.svg",
-    "license": "CC0-1.0",
-    "authors": [
-      "The Tango Desktop Project"
-    ],
-    "sources": [
-      "https://commons.wikimedia.org/wiki/File:Media-floppy.svg",
-      "http://tango.freedesktop.org/Tango_Desktop_Project"
-    ]
-  },
-  {
-    "path": "floppy.svg",
-    "license": "CC0-1.0",
-    "authors": [
-      "The Tango! Desktop Project"
-    ],
-    "sources": [
-      "https://commons.wikimedia.org/wiki/File:Media-floppy.svg"
-    ]
-  },
   {
     "path": "forgejo.svg",
     "license": "CC-BY-SA 4.0",
@@ -563,22 +419,6 @@
     "authors": [],
     "sources": []
   },
-  {
-    "path": "help.svg",
-    "license": "TRIVIAL",
-    "authors": [],
-    "sources": []
-  },
-  {
-    "path": "home.svg",
-    "license": "CC-BY-SA-3.0",
-    "authors": [
-      "Timothy Miller"
-    ],
-    "sources": [
-      "https://commons.wikimedia.org/wiki/File:Home-icon.svg"
-    ]
-  },
   {
     "path": "home.svg",
     "license": "CC-BY-SA-3.0",
@@ -610,23 +450,6 @@
       " https://josm.openstreetmap.de/"
     ]
   },
-  {
-    "path": "josm_logo.svg",
-    "license": "CC0-1.0",
-    "authors": [
-      "JOSM Team"
-    ],
-    "sources": [
-      "https://wiki.openstreetmap.org/wiki/File:JOSM_Logotype_2019.svg",
-      " https://josm.openstreetmap.de/"
-    ]
-  },
-  {
-    "path": "layers.svg",
-    "license": "TRIVIAL",
-    "authors": [],
-    "sources": []
-  },
   {
     "path": "layers.svg",
     "license": "TRIVIAL",
@@ -711,12 +534,6 @@
     "authors": [],
     "sources": []
   },
-  {
-    "path": "logo.svg",
-    "license": "TRIVIAL",
-    "authors": [],
-    "sources": []
-  },
   {
     "path": "mangrove_logo.svg",
     "license": "LOGO",
@@ -759,26 +576,6 @@
       "https://mapillary.com/"
     ]
   },
-  {
-    "path": "mapillary.svg",
-    "license": "LOGO",
-    "authors": [
-      "Mapillary"
-    ],
-    "sources": [
-      "https://mapillary.com/"
-    ]
-  },
-  {
-    "path": "mapillary_black.svg",
-    "license": "LOGO",
-    "authors": [
-      "Mapillary"
-    ],
-    "sources": [
-      "https://www.mapillary.com/"
-    ]
-  },
   {
     "path": "mapillary_black.svg",
     "license": "LOGO",
@@ -805,12 +602,6 @@
     "authors": [],
     "sources": []
   },
-  {
-    "path": "min.svg",
-    "license": "TRIVIAL",
-    "authors": [],
-    "sources": []
-  },
   {
     "path": "move-arrows.svg",
     "license": "CC0-1.0",
@@ -883,24 +674,6 @@
       "https://www.openstreetmap.us/"
     ]
   },
-  {
-    "path": "osm-logo-us.svg",
-    "license": "LOGO",
-    "authors": [
-      "OpenStreetMap U.S. Chapter"
-    ],
-    "sources": [
-      "https://www.openstreetmap.us/"
-    ]
-  },
-  {
-    "path": "osm-logo.svg",
-    "license": "LOGO",
-    "authors": [],
-    "sources": [
-      "https://www.OpenStreetMap.org"
-    ]
-  },
   {
     "path": "osm-logo.svg",
     "license": "LOGO",
@@ -950,17 +723,6 @@
       " https://commons.wikimedia.org/wiki/File:Octicons-pencil.svg"
     ]
   },
-  {
-    "path": "pencil.svg",
-    "license": "MIT",
-    "authors": [
-      "GitHub Octicons"
-    ],
-    "sources": [
-      "https://github.com/primer/octicons",
-      " https://commons.wikimedia.org/wiki/File:Octicons-pencil.svg"
-    ]
-  },
   {
     "path": "person.svg",
     "license": "CC0-1.0",
@@ -975,12 +737,6 @@
     "authors": [],
     "sources": []
   },
-  {
-    "path": "pin.svg",
-    "license": "TRIVIAL",
-    "authors": [],
-    "sources": []
-  },
   {
     "path": "plantnet_logo.svg",
     "license": "LOGO",
@@ -997,12 +753,6 @@
     "authors": [],
     "sources": []
   },
-  {
-    "path": "plus.svg",
-    "license": "TRIVIAL",
-    "authors": [],
-    "sources": []
-  },
   {
     "path": "pop-out.svg",
     "license": "CC-BY-3.0",
@@ -1013,22 +763,6 @@
       "https://www.onlinewebfonts.com/icon/2151"
     ]
   },
-  {
-    "path": "pop-out.svg",
-    "license": "CC-BY-3.0",
-    "authors": [
-      "@fatih"
-    ],
-    "sources": [
-      "https://www.onlinewebfonts.com/icon/2151"
-    ]
-  },
-  {
-    "path": "reload.svg",
-    "license": "TRIVIAL",
-    "authors": [],
-    "sources": []
-  },
   {
     "path": "reload.svg",
     "license": "TRIVIAL",
@@ -1057,12 +791,6 @@
     "authors": [],
     "sources": []
   },
-  {
-    "path": "ring.svg",
-    "license": "TRIVIAL",
-    "authors": [],
-    "sources": []
-  },
   {
     "path": "robot.svg",
     "license": "CC-BY-4.0",
@@ -1094,17 +822,6 @@
       "https://phabricator.wikimedia.org/diffusion/GOJU/browse/master/AUTHORS.txt"
     ]
   },
-  {
-    "path": "search.svg",
-    "license": "MIT",
-    "authors": [
-      "OOjs UI Team and other contributors"
-    ],
-    "sources": [
-      "https://commons.wikimedia.org/wiki/File:OOjs_UI_indicator_search-rtl.svg",
-      "https://phabricator.wikimedia.org/diffusion/GOJU/browse/master/AUTHORS.txt"
-    ]
-  },
   {
     "path": "search_disable.svg",
     "license": "MIT",
@@ -1162,12 +879,6 @@
     "authors": [],
     "sources": []
   },
-  {
-    "path": "square.svg",
-    "license": "TRIVIAL",
-    "authors": [],
-    "sources": []
-  },
   {
     "path": "square_rounded.svg",
     "license": "TRIVIAL",
@@ -1180,18 +891,6 @@
     "authors": [],
     "sources": []
   },
-  {
-    "path": "star.svg",
-    "license": "TRIVIAL",
-    "authors": [],
-    "sources": []
-  },
-  {
-    "path": "star_half.svg",
-    "license": "TRIVIAL",
-    "authors": [],
-    "sources": []
-  },
   {
     "path": "star_half.svg",
     "license": "TRIVIAL",
@@ -1204,22 +903,6 @@
     "authors": [],
     "sources": []
   },
-  {
-    "path": "star_outline.svg",
-    "license": "TRIVIAL",
-    "authors": [],
-    "sources": []
-  },
-  {
-    "path": "statistics.svg",
-    "license": "CC-BY-3.0",
-    "authors": [
-      "@felpgrc"
-    ],
-    "sources": [
-      "https://www.onlinewebfonts.com/icon/197818"
-    ]
-  },
   {
     "path": "statistics.svg",
     "license": "CC-BY-3.0",
@@ -1266,16 +949,6 @@
       "https://commons.wikimedia.org/wiki/File:OOjs_UI_icon_language-ltr.svg"
     ]
   },
-  {
-    "path": "translate.svg",
-    "license": "CC-BY-SA-3.0",
-    "authors": [
-      "MGalloway (WMF)"
-    ],
-    "sources": [
-      "https://commons.wikimedia.org/wiki/File:OOjs_UI_icon_language-ltr.svg"
-    ]
-  },
   {
     "path": "triangle.svg",
     "license": "CC0-1.0",
@@ -1302,16 +975,6 @@
       "https://www.wikidata.org"
     ]
   },
-  {
-    "path": "wikidata.svg",
-    "license": "LOGO",
-    "authors": [
-      "Wikidata"
-    ],
-    "sources": [
-      "https://www.wikidata.org"
-    ]
-  },
   {
     "path": "wikimedia-commons-white.svg",
     "license": "LOGO",
@@ -1322,26 +985,6 @@
       "https://commons.wikimedia.org"
     ]
   },
-  {
-    "path": "wikimedia-commons-white.svg",
-    "license": "LOGO",
-    "authors": [
-      "Wikimedia"
-    ],
-    "sources": [
-      "https://commons.wikimedia.org"
-    ]
-  },
-  {
-    "path": "wikipedia.svg",
-    "license": "LOGO",
-    "authors": [
-      "Wikipedia"
-    ],
-    "sources": [
-      "https://www.wikipedia.org/"
-    ]
-  },
   {
     "path": "wikipedia.svg",
     "license": "LOGO",
diff --git a/assets/themes/hailhydrant/license_info.json b/assets/themes/hailhydrant/license_info.json
index 202a8e3a1..46290f404 100644
--- a/assets/themes/hailhydrant/license_info.json
+++ b/assets/themes/hailhydrant/license_info.json
@@ -53,16 +53,6 @@
       "https://commons.wikimedia.org/wiki/File:Hydrant.svg"
     ]
   },
-  {
-    "path": "hydrant.svg",
-    "license": "CC-BY-SA-4.0",
-    "authors": [
-      "GOwin"
-    ],
-    "sources": [
-      "https://raw.githubusercontent.com/mapamore/MapComplete/master/assets/themes/hailhydrant/hydrant.svg"
-    ]
-  },
   {
     "path": "hydrant_pillar.svg",
     "license": "CC-BY-SA-4.0",
diff --git a/assets/themes/police_call_boxes/police_call_boxes.json b/assets/themes/police_call_boxes/police_call_boxes.json
index d8c127e88..541b3cb51 100644
--- a/assets/themes/police_call_boxes/police_call_boxes.json
+++ b/assets/themes/police_call_boxes/police_call_boxes.json
@@ -1,6 +1,6 @@
 {
   "id": "police_call_boxes",
-  "icon": "./assets/layers/police_call_box/Haiku_OS_–_Misc_TARDIS.svg",
+  "icon": "./assets/layers/police_call_box/police_call_box.svg",
   "layers": [
     "police_call_box"
   ]
diff --git a/assets/themes/toerisme_vlaanderen/NEGATIEF/license_info.json b/assets/themes/toerisme_vlaanderen/NEGATIEF/license_info.json
index a1b585414..0420c8f37 100644
--- a/assets/themes/toerisme_vlaanderen/NEGATIEF/license_info.json
+++ b/assets/themes/toerisme_vlaanderen/NEGATIEF/license_info.json
@@ -120,17 +120,6 @@
       "https://mapcomplete.org/toerisme_vlaanderen"
     ]
   },
-  {
-    "path": "toilets_wheelchair.svg",
-    "license": "CC0-1.0",
-    "authors": [
-      "Toerisme Vlaanderen"
-    ],
-    "sources": [
-      "https://toerismevlaanderen.be/pinjepunt",
-      "https://mapcomplete.org/toerisme_vlaanderen"
-    ]
-  },
   {
     "path": "toilets_wheelchair.svg",
     "license": "CC0-1.0",
diff --git a/assets/themes/toerisme_vlaanderen/license_info.json b/assets/themes/toerisme_vlaanderen/license_info.json
index 919f9b36f..8ed86e08c 100644
--- a/assets/themes/toerisme_vlaanderen/license_info.json
+++ b/assets/themes/toerisme_vlaanderen/license_info.json
@@ -234,17 +234,6 @@
       "https://mapcomplete.org/toerisme_vlaanderen"
     ]
   },
-  {
-    "path": "toilets_wheelchair.svg",
-    "license": "CC0-1.0",
-    "authors": [
-      "Toerisme Vlaanderen"
-    ],
-    "sources": [
-      "https://toerismevlaanderen.be/pinjepunt",
-      "https://mapcomplete.org/toerisme_vlaanderen"
-    ]
-  },
   {
     "path": "toilets_wheelchair.svg",
     "license": "CC0-1.0",
diff --git a/scripts/generateLicenseInfo.ts b/scripts/generateLicenseInfo.ts
index be5f94e9e..41a3b75ea 100644
--- a/scripts/generateLicenseInfo.ts
+++ b/scripts/generateLicenseInfo.ts
@@ -326,6 +326,7 @@ export class GenerateLicenseInfo extends Script {
             }
 
             licenses.sort((a, b) => (a.path < b.path ? -1 : 1))
+            licenses = Utils.DedupOnId(licenses, l => l.path)
             const path = dir + "/license_info.json"
             if (licenses.length === 0) {
                 console.log("Removing", path, "as it is empty")