diff --git a/data/styles/clear/include/Basemap.mapcss b/data/styles/clear/include/Basemap.mapcss
index 1e07b0c044..1ddab4c6a9 100644
--- a/data/styles/clear/include/Basemap.mapcss
+++ b/data/styles/clear/include/Basemap.mapcss
@@ -63,14 +63,6 @@ area[landuse=railway],
 area[landuse=quarry]
 {z-index: 3;}
 
-area[leisure=pitch],
-area[leisure=stadium],
-area[leisure=track][area?]
-area[leisure=playground],
-area[sport=multi],
-area[sport=soccer],
-{z-index: 5;}
-
 area[landuse=forest]
 {z-index: 30;}
 
@@ -78,6 +70,15 @@ area[leisure=park],
 area[leisure=garden]
 {z-index: 40;}
 
+/* Should be greater than leisure=park */
+area[leisure=pitch],
+area[leisure=stadium],
+area[leisure=track][area?],
+area[leisure=playground],
+area[sport=multi],
+area[sport=soccer],
+{z-index: 41;}
+
 area[landuse=farmland],
 area[landuse=farmyard],
 area[landuse=allotments],
diff --git a/data/styles/clear/include/Icons.mapcss b/data/styles/clear/include/Icons.mapcss
index 67b73db971..222ac551be 100644
--- a/data/styles/clear/include/Icons.mapcss
+++ b/data/styles/clear/include/Icons.mapcss
@@ -39,9 +39,6 @@ area[amenity],
 area[man_made],
 {-x-me-min-text-priority: 15300;}
 
-node|z17-[leisure],
-{z-index: 6;}
-
 node|z17-[leisure=golf_course],
 area|z17-[leisure=golf_course]
 {z-index: 50;}
diff --git a/data/styles/vehicle/include/Basemap.mapcss b/data/styles/vehicle/include/Basemap.mapcss
index 9b7e475284..715123b12b 100644
--- a/data/styles/vehicle/include/Basemap.mapcss
+++ b/data/styles/vehicle/include/Basemap.mapcss
@@ -57,14 +57,6 @@ area[landuse=railway],
 area[landuse=quarry]
 {z-index: 3;}
 
-area[leisure=pitch],
-area[leisure=stadium],
-area[leisure=playground],
-area[sport=multi],
-area[sport=soccer],
-{z-index: 5;}
-
-
 area[landuse=forest],
 area[leisure=nature_reserve]
 {z-index: 30;}
@@ -73,6 +65,14 @@ area[leisure=park],
 area[leisure=garden]
 {z-index: 40;}
 
+/* Should be greater than leisure=park */
+area[leisure=pitch],
+area[leisure=stadium],
+area[leisure=playground],
+area[sport=multi],
+area[sport=soccer],
+{z-index: 41;}
+
 area[landuse=farmland],
 area[landuse=allotments],
 area[natural=scrub],
diff --git a/data/styles/vehicle/include/Icons.mapcss b/data/styles/vehicle/include/Icons.mapcss
index 1ac4a3e6af..b84b520e6c 100644
--- a/data/styles/vehicle/include/Icons.mapcss
+++ b/data/styles/vehicle/include/Icons.mapcss
@@ -38,7 +38,6 @@ area[amenity],
 area[man_made],
 {-x-me-min-text-priority: 15300;}
 
-node|z17-[leisure],
 node[amenity=marketplace],
 area[amenity=marketplace]
 {z-index: 6;}
diff --git a/map/style_tests/classificator_tests.cpp b/map/style_tests/classificator_tests.cpp
index 34c4579030..53d8e490df 100644
--- a/map/style_tests/classificator_tests.cpp
+++ b/map/style_tests/classificator_tests.cpp
@@ -240,6 +240,13 @@ UNIT_TEST(Classificator_AreaPriority)
     // 1
     {"man_made", "pier"}, {"man_made", "breakwater"}, {"waterway", "dam"},
   }, {2, 3}, drule::area);
+
+  CheckPriority({
+    // 0
+    {"leisure", "park"},
+    // 1
+    {"leisure", "pitch"}, {"leisure", "playground"}, {"sport", "multi"},
+  }, {1, 3}, drule::area);
 }
 
 UNIT_TEST(Classificator_PoiPriority)