diff --git a/assets/layers/recycling/recycling.json b/assets/layers/recycling/recycling.json
index e4d640f217..928b71ebd0 100644
--- a/assets/layers/recycling/recycling.json
+++ b/assets/layers/recycling/recycling.json
@@ -40,7 +40,7 @@
         "point",
         "centroid"
       ],
-      "icon": "./assets/layers/recycling/recycling-14.svg",
+      "icon": "circle:white;./assets/layers/recycling/recycling-14.svg",
       "iconBadges": [
         {
           "if": "recycling:batteries=yes",
@@ -75,7 +75,12 @@
           "then": "circle:#FFFFFF;./assets/layers/recycling/glass_bottles.svg"
         },
         {
-          "if": "recycling:green_waste=yes",
+          "if": {
+            "or": [
+              "recycling:green_waste=yes",
+              "recycling:organic=yes"
+            ]
+          },
           "then": "circle:#FFFFFF;./assets/layers/recycling/garden_waste.svg"
         },
         {
@@ -258,6 +263,15 @@
             "nl": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/garden_waste.svg'/> Groen afval kan hier gerecycled worden</div>"
           }
         },
+        {
+          "if": "recycling:organic=yes",
+          "ifnot": "recycling:organic=",
+          "then": {
+            "en": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/garden_waste.svg'/> Organic waste can be recycled here</div>",
+            "nl": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/garden_waste.svg'/> Organisch afval kan hier gerecycled worden</div>"
+          },
+          "hideInAnswer": true
+        },
         {
           "if": "recycling:glass_bottles=yes",
           "ifnot": "recycling:glass_bottles=",
diff --git a/assets/layers/waste_basket/waste_basket.json b/assets/layers/waste_basket/waste_basket.json
index 9df55c18b3..cf59c3f29c 100644
--- a/assets/layers/waste_basket/waste_basket.json
+++ b/assets/layers/waste_basket/waste_basket.json
@@ -145,7 +145,7 @@
             "nl": "Deze vuilnisbaak heeft waarschijnlijk geen verdeler voor hondenpoepzakjes",
             "de": "Dieser Abfalleimer <b>hat keinen</b> Spender für (Hunde-)Kotbeutel"
           },
-          "hideInAnwer": true
+          "hideInAnswer": true
         }
       ]
     }
diff --git a/assets/layers/waste_disposal/waste_disposal.json b/assets/layers/waste_disposal/waste_disposal.json
index b744796724..dc5c2e3349 100644
--- a/assets/layers/waste_disposal/waste_disposal.json
+++ b/assets/layers/waste_disposal/waste_disposal.json
@@ -9,7 +9,8 @@
   "source": {
     "osmTags": "amenity=waste_disposal"
   },
-  "minZoom": 12,
+  "minzoom": 18,
+  "minzoomVisible": 18,
   "title": {
     "render": {
       "en": "Waste Disposal"
diff --git a/assets/themes/waste/waste.json b/assets/themes/waste/waste.json
index 6ca4ccbc3c..1998b893a8 100644
--- a/assets/themes/waste/waste.json
+++ b/assets/themes/waste/waste.json
@@ -22,7 +22,8 @@
     {
       "builtin": "waste_basket",
       "override": {
-        "minzoom": 12
+        "minzoom": 18,
+        "minzoomVisible": 18
       }
     },
     "recycling",
diff --git a/langs/layers/en.json b/langs/layers/en.json
index d32c623af7..0f14fb1944 100644
--- a/langs/layers/en.json
+++ b/langs/layers/en.json
@@ -4282,36 +4282,39 @@
                         "then": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/garden_waste.svg'/> Green waste can be recycled here</div>"
                     },
                     "7": {
-                        "then": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/glass_bottles.svg'/> Glass bottles can be recycled here</div>"
+                        "then": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/garden_waste.svg'/> Organic waste can be recycled here</div>"
                     },
                     "8": {
-                        "then": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/glass.svg'/> Glass can be recycled here</div>"
+                        "then": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/glass_bottles.svg'/> Glass bottles can be recycled here</div>"
                     },
                     "9": {
-                        "then": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/newspaper.svg'/> Newspapers can be recycled here</div>"
+                        "then": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/glass.svg'/> Glass can be recycled here</div>"
                     },
                     "10": {
-                        "then": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/paper.svg'/> Paper can be recycled here</div>"
+                        "then": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/newspaper.svg'/> Newspapers can be recycled here</div>"
                     },
                     "11": {
-                        "then": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/plastic_bottles.svg'/> Plastic bottles can be recycled here</div>"
+                        "then": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/paper.svg'/> Paper can be recycled here</div>"
                     },
                     "12": {
-                        "then": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/plastic_packaging.svg'/> Plastic packaging can be recycled here</div>"
+                        "then": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/plastic_bottles.svg'/> Plastic bottles can be recycled here</div>"
                     },
                     "13": {
-                        "then": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/plastic.svg'/> Plastic can be recycled here</div>"
+                        "then": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/plastic_packaging.svg'/> Plastic packaging can be recycled here</div>"
                     },
                     "14": {
-                        "then": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/scrap_metal.svg'/> Scrap metal can be recycled here</div>"
+                        "then": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/plastic.svg'/> Plastic can be recycled here</div>"
                     },
                     "15": {
-                        "then": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/shoes.svg'/> Shoes can be recycled here</div>"
+                        "then": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/scrap_metal.svg'/> Scrap metal can be recycled here</div>"
                     },
                     "16": {
-                        "then": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/small_electrical_appliances.svg'/> Small electrical appliances can be recycled here</div>"
+                        "then": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/shoes.svg'/> Shoes can be recycled here</div>"
                     },
                     "17": {
+                        "then": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/small_electrical_appliances.svg'/> Small electrical appliances can be recycled here</div>"
+                    },
+                    "18": {
                         "then": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/waste_disposal/waste_disposal.svg'/> Residual waste can be recycled here</div>"
                     }
                 },
diff --git a/langs/layers/nl.json b/langs/layers/nl.json
index d9673fce05..0b44ce9f2b 100644
--- a/langs/layers/nl.json
+++ b/langs/layers/nl.json
@@ -4015,36 +4015,39 @@
                         "then": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/garden_waste.svg'/> Groen afval kan hier gerecycled worden</div>"
                     },
                     "7": {
-                        "then": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/glass_bottles.svg'/> Glazen flessen kunnen hier gerecycled worden</div>"
+                        "then": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/garden_waste.svg'/> Organisch afval kan hier gerecycled worden</div>"
                     },
                     "8": {
-                        "then": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/glass.svg'/> Glas kan hier gerecycled worden</div>"
+                        "then": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/glass_bottles.svg'/> Glazen flessen kunnen hier gerecycled worden</div>"
                     },
                     "9": {
-                        "then": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/newspaper.svg'/> Kranten kunnen hier gerecycled worden</div>"
+                        "then": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/glass.svg'/> Glas kan hier gerecycled worden</div>"
                     },
                     "10": {
-                        "then": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/paper.svg'/> Papier kan hier gerecycled worden</div>"
+                        "then": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/newspaper.svg'/> Kranten kunnen hier gerecycled worden</div>"
                     },
                     "11": {
-                        "then": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/plastic_bottles.svg'/> Plastic flessen kunnen hier gerecycled worden</div>"
+                        "then": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/paper.svg'/> Papier kan hier gerecycled worden</div>"
                     },
                     "12": {
-                        "then": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/plastic_packaging.svg'/> Plastic verpakking kan hier gerecycled worden</div>"
+                        "then": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/plastic_bottles.svg'/> Plastic flessen kunnen hier gerecycled worden</div>"
                     },
                     "13": {
-                        "then": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/plastic.svg'/> Plastic kan hier gerecycled worden</div>"
+                        "then": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/plastic_packaging.svg'/> Plastic verpakking kan hier gerecycled worden</div>"
                     },
                     "14": {
-                        "then": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/scrap_metal.svg'/> Oud metaal kan hier gerecycled worden</div>"
+                        "then": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/plastic.svg'/> Plastic kan hier gerecycled worden</div>"
                     },
                     "15": {
-                        "then": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/shoes.svg'/> Schoenen kunnen hier gerecycled worden</div>"
+                        "then": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/scrap_metal.svg'/> Oud metaal kan hier gerecycled worden</div>"
                     },
                     "16": {
-                        "then": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/small_electrical_appliances.svg'/> Kleine elektronische apparaten kunnen hier gerecycled worden</div>"
+                        "then": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/shoes.svg'/> Schoenen kunnen hier gerecycled worden</div>"
                     },
                     "17": {
+                        "then": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/small_electrical_appliances.svg'/> Kleine elektronische apparaten kunnen hier gerecycled worden</div>"
+                    },
+                    "18": {
                         "then": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/waste_disposal/waste_disposal.svg'/> Restafval kan hier gerecycled worden</div>"
                     }
                 },