diff --git a/assets/layers/drinking_water/drinking_water.json b/assets/layers/drinking_water/drinking_water.json
index ff9bdb5b9..f877bfa04 100644
--- a/assets/layers/drinking_water/drinking_water.json
+++ b/assets/layers/drinking_water/drinking_water.json
@@ -62,7 +62,11 @@
       "cs": "Pitná voda"
     }
   },
-  "titleIcons": ["icons.defaults", "auto:type", "auto:seasonal"],
+  "titleIcons": [
+    "icons.defaults",
+    "auto:type",
+    "auto:seasonal"
+  ],
   "pointRendering": [
     {
       "iconBadges": [
@@ -75,6 +79,10 @@
             ]
           },
           "then": "close:#c33"
+        },
+        {
+          "if": "tourism=artwork",
+          "then": "circle:white;./assets/layers/artwork/artwork.svg"
         }
       ],
       "iconSize": "40,40",
@@ -150,7 +158,10 @@
       "mappings": [
         {
           "if": "operational_status=",
-          "addExtraTags": ["disused:amenity=","amenity=drinking_water"],
+          "addExtraTags": [
+            "disused:amenity=",
+            "amenity=drinking_water"
+          ],
           "then": {
             "en": "This drinking water works",
             "nl": "Deze drinkwaterfontein werkt",
@@ -297,7 +308,7 @@
         {
           "if": "fee=yes",
           "then": {
-            "en":"One needs to pay to use this drinking water point"
+            "en": "One needs to pay to use this drinking water point"
           }
         }
       ]
@@ -310,71 +321,123 @@
       "mappings": [
         {
           "if": "seasonal=no",
-          "then":{
-            "en":"This drinking water point is available all around the year"
+          "then": {
+            "en": "This drinking water point is available all around the year"
           }
         },
         {
           "if": "seasonal=summer",
-          "then":{
-            "en":"This drinking water point is only available in summer"
+          "then": {
+            "en": "This drinking water point is only available in summer"
           }
         },
         {
           "if": "seasonal=spring;summer;autumn",
           "icon": "./assets/layers/drinking_water/no_winter.svg",
-          "then":{
-            "en":"This drinking water point is closed during the winter"
+          "then": {
+            "en": "This drinking water point is closed during the winter"
           }
         }
       ]
     },
-    {"builtin":["opening_hours_24_7"],
+    {
+      "builtin": [
+        "opening_hours_24_7"
+      ],
       "override": {
-        "questionHint":{
-          "en":"These are the opening hours if the drinking water fountain is operational."
+        "questionHint": {
+          "en": "These are the opening hours if the drinking water fountain is operational."
         },
-        "+mappings":[
+        "+mappings": [
           {
-            "if":{
+            "if": {
               "and": [
                 "seasonal!=no",
-                {"or":[
-                  {
-                    "and":[
-                      "seasonal!~.*winter.*",
-                      "_now:date~....-(12|01|02)-.."
-                    ]
-                  },
-                  {
-                    "and":[
-                      "seasonal!~.*spring.*",
-                      "_now:date~....-(03|04|05)-.."
-                    ]
-                  },
-                  {
-                    "and":[
-                      "seasonal!~.*summer.*",
-                      "_now:date~....-(06|07|08)-.."
-                    ]
-                  },
-                  {
-                    "and":[
-                      "seasonal!~.*autumn.*",
-                      "_now:date~....-(09|10|11)-.."
-                    ]
-                  }
-                ]}
+                {
+                  "or": [
+                    {
+                      "and": [
+                        "seasonal!~.*winter.*",
+                        "_now:date~....-(12|01|02)-.."
+                      ]
+                    },
+                    {
+                      "and": [
+                        "seasonal!~.*spring.*",
+                        "_now:date~....-(03|04|05)-.."
+                      ]
+                    },
+                    {
+                      "and": [
+                        "seasonal!~.*summer.*",
+                        "_now:date~....-(06|07|08)-.."
+                      ]
+                    },
+                    {
+                      "and": [
+                        "seasonal!~.*autumn.*",
+                        "_now:date~....-(09|10|11)-.."
+                      ]
+                    }
+                  ]
+                }
               ]
             },
-            "then":{
-              "en": "This drinking water fountain is closed this season."
+            "then": {
+              "en": "This drinking water fountain is closed this season. As such, the opening hours are not shown."
             },
-            "hideInAnswer":true
+            "hideInAnswer": true
           }
         ]
       }
     },
+    {
+      "id": "bench-artwork",
+      "question": {
+        "en": "Does this drinking water fountain have an artistic element?",
+        "nl": "Heeft dit drinkwaterpunt een geintegreerd kunstwerk?"
+      },
+      "mappings": [
+        {
+          "if": "tourism=artwork",
+          "addExtraTags": [
+            "not:tourism:artwork="
+          ],
+          "then": {
+            "en": "This drinking water point has an integrated artwork",
+            "nl": "Dit drinkwaterpunt heeft een geintegreerd kunstwerk"
+          }
+        },
+        {
+          "if": "not:tourism:artwork=yes",
+          "then": {
+            "en": "This drinking water point does not have an integrated artwork",
+            "nl": "Dit drinkwaterpunt heeft geen geïntegreerd kunstwerk"
+          },
+          "addExtraTags": [
+            "tourism="
+          ]
+        },
+        {
+          "if": "tourism=",
+          "then": {
+            "en": "This drinking water point <span class=\"subtle\">probably</span> doesn't have an integrated artwork",
+            "nl": "Dit drinkwaterpunt heeft <span class=\"subtle\">waarschijnlijk</span> geen geïntegreerd kunstwerk"
+          },
+          "hideInAnswer": true
+        }
+      ],
+      "questionHint": {
+        "en": "E.g. it has an integrated statue or other non-trivial, creative work",
+        "nl": "Bijvoorbeeld een standbeeld of ander, niet-triviaal kunstwerk"
+      }
+    },
+    {
+      "builtin": "artwork.*artwork-question",
+      "override": {
+        "condition": "tourism=artwork"
+      }
+    },
     {
       "id": "render-closest-drinking-water",
       "render": {
@@ -390,7 +453,6 @@
       },
       "condition": "_closest_other_drinking_water_id~*"
     }
-    
   ],
   "deletion": {
     "softDeletionTags": {
@@ -443,7 +505,7 @@
           ]
         },
         "then": {
-          "en":"This is a historic, manual water pump where no drinking water can be found"
+          "en": "This is a historic, manual water pump where no drinking water can be found"
         }
       }
     ]