diff --git a/data/presets.yaml b/data/presets.yaml
index 71555710e..658976566 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -848,6 +848,14 @@ en:
       recycling_accepts:
         # 'recycling:=*'
         label: Accepts
+      recycling_type:
+        # recycling_type=*
+        label: Recycling Type
+        options:
+          # recycling_type=centre
+          centre: Recycling Center
+          # recycling_type=container
+          container: Container
       ref:
         # ref=*
         label: Reference
@@ -1553,8 +1561,13 @@ en:
       amenity/recycling:
         # amenity=recycling
         name: Recycling
-        # 'terms: can,bottle,garbage,scrap,trash'
+        # 'terms: bin,can,bottle,glass,garbage,rubbish,scrap,trash'
         terms: '<translate with synonyms or related terms for ''Recycling'', separated by commas>'
+      amenity/recycling_centre:
+        # 'amenity=recycling, recycling_type=centre'
+        name: Recycling Center
+        # 'terms: bottle,can,dump,glass,garbage,rubbish,scrap,trash'
+        terms: '<translate with synonyms or related terms for ''Recycling Center'', separated by commas>'
       amenity/register_office:
         # amenity=register_office
         name: Register Office
@@ -1691,17 +1704,17 @@ en:
       amenity/waste_basket:
         # amenity=waste_basket
         name: Waste Basket
-        # 'terms: bin,rubbish,litter,trash,garbage'
+        # 'terms: bin,garbage,rubbish,litter,trash'
         terms: '<translate with synonyms or related terms for ''Waste Basket'', separated by commas>'
       amenity/waste_disposal:
         # amenity=waste_disposal
         name: Garbage Dumpster
-        # 'terms: rubbish,litter,trash'
+        # 'terms: garbage,rubbish,litter,trash'
         terms: '<translate with synonyms or related terms for ''Garbage Dumpster'', separated by commas>'
       amenity/waste_transfer_station:
         # amenity=waste_transfer_station
         name: Waste Transfer Station
-        # 'terms: dump,garbage,recycling,scrap,trash'
+        # 'terms: dump,garbage,recycling,rubbish,scrap,trash'
         terms: '<translate with synonyms or related terms for ''Waste Transfer Station'', separated by commas>'
       amenity/water_point:
         # amenity=water_point
diff --git a/data/presets/fields.json b/data/presets/fields.json
index 34dd4eb19..199ba232f 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -1114,6 +1114,18 @@
             "type": "multiCombo",
             "label": "Accepts"
         },
+        "recycling_type": {
+            "key": "recycling_type",
+            "default": "container",
+            "type": "combo",
+            "label": "Recycling Type",
+            "strings": {
+                "options": {
+                    "container": "Container",
+                    "centre": "Recycling Center"
+                }
+            }
+        },
         "ref": {
             "key": "ref",
             "type": "text",
diff --git a/data/presets/fields/recycling_type.json b/data/presets/fields/recycling_type.json
new file mode 100644
index 000000000..e8195f105
--- /dev/null
+++ b/data/presets/fields/recycling_type.json
@@ -0,0 +1,12 @@
+{
+    "key": "recycling_type",
+    "default": "container",
+    "type": "combo",
+    "label": "Recycling Type",
+    "strings": {
+        "options": {
+            "container": "Container",
+            "centre": "Recycling Center"
+        }
+    }
+}
diff --git a/data/presets/presets.json b/data/presets/presets.json
index ed06bbefb..253fbe0fd 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -1637,8 +1637,8 @@
             "icon": "museum",
             "fields": [
                 "operator",
-                "building_area",
                 "address",
+                "building_area",
                 "opening_hours"
             ],
             "geometry": [
@@ -1813,11 +1813,12 @@
             },
             "name": "Ranger Station"
         },
-        "amenity/recycling": {
+        "amenity/recycling_centre": {
             "icon": "waste-basket",
             "fields": [
                 "operator",
                 "address",
+                "opening_hours",
                 "recycling_accepts"
             ],
             "geometry": [
@@ -1825,9 +1826,39 @@
                 "area"
             ],
             "terms": [
+                "bottle",
+                "can",
+                "dump",
+                "glass",
+                "garbage",
+                "rubbish",
+                "scrap",
+                "trash"
+            ],
+            "tags": {
+                "amenity": "recycling",
+                "recycling_type": "centre"
+            },
+            "name": "Recycling Center"
+        },
+        "amenity/recycling": {
+            "icon": "waste-basket",
+            "fields": [
+                "recycling_type",
+                "recycling_accepts",
+                "collection_times"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "terms": [
+                "bin",
                 "can",
                 "bottle",
+                "glass",
                 "garbage",
+                "rubbish",
                 "scrap",
                 "trash"
             ],
@@ -2405,32 +2436,41 @@
         },
         "amenity/waste_basket": {
             "icon": "waste-basket",
+            "fields": [
+                "collection_times"
+            ],
             "geometry": [
                 "point",
-                "vertex"
+                "vertex",
+                "area"
             ],
             "tags": {
                 "amenity": "waste_basket"
             },
             "terms": [
                 "bin",
+                "garbage",
                 "rubbish",
                 "litter",
-                "trash",
-                "garbage"
+                "trash"
             ],
             "name": "Waste Basket"
         },
         "amenity/waste_disposal": {
             "icon": "waste-basket",
+            "fields": [
+                "collection_times"
+            ],
             "geometry": [
                 "point",
-                "vertex"
+                "vertex",
+                "area"
             ],
             "tags": {
                 "amenity": "waste_disposal"
             },
             "terms": [
+                "garbage",
                 "rubbish",
                 "litter",
                 "trash"
@@ -2452,6 +2492,7 @@
                 "dump",
                 "garbage",
                 "recycling",
+                "rubbish",
                 "scrap",
                 "trash"
             ],
diff --git a/data/presets/presets/amenity/planetarium.json b/data/presets/presets/amenity/planetarium.json
index e9263a253..3e703dd9c 100644
--- a/data/presets/presets/amenity/planetarium.json
+++ b/data/presets/presets/amenity/planetarium.json
@@ -2,8 +2,8 @@
     "icon": "museum",
     "fields": [
         "operator",
-        "building_area",
         "address",
+        "building_area",
         "opening_hours"
     ],
     "geometry": [
diff --git a/data/presets/presets/amenity/recycling.json b/data/presets/presets/amenity/recycling.json
index 2cabff15b..d6ca8d20f 100644
--- a/data/presets/presets/amenity/recycling.json
+++ b/data/presets/presets/amenity/recycling.json
@@ -1,18 +1,21 @@
 {
     "icon": "waste-basket",
     "fields": [
-        "operator",
-        "address",
-        "recycling_accepts"
+        "recycling_type",
+        "recycling_accepts",
+        "collection_times"
     ],
     "geometry": [
         "point",
         "area"
     ],
     "terms": [
+        "bin",
         "can",
         "bottle",
+        "glass",
         "garbage",
+        "rubbish",
         "scrap",
         "trash"
     ],
diff --git a/data/presets/presets/amenity/recycling_centre.json b/data/presets/presets/amenity/recycling_centre.json
new file mode 100644
index 000000000..ba3032a1d
--- /dev/null
+++ b/data/presets/presets/amenity/recycling_centre.json
@@ -0,0 +1,28 @@
+{
+    "icon": "waste-basket",
+    "fields": [
+        "operator",
+        "address",
+        "opening_hours",
+        "recycling_accepts"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "bottle",
+        "can",
+        "dump",
+        "glass",
+        "garbage",
+        "rubbish",
+        "scrap",
+        "trash"
+    ],
+    "tags": {
+        "amenity": "recycling",
+        "recycling_type": "centre"
+    },
+    "name": "Recycling Center"
+}
diff --git a/data/presets/presets/amenity/waste_basket.json b/data/presets/presets/amenity/waste_basket.json
index eaf32591a..a3fa447f6 100644
--- a/data/presets/presets/amenity/waste_basket.json
+++ b/data/presets/presets/amenity/waste_basket.json
@@ -1,18 +1,22 @@
 {
     "icon": "waste-basket",
+    "fields": [
+        "collection_times"
+    ],
     "geometry": [
         "point",
-        "vertex"
+        "vertex",
+        "area"
     ],
     "tags": {
         "amenity": "waste_basket"
     },
     "terms": [
         "bin",
+        "garbage",
         "rubbish",
         "litter",
-        "trash",
-        "garbage"
+        "trash"
     ],
     "name": "Waste Basket"
 }
diff --git a/data/presets/presets/amenity/waste_disposal.json b/data/presets/presets/amenity/waste_disposal.json
index 6246102c2..fe821af89 100644
--- a/data/presets/presets/amenity/waste_disposal.json
+++ b/data/presets/presets/amenity/waste_disposal.json
@@ -1,13 +1,18 @@
 {
     "icon": "waste-basket",
+    "fields": [
+        "collection_times"
+    ],
     "geometry": [
         "point",
-        "vertex"
+        "vertex",
+        "area"
     ],
     "tags": {
         "amenity": "waste_disposal"
     },
     "terms": [
+        "garbage",
         "rubbish",
         "litter",
         "trash"
diff --git a/data/presets/presets/amenity/waste_transfer_station.json b/data/presets/presets/amenity/waste_transfer_station.json
index 316d31984..d28506f7b 100644
--- a/data/presets/presets/amenity/waste_transfer_station.json
+++ b/data/presets/presets/amenity/waste_transfer_station.json
@@ -13,6 +13,7 @@
         "dump",
         "garbage",
         "recycling",
+        "rubbish",
         "scrap",
         "trash"
     ],
diff --git a/data/taginfo.json b/data/taginfo.json
index c412a1158..639c6fbe0 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -383,6 +383,10 @@
             "key": "amenity",
             "value": "ranger_station"
         },
+        {
+            "key": "recycling_type",
+            "value": "centre"
+        },
         {
             "key": "amenity",
             "value": "recycling"
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 42fbb1fcb..11bb1fbc9 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -1346,6 +1346,13 @@
                 "recycling_accepts": {
                     "label": "Accepts"
                 },
+                "recycling_type": {
+                    "label": "Recycling Type",
+                    "options": {
+                        "container": "Container",
+                        "centre": "Recycling Center"
+                    }
+                },
                 "ref": {
                     "label": "Reference"
                 },
@@ -1979,9 +1986,13 @@
                     "name": "Ranger Station",
                     "terms": "visitor center,visitor centre,permit center,permit centre,backcountry office,warden office,warden center"
                 },
+                "amenity/recycling_centre": {
+                    "name": "Recycling Center",
+                    "terms": "bottle,can,dump,glass,garbage,rubbish,scrap,trash"
+                },
                 "amenity/recycling": {
                     "name": "Recycling",
-                    "terms": "can,bottle,garbage,scrap,trash"
+                    "terms": "bin,can,bottle,glass,garbage,rubbish,scrap,trash"
                 },
                 "amenity/restaurant": {
                     "name": "Restaurant",
@@ -2089,15 +2100,15 @@
                 },
                 "amenity/waste_basket": {
                     "name": "Waste Basket",
-                    "terms": "bin,rubbish,litter,trash,garbage"
+                    "terms": "bin,garbage,rubbish,litter,trash"
                 },
                 "amenity/waste_disposal": {
                     "name": "Garbage Dumpster",
-                    "terms": "rubbish,litter,trash"
+                    "terms": "garbage,rubbish,litter,trash"
                 },
                 "amenity/waste_transfer_station": {
                     "name": "Waste Transfer Station",
-                    "terms": "dump,garbage,recycling,scrap,trash"
+                    "terms": "dump,garbage,recycling,rubbish,scrap,trash"
                 },
                 "amenity/water_point": {
                     "name": "RV Drinking Water",