diff --git a/assets/layers/climbing_gym/climbing_gym.json b/assets/layers/climbing_gym/climbing_gym.json
index 87857221a..c3f27a1ac 100644
--- a/assets/layers/climbing_gym/climbing_gym.json
+++ b/assets/layers/climbing_gym/climbing_gym.json
@@ -87,6 +87,7 @@
     }
   ],
   "lineRendering": [],
+  "titleIcons": ["icons.defaults"],
   "presets": [
     {
       "title": {
@@ -130,6 +131,9 @@
     "payment-options",
     "opening_hours",
     "reviews",
+    "climbing.bouldering",
+    "climbing.sportclimbing",
+    "climbing.toprope",
     {
       "id": "shoe_rental",
       "question": {
@@ -464,9 +468,6 @@
         }
       ]
     },
-    "climbing.bouldering",
-    "climbing.sportclimbing",
-    "climbing.toprope",
     {
       "builtin": "climbing.average_length",
       "override": {
@@ -537,6 +538,7 @@
         }
       ]
     },
+    "shower",
     "internet",
     "internet-fee",
     "internet-ssid"
diff --git a/assets/layers/questions/questions.json b/assets/layers/questions/questions.json
index 38dfa9b3a..b2e7bedac 100644
--- a/assets/layers/questions/questions.json
+++ b/assets/layers/questions/questions.json
@@ -2808,6 +2808,43 @@
           }
         }
       ]
+    },
+    {
+      "id": "shower",
+      "question": {
+        "en": "Does this facility offer showers?"
+      },
+      "mappings": [
+        {
+          "if": "shower=hot",
+          "icon": "./assets/layers/shower/shower.svg",
+          "then": {
+            "en": "This facility does have showers with warm water"
+          }
+        },
+        {
+          "if": "shower=cold",
+          "icon": "./assets/layers/shower/shower.svg",
+          "then": {
+            "en": "This facility does have showers, but the water is not heated"
+          }
+        },
+        {
+          "if": "shower=yes",
+          "icon": "./assets/layers/shower/shower.svg",
+          "then": {
+            "en": "This facility does have showers"
+          }
+        },
+
+        {
+          "if": "shower=no",
+          "icon": "invalid;./assets/layers/shower/shower.svg",
+          "then": {
+            "en": "This facility does not offer a shower"
+          }
+        }
+      ]
     }
   ]
 }