diff --git a/assets/layers/usersettings/usersettings.json b/assets/layers/usersettings/usersettings.json
index 9e6304e4f5..a356a9c42e 100644
--- a/assets/layers/usersettings/usersettings.json
+++ b/assets/layers/usersettings/usersettings.json
@@ -688,6 +688,7 @@
       "mappings": [
         {
           "if": "mapcomplete-show_debug=yes",
+          "icon": "./assets/svg/debug.svg",
           "then": {
             "en": "Show debug info",
             "de": "Debug-Informationen anzeigen",
@@ -720,15 +721,15 @@
         }
       ]
     },
-    {
-      "id": "debug",
-      "condition": "mapcomplete-show_debug=yes",
-      "render": "{all_tags()}"
-    },
     {
       "id":"debug-gps",
       "condition": "mapcomplete-show_debug=yes",
       "render": "{gps_all_tags()}"
+    },
+    {
+      "id": "debug",
+      "condition": "mapcomplete-show_debug=yes",
+      "render": "{all_tags()}"
     }
   ]
 }
diff --git a/assets/themes/facadegardens/facadegardens.json b/assets/themes/facadegardens/facadegardens.json
index 1786d61eea..c8aa40ba31 100644
--- a/assets/themes/facadegardens/facadegardens.json
+++ b/assets/themes/facadegardens/facadegardens.json
@@ -579,11 +579,81 @@
         "enableImproveAccuracy": true,
         "enableRelocation": false
       },
-      "pointRendering": [],
-      "lineRendering": [
-        {}
-      ]
+      "pointRendering": [
+        {
+          "marker": [
+            {
+              "icon": "circle",
+              "color": "white"
+            },
+            {
+              "icon": {
+                "render": "./assets/themes/facadegardens/geveltuin.svg",
+                "mappings": [
+                  {
+                    "if": {
+                      "and": [
+                        "direct_sunlight=yes"
+                      ]
+                    },
+                    "then": "./assets/themes/facadegardens/zon.svg"
+                  },
+                  {
+                    "if": {
+                      "and": [
+                        "direct_sunlight=partial"
+                      ]
+                    },
+                    "then": "./assets/themes/facadegardens/halfzon.svg"
+                  },
+                  {
+                    "if": {
+                      "and": [
+                        "direct_sunlight=no"
+                      ]
+                    },
+                    "then": "./assets/themes/facadegardens/schaduw.svg"
+                  }
+                ]
+              }
+            }
+          ],
+          "iconBadges": [
+            {
+              "if": "plant~.*vine.*",
+              "then": "circle:white;./assets/themes/facadegardens/klimplant.svg"
+            },
+            {
+              "if": "plant~.*groundcover.*",
+              "then": "circle:white;./assets/themes/facadegardens/bodembedekker.svg"
+            },
+            {
+              "if": "edible=true",
+              "then": "circle:white;./assets/themes/facadegardens/eetbaar.svg"
+            },
+            {
+              "if": "rain_barel=yes",
+              "then": "circle:white;./assets/themes/facadegardens/gevelton.svg"
+            },
+            {
+              "if": "plant~.*shrub.*",
+              "then": "circle:white;./assets/themes/facadegardens/struik.svg"
+            },
+            {
+              "if": "plant~.*flower.*",
+              "then": "circle:white;./assets/themes/facadegardens/bloei.svg"
+            }
+          ],
+          "iconSize": "50,50",
+          "location": [
+            "point",
+            "centroid"
+          ],
+          "anchor": "center"
+        }
+      ],
+      "lineRendering": []
     }
   ],
   "widenFactor": 1.5
-}
\ No newline at end of file
+}
diff --git a/src/Logic/Actors/GeoLocationHandler.ts b/src/Logic/Actors/GeoLocationHandler.ts
index c8f47d76cf..137345b4bf 100644
--- a/src/Logic/Actors/GeoLocationHandler.ts
+++ b/src/Logic/Actors/GeoLocationHandler.ts
@@ -173,6 +173,8 @@ export default class GeoLocationHandler {
                     properties[k] = location[k]
                 }
             }
+            console.log(location)
+            properties["_all"] = JSON.stringify(location)
 
             const feature = <Feature>{
                 type: "Feature",
diff --git a/src/Models/ThemeConfig/Conversion/Validation.ts b/src/Models/ThemeConfig/Conversion/Validation.ts
index 6e4f940712..fcfd2a971a 100644
--- a/src/Models/ThemeConfig/Conversion/Validation.ts
+++ b/src/Models/ThemeConfig/Conversion/Validation.ts
@@ -1062,6 +1062,9 @@ export class PrevalidateLayer extends DesugaringStep<LayerConfigJson> {
                 )
         }
 
+        if (!(json.pointRendering?.length > 0)) {
+            context.enter("pointRendering").err("There are no pointRenderings at all")
+        }
         if (json.presets?.length > 0) {
             if (!(json.pointRendering?.length > 0)) {
                 context.enter("presets").warn("A preset is defined, but there is no pointRendering")