diff --git a/build.gradle b/build.gradle
index b99f21f1..0ccf3ad9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -65,17 +65,6 @@ def ourVersionCode = gmsVersionCode * 1000 + ourVersionMinor * 2  + (gitCommitCo
 def ourVersionName = "$ourVersionBase.$gmsVersionCode" + "-vanced"
 logger.lifecycle('Starting build for version {} ({})...', ourVersionName, ourVersionCode)
 
-@Deprecated
-String getMyVersionName() {
-    return ourVersionName
-}
-
-@Deprecated
-int getMyVersionCode() {
-    return ourVersionCode
-}
-
-
 allprojects {
     apply plugin: 'idea'
 
@@ -85,25 +74,6 @@ allprojects {
     ext.isReleaseVersion = false
 }
 
-@Deprecated
-def androidCompileSdk() { return androidCompileSdk }
-
-@Deprecated
-def androidTargetSdk() { return androidTargetSdk }
-
-@Deprecated
-def androidMinSdk() { return androidMinSdk }
-
-@Deprecated
-def versionCode() {
-    return ourVersionCode
-}
-
-@Deprecated
-def versionName() {
-    return ourVersionName
-}
-
 subprojects {
     repositories {
         jcenter()
diff --git a/play-services-core/build.gradle b/play-services-core/build.gradle
index 175d4c43..d47cc06c 100644
--- a/play-services-core/build.gradle
+++ b/play-services-core/build.gradle
@@ -55,9 +55,6 @@ android {
 
         multiDexEnabled true
 
-        ndk {
-            abiFilters "armeabi", "armeabi-v7a", "arm64-v8a", "x86", "x86_64"
-        }
     }
 
     dataBinding {
diff --git a/play-services-core/src/main/AndroidManifest.xml b/play-services-core/src/main/AndroidManifest.xml
index e6d3819d..7b4a8055 100644
--- a/play-services-core/src/main/AndroidManifest.xml
+++ b/play-services-core/src/main/AndroidManifest.xml
@@ -279,7 +279,7 @@
             android:name="org.microg.gms.ui.SettingsActivity"
             android:icon="@mipmap/ic_launcher"
             android:label="@string/gms_settings_name"
-            android:roundIcon="@mipmap/ic_microg_settings"
+            android:roundIcon="@mipmap/ic_launcher"
             android:theme="@style/Theme.AppCompat.DayNight">
             <intent-filter>
                 <action android:name="android.intent.action.APPLICATION_PREFERENCES" />
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 6ef04c35..44801f8a 100644
--- a/play-services-core/src/main/res/layout/ask_permission.xml
+++ b/play-services-core/src/main/res/layout/ask_permission.xml
@@ -75,7 +75,7 @@
             android:padding="10dp">
 
             <ImageView
-                android:src="@mipmap/ic_core_service_app"
+                android:src="@mipmap/ic_launcher"
                 android:id="@+id/app_icon"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent" />
diff --git a/play-services-core/src/main/res/mipmap-anydpi-v26/ic_microg_settings.xml b/play-services-core/src/main/res/mipmap-anydpi-v26/ic_microg_settings.xml
deleted file mode 100644
index bcdc5a25..00000000
--- a/play-services-core/src/main/res/mipmap-anydpi-v26/ic_microg_settings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon
-  xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@mipmap/ic_microg_background" />
-    <foreground android:drawable="@mipmap/ic_microg_foreground" />
-</adaptive-icon>
\ No newline at end of file
diff --git a/play-services-core/src/main/res/mipmap-hdpi/ic_core_service_app.png b/play-services-core/src/main/res/mipmap-hdpi/ic_core_service_app.png
deleted file mode 100644
index 47a7303a..00000000
Binary files a/play-services-core/src/main/res/mipmap-hdpi/ic_core_service_app.png and /dev/null differ
diff --git a/play-services-core/src/main/res/mipmap-hdpi/ic_microg_background.png b/play-services-core/src/main/res/mipmap-hdpi/ic_microg_background.png
deleted file mode 100644
index 503ae018..00000000
Binary files a/play-services-core/src/main/res/mipmap-hdpi/ic_microg_background.png and /dev/null differ
diff --git a/play-services-core/src/main/res/mipmap-hdpi/ic_microg_foreground.png b/play-services-core/src/main/res/mipmap-hdpi/ic_microg_foreground.png
deleted file mode 100644
index 9087dc6f..00000000
Binary files a/play-services-core/src/main/res/mipmap-hdpi/ic_microg_foreground.png and /dev/null differ
diff --git a/play-services-core/src/main/res/mipmap-hdpi/ic_microg_settings.png b/play-services-core/src/main/res/mipmap-hdpi/ic_microg_settings.png
deleted file mode 100644
index 4b32cbbf..00000000
Binary files a/play-services-core/src/main/res/mipmap-hdpi/ic_microg_settings.png and /dev/null differ
diff --git a/proguard.flags b/proguard.flags
index 17f1d2ea..86ac77f3 100644
--- a/proguard.flags
+++ b/proguard.flags
@@ -17,10 +17,7 @@
 -dontnote
 
 # Keep dynamically loaded GMS classes
--keep public class com.google.android.gms.maps.internal.CreatorImpl { public *; }
 -keep public class com.google.android.gms.common.security.ProviderInstallerImpl { public *; }
--keep public class com.google.android.gms.plus.plusone.PlusOneButtonCreatorImpl { public *; }
--keep public class com.google.android.gms.chimera.container.DynamiteLoaderImpl { public *; }
 -keep public class com.google.android.gms.cast.framework.internal.CastDynamiteModuleImpl { public *; }
 
 # Keep AutoSafeParcelables