diff --git a/assets/layers/named_streets/named_streets.json b/assets/layers/named_streets/named_streets.json
index 9c2a3c1ba9..4041e8b55d 100644
--- a/assets/layers/named_streets/named_streets.json
+++ b/assets/layers/named_streets/named_streets.json
@@ -11,7 +11,7 @@
   },
   "minzoom": 18,
   "shownByDefault": false,
-  "pointRendering": [],
+  "pointRendering": null,
   "lineRendering": [
     {
       "color": "#ccc",
diff --git a/assets/layers/stairs/license_info.json b/assets/layers/stairs/license_info.json
index 29eb5b169e..6e638d37d1 100644
--- a/assets/layers/stairs/license_info.json
+++ b/assets/layers/stairs/license_info.json
@@ -6,5 +6,15 @@
       "Robin van der Linde"
     ],
     "sources": []
+  },
+  {
+    "path": "stairs.svg",
+    "license": "CC-BY SA 4.0",
+    "authors": [
+      " \tFont Awesome"
+    ],
+    "sources": [
+      "https://commons.wikimedia.org/wiki/File:Stairs-solid.svg"
+    ]
   }
 ]
\ No newline at end of file
diff --git a/assets/layers/stairs/stairs.json b/assets/layers/stairs/stairs.json
index cb7561a707..ea82ade00c 100644
--- a/assets/layers/stairs/stairs.json
+++ b/assets/layers/stairs/stairs.json
@@ -39,7 +39,22 @@
       }
     ]
   },
-  "pointRendering": [],
+  "pointRendering": [
+    {
+      "marker": [
+        {
+          "icon": "circle",
+          "color": "white"
+        },
+        {
+          "icon": "./assets/layers/stairs/stairs.svg"
+        }
+      ],
+      "location": [
+        "point"
+      ]
+    }
+  ],
   "lineRendering": [
     {
       "color": "gray",
diff --git a/assets/layers/stairs/stairs.svg b/assets/layers/stairs/stairs.svg
new file mode 100644
index 0000000000..b2e700e413
--- /dev/null
+++ b/assets/layers/stairs/stairs.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512"><!--! Font Awesome Pro 6.2.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2022 Fonticons, Inc. --><path d="M384 64c0-17.7 14.3-32 32-32H544c17.7 0 32 14.3 32 32s-14.3 32-32 32H448v96c0 17.7-14.3 32-32 32H320v96c0 17.7-14.3 32-32 32H192v96c0 17.7-14.3 32-32 32H32c-17.7 0-32-14.3-32-32s14.3-32 32-32h96V320c0-17.7 14.3-32 32-32h96V192c0-17.7 14.3-32 32-32h96V64z"/></svg>
\ No newline at end of file
diff --git a/assets/layers/stairs/stairs.svg.license b/assets/layers/stairs/stairs.svg.license
new file mode 100644
index 0000000000..64535f1564
--- /dev/null
+++ b/assets/layers/stairs/stairs.svg.license
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText:  	Font Awesome
+SPDX-License-Identifier: CC-BY SA 4.0
\ No newline at end of file
diff --git a/assets/layers/transit_routes/transit_routes.json b/assets/layers/transit_routes/transit_routes.json
index 45163fdb48..9efcb28216 100644
--- a/assets/layers/transit_routes/transit_routes.json
+++ b/assets/layers/transit_routes/transit_routes.json
@@ -63,7 +63,7 @@
     },
     "icons.defaults"
   ],
-  "pointRendering": [],
+  "pointRendering": null,
   "lineRendering": [
     {
       "color": {
diff --git a/assets/layers/walls_and_buildings/walls_and_buildings.json b/assets/layers/walls_and_buildings/walls_and_buildings.json
index 9745070f38..77251153fc 100644
--- a/assets/layers/walls_and_buildings/walls_and_buildings.json
+++ b/assets/layers/walls_and_buildings/walls_and_buildings.json
@@ -43,7 +43,7 @@
       "cs": "Zeď nebo budova"
     }
   },
-  "pointRendering": [],
+  "pointRendering": null,
   "lineRendering": [
     {
       "color": "#fff",
diff --git a/assets/themes/bag/bag.json b/assets/themes/bag/bag.json
index 158f122e09..7a94f8f3c4 100644
--- a/assets/themes/bag/bag.json
+++ b/assets/themes/bag/bag.json
@@ -101,9 +101,49 @@
           "question": "What kind of building is this?"
         }
       ],
-      "pointRendering": [],
+      "pointRendering": null,
       "lineRendering": [
-        {}
+        {
+          "width": {
+            "render": "2",
+            "mappings": [
+              {
+                "if": "fixme~*",
+                "then": "5"
+              }
+            ]
+          },
+          "color": {
+            "render": "#00c",
+            "mappings": [
+              {
+                "if": "fixme~*",
+                "then": "#ff00ff"
+              },
+              {
+                "if": "building=house",
+                "then": "#a00"
+              },
+              {
+                "if": "building=shed",
+                "then": "#563e02"
+              },
+              {
+                "if": {
+                  "or": [
+                    "building=garage",
+                    "building=garages"
+                  ]
+                },
+                "then": "#f9bfbb"
+              },
+              {
+                "if": "building=yes",
+                "then": "#0774f2"
+              }
+            ]
+          }
+        }
       ]
     },
     {
diff --git a/assets/themes/campersite/campersite.json b/assets/themes/campersite/campersite.json
index 48dc140c24..8ee63fe1c7 100644
--- a/assets/themes/campersite/campersite.json
+++ b/assets/themes/campersite/campersite.json
@@ -910,9 +910,42 @@
           }
         }
       ],
-      "pointRendering": [],
+      "pointRendering": [
+        {
+          "marker": [
+            {
+              "icon": "circle",
+              "color": "white"
+            },
+            {
+              "icon": {
+                "render": "./assets/themes/campersite/caravan.svg",
+                "mappings": [
+                  {
+                    "if": {
+                      "and": [
+                        "fee=no"
+                      ]
+                    },
+                    "then": "./assets/themes/campersite/caravan_green.svg"
+                  }
+                ]
+              }
+            }
+          ],
+          "iconSize": "40,40",
+          "location": [
+            "point",
+            "centroid"
+          ],
+          "anchor": "center"
+        }
+      ],
       "lineRendering": [
-        {}
+        {
+          "color": "#00f",
+          "width": "8"
+        }
       ]
     },
     {
@@ -1510,9 +1543,29 @@
           }
         }
       ],
-      "pointRendering": [],
+      "pointRendering": [
+        {
+          "marker": [
+            {
+              "icon": "circle",
+              "color": "white"
+            },
+            {
+              "icon": "./assets/themes/campersite/sanitary_dump_station.svg"
+            }
+          ],
+          "iconSize": "32,32",
+          "location": [
+            "point"
+          ],
+          "anchor": "center"
+        }
+      ],
       "lineRendering": [
-        {}
+        {
+          "color": "#00f",
+          "width": "8"
+        }
       ]
     }
   ],
@@ -1623,4 +1676,4 @@
     ]
   },
   "widenFactor": 1.5
-}
\ No newline at end of file
+}
diff --git a/assets/themes/cycle_highways/cycle_highways.json b/assets/themes/cycle_highways/cycle_highways.json
index 121d408cea..2365eaade6 100644
--- a/assets/themes/cycle_highways/cycle_highways.json
+++ b/assets/themes/cycle_highways/cycle_highways.json
@@ -228,9 +228,41 @@
           ]
         }
       ],
-      "pointRendering": [],
+      "pointRendering": null,
       "lineRendering": [
-        {}
+        {
+          "color": {
+            "render": "#ff7392",
+            "mappings": [
+              {
+                "if": "state=",
+                "then": "#00acfc"
+              },
+              {
+                "if": "state=temporary",
+                "then": "#00acfc"
+              }
+            ]
+          },
+          "width": "4",
+          "dashArray": {
+            "render": "",
+            "mappings": [
+              {
+                "if": "state=temporary",
+                "then": "12 10"
+              },
+              {
+                "if": "note:state=has_highway_no",
+                "then": "0 8"
+              },
+              {
+                "if": "note:state=has_highway_under_construction",
+                "then": "12 10"
+              }
+            ]
+          }
+        }
       ]
     }
   ],
@@ -242,4 +274,4 @@
   "clustering": {
     "maxZoom": 1
   }
-}
\ No newline at end of file
+}
diff --git a/assets/themes/cyclenodes/cyclenodes.json b/assets/themes/cyclenodes/cyclenodes.json
index 691de4369a..f487219578 100644
--- a/assets/themes/cyclenodes/cyclenodes.json
+++ b/assets/themes/cyclenodes/cyclenodes.json
@@ -114,7 +114,8 @@
           "width": "4",
           "color": "#00a703"
         }
-      ]
+      ],
+      "pointRendering":null
     },
     {
       "id": "node",
diff --git a/assets/themes/cyclestreets/cyclestreets.json b/assets/themes/cyclestreets/cyclestreets.json
index 39a242c90a..7b8ce2fc87 100644
--- a/assets/themes/cyclestreets/cyclestreets.json
+++ b/assets/themes/cyclestreets/cyclestreets.json
@@ -103,9 +103,74 @@
       "tagRenderings": [
         "images"
       ],
-      "pointRendering": [],
+      "pointRendering": [
+        {
+          "marker": [
+            {
+              "icon": {
+                "render": "./assets/themes/cyclestreets/F111.svg",
+                "mappings": [
+                  {
+                    "if": "traffic_sign=DE:244.1,1020-30",
+                    "then": "./assets/themes/cyclestreets/Zeichen_244_1020-30.svg"
+                  },
+                  {
+                    "if": "traffic_sign=DE:244.1,1022-12,1024-10",
+                    "then": "./assets/themes/cyclestreets/Zeichen_244_KFZ_frei.svg"
+                  },
+                  {
+                    "if": "traffic_sign=DE:244.1,1022-12",
+                    "then": "./assets/themes/cyclestreets/Zeichen_244_1022-12.svg"
+                  },
+                  {
+                    "if": "traffic_sign=DE:244.1,1024-10",
+                    "then": "./assets/themes/cyclestreets/Zeichen_244_1024-10.svg"
+                  },
+                  {
+                    "if": "_country=de",
+                    "then": "./assets/themes/cyclestreets/Zeichen_244.svg"
+                  },
+                  {
+                    "if": "_country=fi",
+                    "then": "./assets/themes/cyclestreets/Finland_road_sign_E28.svg"
+                  }
+                ]
+              }
+            }
+          ],
+          "iconSize": {
+            "render": "40,40,center",
+            "mappings": [
+              {
+                "if": {
+                  "or": [
+                    "traffic_sign=DE:244.1,1020-30",
+                    "traffic_sign=DE:244.1,1022-12,1024-10"
+                  ]
+                },
+                "then": "40,62,center"
+              },
+              {
+                "if": {
+                  "or": [
+                    "traffic_sign=DE:244.1,1022-12",
+                    "traffic_sign=DE:244.1,1024-10"
+                  ]
+                },
+                "then": "40,70,center"
+              }
+            ]
+          },
+          "location": [
+            "projected_centerpoint"
+          ]
+        }
+      ],
       "lineRendering": [
-        {}
+        {
+          "color": "#0000ff",
+          "width": "10"
+        }
       ]
     },
     {
@@ -193,9 +258,35 @@
       "tagRenderings": [
         "images"
       ],
-      "pointRendering": [],
+      "pointRendering": [
+        {
+          "marker": [
+            {
+              "icon": {
+                "render": "./assets/themes/cyclestreets/F113.svg",
+                "mappings": [
+                  {
+                    "if": "_country=de",
+                    "then": "./assets/themes/cyclestreets/Zeichen_244a.svg"
+                  },
+                  {
+                    "if": "_country=fi",
+                    "then": "./assets/themes/cyclestreets/Finland_road_sign_E29.svg"
+                  }
+                ]
+              }
+            }
+          ],
+          "location": [
+            "projected_centerpoint"
+          ]
+        }
+      ],
       "lineRendering": [
-        {}
+        {
+          "color": "#09f9dd",
+          "width": "5"
+        }
       ]
     },
     {
@@ -273,9 +364,45 @@
       "tagRenderings": [
         "images"
       ],
-      "pointRendering": [],
+      "pointRendering": [
+        {
+          "marker": [
+            {
+              "icon": "./assets/svg/pencil.svg"
+            }
+          ],
+          "location": [
+            "projected_centerpoint"
+          ]
+        }
+      ],
       "lineRendering": [
-        {}
+        {
+          "color": {
+            "render": "#aaaaaa",
+            "mappings": [
+              {
+                "then": "#0000ff",
+                "if": {
+                  "or": [
+                    "cyclestreet=yes",
+                    "bicycle_road=yes"
+                  ]
+                }
+              },
+              {
+                "then": "#09f9dd",
+                "if": {
+                  "or": [
+                    "proposed:cyclestreet=yes",
+                    "proposed:bicycle_road=yes"
+                  ]
+                }
+              }
+            ]
+          },
+          "width": "5"
+        }
       ]
     }
   ],
@@ -646,4 +773,4 @@
     "maxZoom": 12,
     "minNeededElements": 200
   }
-}
\ No newline at end of file
+}
diff --git a/assets/themes/fruit_trees/fruit_tree.svg b/assets/themes/fruit_trees/fruit_tree.svg
deleted file mode 100644
index e5cce675ec..0000000000
--- a/assets/themes/fruit_trees/fruit_tree.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="375px" height="375px" viewBox="0 0 375 375" version="1.1">
-  <g id="surface1">
-    <path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;" d="M 161.011719 216.898438 C 161.011719 225.855469 153.75 233.113281 144.796875 233.113281 C 135.839844 233.113281 128.578125 225.855469 128.578125 216.898438 C 128.578125 207.945312 135.839844 200.683594 144.796875 200.683594 C 153.75 200.683594 161.011719 207.945312 161.011719 216.898438 Z M 161.011719 216.898438 "/>
-    <path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;" d="M 101.558594 200.253906 C 101.558594 209.210938 94.296875 216.46875 85.34375 216.46875 C 76.386719 216.46875 69.128906 209.210938 69.128906 200.253906 C 69.128906 191.296875 76.386719 184.039062 85.34375 184.039062 C 94.296875 184.039062 101.558594 191.296875 101.558594 200.253906 Z M 101.558594 200.253906 "/>
-    <path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;" d="M 93.34375 146.03125 C 93.34375 154.988281 86.085938 162.246094 77.128906 162.246094 C 68.175781 162.246094 60.914062 154.988281 60.914062 146.03125 C 60.914062 137.078125 68.175781 129.816406 77.128906 129.816406 C 86.085938 129.816406 93.34375 137.078125 93.34375 146.03125 Z M 93.34375 146.03125 "/>
-    <path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;" d="M 289.707031 174.699219 C 295.554688 170.796875 305.070312 162.824219 306.367188 151.613281 C 306.933594 146.730469 306.058594 139.769531 299.695312 132.363281 C 302.789062 125.675781 306.503906 114.496094 302.90625 104.425781 C 301.402344 100.199219 298.0625 94.757812 290.6875 91.050781 C 288.957031 84.347656 284.480469 72.453125 273.730469 66.050781 C 266.972656 62.035156 259.167969 60.972656 250.46875 62.851562 C 248.023438 58.949219 244.140625 54.453125 238.355469 51.925781 C 234.980469 50.449219 229.996094 49.28125 223.730469 50.601562 C 219.890625 44.839844 212.996094 36.902344 202.617188 33.574219 C 193.871094 30.761719 184.582031 31.699219 174.960938 36.328125 C 171.339844 34.066406 166.019531 31.777344 159.503906 32.140625 C 152.949219 32.5 146.835938 35.398438 141.257812 40.773438 C 134.234375 36.929688 122.667969 32.296875 112.242188 35.972656 C 107.945312 37.488281 102.558594 40.898438 98.875 48.539062 C 92.460938 48.253906 83.066406 49.125 76.515625 55.488281 C 73.148438 58.761719 69.625 64.4375 69.804688 73.792969 C 62.769531 76.335938 52.667969 81.464844 48.734375 90.78125 C 47.339844 94.085938 46.363281 98.785156 47.859375 104.558594 C 41.203125 107.765625 32.664062 113.492188 29.257812 122.671875 C 27.613281 127.089844 26.722656 133.679688 30.242188 141.777344 C 25.851562 146.355469 20.265625 153.953125 19.148438 163.699219 C 18.1875 172.089844 20.601562 180.261719 26.328125 188.042969 C 24.4375 195.015625 22.132812 208.242188 28.050781 218.085938 C 29.832031 221.039062 32.851562 224.515625 37.890625 226.800781 C 37.640625 232.792969 38.5625 241.101562 43.996094 248.164062 C 49.425781 255.234375 57.878906 259.148438 69.101562 259.886719 C 70.542969 267.367188 77.109375 273.027344 85.003906 273.027344 C 91.328125 273.027344 96.742188 269.371094 99.421875 264.09375 C 103.171875 265.414062 106.992188 265.972656 110.691406 265.972656 C 114.894531 265.972656 118.921875 265.269531 122.5625 264.316406 C 125.210938 270.449219 131.453125 274.578125 138.511719 274.09375 C 144.859375 273.660156 150.046875 269.585938 152.328125 264.074219 C 154.425781 264.015625 156.570312 263.769531 158.753906 263.171875 C 165.914062 261.214844 171.796875 256.433594 176.292969 248.925781 C 180.632812 249.695312 186.972656 249.890625 193.230469 246.710938 C 200.242188 243.148438 205.320312 236.410156 208.34375 226.664062 C 211.386719 226.101562 215.300781 224.757812 218.914062 221.648438 C 220.511719 220.273438 221.871094 218.664062 223.054688 216.871094 C 237.679688 233.667969 244.96875 254.921875 244.734375 280.339844 C 244.5 305.859375 236.394531 326.210938 236.3125 326.417969 C 235.808594 327.667969 235.957031 329.089844 236.707031 330.207031 C 237.464844 331.320312 238.722656 331.996094 240.066406 331.996094 L 296.820312 331.996094 C 298.992188 331.996094 300.78125 330.285156 300.867188 328.117188 C 303.132812 274.972656 287.074219 231.914062 264.816406 202.03125 C 270.671875 200.507812 276.792969 197.820312 281.578125 193.082031 C 286.4375 188.261719 289.203125 181.976562 289.707031 174.699219 Z M 273.515625 170.683594 C 273.964844 176.992188 271.828125 179.898438 270.183594 181.539062 C 265.941406 185.757812 258.324219 187.1875 252.605469 187.566406 C 234.800781 168.949219 214.761719 157.824219 197.367188 155.527344 C 194.535156 155.15625 191.582031 154.589844 188.363281 153.800781 C 163.089844 144.652344 162.371094 109.699219 162.367188 109.347656 C 162.339844 107.40625 160.949219 105.753906 159.042969 105.410156 C 157.113281 105.042969 155.242188 106.109375 154.539062 107.914062 C 151.027344 116.875 152.792969 131.933594 155.46875 141.5 C 126.761719 136.808594 105.761719 99.710938 105.539062 99.3125 C 104.78125 97.949219 103.285156 97.136719 101.746094 97.242188 C 100.183594 97.339844 98.820312 98.320312 98.234375 99.769531 C 91.425781 116.699219 117.5 149.210938 155.570312 173.046875 C 136.570312 170.601562 116.941406 154.988281 116.726562 154.816406 C 115.171875 153.566406 112.945312 153.632812 111.476562 154.964844 C 110 156.296875 109.699219 158.5 110.78125 160.171875 C 126.761719 184.953125 145.464844 186.757812 163.550781 188.496094 C 177.238281 189.816406 191.390625 191.183594 206.378906 201.867188 C 209.09375 203.804688 211.632812 205.847656 214.066406 207.964844 C 211.285156 214.617188 205.988281 214.984375 204.125 214.894531 C 201.074219 214.644531 198.328125 216.621094 197.648438 219.589844 C 195.71875 227.96875 192.40625 233.4375 187.796875 235.828125 C 182.074219 238.804688 175.585938 236.214844 175.566406 236.214844 C 172.542969 234.929688 169.039062 236.261719 167.660156 239.246094 C 164.535156 245.976562 160.472656 250.074219 155.589844 251.433594 C 147.144531 253.789062 138.175781 247.800781 138.105469 247.753906 C 136.117188 246.386719 133.496094 246.335938 131.453125 247.605469 C 131.277344 247.710938 113.617188 258.457031 100.769531 251.476562 C 100.570312 251.371094 100.359375 251.304688 100.160156 251.222656 C 97.875 245.039062 91.976562 240.609375 84.996094 240.609375 C 81.226562 240.609375 77.800781 241.945312 75.046875 244.105469 C 74.414062 243.949219 73.757812 243.839844 73.078125 243.839844 C 65.175781 243.839844 59.71875 241.992188 56.878906 238.34375 C 53.121094 233.523438 54.023438 225.621094 54.675781 223.035156 C 55.269531 220.777344 54.871094 218.378906 53.570312 216.4375 C 52.265625 214.503906 50.199219 213.21875 47.882812 212.917969 C 43.96875 212.40625 42.621094 210.867188 41.953125 209.757812 C 38.855469 204.636719 41.289062 193.671875 42.945312 189.175781 C 44 186.367188 43.414062 183.210938 41.425781 180.964844 C 36.722656 175.648438 34.699219 170.632812 35.242188 165.628906 C 36.214844 156.703125 45.070312 150.144531 45.125 150.105469 C 48.703125 147.558594 49.601562 142.625 47.152344 138.980469 C 42.878906 132.621094 44.066406 129.398438 44.453125 128.339844 C 46.742188 122.101562 57.320312 117.859375 60.8125 116.867188 C 63.296875 116.183594 65.300781 114.367188 66.226562 111.96875 C 67.152344 109.566406 66.886719 106.871094 65.5 104.699219 C 62.472656 99.945312 63.371094 97.8125 63.667969 97.109375 C 65.539062 92.636719 74.679688 88.789062 80.246094 87.601562 C 84.59375 86.695312 87.402344 82.464844 86.554688 78.109375 C 85.828125 74.378906 85.449219 69.441406 87.796875 67.144531 C 90.988281 64.019531 99.085938 64.542969 102.484375 65.277344 C 106.726562 66.242188 110.996094 63.65625 112.109375 59.429688 C 113.296875 54.898438 115.15625 52.15625 117.621094 51.277344 C 123.421875 49.21875 133.835938 54.796875 137.960938 57.808594 C 141.53125 60.445312 146.542969 59.71875 149.226562 56.199219 C 151.828125 52.78125 155.859375 48.648438 160.285156 48.347656 C 164.722656 48.03125 168.320312 51.5625 168.324219 51.5625 C 170.941406 54.320312 175.132812 54.875 178.390625 52.910156 C 185.578125 48.558594 192.042969 47.246094 197.589844 48.996094 C 207.339844 52.074219 212.503906 63.527344 212.535156 63.609375 C 213.398438 65.625 215.050781 67.203125 217.105469 67.984375 C 219.15625 68.765625 221.441406 68.671875 223.429688 67.742188 C 228.507812 65.363281 231.007812 66.425781 231.824219 66.773438 C 235.550781 68.363281 237.917969 73.316406 238.496094 75.03125 C 239.175781 77.144531 240.683594 78.890625 242.679688 79.859375 C 244.679688 80.828125 246.996094 80.933594 249.066406 80.152344 C 255.820312 77.613281 261.316406 77.5625 265.402344 79.964844 C 272.1875 83.960938 275.074219 94.363281 275.609375 98.003906 C 276.039062 101.054688 278.15625 103.605469 281.078125 104.578125 C 285.824219 106.164062 287.09375 108.351562 287.636719 109.863281 C 289.882812 116.097656 284.808594 126.433594 282.867188 129.550781 C 280.714844 132.964844 281.390625 137.4375 284.46875 140.050781 C 288.640625 143.605469 290.597656 146.863281 290.277344 149.726562 C 289.664062 155.132812 281.671875 160.945312 277.917969 162.902344 C 275.015625 164.378906 273.292969 167.445312 273.515625 170.683594 Z M 273.515625 170.683594 "/>
-  </g>
-</svg>
\ No newline at end of file
diff --git a/assets/themes/fruit_trees/fruit_tree.svg.license b/assets/themes/fruit_trees/fruit_tree.svg.license
deleted file mode 100644
index 78591d2d19..0000000000
--- a/assets/themes/fruit_trees/fruit_tree.svg.license
+++ /dev/null
@@ -1,2 +0,0 @@
-SPDX-FileCopyrightText: The Noun Project
-SPDX-License-Identifier: CC0-1.0
\ No newline at end of file
diff --git a/assets/themes/fruit_trees/fruit_trees.json b/assets/themes/fruit_trees/fruit_trees.json
deleted file mode 100644
index 53fe8a7ef8..0000000000
--- a/assets/themes/fruit_trees/fruit_trees.json
+++ /dev/null
@@ -1,151 +0,0 @@
-{
-  "id": "fruit_trees",
-  "title": {
-    "nl": "Open Boomgaardenkaart"
-  },
-  "description": {
-    "nl": "Op deze kaart vindt je boomgaarden en fruitbomen"
-  },
-  "shortDescription": {
-    "nl": "Boomgaarden en fruitbomen"
-  },
-  "icon": "./assets/themes/fruit_trees/fruit_tree.svg",
-  "hideFromOverview": true,
-  "layers": [
-    {
-      "id": "orchards",
-      "name": {
-        "nl": "Boomgaarden"
-      },
-      "minzoom": 12,
-      "source": {
-        "osmTags": {
-          "and": [
-            "landuse=orchard"
-          ]
-        }
-      },
-      "title": {
-        "render": {
-          "nl": "Boomgaard"
-        }
-      },
-      "tagRenderings": [
-        "images"
-      ],
-      "presets": [
-        {
-          "tags": [
-            "landuse=orchard",
-            "fixme=Added with mapcomplete - geometry still to draw"
-          ],
-          "title": {
-            "nl": "een boomgaard"
-          },
-          "description": {
-            "nl": "Voeg een boomgaard toe (als punt - omtrek nog te tekenen)"
-          }
-        }
-      ],
-      "pointRendering": [],
-      "lineRendering": [
-        {}
-      ]
-    },
-    {
-      "id": "fruitboom",
-      "name": {
-        "nl": "Boom"
-      },
-      "minzoom": 12,
-      "source": {
-        "osmTags": {
-          "and": [
-            "natural=tree"
-          ]
-        }
-      },
-      "title": {
-        "render": {
-          "nl": "Boom"
-        }
-      },
-      "description": {
-        "nl": "Een boom"
-      },
-      "tagRenderings": [
-        {
-          "render": {
-            "nl": "De soort is {species:nl}"
-          },
-          "question": {
-            "nl": "Wat is de soort van deze boom (in het Nederlands)?"
-          },
-          "freeform": {
-            "key": "species:nl"
-          },
-          "id": "fruitboom-species:nl"
-        },
-        {
-          "render": {
-            "nl": "Het ras (taxon) van deze boom is <b>{taxon}</b>"
-          },
-          "question": {
-            "nl": "Wat is het taxon (ras) van deze boom?"
-          },
-          "freeform": {
-            "key": "taxon"
-          },
-          "condition": {
-            "and": [
-              "species:nl~*"
-            ]
-          },
-          "id": "fruitboom-taxon"
-        },
-        {
-          "render": {
-            "nl": "Beschrijving: <i>{description}</i>"
-          },
-          "question": {
-            "nl": "Welke beschrijving past bij deze boom?"
-          },
-          "freeform": {
-            "key": "description"
-          },
-          "id": "fruitboom-description"
-        },
-        {
-          "render": {
-            "nl": "Referentienummer: <b>{ref}</b>"
-          },
-          "question": {
-            "nl": "Is er een refernetienummer?"
-          },
-          "freeform": {
-            "key": "ref"
-          },
-          "id": "fruitboom-ref"
-        }
-      ],
-      "presets": [
-        {
-          "tags": [
-            "natural=tree"
-          ],
-          "title": {
-            "nl": "een boom"
-          },
-          "description": {
-            "nl": "Voeg hier een boom toe"
-          }
-        }
-      ],
-      "pointRendering": [],
-      "lineRendering": [
-        {}
-      ]
-    }
-  ],
-  "widenFactor": 2
-}
\ No newline at end of file
diff --git a/assets/themes/fruit_trees/license_info.json b/assets/themes/fruit_trees/license_info.json
deleted file mode 100644
index 3a4a3a0a0d..0000000000
--- a/assets/themes/fruit_trees/license_info.json
+++ /dev/null
@@ -1,12 +0,0 @@
-[
-  {
-    "path": "fruit_tree.svg",
-    "license": "CC0-1.0",
-    "authors": [
-      "The Noun Project"
-    ],
-    "sources": [
-      "https://upload.wikimedia.org/wikipedia/commons/4/4e/Low_Hanging_Fruit_-_The_Noun_Project.svg"
-    ]
-  }
-]
\ No newline at end of file