diff --git a/assets/layers/toilet/toilet.json b/assets/layers/toilet/toilet.json
index 1d2ebee008..fb0e7ce241 100644
--- a/assets/layers/toilet/toilet.json
+++ b/assets/layers/toilet/toilet.json
@@ -68,119 +68,6 @@
   ],
   "tagRenderings": [
     "images",
-    {
-      "question": {
-        "en": "Are these toilets publicly accessible?",
-        "de": "Sind diese Toiletten öffentlich zugänglich?",
-        "fr": "Ces toilettes sont-elles accessibles au public ?",
-        "nl": "Zijn deze toiletten publiek toegankelijk?",
-        "it": "Questi servizi igienici sono aperti al pubblico?",
-        "ru": "Есть ли свободный доступ к этим туалетам?"
-      },
-      "render": {
-        "en": "Access is {access}",
-        "de": "Zugang ist {access}",
-        "fr": "L'accès est {access}",
-        "nl": "Toegankelijkheid is {access}",
-        "it": "L'accesso è {access}"
-      },
-      "freeform": {
-        "key": "access",
-        "addExtraTags": [
-          "fixme=the tag access was filled out by the user and might need refinement"
-        ]
-      },
-      "mappings": [
-        {
-          "if": "access=yes",
-          "then": {
-            "en": "Public access",
-            "de": "Öffentlicher Zugang",
-            "fr": "Accès publique",
-            "nl": "Publiek toegankelijk",
-            "it": "Accesso pubblico",
-            "ru": "Свободный доступ"
-          }
-        },
-        {
-          "if": "access=customers",
-          "then": {
-            "en": "Only access to customers",
-            "de": "Nur Zugang für Kunden",
-            "fr": "Accès réservé aux clients",
-            "nl": "Enkel toegang voor klanten",
-            "it": "Accesso riservato ai clienti e alle clienti"
-          }
-        },
-        {
-          "if": "access=no",
-          "then": {
-            "en": "Not accessible",
-            "de": "Nicht zugänglich",
-            "fr": "Toilettes privées",
-            "nl": "Niet toegankelijk",
-            "ru": "Недоступно",
-            "it": "Non accessibile"
-          }
-        },
-        {
-          "if": "access=key",
-          "then": {
-            "en": "Accessible, but one has to ask a key to enter",
-            "de": "Zugänglich, aber man muss einen Schlüssel für die Eingabe verlangen",
-            "fr": "Accessible, mais vous devez demander la clé",
-            "nl": "Toegankelijk na het vragen van de sleutel",
-            "it": "Accessibile, ma occorre chiedere una chiave per accedere"
-          }
-        },
-        {
-          "if": "access=public",
-          "then": {
-            "en": "Public access",
-            "de": "Öffentlicher Zugang",
-            "fr": "Accès publique",
-            "nl": "Publiek toegankelijk",
-            "it": "Accesso pubblico",
-            "ru": "Свободный доступ"
-          },
-          "hideInAnswer": true
-        }
-      ],
-      "id": "toilet-access"
-    },
-    {
-      "id": "toilets-fee",
-      "question": {
-        "en": "Are these toilets free to use?",
-        "de": "Können diese Toiletten kostenlos benutzt werden?",
-        "fr": "Ces toilettes sont-elles payantes ?",
-        "nl": "Zijn deze toiletten gratis te gebruiken?",
-        "it": "Questi servizi igienici sono gratuiti?"
-      },
-      "mappings": [
-        {
-          "then": {
-            "en": "These are paid toilets",
-            "de": "Dies sind bezahlte Toiletten",
-            "fr": "Toilettes payantes",
-            "nl": "Men moet betalen om deze toiletten te gebruiken",
-            "ru": "Это платные туалеты",
-            "it": "Questi servizi igienici sono a pagamento"
-          },
-          "if": "fee=yes"
-        },
-        {
-          "if": "fee=no",
-          "then": {
-            "en": "Free to use",
-            "de": "Kostenlose Nutzung",
-            "fr": "Toilettes gratuites",
-            "nl": "Gratis te gebruiken",
-            "it": "Gratis"
-          }
-        }
-      ]
-    },
     {
       "question": {
         "en": "How much does one have to pay for these toilets?",
@@ -205,6 +92,33 @@
       },
       "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": {
@@ -435,7 +349,19 @@
             "de": "Für diese Toilette müssen Sie Ihr eigenes Toilettenpapier mitbringen"
           }
         }
-      ]
+      ],
+      "condition": {
+        "#": "Urinals normally don't have toilet paper",
+        "and": [
+          "toilets:position!=urinal"
+        ]
+      }
+    }
+  ],
+  "iconBadges": [
+    {
+      "if": "opening_hours~*",
+      "then": "isOpen"
     }
   ],
   "filter": [
@@ -539,11 +465,5 @@
         "point"
       ]
     }
-  ],
-  "iconBadges": [
-    {
-      "if": "opening_hours~*",
-      "then": "isOpen"
-    }
   ]
 }
\ No newline at end of file