diff --git a/data/classificator.txt b/data/classificator.txt
index 9a3114b746..693e60daef 100644
--- a/data/classificator.txt
+++ b/data/classificator.txt
@@ -541,9 +541,7 @@ world  +
         {}
     leisure  +
         common  -
-        dog_park  +
-            tennis  -
-            {}
+        dog_park  -
         fitness_centre  -
         fitness_station  -
         garden  -
@@ -560,12 +558,7 @@ world  +
         pitch  +
             tennis  -
             {}
-        playground  +
-            tennis  -
-            {}
-        playing_fields  +
-            tennis  -
-            {}
+        playground  -
         recreation_ground  -
         sauna  -
         slipway  -
diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index 04d1a7d500..a947ce9eb1 100644
Binary files a/data/drules_proto.bin and b/data/drules_proto.bin differ
diff --git a/data/drules_proto.txt b/data/drules_proto.txt
index cad075db89..d3c40c52ed 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -34839,76 +34839,6 @@ cont {
     }
   }
 }
-cont {
-  name: "leisure-dog_park-tennis"
-  element {
-    scale: 16
-    symbol {
-      name: "dog_park-m"
-      priority: 16451
-      min_distance: 30
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15451
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "dog_park-m"
-      priority: 16473
-      min_distance: 20
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: 15473
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "dog_park-m"
-      priority: 16473
-      min_distance: 20
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: 15473
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "dog_park-m"
-      priority: 16473
-      min_distance: 20
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: 15473
-    }
-  }
-}
 cont {
   name: "leisure-fitness_centre"
   element {
@@ -36953,126 +36883,6 @@ cont {
     }
   }
 }
-cont {
-  name: "leisure-playground-tennis"
-  element {
-    scale: 17
-    area {
-      color: 13749671
-      priority: -15527
-    }
-    symbol {
-      name: "tennis-m"
-      apply_for_type: 1
-      priority: 16473
-      min_distance: 10
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15473
-    }
-  }
-  element {
-    scale: 18
-    area {
-      color: 13749671
-      priority: -15527
-    }
-    symbol {
-      name: "tennis-m"
-      apply_for_type: 1
-      priority: 16473
-      min_distance: 10
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15473
-    }
-  }
-  element {
-    scale: 19
-    area {
-      color: 13749671
-      priority: -15527
-    }
-    symbol {
-      name: "tennis-m"
-      apply_for_type: 1
-      priority: 16473
-      min_distance: 10
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15473
-    }
-  }
-}
-cont {
-  name: "leisure-playing_fields-tennis"
-  element {
-    scale: 17
-    symbol {
-      name: "tennis-m"
-      apply_for_type: 1
-      priority: 16473
-      min_distance: 10
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15473
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "tennis-m"
-      apply_for_type: 1
-      priority: 16473
-      min_distance: 10
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15473
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "tennis-m"
-      apply_for_type: 1
-      priority: 16473
-      min_distance: 10
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15473
-    }
-  }
-}
 cont {
   name: "leisure-recreation_ground"
   element {
diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index 0eb0868849..57c7e65921 100644
Binary files a/data/drules_proto_clear.bin and b/data/drules_proto_clear.bin differ
diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt
index f496294ced..fbf4ce2ef8 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -34503,76 +34503,6 @@ cont {
     }
   }
 }
-cont {
-  name: "leisure-dog_park-tennis"
-  element {
-    scale: 16
-    symbol {
-      name: "dog_park-m"
-      priority: 16451
-      min_distance: 30
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15451
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "dog_park-m"
-      priority: 16473
-      min_distance: 20
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: 15473
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "dog_park-m"
-      priority: 16473
-      min_distance: 20
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: 15473
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "dog_park-m"
-      priority: 16473
-      min_distance: 20
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: 15473
-    }
-  }
-}
 cont {
   name: "leisure-fitness_centre"
   element {
@@ -36609,126 +36539,6 @@ cont {
     }
   }
 }
-cont {
-  name: "leisure-playground-tennis"
-  element {
-    scale: 17
-    area {
-      color: 13749671
-      priority: -15527
-    }
-    symbol {
-      name: "tennis-m"
-      apply_for_type: 1
-      priority: 16473
-      min_distance: 10
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15473
-    }
-  }
-  element {
-    scale: 18
-    area {
-      color: 13749671
-      priority: -15527
-    }
-    symbol {
-      name: "tennis-m"
-      apply_for_type: 1
-      priority: 16473
-      min_distance: 10
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15473
-    }
-  }
-  element {
-    scale: 19
-    area {
-      color: 13749671
-      priority: -15527
-    }
-    symbol {
-      name: "tennis-m"
-      apply_for_type: 1
-      priority: 16473
-      min_distance: 10
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15473
-    }
-  }
-}
-cont {
-  name: "leisure-playing_fields-tennis"
-  element {
-    scale: 17
-    symbol {
-      name: "tennis-m"
-      apply_for_type: 1
-      priority: 16473
-      min_distance: 10
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15473
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "tennis-m"
-      apply_for_type: 1
-      priority: 16473
-      min_distance: 10
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15473
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "tennis-m"
-      apply_for_type: 1
-      priority: 16473
-      min_distance: 10
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15473
-    }
-  }
-}
 cont {
   name: "leisure-recreation_ground"
   element {
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index 3dd469f315..660abf549a 100644
Binary files a/data/drules_proto_dark.bin and b/data/drules_proto_dark.bin differ
diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt
index 4308747a8f..6fe737fee1 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -34654,76 +34654,6 @@ cont {
     }
   }
 }
-cont {
-  name: "leisure-dog_park-tennis"
-  element {
-    scale: 16
-    symbol {
-      name: "dog_park-m"
-      priority: 16451
-      min_distance: 30
-    }
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15451
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "dog_park-m"
-      priority: 16473
-      min_distance: 20
-    }
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-        is_optional: true
-      }
-      priority: 15473
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "dog_park-m"
-      priority: 16473
-      min_distance: 20
-    }
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-        is_optional: true
-      }
-      priority: 15473
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "dog_park-m"
-      priority: 16473
-      min_distance: 20
-    }
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-        is_optional: true
-      }
-      priority: 15473
-    }
-  }
-}
 cont {
   name: "leisure-fitness_centre"
   element {
@@ -36760,126 +36690,6 @@ cont {
     }
   }
 }
-cont {
-  name: "leisure-playground-tennis"
-  element {
-    scale: 17
-    area {
-      color: 2171163
-      priority: -15527
-    }
-    symbol {
-      name: "tennis-m"
-      apply_for_type: 1
-      priority: 16473
-      min_distance: 10
-    }
-    caption {
-      primary {
-        height: 11
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15473
-    }
-  }
-  element {
-    scale: 18
-    area {
-      color: 2171163
-      priority: -15527
-    }
-    symbol {
-      name: "tennis-m"
-      apply_for_type: 1
-      priority: 16473
-      min_distance: 10
-    }
-    caption {
-      primary {
-        height: 11
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15473
-    }
-  }
-  element {
-    scale: 19
-    area {
-      color: 2171163
-      priority: -15527
-    }
-    symbol {
-      name: "tennis-m"
-      apply_for_type: 1
-      priority: 16473
-      min_distance: 10
-    }
-    caption {
-      primary {
-        height: 11
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15473
-    }
-  }
-}
-cont {
-  name: "leisure-playing_fields-tennis"
-  element {
-    scale: 17
-    symbol {
-      name: "tennis-m"
-      apply_for_type: 1
-      priority: 16473
-      min_distance: 10
-    }
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15473
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "tennis-m"
-      apply_for_type: 1
-      priority: 16473
-      min_distance: 10
-    }
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15473
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "tennis-m"
-      apply_for_type: 1
-      priority: 16473
-      min_distance: 10
-    }
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15473
-    }
-  }
-}
 cont {
   name: "leisure-recreation_ground"
   element {
diff --git a/data/resources-6plus_clear/symbols-ad.png b/data/resources-6plus_clear/symbols-ad.png
index 9f616ba041..1c43e695aa 100644
Binary files a/data/resources-6plus_clear/symbols-ad.png and b/data/resources-6plus_clear/symbols-ad.png differ
diff --git a/data/resources-6plus_clear/symbols.png b/data/resources-6plus_clear/symbols.png
index 920fa53626..09ddd5d603 100644
Binary files a/data/resources-6plus_clear/symbols.png and b/data/resources-6plus_clear/symbols.png differ
diff --git a/data/resources-6plus_dark/symbols-ad.png b/data/resources-6plus_dark/symbols-ad.png
index 4e1a8b8b89..20c3a2a306 100644
Binary files a/data/resources-6plus_dark/symbols-ad.png and b/data/resources-6plus_dark/symbols-ad.png differ
diff --git a/data/resources-6plus_dark/symbols.png b/data/resources-6plus_dark/symbols.png
index 738b78a35a..aa440d3886 100644
Binary files a/data/resources-6plus_dark/symbols.png and b/data/resources-6plus_dark/symbols.png differ
diff --git a/data/resources-hdpi_clear/symbols-ad.png b/data/resources-hdpi_clear/symbols-ad.png
index c7d197d91d..998b3ebfb3 100644
Binary files a/data/resources-hdpi_clear/symbols-ad.png and b/data/resources-hdpi_clear/symbols-ad.png differ
diff --git a/data/resources-hdpi_clear/symbols.png b/data/resources-hdpi_clear/symbols.png
index 22b4553b36..e01ec286a4 100644
Binary files a/data/resources-hdpi_clear/symbols.png and b/data/resources-hdpi_clear/symbols.png differ
diff --git a/data/resources-hdpi_dark/symbols-ad.png b/data/resources-hdpi_dark/symbols-ad.png
index dacf2897b8..f135ca2854 100644
Binary files a/data/resources-hdpi_dark/symbols-ad.png and b/data/resources-hdpi_dark/symbols-ad.png differ
diff --git a/data/resources-hdpi_dark/symbols.png b/data/resources-hdpi_dark/symbols.png
index b0575aedcb..b6c32f7a36 100644
Binary files a/data/resources-hdpi_dark/symbols.png and b/data/resources-hdpi_dark/symbols.png differ
diff --git a/data/resources-mdpi_clear/symbols-ad.png b/data/resources-mdpi_clear/symbols-ad.png
index a53ccdc702..5a7249ef72 100644
Binary files a/data/resources-mdpi_clear/symbols-ad.png and b/data/resources-mdpi_clear/symbols-ad.png differ
diff --git a/data/resources-mdpi_clear/symbols.png b/data/resources-mdpi_clear/symbols.png
index 2454510011..5bd82f6fa4 100644
Binary files a/data/resources-mdpi_clear/symbols.png and b/data/resources-mdpi_clear/symbols.png differ
diff --git a/data/resources-mdpi_dark/symbols-ad.png b/data/resources-mdpi_dark/symbols-ad.png
index 1dde59c1a8..da357d244f 100644
Binary files a/data/resources-mdpi_dark/symbols-ad.png and b/data/resources-mdpi_dark/symbols-ad.png differ
diff --git a/data/resources-mdpi_dark/symbols.png b/data/resources-mdpi_dark/symbols.png
index 0508ad9973..7a19dae862 100644
Binary files a/data/resources-mdpi_dark/symbols.png and b/data/resources-mdpi_dark/symbols.png differ
diff --git a/data/resources-xhdpi_clear/symbols-ad.png b/data/resources-xhdpi_clear/symbols-ad.png
index 949895001c..0ff1c75b1f 100644
Binary files a/data/resources-xhdpi_clear/symbols-ad.png and b/data/resources-xhdpi_clear/symbols-ad.png differ
diff --git a/data/resources-xhdpi_clear/symbols.png b/data/resources-xhdpi_clear/symbols.png
index 199857f113..a366f953bc 100644
Binary files a/data/resources-xhdpi_clear/symbols.png and b/data/resources-xhdpi_clear/symbols.png differ
diff --git a/data/resources-xhdpi_dark/symbols-ad.png b/data/resources-xhdpi_dark/symbols-ad.png
index d7a678de22..915c0eaba2 100644
Binary files a/data/resources-xhdpi_dark/symbols-ad.png and b/data/resources-xhdpi_dark/symbols-ad.png differ
diff --git a/data/resources-xhdpi_dark/symbols.png b/data/resources-xhdpi_dark/symbols.png
index 8bbc2013fb..90343d1f75 100644
Binary files a/data/resources-xhdpi_dark/symbols.png and b/data/resources-xhdpi_dark/symbols.png differ
diff --git a/data/resources-xxhdpi_clear/symbols-ad.png b/data/resources-xxhdpi_clear/symbols-ad.png
index e22816fbb9..528b00dc3f 100644
Binary files a/data/resources-xxhdpi_clear/symbols-ad.png and b/data/resources-xxhdpi_clear/symbols-ad.png differ
diff --git a/data/resources-xxhdpi_clear/symbols.png b/data/resources-xxhdpi_clear/symbols.png
index 0325325093..e2e498bef4 100644
Binary files a/data/resources-xxhdpi_clear/symbols.png and b/data/resources-xxhdpi_clear/symbols.png differ
diff --git a/data/resources-xxhdpi_dark/symbols-ad.png b/data/resources-xxhdpi_dark/symbols-ad.png
index a45c91b39d..c4e60f57ec 100644
Binary files a/data/resources-xxhdpi_dark/symbols-ad.png and b/data/resources-xxhdpi_dark/symbols-ad.png differ
diff --git a/data/resources-xxhdpi_dark/symbols.png b/data/resources-xxhdpi_dark/symbols.png
index 808a0b251e..1290165614 100644
Binary files a/data/resources-xxhdpi_dark/symbols.png and b/data/resources-xxhdpi_dark/symbols.png differ
diff --git a/data/resources-xxxhdpi_clear/symbols-ad.png b/data/resources-xxxhdpi_clear/symbols-ad.png
index ce2b8aa0ff..4849fe60f8 100644
Binary files a/data/resources-xxxhdpi_clear/symbols-ad.png and b/data/resources-xxxhdpi_clear/symbols-ad.png differ
diff --git a/data/resources-xxxhdpi_clear/symbols.png b/data/resources-xxxhdpi_clear/symbols.png
index 86a006ee6c..0c2707dc71 100644
Binary files a/data/resources-xxxhdpi_clear/symbols.png and b/data/resources-xxxhdpi_clear/symbols.png differ
diff --git a/data/resources-xxxhdpi_dark/symbols-ad.png b/data/resources-xxxhdpi_dark/symbols-ad.png
index 901439f4c4..922fe088d5 100644
Binary files a/data/resources-xxxhdpi_dark/symbols-ad.png and b/data/resources-xxxhdpi_dark/symbols-ad.png differ
diff --git a/data/resources-xxxhdpi_dark/symbols.png b/data/resources-xxxhdpi_dark/symbols.png
index e31e12d7b2..85852c8000 100644
Binary files a/data/resources-xxxhdpi_dark/symbols.png and b/data/resources-xxxhdpi_dark/symbols.png differ
diff --git a/data/types.txt b/data/types.txt
index 3569b88d70..507992474b 100644
--- a/data/types.txt
+++ b/data/types.txt
@@ -515,7 +515,7 @@ natural|water
 landuse|forest
 mapswithme
 mapswithme
-leisure|playground|tennis
+mapswithme
 mapswithme
 sport|diving
 highway|track|grade3
@@ -843,9 +843,9 @@ mapswithme
 mapswithme
 mapswithme
 mapswithme
-leisure|dog_park|tennis
+mapswithme
 leisure|park|no-access
-leisure|playing_fields|tennis
+mapswithme
 leisure|recreation_ground
 leisure|recreation_ground
 man_made|pipeline
diff --git a/data/visibility.txt b/data/visibility.txt
index 4f6a04e9ca..531a7bcab7 100644
--- a/data/visibility.txt
+++ b/data/visibility.txt
@@ -541,9 +541,7 @@ world  00000000000000000000  +
         {}
     leisure  00000000000000000000  +
         common  00000000000000000000  -
-        dog_park  00000000000000000000  +
-            tennis  00000000000000000000  -
-            {}
+        dog_park  00000000000000000000  -
         fitness_centre  00000000000000000000  -
         fitness_station  00000000000000000000  -
         garden  00000000000011111111  -
@@ -560,12 +558,7 @@ world  00000000000000000000  +
         pitch  00000000000000000000  +
             tennis  00000000000000000000  -
             {}
-        playground  00000000000000000000  +
-            tennis  00000000000000000000  -
-            {}
-        playing_fields  00000000000000000000  +
-            tennis  00000000000000000000  -
-            {}
+        playground  00000000000000000000  -
         recreation_ground  00000000000000000000  -
         sauna  00000000000000000000  -
         slipway  00000000000000000000  -