diff --git a/data/styles/default/dark/symbols/search-result-drinking-water-no.svg b/data/styles/default/dark/symbols/search-result-drinking-water-no.svg
new file mode 100644
index 0000000000..d32f00fe44
--- /dev/null
+++ b/data/styles/default/dark/symbols/search-result-drinking-water-no.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="36" height="36" version="1.1" viewBox="0 0 36 36" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <defs>
+  <filter id="filter1" x="-.147" y="-.147" width="1.294" height="1.294" color-interpolation-filters="sRGB">
+   <feGaussianBlur stdDeviation="1.5925"/>
+  </filter>
+  <linearGradient id="linearGradient1" x1="18" x2="18" y1="3" y2="29" gradientUnits="userSpaceOnUse">
+   <stop stop-color="#3fa8f3" offset="0"/>
+   <stop stop-color="#2089d4" offset="1"/>
+  </linearGradient>
+ </defs>
+ <circle cx="18" cy="18" r="13" filter="url(#filter1)" opacity=".35"/>
+ <circle cx="18" cy="16" r="13" fill="url(#linearGradient1)" stroke="#fff" stroke-width="2"/>
+ <path d="m18 8.1256c-0.48327 0.64426-1.3499 1.7966-2.252 3.1465l7.6758 7.6758c0.01741-0.17226 0.02734-0.34669 0.02734-0.52344 0-3.0627-4.1387-8.5489-5.4512-10.299zm-4.1133 6.2383c-0.77413 1.4766-1.3379 2.9334-1.3379 4.0605 0 3.0288 2.626 5.4512 5.4512 5.4512 1.4181 0 2.7859-0.6104 3.7969-1.6016l-7.9102-7.9102z" fill="#fff"/>
+ <path d="m12.5 10.501 12 12" fill="none" stroke="#fff" stroke-linecap="round" stroke-width="1.5"/>
+</svg>
diff --git a/data/styles/default/dark/symbols/search-result-drinking-water.svg b/data/styles/default/dark/symbols/search-result-drinking-water.svg
new file mode 100644
index 0000000000..89f4976570
--- /dev/null
+++ b/data/styles/default/dark/symbols/search-result-drinking-water.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="36" height="36" version="1.1" viewBox="0 0 36 36" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <defs>
+  <filter id="filter1" x="-.147" y="-.147" width="1.294" height="1.294" color-interpolation-filters="sRGB">
+   <feGaussianBlur stdDeviation="1.5925"/>
+  </filter>
+  <linearGradient id="linearGradient1" x1="18" x2="18" y1="3" y2="29" gradientUnits="userSpaceOnUse">
+   <stop stop-color="#3fa8f3" offset="0"/>
+   <stop stop-color="#2089d4" offset="1"/>
+  </linearGradient>
+ </defs>
+ <circle cx="18" cy="18" r="13" filter="url(#filter1)" opacity=".35"/>
+ <circle cx="18" cy="16" r="13" fill="url(#linearGradient1)" stroke="#fff" stroke-width="2"/>
+ <path d="m18 23.875c-2.8251 0-5.4518-2.4231-5.4518-5.4518 0-3.0625 4.1394-8.5484 5.4518-10.298 1.3125 1.75 5.4518 7.2355 5.4518 10.298 0 3.0288-2.6268 5.4518-5.4518 5.4518z" fill="#fff"/>
+</svg>
diff --git a/data/styles/default/light/symbols/search-result-drinking-water-no.svg b/data/styles/default/light/symbols/search-result-drinking-water-no.svg
new file mode 100644
index 0000000000..d32f00fe44
--- /dev/null
+++ b/data/styles/default/light/symbols/search-result-drinking-water-no.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="36" height="36" version="1.1" viewBox="0 0 36 36" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <defs>
+  <filter id="filter1" x="-.147" y="-.147" width="1.294" height="1.294" color-interpolation-filters="sRGB">
+   <feGaussianBlur stdDeviation="1.5925"/>
+  </filter>
+  <linearGradient id="linearGradient1" x1="18" x2="18" y1="3" y2="29" gradientUnits="userSpaceOnUse">
+   <stop stop-color="#3fa8f3" offset="0"/>
+   <stop stop-color="#2089d4" offset="1"/>
+  </linearGradient>
+ </defs>
+ <circle cx="18" cy="18" r="13" filter="url(#filter1)" opacity=".35"/>
+ <circle cx="18" cy="16" r="13" fill="url(#linearGradient1)" stroke="#fff" stroke-width="2"/>
+ <path d="m18 8.1256c-0.48327 0.64426-1.3499 1.7966-2.252 3.1465l7.6758 7.6758c0.01741-0.17226 0.02734-0.34669 0.02734-0.52344 0-3.0627-4.1387-8.5489-5.4512-10.299zm-4.1133 6.2383c-0.77413 1.4766-1.3379 2.9334-1.3379 4.0605 0 3.0288 2.626 5.4512 5.4512 5.4512 1.4181 0 2.7859-0.6104 3.7969-1.6016l-7.9102-7.9102z" fill="#fff"/>
+ <path d="m12.5 10.501 12 12" fill="none" stroke="#fff" stroke-linecap="round" stroke-width="1.5"/>
+</svg>
diff --git a/data/styles/default/light/symbols/search-result-drinking-water.svg b/data/styles/default/light/symbols/search-result-drinking-water.svg
new file mode 100644
index 0000000000..89f4976570
--- /dev/null
+++ b/data/styles/default/light/symbols/search-result-drinking-water.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="36" height="36" version="1.1" viewBox="0 0 36 36" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <defs>
+  <filter id="filter1" x="-.147" y="-.147" width="1.294" height="1.294" color-interpolation-filters="sRGB">
+   <feGaussianBlur stdDeviation="1.5925"/>
+  </filter>
+  <linearGradient id="linearGradient1" x1="18" x2="18" y1="3" y2="29" gradientUnits="userSpaceOnUse">
+   <stop stop-color="#3fa8f3" offset="0"/>
+   <stop stop-color="#2089d4" offset="1"/>
+  </linearGradient>
+ </defs>
+ <circle cx="18" cy="18" r="13" filter="url(#filter1)" opacity=".35"/>
+ <circle cx="18" cy="16" r="13" fill="url(#linearGradient1)" stroke="#fff" stroke-width="2"/>
+ <path d="m18 23.875c-2.8251 0-5.4518-2.4231-5.4518-5.4518 0-3.0625 4.1394-8.5484 5.4518-10.298 1.3125 1.75 5.4518 7.2355 5.4518 10.298 0 3.0288-2.6268 5.4518-5.4518 5.4518z" fill="#fff"/>
+</svg>
diff --git a/map/search_mark.cpp b/map/search_mark.cpp
index cdb4a6d417..317284ce6a 100644
--- a/map/search_mark.cpp
+++ b/map/search_mark.cpp
@@ -65,6 +65,8 @@ enum SearchMarkPoint::SearchMarkType : uint8_t
   Hospital,
   Clinic,
   Pharmacy,
+  DrinkingWater,
+  DrinkingWaterNo,
 
   NotFound,  // Service value used in developer tools.
   Count
@@ -128,6 +130,8 @@ std::array<std::string, SearchMarkType::Count> const kSymbols = {
     "search-result-hospital",               // Hospital.
     "search-result-clinic",                 // Clinic.
     "search-result-pharmacy",               // Pharmacy.
+    "search-result-drinking-water",         // DrinkingWater.
+    "search-result-drinking-water-no",      // DrinkingWaterNo.
 
     
     "non-found-search-result",  // NotFound.
@@ -240,6 +244,16 @@ private:
       {{"leisure", "sports_hall"},   SearchMarkType::Pitch},
       {{"leisure", "swimming_pool"}, SearchMarkType::Swimming},
       {{"leisure", "water_park"},    SearchMarkType::Swimming},
+      {{"amenity", "drinking_water"},                       SearchMarkType::DrinkingWater},
+      {{"amenity", "water_point"},                          SearchMarkType::DrinkingWater},
+      {{"man_made", "water_tap"},                           SearchMarkType::DrinkingWater},
+      {{"man_made", "water_well"},                          SearchMarkType::DrinkingWater},
+      {{"natural", "spring"},                               SearchMarkType::DrinkingWater},
+      {{"natural", "hot_spring"},                           SearchMarkType::DrinkingWater},
+      {{"amenity", "water_point", "drinking_water_no"},     SearchMarkType::DrinkingWaterNo},
+      {{"man_made", "water_tap", "drinking_water_no"},      SearchMarkType::DrinkingWaterNo},
+      {{"man_made", "water_well", "drinking_water_no"},     SearchMarkType::DrinkingWaterNo},
+      {{"natural", "spring", "drinking_water_no"},          SearchMarkType::DrinkingWaterNo},
     };
 
     m_searchMarkTypes.reserve(std::size(table));