diff --git a/data/presets/presets.json b/data/presets/presets.json
index 5b706aff1..4f722163d 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -10786,7 +10786,7 @@
             "name": "Baseball Diamond"
         },
         "leisure/pitch/basketball": {
-            "icon": "basketball",
+            "icon": "maki-basketball",
             "fields": [
                 "name",
                 "surface",
@@ -10810,7 +10810,7 @@
             "name": "Basketball Court"
         },
         "leisure/pitch/beachvolleyball": {
-            "icon": "basketball",
+            "icon": "maki-basketball",
             "fields": [
                 "name",
                 "surface",
@@ -11082,7 +11082,7 @@
             "name": "Tennis Court"
         },
         "leisure/pitch/volleyball": {
-            "icon": "basketball",
+            "icon": "maki-basketball",
             "fields": [
                 "name",
                 "surface",
diff --git a/data/presets/presets/leisure/pitch/basketball.json b/data/presets/presets/leisure/pitch/basketball.json
index 30955d275..962097c1a 100644
--- a/data/presets/presets/leisure/pitch/basketball.json
+++ b/data/presets/presets/leisure/pitch/basketball.json
@@ -1,5 +1,5 @@
 {
-    "icon": "basketball",
+    "icon": "maki-basketball",
     "fields": [
         "name",
         "surface",
diff --git a/data/presets/presets/leisure/pitch/beachvolleyball.json b/data/presets/presets/leisure/pitch/beachvolleyball.json
index 3374ddcd2..0a05e5a5f 100644
--- a/data/presets/presets/leisure/pitch/beachvolleyball.json
+++ b/data/presets/presets/leisure/pitch/beachvolleyball.json
@@ -1,5 +1,5 @@
 {
-    "icon": "basketball",
+    "icon": "maki-basketball",
     "fields": [
         "name",
         "surface",
diff --git a/data/presets/presets/leisure/pitch/soccer.json b/data/presets/presets/leisure/pitch/soccer.json
index 3bae2664b..45ba911ed 100644
--- a/data/presets/presets/leisure/pitch/soccer.json
+++ b/data/presets/presets/leisure/pitch/soccer.json
@@ -18,7 +18,7 @@
         "value": "soccer"
     },
     "terms": [
-	"football"
+    	"football"
     ],
     "name": "Soccer Field"
 }
diff --git a/data/presets/presets/leisure/pitch/volleyball.json b/data/presets/presets/leisure/pitch/volleyball.json
index df56e2b5f..6d12b05e2 100644
--- a/data/presets/presets/leisure/pitch/volleyball.json
+++ b/data/presets/presets/leisure/pitch/volleyball.json
@@ -1,5 +1,5 @@
 {
-    "icon": "basketball",
+    "icon": "maki-basketball",
     "fields": [
         "name",
         "surface",
diff --git a/data/taginfo.json b/data/taginfo.json
index 76a1b9f05..feef32f2c 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -4598,7 +4598,8 @@
             "object_types": [
                 "node",
                 "area"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/basketball-15.svg?sanitize=true"
         },
         {
             "key": "sport",
@@ -4607,7 +4608,8 @@
             "object_types": [
                 "node",
                 "area"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/basketball-15.svg?sanitize=true"
         },
         {
             "key": "sport",
@@ -4716,7 +4718,8 @@
             "object_types": [
                 "node",
                 "area"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/basketball-15.svg?sanitize=true"
         },
         {
             "key": "leisure",