diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b0e5102919..55671f5e54 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -28,6 +28,11 @@
     <string name="tr_lang" translatable="false">Turkish</string>
 
     <string name="key_email_for_crash_report" translatable="false">email_for_crash_report</string>
+    <string name="key_smscommunicator_settings" translatable="false">smscommunicator</string>
+    <string name="key_open_humans_settings" translatable="false">open_humans</string>
+    <string name="key_protection_settings" translatable="false">protection</string>
+    <string name="key_absorption_category_settings" translatable="false">absorption_category_settings</string>
+    <string name="key_insulin_oref_peak_settings" translatable="false">insulin_oref_peak_settings</string>
 
     <string name="treatmentssafety_title">Treatments safety</string>
     <string name="treatmentssafety_maxbolus_title">Max allowed bolus [U]</string>
diff --git a/app/src/main/res/xml/pref_absorption_aaps.xml b/app/src/main/res/xml/pref_absorption_aaps.xml
index 7cc14ebb21..9a1be55a9e 100644
--- a/app/src/main/res/xml/pref_absorption_aaps.xml
+++ b/app/src/main/res/xml/pref_absorption_aaps.xml
@@ -5,6 +5,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <PreferenceCategory
+        android:key="@string/key_absorption_settings"
         android:title="@string/absorptionsettings_title"
         app:initialExpandedChildrenCount="0">
 
diff --git a/app/src/main/res/xml/pref_absorption_oref1.xml b/app/src/main/res/xml/pref_absorption_oref1.xml
index b1c3a42160..62c93f1ed9 100644
--- a/app/src/main/res/xml/pref_absorption_oref1.xml
+++ b/app/src/main/res/xml/pref_absorption_oref1.xml
@@ -5,6 +5,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <PreferenceCategory
+        android:key="@string/key_absorption_category_settings"
         android:title="@string/absorptionsettings_title"
         app:initialExpandedChildrenCount="0">
 
diff --git a/app/src/main/res/xml/pref_alerts.xml b/app/src/main/res/xml/pref_alerts.xml
index ab5111d624..15cf4354a1 100644
--- a/app/src/main/res/xml/pref_alerts.xml
+++ b/app/src/main/res/xml/pref_alerts.xml
@@ -4,6 +4,7 @@
     xmlns:validate="http://schemas.android.com/apk/res-auto">
 
     <PreferenceCategory
+        android:key="@string/key_localalert_settings"
         android:title="@string/localalertsettings_title"
         app:initialExpandedChildrenCount="0">
 
diff --git a/app/src/main/res/xml/pref_bgsource.xml b/app/src/main/res/xml/pref_bgsource.xml
index 098d57bc4f..848f538483 100644
--- a/app/src/main/res/xml/pref_bgsource.xml
+++ b/app/src/main/res/xml/pref_bgsource.xml
@@ -3,6 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <PreferenceCategory
+        android:key="@string/key_bgsource_upload_settings"
         android:title="@string/bgsource_upload"
         app:initialExpandedChildrenCount="0">
 
diff --git a/app/src/main/res/xml/pref_bgsourcedexcom.xml b/app/src/main/res/xml/pref_bgsourcedexcom.xml
index 1ca8fa1140..495851995c 100644
--- a/app/src/main/res/xml/pref_bgsourcedexcom.xml
+++ b/app/src/main/res/xml/pref_bgsourcedexcom.xml
@@ -3,6 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <PreferenceCategory
+        android:key="@string/key_dexcom_settings"
         android:title="@string/bgsource_upload"
         app:initialExpandedChildrenCount="0">
 
diff --git a/app/src/main/res/xml/pref_datachoices.xml b/app/src/main/res/xml/pref_datachoices.xml
index d44c622d97..1e6423f3da 100644
--- a/app/src/main/res/xml/pref_datachoices.xml
+++ b/app/src/main/res/xml/pref_datachoices.xml
@@ -4,6 +4,7 @@
     xmlns:validate="http://schemas.android.com/apk/res-auto">
 
     <PreferenceCategory
+        android:key="@string/key_data_choices_settings"
         android:title="@string/data_choices"
         app:initialExpandedChildrenCount="0">
 
diff --git a/app/src/main/res/xml/pref_general.xml b/app/src/main/res/xml/pref_general.xml
index 8dd2f98b76..ee1076fcab 100644
--- a/app/src/main/res/xml/pref_general.xml
+++ b/app/src/main/res/xml/pref_general.xml
@@ -3,8 +3,9 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <PreferenceCategory
-        app:initialExpandedChildrenCount="0"
-        android:title="@string/configbuilder_general">
+        android:key="@string/key_configbuilder_general_settings"
+        android:title="@string/configbuilder_general"
+        app:initialExpandedChildrenCount="0">
 
         <ListPreference
             android:defaultValue="mg/dl"
@@ -27,7 +28,9 @@
             android:summary="@string/patient_name_summary"
             />
 
-        <PreferenceCategory android:title="@string/protection">
+        <PreferenceCategory
+            android:key="@string/key_protection_settings"
+            android:title="@string/protection">
 
             <Preference
                 android:inputType="textPassword"
diff --git a/app/src/main/res/xml/pref_insulinoreffreepeak.xml b/app/src/main/res/xml/pref_insulinoreffreepeak.xml
index 5b7b290ae0..4fbfd30bdf 100644
--- a/app/src/main/res/xml/pref_insulinoreffreepeak.xml
+++ b/app/src/main/res/xml/pref_insulinoreffreepeak.xml
@@ -4,6 +4,7 @@
     xmlns:validate="http://schemas.android.com/apk/res-auto">
 
     <PreferenceCategory
+        android:key="@string/key_insulin_oref_peak_settings"
         android:title="@string/insulin_oref_peak"
         app:initialExpandedChildrenCount="0">
 
diff --git a/app/src/main/res/xml/pref_loop.xml b/app/src/main/res/xml/pref_loop.xml
index 0d92a6bc5f..f94fd564e2 100644
--- a/app/src/main/res/xml/pref_loop.xml
+++ b/app/src/main/res/xml/pref_loop.xml
@@ -4,6 +4,7 @@
     xmlns:validate="http://schemas.android.com/apk/res-auto">
 
     <PreferenceCategory
+        android:key="@string/key_loop_settings"
         app:initialExpandedChildrenCount="0"
         android:title="@string/loop">
 
diff --git a/app/src/main/res/xml/pref_maintenance.xml b/app/src/main/res/xml/pref_maintenance.xml
index cb7d3108cc..633411ed72 100644
--- a/app/src/main/res/xml/pref_maintenance.xml
+++ b/app/src/main/res/xml/pref_maintenance.xml
@@ -4,7 +4,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <PreferenceCategory
-        android:key="maintenance"
+        android:key="@string/key_maintenance_settings"
         android:title="@string/maintenance_settings"
         app:initialExpandedChildrenCount="0">
 
diff --git a/app/src/main/res/xml/pref_nsclientinternal.xml b/app/src/main/res/xml/pref_nsclientinternal.xml
index 8c64284d52..ada082b21b 100644
--- a/app/src/main/res/xml/pref_nsclientinternal.xml
+++ b/app/src/main/res/xml/pref_nsclientinternal.xml
@@ -4,6 +4,7 @@
     xmlns:validate="http://schemas.android.com/apk/res-auto">
 
     <PreferenceCategory
+        android:key="@string/key_nsclientinternal_settings"
         android:title="@string/nsclientinternal_title"
         app:initialExpandedChildrenCount="0">
 
diff --git a/app/src/main/res/xml/pref_openapsama.xml b/app/src/main/res/xml/pref_openapsama.xml
index 3e285d7477..cf5913f060 100644
--- a/app/src/main/res/xml/pref_openapsama.xml
+++ b/app/src/main/res/xml/pref_openapsama.xml
@@ -4,6 +4,7 @@
     xmlns:validate="http://schemas.android.com/apk/res-auto">
 
     <PreferenceCategory
+        android:key="@string/key_openapsma_settings"
         android:title="@string/openapsama"
         app:initialExpandedChildrenCount="0">
 
diff --git a/app/src/main/res/xml/pref_openapssmb.xml b/app/src/main/res/xml/pref_openapssmb.xml
index 1f1be8cb42..857776036b 100644
--- a/app/src/main/res/xml/pref_openapssmb.xml
+++ b/app/src/main/res/xml/pref_openapssmb.xml
@@ -4,6 +4,7 @@
     xmlns:validate="http://schemas.android.com/apk/res-auto">
 
     <PreferenceCategory
+        android:key="@string/key_openapssmb_settings"
         android:title="@string/openapssmb"
         app:initialExpandedChildrenCount="0">
 
diff --git a/app/src/main/res/xml/pref_openhumans.xml b/app/src/main/res/xml/pref_openhumans.xml
index b9ccc3e867..b4b1fee2d4 100644
--- a/app/src/main/res/xml/pref_openhumans.xml
+++ b/app/src/main/res/xml/pref_openhumans.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:validate="http://schemas.android.com/apk/res-auto">
 
-    <PreferenceCategory android:title="@string/open_humans">
+    <PreferenceCategory
+        android:key="@string/key_open_humans_settings"
+        android:title="@string/open_humans">
 
         <CheckBoxPreference
             android:defaultValue="true"
@@ -15,4 +19,4 @@
 
     </PreferenceCategory>
 
-</PreferenceScreen>
\ No newline at end of file
+</androidx.preference.PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/pref_overview.xml b/app/src/main/res/xml/pref_overview.xml
index a98fc25905..a8192da144 100644
--- a/app/src/main/res/xml/pref_overview.xml
+++ b/app/src/main/res/xml/pref_overview.xml
@@ -4,6 +4,7 @@
     xmlns:validate="http://schemas.android.com/apk/res-auto">
 
     <PreferenceCategory
+        android:key="@string/key_overview_settings"
         android:title="@string/overview"
         app:initialExpandedChildrenCount="0">
 
diff --git a/app/src/main/res/xml/pref_pump.xml b/app/src/main/res/xml/pref_pump.xml
index 161692a698..aff98727d5 100644
--- a/app/src/main/res/xml/pref_pump.xml
+++ b/app/src/main/res/xml/pref_pump.xml
@@ -3,6 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <PreferenceCategory
+        android:key="@string/key_pump_settings"
         android:title="@string/pump"
         app:initialExpandedChildrenCount="0">
 
diff --git a/app/src/main/res/xml/pref_safety.xml b/app/src/main/res/xml/pref_safety.xml
index e3f5f2e23d..6113be6c13 100644
--- a/app/src/main/res/xml/pref_safety.xml
+++ b/app/src/main/res/xml/pref_safety.xml
@@ -4,6 +4,7 @@
     xmlns:validate="http://schemas.android.com/apk/res-auto">
 
     <PreferenceCategory
+        android:key="@string/key_treatmentssafety_settings"
         android:title="@string/treatmentssafety_title"
         app:initialExpandedChildrenCount="0">
 
diff --git a/app/src/main/res/xml/pref_smscommunicator.xml b/app/src/main/res/xml/pref_smscommunicator.xml
index dc61d1c1a2..e0fb8ea94c 100644
--- a/app/src/main/res/xml/pref_smscommunicator.xml
+++ b/app/src/main/res/xml/pref_smscommunicator.xml
@@ -4,6 +4,7 @@
     xmlns:validate="http://schemas.android.com/apk/res-auto">
 
     <PreferenceCategory
+        android:key="@string/key_smscommunicator_settings"
         android:title="@string/smscommunicator"
         app:initialExpandedChildrenCount="0">
 
diff --git a/app/src/main/res/xml/pref_tidepool.xml b/app/src/main/res/xml/pref_tidepool.xml
index 96e3c8f218..f935fbbfec 100644
--- a/app/src/main/res/xml/pref_tidepool.xml
+++ b/app/src/main/res/xml/pref_tidepool.xml
@@ -4,6 +4,7 @@
     xmlns:validate="http://schemas.android.com/apk/res-auto">
 
     <PreferenceCategory
+        android:key="@string/key_tidepool_settings"
         android:title="@string/tidepool"
         app:initialExpandedChildrenCount="0">
 
diff --git a/app/src/main/res/xml/pref_virtualpump.xml b/app/src/main/res/xml/pref_virtualpump.xml
index 5e60fe4cb8..ad1e0344fa 100644
--- a/app/src/main/res/xml/pref_virtualpump.xml
+++ b/app/src/main/res/xml/pref_virtualpump.xml
@@ -3,6 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <PreferenceCategory
+        android:key="@string/key_virtualpump_settings"
         android:title="@string/virtualpump_settings"
         app:initialExpandedChildrenCount="0">
 
diff --git a/app/src/main/res/xml/pref_wear.xml b/app/src/main/res/xml/pref_wear.xml
index 4b4a1d15b5..d46a317400 100644
--- a/app/src/main/res/xml/pref_wear.xml
+++ b/app/src/main/res/xml/pref_wear.xml
@@ -3,6 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <PreferenceCategory
+        android:key="@string/key_wear_settings"
         android:title="@string/wear_settings"
         app:initialExpandedChildrenCount="0">
 
diff --git a/app/src/main/res/xml/pref_xdripstatus.xml b/app/src/main/res/xml/pref_xdripstatus.xml
index 00aa8262ef..15309d4f05 100644
--- a/app/src/main/res/xml/pref_xdripstatus.xml
+++ b/app/src/main/res/xml/pref_xdripstatus.xml
@@ -3,6 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <PreferenceCategory
+        android:key="@string/key_xdripstatus_settings"
         android:title="@string/xdripstatus_settings"
         app:initialExpandedChildrenCount="0">
 
diff --git a/automation/src/main/res/values/strings.xml b/automation/src/main/res/values/strings.xml
index fd6c5de741..b8ee4c099a 100644
--- a/automation/src/main/res/values/strings.xml
+++ b/automation/src/main/res/values/strings.xml
@@ -109,6 +109,7 @@
     <string name="preconditions">Preconditions:</string>
     <string name="automation_event">Automation event</string>
     <string name="reorder_label">Reorder</string>
+    <string name="key_automation_settings" translatable="false">automation_settings</string>
 
 
 </resources>
\ No newline at end of file
diff --git a/automation/src/main/res/xml/pref_automation.xml b/automation/src/main/res/xml/pref_automation.xml
index e1c43f32b4..8d193dccb8 100644
--- a/automation/src/main/res/xml/pref_automation.xml
+++ b/automation/src/main/res/xml/pref_automation.xml
@@ -3,6 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <PreferenceCategory
+        android:key="@string/key_automation_settings"
         android:title="@string/automation"
         app:initialExpandedChildrenCount="0">
 
diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index 9a394e3ef4..fbeed450e7 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -34,6 +34,28 @@
     <string name="key_openapsama_autosens_max" translatable="false">autosens_max</string>
     <string name="key_openapsama_autosens_min" translatable="false">autosens_min</string>
     <string name="key_treatmentssafety_maxcarbs" translatable="false">treatmentssafety_maxcarbs</string>
+    <string name="key_bgsource_upload_settings" translatable="false">bgsource_upload_settings</string>
+    <string name="key_localalert_settings" translatable="false">localalert_settings</string>
+    <string name="key_wear_settings" translatable="false">wear_settings</string>
+    <string name="key_configbuilder_general_settings" translatable="false">configbuilder_general_settings</string>
+    <string name="key_maintenance_settings" translatable="false">maintenance_settings</string>
+    <string name="key_smscommunicator_settings" translatable="false">smscommunicator_settings</string>
+    <string name="key_openapssmb_settings" translatable="false">openapssmb_settings</string>
+    <string name="key_treatmentssafety_settings" translatable="false">treatmentssafety_settings</string>
+    <string name="key_loop_settings" translatable="false">loop_settings</string>
+    <string name="key_virtualpump_settings" translatable="false">virtualpump_settings</string>
+    <string name="key_pump_settings" translatable="false">pump_settings</string>
+    <string name="key_tidepool_settings" translatable="false">tidepool_settings</string>
+    <string name="key_absorption_settings" translatable="false">absorption_settings</string>
+    <string name="key_overview_settings" translatable="false">overview_settings</string>
+    <string name="key_openapsma_settings" translatable="false">openapsma_settings</string>
+    <string name="key_medtronic_settings" translatable="false">medtronic_settings</string>
+    <string name="key_danars_settings" translatable="false">danars_settings</string>
+    <string name="key_xdripstatus_settings" translatable="false">xdripstatus_settings</string>
+    <string name="key_nsclientinternal_settings" translatable="false">nsclientinternal_settings</string>
+    <string name="key_insight_local_settings" translatable="false">insight_local_settings</string>
+    <string name="key_data_choices_settings" translatable="false">data_choices_settings</string>
+    <string name="key_dexcom_settings" translatable="false">dexcom_settings</string>
 
     <!--    General-->
     <string name="refresh">Refresh</string>
diff --git a/danar/src/main/res/values/strings.xml b/danar/src/main/res/values/strings.xml
new file mode 100644
index 0000000000..0383441326
--- /dev/null
+++ b/danar/src/main/res/values/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="key_danar_pump_settings" translatable="false">danar_pump_settings</string>
+</resources>
\ No newline at end of file
diff --git a/danar/src/main/res/xml/pref_danar.xml b/danar/src/main/res/xml/pref_danar.xml
index 27efaac878..475c49531d 100644
--- a/danar/src/main/res/xml/pref_danar.xml
+++ b/danar/src/main/res/xml/pref_danar.xml
@@ -4,6 +4,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <PreferenceCategory
+        android:key="@string/key_danar_pump_settings"
         android:title="@string/danar_pump_settings"
         app:initialExpandedChildrenCount="0">
 
diff --git a/danar/src/main/res/xml/pref_danarkorean.xml b/danar/src/main/res/xml/pref_danarkorean.xml
index 5e46cdae54..3e2944a2a3 100644
--- a/danar/src/main/res/xml/pref_danarkorean.xml
+++ b/danar/src/main/res/xml/pref_danarkorean.xml
@@ -4,6 +4,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <PreferenceCategory
+        android:key="@string/key_danar_pump_settings"
         android:title="@string/danar_pump_settings"
         app:initialExpandedChildrenCount="0">
 
diff --git a/danar/src/main/res/xml/pref_danarv2.xml b/danar/src/main/res/xml/pref_danarv2.xml
index d0d36999a5..f18ed77e4a 100644
--- a/danar/src/main/res/xml/pref_danarv2.xml
+++ b/danar/src/main/res/xml/pref_danarv2.xml
@@ -4,6 +4,7 @@
     xmlns:validate="http://schemas.android.com/apk/res-auto">
 
     <PreferenceCategory
+        android:key="@string/key_danar_pump_settings"
         android:title="@string/danar_pump_settings"
         app:initialExpandedChildrenCount="0">
 
diff --git a/danars/src/main/res/xml/pref_danars.xml b/danars/src/main/res/xml/pref_danars.xml
index 8fc3d691b4..7c927aa2ae 100644
--- a/danars/src/main/res/xml/pref_danars.xml
+++ b/danars/src/main/res/xml/pref_danars.xml
@@ -4,6 +4,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <PreferenceCategory
+        android:key="@string/key_danars_settings"
         android:title="@string/danarspump"
         app:initialExpandedChildrenCount="0">
 
diff --git a/insight/src/main/res/xml/pref_insight_local_full.xml b/insight/src/main/res/xml/pref_insight_local_full.xml
index 820c12d422..1329db7de3 100644
--- a/insight/src/main/res/xml/pref_insight_local_full.xml
+++ b/insight/src/main/res/xml/pref_insight_local_full.xml
@@ -3,6 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <PreferenceCategory
+        android:key="@string/key_insight_local_settings"
         android:title="@string/insight_local"
         app:initialExpandedChildrenCount="0">
 
diff --git a/insight/src/main/res/xml/pref_insight_local_pumpcontrol.xml b/insight/src/main/res/xml/pref_insight_local_pumpcontrol.xml
index a863e56757..b73c01f1f7 100644
--- a/insight/src/main/res/xml/pref_insight_local_pumpcontrol.xml
+++ b/insight/src/main/res/xml/pref_insight_local_pumpcontrol.xml
@@ -3,6 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <PreferenceCategory
+        android:key="@string/key_insight_local_settings"
         android:title="@string/insight_local"
         app:initialExpandedChildrenCount="0">
 
diff --git a/medtronic/src/main/res/values/strings.xml b/medtronic/src/main/res/values/strings.xml
index 3a3e627f80..4791a03276 100644
--- a/medtronic/src/main/res/values/strings.xml
+++ b/medtronic/src/main/res/values/strings.xml
@@ -24,6 +24,7 @@
     <string name="key_medtronic_pump_battery_lithium" translatable="false">medtronic_pump_battery_lithium</string>
     <string name="key_medtronic_pump_battery_nizn" translatable="false">medtronic_pump_battery_nizn</string>
     <string name="key_medtronic_pump_battery_nimh" translatable="false">medtronic_pump_battery_nimh</string>
+    <string name="key_medtronic_name_settings" translatable="false">medtronic_name_settings</string>
 
     <string name="medtronic_serial_number">Pump Serial Number</string>
     <string name="medtronic_pump_type">Pump Type</string>
diff --git a/medtronic/src/main/res/xml/pref_medtronic.xml b/medtronic/src/main/res/xml/pref_medtronic.xml
index 5006bf32b9..cdd786d183 100644
--- a/medtronic/src/main/res/xml/pref_medtronic.xml
+++ b/medtronic/src/main/res/xml/pref_medtronic.xml
@@ -4,6 +4,7 @@
     xmlns:validate="http://schemas.android.com/apk/res-auto">
 
     <PreferenceCategory
+        android:key="@string/key_medtronic_name_settings"
         android:title="@string/medtronic_name"
         app:initialExpandedChildrenCount="0">
 
diff --git a/omnipod-dash/src/main/res/values/strings.xml b/omnipod-dash/src/main/res/values/strings.xml
index 5ea562af03..8f0286a543 100644
--- a/omnipod-dash/src/main/res/values/strings.xml
+++ b/omnipod-dash/src/main/res/values/strings.xml
@@ -11,4 +11,7 @@
     <!-- Omnipod Dash - Overview -->
     <string name="omnipod_dash_bluetooth_status">Bluetooth Status</string>
     <string name="omnipod_dash_bluetooth_address">Bluetooth Address</string>
+    <string name="key_omnipod_common_preferences_category_confirmation_beeps" translatable="false">omnipod_common_preferences_category_confirmation</string>
+    <string name="key_common_preferences_category_alerts_settings" translatable="false">common_preferences_category_alerts</string>
+    <string name="key_common_preferences_category_other_settings" translatable="false">common_preferences_category_other</string>
 </resources>
\ No newline at end of file
diff --git a/omnipod-dash/src/main/res/xml/omnipod_dash_preferences.xml b/omnipod-dash/src/main/res/xml/omnipod_dash_preferences.xml
index d836089473..26d400e602 100644
--- a/omnipod-dash/src/main/res/xml/omnipod_dash_preferences.xml
+++ b/omnipod-dash/src/main/res/xml/omnipod_dash_preferences.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:validate="http://schemas.android.com/apk/res-auto">
-    <PreferenceCategory android:title="@string/omnipod_common_preferences_category_confirmation_beeps">
+    <PreferenceCategory
+        android:key="@string/key_omnipod_common_preferences_category_confirmation_beeps"
+        android:title="@string/omnipod_common_preferences_category_confirmation_beeps"
+        app:initialExpandedChildrenCount="0">
 
         <SwitchPreference
             android:defaultValue="true"
@@ -25,7 +29,10 @@
 
     </PreferenceCategory>
 
-    <PreferenceCategory android:title="@string/omnipod_common_preferences_category_alerts">
+    <PreferenceCategory
+        android:key="@string/key_common_preferences_category_alerts_settings"
+        android:title="@string/omnipod_common_preferences_category_alerts"
+        app:initialExpandedChildrenCount="0">
 
         <SwitchPreference
             android:defaultValue="true"
@@ -66,7 +73,10 @@
 
     </PreferenceCategory>
 
-    <PreferenceCategory android:title="@string/omnipod_common_preferences_category_other">
+    <PreferenceCategory
+        android:key="@string/key_common_preferences_category_other_settings"
+        android:title="@string/omnipod_common_preferences_category_other"
+        app:initialExpandedChildrenCount="0">
 
         <SwitchPreference
             android:defaultValue="false"
diff --git a/omnipod-eros/src/main/res/values/strings.xml b/omnipod-eros/src/main/res/values/strings.xml
index 8fd21404c5..9e78325f0b 100644
--- a/omnipod-eros/src/main/res/values/strings.xml
+++ b/omnipod-eros/src/main/res/values/strings.xml
@@ -18,6 +18,10 @@
     <string name="key_omnipod_eros_tbrs_set" translatable="false">AAPS.Omnipod.tbrs_set</string>
     <string name="key_omnipod_eros_std_boluses_delivered" translatable="false">AAPS.Omnipod.std_boluses_delivered</string>
     <string name="key_omnipod_eros_smb_boluses_delivered" translatable="false">AAPS.Omnipod.smb_boluses_delivered</string>
+    <string name="key_common_preferences_category_confirmation_beeps_settings" translatable="false">common_preferences_category_confirmation_beeps_settings</string>
+    <string name="key_omnipod_eros_preferences_category_notifications_settings" translatable="false">omnipod_eros_preferences_category_notifications_settings</string>
+    <string name="key_omnipod_common_preferences_category_other_settings" translatable="false">omnipod_common_preferences_category_other_settings</string>
+    <string name="key_omnipod_preference_category_rileylink_settings" translatable="false">omnipod_preference_category_rileylink_settings</string>
 
     <!-- Omnipod Eros - Overview -->
     <string name="omnipod_eros_overview_firmware_version_value" translatable="false">PM %1$s / PI %2$s</string>
diff --git a/omnipod-eros/src/main/res/xml/omnipod_eros_preferences.xml b/omnipod-eros/src/main/res/xml/omnipod_eros_preferences.xml
index 49fe2df5d6..c2b97d711d 100644
--- a/omnipod-eros/src/main/res/xml/omnipod_eros_preferences.xml
+++ b/omnipod-eros/src/main/res/xml/omnipod_eros_preferences.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:validate="http://schemas.android.com/apk/res-auto">
 
-    <PreferenceCategory android:title="@string/omnipod_eros_preferences_category_riley_link">
+    <PreferenceCategory
+        android:key="@string/key_omnipod_preference_category_rileylink_settings"
+        android:title="@string/omnipod_eros_preferences_category_riley_link"
+        app:initialExpandedChildrenCount="0">
 
         <Preference
             android:enabled="true"
@@ -25,7 +29,10 @@
 
     </PreferenceCategory>
 
-    <PreferenceCategory android:title="@string/omnipod_common_preferences_category_confirmation_beeps">
+    <PreferenceCategory
+        android:key="@string/key_common_preferences_category_confirmation_beeps_settings"
+        android:title="@string/omnipod_common_preferences_category_confirmation_beeps"
+        app:initialExpandedChildrenCount="0">
 
         <SwitchPreference
             android:defaultValue="true"
@@ -49,7 +56,10 @@
 
     </PreferenceCategory>
 
-    <PreferenceCategory android:title="@string/omnipod_common_preferences_category_alerts">
+    <PreferenceCategory
+        android:key="@string/key_common_preferences_category_alerts_settings"
+        android:title="@string/omnipod_common_preferences_category_alerts"
+        app:initialExpandedChildrenCount="0">
 
         <SwitchPreference
             android:defaultValue="true"
@@ -90,7 +100,10 @@
 
     </PreferenceCategory>
 
-    <PreferenceCategory android:title="@string/omnipod_eros_preferences_category_notifications">
+    <PreferenceCategory
+        android:key="@string/key_omnipod_eros_preferences_category_notifications_settings"
+        android:title="@string/omnipod_eros_preferences_category_notifications"
+        app:initialExpandedChildrenCount="0">
 
         <SwitchPreference
             android:defaultValue="false"
@@ -109,7 +122,10 @@
 
     </PreferenceCategory>
 
-    <PreferenceCategory android:title="@string/omnipod_common_preferences_category_other">
+    <PreferenceCategory
+        android:key="@string/key_omnipod_common_preferences_category_other_settings"
+        android:title="@string/omnipod_common_preferences_category_other"
+        app:initialExpandedChildrenCount="0">
 
         <SwitchPreference
             android:defaultValue="false"