diff --git a/assets/layers/ticket_validator/ticket_validator.json b/assets/layers/ticket_validator/ticket_validator.json
index aa6be5582..ce648d458 100644
--- a/assets/layers/ticket_validator/ticket_validator.json
+++ b/assets/layers/ticket_validator/ticket_validator.json
@@ -121,6 +121,6 @@
       ]
     }
   ],
-  "allowMove":true,
-  "deletion":true
+  "allowMove": true,
+  "deletion": true
 }
\ No newline at end of file
diff --git a/assets/themes/stations/drinking_water.svg b/assets/themes/stations/drinking_water.svg
new file mode 100644
index 000000000..9bb1e585e
--- /dev/null
+++ b/assets/themes/stations/drinking_water.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="0 0 14 14">
+  <path d="m 1,6 1.5,8 5,0 L 9,6 z M 2.18,7 7.81,7 7.44,9 2.55,9 M 4,5 C 4,3 5,2 7,2 L 8,2 8,1 7,1 C 6,1 6,0 7,0 l 3,0 c 1,0 1,1 0,1 l -1,0 0,1 4,0 0,1.5 -6,0 C 5.91526,3.49111 5.5,3.9824765 5.5,5 z"/>
+</svg>
diff --git a/assets/themes/stations/license_info.json b/assets/themes/stations/license_info.json
index 13b0032bb..afdac24d9 100644
--- a/assets/themes/stations/license_info.json
+++ b/assets/themes/stations/license_info.json
@@ -27,6 +27,17 @@
     ],
     "sources": []
   },
+  {
+    "path": "drinking_water.svg",
+    "license": "CC0",
+    "authors": [
+      "Andy Allan",
+      "Michael Glanznig"
+    ],
+    "sources": [
+      "https://github.com/gravitystorm/openstreetmap-carto/blob/master/symbols/amenity/drinking_water.svg"
+    ]
+  },
   {
     "path": "public_transport_tickets.svg",
     "license": "CC0",
diff --git a/assets/themes/stations/stations.json b/assets/themes/stations/stations.json
index 7d6605b1b..f23d773e9 100644
--- a/assets/themes/stations/stations.json
+++ b/assets/themes/stations/stations.json
@@ -232,7 +232,8 @@
         "entrance",
         "elevator",
         "waste_basket",
-        "atm"
+        "atm",
+        "clock"
       ],
       "override": {
         "minzoom": 19
@@ -249,6 +250,17 @@
         ]
       }
     },
+    {
+      "builtin": "drinking_water",
+      "override": {
+        "minzoom": 19,
+        "mapRendering": [
+          {
+            "icon": "circle:white;./assets/themes/stations/drinking_water.svg"
+          }
+        ]
+      }
+    },
     {
       "id": "departures_board",
       "name": {
@@ -291,6 +303,7 @@
         }
       },
       "tagRenderings": [
+        "images",
         {
           "id": "type",
           "question": {