diff --git a/map/bookmark_helpers.cpp b/map/bookmark_helpers.cpp
index 0aad2a1e7f..d20a4eea64 100644
--- a/map/bookmark_helpers.cpp
+++ b/map/bookmark_helpers.cpp
@@ -69,7 +69,6 @@ std::map<std::string, BookmarkMatchInfo> const kFeatureTypeToBookmarkMatchInfo =
   {"amenity-cinema", {kml::BookmarkIcon::Entertainment, BookmarkBaseType::Entertainment}},
   {"amenity-nightclub", {kml::BookmarkIcon::Entertainment, BookmarkBaseType::Entertainment}},
   {"amenity-theatre", {kml::BookmarkIcon::Entertainment, BookmarkBaseType::Entertainment}},
-  {"leisure-water_park", {kml::BookmarkIcon::Entertainment, BookmarkBaseType::Entertainment}},
   {"shop-bookmaker", {kml::BookmarkIcon::Entertainment, BookmarkBaseType::Entertainment}},
   {"tourism-theme_park", {kml::BookmarkIcon::Entertainment, BookmarkBaseType::Entertainment}},
 
@@ -165,6 +164,7 @@ std::map<std::string, BookmarkMatchInfo> const kFeatureTypeToBookmarkMatchInfo =
 
   {"leisure-sports_centre-swimming", {kml::BookmarkIcon::Swim, BookmarkBaseType::Swim}},
   {"leisure-swimming_pool", {kml::BookmarkIcon::Swim, BookmarkBaseType::Swim}},
+  {"leisure-water_park", {kml::BookmarkIcon::Swim, BookmarkBaseType::Swim}},
   {"natural-beach", {kml::BookmarkIcon::Swim, BookmarkBaseType::Swim}},
   {"sport-diving", {kml::BookmarkIcon::Swim, BookmarkBaseType::Swim}},
   {"sport-scuba_diving", {kml::BookmarkIcon::Swim, BookmarkBaseType::Swim}},