diff --git a/app/src/main/ic_launcher_debug-web.png b/app/src/debug/ic_launcher-web.png
similarity index 100%
rename from app/src/main/ic_launcher_debug-web.png
rename to app/src/debug/ic_launcher-web.png
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_debug.xml b/app/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml
similarity index 100%
rename from app/src/main/res/mipmap-anydpi-v26/ic_launcher_debug.xml
rename to app/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_debug_round.xml b/app/src/debug/res/mipmap-anydpi-v26/ic_launcher_round.xml
similarity index 100%
rename from app/src/main/res/mipmap-anydpi-v26/ic_launcher_debug_round.xml
rename to app/src/debug/res/mipmap-anydpi-v26/ic_launcher_round.xml
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_debug.png b/app/src/debug/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from app/src/main/res/mipmap-hdpi/ic_launcher_debug.png
rename to app/src/debug/res/mipmap-hdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_debug_round.png b/app/src/debug/res/mipmap-hdpi/ic_launcher_round.png
similarity index 100%
rename from app/src/main/res/mipmap-hdpi/ic_launcher_debug_round.png
rename to app/src/debug/res/mipmap-hdpi/ic_launcher_round.png
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_debug.png b/app/src/debug/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from app/src/main/res/mipmap-mdpi/ic_launcher_debug.png
rename to app/src/debug/res/mipmap-mdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_debug_round.png b/app/src/debug/res/mipmap-mdpi/ic_launcher_round.png
similarity index 100%
rename from app/src/main/res/mipmap-mdpi/ic_launcher_debug_round.png
rename to app/src/debug/res/mipmap-mdpi/ic_launcher_round.png
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_debug.png b/app/src/debug/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from app/src/main/res/mipmap-xhdpi/ic_launcher_debug.png
rename to app/src/debug/res/mipmap-xhdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_debug_round.png b/app/src/debug/res/mipmap-xhdpi/ic_launcher_round.png
similarity index 100%
rename from app/src/main/res/mipmap-xhdpi/ic_launcher_debug_round.png
rename to app/src/debug/res/mipmap-xhdpi/ic_launcher_round.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_debug.png b/app/src/debug/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from app/src/main/res/mipmap-xxhdpi/ic_launcher_debug.png
rename to app/src/debug/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_debug_round.png b/app/src/debug/res/mipmap-xxhdpi/ic_launcher_round.png
similarity index 100%
rename from app/src/main/res/mipmap-xxhdpi/ic_launcher_debug_round.png
rename to app/src/debug/res/mipmap-xxhdpi/ic_launcher_round.png
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_debug.png b/app/src/debug/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from app/src/main/res/mipmap-xxxhdpi/ic_launcher_debug.png
rename to app/src/debug/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_debug_round.png b/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_round.png
similarity index 100%
rename from app/src/main/res/mipmap-xxxhdpi/ic_launcher_debug_round.png
rename to app/src/debug/res/mipmap-xxxhdpi/ic_launcher_round.png
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 2c2c13d33e..6a7f5ce0e6 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -118,7 +118,6 @@
 
         <activity
             android:name=".ActivityMain"
-            android:enabled="true"
             android:excludeFromRecents="true"
             android:exported="true"
             android:icon="@mipmap/ic_launcher"
@@ -144,24 +143,6 @@
             </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/main/java/eu/faircode/email/ApplicationEx.java b/app/src/main/java/eu/faircode/email/ApplicationEx.java
index 896d7869e8..e7934599b6 100644
--- a/app/src/main/java/eu/faircode/email/ApplicationEx.java
+++ b/app/src/main/java/eu/faircode/email/ApplicationEx.java
@@ -103,9 +103,6 @@ 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);