diff --git a/mobile/android/base/AndroidManifest.xml.in b/mobile/android/base/AndroidManifest.xml.in
index 8f9f52d4c0de..887d7740d88f 100644
--- a/mobile/android/base/AndroidManifest.xml.in
+++ b/mobile/android/base/AndroidManifest.xml.in
@@ -236,7 +236,7 @@
         </activity>
 
 #include ../services/manifests/AnnouncementsAndroidManifest_activities.xml.in
-#include ../services/manifests/FxAccountAndroidManifest_services.xml.in
+#include ../services/manifests/FxAccountAndroidManifest_activities.xml.in
 #include ../services/manifests/SyncAndroidManifest_activities.xml.in
 #include ../services/manifests/HealthReportAndroidManifest_activities.xml.in
 
@@ -315,6 +315,7 @@
 
 
 #include ../services/manifests/AnnouncementsAndroidManifest_services.xml.in
+#include ../services/manifests/FxAccountAndroidManifest_services.xml.in
 #include ../services/manifests/HealthReportAndroidManifest_services.xml.in
 #include ../services/manifests/SyncAndroidManifest_services.xml.in
 
diff --git a/mobile/android/base/android-services.mozbuild b/mobile/android/base/android-services.mozbuild
index 3216114fb405..564cef7d0a64 100644
--- a/mobile/android/base/android-services.mozbuild
+++ b/mobile/android/base/android-services.mozbuild
@@ -544,13 +544,9 @@ sync_java_files = [
     'fxa/authenticator/FxAccountAuthenticator.java',
     'fxa/authenticator/FxAccountAuthenticatorService.java',
     'fxa/sync/FxAccount.java',
-    'fxa/sync/FxAccountBookmarksSyncService.java',
     'fxa/sync/FxAccountGlobalSession.java',
-    'fxa/sync/FxAccountHistorySyncService.java',
-    'fxa/sync/FxAccountPasswordsSyncService.java',
     'fxa/sync/FxAccountSyncAdapter.java',
     'fxa/sync/FxAccountSyncService.java',
-    'fxa/sync/FxAccountTabsSyncService.java',
     'sync/AlreadySyncingException.java',
     'sync/BadRequiredFieldJSONException.java',
     'sync/CollectionKeys.java',
diff --git a/mobile/android/base/fxa/authenticator/FxAccountAuthenticator.java b/mobile/android/base/fxa/authenticator/FxAccountAuthenticator.java
index 045867b3294d..0b3e42741150 100644
--- a/mobile/android/base/fxa/authenticator/FxAccountAuthenticator.java
+++ b/mobile/android/base/fxa/authenticator/FxAccountAuthenticator.java
@@ -43,9 +43,6 @@ public class FxAccountAuthenticator extends AbstractAccountAuthenticator {
   protected static void enableSyncing(Context context, Account account) {
     for (String authority : new String[] {
         AppConstants.ANDROID_PACKAGE_NAME + ".db.browser",
-        AppConstants.ANDROID_PACKAGE_NAME + ".db.formhistory",
-        AppConstants.ANDROID_PACKAGE_NAME + ".db.tabs",
-        AppConstants.ANDROID_PACKAGE_NAME + ".db.passwords",
     }) {
       ContentResolver.setSyncAutomatically(account, authority, true);
       ContentResolver.setIsSyncable(account, authority, 1);
diff --git a/mobile/android/base/fxa/sync/FxAccountBookmarksSyncService.java b/mobile/android/base/fxa/sync/FxAccountBookmarksSyncService.java
deleted file mode 100644
index 374c73fb5a9c..000000000000
--- a/mobile/android/base/fxa/sync/FxAccountBookmarksSyncService.java
+++ /dev/null
@@ -1,9 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-package org.mozilla.gecko.fxa.sync;
-
-public class FxAccountBookmarksSyncService extends FxAccountSyncService {
-
-}
diff --git a/mobile/android/base/fxa/sync/FxAccountHistorySyncService.java b/mobile/android/base/fxa/sync/FxAccountHistorySyncService.java
deleted file mode 100644
index 6171a11da856..000000000000
--- a/mobile/android/base/fxa/sync/FxAccountHistorySyncService.java
+++ /dev/null
@@ -1,9 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-package org.mozilla.gecko.fxa.sync;
-
-public class FxAccountHistorySyncService extends FxAccountSyncService {
-
-}
diff --git a/mobile/android/base/fxa/sync/FxAccountPasswordsSyncService.java b/mobile/android/base/fxa/sync/FxAccountPasswordsSyncService.java
deleted file mode 100644
index 2dd0905ec534..000000000000
--- a/mobile/android/base/fxa/sync/FxAccountPasswordsSyncService.java
+++ /dev/null
@@ -1,9 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-package org.mozilla.gecko.fxa.sync;
-
-public class FxAccountPasswordsSyncService extends FxAccountHistorySyncService {
-
-}
diff --git a/mobile/android/base/fxa/sync/FxAccountSyncService.java b/mobile/android/base/fxa/sync/FxAccountSyncService.java
index c6f2da059f87..0d271e8615d4 100644
--- a/mobile/android/base/fxa/sync/FxAccountSyncService.java
+++ b/mobile/android/base/fxa/sync/FxAccountSyncService.java
@@ -8,7 +8,7 @@ import android.app.Service;
 import android.content.Intent;
 import android.os.IBinder;
 
-public abstract class FxAccountSyncService extends Service {
+public class FxAccountSyncService extends Service {
   private static final Object syncAdapterLock = new Object();
   private static FxAccountSyncAdapter syncAdapter = null;
 
diff --git a/mobile/android/base/fxa/sync/FxAccountTabsSyncService.java b/mobile/android/base/fxa/sync/FxAccountTabsSyncService.java
deleted file mode 100644
index c3369e235387..000000000000
--- a/mobile/android/base/fxa/sync/FxAccountTabsSyncService.java
+++ /dev/null
@@ -1,9 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-package org.mozilla.gecko.fxa.sync;
-
-public class FxAccountTabsSyncService extends FxAccountSyncService {
-
-}
diff --git a/mobile/android/base/resources/values/fxaccount_styles.xml b/mobile/android/base/resources/values/fxaccount_styles.xml
new file mode 100644
index 000000000000..c73f4bee04e6
--- /dev/null
+++ b/mobile/android/base/resources/values/fxaccount_styles.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+  <style name="FxAccountTheme" parent="@style/Gecko" />
+</resources>
diff --git a/mobile/android/base/resources/xml/fxaccount_history_syncadapter.xml b/mobile/android/base/resources/xml/fxaccount_history_syncadapter.xml
deleted file mode 100644
index 82eabe023ad4..000000000000
--- a/mobile/android/base/resources/xml/fxaccount_history_syncadapter.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<sync-adapter xmlns:android="http://schemas.android.com/apk/res/android"
-    android:accountType="@string/moz_android_shared_fxaccount_type"
-    android:contentAuthority="@string/content_authority_db_formhistory"
-    android:isAlwaysSyncable="true"
-    android:supportsUploading="true"
-    android:userVisible="true"
-/>
diff --git a/mobile/android/base/resources/xml/fxaccount_passwords_syncadapter.xml b/mobile/android/base/resources/xml/fxaccount_passwords_syncadapter.xml
deleted file mode 100644
index 5d4c77280d94..000000000000
--- a/mobile/android/base/resources/xml/fxaccount_passwords_syncadapter.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<sync-adapter xmlns:android="http://schemas.android.com/apk/res/android"
-    android:accountType="@string/moz_android_shared_fxaccount_type"
-    android:contentAuthority="@string/content_authority_db_passwords"
-    android:isAlwaysSyncable="true"
-    android:supportsUploading="true"
-    android:userVisible="true"
-/>
diff --git a/mobile/android/base/resources/xml/fxaccount_bookmarks_syncadapter.xml b/mobile/android/base/resources/xml/fxaccount_syncadapter.xml
similarity index 100%
rename from mobile/android/base/resources/xml/fxaccount_bookmarks_syncadapter.xml
rename to mobile/android/base/resources/xml/fxaccount_syncadapter.xml
diff --git a/mobile/android/base/resources/xml/fxaccount_tabs_syncadapter.xml b/mobile/android/base/resources/xml/fxaccount_tabs_syncadapter.xml
deleted file mode 100644
index ade42184d7a2..000000000000
--- a/mobile/android/base/resources/xml/fxaccount_tabs_syncadapter.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<sync-adapter xmlns:android="http://schemas.android.com/apk/res/android"
-    android:accountType="@string/moz_android_shared_fxaccount_type"
-    android:contentAuthority="@string/content_authority_db_tabs"
-    android:isAlwaysSyncable="true"
-    android:supportsUploading="true"
-    android:userVisible="true"
-/>
diff --git a/mobile/android/base/sync/receivers/UpgradeReceiver.java b/mobile/android/base/sync/receivers/UpgradeReceiver.java
index 4e58fb5e43b8..344b433f670d 100644
--- a/mobile/android/base/sync/receivers/UpgradeReceiver.java
+++ b/mobile/android/base/sync/receivers/UpgradeReceiver.java
@@ -67,7 +67,7 @@ public class UpgradeReceiver extends BroadcastReceiver {
           final String product = GlobalConstants.BROWSER_INTENT_PACKAGE;
           final String username = params.username;
           final String serverURL = params.serverURL;
-          final String profile = Constants.DEFAULT_PROFILE;
+          final String profile = "default";
           try {
             ConfigurationMigrator.ensurePrefsAreVersion(SyncConfiguration.CURRENT_PREFS_VERSION, context, accountManager, account,
                 product, username, serverURL, profile);
diff --git a/mobile/android/services/manifests/FxAccountAndroidManifest_services.xml.in b/mobile/android/services/manifests/FxAccountAndroidManifest_services.xml.in
index 757e921a1308..68293678a5d3 100644
--- a/mobile/android/services/manifests/FxAccountAndroidManifest_services.xml.in
+++ b/mobile/android/services/manifests/FxAccountAndroidManifest_services.xml.in
@@ -11,45 +11,12 @@
         </service>
         <service
             android:exported="false"
-            android:name="org.mozilla.gecko.fxa.sync.FxAccountBookmarksSyncService" >
+            android:name="org.mozilla.gecko.fxa.sync.FxAccountSyncService" >
             <intent-filter >
                 <action android:name="android.content.SyncAdapter" />
             </intent-filter>
 
             <meta-data
                 android:name="android.content.SyncAdapter"
-                android:resource="@xml/fxaccount_bookmarks_syncadapter" />
-        </service>
-        <service
-            android:exported="false"
-            android:name="org.mozilla.gecko.fxa.sync.FxAccountHistorySyncService" >
-            <intent-filter >
-                <action android:name="android.content.SyncAdapter" />
-            </intent-filter>
-
-            <meta-data
-                android:name="android.content.SyncAdapter"
-                android:resource="@xml/fxaccount_history_syncadapter" />
-        </service>
-        <service
-            android:exported="false"
-            android:name="org.mozilla.gecko.fxa.sync.FxAccountPasswordsSyncService" >
-            <intent-filter >
-                <action android:name="android.content.SyncAdapter" />
-            </intent-filter>
-
-            <meta-data
-                android:name="android.content.SyncAdapter"
-                android:resource="@xml/fxaccount_passwords_syncadapter" />
-        </service>
-        <service
-            android:exported="false"
-            android:name="org.mozilla.gecko.fxa.sync.FxAccountTabsSyncService" >
-            <intent-filter >
-                <action android:name="android.content.SyncAdapter" />
-            </intent-filter>
-
-            <meta-data
-                android:name="android.content.SyncAdapter"
-                android:resource="@xml/fxaccount_tabs_syncadapter" />
+                android:resource="@xml/fxaccount_syncadapter" />
         </service>