diff --git a/data/styles/clear/include/Basemap.mapcss b/data/styles/clear/include/Basemap.mapcss
index db109ca8bb..525d503310 100644
--- a/data/styles/clear/include/Basemap.mapcss
+++ b/data/styles/clear/include/Basemap.mapcss
@@ -74,8 +74,6 @@ area[leisure=garden]
 area[leisure=pitch],
 area[leisure=stadium],
 area[leisure=track][area?],
-area[sport=multi],
-area[sport=soccer],
 {z-index: 41;}
 
 area[landuse=farmland],
diff --git a/data/styles/clear/include/Icons.mapcss b/data/styles/clear/include/Icons.mapcss
index 32b122da8a..fba2503d12 100644
--- a/data/styles/clear/include/Icons.mapcss
+++ b/data/styles/clear/include/Icons.mapcss
@@ -144,70 +144,72 @@ node[sport],
 area[sport],
 {z-index: 2410;}
 
-node|z18-[sport=archery],
-area|z18-[sport=archery],
-node|z18-[sport=shooting],
-area|z18-[sport=shooting],
-node|z18-[sport=australian_football],
-area|z18-[sport=australian_football],
-node|z18-[sport=bowls],
-area|z18-[sport=bowls],
-node|z18-[sport=cricket],
-area|z18-[sport=cricket],
-node|z18-[sport=curling],
-area|z18-[sport=curling],
-node|z18-[sport=diving],
-area|z18-[sport=diving],
-node|z18-[sport=scuba_diving],
-area|z18-[sport=scuba_diving],
-node|z18-[sport=equestrian],
-area|z18-[sport=equestrian],
-node|z18-[sport=climbing],
-area|z18-[sport=climbing],
-node|z18-[sport=9pin],
-area|z18-[sport=9pin],
-node|z18-[sport=10pin],
-area|z18-[sport=10pin],
-node|z18-[sport=chess],
-area|z18-[sport=chess],
+node[sport=futsal],
+area[sport=futsal],
+node[sport=archery],
+area[sport=archery],
+node[sport=shooting],
+area[sport=shooting],
+node[sport=australian_football],
+area[sport=australian_football],
+node[sport=bowls],
+area[sport=bowls],
+node[sport=cricket],
+area[sport=cricket],
+node[sport=curling],
+area[sport=curling],
+node[sport=diving],
+area[sport=diving],
+node[sport=scuba_diving],
+area[sport=scuba_diving],
+node[sport=equestrian],
+area[sport=equestrian],
+node[sport=climbing],
+area[sport=climbing],
+node[sport=9pin],
+area[sport=9pin],
+node[sport=10pin],
+area[sport=10pin],
+node[sport=chess],
+area[sport=chess],
 {z-index: 2440;}
 
-node|z18-[sport=swimming],
-area|z18-[sport=swimming],
-node|z18-[sport=baseball],
-area|z18-[sport=baseball],
-node|z18-[sport=basketball],
-area|z18-[sport=basketball],
-node|z18-[sport=american_football],
-area|z18-[sport=american_football],
-node|z18-[sport=athletics],
-area|z18-[sport=athletics],
-node|z18-[sport=golf],
-area|z18-[sport=golf],
-node|z18-[sport=gymnastics],
-area|z18-[sport=gymnastics],
-node|z18-[sport=skateboard],
-area|z18-[sport=skateboard],
-node|z18-[sport=volleyball],
-area|z18-[sport=volleyball],
-node|z18-[sport=beachvolleyball],
-area|z18-[sport=beachvolleyball],
-node|z18-[sport=table_tennis],
-area|z18-[sport=table_tennis],
-node|z18-[sport=yoga],
-area|z18-[sport=yoga],
-node|z18-[sport=padel],
-area|z18-[sport=padel],
-node|z18-[sport=handball],
-area|z18-[sport=handball],
-node|z18-[sport=ice_hockey],
-area|z18-[sport=ice_hockey],
-node|z18-[sport=field_hockey],
-area|z18-[sport=field_hockey],
-node|z18-[sport=badminton],
-area|z18-[sport=badminton],
-node|z18-[sport=pelota],
-area|z18-[sport=pelota],
+node[sport=swimming],
+area[sport=swimming],
+node[sport=baseball],
+area[sport=baseball],
+node[sport=basketball],
+area[sport=basketball],
+node[sport=american_football],
+area[sport=american_football],
+node[sport=athletics],
+area[sport=athletics],
+node[sport=golf],
+area[sport=golf],
+node[sport=gymnastics],
+area[sport=gymnastics],
+node[sport=skateboard],
+area[sport=skateboard],
+node[sport=volleyball],
+area[sport=volleyball],
+node[sport=beachvolleyball],
+area[sport=beachvolleyball],
+node[sport=table_tennis],
+area[sport=table_tennis],
+node[sport=yoga],
+area[sport=yoga],
+node[sport=padel],
+area[sport=padel],
+node[sport=handball],
+area[sport=handball],
+node[sport=ice_hockey],
+area[sport=ice_hockey],
+node[sport=field_hockey],
+area[sport=field_hockey],
+node[sport=badminton],
+area[sport=badminton],
+node[sport=pelota],
+area[sport=pelota],
 {z-index: 2460;}
 
 node[landuse=landfill],