diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index cd6651e144..5e65be2532 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1333,7 +1333,6 @@
     <string name="key_tidepool_test_login" translatable="false">tidepool_test_login</string>
     <string name="key_tidepool_only_while_charging" translatable="false">tidepool_only_while_charging</string>
     <string name="key_tidepool_only_while_unmetered" translatable="false">tidepool_only_while_unmetered</string>
-    <string name="summary_tidepool_upload_screen">Upload data to the Tidepool service</string>
     <string name="summary_tidepool_username">Your Tidepool login user name, normally your email address</string>
     <string name="title_tidepool_username">Login User Name</string>
     <string name="summary_tidepool_password">Your Tidepool login password</string>
diff --git a/app/src/main/res/xml/pref_tidepool.xml b/app/src/main/res/xml/pref_tidepool.xml
index a37bf73954..a3b8d6301d 100644
--- a/app/src/main/res/xml/pref_tidepool.xml
+++ b/app/src/main/res/xml/pref_tidepool.xml
@@ -1,57 +1,60 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    android:key="tidepool_upload_screen"
-    android:summary="@string/summary_tidepool_upload_screen"
-    android:title="@string/tidepool">
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <EditTextPreference
-        android:key="@string/key_tidepool_username"
-        android:summary="@string/summary_tidepool_username"
-        android:title="@string/title_tidepool_username" />
-    <EditTextPreference
-        android:inputType="textPassword"
-        android:key="@string/key_tidepool_password"
-        android:summary="@string/summary_tidepool_password"
-        android:title="@string/title_tidepool_password" />
-    <Preference
-        android:key="@string/key_tidepool_test_login"
-        android:title="@string/title_tidepool_test_login" />
-    <CheckBoxPreference
-        android:defaultValue="true"
-        android:key="@string/key_tidepool_upload_cgm"
-        android:title="@string/tidepool_upload_cgm" />
-    <CheckBoxPreference
-        android:defaultValue="true"
-        android:key="@string/key_tidepool_upload_bolus"
-        android:title="@string/tidepool_upload_bolus" />
-    <CheckBoxPreference
-        android:defaultValue="true"
-        android:key="@string/key_tidepool_upload_bg"
-        android:title="@string/tidepool_upload_bg" />
-    <CheckBoxPreference
-        android:defaultValue="true"
-        android:key="@string/key_tidepool_upload_tbr"
-        android:title="@string/tidepool_upload_tbr" />
-    <CheckBoxPreference
-        android:defaultValue="true"
-        android:key="@string/key_tidepool_upload_profile"
-        android:title="@string/tidepool_upload_profile" />
-    <CheckBoxPreference
-        android:defaultValue="true"
-        android:enabled="false"
-        android:key="@string/key_tidepool_dev_servers"
-        android:summary="@string/summary_tidepool_dev_servers"
-        android:title="@string/title_tidepool_dev_servers" />
-    <CheckBoxPreference
-        android:defaultValue="false"
-        android:key="@string/key_tidepool_only_while_charging"
-        android:summary="Upload data only when charging"
-        android:title="Only when charging" />
-    <CheckBoxPreference
-        android:defaultValue="false"
-        android:key="@string/key_tidepool_only_while_unmetered"
-        android:summary="Upload data only when connected to an unmetered network like Wifi"
-        android:title="Only on Wifi" />
+    <PreferenceCategory
+        android:key="tidepool_upload_screen"
+        android:title="@string/tidepool">
+
+        <EditTextPreference
+            android:key="@string/key_tidepool_username"
+            android:summary="@string/summary_tidepool_username"
+            android:title="@string/title_tidepool_username" />
+        <EditTextPreference
+            android:inputType="textPassword"
+            android:key="@string/key_tidepool_password"
+            android:summary="@string/summary_tidepool_password"
+            android:title="@string/title_tidepool_password" />
+        <Preference
+            android:key="@string/key_tidepool_test_login"
+            android:title="@string/title_tidepool_test_login" />
+        <CheckBoxPreference
+            android:defaultValue="true"
+            android:key="@string/key_tidepool_upload_cgm"
+            android:title="@string/tidepool_upload_cgm" />
+        <CheckBoxPreference
+            android:defaultValue="true"
+            android:key="@string/key_tidepool_upload_bolus"
+            android:title="@string/tidepool_upload_bolus" />
+        <CheckBoxPreference
+            android:defaultValue="true"
+            android:key="@string/key_tidepool_upload_bg"
+            android:title="@string/tidepool_upload_bg" />
+        <CheckBoxPreference
+            android:defaultValue="true"
+            android:key="@string/key_tidepool_upload_tbr"
+            android:title="@string/tidepool_upload_tbr" />
+        <CheckBoxPreference
+            android:defaultValue="true"
+            android:key="@string/key_tidepool_upload_profile"
+            android:title="@string/tidepool_upload_profile" />
+        <CheckBoxPreference
+            android:defaultValue="true"
+            android:enabled="false"
+            android:key="@string/key_tidepool_dev_servers"
+            android:summary="@string/summary_tidepool_dev_servers"
+            android:title="@string/title_tidepool_dev_servers" />
+        <CheckBoxPreference
+            android:defaultValue="false"
+            android:key="@string/key_tidepool_only_while_charging"
+            android:summary="Upload data only when charging"
+            android:title="Only when charging" />
+        <CheckBoxPreference
+            android:defaultValue="false"
+            android:key="@string/key_tidepool_only_while_unmetered"
+            android:summary="Upload data only when connected to an unmetered network like Wifi"
+            android:title="Only on Wifi" />
+
+    </PreferenceCategory>
 
 </PreferenceScreen>