diff --git a/assets/layers/shower/shower.json b/assets/layers/shower/shower.json
index 0ff035a762..f6192eea34 100644
--- a/assets/layers/shower/shower.json
+++ b/assets/layers/shower/shower.json
@@ -105,6 +105,17 @@
           }
         }
       ]
+    },
+    {
+      "builtin": "payment-options-split",
+      "override": {
+        "condition": {
+          "or": [
+            "fee=yes",
+            "hot_water=fee"
+          ]
+        }
+      }
     }
   ],
   "filter": [],
diff --git a/assets/layers/toilet/toilet.json b/assets/layers/toilet/toilet.json
index 02ae4005c4..4130253014 100644
--- a/assets/layers/toilet/toilet.json
+++ b/assets/layers/toilet/toilet.json
@@ -241,7 +241,11 @@
       "condition": "fee=yes",
       "freeform": {
         "key": "charge",
-        "type": "string"
+        "type": "string",
+        "placeholder": {
+          "en": "e.g. 0.50 EUR",
+          "nl": "bijv. 0,50 EUR"
+        }
       },
       "id": "toilet-charge"
     },
diff --git a/assets/layers/toilet_at_amenity/toilet_at_amenity.json b/assets/layers/toilet_at_amenity/toilet_at_amenity.json
index f9964e3069..b10d13f7a0 100644
--- a/assets/layers/toilet_at_amenity/toilet_at_amenity.json
+++ b/assets/layers/toilet_at_amenity/toilet_at_amenity.json
@@ -344,7 +344,7 @@
   "mapRendering": [
     {
       "icon": {
-        "render": "./assets/layers/toilet/toilets.svg",
+        "render": "circle:white;./assets/layers/toilet/toilets.svg",
         "mappings": [
           {
             "if": {