diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/preferences/AnkiquestSettingsFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/preferences/AnkiquestSettingsFragment.kt
index 98b7051d7f83..9130031dc82f 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/preferences/AnkiquestSettingsFragment.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/preferences/AnkiquestSettingsFragment.kt
@@ -38,7 +38,7 @@ import okhttp3.HttpUrl.Companion.toHttpUrl
 import org.json.JSONObject
 import java.util.Date
 
-class AnkiquestSettingsFragment : SettingsFragment() {
+open class AnkiquestSettingsFragment : SettingsFragment() {
     override val preferenceResource = R.xml.preferences_ankiquest
     override val analyticsScreenNameConstant = "prefs.ankiquest"
 
@@ -75,37 +75,14 @@ class AnkiquestSettingsFragment : SettingsFragment() {
 
     override fun initSubscreen() {
         refreshServerSettings.clear()
+        bindDashboard(R.string.ankiquest_dashboard_key)
+    }
+
+    protected fun bindAccount() {
         requirePreference<VersatileTextPreference>(R.string.ankiquest_url_key).continuousValidator =
             VersatileTextPreference.Validator { value ->
                 if (value.isNotEmpty()) value.toHttpUrl()
             }
-        requirePreference<SwitchPreferenceCompat>(R.string.ankiquest_notify_rank_key).setOnPreferenceChangeListener { _, enabled ->
-            if (enabled == true) askForNotifications()
-            true
-        }
-        requirePreference<ListPreference>(R.string.ankiquest_streak_hours_key).setOnPreferenceChangeListener { _, hours ->
-            if (hours != "0") askForNotifications()
-            true
-        }
-        bindServerToggle(
-            R.string.ankiquest_nudges_key,
-            read = { Ankiquest.nudgesEnabled() },
-            save = { Ankiquest.setNudges(it).getBoolean("nudges") },
-            notify = true,
-        )
-        bindServerToggle(
-            R.string.ankiquest_celebrations_key,
-            read = { Ankiquest.celebrationsEnabled() },
-            save = { Ankiquest.setCelebrations(it).optBoolean("celebrations", it) },
-            notify = true,
-        )
-        bindServerToggle(
-            R.string.ankiquest_streak_protection_key,
-            read = { Ankiquest.streakProtectionEnabled() },
-            save = { Ankiquest.setStreakProtection(it) },
-        )
-        bindDashboard(R.string.ankiquest_dashboard_key)
-        bindDashboard(R.string.ankiquest_community_reminders_key, community = true)
         requirePreference<Preference>(R.string.ankiquest_avatar_key).setOnPreferenceClickListener {
             pictureAction {
                 val account = checkNotNull(AnkiquestAvatars.account()) { getString(R.string.ankiquest_nudges_unavailable) }
@@ -142,14 +119,48 @@ class AnkiquestSettingsFragment : SettingsFragment() {
             }
             true
         }
+        bindAction(R.string.ankiquest_test_key) { Ankiquest.runFromSettings(requireContext(), uploadAll = false) }
+    }
+
+    protected fun bindStudy() {
+        bindServerToggle(
+            R.string.ankiquest_streak_protection_key,
+            read = { Ankiquest.streakProtectionEnabled() },
+            save = { Ankiquest.setStreakProtection(it) },
+        )
+    }
+
+    protected fun bindNotifications() {
+        requirePreference<SwitchPreferenceCompat>(R.string.ankiquest_notify_rank_key).setOnPreferenceChangeListener { _, enabled ->
+            if (enabled == true) askForNotifications()
+            true
+        }
+        requirePreference<ListPreference>(R.string.ankiquest_streak_hours_key).setOnPreferenceChangeListener { _, hours ->
+            if (hours != "0") askForNotifications()
+            true
+        }
+        bindServerToggle(
+            R.string.ankiquest_nudges_key,
+            read = { Ankiquest.nudgesEnabled() },
+            save = { Ankiquest.setNudges(it).getBoolean("nudges") },
+            notify = true,
+        )
+        bindServerToggle(
+            R.string.ankiquest_celebrations_key,
+            read = { Ankiquest.celebrationsEnabled() },
+            save = { Ankiquest.setCelebrations(it).optBoolean("celebrations", it) },
+            notify = true,
+        )
+        bindDashboard(R.string.ankiquest_community_reminders_key, community = true)
         bindAlertSettings(R.string.ankiquest_message_alerts_key, nudge = false)
         bindAlertSettings(R.string.ankiquest_nudge_alerts_key, nudge = true)
         requirePreference<Preference>(R.string.ankiquest_health_key).setOnPreferenceClickListener {
             showNotificationHealth()
             true
         }
-        bindAction(R.string.ankiquest_test_key) { Ankiquest.runFromSettings(requireContext(), uploadAll = false) }
-        bindAction(R.string.ankiquest_upload_all_key) { Ankiquest.runFromSettings(requireContext(), uploadAll = true) }
+    }
+
+    protected fun bindSharing() {
         bindAction(R.string.ankiquest_deck_notifications_key) {
             try {
                 showDeckNotifications(Ankiquest.deckNotificationSettings())
@@ -158,6 +169,10 @@ class AnkiquestSettingsFragment : SettingsFragment() {
                 getString(R.string.ankiquest_check_failed, e.message ?: e.javaClass.simpleName)
             }
         }
+    }
+
+    protected fun bindMaintenance() {
+        bindAction(R.string.ankiquest_upload_all_key) { Ankiquest.runFromSettings(requireContext(), uploadAll = true) }
         requirePreference<Preference>(R.string.ankiquest_check_updates_key).summary =
             getString(
                 R.string.ankiquest_check_updates_summary,
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/preferences/AnkiquestSettingsSections.kt b/AnkiDroid/src/main/java/com/ichi2/anki/preferences/AnkiquestSettingsSections.kt
new file mode 100644
index 000000000000..1e3fe63eac2d
--- /dev/null
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/preferences/AnkiquestSettingsSections.kt
@@ -0,0 +1,40 @@
+// SPDX-License-Identifier: AGPL-3.0-only
+
+package com.ichi2.anki.preferences
+
+import com.ichi2.anki.R
+
+class AnkiquestAccountSettingsFragment : AnkiquestSettingsFragment() {
+    override val preferenceResource = R.xml.preferences_ankiquest_account
+    override val analyticsScreenNameConstant = "prefs.ankiquest.account"
+
+    override fun initSubscreen() = bindAccount()
+}
+
+class AnkiquestStudySettingsFragment : AnkiquestSettingsFragment() {
+    override val preferenceResource = R.xml.preferences_ankiquest_study
+    override val analyticsScreenNameConstant = "prefs.ankiquest.study"
+
+    override fun initSubscreen() = bindStudy()
+}
+
+class AnkiquestNotificationsSettingsFragment : AnkiquestSettingsFragment() {
+    override val preferenceResource = R.xml.preferences_ankiquest_notifications
+    override val analyticsScreenNameConstant = "prefs.ankiquest.notifications"
+
+    override fun initSubscreen() = bindNotifications()
+}
+
+class AnkiquestSharingSettingsFragment : AnkiquestSettingsFragment() {
+    override val preferenceResource = R.xml.preferences_ankiquest_sharing
+    override val analyticsScreenNameConstant = "prefs.ankiquest.sharing"
+
+    override fun initSubscreen() = bindSharing()
+}
+
+class AnkiquestMaintenanceSettingsFragment : AnkiquestSettingsFragment() {
+    override val preferenceResource = R.xml.preferences_ankiquest_maintenance
+    override val analyticsScreenNameConstant = "prefs.ankiquest.maintenance"
+
+    override fun initSubscreen() = bindMaintenance()
+}
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/preferences/Preferences.kt b/AnkiDroid/src/main/java/com/ichi2/anki/preferences/Preferences.kt
index 39a6c38f4738..da3c6ca49f36 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/preferences/Preferences.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/preferences/Preferences.kt
@@ -311,6 +311,11 @@ fun getFragmentFromXmlRes(
         R.xml.preferences_backup_limits -> BackupLimitsSettingsFragment()
         R.xml.preferences_custom_sync_server -> CustomSyncServerSettingsFragment()
         R.xml.preferences_ankiquest -> AnkiquestSettingsFragment()
+        R.xml.preferences_ankiquest_account -> AnkiquestAccountSettingsFragment()
+        R.xml.preferences_ankiquest_study -> AnkiquestStudySettingsFragment()
+        R.xml.preferences_ankiquest_notifications -> AnkiquestNotificationsSettingsFragment()
+        R.xml.preferences_ankiquest_sharing -> AnkiquestSharingSettingsFragment()
+        R.xml.preferences_ankiquest_maintenance -> AnkiquestMaintenanceSettingsFragment()
         R.xml.preferences_ankiquest_subscriptions -> AnkiquestSubscriptionsFragment()
         R.xml.preferences_notifications -> NotificationsSettingsFragment()
         R.xml.preferences_appearance -> AppearanceSettingsFragment()
diff --git a/AnkiDroid/src/main/res/values-de/ankiquest.xml b/AnkiDroid/src/main/res/values-de/ankiquest.xml
index 9d6ff39ef845..b00a8db5ab3b 100644
--- a/AnkiDroid/src/main/res/values-de/ankiquest.xml
+++ b/AnkiDroid/src/main/res/values-de/ankiquest.xml
@@ -1,6 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- SPDX-License-Identifier: AGPL-3.0-only -->
 <resources>
+    <string name="ankiquest_account_title">Konto und Verbindung</string>
+    <string name="ankiquest_account_summary">Server, Spieler, Token und Profilbild</string>
+    <string name="ankiquest_study_title">Lernen und Serien</string>
+    <string name="ankiquest_study_summary">Tägliches Lernen und Serienschutz</string>
+    <string name="ankiquest_notifications_title">Erinnerungen und Hinweise</string>
+    <string name="ankiquest_notifications_summary">Erinnerungen, Hinweise und Alarme</string>
+    <string name="ankiquest_sharing_title">Freunde und Teilen</string>
+    <string name="ankiquest_sharing_summary">Deckmeldungen und Abonnements</string>
+    <string name="ankiquest_maintenance_title">App und Daten</string>
+    <string name="ankiquest_maintenance_summary">Uploads und App-Updates</string>
+    <string name="ankiquest_notification_events_title">Wann benachrichtigen</string>
+    <string name="ankiquest_notification_delivery_title">Benachrichtigungseinstellungen</string>
     <string name="ankiquest_dashboard_title">Rangliste</string>
     <string name="ankiquest_community_reminders_title">Gemeinschaftserinnerungen</string>
     <string name="ankiquest_community_reminders_summary">Wähle Erinnerungen für Community-Events</string>
diff --git a/AnkiDroid/src/main/res/values-es/ankiquest.xml b/AnkiDroid/src/main/res/values-es/ankiquest.xml
index e841f9d8ea51..0e5230cc384f 100644
--- a/AnkiDroid/src/main/res/values-es/ankiquest.xml
+++ b/AnkiDroid/src/main/res/values-es/ankiquest.xml
@@ -1,6 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- SPDX-License-Identifier: AGPL-3.0-only -->
 <resources>
+    <string name="ankiquest_account_title">Cuenta y conexión</string>
+    <string name="ankiquest_account_summary">Servidor, jugador, token y foto de perfil</string>
+    <string name="ankiquest_study_title">Estudio y rachas</string>
+    <string name="ankiquest_study_summary">Opciones de estudio diario y protección de racha</string>
+    <string name="ankiquest_notifications_title">Recordatorios y alertas</string>
+    <string name="ankiquest_notifications_summary">Recordatorios, avisos y alertas</string>
+    <string name="ankiquest_sharing_title">Amigos y contenido compartido</string>
+    <string name="ankiquest_sharing_summary">Avisos de mazos y suscripciones</string>
+    <string name="ankiquest_maintenance_title">Aplicación y datos</string>
+    <string name="ankiquest_maintenance_summary">Subida de repasos y actualizaciones</string>
+    <string name="ankiquest_notification_events_title">Cuándo avisar</string>
+    <string name="ankiquest_notification_delivery_title">Ajustes de alertas</string>
     <string name="ankiquest_dashboard_title">Clasificación</string>
     <string name="ankiquest_community_reminders_title">Recordatorios de la comunidad</string>
     <string name="ankiquest_community_reminders_summary">Elige recordatorios de eventos de la comunidad</string>
diff --git a/AnkiDroid/src/main/res/values-fr/ankiquest.xml b/AnkiDroid/src/main/res/values-fr/ankiquest.xml
index ecae0564f09b..8db42da5384b 100644
--- a/AnkiDroid/src/main/res/values-fr/ankiquest.xml
+++ b/AnkiDroid/src/main/res/values-fr/ankiquest.xml
@@ -1,6 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- SPDX-License-Identifier: AGPL-3.0-only -->
 <resources>
+    <string name="ankiquest_account_title">Compte et connexion</string>
+    <string name="ankiquest_account_summary">Serveur, joueur, jeton et photo de profil</string>
+    <string name="ankiquest_study_title">Étude et séries</string>
+    <string name="ankiquest_study_summary">Étude quotidienne et protection des séries</string>
+    <string name="ankiquest_notifications_title">Rappels et alertes</string>
+    <string name="ankiquest_notifications_summary">Rappels, encouragements et alertes</string>
+    <string name="ankiquest_sharing_title">Amis et partage</string>
+    <string name="ankiquest_sharing_summary">Actualités des paquets et abonnements</string>
+    <string name="ankiquest_maintenance_title">Application et données</string>
+    <string name="ankiquest_maintenance_summary">Envois de révisions et mises à jour</string>
+    <string name="ankiquest_notification_events_title">Quand notifier</string>
+    <string name="ankiquest_notification_delivery_title">Paramètres des alertes</string>
     <string name="ankiquest_dashboard_title">Classement</string>
     <string name="ankiquest_community_reminders_title">Rappels communautaires</string>
     <string name="ankiquest_community_reminders_summary">Choisir des rappels pour les événements communautaires</string>
diff --git a/AnkiDroid/src/main/res/values-pt/ankiquest.xml b/AnkiDroid/src/main/res/values-pt/ankiquest.xml
index aa1265a1d3cb..82caf94555b9 100644
--- a/AnkiDroid/src/main/res/values-pt/ankiquest.xml
+++ b/AnkiDroid/src/main/res/values-pt/ankiquest.xml
@@ -1,6 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- SPDX-License-Identifier: AGPL-3.0-only -->
 <resources>
+    <string name="ankiquest_account_title">Conta e conexão</string>
+    <string name="ankiquest_account_summary">Servidor, jogador, token e foto de perfil</string>
+    <string name="ankiquest_study_title">Estudo e sequências</string>
+    <string name="ankiquest_study_summary">Estudo diário e proteção de sequências</string>
+    <string name="ankiquest_notifications_title">Lembretes e alertas</string>
+    <string name="ankiquest_notifications_summary">Lembretes, incentivos e alertas</string>
+    <string name="ankiquest_sharing_title">Amigos e partilha</string>
+    <string name="ankiquest_sharing_summary">Avisos de baralhos e subscrições</string>
+    <string name="ankiquest_maintenance_title">Aplicação e dados</string>
+    <string name="ankiquest_maintenance_summary">Envio de revisões e atualizações</string>
+    <string name="ankiquest_notification_events_title">Quando notificar</string>
+    <string name="ankiquest_notification_delivery_title">Definições dos alertas</string>
     <string name="ankiquest_dashboard_title">Classificação</string>
     <string name="ankiquest_community_reminders_title">Avisos comunitários</string>
     <string name="ankiquest_community_reminders_summary">Escolha lembretes para eventos comunitários</string>
diff --git a/AnkiDroid/src/main/res/values/ankiquest.xml b/AnkiDroid/src/main/res/values/ankiquest.xml
index 3a29171d42c5..4b12f153a197 100644
--- a/AnkiDroid/src/main/res/values/ankiquest.xml
+++ b/AnkiDroid/src/main/res/values/ankiquest.xml
@@ -1,6 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- SPDX-License-Identifier: AGPL-3.0-only -->
 <resources xmlns:tools="http://schemas.android.com/tools">
+    <string name="ankiquest_account_screen_key" translatable="false">ankiquestAccountScreen</string>
+    <string name="ankiquest_account_title">Account &amp; connection</string>
+    <string name="ankiquest_account_summary">Server, player, token and profile picture</string>
+    <string name="ankiquest_study_screen_key" translatable="false">ankiquestStudyScreen</string>
+    <string name="ankiquest_study_title">Study &amp; streaks</string>
+    <string name="ankiquest_study_summary">Daily study options and streak protection</string>
+    <string name="ankiquest_notifications_screen_key" translatable="false">ankiquestNotificationsScreen</string>
+    <string name="ankiquest_notifications_title">Reminders &amp; alerts</string>
+    <string name="ankiquest_notifications_summary">Reminders, nudges and alert delivery</string>
+    <string name="ankiquest_sharing_screen_key" translatable="false">ankiquestSharingScreen</string>
+    <string name="ankiquest_sharing_title">Friends &amp; sharing</string>
+    <string name="ankiquest_sharing_summary">Deck updates and subscriptions</string>
+    <string name="ankiquest_maintenance_screen_key" translatable="false">ankiquestMaintenanceScreen</string>
+    <string name="ankiquest_maintenance_title">App &amp; data</string>
+    <string name="ankiquest_maintenance_summary">Review uploads and app updates</string>
+    <string name="ankiquest_notification_events_title">When to notify</string>
+    <string name="ankiquest_notification_delivery_title">Alert settings</string>
     <string name="ankiquest_dashboard_key" translatable="false">ankiquestDashboard</string>
     <string name="ankiquest_dashboard_title" maxLength="41">Leaderboard</string>
     <string name="ankiquest_community_reminders_key" translatable="false">ankiquestCommunityReminders</string>
diff --git a/AnkiDroid/src/main/res/xml/preferences_ankiquest.xml b/AnkiDroid/src/main/res/xml/preferences_ankiquest.xml
index 456bdb861e95..fc14bce3f319 100644
--- a/AnkiDroid/src/main/res/xml/preferences_ankiquest.xml
+++ b/AnkiDroid/src/main/res/xml/preferences_ankiquest.xml
@@ -10,107 +10,34 @@
         android:title="@string/ankiquest_dashboard_title"
         android:icon="@drawable/aki_face"
         android:summary="@string/aki_settings_summary" />
-    <com.ichi2.preferences.VersatileTextPreference
-        android:key="@string/ankiquest_url_key"
-        android:title="@string/ankiquest_url_title"
-        android:inputType="textUri"
-        app:dialogHint="@string/dialog_hint_url"
-        app:useSimpleSummaryProvider="true" />
-    <com.ichi2.preferences.VersatileTextPreference
-        android:key="@string/ankiquest_user_key"
-        android:title="@string/ankiquest_user_title"
-        android:inputType="text"
-        app:useSimpleSummaryProvider="true" />
-    <com.ichi2.preferences.VersatileTextPreference
-        android:key="@string/ankiquest_token_key"
-        android:title="@string/ankiquest_token_title"
-        android:inputType="textPassword" />
     <Preference
-        android:key="@string/ankiquest_avatar_key"
+        android:key="@string/ankiquest_account_screen_key"
+        android:fragment="com.ichi2.anki.preferences.AnkiquestAccountSettingsFragment"
         android:persistent="false"
-        android:title="@string/ankiquest_avatar_title"
-        android:summary="@string/ankiquest_avatar_summary" />
-    <SwitchPreferenceCompat
-        android:defaultValue="false"
-        android:key="@string/ankiquest_open_today_key"
-        android:summary="@string/ankiquest_open_today_summary"
-        android:title="@string/ankiquest_open_today_title" />
-    <SwitchPreferenceCompat
-        android:defaultValue="true"
-        android:key="@string/ankiquest_summary_preference_key"
-        android:summary="@string/ankiquest_summary_preference_summary"
-        android:title="@string/ankiquest_summary_preference_title" />
-    <SwitchPreferenceCompat
-        android:defaultValue="true"
-        android:key="@string/ankiquest_notify_rank_key"
-        android:summary="@string/ankiquest_notify_rank_summary"
-        android:title="@string/ankiquest_notify_rank_title" />
-    <ListPreference
-        android:defaultValue="2"
-        android:entries="@array/ankiquest_streak_hours_entries"
-        android:entryValues="@array/ankiquest_streak_hours_values"
-        android:key="@string/ankiquest_streak_hours_key"
-        android:title="@string/ankiquest_streak_hours_title"
-        app:useSimpleSummaryProvider="true" />
-    <SwitchPreferenceCompat
-        android:key="@string/ankiquest_nudges_key"
-        android:summary="@string/ankiquest_nudges_summary"
-        android:title="@string/ankiquest_nudges_title" />
-    <SwitchPreferenceCompat
-        android:key="@string/ankiquest_celebrations_key"
-        android:summary="@string/ankiquest_celebrations_summary"
-        android:title="@string/ankiquest_celebrations_title" />
-    <SwitchPreferenceCompat
-        android:key="@string/ankiquest_streak_protection_key"
-        android:persistent="false"
-        android:summary="@string/ankiquest_streak_protection_summary"
-        android:title="@string/ankiquest_streak_protection_title" />
-    <Preference
-        android:key="@string/ankiquest_community_reminders_key"
-        android:persistent="false"
-        android:summary="@string/ankiquest_community_reminders_summary"
-        android:title="@string/ankiquest_community_reminders_title" />
+        android:title="@string/ankiquest_account_title"
+        android:summary="@string/ankiquest_account_summary" />
     <Preference
-        android:key="@string/ankiquest_message_alerts_key"
+        android:key="@string/ankiquest_study_screen_key"
+        android:fragment="com.ichi2.anki.preferences.AnkiquestStudySettingsFragment"
         android:persistent="false"
-        android:title="@string/ankiquest_message_alerts_title"
-        android:summary="@string/ankiquest_alerts_summary" />
+        android:title="@string/ankiquest_study_title"
+        android:summary="@string/ankiquest_study_summary" />
     <Preference
-        android:key="@string/ankiquest_nudge_alerts_key"
+        android:key="@string/ankiquest_notifications_screen_key"
+        android:fragment="com.ichi2.anki.preferences.AnkiquestNotificationsSettingsFragment"
         android:persistent="false"
-        android:title="@string/ankiquest_nudge_alerts_title"
-        android:summary="@string/ankiquest_alerts_summary" />
+        android:title="@string/ankiquest_notifications_title"
+        android:summary="@string/ankiquest_notifications_summary" />
     <Preference
-        android:key="@string/ankiquest_health_key"
+        android:key="@string/ankiquest_sharing_screen_key"
+        android:fragment="com.ichi2.anki.preferences.AnkiquestSharingSettingsFragment"
         android:persistent="false"
-        android:title="@string/ankiquest_health_title"
-        android:summary="@string/ankiquest_health_summary" />
-    <Preference
-        android:key="@string/ankiquest_deck_notifications_key"
-        android:title="@string/ankiquest_deck_notifications_title"
-        android:summary="@string/ankiquest_deck_notifications_summary" />
+        android:title="@string/ankiquest_sharing_title"
+        android:summary="@string/ankiquest_sharing_summary" />
     <Preference
-        android:key="@string/ankiquest_subscriptions_key"
-        android:fragment="com.ichi2.anki.preferences.AnkiquestSubscriptionsFragment"
+        android:key="@string/ankiquest_maintenance_screen_key"
+        android:fragment="com.ichi2.anki.preferences.AnkiquestMaintenanceSettingsFragment"
         android:persistent="false"
-        android:title="@string/ankiquest_subscriptions_title"
-        android:summary="@string/ankiquest_subscriptions_summary" />
-    <Preference
-        android:key="@string/ankiquest_test_key"
-        android:title="@string/ankiquest_test_title"
-        android:summary="@string/ankiquest_test_summary" />
-    <Preference
-        android:key="@string/ankiquest_upload_all_key"
-        android:title="@string/ankiquest_upload_all_title"
-        android:summary="@string/ankiquest_upload_all_summary" />
-    <ListPreference
-        android:defaultValue="stable"
-        android:entries="@array/ankiquest_update_channel_entries"
-        android:entryValues="@array/ankiquest_update_channel_values"
-        android:key="@string/ankiquest_update_channel_key"
-        android:title="@string/ankiquest_update_channel_title"
-        app:useSimpleSummaryProvider="true" />
-    <Preference
-        android:key="@string/ankiquest_check_updates_key"
-        android:title="@string/ankiquest_check_updates_title" />
+        android:title="@string/ankiquest_maintenance_title"
+        android:summary="@string/ankiquest_maintenance_summary" />
 </PreferenceScreen>
diff --git a/AnkiDroid/src/main/res/xml/preferences_ankiquest_account.xml b/AnkiDroid/src/main/res/xml/preferences_ankiquest_account.xml
new file mode 100644
index 000000000000..b477c45a25a3
--- /dev/null
+++ b/AnkiDroid/src/main/res/xml/preferences_ankiquest_account.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- SPDX-License-Identifier: AGPL-3.0-only -->
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:title="@string/ankiquest_account_title"
+    android:key="@string/ankiquest_account_screen_key">
+    <com.ichi2.preferences.VersatileTextPreference
+        android:key="@string/ankiquest_url_key"
+        android:title="@string/ankiquest_url_title"
+        android:inputType="textUri"
+        app:dialogHint="@string/dialog_hint_url"
+        app:useSimpleSummaryProvider="true" />
+    <com.ichi2.preferences.VersatileTextPreference
+        android:key="@string/ankiquest_user_key"
+        android:title="@string/ankiquest_user_title"
+        android:inputType="text"
+        app:useSimpleSummaryProvider="true" />
+    <com.ichi2.preferences.VersatileTextPreference
+        android:key="@string/ankiquest_token_key"
+        android:title="@string/ankiquest_token_title"
+        android:inputType="textPassword" />
+    <Preference
+        android:key="@string/ankiquest_avatar_key"
+        android:persistent="false"
+        android:title="@string/ankiquest_avatar_title"
+        android:summary="@string/ankiquest_avatar_summary" />
+    <Preference
+        android:key="@string/ankiquest_test_key"
+        android:title="@string/ankiquest_test_title"
+        android:summary="@string/ankiquest_test_summary" />
+</PreferenceScreen>
diff --git a/AnkiDroid/src/main/res/xml/preferences_ankiquest_maintenance.xml b/AnkiDroid/src/main/res/xml/preferences_ankiquest_maintenance.xml
new file mode 100644
index 000000000000..13ddd84cb432
--- /dev/null
+++ b/AnkiDroid/src/main/res/xml/preferences_ankiquest_maintenance.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- SPDX-License-Identifier: AGPL-3.0-only -->
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:title="@string/ankiquest_maintenance_title"
+    android:key="@string/ankiquest_maintenance_screen_key">
+    <Preference
+        android:key="@string/ankiquest_upload_all_key"
+        android:title="@string/ankiquest_upload_all_title"
+        android:summary="@string/ankiquest_upload_all_summary" />
+    <ListPreference
+        android:defaultValue="stable"
+        android:entries="@array/ankiquest_update_channel_entries"
+        android:entryValues="@array/ankiquest_update_channel_values"
+        android:key="@string/ankiquest_update_channel_key"
+        android:title="@string/ankiquest_update_channel_title"
+        app:useSimpleSummaryProvider="true" />
+    <Preference
+        android:key="@string/ankiquest_check_updates_key"
+        android:title="@string/ankiquest_check_updates_title" />
+</PreferenceScreen>
diff --git a/AnkiDroid/src/main/res/xml/preferences_ankiquest_notifications.xml b/AnkiDroid/src/main/res/xml/preferences_ankiquest_notifications.xml
new file mode 100644
index 000000000000..e75421f4c0f6
--- /dev/null
+++ b/AnkiDroid/src/main/res/xml/preferences_ankiquest_notifications.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- SPDX-License-Identifier: AGPL-3.0-only -->
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:title="@string/ankiquest_notifications_title"
+    android:key="@string/ankiquest_notifications_screen_key">
+    <PreferenceCategory android:title="@string/ankiquest_notification_events_title">
+        <SwitchPreferenceCompat
+            android:defaultValue="true"
+            android:key="@string/ankiquest_notify_rank_key"
+            android:summary="@string/ankiquest_notify_rank_summary"
+            android:title="@string/ankiquest_notify_rank_title" />
+        <ListPreference
+            android:defaultValue="2"
+            android:entries="@array/ankiquest_streak_hours_entries"
+            android:entryValues="@array/ankiquest_streak_hours_values"
+            android:key="@string/ankiquest_streak_hours_key"
+            android:title="@string/ankiquest_streak_hours_title"
+            app:useSimpleSummaryProvider="true" />
+        <SwitchPreferenceCompat
+            android:key="@string/ankiquest_nudges_key"
+            android:summary="@string/ankiquest_nudges_summary"
+            android:title="@string/ankiquest_nudges_title" />
+        <SwitchPreferenceCompat
+            android:key="@string/ankiquest_celebrations_key"
+            android:summary="@string/ankiquest_celebrations_summary"
+            android:title="@string/ankiquest_celebrations_title" />
+        <Preference
+            android:key="@string/ankiquest_community_reminders_key"
+            android:persistent="false"
+            android:summary="@string/ankiquest_community_reminders_summary"
+            android:title="@string/ankiquest_community_reminders_title" />
+    </PreferenceCategory>
+    <PreferenceCategory android:title="@string/ankiquest_notification_delivery_title">
+        <Preference
+            android:key="@string/ankiquest_message_alerts_key"
+            android:persistent="false"
+            android:title="@string/ankiquest_message_alerts_title"
+            android:summary="@string/ankiquest_alerts_summary" />
+        <Preference
+            android:key="@string/ankiquest_nudge_alerts_key"
+            android:persistent="false"
+            android:title="@string/ankiquest_nudge_alerts_title"
+            android:summary="@string/ankiquest_alerts_summary" />
+        <Preference
+            android:key="@string/ankiquest_health_key"
+            android:persistent="false"
+            android:title="@string/ankiquest_health_title"
+            android:summary="@string/ankiquest_health_summary" />
+    </PreferenceCategory>
+</PreferenceScreen>
diff --git a/AnkiDroid/src/main/res/xml/preferences_ankiquest_sharing.xml b/AnkiDroid/src/main/res/xml/preferences_ankiquest_sharing.xml
new file mode 100644
index 000000000000..c837b444a856
--- /dev/null
+++ b/AnkiDroid/src/main/res/xml/preferences_ankiquest_sharing.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- SPDX-License-Identifier: AGPL-3.0-only -->
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:title="@string/ankiquest_sharing_title"
+    android:key="@string/ankiquest_sharing_screen_key">
+    <Preference
+        android:key="@string/ankiquest_deck_notifications_key"
+        android:title="@string/ankiquest_deck_notifications_title"
+        android:summary="@string/ankiquest_deck_notifications_summary" />
+    <Preference
+        android:key="@string/ankiquest_subscriptions_key"
+        android:fragment="com.ichi2.anki.preferences.AnkiquestSubscriptionsFragment"
+        android:persistent="false"
+        android:title="@string/ankiquest_subscriptions_title"
+        android:summary="@string/ankiquest_subscriptions_summary" />
+</PreferenceScreen>
diff --git a/AnkiDroid/src/main/res/xml/preferences_ankiquest_study.xml b/AnkiDroid/src/main/res/xml/preferences_ankiquest_study.xml
new file mode 100644
index 000000000000..7df7c8f5df1f
--- /dev/null
+++ b/AnkiDroid/src/main/res/xml/preferences_ankiquest_study.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- SPDX-License-Identifier: AGPL-3.0-only -->
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:title="@string/ankiquest_study_title"
+    android:key="@string/ankiquest_study_screen_key">
+    <SwitchPreferenceCompat
+        android:defaultValue="false"
+        android:key="@string/ankiquest_open_today_key"
+        android:summary="@string/ankiquest_open_today_summary"
+        android:title="@string/ankiquest_open_today_title" />
+    <SwitchPreferenceCompat
+        android:defaultValue="true"
+        android:key="@string/ankiquest_summary_preference_key"
+        android:summary="@string/ankiquest_summary_preference_summary"
+        android:title="@string/ankiquest_summary_preference_title" />
+    <SwitchPreferenceCompat
+        android:key="@string/ankiquest_streak_protection_key"
+        android:persistent="false"
+        android:summary="@string/ankiquest_streak_protection_summary"
+        android:title="@string/ankiquest_streak_protection_title" />
+</PreferenceScreen>
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/ankiquest/AnkiquestNotificationHealthDialogTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/ankiquest/AnkiquestNotificationHealthDialogTest.kt
index f417fafcf923..38c594850d62 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/ankiquest/AnkiquestNotificationHealthDialogTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/ankiquest/AnkiquestNotificationHealthDialogTest.kt
@@ -9,6 +9,7 @@ import androidx.preference.Preference
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.ichi2.anki.R
 import com.ichi2.anki.RobolectricTest
+import com.ichi2.anki.preferences.AnkiquestNotificationsSettingsFragment
 import com.ichi2.anki.preferences.AnkiquestSettingsFragment
 import com.ichi2.anki.preferences.PreferencesActivity
 import com.ichi2.anki.preferences.PreferencesFragment
@@ -28,10 +29,18 @@ class AnkiquestNotificationHealthDialogTest : RobolectricTest() {
         val intent = PreferencesActivity.getIntent(targetContext, AnkiquestSettingsFragment::class)
         val controller = Robolectric.buildActivity(PreferencesActivity::class.java, intent).setup()
         saveControllerForCleanup(controller)
-        val fragment =
+        val menu =
             (controller.get().fragment as PreferencesFragment)
                 .childFragmentManager
                 .findFragmentById(R.id.settings_container) as AnkiquestSettingsFragment
+        assertNotNull(
+            menu.findPreference<Preference>(targetContext.getString(R.string.ankiquest_notifications_screen_key)),
+        ).performClick()
+        shadowOf(Looper.getMainLooper()).idle()
+        val fragment =
+            (controller.get().fragment as PreferencesFragment)
+                .childFragmentManager
+                .findFragmentById(R.id.settings_container) as AnkiquestNotificationsSettingsFragment
         val health = assertNotNull(fragment.findPreference<Preference>(targetContext.getString(R.string.ankiquest_health_key)))
 
         health.performClick()
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/preferences/AnkiquestSettingsMenuTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/preferences/AnkiquestSettingsMenuTest.kt
new file mode 100644
index 000000000000..01897fd598c8
--- /dev/null
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/preferences/AnkiquestSettingsMenuTest.kt
@@ -0,0 +1,69 @@
+// SPDX-License-Identifier: AGPL-3.0-only
+
+package com.ichi2.anki.preferences
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.ichi2.anki.R
+import com.ichi2.anki.RobolectricTest
+import org.junit.Test
+import org.junit.runner.RunWith
+import kotlin.test.assertEquals
+
+@RunWith(AndroidJUnit4::class)
+class AnkiquestSettingsMenuTest : RobolectricTest() {
+    @Test
+    fun `each existing setting remains available exactly once`() {
+        val pages =
+            listOf(
+                R.xml.preferences_ankiquest,
+                R.xml.preferences_ankiquest_account,
+                R.xml.preferences_ankiquest_study,
+                R.xml.preferences_ankiquest_notifications,
+                R.xml.preferences_ankiquest_sharing,
+                R.xml.preferences_ankiquest_maintenance,
+            )
+        val navigationKeys =
+            setOf(
+                R.string.ankiquest_screen_key,
+                R.string.ankiquest_account_screen_key,
+                R.string.ankiquest_study_screen_key,
+                R.string.ankiquest_notifications_screen_key,
+                R.string.ankiquest_sharing_screen_key,
+                R.string.ankiquest_maintenance_screen_key,
+            ).map(targetContext::getString).toSet()
+        val settings =
+            pages
+                .flatMap { PreferenceTestUtils.getAttrFromXml(targetContext, it, "key") }
+                .map { targetContext.getString(it.removePrefix("@").toInt()) }
+                .filterNot { it in navigationKeys }
+        val expected =
+            listOf(
+                R.string.ankiquest_dashboard_key,
+                R.string.ankiquest_url_key,
+                R.string.ankiquest_user_key,
+                R.string.ankiquest_token_key,
+                R.string.ankiquest_avatar_key,
+                R.string.ankiquest_test_key,
+                R.string.ankiquest_open_today_key,
+                R.string.ankiquest_summary_preference_key,
+                R.string.ankiquest_streak_protection_key,
+                R.string.ankiquest_notify_rank_key,
+                R.string.ankiquest_streak_hours_key,
+                R.string.ankiquest_nudges_key,
+                R.string.ankiquest_celebrations_key,
+                R.string.ankiquest_community_reminders_key,
+                R.string.ankiquest_message_alerts_key,
+                R.string.ankiquest_nudge_alerts_key,
+                R.string.ankiquest_health_key,
+                R.string.ankiquest_deck_notifications_key,
+                R.string.ankiquest_subscriptions_key,
+                R.string.ankiquest_upload_all_key,
+                R.string.ankiquest_update_channel_key,
+                R.string.ankiquest_check_updates_key,
+            ).map(targetContext::getString)
+
+        assertEquals(expected.size, settings.size, "A setting was omitted or duplicated")
+        assertEquals(expected.toSet(), settings.toSet())
+        assertEquals(5, PreferenceTestUtils.getAttrFromXml(targetContext, R.xml.preferences_ankiquest, "fragment").size)
+    }
+}