diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index 11808ec879c6..34ee89a07889 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -111,7 +111,7 @@
 
         <meta-data
             android:name="xperiaplayoptimized_content"
-            android:resource="@drawable/ic_launcher" />
+            android:resource="@mipmap/ic_launcher" />
 
         <profileable android:shell="true" android:enabled="true" />
     </application>
diff --git a/android/build.gradle b/android/build.gradle
index bbb8dde19824..b5fc122301e0 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -48,7 +48,11 @@ android {
 
 	compileSdk 35
 	ndkVersion "21.4.7075529"
-
+	java {
+		toolchain {
+			languageVersion = JavaLanguageVersion.of(17)
+		}
+	}
 	defaultConfig {
 		/*
 		configurations.all {
@@ -117,10 +121,14 @@ android {
 					'../assets',
 			]
 		}
+		normal {
+			res.srcDirs = ['normal/res']
+		}
 		gold {
 			res.srcDirs = ['gold/res']
 		}
 		vr {
+			res.srcDirs = ['normal/res']
 			manifest.srcFile 'VRManifest.xml'
 		}
 		legacy {
diff --git a/android/d.txt b/android/d.txt
deleted file mode 100644
index 4bcfe98e640c..000000000000
--- a/android/d.txt
+++ /dev/null
@@ -1 +0,0 @@
-d
diff --git a/android/gold/res/drawable-hdpi/ic_launcher.png b/android/gold/res/drawable-hdpi/ic_launcher.png
deleted file mode 100644
index 66236297410b..000000000000
Binary files a/android/gold/res/drawable-hdpi/ic_launcher.png and /dev/null differ
diff --git a/android/gold/res/drawable-ldpi/ic_launcher.png b/android/gold/res/drawable-ldpi/ic_launcher.png
deleted file mode 100644
index 2b6a4090650b..000000000000
Binary files a/android/gold/res/drawable-ldpi/ic_launcher.png and /dev/null differ
diff --git a/android/gold/res/drawable-mdpi/ic_launcher.png b/android/gold/res/drawable-mdpi/ic_launcher.png
deleted file mode 100644
index d2df261bab6a..000000000000
Binary files a/android/gold/res/drawable-mdpi/ic_launcher.png and /dev/null differ
diff --git a/android/gold/res/drawable-xhdpi/ic_banner.png b/android/gold/res/drawable-xhdpi/ic_banner.png
index aadda27f3220..936edbcd6ba9 100644
Binary files a/android/gold/res/drawable-xhdpi/ic_banner.png and b/android/gold/res/drawable-xhdpi/ic_banner.png differ
diff --git a/android/gold/res/drawable-xhdpi/ic_launcher.png b/android/gold/res/drawable-xhdpi/ic_launcher.png
deleted file mode 100644
index c8e6e7d3d4c0..000000000000
Binary files a/android/gold/res/drawable-xhdpi/ic_launcher.png and /dev/null differ
diff --git a/android/gold/res/drawable-xxhdpi/ic_launcher.png b/android/gold/res/drawable-xxhdpi/ic_launcher.png
deleted file mode 100644
index f1d666718cff..000000000000
Binary files a/android/gold/res/drawable-xxhdpi/ic_launcher.png and /dev/null differ
diff --git a/android/res/mipmap-anydpi-v26/ic_launcher.xml b/android/gold/res/mipmap-anydpi-v26/ic_launcher_round.xml
similarity index 100%
rename from android/res/mipmap-anydpi-v26/ic_launcher.xml
rename to android/gold/res/mipmap-anydpi-v26/ic_launcher_round.xml
diff --git a/android/gold/res/mipmap-hdpi/ic_launcher.png b/android/gold/res/mipmap-hdpi/ic_launcher.png
index 66236297410b..6adb7a5140ab 100644
Binary files a/android/gold/res/mipmap-hdpi/ic_launcher.png and b/android/gold/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/android/gold/res/mipmap-hdpi/ic_launcher_foreground.png b/android/gold/res/mipmap-hdpi/ic_launcher_foreground.png
index ddd85887cda3..7112364351ab 100644
Binary files a/android/gold/res/mipmap-hdpi/ic_launcher_foreground.png and b/android/gold/res/mipmap-hdpi/ic_launcher_foreground.png differ
diff --git a/android/gold/res/mipmap-hdpi/ic_launcher_round.png b/android/gold/res/mipmap-hdpi/ic_launcher_round.png
new file mode 100644
index 000000000000..355fb97310cc
Binary files /dev/null and b/android/gold/res/mipmap-hdpi/ic_launcher_round.png differ
diff --git a/android/gold/res/mipmap-mdpi/ic_launcher.png b/android/gold/res/mipmap-mdpi/ic_launcher.png
index d2df261bab6a..07ef1f44fdfc 100644
Binary files a/android/gold/res/mipmap-mdpi/ic_launcher.png and b/android/gold/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/android/gold/res/mipmap-mdpi/ic_launcher_foreground.png b/android/gold/res/mipmap-mdpi/ic_launcher_foreground.png
index da83c7f7aa9b..b4d4614206f6 100644
Binary files a/android/gold/res/mipmap-mdpi/ic_launcher_foreground.png and b/android/gold/res/mipmap-mdpi/ic_launcher_foreground.png differ
diff --git a/android/gold/res/mipmap-mdpi/ic_launcher_round.png b/android/gold/res/mipmap-mdpi/ic_launcher_round.png
new file mode 100644
index 000000000000..9db2a471f049
Binary files /dev/null and b/android/gold/res/mipmap-mdpi/ic_launcher_round.png differ
diff --git a/android/gold/res/mipmap-xhdpi/ic_launcher.png b/android/gold/res/mipmap-xhdpi/ic_launcher.png
index c8e6e7d3d4c0..b90db5d063eb 100644
Binary files a/android/gold/res/mipmap-xhdpi/ic_launcher.png and b/android/gold/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/android/gold/res/mipmap-xhdpi/ic_launcher_foreground.png b/android/gold/res/mipmap-xhdpi/ic_launcher_foreground.png
index 1b164184ef69..4d8035ae6ca2 100644
Binary files a/android/gold/res/mipmap-xhdpi/ic_launcher_foreground.png and b/android/gold/res/mipmap-xhdpi/ic_launcher_foreground.png differ
diff --git a/android/gold/res/mipmap-xhdpi/ic_launcher_round.png b/android/gold/res/mipmap-xhdpi/ic_launcher_round.png
new file mode 100644
index 000000000000..be3423da4b61
Binary files /dev/null and b/android/gold/res/mipmap-xhdpi/ic_launcher_round.png differ
diff --git a/android/gold/res/mipmap-xxhdpi/ic_launcher.png b/android/gold/res/mipmap-xxhdpi/ic_launcher.png
index f1d666718cff..3f15e255168e 100644
Binary files a/android/gold/res/mipmap-xxhdpi/ic_launcher.png and b/android/gold/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/android/gold/res/mipmap-xxhdpi/ic_launcher_foreground.png b/android/gold/res/mipmap-xxhdpi/ic_launcher_foreground.png
index 9aad451c46c2..acfca1b1a7ca 100644
Binary files a/android/gold/res/mipmap-xxhdpi/ic_launcher_foreground.png and b/android/gold/res/mipmap-xxhdpi/ic_launcher_foreground.png differ
diff --git a/android/gold/res/mipmap-xxhdpi/ic_launcher_round.png b/android/gold/res/mipmap-xxhdpi/ic_launcher_round.png
new file mode 100644
index 000000000000..0013f53b63de
Binary files /dev/null and b/android/gold/res/mipmap-xxhdpi/ic_launcher_round.png differ
diff --git a/android/gold/res/mipmap-xxxhdpi/ic_launcher.png b/android/gold/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 000000000000..f72cc6dd9a0a
Binary files /dev/null and b/android/gold/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/android/gold/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/android/gold/res/mipmap-xxxhdpi/ic_launcher_foreground.png
new file mode 100644
index 000000000000..ec9efd3da5c9
Binary files /dev/null and b/android/gold/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ
diff --git a/android/gold/res/mipmap-xxxhdpi/ic_launcher_round.png b/android/gold/res/mipmap-xxxhdpi/ic_launcher_round.png
new file mode 100644
index 000000000000..6a2760d7f338
Binary files /dev/null and b/android/gold/res/mipmap-xxxhdpi/ic_launcher_round.png differ
diff --git a/android/gold/res/values/ic_launcher_background.xml b/android/gold/res/values/ic_launcher_background.xml
index 41d3129698c8..af3eaffd89c0 100644
--- a/android/gold/res/values/ic_launcher_background.xml
+++ b/android/gold/res/values/ic_launcher_background.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="ic_launcher_background">#53482D</color>
+    <color name="ic_launcher_background">#534820</color>
 </resources>
\ No newline at end of file
diff --git a/android/legacy/res/drawable-hdpi/ic_launcher.png b/android/legacy/res/drawable-hdpi/ic_launcher.png
deleted file mode 100644
index 7a36832d0f60..000000000000
Binary files a/android/legacy/res/drawable-hdpi/ic_launcher.png and /dev/null differ
diff --git a/android/legacy/res/drawable-mdpi/ic_launcher.png b/android/legacy/res/drawable-mdpi/ic_launcher.png
deleted file mode 100644
index ed83506c1b77..000000000000
Binary files a/android/legacy/res/drawable-mdpi/ic_launcher.png and /dev/null differ
diff --git a/android/legacy/res/drawable-xhdpi/ic_launcher.png b/android/legacy/res/drawable-xhdpi/ic_launcher.png
deleted file mode 100644
index 4b7484924c6a..000000000000
Binary files a/android/legacy/res/drawable-xhdpi/ic_launcher.png and /dev/null differ
diff --git a/android/legacy/res/drawable-xxhdpi/ic_launcher.png b/android/legacy/res/drawable-xxhdpi/ic_launcher.png
deleted file mode 100644
index 895bba7f68ad..000000000000
Binary files a/android/legacy/res/drawable-xxhdpi/ic_launcher.png and /dev/null differ
diff --git a/android/res/drawable-xhdpi/ic_banner.png b/android/normal/res/drawable-xhdpi/ic_banner.png
similarity index 100%
rename from android/res/drawable-xhdpi/ic_banner.png
rename to android/normal/res/drawable-xhdpi/ic_banner.png
diff --git a/android/normal/res/mipmap-anydpi-v26/ic_launcher.xml b/android/normal/res/mipmap-anydpi-v26/ic_launcher.xml
new file mode 100644
index 000000000000..036d09bc5fd5
--- /dev/null
+++ b/android/normal/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>
\ No newline at end of file
diff --git a/android/normal/res/mipmap-anydpi-v26/ic_launcher_round.xml b/android/normal/res/mipmap-anydpi-v26/ic_launcher_round.xml
new file mode 100644
index 000000000000..036d09bc5fd5
--- /dev/null
+++ b/android/normal/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>
\ No newline at end of file
diff --git a/android/normal/res/mipmap-hdpi/ic_launcher.png b/android/normal/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 000000000000..eaee4ede0c43
Binary files /dev/null and b/android/normal/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/android/normal/res/mipmap-hdpi/ic_launcher_foreground.png b/android/normal/res/mipmap-hdpi/ic_launcher_foreground.png
new file mode 100644
index 000000000000..fedf484d4603
Binary files /dev/null and b/android/normal/res/mipmap-hdpi/ic_launcher_foreground.png differ
diff --git a/android/normal/res/mipmap-hdpi/ic_launcher_round.png b/android/normal/res/mipmap-hdpi/ic_launcher_round.png
new file mode 100644
index 000000000000..ebdb864f0563
Binary files /dev/null and b/android/normal/res/mipmap-hdpi/ic_launcher_round.png differ
diff --git a/android/normal/res/mipmap-mdpi/ic_launcher.png b/android/normal/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 000000000000..93c8c8a38cef
Binary files /dev/null and b/android/normal/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/android/normal/res/mipmap-mdpi/ic_launcher_foreground.png b/android/normal/res/mipmap-mdpi/ic_launcher_foreground.png
new file mode 100644
index 000000000000..8fb9ddb9daa7
Binary files /dev/null and b/android/normal/res/mipmap-mdpi/ic_launcher_foreground.png differ
diff --git a/android/normal/res/mipmap-mdpi/ic_launcher_round.png b/android/normal/res/mipmap-mdpi/ic_launcher_round.png
new file mode 100644
index 000000000000..7acb40d47395
Binary files /dev/null and b/android/normal/res/mipmap-mdpi/ic_launcher_round.png differ
diff --git a/android/normal/res/mipmap-xhdpi/ic_launcher.png b/android/normal/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 000000000000..f9be4ef41db2
Binary files /dev/null and b/android/normal/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/android/normal/res/mipmap-xhdpi/ic_launcher_foreground.png b/android/normal/res/mipmap-xhdpi/ic_launcher_foreground.png
new file mode 100644
index 000000000000..858b5129a88a
Binary files /dev/null and b/android/normal/res/mipmap-xhdpi/ic_launcher_foreground.png differ
diff --git a/android/normal/res/mipmap-xhdpi/ic_launcher_round.png b/android/normal/res/mipmap-xhdpi/ic_launcher_round.png
new file mode 100644
index 000000000000..6208a478af40
Binary files /dev/null and b/android/normal/res/mipmap-xhdpi/ic_launcher_round.png differ
diff --git a/android/normal/res/mipmap-xxhdpi/ic_launcher.png b/android/normal/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 000000000000..f2ebb55a1668
Binary files /dev/null and b/android/normal/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/android/normal/res/mipmap-xxhdpi/ic_launcher_foreground.png b/android/normal/res/mipmap-xxhdpi/ic_launcher_foreground.png
new file mode 100644
index 000000000000..508c08372eeb
Binary files /dev/null and b/android/normal/res/mipmap-xxhdpi/ic_launcher_foreground.png differ
diff --git a/android/normal/res/mipmap-xxhdpi/ic_launcher_round.png b/android/normal/res/mipmap-xxhdpi/ic_launcher_round.png
new file mode 100644
index 000000000000..b4a0ce6c2076
Binary files /dev/null and b/android/normal/res/mipmap-xxhdpi/ic_launcher_round.png differ
diff --git a/android/normal/res/mipmap-xxxhdpi/ic_launcher.png b/android/normal/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 000000000000..97cb59b7d506
Binary files /dev/null and b/android/normal/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/android/normal/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/android/normal/res/mipmap-xxxhdpi/ic_launcher_foreground.png
new file mode 100644
index 000000000000..dc27abeb6464
Binary files /dev/null and b/android/normal/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ
diff --git a/android/normal/res/mipmap-xxxhdpi/ic_launcher_round.png b/android/normal/res/mipmap-xxxhdpi/ic_launcher_round.png
new file mode 100644
index 000000000000..2a0afd666006
Binary files /dev/null and b/android/normal/res/mipmap-xxxhdpi/ic_launcher_round.png differ
diff --git a/android/res/values/ic_launcher_background.xml b/android/normal/res/values/ic_launcher_background.xml
similarity index 100%
rename from android/res/values/ic_launcher_background.xml
rename to android/normal/res/values/ic_launcher_background.xml
diff --git a/android/res/drawable-hdpi/ic_launcher.png b/android/res/drawable-hdpi/ic_launcher.png
deleted file mode 100644
index 982b0e34bcb5..000000000000
Binary files a/android/res/drawable-hdpi/ic_launcher.png and /dev/null differ
diff --git a/android/res/drawable-mdpi/ic_launcher.png b/android/res/drawable-mdpi/ic_launcher.png
deleted file mode 100644
index badd38dc062c..000000000000
Binary files a/android/res/drawable-mdpi/ic_launcher.png and /dev/null differ
diff --git a/android/res/drawable-xhdpi/ic_launcher.png b/android/res/drawable-xhdpi/ic_launcher.png
deleted file mode 100644
index 33d7274e9fbc..000000000000
Binary files a/android/res/drawable-xhdpi/ic_launcher.png and /dev/null differ
diff --git a/android/res/drawable-xxhdpi/ic_launcher.png b/android/res/drawable-xxhdpi/ic_launcher.png
deleted file mode 100644
index 79863e3706b6..000000000000
Binary files a/android/res/drawable-xxhdpi/ic_launcher.png and /dev/null differ
diff --git a/android/res/mipmap-hdpi/ic_launcher.png b/android/res/mipmap-hdpi/ic_launcher.png
deleted file mode 100644
index 982b0e34bcb5..000000000000
Binary files a/android/res/mipmap-hdpi/ic_launcher.png and /dev/null differ
diff --git a/android/res/mipmap-hdpi/ic_launcher_foreground.png b/android/res/mipmap-hdpi/ic_launcher_foreground.png
deleted file mode 100644
index dfd4b7ebadac..000000000000
Binary files a/android/res/mipmap-hdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/android/res/mipmap-mdpi/ic_launcher.png b/android/res/mipmap-mdpi/ic_launcher.png
deleted file mode 100644
index badd38dc062c..000000000000
Binary files a/android/res/mipmap-mdpi/ic_launcher.png and /dev/null differ
diff --git a/android/res/mipmap-mdpi/ic_launcher_foreground.png b/android/res/mipmap-mdpi/ic_launcher_foreground.png
deleted file mode 100644
index 00db9645c026..000000000000
Binary files a/android/res/mipmap-mdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/android/res/mipmap-xhdpi/ic_launcher.png b/android/res/mipmap-xhdpi/ic_launcher.png
deleted file mode 100644
index 33d7274e9fbc..000000000000
Binary files a/android/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ
diff --git a/android/res/mipmap-xhdpi/ic_launcher_foreground.png b/android/res/mipmap-xhdpi/ic_launcher_foreground.png
deleted file mode 100644
index 1711f0f7b989..000000000000
Binary files a/android/res/mipmap-xhdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/android/res/mipmap-xxhdpi/ic_launcher.png b/android/res/mipmap-xxhdpi/ic_launcher.png
deleted file mode 100644
index 79863e3706b6..000000000000
Binary files a/android/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ
diff --git a/android/res/mipmap-xxhdpi/ic_launcher_foreground.png b/android/res/mipmap-xxhdpi/ic_launcher_foreground.png
deleted file mode 100644
index b623f90e42d5..000000000000
Binary files a/android/res/mipmap-xxhdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/android/res/values/analytics.xml b/android/res/values/analytics.xml
deleted file mode 100644
index b8b5bb4c40ce..000000000000
--- a/android/res/values/analytics.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <string name="ga_trackingId">UA-36039055-2</string>
-  <!--Enable automatic activity tracking-->
-  <bool name="ga_autoActivityTracking">true</bool>
-  <!--Enable automatic exception tracking-->
-  <bool name="ga_reportUncaughtExceptions">true</bool>
-</resources>
diff --git a/android/src/gold/ic_launcher-playstore.png b/android/src/gold/ic_launcher-playstore.png
new file mode 100644
index 000000000000..12a23edafb69
Binary files /dev/null and b/android/src/gold/ic_launcher-playstore.png differ
diff --git a/android/src/normal/ic_launcher-playstore.png b/android/src/normal/ic_launcher-playstore.png
new file mode 100644
index 000000000000..dd96d9be5e0d
Binary files /dev/null and b/android/src/normal/ic_launcher-playstore.png differ
diff --git a/android/src/org/ppsspp/ppsspp/ShortcutActivity.java b/android/src/org/ppsspp/ppsspp/ShortcutActivity.java
index f7717f823afb..8cd2945b21c8 100644
--- a/android/src/org/ppsspp/ppsspp/ShortcutActivity.java
+++ b/android/src/org/ppsspp/ppsspp/ShortcutActivity.java
@@ -154,7 +154,7 @@ private void respondToShortcutRequest(Uri uri) {
 		}
 		if (!setIcon) {
 			// Fall back to the PPSSPP icon.
-			ShortcutIconResource iconResource = ShortcutIconResource.fromContext(this, R.drawable.ic_launcher);
+			ShortcutIconResource iconResource = ShortcutIconResource.fromContext(this, R.mipmap.ic_launcher);
 			responseIntent.putExtra(Intent.EXTRA_SHORTCUT_ICON_RESOURCE, iconResource);
 		}
 		setResult(RESULT_OK, responseIntent);