diff --git a/.github/matchers/gradle-build-matcher.json b/.github/matchers/gradle-build-matcher.json
index e22f22eac4..df09e4f4d8 100644
--- a/.github/matchers/gradle-build-matcher.json
+++ b/.github/matchers/gradle-build-matcher.json
@@ -4,7 +4,7 @@
       "owner": "gradle-build-matcher",
       "pattern": [
         {
-          "regexp": "^([^:]+):(\\d+):\\s(error|Error):\\s(.+)$",
+          "regexp": "^\\s*([^:]+):(\\d+):\\s(error|Error):\\s(.+)$",
           "file": 1,
           "line": 2,
           "severity": 3,
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 67c506394b..0bd69ddc39 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -41,5 +41,7 @@ jobs:
               echo "Matcher configured: ${NAME:?}"
             fi
           done
-      - name: "Execute Gradle build"
-        run: "./gradlew --no-daemon build"
+      - name: "Execute Gradle assemble"
+        run: "./gradlew --no-daemon assemble"
+      - name: "Execute Gradle check"
+        run: "./gradlew --no-daemon check"
diff --git a/build.gradle b/build.gradle
index 76c0cbe862..4119b63f7f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -82,8 +82,8 @@ allprojects {
     apply plugin: 'idea'
 
     group = 'org.microg.gms'
-    ext.appVersionName = 5.1
-    ext.appVersionCode = 240812000
+    ext.appVersionName = 5.2
+    ext.appVersionCode = 240856000
     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/fake-signature/src/huawei/java/com/huawei/signature/diff/AppListDatabaseOpenHelper.java b/fake-signature/src/huawei/java/com/huawei/signature/diff/AppListDatabaseOpenHelper.java
index 46441eb033..f7e2d26eef 100644
--- a/fake-signature/src/huawei/java/com/huawei/signature/diff/AppListDatabaseOpenHelper.java
+++ b/fake-signature/src/huawei/java/com/huawei/signature/diff/AppListDatabaseOpenHelper.java
@@ -18,7 +18,7 @@ public class AppListDatabaseOpenHelper extends SQLiteOpenHelper {
     public static final String TABLE_APPLIST = "applist";
     public static final String COLUMN_NAME = "name";
     public static final String COLUMN_FAKE = "fake";
-    private static final int DATABASE_VERSION = 2;
+    private static final int DATABASE_VERSION = 3;
     private static final String DROP_APP_LIST_TABLE = "DROP TABLE IF EXISTS " + TABLE_APPLIST;
     private static final String CREATE_APP_LIST_TABLE = "CREATE TABLE IF NOT EXISTS " + TABLE_APPLIST + "(" +
             COLUMN_NAME + " VARCHAR(255) PRIMARY KEY, " +
diff --git a/fake-signature/src/main/res/values/arrays.xml b/fake-signature/src/main/res/values/arrays.xml
index 86a670a0bb..4f3118db88 100644
--- a/fake-signature/src/main/res/values/arrays.xml
+++ b/fake-signature/src/main/res/values/arrays.xml
@@ -28,6 +28,10 @@
         <item>com.mobisoft.morhipo</item>
         <item>com.zzkko</item>
         <item>com.didilabs.kaavefali</item>
+        <item>com.airbnb.android</item>
+        <item>com.mobillium.papara</item>
+        <item>co.com.fincaraiz.app</item>
+        <item>com.frisby.frisby</item>
     </string-array>
     <string-array name="signature_never_fake">
         <item>com.truecaller</item>
diff --git a/play-services-base/core/src/main/kotlin/org/microg/gms/ui/AppPreference.kt b/play-services-base/core/src/main/kotlin/org/microg/gms/ui/AppPreference.kt
index 2675793263..a34e561412 100644
--- a/play-services-base/core/src/main/kotlin/org/microg/gms/ui/AppPreference.kt
+++ b/play-services-base/core/src/main/kotlin/org/microg/gms/ui/AppPreference.kt
@@ -99,6 +99,9 @@ abstract class AppPreference : Preference {
             packageName.contains(".revanced.android") -> context.getString(R.string.revanced)
             packageName.contains(".rvx.android") -> context.getString(R.string.revanced_extended)
             packageName.contains(".rex.android") -> context.getString(R.string.youtube_advanced)
+            packageName.contains(".rve.android") -> context.getString(R.string.revanced_extended_rufusin)
+            packageName.contains("anddea.youtube") -> context.getString(R.string.revanced_extended_anddea)
+            packageName.contains("bill.youtube") -> context.getString(R.string.revanced_extended_anddea)
             else -> ""
         }
 
diff --git a/play-services-base/core/src/main/res/drawable/ic_expand_apps.xml b/play-services-base/core/src/main/res/drawable/ic_expand_apps.xml
index 4275084e72..b9d7dd1326 100644
--- a/play-services-base/core/src/main/res/drawable/ic_expand_apps.xml
+++ b/play-services-base/core/src/main/res/drawable/ic_expand_apps.xml
@@ -5,17 +5,17 @@
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
+    android:width="25dp"
+    android:height="25dp"
     android:tint="?attr/colorAccent"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportWidth="25"
+    android:viewportHeight="25">
     <group>
-        <clip-path android:pathData="M0 0H24V24H0z" />
+        <clip-path android:pathData="M.64.92H24.64V24.92H.64z" />
         <group>
             <path
-                android:fillColor="#FF000000"
-                android:pathData="M12.6 12L8 7.4 9.4 6l6 6-6 6L8 16.6l4.6-4.6Z" />
+                android:fillColor="#FF1C1B1F"
+                android:pathData="M13.24 12.92l-3.9-3.9C9.16 8.83 9.07 8.6 9.07 8.32c0-0.29 0.1-0.52 0.27-0.7 0.19-0.19 0.42-0.28 0.7-0.28 0.29 0 0.52 0.1 0.7 0.28l4.6 4.6c0.1 0.1 0.17 0.2 0.22 0.32 0.04 0.12 0.06 0.24 0.06 0.38 0 0.13-0.02 0.26-0.06 0.37-0.05 0.12-0.12 0.23-0.22 0.33l-4.6 4.6c-0.18 0.18-0.41 0.27-0.7 0.27-0.28 0-0.51-0.09-0.7-0.27-0.18-0.19-0.27-0.42-0.27-0.7 0-0.29 0.1-0.52 0.27-0.7l3.9-3.9Z" />
         </group>
     </group>
 </vector>
\ No newline at end of file
diff --git a/play-services-base/core/src/main/res/drawable/ic_info_outline.xml b/play-services-base/core/src/main/res/drawable/ic_info_outline.xml
deleted file mode 100644
index a3904c31b0..0000000000
--- a/play-services-base/core/src/main/res/drawable/ic_info_outline.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ SPDX-FileCopyrightText: 2019, The Android Open Source Project
-  ~ SPDX-FileCopyrightText: 2020, microG Project Team
-  ~ SPDX-License-Identifier: Apache-2.0
-  -->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:tint="?colorControlNormal"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <group>
-        <clip-path android:pathData="M0 0H24V24H0z" />
-        <group>
-            <path
-                android:fillColor="#000000"
-                android:pathData="M11 17h2v-6h-2v6Zm1-8c0.28 0 0.52-0.1 0.71-0.29C12.91 8.52 13 8.28 13 8c0-0.28-0.1-0.52-0.29-0.71C12.52 7.09 12.28 7 12 7c-0.28 0-0.52 0.1-0.71 0.29C11.09 7.48 11 7.72 11 8c0 0.28 0.1 0.52 0.29 0.71C11.48 8.91 11.72 9 12 9Zm0 13c-1.38 0-2.68-0.26-3.9-0.79-1.22-0.52-2.27-1.23-3.17-2.14-0.9-0.9-1.62-1.95-2.14-3.17C2.26 14.68 2 13.38 2 12s0.26-2.68 0.79-3.9C3.3 6.88 4.03 5.83 4.92 4.93c0.9-0.9 1.96-1.62 3.18-2.14C9.32 2.26 10.62 2 12 2s2.68 0.26 3.9 0.79c1.22 0.52 2.28 1.24 3.17 2.13 0.9 0.9 1.62 1.96 2.14 3.18C21.74 9.32 22 10.62 22 12s-0.26 2.68-0.79 3.9c-0.52 1.22-1.23 2.28-2.14 3.17-0.9 0.9-1.95 1.62-3.17 2.14C14.68 21.74 13.38 22 12 22Zm0-2c2.23 0 4.13-0.77 5.68-2.32C19.23 16.13 20 14.23 20 12c0-2.23-0.77-4.13-2.32-5.67C16.13 4.78 14.23 4 12 4 9.77 4 7.87 4.78 6.33 6.33 4.78 7.87 4 9.77 4 12s0.78 4.13 2.33 5.68C7.87 19.23 9.77 20 12 20Z" />
-        </group>
-    </group>
-</vector>
\ No newline at end of file
diff --git a/play-services-base/core/src/main/res/drawable/ic_information.xml b/play-services-base/core/src/main/res/drawable/ic_information.xml
new file mode 100644
index 0000000000..0f2c07cb7c
--- /dev/null
+++ b/play-services-base/core/src/main/res/drawable/ic_information.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ SPDX-FileCopyrightText: 2019, The Android Open Source Project
+  ~ SPDX-FileCopyrightText: 2020, microG Project Team
+  ~ SPDX-License-Identifier: Apache-2.0
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?colorControlNormal"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <group>
+        <clip-path android:pathData="M0 0H24V24H0z" />
+        <group>
+            <path
+                android:fillColor="#FF1C1B1F"
+                android:pathData="M12 17c0.28 0 0.52-0.1 0.71-0.29C12.91 16.52 13 16.28 13 16v-4c0-0.28-0.1-0.52-0.29-0.71C12.52 11.09 12.28 11 12 11c-0.28 0-0.52 0.1-0.71 0.29C11.09 11.48 11 11.72 11 12v4c0 0.28 0.1 0.52 0.29 0.71C11.48 16.91 11.72 17 12 17Zm0-8c0.28 0 0.52-0.1 0.71-0.29C12.91 8.52 13 8.28 13 8c0-0.28-0.1-0.52-0.29-0.71C12.52 7.09 12.28 7 12 7c-0.28 0-0.52 0.1-0.71 0.29C11.09 7.48 11 7.72 11 8c0 0.28 0.1 0.52 0.29 0.71C11.48 8.91 11.72 9 12 9Zm0 13c-1.38 0-2.68-0.26-3.9-0.79-1.22-0.52-2.27-1.23-3.17-2.14-0.9-0.9-1.62-1.95-2.14-3.17C2.26 14.68 2 13.38 2 12s0.26-2.68 0.79-3.9C3.3 6.88 4.03 5.83 4.92 4.93c0.9-0.9 1.96-1.62 3.18-2.14C9.32 2.26 10.62 2 12 2s2.68 0.26 3.9 0.79c1.22 0.52 2.28 1.24 3.17 2.13 0.9 0.9 1.62 1.96 2.14 3.18C21.74 9.32 22 10.62 22 12s-0.26 2.68-0.79 3.9c-0.52 1.22-1.23 2.28-2.14 3.17-0.9 0.9-1.95 1.62-3.17 2.14C14.68 21.74 13.38 22 12 22Zm0-2c2.23 0 4.13-0.77 5.68-2.32C19.23 16.13 20 14.23 20 12c0-2.23-0.77-4.13-2.32-5.67C16.13 4.78 14.23 4 12 4 9.77 4 7.87 4.78 6.33 6.33 4.78 7.87 4 9.77 4 12s0.78 4.13 2.33 5.68C7.87 19.23 9.77 20 12 20Z" />
+        </group>
+    </group>
+</vector>
\ No newline at end of file
diff --git a/play-services-base/core/src/main/res/drawable/ic_open.xml b/play-services-base/core/src/main/res/drawable/ic_open.xml
index 96c3fe42ea..35ae992f81 100644
--- a/play-services-base/core/src/main/res/drawable/ic_open.xml
+++ b/play-services-base/core/src/main/res/drawable/ic_open.xml
@@ -14,8 +14,8 @@
         <clip-path android:pathData="M0 0H24V24H0z" />
         <group>
             <path
-                android:fillColor="#000000"
-                android:pathData="M5 21c-0.55 0-1.02-0.2-1.41-0.59C3.19 20.02 3 19.55 3 19V5c0-0.55 0.2-1.02 0.59-1.41C3.98 3.19 4.45 3 5 3h7v2H5v14h14v-7h2v7c0 0.55-0.2 1.02-0.59 1.41C20.02 20.81 19.55 21 19 21H5Zm4.7-5.3l-1.4-1.4L17.6 5H14V3h7v7h-2V6.4l-9.3 9.3Z" />
+                android:fillColor="#FF1C1B1F"
+                android:pathData="M5 21c-0.55 0-1.02-0.2-1.41-0.59C3.19 20.02 3 19.55 3 19V5c0-0.55 0.2-1.02 0.59-1.41C3.98 3.19 4.45 3 5 3h6c0.28 0 0.52 0.1 0.71 0.29C11.91 3.48 12 3.72 12 4c0 0.28-0.1 0.52-0.29 0.71C11.52 4.91 11.28 5 11 5H5v14h14v-6c0-0.28 0.1-0.52 0.29-0.71C19.48 12.09 19.72 12 20 12c0.28 0 0.52 0.1 0.71 0.29C20.91 12.48 21 12.72 21 13v6c0 0.55-0.2 1.02-0.59 1.41C20.02 20.81 19.55 21 19 21H5ZM19 6.4L10.4 15c-0.18 0.18-0.42 0.28-0.7 0.28-0.28 0-0.52-0.1-0.7-0.28-0.18-0.18-0.28-0.42-0.28-0.7 0-0.28 0.1-0.52 0.28-0.7L17.6 5H15c-0.28 0-0.52-0.1-0.71-0.29C14.09 4.52 14 4.28 14 4c0-0.28 0.1-0.52 0.29-0.71C14.48 3.09 14.72 3 15 3h5c0.28 0 0.52 0.1 0.71 0.29C20.91 3.48 21 3.72 21 4v5c0 0.28-0.1 0.52-0.29 0.71C20.52 9.91 20.28 10 20 10c-0.28 0-0.52-0.1-0.71-0.29C19.09 9.52 19 9.28 19 9V6.4Z" />
         </group>
     </group>
 </vector>
\ No newline at end of file
diff --git a/play-services-base/core/src/main/res/drawable/ic_patcher.xml b/play-services-base/core/src/main/res/drawable/ic_patcher.xml
index c9d20a8ae6..54997c8661 100644
--- a/play-services-base/core/src/main/res/drawable/ic_patcher.xml
+++ b/play-services-base/core/src/main/res/drawable/ic_patcher.xml
@@ -9,7 +9,7 @@
         <clip-path android:pathData="M0 0H24V24H0z" />
         <group>
             <path
-                android:fillColor="#000000"
+                android:fillColor="#FF1C1B1F"
                 android:pathData="M18.85 21.98c-0.13 0-0.26-0.03-0.38-0.07-0.11-0.04-0.22-0.11-0.32-0.21l-5.1-5.1c-0.1-0.1-0.17-0.2-0.21-0.33-0.04-0.11-0.06-0.24-0.06-0.37s0.02-0.26 0.06-0.38c0.04-0.11 0.11-0.22 0.21-0.32l2.13-2.13c0.1-0.1 0.2-0.17 0.32-0.2 0.12-0.05 0.24-0.07 0.38-0.07 0.13 0 0.25 0.02 0.37 0.06 0.12 0.04 0.23 0.12 0.32 0.21l5.1 5.1c0.1 0.1 0.18 0.21 0.22 0.33 0.04 0.12 0.06 0.24 0.06 0.38 0 0.13-0.02 0.25-0.06 0.37-0.04 0.12-0.12 0.23-0.21 0.32l-2.13 2.13c-0.1 0.1-0.2 0.17-0.32 0.21-0.12 0.04-0.25 0.07-0.38 0.07Zm0-2.38l0.72-0.73-3.67-3.67-0.72 0.73 3.67 3.67ZM5.12 22C5 22 4.87 21.98 4.75 21.93 4.6 21.88 4.5 21.8 4.4 21.7l-2.1-2.1c-0.1-0.1-0.17-0.21-0.22-0.34C2.02 19.14 2 19.01 2 18.87c0-0.13 0.02-0.25 0.08-0.37 0.04-0.12 0.12-0.23 0.22-0.32l5.3-5.3h2.13l0.84-0.86L6.45 7.9H5.03L2 4.87l2.83-2.82 3.02 3.03V6.5l4.13 4.13 2.9-2.9-1.08-1.08 1.4-1.4h-2.82l-0.7-0.7L15.21 1l0.7 0.7v2.83l1.4-1.4 3.55 3.54c0.29 0.29 0.5 0.6 0.65 0.97 0.16 0.36 0.23 0.74 0.23 1.14 0 0.4-0.07 0.78-0.23 1.15-0.14 0.36-0.36 0.69-0.64 0.97l-2.13-2.13-1.4 1.4-1.05-1.04-5.18 5.17v2.1l-5.3 5.3c-0.1 0.1-0.2 0.18-0.32 0.23C5.38 21.98 5.26 22 5.12 22Zm0-2.4l4.25-4.25v-0.72H8.65L4.4 18.87l0.72 0.73Zm0 0L4.4 18.87l0.38 0.36 0.34 0.37Z" />
         </group>
     </group>
diff --git a/play-services-base/core/src/main/res/values-pt-rBR/strings.xml b/play-services-base/core/src/main/res/values-pt-rBR/strings.xml
index 41f1770428..a3418b3732 100644
--- a/play-services-base/core/src/main/res/values-pt-rBR/strings.xml
+++ b/play-services-base/core/src/main/res/values-pt-rBR/strings.xml
@@ -8,7 +8,7 @@
     <string name="foreground_service_notification_text"><xliff:g example="Exposure Notification">%1$s</xliff:g> está rodando em segundo plano</string>
     <string name="foreground_service_notification_big_text">Exclua o <xliff:g example="microG Services">%1$s</xliff:g> das otimizações de bateria ou altere as configurações de notificação para ocultar este aviso</string>
 
-    <string name="menu_advanced">Avançado</string>
+    <string name="menu_settings">Configurações</string>
 
     <string name="list_no_item_none">Nenhum</string>
     <string name="list_item_see_all">Ver todos</string>
diff --git a/play-services-base/core/src/main/res/values/strings.xml b/play-services-base/core/src/main/res/values/strings.xml
index fe6d49aff7..a724c83ebd 100644
--- a/play-services-base/core/src/main/res/values/strings.xml
+++ b/play-services-base/core/src/main/res/values/strings.xml
@@ -9,7 +9,7 @@
     <string name="foreground_service_notification_text"><xliff:g example="Exposure Notification">%1$s</xliff:g> is running in background</string>
     <string name="foreground_service_notification_big_text">Exclude <xliff:g example="microG Services">%1$s</xliff:g> from battery optimizations or change notification settings to hide this notification</string>
 
-    <string name="menu_advanced">Advanced</string>
+    <string name="menu_settings">Settings</string>
 
     <string name="list_no_item_none">None</string>
     <string name="list_item_see_all">See all</string>
@@ -27,6 +27,8 @@
 
     <string name="vanced">Vanced</string>
     <string name="revanced">ReVanced</string>
-    <string name="revanced_extended">ReVanced Extended</string>
     <string name="youtube_advanced">YT Advanced</string>
+    <string name="revanced_extended">ReVanced Extended</string>
+    <string name="revanced_extended_anddea">ReVanced Extended (Anddea)</string>
+    <string name="revanced_extended_rufusin">ReVanced Extended (Rufusin)</string>
 </resources>
diff --git a/play-services-core/microg-ui-tools/src/main/res/drawable/ic_expand_less.xml b/play-services-core/microg-ui-tools/src/main/res/drawable/ic_expand_less.xml
index 39cfa91b13..822fcf862b 100644
--- a/play-services-core/microg-ui-tools/src/main/res/drawable/ic_expand_less.xml
+++ b/play-services-core/microg-ui-tools/src/main/res/drawable/ic_expand_less.xml
@@ -25,8 +25,8 @@
         <clip-path android:pathData="M0 0H24V24H0z" />
         <group>
             <path
-                android:fillColor="#000000"
-                android:pathData="M7.4 15.38L6 13.97l6-6 6 6-1.4 1.4-4.6-4.6-4.6 4.6Z" />
+                android:fillColor="#FF1C1B1F"
+                android:pathData="M12 10.78l-3.9 3.9c-0.18 0.18-0.42 0.27-0.7 0.27-0.28 0-0.52-0.1-0.7-0.27-0.18-0.19-0.28-0.42-0.28-0.7 0-0.29 0.1-0.52 0.28-0.7l4.6-4.6c0.1-0.1 0.2-0.18 0.32-0.22C11.74 8.42 11.88 8.4 12 8.4s0.26 0.02 0.38 0.06c0.11 0.04 0.22 0.11 0.32 0.21l4.6 4.6c0.18 0.19 0.27 0.42 0.27 0.7 0 0.29-0.09 0.52-0.27 0.7-0.18 0.19-0.42 0.28-0.7 0.28-0.28 0-0.52-0.1-0.7-0.27l-3.9-3.9Z" />
         </group>
     </group>
 </vector>
\ No newline at end of file
diff --git a/play-services-core/microg-ui-tools/src/main/res/drawable/ic_expand_more.xml b/play-services-core/microg-ui-tools/src/main/res/drawable/ic_expand_more.xml
index ae68e69ba0..3aed41c215 100644
--- a/play-services-core/microg-ui-tools/src/main/res/drawable/ic_expand_more.xml
+++ b/play-services-core/microg-ui-tools/src/main/res/drawable/ic_expand_more.xml
@@ -22,11 +22,11 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <group>
-        <clip-path android:pathData="M.2.82H24.2V24.82H.2z" />
+        <clip-path android:pathData="M0 0H24V24H0z" />
         <group>
             <path
-                android:fillColor="#000000"
-                android:pathData="M12.2 16.2l-6-6 1.4-1.4 4.6 4.6 4.6-4.6 1.4 1.4-6 6Z" />
+                android:fillColor="#FF1C1B1F"
+                android:pathData="M12 14.95c-0.13 0-0.26-0.02-0.38-0.06-0.11-0.04-0.22-0.12-0.32-0.21l-4.6-4.6c-0.18-0.19-0.28-0.42-0.28-0.7 0-0.29 0.1-0.52 0.28-0.7C6.88 8.49 7.12 8.4 7.4 8.4c0.28 0 0.52 0.1 0.7 0.28l3.9 3.9 3.9-3.9c0.18-0.19 0.42-0.28 0.7-0.28 0.28 0 0.52 0.1 0.7 0.28 0.18 0.18 0.27 0.41 0.27 0.7 0 0.28-0.09 0.51-0.27 0.7l-4.6 4.6c-0.1 0.1-0.2 0.17-0.32 0.2-0.12 0.05-0.25 0.07-0.38 0.07Z" />
         </group>
     </group>
 </vector>
\ No newline at end of file
diff --git a/play-services-core/microg-ui-tools/src/main/res/layout-v21/preference_material.xml b/play-services-core/microg-ui-tools/src/main/res/layout-v21/preference_material.xml
deleted file mode 100644
index a54c95d275..0000000000
--- a/play-services-core/microg-ui-tools/src/main/res/layout-v21/preference_material.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2015 The Android Open Source Project
-  ~ Copyright (C) 2015-2017 microG Project Team
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-  -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              xmlns:app="http://schemas.android.com/apk/res-auto"
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-              android:background="?android:attr/selectableItemBackground"
-              android:baselineAligned="false"
-              android:clipToPadding="false"
-              android:focusable="true"
-              android:gravity="center_vertical"
-              android:minHeight="?android:attr/listPreferredItemHeightSmall"
-              android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
-              android:paddingStart="?android:attr/listPreferredItemPaddingStart">
-
-    <LinearLayout
-        android:id="@+id/icon_frame"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:gravity="start|center_vertical"
-        android:minWidth="56dp"
-        android:orientation="horizontal"
-        android:paddingBottom="4dp"
-        android:paddingEnd="12dp"
-        android:paddingTop="4dp">
-
-        <androidx.appcompat.widget.AppCompatImageView
-            android:id="@android:id/icon"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:maxHeight="48dp"
-            app:maxWidth="48dp"/>
-    </LinearLayout>
-
-    <RelativeLayout
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:paddingBottom="16dp"
-        android:paddingTop="16dp">
-
-        <TextView
-            android:id="@android:id/title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:ellipsize="marquee"
-            android:singleLine="true"
-            android:textAppearance="?android:attr/textAppearanceListItem"/>
-
-        <TextView
-            android:id="@android:id/summary"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignStart="@android:id/title"
-            android:layout_below="@android:id/title"
-            android:maxLines="10"
-            android:textAppearance="?android:attr/textAppearanceListItemSecondary"
-            android:textColor="?android:attr/textColorSecondary"/>
-
-    </RelativeLayout>
-
-    <!-- Preference should place its actual preference widget here. -->
-    <LinearLayout
-        android:id="@android:id/widget_frame"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:gravity="end|center_vertical"
-        android:orientation="vertical"
-        android:paddingStart="16dp"/>
-
-</LinearLayout>
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 26ba4deba9..188fdcfd5c 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.1</string>
+    <string name="github_tag_version">5.2</string>
 
     <!-- Updater strings-->
 
@@ -55,5 +55,4 @@
 
     <string name="error_connection">Connection error:</string>
     <string name="error_others">Error:</string>
-
 </resources>
diff --git a/play-services-core/src/main/java/org/microg/gms/auth/login/LoginActivity.java b/play-services-core/src/main/java/org/microg/gms/auth/login/LoginActivity.java
index 7ca7eab2e3..2f29f1ac25 100644
--- a/play-services-core/src/main/java/org/microg/gms/auth/login/LoginActivity.java
+++ b/play-services-core/src/main/java/org/microg/gms/auth/login/LoginActivity.java
@@ -17,6 +17,7 @@
 package org.microg.gms.auth.login;
 
 import android.accounts.Account;
+import android.accounts.AccountAuthenticatorResponse;
 import android.accounts.AccountManager;
 import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
@@ -103,6 +104,7 @@ public class LoginActivity extends AssistantActivity {
     private WebView webView;
     private String accountType;
     private AccountManager accountManager;
+    private AccountAuthenticatorResponse response;
     private InputMethodManager inputMethodManager;
     private ViewGroup authContent;
     private int state = 0;
@@ -142,6 +144,12 @@ public void onPageFinished(WebView view, String url) {
                     closeWeb(true);
             }
         });
+        if(getIntent().hasExtra(AccountManager.KEY_ACCOUNT_AUTHENTICATOR_RESPONSE)){
+            Object tempObject = getIntent().getExtras().get("accountAuthenticatorResponse");
+            if (tempObject instanceof AccountAuthenticatorResponse) {
+                response = (AccountAuthenticatorResponse) tempObject;
+            }
+        }
         if (getIntent().hasExtra(EXTRA_TOKEN)) {
             if (getIntent().hasExtra(EXTRA_EMAIL)) {
                 AccountManager accountManager = AccountManager.get(this);
@@ -197,6 +205,14 @@ protected void onHuaweiButtonClicked() {
         }
     }
 
+    @Override
+    public void onBackPressed() {
+        super.onBackPressed();
+        if(response != null){
+            response.onError(AccountManager.ERROR_CODE_CANCELED, "Canceled");
+        }
+    }
+
     private void init() {
         setTitle(R.string.just_a_sec);
         setSpoofButtonText(null);
@@ -353,7 +369,15 @@ public void onException(Exception exception) {
                     }
                 });
     }
-
+    private void returnSuccessResponse(Account account){
+        if(response != null){
+            Bundle bd = new Bundle();
+            bd.putString(AccountManager.KEY_ACCOUNT_NAME,account.name);
+            bd.putBoolean("new_account_created",false);
+            bd.putString(AccountManager.KEY_ACCOUNT_TYPE,accountType);
+            response.onResult(bd);
+        }
+    }
     private void retrieveGmsToken(final Account account) {
         final AuthManager authManager = new AuthManager(this, account.name, GOOGLE_GMS_PACKAGE_NAME, "ac2dm");
         authManager.setPermitted(true);
@@ -374,7 +398,11 @@ public void onResponse(AuthResponse response) {
                         String accountId = PeopleManager.loadUserInfo(LoginActivity.this, account);
                         if (!TextUtils.isEmpty(accountId))
                             accountManager.setUserData(account, "GoogleUserId", accountId);
+                        if (isAuthVisible(LoginActivity.this) && SDK_INT >= 26) {
+                            accountManager.setAccountVisibility(account, PACKAGE_NAME_KEY_LEGACY_NOT_VISIBLE, VISIBILITY_USER_MANAGED_VISIBLE);
+                        }
                         checkin(true);
+                        returnSuccessResponse(account);
                         finish();
                     }
 
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 38d9fe8fe2..2b89e46a57 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
@@ -154,7 +154,7 @@ class AccountsFragment : PreferenceFragmentCompat() {
     }
 
     override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
-        inflater.inflate(R.menu.privacy_menu_item, menu)
+        inflater.inflate(R.menu.accounts_menu_item, menu)
         super.onCreateOptionsMenu(menu, inflater)
     }
 
diff --git a/play-services-core/src/main/java/org/microg/gms/ui/AskPushPermission.java b/play-services-core/src/main/java/org/microg/gms/ui/AskPushPermission.java
index 32d7fa3d16..6293694d52 100644
--- a/play-services-core/src/main/java/org/microg/gms/ui/AskPushPermission.java
+++ b/play-services-core/src/main/java/org/microg/gms/ui/AskPushPermission.java
@@ -51,7 +51,7 @@ public void onCreate(Bundle savedInstanceState) {
             return;
         }
 
-        View gcmView = getLayoutInflater().inflate(R.layout.ask_gcm, null);
+        View gcmView = getLayoutInflater().inflate(R.layout.ask_push_notification, null);
 
         // Create and show the AlertDialog
         try {
diff --git a/play-services-core/src/main/java/org/microg/tools/selfcheck/RomSpoofSignatureChecks.java b/play-services-core/src/main/java/org/microg/tools/selfcheck/RomSpoofSignatureChecks.java
index beb61d989d..96d3f142d1 100644
--- a/play-services-core/src/main/java/org/microg/tools/selfcheck/RomSpoofSignatureChecks.java
+++ b/play-services-core/src/main/java/org/microg/tools/selfcheck/RomSpoofSignatureChecks.java
@@ -44,41 +44,36 @@ public String getGroupName(Context context) {
 
     @Override
     public void doChecks(Context context, ResultCollector collector) {
-        boolean hasPermission = addRomKnowsFakeSignaturePermission(context, collector);
-        if (hasPermission) {
-            addSystemGrantsFakeSignaturePermission(context, collector);
-        }
         addSystemSpoofsSignature(context, collector);
     }
 
-    private boolean addRomKnowsFakeSignaturePermission(Context context, ResultCollector collector) {
+    private boolean addSystemSpoofsSignature(Context context, ResultCollector collector) {
         boolean knowsPermission = true;
         try {
             context.getPackageManager().getPermissionInfo(FAKE_SIGNATURE_PERMISSION, 0);
         } catch (PackageManager.NameNotFoundException e) {
             knowsPermission = false;
         }
-        collector.addResult(context.getString(R.string.self_check_name_fake_sig_perm), knowsPermission ? Positive : Unknown,
-                context.getString(R.string.self_check_resolution_fake_sig_perm));
-        return knowsPermission;
-    }
-
-    private boolean addSystemGrantsFakeSignaturePermission(Context context, ResultCollector collector) {
-        boolean grantsPermission = ContextCompat.checkSelfPermission(context, FAKE_SIGNATURE_PERMISSION) == PERMISSION_GRANTED;
-        collector.addResult(context.getString(R.string.self_check_name_perm_granted), grantsPermission ? Positive : Negative,
-                context.getString(R.string.self_check_resolution_perm_granted), new CheckResolver() {
-                    @Override
-                    public void tryResolve(Fragment fragment) {
-                        fragment.requestPermissions(new String[]{FAKE_SIGNATURE_PERMISSION}, 0);
-                    }
-                });
-        return grantsPermission;
-    }
-
-    private boolean addSystemSpoofsSignature(Context context, ResultCollector collector) {
+        boolean grantsPermission = false;
+        if (knowsPermission) {
+            grantsPermission = ContextCompat.checkSelfPermission(context, FAKE_SIGNATURE_PERMISSION) == PERMISSION_GRANTED;
+        }
         boolean spoofsSignature = GMS_PACKAGE_SIGNATURE_SHA1.equals(PackageUtils.firstSignatureDigest(context, Constants.GMS_PACKAGE_NAME));
-        collector.addResult(context.getString(R.string.self_check_name_system_spoofs), spoofsSignature ? Positive : Negative,
-                context.getString(R.string.self_check_resolution_system_spoofs));
+        if (knowsPermission && !spoofsSignature && !grantsPermission) {
+            collector.addResult(
+                    context.getString(R.string.self_check_name_system_spoofs),
+                    spoofsSignature ? Positive : Negative,
+                    context.getString(org.microg.tools.ui.R.string.self_check_resolution_permission),
+                    fragment -> fragment.requestPermissions(new String[]{FAKE_SIGNATURE_PERMISSION}, 0)
+            );
+        } else {
+            collector.addResult(
+                    context.getString(R.string.self_check_name_system_spoofs),
+                    spoofsSignature ? Positive : Negative,
+                    context.getString(R.string.self_check_resolution_system_spoofs),
+                    fragment -> fragment.requestPermissions(new String[]{FAKE_SIGNATURE_PERMISSION}, 0)
+            );
+        }
         return spoofsSignature;
     }
 }
diff --git a/play-services-core/src/main/kotlin/org/microg/gms/ui/PushNotificationAdvancedFragment.kt b/play-services-core/src/main/kotlin/org/microg/gms/ui/PushNotificationAdvancedFragment.kt
index bbbae06b02..76b7c06d12 100644
--- a/play-services-core/src/main/kotlin/org/microg/gms/ui/PushNotificationAdvancedFragment.kt
+++ b/play-services-core/src/main/kotlin/org/microg/gms/ui/PushNotificationAdvancedFragment.kt
@@ -25,7 +25,7 @@ class PushNotificationAdvancedFragment : PreferenceFragmentCompat() {
     private lateinit var networkOther: ListPreference
 
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
-        addPreferencesFromResource(R.xml.preferences_gcm_advanced)
+        addPreferencesFromResource(R.xml.preferences_push_notification_settings)
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
diff --git a/play-services-core/src/main/kotlin/org/microg/gms/ui/PushNotificationFragment.kt b/play-services-core/src/main/kotlin/org/microg/gms/ui/PushNotificationFragment.kt
index 04002059e4..2caa52d135 100644
--- a/play-services-core/src/main/kotlin/org/microg/gms/ui/PushNotificationFragment.kt
+++ b/play-services-core/src/main/kotlin/org/microg/gms/ui/PushNotificationFragment.kt
@@ -155,7 +155,7 @@ class PushNotificationFragment : PreferenceFragmentCompat() {
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         return when (item.itemId) {
-            R.id.menu_advanced -> {
+            R.id.menu_settings -> {
                 findNavController().navigate(R.id.openGcmAdvancedSettings)
                 true
             }
diff --git a/play-services-core/src/main/res/drawable-v21/material_switch_bar_background_disabled.xml b/play-services-core/src/main/res/drawable-v21/material_switch_bar_background_disabled.xml
index 1e16a986a5..0502ba50b6 100644
--- a/play-services-core/src/main/res/drawable-v21/material_switch_bar_background_disabled.xml
+++ b/play-services-core/src/main/res/drawable-v21/material_switch_bar_background_disabled.xml
@@ -4,10 +4,10 @@
   -->
 
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="?attr/colorControlHighlight">
+    android:color="?attr/colorSurfaceContainerHighest">
     <item>
         <shape android:shape="rectangle">
-            <solid android:color="?attr/colorControlHighlight"/>
+            <solid android:color="?attr/colorSurfaceContainerHighest"/>
             <corners android:radius="28dp"/>
         </shape>
     </item>
diff --git a/play-services-core/src/main/res/drawable-v21/material_switch_bar_background_off.xml b/play-services-core/src/main/res/drawable-v21/material_switch_bar_background_off.xml
new file mode 100644
index 0000000000..63dfc8615e
--- /dev/null
+++ b/play-services-core/src/main/res/drawable-v21/material_switch_bar_background_off.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ SPDX-FileCopyrightText: 2024 microG Project Team
+  ~ SPDX-License-Identifier: Apache-2.0
+  -->
+
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="?attr/colorSurfaceContainerHighest">
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="?attr/colorSurfaceContainerHighest"/>
+            <corners android:radius="28dp"/>
+        </shape>
+    </item>
+</ripple>
\ No newline at end of file
diff --git a/play-services-core/src/main/res/drawable-v21/material_switch_bar_background.xml b/play-services-core/src/main/res/drawable-v21/material_switch_bar_background_on.xml
similarity index 89%
rename from play-services-core/src/main/res/drawable-v21/material_switch_bar_background.xml
rename to play-services-core/src/main/res/drawable-v21/material_switch_bar_background_on.xml
index ef8e758b3b..2c8ae009c3 100644
--- a/play-services-core/src/main/res/drawable-v21/material_switch_bar_background.xml
+++ b/play-services-core/src/main/res/drawable-v21/material_switch_bar_background_on.xml
@@ -5,7 +5,7 @@
   -->
 
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="?attr/colorControlHighlight">
+    android:color="?attr/colorPrimaryContainer">
     <item>
         <shape android:shape="rectangle">
             <solid android:color="?attr/colorPrimaryContainer"/>
diff --git a/play-services-core/src/main/res/drawable/ic_accounts.xml b/play-services-core/src/main/res/drawable/ic_accounts.xml
new file mode 100644
index 0000000000..96b61e54fc
--- /dev/null
+++ b/play-services-core/src/main/res/drawable/ic_accounts.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="25dp"
+    android:height="25dp"
+    android:tint="?colorControlNormal"
+    android:viewportWidth="25"
+    android:viewportHeight="25">
+    <group>
+        <clip-path android:pathData="M.5.5H24.5V24.5H.5z" />
+        <group>
+            <path
+                android:fillColor="#FF1C1B1F"
+                android:pathData="M6.35 17.6c0.85-0.65 1.8-1.16 2.85-1.54 1.05-0.37 2.15-0.56 3.3-0.56s2.25 0.19 3.3 0.56c1.05 0.38 2 0.89 2.85 1.54 0.58-0.68 1.04-1.46 1.36-2.33 0.33-0.86 0.49-1.79 0.49-2.77 0-2.22-0.78-4.1-2.34-5.66C16.6 5.28 14.72 4.5 12.5 4.5S8.4 5.28 6.84 6.84C5.28 8.4 4.5 10.28 4.5 12.5c0 0.98 0.16 1.9 0.49 2.78 0.32 0.86 0.78 1.64 1.36 2.32Zm6.15-4.1c-0.98 0-1.81-0.34-2.49-1.01C9.34 11.8 9 10.99 9 10c0-0.98 0.34-1.81 1.01-2.49 0.68-0.67 1.5-1.01 2.49-1.01 0.98 0 1.81 0.34 2.49 1.01C15.66 8.2 16 9.01 16 10c0 0.98-0.34 1.81-1.01 2.49-0.68 0.67-1.5 1.01-2.49 1.01Zm0 9c-1.38 0-2.68-0.26-3.9-0.79-1.22-0.52-2.27-1.23-3.17-2.14-0.9-0.9-1.62-1.95-2.14-3.17-0.53-1.22-0.79-2.52-0.79-3.9s0.26-2.68 0.79-3.9C3.8 7.38 4.53 6.33 5.42 5.43c0.9-0.9 1.96-1.62 3.18-2.14 1.22-0.53 2.52-0.79 3.9-0.79s2.68 0.26 3.9 0.79c1.22 0.52 2.28 1.24 3.18 2.13 0.9 0.9 1.6 1.96 2.13 3.18 0.53 1.22 0.79 2.52 0.79 3.9s-0.26 2.68-0.79 3.9c-0.52 1.22-1.23 2.28-2.14 3.18-0.9 0.9-1.95 1.6-3.17 2.13-1.22 0.53-2.52 0.79-3.9 0.79Zm0-2c0.88 0 1.72-0.13 2.5-0.39s1.5-0.63 2.15-1.11c-0.65-0.48-1.37-0.85-2.15-1.11-0.78-0.26-1.62-0.39-2.5-0.39-0.88 0-1.72 0.13-2.5 0.39S8.5 18.52 7.85 19c0.65 0.48 1.37 0.85 2.15 1.11 0.78 0.26 1.62 0.39 2.5 0.39Zm0-9c0.43 0 0.8-0.14 1.07-0.43C13.86 10.8 14 10.43 14 10c0-0.43-0.14-0.8-0.43-1.07C13.3 8.64 12.93 8.5 12.5 8.5c-0.43 0-0.8 0.14-1.07 0.43C11.14 9.2 11 9.57 11 10c0 0.43 0.14 0.8 0.43 1.07 0.28 0.29 0.64 0.43 1.07 0.43Z" />
+        </group>
+    </group>
+</vector>
\ No newline at end of file
diff --git a/play-services-core/src/main/res/drawable/ic_add_account.xml b/play-services-core/src/main/res/drawable/ic_add_account.xml
deleted file mode 100644
index 7b2dc23c2e..0000000000
--- a/play-services-core/src/main/res/drawable/ic_add_account.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="25dp"
-    android:height="25dp"
-    android:tint="?colorControlNormal"
-    android:viewportWidth="25"
-    android:viewportHeight="25">
-    <group>
-        <clip-path android:pathData="M.27.42H24.27V24.42H.27z" />
-        <group>
-            <path
-                android:fillColor="#000000"
-                android:pathData="M6.12 17.52c0.85-0.65 1.8-1.16 2.85-1.53 1.05-0.38 2.15-0.57 3.3-0.57s2.25 0.2 3.3 0.57c1.05 0.37 2 0.88 2.85 1.53 0.59-0.68 1.04-1.45 1.37-2.32 0.32-0.87 0.48-1.8 0.48-2.78 0-2.21-0.78-4.1-2.33-5.66-1.56-1.56-3.45-2.34-5.67-2.34-2.21 0-4.1 0.78-5.66 2.34-1.56 1.56-2.34 3.45-2.34 5.66 0 0.99 0.17 1.91 0.49 2.78 0.33 0.87 0.78 1.64 1.36 2.32Zm6.15-4.1c-0.98 0-1.81-0.33-2.48-1-0.68-0.68-1.02-1.51-1.02-2.5 0-0.98 0.34-1.8 1.02-2.48 0.67-0.68 1.5-1.02 2.48-1.02 0.99 0 1.82 0.34 2.49 1.02 0.68 0.67 1.01 1.5 1.01 2.48 0 0.99-0.33 1.82-1.01 2.5-0.67 0.67-1.5 1-2.49 1Zm0 9c-1.38 0-2.68-0.26-3.9-0.78C7.16 21.1 6.1 20.4 5.2 19.5c-0.9-0.9-1.61-1.96-2.14-3.18-0.52-1.21-0.79-2.51-0.79-3.9 0-1.38 0.27-2.68 0.79-3.9C3.59 7.31 4.3 6.25 5.2 5.35c0.9-0.9 1.96-1.61 3.17-2.14 1.22-0.52 2.52-0.79 3.9-0.79 1.39 0 2.69 0.27 3.9 0.8 1.22 0.52 2.28 1.23 3.18 2.13 0.9 0.9 1.61 1.96 2.14 3.17 0.52 1.22 0.78 2.52 0.78 3.9 0 1.39-0.26 2.69-0.78 3.9-0.53 1.22-1.24 2.28-2.14 3.18-0.9 0.9-1.96 1.61-3.18 2.14-1.21 0.52-2.51 0.78-3.9 0.78Zm0-2c0.89 0 1.72-0.12 2.5-0.38 0.79-0.26 1.5-0.63 2.15-1.12-0.65-0.48-1.36-0.85-2.15-1.1-0.78-0.27-1.61-0.4-2.5-0.4-0.88 0-1.71 0.13-2.5 0.4-0.78 0.25-1.5 0.62-2.15 1.1 0.65 0.49 1.37 0.86 2.15 1.12 0.79 0.26 1.62 0.38 2.5 0.38Zm0-9c0.44 0 0.8-0.14 1.08-0.42 0.28-0.28 0.42-0.64 0.42-1.08 0-0.43-0.14-0.79-0.42-1.07-0.29-0.28-0.64-0.43-1.08-0.43-0.43 0-0.79 0.15-1.07 0.43-0.29 0.28-0.43 0.64-0.43 1.07 0 0.44 0.14 0.8 0.43 1.08 0.28 0.28 0.64 0.42 1.07 0.42Z" />
-        </group>
-    </group>
-</vector>
\ No newline at end of file
diff --git a/play-services-core/src/main/res/drawable/ic_add_new_account.xml b/play-services-core/src/main/res/drawable/ic_add_new_account.xml
index 8a0b751aa2..aee120e21b 100644
--- a/play-services-core/src/main/res/drawable/ic_add_new_account.xml
+++ b/play-services-core/src/main/res/drawable/ic_add_new_account.xml
@@ -9,8 +9,8 @@
         <clip-path android:pathData="M0 0H24V24H0z" />
         <group>
             <path
-                android:fillColor="#000000"
-                android:pathData="M11 13H5v-2h6V5h2v6h6v2h-6v6h-2v-6Z" />
+                android:fillColor="#FF1C1B1F"
+                android:pathData="M11 13H6c-0.28 0-0.52-0.1-0.71-0.29C5.09 12.52 5 12.28 5 12c0-0.28 0.1-0.52 0.29-0.71C5.48 11.09 5.72 11 6 11h5V6c0-0.28 0.1-0.52 0.29-0.71C11.48 5.09 11.72 5 12 5c0.28 0 0.52 0.1 0.71 0.29C12.91 5.48 13 5.72 13 6v5h5c0.28 0 0.52 0.1 0.71 0.29C18.91 11.48 19 11.72 19 12c0 0.28-0.1 0.52-0.29 0.71C18.52 12.91 18.28 13 18 13h-5v5c0 0.28-0.1 0.52-0.29 0.71C12.52 18.91 12.28 19 12 19c-0.28 0-0.52-0.1-0.71-0.29C11.09 18.52 11 18.28 11 18v-5Z" />
         </group>
     </group>
 </vector>
\ No newline at end of file
diff --git a/play-services-core/src/main/res/drawable/ic_cloud_bell.xml b/play-services-core/src/main/res/drawable/ic_cloud_bell.xml
deleted file mode 100644
index fd636d237f..0000000000
--- a/play-services-core/src/main/res/drawable/ic_cloud_bell.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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="24"
-    android:viewportHeight="24">
-    <group>
-        <clip-path android:pathData="M0 0H24V24H0z" />
-        <group>
-            <path
-                android:fillColor="#000000"
-                android:pathData="M4 19v-2h2v-7c0-1.38 0.42-2.61 1.25-3.69 0.83-1.07 1.92-1.78 3.25-2.11V3.5c0-0.42 0.15-0.77 0.44-1.06C11.23 2.14 11.58 2 12 2c0.42 0 0.77 0.15 1.06 0.44 0.3 0.29 0.44 0.64 0.44 1.06v0.7c1.33 0.33 2.42 1.04 3.25 2.11C17.58 7.4 18 8.61 18 10v7h2v2H4Zm8 3c-0.55 0-1.02-0.2-1.41-0.59C10.19 21.02 10 20.55 10 20h4c0 0.55-0.2 1.02-0.59 1.41C13.02 21.81 12.55 22 12 22Zm-4-5h8v-7c0-1.1-0.4-2.04-1.18-2.83C14.04 6.4 13.1 6 12 6c-1.1 0-2.04 0.4-2.82 1.17C8.39 7.96 8 8.9 8 10v7Z" />
-        </group>
-    </group>
-</vector>
\ No newline at end of file
diff --git a/play-services-core/src/main/res/drawable/ic_cloud_messaging.xml b/play-services-core/src/main/res/drawable/ic_cloud_messaging.xml
new file mode 100644
index 0000000000..acaa151952
--- /dev/null
+++ b/play-services-core/src/main/res/drawable/ic_cloud_messaging.xml
@@ -0,0 +1,16 @@
+<?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="24"
+    android:viewportHeight="24">
+    <group>
+        <clip-path android:pathData="M0 0H24V24H0z" />
+        <group>
+            <path
+                android:fillColor="#FF1C1B1F"
+                android:pathData="M5 19c-0.28 0-0.52-0.1-0.71-0.29C4.09 18.52 4 18.28 4 18c0-0.28 0.1-0.52 0.29-0.71C4.48 17.09 4.72 17 5 17h1v-7c0-1.38 0.42-2.61 1.25-3.69 0.83-1.07 1.92-1.78 3.25-2.11V3.5c0-0.42 0.15-0.77 0.44-1.06C11.23 2.14 11.58 2 12 2c0.42 0 0.77 0.15 1.06 0.44 0.3 0.29 0.44 0.64 0.44 1.06v0.7c1.33 0.33 2.42 1.04 3.25 2.11C17.58 7.4 18 8.61 18 10v7h1c0.28 0 0.52 0.1 0.71 0.29C19.91 17.48 20 17.72 20 18c0 0.28-0.1 0.52-0.29 0.71C19.52 18.91 19.28 19 19 19H5Zm7 3c-0.55 0-1.02-0.2-1.41-0.59C10.19 21.02 10 20.55 10 20h4c0 0.55-0.2 1.02-0.59 1.41C13.02 21.81 12.55 22 12 22Zm-4-5h8v-7c0-1.1-0.4-2.04-1.18-2.83C14.04 6.4 13.1 6 12 6c-1.1 0-2.04 0.4-2.82 1.17C8.39 7.96 8 8.9 8 10v7Z" />
+        </group>
+    </group>
+</vector>
\ No newline at end of file
diff --git a/play-services-core/src/main/res/drawable/ic_device_login.xml b/play-services-core/src/main/res/drawable/ic_device_login.xml
index 67771e8804..adec189e90 100644
--- a/play-services-core/src/main/res/drawable/ic_device_login.xml
+++ b/play-services-core/src/main/res/drawable/ic_device_login.xml
@@ -9,8 +9,8 @@
         <clip-path android:pathData="M0 0H24V24H0z" />
         <group>
             <path
-                android:fillColor="#000000"
-                android:pathData="M7 20H4c-0.55 0-1.02-0.2-1.41-0.59C2.19 19.02 2 18.55 2 18V6c0-0.55 0.2-1.02 0.59-1.41C2.98 4.19 3.45 4 4 4h16v2H4v12h3v2Zm4-2.5c0.42 0 0.77-0.15 1.06-0.44 0.3-0.29 0.44-0.64 0.44-1.06 0-0.42-0.15-0.77-0.44-1.06-0.29-0.3-0.64-0.44-1.06-0.44-0.42 0-0.77 0.15-1.06 0.44C9.64 15.23 9.5 15.58 9.5 16c0 0.42 0.15 0.77 0.44 1.06 0.29 0.3 0.64 0.44 1.06 0.44ZM9 20v-1.77c-0.32-0.29-0.56-0.62-0.74-1C8.1 16.84 8 16.43 8 16c0-0.43 0.09-0.84 0.26-1.22 0.18-0.39 0.42-0.72 0.74-1V12h4v1.78c0.32 0.28 0.56 0.61 0.74 1C13.9 15.16 14 15.57 14 16c0 0.43-0.09 0.84-0.26 1.23-0.18 0.38-0.42 0.71-0.74 1V20H9Zm12 0h-5c-0.28 0-0.52-0.1-0.71-0.29C15.09 19.52 15 19.28 15 19v-9c0-0.28 0.1-0.52 0.29-0.71C15.48 9.09 15.72 9 16 9h5c0.28 0 0.52 0.1 0.71 0.29C21.91 9.48 22 9.72 22 10v9c0 0.28-0.1 0.52-0.29 0.71C21.52 19.91 21.28 20 21 20Zm-4-2h3v-7h-3v7Z" />
+                android:fillColor="#FF1C1B1F"
+                android:pathData="M4 20c-0.55 0-1.02-0.2-1.41-0.59C2.19 19.02 2 18.55 2 18V6c0-0.55 0.2-1.02 0.59-1.41C2.98 4.19 3.45 4 4 4h15c0.28 0 0.52 0.1 0.71 0.29C19.91 4.48 20 4.72 20 5c0 0.28-0.1 0.52-0.29 0.71C19.52 5.91 19.28 6 19 6H4v12h2c0.28 0 0.52 0.1 0.71 0.29C6.91 18.48 7 18.72 7 19c0 0.28-0.1 0.52-0.29 0.71C6.52 19.91 6.28 20 6 20H4Zm7-2.5c0.42 0 0.77-0.15 1.06-0.44 0.3-0.29 0.44-0.64 0.44-1.06 0-0.42-0.15-0.77-0.44-1.06-0.29-0.3-0.64-0.44-1.06-0.44-0.42 0-0.77 0.15-1.06 0.44C9.64 15.23 9.5 15.58 9.5 16c0 0.42 0.15 0.77 0.44 1.06 0.29 0.3 0.64 0.44 1.06 0.44ZM21 20h-5c-0.28 0-0.52-0.1-0.71-0.29C15.09 19.52 15 19.28 15 19v-9c0-0.28 0.1-0.52 0.29-0.71C15.48 9.09 15.72 9 16 9h5c0.28 0 0.52 0.1 0.71 0.29C21.91 9.48 22 9.72 22 10v9c0 0.28-0.1 0.52-0.29 0.71C21.52 19.91 21.28 20 21 20Zm-4-2h3v-7h-3v7Zm-8 1v-0.77c-0.32-0.29-0.56-0.62-0.74-1C8.1 16.84 8 16.43 8 16c0-0.43 0.09-0.84 0.26-1.22 0.18-0.39 0.42-0.72 0.74-1V13c0-0.28 0.1-0.52 0.29-0.71C9.48 12.09 9.72 12 10 12h2c0.28 0 0.52 0.1 0.71 0.29C12.91 12.48 13 12.72 13 13v0.78c0.32 0.28 0.56 0.61 0.74 1C13.9 15.16 14 15.57 14 16c0 0.43-0.09 0.84-0.26 1.23-0.18 0.38-0.42 0.71-0.74 1V19c0 0.28-0.1 0.52-0.29 0.71C12.52 19.91 12.28 20 12 20h-2c-0.28 0-0.52-0.1-0.71-0.29C9.09 19.52 9 19.28 9 19Z" />
         </group>
     </group>
 </vector>
\ No newline at end of file
diff --git a/play-services-core/src/main/res/drawable/ic_hide_launcher_icon.xml b/play-services-core/src/main/res/drawable/ic_hide_launcher_icon.xml
index 37c824215a..34ca05e7f8 100644
--- a/play-services-core/src/main/res/drawable/ic_hide_launcher_icon.xml
+++ b/play-services-core/src/main/res/drawable/ic_hide_launcher_icon.xml
@@ -9,8 +9,8 @@
         <clip-path android:pathData="M0 0H24V24H0z" />
         <group>
             <path
-                android:fillColor="#000000"
-                android:pathData="M19.77 22.63l-2.27-2.28c-0.82 0.53-1.69 0.94-2.61 1.22C13.96 21.86 13 22 12 22c-1.38 0-2.68-0.26-3.9-0.79-1.22-0.52-2.27-1.23-3.17-2.14-0.9-0.9-1.62-1.95-2.14-3.17C2.26 14.68 2 13.38 2 12c0-1 0.14-1.96 0.42-2.89 0.29-0.92 0.7-1.8 1.23-2.61L1.38 4.22 2.8 2.8l18.4 18.4-1.43 1.43ZM12 20c0.72 0 1.41-0.1 2.09-0.27 0.67-0.19 1.33-0.46 1.96-0.83L5.1 7.95C4.73 8.58 4.46 9.24 4.28 9.91 4.08 10.6 4 11.28 4 12c0 2.22 0.78 4.1 2.34 5.66C7.9 19.22 9.78 20 12 20Zm8.35-2.5l-1.45-1.45c0.37-0.63 0.64-1.29 0.83-1.96C19.9 13.4 20 12.72 20 12c0-2.22-0.78-4.1-2.34-5.66C16.1 4.78 14.22 4 12 4c-0.72 0-1.41 0.1-2.09 0.28C9.24 4.46 8.58 4.73 7.95 5.1L6.5 3.65c0.82-0.53 1.69-0.94 2.61-1.23C10.04 2.14 11 2 12 2c1.38 0 2.68 0.26 3.9 0.79 1.22 0.52 2.28 1.24 3.17 2.13 0.9 0.9 1.62 1.96 2.14 3.18C21.74 9.32 22 10.62 22 12c0 1-0.14 1.96-0.43 2.89-0.28 0.92-0.69 1.8-1.22 2.61Z" />
+                android:fillColor="#FF1C1B1F"
+                android:pathData="M19.07 21.9l-1.57-1.55c-0.82 0.53-1.69 0.94-2.61 1.22C13.96 21.86 13 22 12 22c-1.38 0-2.68-0.26-3.9-0.79-1.22-0.52-2.27-1.23-3.17-2.14-0.9-0.9-1.62-1.95-2.14-3.17C2.26 14.68 2 13.38 2 12c0-1 0.14-1.96 0.42-2.89 0.29-0.92 0.7-1.8 1.23-2.61L2.08 4.92c-0.2-0.2-0.3-0.43-0.3-0.7 0-0.28 0.1-0.52 0.3-0.72 0.2-0.2 0.43-0.3 0.7-0.3 0.28 0 0.52 0.1 0.72 0.3l17 17c0.2 0.2 0.3 0.43 0.3 0.7 0 0.27-0.1 0.5-0.3 0.7-0.2 0.2-0.44 0.3-0.71 0.3-0.28 0-0.52-0.1-0.71-0.3ZM12 20c0.72 0 1.41-0.1 2.09-0.27 0.67-0.19 1.33-0.46 1.96-0.83L5.1 7.95C4.73 8.58 4.46 9.24 4.28 9.91 4.08 10.6 4 11.28 4 12c0 2.22 0.78 4.1 2.34 5.66C7.9 19.22 9.78 20 12 20Zm0-16c-0.55 0-1.09 0.05-1.61 0.16-0.53 0.11-1.04 0.27-1.54 0.49-0.27 0.12-0.53 0.13-0.8 0.05s-0.47-0.24-0.6-0.48C7.32 4 7.29 3.74 7.36 3.48 7.44 3.2 7.6 3.02 7.85 2.9 8.5 2.6 9.17 2.38 9.86 2.23 10.56 2.08 11.26 2 12 2c1.38 0 2.68 0.26 3.9 0.79 1.22 0.52 2.28 1.24 3.17 2.13 0.9 0.9 1.62 1.96 2.14 3.18C21.74 9.32 22 10.62 22 12c0 0.73-0.07 1.45-0.23 2.14-0.14 0.69-0.37 1.36-0.67 2.01-0.12 0.25-0.3 0.41-0.58 0.49-0.26 0.07-0.51 0.04-0.75-0.09-0.23-0.13-0.39-0.33-0.47-0.6-0.08-0.27-0.07-0.53 0.05-0.8 0.22-0.5 0.38-1.01 0.49-1.54C19.94 13.1 20 12.55 20 12c0-2.22-0.78-4.1-2.34-5.66C16.1 4.78 14.22 4 12 4Z" />
         </group>
     </group>
 </vector>
\ No newline at end of file
diff --git a/play-services-core/src/main/res/drawable/ic_launch_push.xml b/play-services-core/src/main/res/drawable/ic_launch_push.xml
index 678237a6f0..d3e9131ee6 100644
--- a/play-services-core/src/main/res/drawable/ic_launch_push.xml
+++ b/play-services-core/src/main/res/drawable/ic_launch_push.xml
@@ -9,8 +9,8 @@
         <clip-path android:pathData="M0 0H24V24H0z" />
         <group>
             <path
-                android:fillColor="#000000"
-                android:pathData="M6 14h8v-2H6v2Zm0-3h12V9H6v2Zm0-3h12V6H6v2ZM2 22V4c0-0.55 0.2-1.02 0.59-1.41C2.98 2.19 3.45 2 4 2h16c0.55 0 1.02 0.2 1.41 0.59C21.81 2.98 22 3.45 22 4v12c0 0.55-0.2 1.02-0.59 1.41C21.02 17.81 20.55 18 20 18H6l-4 4Zm3.15-6H20V4H4v13.13L5.15 16Z" />
+                android:fillColor="#FF1C1B1F"
+                android:pathData="M18.18 18H15c-0.28 0-0.52-0.1-0.71-0.29C14.09 17.52 14 17.28 14 17c0-0.28 0.1-0.52 0.29-0.71C14.48 16.09 14.72 16 15 16h3.18l-0.88-0.88c-0.18-0.2-0.28-0.43-0.29-0.7 0-0.28 0.09-0.52 0.29-0.72 0.2-0.2 0.43-0.3 0.7-0.3 0.27 0 0.5 0.1 0.7 0.3l2.6 2.6c0.2 0.2 0.3 0.43 0.3 0.7 0 0.27-0.1 0.5-0.3 0.7l-2.6 2.6c-0.2 0.2-0.43 0.3-0.7 0.3-0.27 0-0.5-0.1-0.7-0.3-0.2-0.2-0.3-0.44-0.29-0.71 0.01-0.28 0.1-0.52 0.29-0.71L18.18 18ZM6 18l-2.15 2.15c-0.17 0.17-0.35 0.2-0.55 0.13C3.1 20.18 3 20.02 3 19.8V6c0-0.55 0.2-1.02 0.59-1.41C3.98 4.19 4.45 4 5 4h12c0.55 0 1.02 0.2 1.41 0.59C18.81 4.98 19 5.45 19 6v4c0 0.28-0.1 0.52-0.29 0.71C18.52 10.91 18.28 11 18 11c-0.28 0-0.52-0.1-0.71-0.29C17.09 10.52 17 10.28 17 10V6H5v10h6c0.28 0 0.52 0.1 0.71 0.29C11.91 16.48 12 16.72 12 17c0 0.28-0.1 0.52-0.29 0.71C11.52 17.91 11.28 18 11 18H6Zm2-8h6c0.28 0 0.52-0.1 0.71-0.29C14.91 9.52 15 9.28 15 9c0-0.28-0.1-0.52-0.29-0.71C14.52 8.09 14.28 8 14 8H8C7.72 8 7.48 8.1 7.29 8.29 7.09 8.48 7 8.72 7 9c0 0.28 0.1 0.52 0.29 0.71C7.48 9.91 7.72 10 8 10Zm0 4h3c0.28 0 0.52-0.1 0.71-0.29C11.91 13.52 12 13.28 12 13c0-0.28-0.1-0.52-0.29-0.71C11.52 12.09 11.28 12 11 12H8c-0.28 0-0.52 0.1-0.71 0.29C7.09 12.48 7 12.72 7 13c0 0.28 0.1 0.52 0.29 0.71C7.48 13.91 7.72 14 8 14Z" />
         </group>
     </group>
 </vector>
\ No newline at end of file
diff --git a/play-services-core/src/main/res/drawable/ic_manage_account.xml b/play-services-core/src/main/res/drawable/ic_manage_account.xml
index 2bf1cf8e6a..9a7e28e6ab 100644
--- a/play-services-core/src/main/res/drawable/ic_manage_account.xml
+++ b/play-services-core/src/main/res/drawable/ic_manage_account.xml
@@ -9,8 +9,8 @@
         <clip-path android:pathData="M0 0H24V24H0z" />
         <group>
             <path
-                android:fillColor="#000000"
-                android:pathData="M14.5 23c-0.42 0-0.77-0.15-1.06-0.44-0.3-0.29-0.44-0.64-0.44-1.06v-7c0-0.42 0.15-0.77 0.44-1.06 0.29-0.3 0.64-0.44 1.06-0.44h7c0.42 0 0.77 0.15 1.06 0.44 0.3 0.29 0.44 0.64 0.44 1.06v7c0 0.42-0.15 0.77-0.44 1.06-0.29 0.3-0.64 0.44-1.06 0.44h-7Zm0-1.5h7v-0.8c-0.42-0.52-0.93-0.93-1.52-1.24C19.38 19.16 18.71 19 18 19s-1.38 0.15-1.98 0.46c-0.6 0.31-1.1 0.72-1.52 1.24v0.8ZM18 18c0.42 0 0.77-0.15 1.06-0.44 0.3-0.29 0.44-0.64 0.44-1.06 0-0.42-0.15-0.77-0.44-1.06C18.77 15.14 18.42 15 18 15c-0.42 0-0.77 0.15-1.06 0.44-0.3 0.29-0.44 0.64-0.44 1.06 0 0.42 0.15 0.77 0.44 1.06C17.23 17.86 17.58 18 18 18Zm-5.95-9.5c-0.97 0-1.8 0.34-2.48 1.03C8.9 10.2 8.55 11.03 8.55 12c0 0.8 0.22 1.5 0.67 2.1 0.46 0.6 1.05 1.02 1.78 1.25V13.1c-0.13-0.13-0.24-0.3-0.32-0.51-0.09-0.21-0.13-0.4-0.13-0.59 0-0.42 0.15-0.77 0.44-1.06 0.29-0.3 0.64-0.44 1.06-0.44 0.23 0 0.44 0.05 0.63 0.14 0.18 0.09 0.34 0.21 0.47 0.36h2.25c-0.22-0.73-0.63-1.33-1.24-1.8-0.6-0.47-1.31-0.7-2.11-0.7ZM9.25 22l-0.4-3.2c-0.22-0.08-0.42-0.18-0.61-0.3-0.2-0.12-0.38-0.24-0.57-0.38L4.7 19.38l-2.75-4.75 2.58-1.94-0.03-0.34v-0.68c0-0.1 0-0.22 0.03-0.34L1.95 9.38 4.7 4.63l2.97 1.25C7.87 5.74 8.05 5.62 8.25 5.5c0.2-0.12 0.4-0.22 0.6-0.3L9.25 2h5.5l0.4 3.2c0.22 0.08 0.42 0.18 0.61 0.3 0.2 0.12 0.38 0.24 0.56 0.38l2.98-1.25 2.75 4.75L19.92 11H17.4l-0.05-0.26c-0.02-0.1-0.04-0.18-0.08-0.27l2.16-1.62-0.98-1.7-2.47 1.05c-0.37-0.38-0.78-0.7-1.22-0.96-0.44-0.26-0.92-0.46-1.44-0.59L13 4h-1.97l-0.35 2.65c-0.52 0.13-1 0.33-1.44 0.59C8.8 7.5 8.39 7.8 8.03 8.18L5.54 7.15l-0.97 1.7 2.14 1.6c-0.08 0.25-0.14 0.5-0.17 0.75S6.5 11.72 6.5 12c0 0.27 0.02 0.53 0.05 0.78 0.03 0.25 0.1 0.5 0.17 0.75l-2.14 1.62 0.97 1.7 2.48-1.05c0.4 0.42 0.85 0.77 1.35 1.05 0.5 0.28 1.04 0.47 1.62 0.55V22H9.25Z" />
+                android:fillColor="#FF1C1B1F"
+                android:pathData="M14.5 23c-0.42 0-0.77-0.15-1.06-0.44-0.3-0.29-0.44-0.64-0.44-1.06v-7c0-0.42 0.15-0.77 0.44-1.06 0.29-0.3 0.64-0.44 1.06-0.44h7c0.42 0 0.77 0.15 1.06 0.44 0.3 0.29 0.44 0.64 0.44 1.06v7c0 0.42-0.15 0.77-0.44 1.06-0.29 0.3-0.64 0.44-1.06 0.44h-7Zm3.5-5c0.42 0 0.77-0.15 1.06-0.44 0.3-0.29 0.44-0.64 0.44-1.06 0-0.42-0.15-0.77-0.44-1.06C18.77 15.14 18.42 15 18 15c-0.42 0-0.77 0.15-1.06 0.44-0.3 0.29-0.44 0.64-0.44 1.06 0 0.42 0.15 0.77 0.44 1.06C17.23 17.86 17.58 18 18 18Zm-7-0.57V22h-0.43c-0.45 0-0.8-0.15-1.03-0.45-0.24-0.3-0.4-0.67-0.46-1.1L8.84 18.8c-0.22-0.08-0.42-0.18-0.61-0.3-0.2-0.12-0.38-0.24-0.57-0.38l-1.54 0.65c-0.42 0.19-0.84 0.2-1.25 0.05-0.42-0.14-0.75-0.41-0.98-0.8l-1.17-2.04c-0.24-0.39-0.3-0.8-0.2-1.23 0.1-0.43 0.32-0.8 0.67-1.07l1.33-1-0.03-0.34v-0.68c0-0.1 0-0.22 0.03-0.34l-1.33-1c-0.35-0.28-0.58-0.64-0.68-1.07-0.1-0.43-0.03-0.84 0.2-1.22L3.9 5.98c0.23-0.39 0.56-0.66 0.98-0.8 0.41-0.15 0.83-0.14 1.25 0.04l1.54 0.66C7.87 5.74 8.05 5.62 8.25 5.5c0.2-0.12 0.4-0.22 0.6-0.3l0.22-1.65c0.07-0.43 0.27-0.8 0.6-1.1C9.98 2.15 10.36 2 10.81 2h2.36c0.45 0 0.83 0.15 1.16 0.45 0.32 0.3 0.52 0.67 0.59 1.1l0.22 1.65c0.22 0.08 0.42 0.18 0.61 0.3 0.2 0.12 0.38 0.24 0.56 0.38l1.55-0.66c0.42-0.18 0.84-0.2 1.25-0.04 0.42 0.15 0.75 0.41 0.98 0.8l1.17 2.04c0.24 0.39 0.3 0.8 0.2 1.24-0.1 0.44-0.32 0.8-0.67 1.06l-0.6 0.46c-0.23 0.16-0.48 0.23-0.74 0.2-0.26-0.04-0.48-0.16-0.66-0.38-0.18-0.22-0.26-0.46-0.23-0.72 0.04-0.27 0.16-0.5 0.38-0.68l0.48-0.35-0.98-1.7-2.47 1.05c-0.37-0.38-0.78-0.7-1.22-0.96-0.44-0.26-0.92-0.46-1.44-0.59L13 4h-1.97l-0.35 2.65c-0.52 0.13-1 0.33-1.44 0.59C8.8 7.5 8.39 7.8 8.03 8.18L5.54 7.15l-0.97 1.7 2.14 1.6c-0.08 0.25-0.14 0.5-0.17 0.75S6.5 11.72 6.5 12c0 0.27 0.02 0.53 0.05 0.78 0.03 0.25 0.1 0.5 0.17 0.75l-2.14 1.62 0.97 1.7 2.48-1.05c0.4 0.42 0.85 0.76 1.36 1.04 0.5 0.27 1.04 0.47 1.61 0.59Zm1.05-8.93c-0.97 0-1.8 0.34-2.48 1.01C8.9 10.2 8.55 11.01 8.55 12c0 0.35 0.05 0.7 0.15 1.03 0.1 0.33 0.25 0.65 0.45 0.95 0.18 0.24 0.42 0.4 0.71 0.47 0.3 0.07 0.56 0 0.79-0.17 0.23-0.17 0.37-0.4 0.41-0.67 0.04-0.27-0.03-0.51-0.21-0.71-0.1-0.13-0.17-0.27-0.22-0.41-0.06-0.14-0.08-0.3-0.08-0.49 0-0.42 0.15-0.77 0.44-1.06 0.29-0.3 0.64-0.44 1.06-0.44 0.17 0 0.33 0.03 0.49 0.09 0.16 0.06 0.3 0.13 0.44 0.23 0.2 0.15 0.42 0.2 0.67 0.17 0.25-0.04 0.46-0.18 0.63-0.42 0.16-0.23 0.22-0.49 0.16-0.77S14.24 9.28 14 9.1c-0.23-0.2-0.52-0.35-0.85-0.45-0.33-0.1-0.7-0.15-1.1-0.15Zm2.95 13h6c0.13 0 0.25-0.05 0.35-0.15 0.1-0.1 0.15-0.22 0.15-0.35 0-0.1-0.02-0.2-0.05-0.27-0.03-0.09-0.08-0.17-0.15-0.25-0.42-0.46-0.9-0.81-1.46-1.08C19.28 19.13 18.67 19 18 19c-0.67 0-1.28 0.13-1.84 0.4s-1.04 0.63-1.46 1.08c-0.03 0.03-0.1 0.2-0.2 0.52 0 0.13 0.05 0.25 0.15 0.35 0.1 0.1 0.22 0.15 0.35 0.15Z" />
         </group>
     </group>
 </vector>
\ No newline at end of file
diff --git a/play-services-core/src/main/res/drawable/ic_privacy.xml b/play-services-core/src/main/res/drawable/ic_privacy.xml
index db6c2bc484..3d202a0e8f 100644
--- a/play-services-core/src/main/res/drawable/ic_privacy.xml
+++ b/play-services-core/src/main/res/drawable/ic_privacy.xml
@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="25dp"
-    android:height="25dp"
+    android:width="24dp"
+    android:height="24dp"
     android:tint="?colorControlNormal"
-    android:viewportWidth="25"
-    android:viewportHeight="25">
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
     <group>
-        <clip-path android:pathData="M.55.05H24.55V24.05H.55z" />
+        <clip-path android:pathData="M0 0H24V24H0z" />
         <group>
             <path
-                android:fillColor="#000000"
-                android:pathData="M12.55 13.05c-0.99 0-1.81-0.34-2.49-1.01-0.67-0.68-1.01-1.5-1.01-2.5 0-0.97 0.34-1.8 1.01-2.48 0.68-0.67 1.5-1.01 2.49-1.01 0.98 0 1.81 0.34 2.49 1.01 0.67 0.68 1 1.5 1 2.49 0 0.98-0.33 1.81-1 2.49-0.68 0.67-1.5 1-2.5 1Zm0-2c0.43 0 0.79-0.14 1.07-0.43 0.29-0.28 0.43-0.64 0.43-1.07 0-0.43-0.14-0.8-0.43-1.08-0.28-0.28-0.64-0.42-1.07-0.42-0.44 0-0.8 0.14-1.08 0.42-0.28 0.29-0.42 0.65-0.42 1.08 0 0.43 0.14 0.79 0.42 1.07 0.29 0.29 0.64 0.43 1.08 0.43Zm0 11c-2.32-0.58-4.23-1.91-5.74-3.99-1.5-2.07-2.26-4.38-2.26-6.91v-6.1l8-3 8 3v6.1c0 2.53-0.76 4.84-2.26 6.91-1.51 2.08-3.43 3.4-5.74 3.99Zm0-17.88l-6 2.25v4.73c0 0.9 0.12 1.77 0.37 2.62 0.25 0.85 0.6 1.65 1.03 2.4 0.7-0.35 1.43-0.62 2.2-0.82 0.76-0.2 1.56-0.3 2.4-0.3 0.83 0 1.63 0.1 2.4 0.3 0.76 0.2 1.5 0.47 2.2 0.82 0.43-0.75 0.77-1.55 1.02-2.4 0.25-0.85 0.38-1.72 0.38-2.62V6.42l-6-2.25Zm0 12.88c-0.6 0-1.19 0.07-1.75 0.2-0.57 0.13-1.11 0.32-1.63 0.55 0.49 0.5 1.01 0.93 1.58 1.3 0.56 0.37 1.16 0.65 1.8 0.85 0.63-0.2 1.23-0.48 1.8-0.85 0.56-0.37 1.09-0.8 1.57-1.3-0.51-0.23-1.06-0.42-1.62-0.55-0.57-0.13-1.15-0.2-1.75-0.2Z" />
+                android:fillColor="#FF1C1B1F"
+                android:pathData="M12 13c-0.98 0-1.81-0.34-2.49-1.01C8.84 11.3 8.5 10.49 8.5 9.5c0-0.98 0.34-1.81 1.01-2.49C10.2 6.34 11.01 6 12 6c0.98 0 1.81 0.34 2.49 1.01 0.67 0.68 1.01 1.5 1.01 2.49 0 0.98-0.34 1.81-1.01 2.49C13.8 12.66 12.99 13 12 13Zm0-2c0.43 0 0.8-0.14 1.07-0.43 0.29-0.28 0.43-0.64 0.43-1.07 0-0.43-0.14-0.8-0.43-1.07C12.8 8.14 12.43 8 12 8c-0.43 0-0.8 0.14-1.07 0.43C10.64 8.7 10.5 9.07 10.5 9.5c0 0.43 0.14 0.8 0.43 1.07C11.2 10.86 11.57 11 12 11Zm0-6.88L6 6.38v4.73c0 0.9 0.13 1.78 0.38 2.63 0.25 0.84 0.59 1.64 1.02 2.4 0.7-0.35 1.43-0.63 2.2-0.83 0.77-0.2 1.57-0.3 2.4-0.3 0.83 0 1.63 0.1 2.4 0.3 0.77 0.2 1.5 0.47 2.2 0.82 0.43-0.75 0.77-1.55 1.02-2.4C17.88 12.88 18 12 18 11.1V6.38l-6-2.25ZM12 17c-0.6 0-1.18 0.07-1.75 0.2-0.57 0.13-1.1 0.32-1.63 0.55 0.49 0.5 1.01 0.93 1.58 1.3 0.57 0.37 1.17 0.65 1.8 0.85 0.63-0.2 1.23-0.48 1.8-0.85 0.57-0.37 1.1-0.8 1.57-1.3-0.51-0.23-1.05-0.42-1.62-0.55C13.18 17.07 12.6 17 12 17Zm0 4.9c-0.12 0-0.22 0-0.32-0.02l-0.3-0.08C9.12 21.05 7.33 19.66 6 17.64c-1.33-2.03-2-4.2-2-6.54V6.38c0-0.42 0.12-0.8 0.36-1.13C4.6 4.92 4.92 4.67 5.3 4.53l6-2.26c0.23-0.08 0.47-0.12 0.7-0.12 0.23 0 0.47 0.04 0.7 0.13l6 2.25c0.38 0.14 0.7 0.39 0.94 0.72C19.88 5.58 20 5.95 20 6.38v4.72c0 2.33-0.67 4.51-2 6.54-1.33 2.02-3.13 3.41-5.38 4.16-0.1 0.03-0.2 0.06-0.3 0.07-0.1 0.02-0.2 0.03-0.32 0.03Z" />
         </group>
     </group>
 </vector>
\ No newline at end of file
diff --git a/play-services-core/src/main/res/drawable/ic_push_register.xml b/play-services-core/src/main/res/drawable/ic_push_register.xml
index e126e43d97..54ac0e8ddd 100644
--- a/play-services-core/src/main/res/drawable/ic_push_register.xml
+++ b/play-services-core/src/main/res/drawable/ic_push_register.xml
@@ -9,8 +9,8 @@
         <clip-path android:pathData="M0 0H24V24H0z" />
         <group>
             <path
-                android:fillColor="#000000"
-                android:pathData="M11 15h2v-2h2v-2h-2V9h-2v2H9v2h2v2Zm-7 4v-2h2v-7c0-1.38 0.42-2.61 1.25-3.69 0.83-1.07 1.92-1.78 3.25-2.11V3.5c0-0.42 0.15-0.77 0.44-1.06C11.23 2.14 11.58 2 12 2c0.42 0 0.77 0.15 1.06 0.44 0.3 0.29 0.44 0.64 0.44 1.06v0.7c1.33 0.33 2.42 1.04 3.25 2.11C17.58 7.4 18 8.61 18 10v7h2v2H4Zm8 3c-0.55 0-1.02-0.2-1.41-0.59C10.19 21.02 10 20.55 10 20h4c0 0.55-0.2 1.02-0.59 1.41C13.02 21.81 12.55 22 12 22Zm-4-5h8v-7c0-1.1-0.4-2.04-1.18-2.83C14.04 6.4 13.1 6 12 6c-1.1 0-2.04 0.4-2.82 1.17C8.39 7.96 8 8.9 8 10v7Z" />
+                android:fillColor="#FF1C1B1F"
+                android:pathData="M5 19c-0.28 0-0.52-0.1-0.71-0.29C4.09 18.52 4 18.28 4 18c0-0.28 0.1-0.52 0.29-0.71C4.48 17.09 4.72 17 5 17h1v-7c0-1.38 0.42-2.61 1.25-3.69 0.83-1.07 1.92-1.78 3.25-2.11V3.5c0-0.42 0.15-0.77 0.44-1.06C11.23 2.14 11.58 2 12 2c0.42 0 0.77 0.15 1.06 0.44 0.3 0.29 0.44 0.64 0.44 1.06v0.7c1.33 0.33 2.42 1.04 3.25 2.11C17.58 7.4 18 8.61 18 10v7h1c0.28 0 0.52 0.1 0.71 0.29C19.91 17.48 20 17.72 20 18c0 0.28-0.1 0.52-0.29 0.71C19.52 18.91 19.28 19 19 19H5Zm7 3c-0.55 0-1.02-0.2-1.41-0.59C10.19 21.02 10 20.55 10 20h4c0 0.55-0.2 1.02-0.59 1.41C13.02 21.81 12.55 22 12 22Zm-4-5h8v-7c0-1.1-0.4-2.04-1.18-2.83C14.04 6.4 13.1 6 12 6c-1.1 0-2.04 0.4-2.82 1.17C8.39 7.96 8 8.9 8 10v7Zm3-4v1c0 0.28 0.1 0.52 0.29 0.71C11.48 14.91 11.72 15 12 15c0.28 0 0.52-0.1 0.71-0.29C12.91 14.52 13 14.28 13 14v-1h1c0.28 0 0.52-0.1 0.71-0.29C14.91 12.52 15 12.28 15 12c0-0.28-0.1-0.52-0.29-0.71C14.52 11.09 14.28 11 14 11h-1v-1c0-0.28-0.1-0.52-0.29-0.71C12.52 9.09 12.28 9 12 9c-0.28 0-0.52 0.1-0.71 0.29C11.09 9.48 11 9.72 11 10v1h-1c-0.28 0-0.52 0.1-0.71 0.29C9.09 11.48 9 11.72 9 12c0 0.28 0.1 0.52 0.29 0.71C9.48 12.91 9.72 13 10 13h1Z" />
         </group>
     </group>
 </vector>
\ No newline at end of file
diff --git a/play-services-core/src/main/res/drawable/ic_self_check.xml b/play-services-core/src/main/res/drawable/ic_self_check.xml
index d9ca7b9fb4..8feed36f69 100644
--- a/play-services-core/src/main/res/drawable/ic_self_check.xml
+++ b/play-services-core/src/main/res/drawable/ic_self_check.xml
@@ -9,8 +9,8 @@
         <clip-path android:pathData="M0 0H24V24H0z" />
         <group>
             <path
-                android:fillColor="#000000"
-                android:pathData="M8.6 22.5l-1.9-3.2-3.6-0.8 0.35-3.7L1 12l2.45-2.8L3.1 5.5l3.6-0.8 1.9-3.2L12 2.95l3.4-1.45 1.9 3.2 3.6 0.8-0.35 3.7L23 12l-2.45 2.8 0.35 3.7-3.6 0.8-1.9 3.2-3.4-1.45-3.4 1.45Zm0.85-2.55l2.55-1.1 2.6 1.1 1.4-2.4 2.75-0.65-0.25-2.8 1.85-2.1-1.85-2.15 0.25-2.8L16 6.45l-1.45-2.4L12 5.15l-2.6-1.1L8 6.45l-2.75 0.6 0.25 2.8L3.65 12l1.85 2.1-0.25 2.85L8 17.55l1.45 2.4Zm1.5-4.4L16.6 9.9l-1.4-1.45-4.25 4.25-2.15-2.1L7.4 12l3.55 3.55Z" />
+                android:fillColor="#FF1C1B1F"
+                android:pathData="M10.95 12.7L9.5 11.28C9.32 11.09 9.09 11 8.81 11c-0.27 0-0.51 0.1-0.71 0.3-0.18 0.18-0.27 0.42-0.27 0.7 0 0.28 0.09 0.52 0.27 0.7l2.15 2.15c0.2 0.2 0.43 0.3 0.7 0.3 0.27 0 0.5-0.1 0.7-0.3l4.25-4.25c0.2-0.2 0.3-0.43 0.29-0.7-0.01-0.27-0.1-0.5-0.29-0.7-0.2-0.2-0.44-0.3-0.71-0.31-0.28-0.01-0.51 0.08-0.71 0.29l-3.53 3.52Zm-2.8 9.05L6.7 19.3l-2.75-0.6c-0.25-0.05-0.45-0.18-0.6-0.39-0.15-0.2-0.2-0.43-0.18-0.68l0.28-2.83-1.88-2.15c-0.16-0.18-0.25-0.4-0.25-0.65s0.09-0.47 0.25-0.65L3.46 9.2 3.17 6.38C3.15 6.13 3.2 5.9 3.35 5.67 3.5 5.49 3.7 5.36 3.95 5.3L6.7 4.7l1.45-2.45C8.28 2.03 8.47 1.89 8.7 1.81c0.23-0.07 0.47-0.06 0.7 0.04l2.6 1.1 2.6-1.1c0.23-0.1 0.47-0.11 0.7-0.04 0.23 0.08 0.42 0.22 0.55 0.44L17.3 4.7l2.75 0.6c0.25 0.05 0.45 0.18 0.6 0.39 0.15 0.2 0.2 0.43 0.18 0.68L20.54 9.2l1.88 2.15c0.16 0.18 0.25 0.4 0.25 0.65s-0.09 0.47-0.25 0.65l-1.88 2.15 0.27 2.82c0.04 0.25-0.02 0.48-0.17 0.7-0.15 0.2-0.35 0.33-0.6 0.38l-2.75 0.6-1.45 2.45c-0.13 0.22-0.32 0.36-0.55 0.44-0.23 0.07-0.47 0.06-0.7-0.04l-2.6-1.1-2.6 1.1c-0.23 0.1-0.47 0.11-0.7 0.04-0.23-0.08-0.42-0.22-0.55-0.44Zm1.3-1.8l2.55-1.1 2.6 1.1 1.4-2.4 2.75-0.65-0.25-2.8 1.85-2.1-1.85-2.15 0.25-2.8L16 6.45l-1.45-2.4L12 5.15l-2.6-1.1L8 6.45l-2.75 0.6 0.25 2.8L3.65 12l1.85 2.1-0.25 2.85L8 17.55l1.45 2.4Z" />
         </group>
     </group>
 </vector>
\ No newline at end of file
diff --git a/play-services-core/src/main/res/drawable/ic_settings.xml b/play-services-core/src/main/res/drawable/ic_settings.xml
index 3d9cf9e1a4..1f68535d48 100644
--- a/play-services-core/src/main/res/drawable/ic_settings.xml
+++ b/play-services-core/src/main/res/drawable/ic_settings.xml
@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="25dp"
-    android:height="25dp"
+    android:width="24dp"
+    android:height="24dp"
     android:tint="?colorControlNormal"
-    android:viewportWidth="25"
-    android:viewportHeight="25">
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <group>
-        <clip-path
-            android:pathData="M.76.13H24.76V24.13H.76z"/>
+        <clip-path android:pathData="M0 0H24V24H0z" />
         <group>
             <path
-                android:fillColor="#000000"
-                android:pathData="M10 22.13l-0.4-3.2c-0.2-0.08-0.41-0.18-0.6-0.3-0.2-0.11-0.38-0.24-0.57-0.37L5.46 19.5 2.7 14.76l2.57-1.95-0.02-0.34V11.8c0-0.11 0-0.23 0.02-0.34L2.71 9.5l2.75-4.75L8.43 6c0.19-0.14 0.38-0.26 0.58-0.38l0.6-0.3 0.4-3.2h5.5l0.4 3.2c0.22 0.09 0.42 0.19 0.61 0.3 0.2 0.12 0.38 0.24 0.56 0.38l2.98-1.25L22.8 9.5l-2.58 1.95c0.02 0.11 0.03 0.23 0.03 0.34v0.67c0 0.1-0.02 0.22-0.05 0.34l2.57 1.95-2.75 4.75-2.95-1.25c-0.18 0.13-0.37 0.26-0.57 0.37-0.2 0.12-0.4 0.22-0.6 0.3l-0.4 3.2H10Zm1.76-2h1.97l0.35-2.65c0.52-0.13 1-0.33 1.44-0.58 0.44-0.26 0.85-0.57 1.21-0.94l2.48 1.02 0.97-1.7-2.15-1.62c0.09-0.23 0.15-0.48 0.18-0.74s0.05-0.52 0.05-0.79c0-0.26-0.02-0.53-0.05-0.78-0.03-0.26-0.1-0.5-0.18-0.74l2.15-1.63-0.97-1.7-2.48 1.05c-0.36-0.38-0.77-0.7-1.2-0.96-0.45-0.26-0.93-0.45-1.45-0.59l-0.32-2.65h-1.98l-0.35 2.65c-0.51 0.14-1 0.33-1.43 0.6C9.55 7.62 9.15 7.93 8.78 8.3L6.31 7.28l-0.98 1.7 2.15 1.6c-0.08 0.25-0.14 0.5-0.17 0.75s-0.05 0.52-0.05 0.8c0 0.27 0.02 0.53 0.05 0.78 0.03 0.25 0.1 0.5 0.17 0.75l-2.15 1.62 0.98 1.7 2.47-1.05c0.37 0.39 0.77 0.7 1.22 0.97 0.44 0.25 0.92 0.45 1.43 0.58l0.33 2.65Zm1.05-4.5c0.97 0 1.8-0.34 2.47-1.02 0.69-0.68 1.03-1.51 1.03-2.48 0-0.96-0.34-1.79-1.03-2.47-0.68-0.69-1.5-1.03-2.47-1.03-0.98 0-1.81 0.34-2.49 1.03-0.67 0.68-1.01 1.5-1.01 2.47 0 0.97 0.34 1.8 1.01 2.48 0.68 0.68 1.5 1.02 2.49 1.02Z"/>
+                android:fillColor="#FF1C1B1F"
+                android:pathData="M10.82 22c-0.45 0-0.83-0.15-1.16-0.45-0.32-0.3-0.52-0.67-0.59-1.1L8.85 18.8c-0.22-0.08-0.42-0.18-0.61-0.3-0.2-0.12-0.38-0.24-0.57-0.38l-1.54 0.65c-0.42 0.19-0.84 0.2-1.25 0.05-0.42-0.14-0.75-0.41-0.98-0.8l-1.17-2.04c-0.24-0.39-0.3-0.8-0.2-1.23 0.1-0.43 0.32-0.8 0.67-1.07l1.33-1-0.03-0.34v-0.68c0-0.1 0-0.22 0.03-0.34l-1.33-1c-0.35-0.28-0.58-0.64-0.68-1.07-0.1-0.43-0.03-0.84 0.2-1.22L3.9 5.98c0.23-0.39 0.56-0.66 0.98-0.8 0.41-0.15 0.83-0.14 1.25 0.04l1.54 0.66C7.87 5.74 8.05 5.62 8.25 5.5c0.2-0.12 0.4-0.22 0.6-0.3l0.22-1.65c0.07-0.43 0.27-0.8 0.6-1.1C9.98 2.15 10.36 2 10.81 2h2.36c0.45 0 0.83 0.15 1.16 0.45 0.32 0.3 0.52 0.67 0.59 1.1l0.22 1.65c0.22 0.08 0.42 0.18 0.61 0.3 0.2 0.12 0.38 0.24 0.56 0.38l1.55-0.66c0.42-0.18 0.84-0.2 1.25-0.04 0.42 0.15 0.75 0.41 0.98 0.8l1.17 2.04c0.24 0.39 0.3 0.8 0.2 1.23-0.1 0.43-0.32 0.8-0.67 1.07l-1.32 1 0.02 0.34v0.68c0 0.1-0.02 0.22-0.05 0.34l1.32 1c0.36 0.28 0.58 0.64 0.68 1.07 0.1 0.43 0.03 0.84-0.2 1.22l-1.2 2.05c-0.23 0.39-0.56 0.66-0.98 0.8-0.41 0.16-0.83 0.14-1.25-0.05l-1.5-0.64c-0.18 0.13-0.37 0.25-0.57 0.37-0.2 0.12-0.4 0.22-0.6 0.3l-0.22 1.65c-0.07 0.43-0.27 0.8-0.6 1.1-0.32 0.3-0.7 0.45-1.15 0.45h-2.36ZM11 20h1.97l0.35-2.65c0.52-0.13 1-0.33 1.44-0.59 0.44-0.26 0.85-0.57 1.21-0.94l2.48 1.03 0.98-1.7-2.16-1.63c0.09-0.23 0.15-0.47 0.18-0.73S17.5 12.27 17.5 12s-0.02-0.53-0.05-0.79c-0.03-0.26-0.1-0.5-0.18-0.74l2.16-1.62-0.98-1.7-2.47 1.05c-0.37-0.38-0.78-0.7-1.22-0.96-0.44-0.26-0.92-0.46-1.44-0.59L13 4h-1.97l-0.35 2.65c-0.52 0.13-1 0.33-1.44 0.59C8.8 7.5 8.39 7.8 8.03 8.18L5.54 7.15l-0.97 1.7 2.14 1.6c-0.08 0.25-0.14 0.5-0.17 0.75S6.5 11.72 6.5 12c0 0.27 0.02 0.53 0.05 0.78 0.03 0.25 0.1 0.5 0.17 0.75l-2.14 1.62 0.97 1.7 2.48-1.05c0.36 0.38 0.77 0.7 1.2 0.96 0.45 0.26 0.93 0.46 1.45 0.59L11 20Zm1.05-4.5c0.97 0 1.8-0.34 2.47-1.03 0.69-0.68 1.03-1.5 1.03-2.47 0-0.97-0.34-1.8-1.03-2.47-0.68-0.69-1.5-1.03-2.47-1.03-0.98 0-1.81 0.34-2.49 1.03C8.9 10.2 8.55 11.03 8.55 12c0 0.97 0.34 1.8 1.01 2.47 0.68 0.69 1.5 1.03 2.49 1.03Z" />
         </group>
     </group>
 </vector>
\ No newline at end of file
diff --git a/play-services-core/src/main/res/drawable/ic_unregister.xml b/play-services-core/src/main/res/drawable/ic_unregister.xml
index bc4f056646..4960af9716 100644
--- a/play-services-core/src/main/res/drawable/ic_unregister.xml
+++ b/play-services-core/src/main/res/drawable/ic_unregister.xml
@@ -9,8 +9,8 @@
         <clip-path android:pathData="M0 0H24V24H0z" />
         <group>
             <path
-                android:fillColor="#000000"
-                android:pathData="M7 21c-0.55 0-1.02-0.2-1.41-0.59C5.19 20.02 5 19.55 5 19V6H4V4h5V3h6v1h5v2h-1v13c0 0.55-0.2 1.02-0.59 1.41C18.02 20.81 17.55 21 17 21H7ZM17 6H7v13h10V6ZM9 17h2V8H9v9Zm4 0h2V8h-2v9Z" />
+                android:fillColor="#FF1C1B1F"
+                android:pathData="M7 21c-0.55 0-1.02-0.2-1.41-0.59C5.19 20.02 5 19.55 5 19V6C4.72 6 4.48 5.9 4.29 5.71 4.09 5.52 4 5.28 4 5c0-0.28 0.1-0.52 0.29-0.71C4.48 4.09 4.72 4 5 4h4c0-0.28 0.1-0.52 0.29-0.71C9.48 3.09 9.72 3 10 3h4c0.28 0 0.52 0.1 0.71 0.29C14.91 3.48 15 3.72 15 4h4c0.28 0 0.52 0.1 0.71 0.29C19.91 4.48 20 4.72 20 5c0 0.28-0.1 0.52-0.29 0.71C19.52 5.91 19.28 6 19 6v13c0 0.55-0.2 1.02-0.59 1.41C18.02 20.81 17.55 21 17 21H7ZM17 6H7v13h10V6Zm-7 11c0.28 0 0.52-0.1 0.71-0.29C10.91 16.52 11 16.28 11 16V9c0-0.28-0.1-0.52-0.29-0.71C10.52 8.09 10.28 8 10 8 9.72 8 9.48 8.1 9.29 8.29 9.09 8.48 9 8.72 9 9v7c0 0.28 0.1 0.52 0.29 0.71C9.48 16.91 9.72 17 10 17Zm4 0c0.28 0 0.52-0.1 0.71-0.29C14.91 16.52 15 16.28 15 16V9c0-0.28-0.1-0.52-0.29-0.71C14.52 8.09 14.28 8 14 8c-0.28 0-0.52 0.1-0.71 0.29C13.09 8.48 13 8.72 13 9v7c0 0.28 0.1 0.52 0.29 0.71C13.48 16.91 13.72 17 14 17Z" />
         </group>
     </group>
 </vector>
\ No newline at end of file
diff --git a/play-services-core/src/main/res/drawable/material_switch_bar_background.xml b/play-services-core/src/main/res/drawable/material_switch_bar_background.xml
deleted file mode 100644
index 98ba43f114..0000000000
--- a/play-services-core/src/main/res/drawable/material_switch_bar_background.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ SPDX-FileCopyrightText: 2024 microG Project Team
-  ~ SPDX-License-Identifier: Apache-2.0
-  -->
-
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="?attr/colorPrimaryContainer"/>
-    <corners android:radius="28dp"/>
-</shape>
\ No newline at end of file
diff --git a/play-services-core/src/main/res/drawable/material_switch_bar_background_disabled.xml b/play-services-core/src/main/res/drawable/material_switch_bar_background_disabled.xml
deleted file mode 100644
index ad37971c2b..0000000000
--- a/play-services-core/src/main/res/drawable/material_switch_bar_background_disabled.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ SPDX-FileCopyrightText: 2024 microG Project Team
-  ~ SPDX-License-Identifier: Apache-2.0
-  -->
-
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="?attr/colorControlHighlight"/>
-    <corners android:radius="28dp"/>
-</shape>
\ No newline at end of file
diff --git a/play-services-core/src/main/res/layout/ask_gcm.xml b/play-services-core/src/main/res/layout/ask_push_notification.xml
similarity index 67%
rename from play-services-core/src/main/res/layout/ask_gcm.xml
rename to play-services-core/src/main/res/layout/ask_push_notification.xml
index a3e9fcdbf8..dc4552444f 100644
--- a/play-services-core/src/main/res/layout/ask_gcm.xml
+++ b/play-services-core/src/main/res/layout/ask_push_notification.xml
@@ -39,7 +39,7 @@
                 android:layout_height="24dp"
                 android:layout_marginBottom="18dp"
                 android:scaleType="fitCenter"
-                android:src="@drawable/ic_cloud_bell" />
+                android:src="@drawable/ic_cloud_messaging" />
 
             <TextView
                 android:id="@+id/permission_message"
@@ -59,23 +59,31 @@
             android:layout_marginBottom="18dp"
             android:divider="?attr/dividerHorizontal"
             android:orientation="vertical"
-            android:paddingLeft="20dp"
-            android:paddingRight="20dp">
+            android:paddingStart="26dp"
+            android:paddingEnd="26dp">
 
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/permission_allow_button"
-                android:layout_width="match_parent"
-                android:layout_height="64dp"
-                android:text="@string/allow">
-            </com.google.android.material.button.MaterialButton>
+            <com.google.android.material.button.MaterialButtonToggleGroup
+                android:id="@+id/toggleButton"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:orientation="vertical">
+
+                <Button
+                    android:id="@+id/permission_allow_button"
+                    style="@style/Widget.Material3.Button.TonalButton"
+                    android:layout_width="fill_parent"
+                    android:layout_height="72dp"
+                    android:text="@string/allow" />
+
+                <Button
+                    android:id="@+id/permission_deny_button"
+                    style="@style/Widget.Material3.Button.TonalButton"
+                    android:layout_width="fill_parent"
+                    android:layout_height="72dp"
+                    android:text="@string/deny" />
 
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/permission_deny_button"
-                style="@style/Widget.Material3.Button.TonalButton"
-                android:layout_width="match_parent"
-                android:layout_height="64dp"
-                android:text="@string/deny">
-            </com.google.android.material.button.MaterialButton>
+            </com.google.android.material.button.MaterialButtonToggleGroup>
         </LinearLayout>
 
     </LinearLayout>
diff --git a/play-services-core/src/main/res/menu/privacy_menu_item.xml b/play-services-core/src/main/res/menu/accounts_menu_item.xml
similarity index 100%
rename from play-services-core/src/main/res/menu/privacy_menu_item.xml
rename to play-services-core/src/main/res/menu/accounts_menu_item.xml
diff --git a/play-services-core/src/main/res/menu/gcm_menu_item.xml b/play-services-core/src/main/res/menu/gcm_menu_item.xml
index 0a894ba585..61d9a1b48b 100644
--- a/play-services-core/src/main/res/menu/gcm_menu_item.xml
+++ b/play-services-core/src/main/res/menu/gcm_menu_item.xml
@@ -2,8 +2,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item
-        android:id="@+id/menu_advanced"
+        android:id="@+id/menu_settings"
         android:icon="@drawable/ic_settings"
-        android:title="@string/menu_advanced"
+        android:title="@string/menu_settings"
         app:showAsAction="ifRoom" />
 </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 070ad04227..10d40ceeb0 100644
--- a/play-services-core/src/main/res/navigation/nav_settings.xml
+++ b/play-services-core/src/main/res/navigation/nav_settings.xml
@@ -11,9 +11,6 @@
         android:id="@+id/settingsFragment"
         android:name="org.microg.gms.ui.SettingsFragment"
         android:label="@string/gms_settings_name">
-        <action
-            android:id="@+id/openSelfcheck"
-            app:destination="@id/selfcheckFragment" />
         <action
             android:id="@+id/openCheckinSettings"
             app:destination="@id/checkinFragment" />
@@ -87,7 +84,7 @@
     <fragment
         android:id="@+id/gcmAdvancedFragment"
         android:name="org.microg.gms.ui.PushNotificationAdvancedFragment"
-        android:label="@string/menu_advanced" />
+        android:label="@string/menu_settings" />
 
     <fragment
         android:id="@+id/privacyFragment"
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 45592e6492..d5a396ffde 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
@@ -96,7 +96,7 @@ Isso pode levar alguns minutos."</string>
     <string name="pref_auth_visible_title">Permitir que aplicativos encontrem contas</string>
     <string name="pref_auth_visible_summary">Quando ativado, todos os aplicativos deste dispositivo poderão ver o endereço de e-mail de suas contas do Google sem autorização prévia</string>
     <string name="pref_auth_include_android_id_title">Autenticar com o registro de dispositivos</string>
-    <string name="pref_auth_include_android_id_summary">Quando desabilitado, as solicitações de autenticação não serão vinculadas ao registro de dispositivos, o que permite que dispositivos não autorizados entrem, mas podem haver consequências imprevistas</string>
+    <string name="pref_auth_include_android_id_summary">Quando desativado, as solicitações de autenticação não serão vinculadas ao registro de dispositivos, o que permite que dispositivos não autorizados entrem, mas podem haver consequências imprevistas</string>
     <string name="pref_auth_strip_device_name_title">Remover nome do dispositivo para autenticação</string>
     <string name="pref_auth_strip_device_name_summary">Quando ativado, solicitações de autenticação não incluirão o nome do dispositivo, o que pode permitir que dispositivos não autorizados façam login, mas pode ter consequências imprevistas</string>
 
@@ -127,7 +127,7 @@ Isso pode levar alguns minutos."</string>
     <string name="gcm_messages_counter">Mensagens: <xliff:g example="123">%1$d</xliff:g> (<xliff:g example="12345">%2$d</xliff:g> bytes)</string>
     <string name="gcm_network_state_disconnected">Desconectado</string>
     <string name="gcm_network_state_connected">Conectado: <xliff:g example="2 hours ago">%1$s</xliff:g></string>
-    <string name="gcm_enable_switch">Receber notificações push</string>
+    <string name="gcm_enable_switch">Notificações push</string>
     <string name="gcm_allow_app_popup">Permitir que <xliff:g example="F-Droid">%1$s</xliff:g> se registre para notificações push?</string>
 
     <string name="pref_push_app_allow_register_title">Permitir registro</string>
@@ -156,6 +156,11 @@ Isso pode levar alguns minutos."</string>
     <string name="push_notifications_summary_values_seconds">%s segundos</string>
     <string name="push_notifications_summary_values_minutes">%s minutos</string>
 
+    <string name="pref_network_google_enabled_summary">Se desativado, todas as conexões com os servidores do Google normalmente feitas pelo MicroG serão negadas. Isso substitui as configurações específicas do serviço</string>
+    <string name="pref_network_google_enabled">Permitir a conexão aos servidores do Google</string>
+    <string name="pref_network_google_use_tor">Conectar ao Google via rede Tor</string>
+    <string name="pref_network_google_use_tor_summary">Exige que o Orbot esteja instalado\\nAinda não há suporte</string>
+
     <!-- Account settings-->
 
     <string name="pref_accounts_summary">Adicionar e gerenciar contas Google</string>
@@ -174,13 +179,9 @@ Isso pode levar alguns minutos."</string>
     <string name="dialog_cancel_button">Cancelar</string>
     <string name="toast_remove_account_success">%s removida</string>
 
-    <!-- Redesign strings-->
+    <!-- Settings options strings-->
 
     <string name="developer">Desenvolvedor</string>
     <string name="github_source">Repositório com o código fonte</string>
     <string name="pref_hide_launcher_icon">Ocultar ícone do launcher</string>
-    <string name="pref_network_google_enabled_summary">Se desativado, todas as conexões com os servidores do Google normalmente feitas pelo MicroG serão negadas. Isso substitui as configurações específicas do serviço</string>
-    <string name="pref_network_google_enabled">Permitir a conexão aos servidores do Google</string>
-    <string name="pref_network_google_use_tor">Conectar ao Google via rede Tor</string>
-    <string name="pref_network_google_use_tor_summary">Exige que o Orbot esteja instalado\\nAinda não há suporte</string>
 </resources>
diff --git a/play-services-core/src/main/res/values/strings.xml b/play-services-core/src/main/res/values/strings.xml
index aca6d47144..af786f0638 100644
--- a/play-services-core/src/main/res/values/strings.xml
+++ b/play-services-core/src/main/res/values/strings.xml
@@ -167,6 +167,11 @@ This can take a couple of minutes"</string>
     <string name="push_notifications_summary_values_seconds">%s seconds</string>
     <string name="push_notifications_summary_values_minutes">%s minutes</string>
 
+    <string name="pref_network_google_enabled_summary">If disabled, all connections to Google servers usually done by MicroG will be denied. This overrides service specific settings</string>
+    <string name="pref_network_google_enabled">Allow connecting to Google servers</string>
+    <string name="pref_network_google_use_tor">Connect to Google via Tor network</string>
+    <string name="pref_network_google_use_tor_summary">Requires Orbot to be installed\\nNot yet supported</string>
+
     <!-- Account settings-->
 
     <string name="pref_accounts_summary">Add and manage Google accounts</string>
@@ -185,7 +190,7 @@ This can take a couple of minutes"</string>
     <string name="dialog_cancel_button">Cancel</string>
     <string name="toast_remove_account_success">%s removed</string>
 
-    <!-- Redesign strings-->
+    <!-- Settings options strings-->
 
     <string name="wstxda">WSTxda</string>
     <string name="developer">Developer</string>
@@ -194,8 +199,4 @@ This can take a couple of minutes"</string>
     <string name="github_source">Source code repository</string>
     <string name="github_link">https://github.com/WSTxda/MicroG-RE</string>
     <string name="pref_hide_launcher_icon">Hide icon in launcher</string>
-    <string name="pref_network_google_enabled_summary">If disabled, all connections to Google servers usually done by MicroG will be denied. This overrides service specific settings</string>
-    <string name="pref_network_google_enabled">Allow connecting to Google servers</string>
-    <string name="pref_network_google_use_tor">Connect to Google via Tor network</string>
-    <string name="pref_network_google_use_tor_summary">Requires Orbot to be installed\\nNot yet supported</string>
 </resources>
diff --git a/play-services-core/src/main/res/values/themes.xml b/play-services-core/src/main/res/values/themes.xml
index 002c236892..6c6a0f2b4c 100644
--- a/play-services-core/src/main/res/values/themes.xml
+++ b/play-services-core/src/main/res/values/themes.xml
@@ -61,8 +61,8 @@
     <style name="Theme.Base.Preference.SwitchBarPreference" parent="@style/Preference.SwitchBar">
         <item name="layout">@layout/preference_material_switch_bar</item>
         <item name="switchBarFrameId">@id/frame</item>
-        <item name="switchBarFrameBackgroundOn">@drawable/material_switch_bar_background</item>
-        <item name="switchBarFrameBackgroundOff">@drawable/material_switch_bar_background</item>
+        <item name="switchBarFrameBackgroundOn">@drawable/material_switch_bar_background_on</item>
+        <item name="switchBarFrameBackgroundOff">@drawable/material_switch_bar_background_off</item>
         <item name="switchBarFrameBackgroundDisabled">@drawable/material_switch_bar_background_disabled</item>
     </style>
 
diff --git a/play-services-core/src/main/res/xml/preferences_device_registration.xml b/play-services-core/src/main/res/xml/preferences_device_registration.xml
index 1d27ec10ca..30b5af61b8 100644
--- a/play-services-core/src/main/res/xml/preferences_device_registration.xml
+++ b/play-services-core/src/main/res/xml/preferences_device_registration.xml
@@ -52,7 +52,7 @@
             android:title="@string/pref_info_status"
             tools:summary="Last registration: 13 hours ago" />
 
-        <PreferenceCategory android:icon="@drawable/ic_info_outline" />
+        <PreferenceCategory android:icon="@drawable/ic_information" />
 
         <org.microg.gms.ui.TextPreference
             android:selectable="false"
diff --git a/play-services-core/src/main/res/xml/preferences_gcm_advanced.xml b/play-services-core/src/main/res/xml/preferences_push_notification_settings.xml
similarity index 94%
rename from play-services-core/src/main/res/xml/preferences_gcm_advanced.xml
rename to play-services-core/src/main/res/xml/preferences_push_notification_settings.xml
index 453496ce01..915dadcf46 100644
--- a/play-services-core/src/main/res/xml/preferences_gcm_advanced.xml
+++ b/play-services-core/src/main/res/xml/preferences_push_notification_settings.xml
@@ -18,15 +18,13 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <org.microg.gms.ui.SwitchBarPreference
+    <SwitchPreferenceCompat
         android:defaultValue="false"
         android:key="gcm_confirm_new_apps"
         android:persistent="false"
-        android:title="@string/pref_gcm_confirm_new_apps_title" />
-
-    <Preference
-        android:selectable="false"
-        android:summary="@string/pref_gcm_confirm_new_apps_summary" />
+        android:summary="@string/pref_gcm_confirm_new_apps_summary"
+        android:title="@string/pref_gcm_confirm_new_apps_title"
+        app:iconSpaceReserved="false" />
 
     <PreferenceCategory
         android:key="prefcat_networks"
diff --git a/play-services-core/src/main/res/xml/preferences_push_notifications.xml b/play-services-core/src/main/res/xml/preferences_push_notifications.xml
index 8c40ad0082..36ecb28238 100644
--- a/play-services-core/src/main/res/xml/preferences_push_notifications.xml
+++ b/play-services-core/src/main/res/xml/preferences_push_notifications.xml
@@ -40,7 +40,7 @@
             app:selectable="false"
             tools:summary="Connected since 15 minutes ago" />
 
-        <PreferenceCategory android:icon="@drawable/ic_info_outline" />
+        <PreferenceCategory android:icon="@drawable/ic_information" />
 
         <org.microg.gms.ui.TextPreference
             android:selectable="false"
diff --git a/play-services-core/src/main/res/xml/preferences_push_notifications_app.xml b/play-services-core/src/main/res/xml/preferences_push_notifications_app.xml
index 20265329ab..358d670b3b 100644
--- a/play-services-core/src/main/res/xml/preferences_push_notifications_app.xml
+++ b/play-services-core/src/main/res/xml/preferences_push_notifications_app.xml
@@ -44,7 +44,7 @@
         android:layout="@layout/preference_category_no_label">
 
         <Preference
-            android:icon="@drawable/ic_info_outline"
+            android:icon="@drawable/ic_information"
             android:key="pref_push_app_status"
             android:selectable="false"
             tools:summary="Messages: 1000 (37 MB)\nLast message: 22 min ago\nRegistered since: 3 month ago" />
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 2e0172527b..db35ca2ae7 100644
--- a/play-services-core/src/main/res/xml/preferences_start.xml
+++ b/play-services-core/src/main/res/xml/preferences_start.xml
@@ -18,29 +18,14 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-
     <Preference
         android:key="pref_ignore_battery_optimization"
         android:summary="@string/self_check_resolution_battery_optimizations"
         android:title="@string/cond_gcm_bat_action"
         app:layout="@layout/preference_material_card_view" />
 
-
-    <Preference
-        android:icon="@drawable/ic_self_check"
-        android:summary="@string/self_check_desc"
-        android:title="@string/self_check_title">
-        <intent
-            android:targetClass="org.microg.gms.ui.SelfCheckFragment$AsActivity"
-            android:targetPackage="@string/var_pref_start_gms_package" />
-    </Preference>
-
-    <PreferenceCategory
-        android:key="prefcat_google_services"
-        android:layout="@layout/preference_category_no_label">
-
         <Preference
-            android:icon="@drawable/ic_add_account"
+            android:icon="@drawable/ic_accounts"
             android:key="pref_accounts"
             android:summary="@string/pref_accounts_summary"
             android:title="@string/pref_add_account_title" />
@@ -51,7 +36,7 @@
             android:title="@string/service_name_checkin" />
 
         <Preference
-            android:icon="@drawable/ic_cloud_bell"
+            android:icon="@drawable/ic_cloud_messaging"
             android:key="pref_gcm"
             android:title="@string/service_name_mcs" />
 
@@ -61,11 +46,6 @@
             android:key="pref_hide_launcher_icon"
             android:title="@string/pref_hide_launcher_icon" />
 
-    </PreferenceCategory>
-    <PreferenceCategory
-        android:key="prefcat_footer"
-        android:layout="@layout/preference_category_no_label">
-
         <Preference
             android:icon="@drawable/ic_developer"
             android:key="pref_developer"
@@ -79,8 +59,7 @@
             android:title="@string/github" />
 
         <Preference
-            android:icon="@drawable/ic_info_outline"
+            android:icon="@drawable/ic_information"
             android:key="pref_about"
             android:title="@string/pref_about_title" />
-    </PreferenceCategory>
 </PreferenceScreen>