diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 8cd64b13ac..51eff7fc7b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -118,6 +118,7 @@
 
         <activity
             android:name=".ActivityMain"
+            android:enabled="true"
             android:excludeFromRecents="true"
             android:exported="true"
             android:launchMode="singleInstance"
@@ -141,6 +142,24 @@
             </intent-filter>
         </activity>
 
+        <activity-alias
+            android:name=".ActivityMain.Debug"
+            android:enabled="true"
+            android:icon="@mipmap/ic_launcher_debug"
+            android:roundIcon="@mipmap/ic_launcher_debug_round"
+            android:targetActivity=".ActivityMain">
+
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+
+            <intent-filter>
+                <action android:name="${applicationId}.REFRESH" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity-alias>
+
         <activity
             android:name=".ActivitySetup"
             android:exported="false"
diff --git a/app/src/debug/ic_launcher-web.png b/app/src/main/ic_launcher_debug-web.png
similarity index 100%
rename from app/src/debug/ic_launcher-web.png
rename to app/src/main/ic_launcher_debug-web.png
diff --git a/app/src/main/java/eu/faircode/email/ApplicationEx.java b/app/src/main/java/eu/faircode/email/ApplicationEx.java
index e7934599b6..896d7869e8 100644
--- a/app/src/main/java/eu/faircode/email/ApplicationEx.java
+++ b/app/src/main/java/eu/faircode/email/ApplicationEx.java
@@ -103,6 +103,9 @@ public class ApplicationEx extends Application {
             }
         });
 
+        Helper.enableComponent(this, ActivityMain.class, !BuildConfig.DEBUG);
+        Helper.enableComponent(this, ActivityMain.class.getName() + ".Debug", BuildConfig.DEBUG);
+
         Log.setup(this);
 
         upgrade(this);
diff --git a/app/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_debug.xml
similarity index 100%
rename from app/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml
rename to app/src/main/res/mipmap-anydpi-v26/ic_launcher_debug.xml
diff --git a/app/src/debug/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_debug_round.xml
similarity index 100%
rename from app/src/debug/res/mipmap-anydpi-v26/ic_launcher_round.xml
rename to app/src/main/res/mipmap-anydpi-v26/ic_launcher_debug_round.xml
diff --git a/app/src/debug/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher_debug.png
similarity index 100%
rename from app/src/debug/res/mipmap-hdpi/ic_launcher.png
rename to app/src/main/res/mipmap-hdpi/ic_launcher_debug.png
diff --git a/app/src/debug/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_debug_round.png
similarity index 100%
rename from app/src/debug/res/mipmap-hdpi/ic_launcher_round.png
rename to app/src/main/res/mipmap-hdpi/ic_launcher_debug_round.png
diff --git a/app/src/debug/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher_debug.png
similarity index 100%
rename from app/src/debug/res/mipmap-mdpi/ic_launcher.png
rename to app/src/main/res/mipmap-mdpi/ic_launcher_debug.png
diff --git a/app/src/debug/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_debug_round.png
similarity index 100%
rename from app/src/debug/res/mipmap-mdpi/ic_launcher_round.png
rename to app/src/main/res/mipmap-mdpi/ic_launcher_debug_round.png
diff --git a/app/src/debug/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_debug.png
similarity index 100%
rename from app/src/debug/res/mipmap-xhdpi/ic_launcher.png
rename to app/src/main/res/mipmap-xhdpi/ic_launcher_debug.png
diff --git a/app/src/debug/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_debug_round.png
similarity index 100%
rename from app/src/debug/res/mipmap-xhdpi/ic_launcher_round.png
rename to app/src/main/res/mipmap-xhdpi/ic_launcher_debug_round.png
diff --git a/app/src/debug/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_debug.png
similarity index 100%
rename from app/src/debug/res/mipmap-xxhdpi/ic_launcher.png
rename to app/src/main/res/mipmap-xxhdpi/ic_launcher_debug.png
diff --git a/app/src/debug/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_debug_round.png
similarity index 100%
rename from app/src/debug/res/mipmap-xxhdpi/ic_launcher_round.png
rename to app/src/main/res/mipmap-xxhdpi/ic_launcher_debug_round.png
diff --git a/app/src/debug/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_debug.png
similarity index 100%
rename from app/src/debug/res/mipmap-xxxhdpi/ic_launcher.png
rename to app/src/main/res/mipmap-xxxhdpi/ic_launcher_debug.png
diff --git a/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_debug_round.png
similarity index 100%
rename from app/src/debug/res/mipmap-xxxhdpi/ic_launcher_round.png
rename to app/src/main/res/mipmap-xxxhdpi/ic_launcher_debug_round.png