@@ -78,6 +78,120 @@
             </intent-filter>
         </config-file>
 
+        <config-file target="AndroidManifest.xml" parent="./application">
+            <activity-alias
+                android:name=".MainActivityIconDefault"
+                android:enabled="true"
+                android:exported="true"
+                android:icon="@mipmap/ic_launcher"
+                android:roundIcon="@mipmap/ic_launcher_round"
+                android:label="@string/app_name"
+                android:targetActivity=".MainActivity">
+                <intent-filter>
+                    <action android:name="android.intent.action.MAIN" />
+                    <category android:name="android.intent.category.LAUNCHER" />
+                </intent-filter>
+            </activity-alias>
+
+            <activity-alias
+                android:name=".MainActivityIconPro"
+                android:enabled="false"
+                android:exported="true"
+                android:icon="@mipmap/ic_acode_pro"
+                android:roundIcon="@mipmap/ic_acode_pro_round"
+                android:label="@string/app_name"
+                android:targetActivity=".MainActivity">
+                <intent-filter>
+                    <action android:name="android.intent.action.MAIN" />
+                    <category android:name="android.intent.category.LAUNCHER" />
+                </intent-filter>
+            </activity-alias>
+
+            <activity-alias
+                android:name=".MainActivityIconMidnightCircuit"
+                android:enabled="false"
+                android:exported="true"
+                android:icon="@mipmap/ic_acode_midnight_circuit"
+                android:roundIcon="@mipmap/ic_acode_midnight_circuit_round"
+                android:label="@string/app_name"
+                android:targetActivity=".MainActivity">
+                <intent-filter>
+                    <action android:name="android.intent.action.MAIN" />
+                    <category android:name="android.intent.category.LAUNCHER" />
+                </intent-filter>
+            </activity-alias>
+
+            <activity-alias
+                android:name=".MainActivityIconAuroraPulse"
+                android:enabled="false"
+                android:exported="true"
+                android:icon="@mipmap/ic_acode_aurora_pulse"
+                android:roundIcon="@mipmap/ic_acode_aurora_pulse_round"
+                android:label="@string/app_name"
+                android:targetActivity=".MainActivity">
+                <intent-filter>
+                    <action android:name="android.intent.action.MAIN" />
+                    <category android:name="android.intent.category.LAUNCHER" />
+                </intent-filter>
+            </activity-alias>
+
+            <activity-alias
+                android:name=".MainActivityIconTerminalGlow"
+                android:enabled="false"
+                android:exported="true"
+                android:icon="@mipmap/ic_acode_terminal_glow"
+                android:roundIcon="@mipmap/ic_acode_terminal_glow_round"
+                android:label="@string/app_name"
+                android:targetActivity=".MainActivity">
+                <intent-filter>
+                    <action android:name="android.intent.action.MAIN" />
+                    <category android:name="android.intent.category.LAUNCHER" />
+                </intent-filter>
+            </activity-alias>
+
+            <activity-alias
+                android:name=".MainActivityIconSolarFlare"
+                android:enabled="false"
+                android:exported="true"
+                android:icon="@mipmap/ic_acode_solar_flare"
+                android:roundIcon="@mipmap/ic_acode_solar_flare_round"
+                android:label="@string/app_name"
+                android:targetActivity=".MainActivity">
+                <intent-filter>
+                    <action android:name="android.intent.action.MAIN" />
+                    <category android:name="android.intent.category.LAUNCHER" />
+                </intent-filter>
+            </activity-alias>
+
+            <activity-alias
+                android:name=".MainActivityIconBlueprint"
+                android:enabled="false"
+                android:exported="true"
+                android:icon="@mipmap/ic_acode_blueprint"
+                android:roundIcon="@mipmap/ic_acode_blueprint_round"
+                android:label="@string/app_name"
+                android:targetActivity=".MainActivity">
+                <intent-filter>
+                    <action android:name="android.intent.action.MAIN" />
+                    <category android:name="android.intent.category.LAUNCHER" />
+                </intent-filter>
+            </activity-alias>
+
+            <activity-alias
+                android:name=".MainActivityIconPixelParty"
+                android:enabled="false"
+                android:exported="true"
+                android:icon="@mipmap/ic_acode_pixel_party"
+                android:roundIcon="@mipmap/ic_acode_pixel_party_round"
+                android:label="@string/app_name"
+                android:targetActivity=".MainActivity">
+                <intent-filter>
+                    <action android:name="android.intent.action.MAIN" />
+                    <category android:name="android.intent.category.LAUNCHER" />
+                </intent-filter>
+            </activity-alias>
+        </config-file>
+
         <config-file target="AndroidManifest.xml" parent="/manifest">
             <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
             <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
@@ -25,11 +25,18 @@ fs.copyFileSync(gradleFilePath, androidGradleFilePath);
 // directories that are required later in the build. Keep the generated tree and
 // only overlay this project's custom resources on top of it.
 copyDirRecursively(localResPath, resPath);
+// Cordova can retain plugin Java from an earlier install during prepare.
+// Keep the System plugin's icon map in sync with the launcher resources.
+copyDirRecursively(
+  path.resolve(__dirname, '../src/plugins/system/android'),
+  path.resolve(__dirname, '../platforms/android/app/src/main/java')
+);
 enableLegacyJni();
 enableStaticContext();
 disableSplashFadeOnRealmeAndroid13();
 removeLegacyKeyboardWorkaround();
 patchTargetSdkVersion();
+stripLauncherFilterFromMainActivity();
 
 function getPackageName() {
   const configPath = path.resolve(__dirname, '../config.xml');
@@ -66,6 +73,43 @@ function getTmpDir() {
   }
 }
 
+/**
+ * Removes the MAIN/LAUNCHER intent-filter from MainActivity in the generated
+ * AndroidManifest. The launcher role is handled by activity-aliases instead
+ * (see config.xml), so that switching app icons at runtime only toggles aliases
+ * and never disables the running MainActivity component (which would otherwise
+ * force-stop/restart the app).
+ */
+function stripLauncherFilterFromMainActivity() {
+  const prefix = execSync('npm prefix').toString().trim();
+  const manifestPath = path.join(
+    prefix,
+    'platforms/android/app/src/main/AndroidManifest.xml'
+  );
+
+  if (!fs.existsSync(manifestPath)) {
+    console.warn('[Cordova Hook] ⚠️ AndroidManifest.xml not found');
+    return;
+  }
+
+  let content = fs.readFileSync(manifestPath, 'utf-8');
+  const updated = content.replace(
+    /(<activity[^>]*\bname="MainActivity"[^>]*>)\s*<intent-filter[^>]*>\s*<action android:name="android\.intent\.action\.MAIN"[^>]*\/>\s*<category android:name="android\.intent\.category\.LAUNCHER"[^>]*\/>\s*<\/intent-filter>/,
+    '$1'
+  );
+
+  if (updated !== content) {
+    fs.writeFileSync(manifestPath, updated, 'utf-8');
+    console.log(
+      '[Cordova Hook] ✅ Removed launcher intent-filter from MainActivity'
+    );
+  } else {
+    console.log(
+      '[Cordova Hook] ✅ Launcher intent-filter already removed, skipping'
+    );
+  }
+}
+
 function patchTargetSdkVersion() {
   const prefix = execSync('npm prefix').toString().trim();
   const gradleFile = path.join(prefix, 'platforms/android/app/build.gradle');
 
@@ -45,10 +45,10 @@
       "com.foxdebug.acode.rk.exec.proot": {},
       "cordova-plugin-iap": {},
       "com.foxdebug.acode.rk.customtabs": {},
-      "cordova-plugin-system": {},
       "cordova-plugin-crashhandler": {},
       "cordova-plugin-advanced-http": {},
-      "cordova-plugin-acode-webview": {}
+      "cordova-plugin-acode-webview": {},
+      "cordova-plugin-system": {}
     },
     "platforms": [
       "android"