diff --git a/Images/Dark.png b/Images/Dark.png
index 024ff22cc3..973dfaa788 100644
Binary files a/Images/Dark.png and b/Images/Dark.png differ
diff --git a/Images/Light.png b/Images/Light.png
index 4aa8f76c01..e50052abaf 100644
Binary files a/Images/Light.png and b/Images/Light.png differ
diff --git a/build.gradle b/build.gradle
index afc034e7d8..e2687b949e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -11,8 +11,8 @@ buildscript {
     ext.appcompatVersion = '1.7.0'
     ext.biometricVersion = '1.1.0'
     ext.coreVersion = '1.13.1'
-    ext.fragmentVersion = '1.7.1'
-    ext.lifecycleVersion = '2.8.1'
+    ext.fragmentVersion = '1.8.1'
+    ext.lifecycleVersion = '2.8.3'
     ext.loaderVersion = '1.1.0'
     ext.materialVersion = '1.12.0'
     ext.mediarouterVersion = '1.7.0'
@@ -22,17 +22,17 @@ buildscript {
     ext.recyclerviewVersion = '1.3.2'
     ext.webkitVersion = '1.11.0'
 
-    ext.coroutineVersion = '1.7.3'
+    ext.coroutineVersion = '1.8.1'
     ext.kotlinVersion = '2.0.0'
 
-    ext.cronetVersion = '102.5005.125'
+    ext.cronetVersion = '119.6045.31'
     ext.okhttpVersion = '4.12.0'
-    ext.slf4jVersion = '1.7.36'
+    ext.slf4jVersion = '2.0.13'
     ext.volleyVersion = '1.2.1'
     ext.wearableVersion = '0.1.1'
-    ext.wireVersion = '4.9.9'
+    ext.wireVersion = '5.0.0'
 
-    ext.androidBuildGradleVersion = '8.3.2'
+    ext.androidBuildGradleVersion = '8.5.1'
 
     ext.androidBuildVersionTools = '34.0.0'
 
@@ -82,8 +82,8 @@ allprojects {
     apply plugin: 'idea'
 
     group = 'org.microg.gms'
-    ext.appVersionName = 5.4
-    ext.appVersionCode = 242155000
+    ext.appVersionName = 5.5
+    ext.appVersionCode = 242632000
     ext.baseVersion = ext.appVersionCode.toString()[0..1] + '.' + ext.appVersionCode.toString()[2..3] + '.' + ext.appVersionCode.toString()[4..5]
     version = ext.appVersionName+" GMS-"+ext.baseVersion.replaceAll("\\.", "")
     ext.isReleaseVersion = false
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index b084d326c7..e1ce1bf057 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,7 +3,7 @@
 
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/play-services-base/src/main/java/com/google/android/gms/auth/api/signin/GoogleSignInOptions.java b/play-services-base/src/main/java/com/google/android/gms/auth/api/signin/GoogleSignInOptions.java
index 6033bdbbaa..c742be477b 100644
--- a/play-services-base/src/main/java/com/google/android/gms/auth/api/signin/GoogleSignInOptions.java
+++ b/play-services-base/src/main/java/com/google/android/gms/auth/api/signin/GoogleSignInOptions.java
@@ -72,6 +72,7 @@ public class GoogleSignInOptions extends AutoSafeParcelable {
     private String logSessionId;
 
     private GoogleSignInOptions() {
+        this.scopes = new ArrayList<>();
     }
 
     /**
diff --git a/play-services-core/microg-ui-tools/src/main/res/values/strings.xml b/play-services-core/microg-ui-tools/src/main/res/values/strings.xml
index 107abf1b42..297056bc28 100644
--- a/play-services-core/microg-ui-tools/src/main/res/values/strings.xml
+++ b/play-services-core/microg-ui-tools/src/main/res/values/strings.xml
@@ -44,7 +44,7 @@
 
     <!-- UpdateChecker tag controller-->
 
-    <string name="github_tag_version">5.4</string>
+    <string name="github_tag_version">5.5</string>
 
     <!-- Updater strings-->
 
diff --git a/play-services-core/src/main/AndroidManifest.xml b/play-services-core/src/main/AndroidManifest.xml
index 20a1768250..371e8326d4 100644
--- a/play-services-core/src/main/AndroidManifest.xml
+++ b/play-services-core/src/main/AndroidManifest.xml
@@ -449,9 +449,15 @@
             android:process=":ui"
             android:taskAffinity="org.microg.gms.settings" />
 
+        <activity
+            android:name="org.microg.gms.ui.AccountsFragment$AsActivity"
+            android:label="@string/pref_account_title"
+            android:process=":ui"
+            android:taskAffinity="org.microg.gms.settings" />
+
         <activity
             android:name="org.microg.gms.ui.LegacyAccountSettingsActivity"
-            android:label="@string/privacy_title"
+            android:label="@string/pref_privacy_title"
             android:process=":ui"
             android:taskAffinity="org.microg.gms.settings" />
 
@@ -476,7 +482,7 @@
             android:process=":ui"
             android:exported="true"
             android:excludeFromRecents="true"
-            android:targetActivity="org.microg.gms.ui.MainSettingsActivity"
+            android:targetActivity="org.microg.gms.ui.AccountsFragment$AsActivity"
             android:taskAffinity="org.microg.gms.settings">
             <intent-filter>
                 <action android:name="com.google.android.gms.accountsettings.action.VIEW_SETTINGS" />
diff --git a/play-services-core/src/main/java/org/microg/gms/ui/AccountsFragment.kt b/play-services-core/src/main/java/org/microg/gms/ui/AccountsFragment.kt
index 49b5234bb3..736a2b7e6b 100644
--- a/play-services-core/src/main/java/org/microg/gms/ui/AccountsFragment.kt
+++ b/play-services-core/src/main/java/org/microg/gms/ui/AccountsFragment.kt
@@ -5,18 +5,15 @@ import android.accounts.AccountManager
 import android.content.ActivityNotFoundException
 import android.content.Intent
 import android.graphics.Bitmap
+import android.net.Uri
 import android.os.Bundle
 import android.provider.Settings
 import android.util.Log
-import android.view.Menu
-import android.view.MenuInflater
-import android.view.MenuItem
 import android.view.View
 import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
 import androidx.core.graphics.drawable.RoundedBitmapDrawableFactory
 import androidx.lifecycle.lifecycleScope
-import androidx.navigation.fragment.findNavController
 import androidx.preference.Preference
 import androidx.preference.PreferenceCategory
 import androidx.preference.PreferenceFragmentCompat
@@ -30,6 +27,7 @@ import org.microg.gms.auth.AuthConstants
 import org.microg.gms.auth.login.LoginActivity
 import org.microg.gms.people.DatabaseHelper
 import org.microg.gms.people.PeopleManager
+import org.microg.tools.ui.AbstractSettingsActivity
 
 class AccountsFragment : PreferenceFragmentCompat() {
 
@@ -82,13 +80,14 @@ class AccountsFragment : PreferenceFragmentCompat() {
                     }
                 }
 
-                if (photo == null) {
-                    withContext(Dispatchers.IO) {
-                        PeopleManager.getOwnerAvatarBitmap(context, account.name, true)
-                    }?.let { newPreference.icon = getCircleBitmapDrawable(it) }
+                if (preferenceCategory?.findPreference<Preference>(newPreference.key) == null) {
+                    if (photo == null) {
+                        withContext(Dispatchers.IO) {
+                            PeopleManager.getOwnerAvatarBitmap(context, account.name, true)
+                        }?.let { newPreference.icon = getCircleBitmapDrawable(it) }
+                    }
+                    preferenceCategory?.addPreference(newPreference)
                 }
-
-                preferenceCategory?.addPreference(newPreference)
             }
         }
     }
@@ -137,7 +136,7 @@ class AccountsFragment : PreferenceFragmentCompat() {
             try {
                 startActivity(Intent(Settings.ACTION_SYNC_SETTINGS))
             } catch (activityNotFoundException: ActivityNotFoundException) {
-                Log.e(TAG, "Failed to launch sync settings", activityNotFoundException)
+                Log.e(tag, "Failed to launch sync settings", activityNotFoundException)
             }
             true
         }
@@ -146,29 +145,28 @@ class AccountsFragment : PreferenceFragmentCompat() {
             try {
                 startActivity(Intent(requireContext(), LoginActivity::class.java))
             } catch (activityNotFoundException: ActivityNotFoundException) {
-                Log.e(TAG, "Failed to launch login activity", activityNotFoundException)
+                Log.e(tag, "Failed to launch login activity", activityNotFoundException)
             }
             true
         }
-    }
-
-    init {
-        setHasOptionsMenu(true)
-    }
 
-    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
-        inflater.inflate(R.menu.accounts_menu_item, menu)
-        super.onCreateOptionsMenu(menu, inflater)
-    }
-
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        return when (item.itemId) {
-            R.id.privacy_settings -> {
-                findNavController().navigate(R.id.privacyFragment)
-                true
+        findPreference<Preference>("pref_privacy")?.setOnPreferenceClickListener {
+            try {
+                startActivity(Intent(requireContext(), LegacyAccountSettingsActivity::class.java))
+            } catch (activityNotFoundException: ActivityNotFoundException) {
+                Log.e(tag, "Failed to launch privacy activity", activityNotFoundException)
             }
+            true
+        }
 
-            else -> super.onOptionsItemSelected(item)
+        findPreference<Preference>("pref_manage_history")?.setOnPreferenceClickListener {
+            startActivity(Intent(Intent.ACTION_VIEW, Uri.parse("https://myactivity.google.com/product/youtube")))
+            true
+        }
+
+        findPreference<Preference>("pref_your_data")?.setOnPreferenceClickListener {
+            startActivity(Intent(Intent.ACTION_VIEW, Uri.parse("https://myaccount.google.com/yourdata/youtube")))
+            true
         }
     }
 
@@ -193,4 +191,15 @@ class AccountsFragment : PreferenceFragmentCompat() {
     private fun showToast(message: String) {
         Toast.makeText(requireContext(), message, Toast.LENGTH_SHORT).show()
     }
+
+    class AsActivity : AbstractSettingsActivity() {
+        override fun getFragment(): PreferenceFragmentCompat {
+            return AccountsFragment()
+        }
+
+        override fun onCreate(savedInstanceState: Bundle?) {
+            super.onCreate(savedInstanceState)
+            supportActionBar?.setDisplayHomeAsUpEnabled(true)
+        }
+    }
 }
diff --git a/play-services-core/src/main/java/org/microg/gms/ui/LegacyAccountSettingsActivity.java b/play-services-core/src/main/java/org/microg/gms/ui/LegacyAccountSettingsActivity.java
index 02f211fc5b..813530fcbf 100644
--- a/play-services-core/src/main/java/org/microg/gms/ui/LegacyAccountSettingsActivity.java
+++ b/play-services-core/src/main/java/org/microg/gms/ui/LegacyAccountSettingsActivity.java
@@ -21,6 +21,7 @@
 import android.os.Bundle;
 
 import androidx.annotation.Nullable;
+import androidx.appcompat.app.ActionBar;
 import androidx.fragment.app.Fragment;
 import androidx.preference.Preference;
 
@@ -38,6 +39,16 @@
 
 public class LegacyAccountSettingsActivity extends AbstractSettingsActivity {
 
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        ActionBar actionBar = getSupportActionBar();
+        if (actionBar != null) {
+            actionBar.setDisplayHomeAsUpEnabled(true);
+        }
+    }
+
     @Override
     protected Fragment getFragment() {
         return new AccountSettingsFragment();
@@ -45,7 +56,7 @@ protected Fragment getFragment() {
 
     public static class AccountSettingsFragment extends ResourceSettingsFragment {
         public AccountSettingsFragment() {
-            preferencesResource =  R.xml.preferences_account;
+            preferencesResource = R.xml.preferences_account;
         }
 
         @Override
diff --git a/play-services-core/src/main/kotlin/org/microg/gms/auth/signin/AuthSignInService.kt b/play-services-core/src/main/kotlin/org/microg/gms/auth/signin/AuthSignInService.kt
index 4d8424e381..0f70babf2b 100644
--- a/play-services-core/src/main/kotlin/org/microg/gms/auth/signin/AuthSignInService.kt
+++ b/play-services-core/src/main/kotlin/org/microg/gms/auth/signin/AuthSignInService.kt
@@ -103,8 +103,12 @@ class AuthSignInServiceImpl(
         lifecycleScope.launchWhenStarted {
             try {
                 val account = account ?: options?.account ?: SignInConfigurationService.getDefaultAccount(context, packageName)
-                if (account != null) performSignOut(context, packageName, options, account)
-                SignInConfigurationService.setDefaultAccount(context, packageName, null)
+                if (account != null) {
+                    val defaultOptions = SignInConfigurationService.getDefaultOptions(context, packageName)
+                    Log.d(TAG, "$packageName:signOut defaultOptions:($defaultOptions)")
+                    performSignOut(context, packageName, defaultOptions ?: options, account)
+                }
+                SignInConfigurationService.setDefaultSignInInfo(context, packageName, null, null)
                 runCatching { callbacks.onSignOut(Status.SUCCESS) }
             } catch (e: Exception) {
                 Log.w(TAG, e)
@@ -137,7 +141,7 @@ class AuthSignInServiceImpl(
                         authManager.invalidateAuthToken(token)
                         authManager.isPermitted = false
                     }
-                    SignInConfigurationService.setDefaultAccount(context, packageName, account)
+                    SignInConfigurationService.setDefaultSignInInfo(context, packageName, account, options?.toJson())
                     runCatching { callbacks.onRevokeAccess(Status.SUCCESS) }
                 } catch (e: Exception) {
                     Log.w(TAG, e)
diff --git a/play-services-core/src/main/kotlin/org/microg/gms/auth/signin/SignInConfigurationService.kt b/play-services-core/src/main/kotlin/org/microg/gms/auth/signin/SignInConfigurationService.kt
index dec280687b..5cc24f7994 100644
--- a/play-services-core/src/main/kotlin/org/microg/gms/auth/signin/SignInConfigurationService.kt
+++ b/play-services-core/src/main/kotlin/org/microg/gms/auth/signin/SignInConfigurationService.kt
@@ -12,6 +12,7 @@ import android.content.*
 import android.os.*
 import androidx.core.content.getSystemService
 import androidx.core.os.bundleOf
+import com.google.android.gms.auth.api.signin.GoogleSignInOptions
 import org.microg.gms.auth.AuthConstants
 import org.microg.gms.common.PackageUtils
 import kotlin.coroutines.resume
@@ -20,12 +21,15 @@ import kotlin.coroutines.suspendCoroutine
 
 private const val PREFERENCES_NAME = "google_account_cache"
 private const val DEFAULT_ACCOUNT_PREFIX = "default_google_account_"
+private const val DEFAULT_SIGN_IN_OPTIONS_PREFIX = "default_sign_in_options_"
 
 private const val MSG_GET_DEFAULT_ACCOUNT = 1
-private const val MSG_SET_DEFAULT_ACCOUNT = 2
+private const val MSG_SET_DEFAULT_SIGN_IN_INFO = 2
+private const val MSG_GET_DEFAULT_OPTIONS = 3
 
 private const val MSG_DATA_PACKAGE_NAME = "package_name"
 private const val MSG_DATA_ACCOUNT = "account"
+private const val MSG_DATA_SIGN_IN_OPTIONS = "google_sign_in_options"
 
 class SignInConfigurationService : Service() {
     private val preferences: SharedPreferences
@@ -46,13 +50,24 @@ class SignInConfigurationService : Service() {
                         )
                     }
 
-                    MSG_SET_DEFAULT_ACCOUNT -> {
+                    MSG_SET_DEFAULT_SIGN_IN_INFO -> {
                         val packageName = msg.data?.getString(MSG_DATA_PACKAGE_NAME)
                         val account = msg.data?.getParcelable<Account>(MSG_DATA_ACCOUNT)
-                        packageName?.let { setDefaultAccount(it, account) }
+                        val googleSignInOptions = msg.data?.getString(MSG_DATA_SIGN_IN_OPTIONS)
+                        packageName?.let { setDefaultSignInInfo(it, account, googleSignInOptions) }
                         bundleOf(
                             MSG_DATA_PACKAGE_NAME to packageName,
-                            MSG_DATA_ACCOUNT to account
+                            MSG_DATA_ACCOUNT to account,
+                            MSG_DATA_SIGN_IN_OPTIONS to googleSignInOptions,
+                        )
+                    }
+
+                    MSG_GET_DEFAULT_OPTIONS -> {
+                        val packageName = msg.data?.getString(MSG_DATA_PACKAGE_NAME)
+                        val googleSignInOptions = packageName?.let { getDefaultOptions(it) }
+                        bundleOf(
+                            MSG_DATA_PACKAGE_NAME to packageName,
+                            MSG_DATA_SIGN_IN_OPTIONS to googleSignInOptions
                         )
                     }
 
@@ -80,13 +95,24 @@ class SignInConfigurationService : Service() {
         return null
     }
 
-    private fun setDefaultAccount(packageName: String, account: Account?) {
+    private fun getDefaultOptions(packageName: String): String? {
+        val data = preferences.getString(DEFAULT_SIGN_IN_OPTIONS_PREFIX + getPackageNameSuffix(packageName), null)
+        if (data.isNullOrBlank()) return null
+        return data
+    }
+
+    private fun setDefaultSignInInfo(packageName: String, account: Account?, optionsJson: String?) {
         val editor: SharedPreferences.Editor = preferences.edit()
         if (account == null || account.name == AuthConstants.DEFAULT_ACCOUNT) {
             editor.remove(DEFAULT_ACCOUNT_PREFIX + getPackageNameSuffix(packageName))
         } else {
             editor.putString(DEFAULT_ACCOUNT_PREFIX + getPackageNameSuffix(packageName), account.name)
         }
+        if (optionsJson == null) {
+            editor.remove(DEFAULT_SIGN_IN_OPTIONS_PREFIX + getPackageNameSuffix(packageName))
+        } else {
+            editor.putString(DEFAULT_SIGN_IN_OPTIONS_PREFIX + getPackageNameSuffix(packageName), optionsJson)
+        }
         editor.apply()
     }
 
@@ -130,12 +156,22 @@ class SignInConfigurationService : Service() {
             }).data?.getParcelable(MSG_DATA_ACCOUNT)
         }
 
-        suspend fun setDefaultAccount(context: Context, packageName: String, account: Account?) {
+        suspend fun getDefaultOptions(context: Context, packageName: String): GoogleSignInOptions? {
+            return singleRequest(context, Message.obtain().apply {
+                what = MSG_GET_DEFAULT_OPTIONS
+                data = bundleOf(
+                    MSG_DATA_PACKAGE_NAME to packageName
+                )
+            }).data?.getString(MSG_DATA_SIGN_IN_OPTIONS)?.let { GoogleSignInOptions.fromJson(it) }
+        }
+
+        suspend fun setDefaultSignInInfo(context: Context, packageName: String, account: Account?, optionsJson: String?) {
             singleRequest(context, Message.obtain().apply {
-                what = MSG_SET_DEFAULT_ACCOUNT
+                what = MSG_SET_DEFAULT_SIGN_IN_INFO
                 data = bundleOf(
                     MSG_DATA_PACKAGE_NAME to packageName,
-                    MSG_DATA_ACCOUNT to account
+                    MSG_DATA_ACCOUNT to account,
+                    MSG_DATA_SIGN_IN_OPTIONS to optionsJson
                 )
             })
         }
diff --git a/play-services-core/src/main/kotlin/org/microg/gms/auth/signin/extensions.kt b/play-services-core/src/main/kotlin/org/microg/gms/auth/signin/extensions.kt
index 7c1623f1d3..90ba353c7f 100644
--- a/play-services-core/src/main/kotlin/org/microg/gms/auth/signin/extensions.kt
+++ b/play-services-core/src/main/kotlin/org/microg/gms/auth/signin/extensions.kt
@@ -105,7 +105,7 @@ suspend fun performSignIn(context: Context, packageName: String, options: Google
             databaseHelper.close()
         }
     } else listOf(null, null, null, null)
-    SignInConfigurationService.setDefaultAccount(context, packageName, account)
+    SignInConfigurationService.setDefaultSignInInfo(context, packageName, account, options?.toJson())
     return GoogleSignInAccount(
         id,
         tokenId,
diff --git a/play-services-core/src/main/res/drawable/ic_youtube_data.xml b/play-services-core/src/main/res/drawable/ic_youtube_data.xml
new file mode 100644
index 0000000000..86b27ba0c7
--- /dev/null
+++ b/play-services-core/src/main/res/drawable/ic_youtube_data.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?colorControlNormal"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="#FF1C1B1F"
+        android:pathData="M160,840Q143,840 131.5,828.5Q120,817 120,800L120,760Q120,743 131.5,731.5Q143,720 160,720Q177,720 188.5,731.5Q200,743 200,760L200,800Q200,817 188.5,828.5Q177,840 160,840ZM320,840Q303,840 291.5,828.5Q280,817 280,800L280,580Q280,563 291.5,551.5Q303,540 320,540Q337,540 348.5,551.5Q360,563 360,580L360,800Q360,817 348.5,828.5Q337,840 320,840ZM480,840Q463,840 451.5,828.5Q440,817 440,800L440,660Q440,643 451.5,631.5Q463,620 480,620Q497,620 508.5,631.5Q520,643 520,660L520,800Q520,817 508.5,828.5Q497,840 480,840ZM640,840Q623,840 611.5,828.5Q600,817 600,800L600,600Q600,583 611.5,571.5Q623,560 640,560Q657,560 668.5,571.5Q680,583 680,600L680,800Q680,817 668.5,828.5Q657,840 640,840ZM800,840Q783,840 771.5,828.5Q760,817 760,800L760,440Q760,423 771.5,411.5Q783,400 800,400Q817,400 828.5,411.5Q840,423 840,440L840,800Q840,817 828.5,828.5Q817,840 800,840ZM560,479Q544,479 529.5,473Q515,467 503,456L400,353Q400,353 400,353Q400,353 400,353L188,565Q176,577 159.5,576.5Q143,576 131,564Q120,552 120.5,535.5Q121,519 132,508L343,297Q355,285 369.5,279.5Q384,274 400,274Q416,274 431,279.5Q446,285 457,297L560,400Q560,400 560,400Q560,400 560,400L772,188Q784,176 800.5,176.5Q817,177 829,189Q840,201 839.5,217.5Q839,234 828,245L617,456Q606,467 591,473Q576,479 560,479Z" />
+</vector>
\ No newline at end of file
diff --git a/play-services-core/src/main/res/drawable/ic_youtube_history.xml b/play-services-core/src/main/res/drawable/ic_youtube_history.xml
new file mode 100644
index 0000000000..d884a9d075
--- /dev/null
+++ b/play-services-core/src/main/res/drawable/ic_youtube_history.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?colorControlNormal"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="#FF1C1B1F"
+        android:pathData="M480,840Q354,840 257,763.5Q160,687 131,568Q127,553 137,540.5Q147,528 164,526Q180,524 193,532Q206,540 211,556Q235,646 310,703Q385,760 480,760Q597,760 678.5,678.5Q760,597 760,480Q760,363 678.5,281.5Q597,200 480,200Q411,200 351,232Q291,264 250,320L320,320Q337,320 348.5,331.5Q360,343 360,360Q360,377 348.5,388.5Q337,400 320,400L160,400Q143,400 131.5,388.5Q120,377 120,360L120,200Q120,183 131.5,171.5Q143,160 160,160Q177,160 188.5,171.5Q200,183 200,200L200,254Q251,190 324.5,155Q398,120 480,120Q555,120 620.5,148.5Q686,177 734.5,225.5Q783,274 811.5,339.5Q840,405 840,480Q840,555 811.5,620.5Q783,686 734.5,734.5Q686,783 620.5,811.5Q555,840 480,840ZM520,464L620,564Q631,575 631,592Q631,609 620,620Q609,631 592,631Q575,631 564,620L452,508Q446,502 443,494.5Q440,487 440,479L440,320Q440,303 451.5,291.5Q463,280 480,280Q497,280 508.5,291.5Q520,303 520,320L520,464Z"/></vector>
\ No newline at end of file
diff --git a/play-services-core/src/main/res/layout/ask_permission.xml b/play-services-core/src/main/res/layout/ask_permission.xml
index 82f8b931b5..92e1e48239 100644
--- a/play-services-core/src/main/res/layout/ask_permission.xml
+++ b/play-services-core/src/main/res/layout/ask_permission.xml
@@ -26,7 +26,7 @@
         android:layout_height="wrap_content"
         android:gravity="center_horizontal"
         android:paddingTop="10dp"
-        android:text="@string/privacy_title"
+        android:text="@string/pref_privacy_title"
         android:textColor="?attr/colorPrimary" />
 
     <View
diff --git a/play-services-core/src/main/res/menu/accounts_menu_item.xml b/play-services-core/src/main/res/menu/accounts_menu_item.xml
deleted file mode 100644
index 60a142257f..0000000000
--- a/play-services-core/src/main/res/menu/accounts_menu_item.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <item
-        android:id="@+id/privacy_settings"
-        android:icon="@drawable/ic_privacy"
-        android:title="@string/privacy_title"
-        app:showAsAction="always" />
-</menu>
\ No newline at end of file
diff --git a/play-services-core/src/main/res/navigation/nav_settings.xml b/play-services-core/src/main/res/navigation/nav_settings.xml
index 10d40ceeb0..a2918ca23e 100644
--- a/play-services-core/src/main/res/navigation/nav_settings.xml
+++ b/play-services-core/src/main/res/navigation/nav_settings.xml
@@ -42,7 +42,7 @@
     <fragment
         android:id="@+id/accountManagerFragment"
         android:name="org.microg.gms.ui.AccountsFragment"
-        android:label="@string/pref_add_account_title" />
+        android:label="@string/pref_account_title" />
 
     <!-- Push Notifications -->
 
@@ -86,11 +86,6 @@
         android:name="org.microg.gms.ui.PushNotificationAdvancedFragment"
         android:label="@string/menu_settings" />
 
-    <fragment
-        android:id="@+id/privacyFragment"
-        android:name="org.microg.gms.ui.LegacyAccountSettingsActivity$AccountSettingsFragment"
-        android:label="@string/privacy_title" />
-
     <!-- About -->
 
     <fragment
diff --git a/play-services-core/src/main/res/values-pt-rBR/strings.xml b/play-services-core/src/main/res/values-pt-rBR/strings.xml
index 09db6584a5..0aec7dbf36 100644
--- a/play-services-core/src/main/res/values-pt-rBR/strings.xml
+++ b/play-services-core/src/main/res/values-pt-rBR/strings.xml
@@ -11,7 +11,8 @@
     <string name="ask_scope_permission_title"><xliff:g example="F-Droid">%1$s</xliff:g> gostaria de:</string>
     <string name="ask_service_permission_title"><xliff:g example="F-Droid">%1$s</xliff:g> gostaria de usar:</string>
 
-    <string name="privacy_title">Privacidade</string>
+    <string name="pref_privacy_title">Privacidade</string>
+    <string name="pref_privacy_summary">Configurações de privacidade para autenticação e apps</string>
     <string name="prefcat_applications">Aplicativos</string>
     <string name="prefcat_authentication">Autenticação</string>
 
@@ -108,8 +109,8 @@ Isso pode levar alguns minutos."</string>
 
     <string name="pref_info_status">Status</string>
 
-    <string name="pref_add_account_title">Contas</string>
-    <string name="pref_add_account_summary">Fazer login em uma conta Google</string>
+    <string name="pref_account_title">Contas</string>
+    <string name="pref_account_summary">Fazer login em uma conta Google</string>
     <string name="pref_gcm_enable_mcs_summary">Cloud Messaging é um provedor de notificação push usado por aplicativos modificados. Para utilizar você deve habilitar o registro de dispositivos</string>
     <string name="pref_gcm_confirm_new_apps_title">Confirmar novos apps</string>
     <string name="pref_gcm_confirm_new_apps_summary">Perguntar antes de registrar um novo app para receber notificações push</string>
@@ -169,6 +170,10 @@ Isso pode levar alguns minutos."</string>
     <string name="pref_accounts_add_account_title">Adicionar conta</string>
     <string name="pref_accounts_manage_accounts_title">Gerenciador de contas</string>
     <string name="pref_accounts_manage_accounts_summary">Abrir o gerenciador de contas do dispositivo</string>
+    <!-- YouTube activity-->
+    <string name="prefcat_youtube_activity">Atividades no YouTube</string>
+    <string name="pref_manage_all_history">Gerencie todo o histórico</string>
+    <string name="pref_data_in_youtube">Seus dados no YouTube</string>
 
     <!-- Account remove dialog-->
 
diff --git a/play-services-core/src/main/res/values/strings.xml b/play-services-core/src/main/res/values/strings.xml
index 446df8a341..e81936ec69 100644
--- a/play-services-core/src/main/res/values/strings.xml
+++ b/play-services-core/src/main/res/values/strings.xml
@@ -13,7 +13,8 @@
     <string name="ask_scope_permission_title"><xliff:g example="F-Droid">%1$s</xliff:g> would like to:</string>
     <string name="ask_service_permission_title"><xliff:g example="F-Droid">%1$s</xliff:g> would like to use:</string>
 
-    <string name="privacy_title">Privacy</string>
+    <string name="pref_privacy_title">Privacy</string>
+    <string name="pref_privacy_summary">Privacy settings for authentication and apps</string>
     <string name="prefcat_applications">Applications</string>
     <string name="prefcat_authentication">Authentication</string>
 
@@ -119,8 +120,8 @@ This can take a couple of minutes"</string>
 
     <string name="pref_info_status">Status</string>
 
-    <string name="pref_add_account_title">Accounts</string>
-    <string name="pref_add_account_summary">Login in new Google account</string>
+    <string name="pref_account_title">Accounts</string>
+    <string name="pref_account_summary">Login in new Google account</string>
     <string name="pref_gcm_enable_mcs_summary">Cloud Messaging is a push notification provider used for modified apps. To use it you must enable device registration</string>
     <string name="pref_gcm_confirm_new_apps_title">Confirm new apps</string>
     <string name="pref_gcm_confirm_new_apps_summary">Ask before registering a new app to receive push notifications</string>
@@ -180,6 +181,10 @@ This can take a couple of minutes"</string>
     <string name="pref_accounts_add_account_title">Add account</string>
     <string name="pref_accounts_manage_accounts_title">Manage accounts</string>
     <string name="pref_accounts_manage_accounts_summary">Open device accounts manager</string>
+    <!-- YouTube activity-->
+    <string name="prefcat_youtube_activity">YouTube Activity</string>
+    <string name="pref_manage_all_history">Manage all history</string>
+    <string name="pref_data_in_youtube">Your data in YouTube</string>
 
     <!-- Account remove dialog-->
 
diff --git a/play-services-core/src/main/res/xml/preferences_accounts.xml b/play-services-core/src/main/res/xml/preferences_accounts.xml
index 40c61fa403..4384164fc7 100644
--- a/play-services-core/src/main/res/xml/preferences_accounts.xml
+++ b/play-services-core/src/main/res/xml/preferences_accounts.xml
@@ -1,20 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <PreferenceCategory
         android:key="prefcat_current_accounts"
         android:title="@string/prefcat_accounts_login_accounts_title"
         android:visibility="gone" />
 
+    <Preference
+        android:icon="@drawable/ic_add_new_account"
+        android:key="pref_add_account"
+        app:allowDividerBelow="true"
+        android:title="@string/pref_accounts_add_account_title" />
+
     <PreferenceCategory
         android:key="prefcat_account_settings"
         android:title="@string/prefcat_accounts_options_title">
 
         <Preference
-            android:icon="@drawable/ic_add_new_account"
-            android:key="pref_add_account"
-            android:summary="@string/pref_add_account_summary"
-            android:title="@string/pref_accounts_add_account_title" />
+            android:icon="@drawable/ic_privacy"
+            android:key="pref_privacy"
+            android:summary="@string/pref_privacy_summary"
+            android:title="@string/pref_privacy_title" />
 
         <Preference
             android:icon="@drawable/ic_manage_account"
@@ -22,4 +29,17 @@
             android:summary="@string/pref_accounts_manage_accounts_summary"
             android:title="@string/pref_accounts_manage_accounts_title" />
     </PreferenceCategory>
+
+    <PreferenceCategory android:title="@string/prefcat_youtube_activity">
+
+        <Preference
+            android:key="pref_manage_history"
+            android:icon="@drawable/ic_youtube_history"
+            android:title="@string/pref_manage_all_history" />
+
+        <Preference
+            android:key="pref_your_data"
+            android:icon="@drawable/ic_youtube_data"
+            android:title="@string/pref_data_in_youtube" />
+    </PreferenceCategory>
 </PreferenceScreen>
\ No newline at end of file
diff --git a/play-services-core/src/main/res/xml/preferences_start.xml b/play-services-core/src/main/res/xml/preferences_start.xml
index db35ca2ae7..5d19e37cd7 100644
--- a/play-services-core/src/main/res/xml/preferences_start.xml
+++ b/play-services-core/src/main/res/xml/preferences_start.xml
@@ -28,7 +28,7 @@
             android:icon="@drawable/ic_accounts"
             android:key="pref_accounts"
             android:summary="@string/pref_accounts_summary"
-            android:title="@string/pref_add_account_title" />
+            android:title="@string/pref_account_title" />
 
         <Preference
             android:icon="@drawable/ic_device_login"