diff --git a/data/locales.js b/data/locales.js
index bd76d0103..b27cbfb64 100644
--- a/data/locales.js
+++ b/data/locales.js
@@ -7303,6 +7303,10 @@ locale.en = {
                 "name": "University",
                 "terms": ""
             },
+            "amenity/waste_basket": {
+                "name": "Waste Basket",
+                "terms": "rubbish bin,litter bin,trash can,garbage can"
+            },
             "barrier": {
                 "name": "Barrier",
                 "terms": ""
@@ -7391,6 +7395,10 @@ locale.en = {
                 "name": "House",
                 "terms": ""
             },
+            "emergency/phone": {
+                "name": "Emergency Phone",
+                "terms": ""
+            },
             "entrance": {
                 "name": "Entrance",
                 "terms": ""
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 25978fe99..face7be0d 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -2205,7 +2205,7 @@
         "name": "Tennis Court"
     },
     "leisure/pitch/volleyball": {
-        "icon": "volleyball",
+        "icon": "pitch",
         "fields": [
             "surface"
         ],
diff --git a/data/presets/presets/leisure/pitch/volleyball.json b/data/presets/presets/leisure/pitch/volleyball.json
index 38816f1b7..f44ad8f3e 100644
--- a/data/presets/presets/leisure/pitch/volleyball.json
+++ b/data/presets/presets/leisure/pitch/volleyball.json
@@ -1,5 +1,5 @@
 {
-    "icon": "volleyball",
+    "icon": "pitch",
     "fields": [
         "surface"
     ],