diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 9fed8e98df8851fecbda66df0cbc3c79d87d14aa..b00887dd4d5aa105bd84761a8a8701bc1d514e64 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -3769,7 +3769,7 @@
 
         <activity
             android:name=".Settings$AccountDashboardActivity"
-            android:label="@string/account_dashboard_title"
+            android:label="@string/Accounts_settings_title"
             android:exported="true"
             android:icon="@drawable/ic_homepage_accounts">
             <intent-filter android:priority="1">
diff --git a/res/xml/accounts_dashboard_settings.xml b/res/xml/accounts_dashboard_settings.xml
index c8627e7e9e76b895a69a44904616fb1b09f1a5fb..6d9364a67f5c346046325a2280c20487e971a05c 100644
--- a/res/xml/accounts_dashboard_settings.xml
+++ b/res/xml/accounts_dashboard_settings.xml
@@ -18,7 +18,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:key="user_and_account_settings_screen"
-    android:title="@string/account_dashboard_title"
+    android:title="@string/Accounts_settings_title"
     settings:keywords="@string/keywords_accounts">
 
     <PreferenceCategory
diff --git a/res/xml/accounts_dashboard_settings_header.xml b/res/xml/accounts_dashboard_settings_header.xml
index 99f07360f48b91c6c9ad4b94ea13fbcf5778b69c..ebb35577e3271e52f38f2351773f173eb5d3f844 100644
--- a/res/xml/accounts_dashboard_settings_header.xml
+++ b/res/xml/accounts_dashboard_settings_header.xml
@@ -17,6 +17,6 @@
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:settings="http://schemas.android.com/apk/res-auto"
-    android:title="@string/account_dashboard_title"
+    android:title="@string/Accounts_settings_title"
     settings:searchable="false">
 </PreferenceScreen>
diff --git a/res/xml/accounts_personal_dashboard_settings.xml b/res/xml/accounts_personal_dashboard_settings.xml
index e0ba71bbef3eb0c3dfb63c0bdce96b96739f5f91..29b92b818aa6668c821bdec3f60ee0298c5f2bef 100644
--- a/res/xml/accounts_personal_dashboard_settings.xml
+++ b/res/xml/accounts_personal_dashboard_settings.xml
@@ -19,7 +19,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:key="user_and_account_settings_screen"
-    android:title="@string/account_dashboard_title"
+    android:title="@string/Accounts_settings_title"
     settings:keywords="@string/keywords_accounts">
 
     <PreferenceCategory
diff --git a/res/xml/accounts_work_dashboard_settings.xml b/res/xml/accounts_work_dashboard_settings.xml
index 32699338434fd3835c773b97b7e09e6936a17609..947918d0e5b64f653e7841dc484e913c4d279f35 100644
--- a/res/xml/accounts_work_dashboard_settings.xml
+++ b/res/xml/accounts_work_dashboard_settings.xml
@@ -19,7 +19,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:key="user_and_account_settings_screen"
-    android:title="@string/account_dashboard_title"
+    android:title="@string/Accounts_settings_title"
     settings:keywords="@string/keywords_accounts">
 
     <PreferenceCategory
diff --git a/res/xml/top_level_settings.xml b/res/xml/top_level_settings.xml
index 602f3399063a47d9bf01628b6fd3548831420173..176861ff48d0179bb15ac372c08bca0317d6b82c 100644
--- a/res/xml/top_level_settings.xml
+++ b/res/xml/top_level_settings.xml
@@ -26,12 +26,22 @@
         android:title="@string/system_update_settings_list_item_title"
         android:summary="@string/system_update_summary"
         android:icon="@drawable/ic_updater"
-        android:order="-160"
+        android:order="-170"
         settings:controller="com.android.settings.system.SystemUpdatePreferenceController"
         settings:keywords="@string/keywords_system_update_settings">
         <intent android:action="android.settings.SYSTEM_UPDATE_SETTINGS" />
     </com.android.settings.widget.HomepagePreference>
 
+    <com.android.settings.widget.HomepagePreference
+        android:fragment="com.android.settings.accounts.AccountDashboardFragment"
+        android:icon="@drawable/ic_settings_accounts"
+        android:key="top_level_accounts"
+        android:order="-160"
+        android:title="@string/Accounts_settings_title"
+        android:summary="@string/summary_placeholder"
+        settings:highlightableMenuKey="@string/menu_key_accounts"
+        settings:controller="com.android.settings.accounts.TopLevelAccountEntryPreferenceController"/>
+
     <com.android.settings.widget.HomepagePreference
         android:fragment="com.android.settings.network.NetworkDashboardFragment"
         android:icon="@drawable/ic_wireless"
@@ -174,16 +184,6 @@
         android:fragment="com.android.settings.emergency.EmergencyDashboardFragment"
         settings:highlightableMenuKey="@string/menu_key_emergency"/>
 
-    <com.android.settings.widget.HomepagePreference
-        android:fragment="com.android.settings.accounts.AccountDashboardFragment"
-        android:icon="@drawable/ic_settings_accounts"
-        android:key="top_level_accounts"
-        android:order="-10"
-        android:title="@string/account_dashboard_title"
-        android:summary="@string/summary_placeholder"
-        settings:highlightableMenuKey="@string/menu_key_accounts"
-        settings:controller="com.android.settings.accounts.TopLevelAccountEntryPreferenceController"/>
-
     <com.android.settings.widget.HomepagePreference
         android:fragment="com.android.settings.system.SystemDashboardFragment"
         android:icon="@drawable/ic_settings_system_dashboard_white"