diff --git a/assets/layers/toilet/toilet.json b/assets/layers/toilet/toilet.json
index 5fe9010f6..26fb1d19f 100644
--- a/assets/layers/toilet/toilet.json
+++ b/assets/layers/toilet/toilet.json
@@ -22,28 +22,6 @@
       "it": "Servizi igienici"
     }
   },
-  "icon": {
-    "render": "./assets/layers/toilet/toilets.svg",
-    "mappings": [
-      {
-        "if": "wheelchair=yes",
-        "then": "circle:white;./assets/layers/toilet/wheelchair.svg"
-      },
-      {
-        "if": {
-          "or": [
-            "toilets:position=urinals",
-            "toilets:position=urinal"
-          ]
-        },
-        "then": "./assets/layers/toilet/urinal.svg"
-      }
-    ]
-  },
-  "color": {
-    "render": "#0000ff"
-  },
-  "wayHandling": 1,
   "presets": [
     {
       "title": {
@@ -307,6 +285,31 @@
       },
       "id": "toilet-charge"
     },
+    {
+      "builtin": "payment-options",
+      "override": {
+        "condition": "fee=yes"
+      }
+    },
+    {
+      "id": "Opening-hours",
+      "question": {
+        "en": "When are these toilets opened?",
+        "nl": "Wanneer zijn deze toiletten open?"
+      },
+      "render": "{opening_hours_table()}",
+      "freeform": {
+        "key": "opening_hours",
+        "type": "opening_hours"
+      },
+      "mappings": [{
+        "if": "opening_hours=24/7",
+        "then": {
+          "en": "Opened 24/7",
+          "nl": "Altijd open"
+        }
+      }]
+    },
     {
       "id": "toilets-wheelchair",
       "question": {
@@ -518,7 +521,7 @@
       "id": "toilet-has-paper",
       "question": {
         "en": "Does one have to bring their own toilet paper to this toilet?",
-        "nl": "Moet je je eigen toiletpappier meenemen naar deze toilet?",
+        "nl": "Moet je je eigen toiletpapier meenemen naar deze toilet?",
         "de": "Muss man für diese Toilette sein eigenes Toilettenpapier mitbringen?"
       },
       "mappings": [
@@ -537,7 +540,11 @@
             "de": "Für diese Toilette müssen Sie Ihr eigenes Toilettenpapier mitbringen"
           }
         }
-      ]
+      ],
+      "condition": {
+        "#": "Urinals normally don't have toilet paper",
+        "and": ["toilets:position!=urinal"]
+      }
     }
   ],
   "filter": [
@@ -585,6 +592,18 @@
           }
         }
       ]
+    },
+    {
+      "id": "is_open",
+      "options": [{
+        "question": {
+          "nl": "Nu geopened",
+          "en": "Opened now"
+        },
+        "osmTags": {
+          "or": ["opening_hours=","_isOpen=yes"]
+        }
+      }]
     }
   ],
   "deletion": {
@@ -620,6 +639,10 @@
           }
         ]
       },
+      "iconBadges": [{
+        "if": "opening_hours~*",
+        "then": "isOpen"
+      }],
       "location": [
         "point"
       ]
diff --git a/langs/layers/en.json b/langs/layers/en.json
index 65872e106..3782ab5a0 100644
--- a/langs/layers/en.json
+++ b/langs/layers/en.json
@@ -3198,6 +3198,13 @@
             "question": "Free to use"
           }
         }
+      },
+      "3": {
+        "options": {
+          "0": {
+            "question": "Opened now"
+          }
+        }
       }
     },
     "name": "Toilets",
@@ -3212,6 +3219,14 @@
       }
     },
     "tagRenderings": {
+      "Opening-hours": {
+        "mappings": {
+          "0": {
+            "then": "Opened 24/7"
+          }
+        },
+        "question": "When are these toilets opened?"
+      },
       "toilet-access": {
         "mappings": {
           "0": {
diff --git a/langs/layers/nl.json b/langs/layers/nl.json
index ec21069bf..3c5280e67 100644
--- a/langs/layers/nl.json
+++ b/langs/layers/nl.json
@@ -3589,6 +3589,13 @@
             "question": "Gratis toegankelijk"
           }
         }
+      },
+      "3": {
+        "options": {
+          "0": {
+            "question": "Nu geopened"
+          }
+        }
       }
     },
     "name": "Toiletten",
@@ -3603,6 +3610,14 @@
       }
     },
     "tagRenderings": {
+      "Opening-hours": {
+        "mappings": {
+          "0": {
+            "then": "Altijd open"
+          }
+        },
+        "question": "Wanneer zijn deze toiletten open?"
+      },
       "toilet-access": {
         "mappings": {
           "0": {
@@ -3666,7 +3681,7 @@
             "then": "Je moet je eigen toiletpapier meebrengen naar deze toilet"
           }
         },
-        "question": "Moet je je eigen toiletpappier meenemen naar deze toilet?"
+        "question": "Moet je je eigen toiletpapier meenemen naar deze toilet?"
       },
       "toilets-changing-table": {
         "mappings": {