diff --git a/assets/layers/usersettings/usersettings.json b/assets/layers/usersettings/usersettings.json
index ed8d50057..099c5d149 100644
--- a/assets/layers/usersettings/usersettings.json
+++ b/assets/layers/usersettings/usersettings.json
@@ -1464,13 +1464,57 @@
       ],
       "#force-save-button": "yes"
     },
+    {
+      "id": "gps_accordeon",
+      "render": {
+        "special": {
+          "type": "group",
+          "header": "debug-gps-title",
+          "labels": "debug-gps"
+        }
+      }
+    },
+    {
+      "id": "debug-gps-title",
+      "labels": [
+        "hidden"
+      ],
+      "render": {
+        "en": "GPS and gyroscope data"
+      }
+    },
     {
       "id": "debug-gps",
+      "labels": [
+        "hidden"
+      ],
       "condition": "mapcomplete-show_debug=yes",
       "render": "{gps_all_tags()}"
     },
+    {
+      "id": "debug_accordeon",
+      "render": {
+        "special": {
+          "type": "group",
+          "header": "debug_accordeon_title",
+          "labels": "debug"
+        }
+      }
+    },
+    {
+      "id": "debug_accordeon_title",
+      "labels": [
+        "hidden"
+      ],
+      "render": {
+        "en": "Debug information"
+      }
+    },
     {
       "id": "debug",
+      "labels": [
+        "hidden"
+      ],
       "condition": "mapcomplete-show_debug=yes",
       "render": "{all_tags()}"
     }