diff --git a/app/src/fdroid/AndroidManifest.xml b/app/src/fdroid/AndroidManifest.xml
new file mode 100644
index 0000000000..0b2c41ea3a
--- /dev/null
+++ b/app/src/fdroid/AndroidManifest.xml
@@ -0,0 +1,403 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    package="eu.faircode.email"
+    android:installLocation="internalOnly">
+
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+    <uses-permission android:name="android.permission.READ_CONTACTS" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="com.android.vending.BILLING" />
+    <uses-permission android:name="android.permission.USE_BIOMETRIC" />
+
+    <!-- OAuth -->
+    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
+    <uses-permission
+        android:name="android.permission.USE_CREDENTIALS"
+        android:maxSdkVersion="22" />
+    <uses-permission
+        android:name="android.permission.READ_PROFILE"
+        android:maxSdkVersion="22" />
+
+    <!-- https://developer.android.com/guide/topics/manifest/uses-feature-element#features-reference -->
+    <uses-feature
+        android:name="android.software.app_widgets"
+        android:required="false" />
+    <uses-feature
+        android:name="android.software.webview"
+        android:required="false" />
+    <uses-feature
+        android:name="android.hardware.camera"
+        android:required="false" />
+    <uses-feature
+        android:name="android.hardware.fingerprint"
+        android:required="false" />
+
+    <!-- Android 11: https://developer.android.com/preview/privacy/package-visibility -->
+    <queries>
+        <!--intent>
+            <action android:name="android.intent.action.VIEW" />
+            <data android:mimeType="*/*" />
+        </intent-->
+
+        <!-- AppAuth-Android -->
+        <intent>
+            <action android:name="android.intent.action.VIEW" />
+            <category android:name="android.intent.category.BROWSABLE" />
+            <data android:scheme="https" />
+        </intent>
+
+        <intent>
+            <action android:name="android.intent.action.VIEW" />
+            <category android:name="android.intent.category.BROWSABLE" />
+            <data android:scheme="http" />
+        </intent>
+
+        <!-- Customtabs -->
+        <!-- https://developers.google.com/web/updates/2020/07/custom-tabs-android-11#detecting_browsers_that_support_custom_tabs -->
+        <intent>
+            <action android:name="android.support.customtabs.action.CustomTabsService" />
+        </intent>
+
+        <intent>
+            <action android:name="android.intent.action.INSERT" />
+        </intent>
+
+        <intent>
+            <action android:name="android.intent.action.GET_CONTENT" />
+            <category android:name="android.intent.category.OPENABLE" />
+            <data android:mimeType="*/*" />
+        </intent>
+
+        <intent>
+            <action android:name="android.media.action.IMAGE_CAPTURE" />
+        </intent>
+
+        <intent>
+            <action android:name="android.provider.MediaStore.RECORD_SOUND" />
+        </intent>
+
+        <package android:name="org.sufficientlysecure.keychain" />
+        <package android:name="org.sufficientlysecure.keychain.debug" />
+
+        <intent>
+            <action android:name="org.openintents.openpgp.IOpenPgpService2" />
+        </intent>
+
+        <package android:name="com.google.android.tts" />
+    </queries>
+
+    <application
+        android:name=".ApplicationEx"
+        android:allowBackup="false"
+        android:appCategory="productivity"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:networkSecurityConfig="@xml/network_security_config"
+        android:requestLegacyExternalStorage="true"
+        android:roundIcon="@mipmap/ic_launcher_round"
+        android:supportsRtl="true"
+        android:theme="@style/AppThemeBlueOrangeLight">
+
+        <!-- do not contact Google servers -->
+        <meta-data
+            android:name="android.webkit.WebView.MetricsOptOut"
+            android:value="true" />
+        <meta-data
+            android:name="android.webkit.WebView.EnableSafeBrowsing"
+            android:value="false" />
+        <meta-data
+            android:name="android.allow_multiple_resumed_activities"
+            android:value="true" />
+
+        <activity
+            android:name=".ActivityMain"
+            android:excludeFromRecents="true"
+            android:exported="true"
+            android:launchMode="singleInstance"
+            android:theme="@style/Theme.AppCompat.Translucent">
+
+            <meta-data
+                android:name="android.app.shortcuts"
+                android:resource="@xml/shortcuts" />
+            <meta-data
+                android:name="android.service.chooser.chooser_target_service"
+                android:value="androidx.sharetarget.ChooserTargetServiceCompat" />
+
+            <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>
+
+        <activity
+            android:name=".ActivitySetup"
+            android:exported="false"
+            android:launchMode="singleTask"
+            android:parentActivityName=".ActivityMain" />
+
+        <activity
+            android:name=".ActivitySignature"
+            android:exported="false"
+            android:launchMode="singleTask"
+            android:parentActivityName=".ActivitySetup" />
+
+        <activity
+            android:name=".ActivityWidget"
+            android:exported="true">
+
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
+            </intent-filter>
+        </activity>
+
+        <activity
+            android:name=".ActivityWidgetUnified"
+            android:exported="true">
+
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
+            </intent-filter>
+        </activity>
+
+        <activity
+            android:name=".ActivityView"
+            android:exported="false"
+            android:launchMode="singleTask"
+            android:parentActivityName=".ActivityMain" />
+
+        <activity
+            android:name=".ActivitySearch"
+            android:enabled="true"
+            android:excludeFromRecents="true"
+            android:exported="true"
+            android:icon="@mipmap/ic_launcher"
+            android:label="@string/app_search"
+            android:launchMode="singleTask"
+            android:theme="@style/Theme.AppCompat.Translucent">
+
+            <intent-filter>
+                <action android:name="android.intent.action.PROCESS_TEXT" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="text/plain" />
+            </intent-filter>
+        </activity>
+
+        <activity
+            android:name=".ActivityCompose"
+            android:exported="true"
+            android:launchMode="singleTask"
+            android:parentActivityName=".ActivityView">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="mailto" />
+            </intent-filter>
+
+            <intent-filter>
+                <action android:name="android.intent.action.SENDTO" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:scheme="mailto" />
+            </intent-filter>
+
+            <intent-filter>
+                <action android:name="android.intent.action.SEND" />
+                <action android:name="android.intent.action.SEND_MULTIPLE" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="*/*" />
+            </intent-filter>
+        </activity>
+
+        <activity
+            android:name=".ActivityEML"
+            android:exported="true"
+            android:icon="@mipmap/ic_launcher"
+            android:launchMode="singleTask">
+
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.BROWSABLE" />
+                <category android:name="android.intent.category.DEFAULT" />
+
+                <data android:scheme="content" />
+                <data android:mimeType="message/rfc822" />
+                <data android:host="*" />
+            </intent-filter>
+
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.BROWSABLE" />
+                <category android:name="android.intent.category.DEFAULT" />
+
+                <data android:scheme="content" />
+                <data android:mimeType="*/*" />
+                <data android:host="*" />
+                <data android:pathPattern=".*\\.eml" />
+                <data android:pathPattern=".*\\..*\\.eml" />
+                <data android:pathPattern=".*\\..*\\..*\\.eml" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\.eml" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.eml" />
+            </intent-filter>
+        </activity>
+
+        <activity
+            android:name=".ActivityDSN"
+            android:exported="true"
+            android:icon="@mipmap/ic_launcher"
+            android:launchMode="singleTask">
+
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.BROWSABLE" />
+                <category android:name="android.intent.category.DEFAULT" />
+
+                <data android:scheme="content" />
+                <data android:mimeType="message/delivery-status" />
+                <data android:mimeType="message/disposition-notification" />
+                <data android:mimeType="text/rfc822-headers" />
+                <data android:host="*" />
+            </intent-filter>
+        </activity>
+
+        <activity
+            android:name=".ActivityBilling"
+            android:icon="@mipmap/ic_launcher"
+            android:launchMode="singleTask" />
+
+        <activity
+            android:name="net.openid.appauth.RedirectUriReceiverActivity"
+            tools:node="replace">
+            <intent-filter android:autoVerify="false">
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="oauth.faircode.eu"
+                    android:scheme="https" />
+            </intent-filter>
+
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="eu.faircode.email" />
+            </intent-filter>
+        </activity>
+
+        <service
+            android:name=".ServiceSynchronize"
+            android:foregroundServiceType="dataSync" />
+
+        <service
+            android:name=".ServiceSend"
+            android:foregroundServiceType="dataSync" />
+
+        <service android:name=".ServiceUI" />
+
+        <service
+            android:name=".ServiceExternal"
+            android:foregroundServiceType="dataSync">
+
+            <intent-filter>
+                <action android:name="${applicationId}.POLL" />
+                <action android:name="${applicationId}.ENABLE" />
+                <action android:name="${applicationId}.DISABLE" />
+                <action android:name="${applicationId}.DISCONNECT.ME" />
+            </intent-filter>
+        </service>
+
+        <service
+            android:name=".ServiceTileSynchronize"
+            android:icon="@drawable/baseline_sync_disabled_24"
+            android:label="@string/app_name"
+            android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
+
+            <intent-filter>
+                <action android:name="android.service.quicksettings.action.QS_TILE" />
+            </intent-filter>
+        </service>
+
+        <service
+            android:name=".ServiceTileUnseen"
+            android:icon="@drawable/baseline_mail_outline_24"
+            android:label="@string/tile_unseen"
+            android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
+
+            <intent-filter>
+                <action android:name="android.service.quicksettings.action.QS_TILE" />
+            </intent-filter>
+        </service>
+
+        <provider
+            android:name="androidx.core.content.FileProvider"
+            android:authorities="${applicationId}"
+            android:exported="false"
+            android:grantUriPermissions="true">
+
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/fileprovider_paths" />
+        </provider>
+
+        <receiver
+            android:name=".Widget"
+            android:label="@string/title_widget_title_count">
+
+            <meta-data
+                android:name="android.appwidget.provider"
+                android:resource="@xml/widget" />
+
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+            </intent-filter>
+        </receiver>
+
+        <receiver
+            android:name=".WidgetUnified"
+            android:label="@string/title_widget_title_list">
+
+            <meta-data
+                android:name="android.appwidget.provider"
+                android:resource="@xml/widget_unified" />
+
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+            </intent-filter>
+        </receiver>
+
+        <service
+            android:name="WidgetUnifiedService"
+            android:permission="android.permission.BIND_REMOTEVIEWS" />
+
+        <receiver android:name=".ReceiverAutoStart">
+
+            <intent-filter>
+                <action android:name="android.intent.action.BOOT_COMPLETED" />
+            </intent-filter>
+
+            <intent-filter>
+                <action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
+            </intent-filter>
+        </receiver>
+    </application>
+</manifest>
\ No newline at end of file
diff --git a/app/src/github/AndroidManifest.xml b/app/src/github/AndroidManifest.xml
new file mode 100644
index 0000000000..0b2c41ea3a
--- /dev/null
+++ b/app/src/github/AndroidManifest.xml
@@ -0,0 +1,403 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    package="eu.faircode.email"
+    android:installLocation="internalOnly">
+
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+    <uses-permission android:name="android.permission.READ_CONTACTS" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="com.android.vending.BILLING" />
+    <uses-permission android:name="android.permission.USE_BIOMETRIC" />
+
+    <!-- OAuth -->
+    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
+    <uses-permission
+        android:name="android.permission.USE_CREDENTIALS"
+        android:maxSdkVersion="22" />
+    <uses-permission
+        android:name="android.permission.READ_PROFILE"
+        android:maxSdkVersion="22" />
+
+    <!-- https://developer.android.com/guide/topics/manifest/uses-feature-element#features-reference -->
+    <uses-feature
+        android:name="android.software.app_widgets"
+        android:required="false" />
+    <uses-feature
+        android:name="android.software.webview"
+        android:required="false" />
+    <uses-feature
+        android:name="android.hardware.camera"
+        android:required="false" />
+    <uses-feature
+        android:name="android.hardware.fingerprint"
+        android:required="false" />
+
+    <!-- Android 11: https://developer.android.com/preview/privacy/package-visibility -->
+    <queries>
+        <!--intent>
+            <action android:name="android.intent.action.VIEW" />
+            <data android:mimeType="*/*" />
+        </intent-->
+
+        <!-- AppAuth-Android -->
+        <intent>
+            <action android:name="android.intent.action.VIEW" />
+            <category android:name="android.intent.category.BROWSABLE" />
+            <data android:scheme="https" />
+        </intent>
+
+        <intent>
+            <action android:name="android.intent.action.VIEW" />
+            <category android:name="android.intent.category.BROWSABLE" />
+            <data android:scheme="http" />
+        </intent>
+
+        <!-- Customtabs -->
+        <!-- https://developers.google.com/web/updates/2020/07/custom-tabs-android-11#detecting_browsers_that_support_custom_tabs -->
+        <intent>
+            <action android:name="android.support.customtabs.action.CustomTabsService" />
+        </intent>
+
+        <intent>
+            <action android:name="android.intent.action.INSERT" />
+        </intent>
+
+        <intent>
+            <action android:name="android.intent.action.GET_CONTENT" />
+            <category android:name="android.intent.category.OPENABLE" />
+            <data android:mimeType="*/*" />
+        </intent>
+
+        <intent>
+            <action android:name="android.media.action.IMAGE_CAPTURE" />
+        </intent>
+
+        <intent>
+            <action android:name="android.provider.MediaStore.RECORD_SOUND" />
+        </intent>
+
+        <package android:name="org.sufficientlysecure.keychain" />
+        <package android:name="org.sufficientlysecure.keychain.debug" />
+
+        <intent>
+            <action android:name="org.openintents.openpgp.IOpenPgpService2" />
+        </intent>
+
+        <package android:name="com.google.android.tts" />
+    </queries>
+
+    <application
+        android:name=".ApplicationEx"
+        android:allowBackup="false"
+        android:appCategory="productivity"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:networkSecurityConfig="@xml/network_security_config"
+        android:requestLegacyExternalStorage="true"
+        android:roundIcon="@mipmap/ic_launcher_round"
+        android:supportsRtl="true"
+        android:theme="@style/AppThemeBlueOrangeLight">
+
+        <!-- do not contact Google servers -->
+        <meta-data
+            android:name="android.webkit.WebView.MetricsOptOut"
+            android:value="true" />
+        <meta-data
+            android:name="android.webkit.WebView.EnableSafeBrowsing"
+            android:value="false" />
+        <meta-data
+            android:name="android.allow_multiple_resumed_activities"
+            android:value="true" />
+
+        <activity
+            android:name=".ActivityMain"
+            android:excludeFromRecents="true"
+            android:exported="true"
+            android:launchMode="singleInstance"
+            android:theme="@style/Theme.AppCompat.Translucent">
+
+            <meta-data
+                android:name="android.app.shortcuts"
+                android:resource="@xml/shortcuts" />
+            <meta-data
+                android:name="android.service.chooser.chooser_target_service"
+                android:value="androidx.sharetarget.ChooserTargetServiceCompat" />
+
+            <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>
+
+        <activity
+            android:name=".ActivitySetup"
+            android:exported="false"
+            android:launchMode="singleTask"
+            android:parentActivityName=".ActivityMain" />
+
+        <activity
+            android:name=".ActivitySignature"
+            android:exported="false"
+            android:launchMode="singleTask"
+            android:parentActivityName=".ActivitySetup" />
+
+        <activity
+            android:name=".ActivityWidget"
+            android:exported="true">
+
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
+            </intent-filter>
+        </activity>
+
+        <activity
+            android:name=".ActivityWidgetUnified"
+            android:exported="true">
+
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
+            </intent-filter>
+        </activity>
+
+        <activity
+            android:name=".ActivityView"
+            android:exported="false"
+            android:launchMode="singleTask"
+            android:parentActivityName=".ActivityMain" />
+
+        <activity
+            android:name=".ActivitySearch"
+            android:enabled="true"
+            android:excludeFromRecents="true"
+            android:exported="true"
+            android:icon="@mipmap/ic_launcher"
+            android:label="@string/app_search"
+            android:launchMode="singleTask"
+            android:theme="@style/Theme.AppCompat.Translucent">
+
+            <intent-filter>
+                <action android:name="android.intent.action.PROCESS_TEXT" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="text/plain" />
+            </intent-filter>
+        </activity>
+
+        <activity
+            android:name=".ActivityCompose"
+            android:exported="true"
+            android:launchMode="singleTask"
+            android:parentActivityName=".ActivityView">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="mailto" />
+            </intent-filter>
+
+            <intent-filter>
+                <action android:name="android.intent.action.SENDTO" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:scheme="mailto" />
+            </intent-filter>
+
+            <intent-filter>
+                <action android:name="android.intent.action.SEND" />
+                <action android:name="android.intent.action.SEND_MULTIPLE" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="*/*" />
+            </intent-filter>
+        </activity>
+
+        <activity
+            android:name=".ActivityEML"
+            android:exported="true"
+            android:icon="@mipmap/ic_launcher"
+            android:launchMode="singleTask">
+
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.BROWSABLE" />
+                <category android:name="android.intent.category.DEFAULT" />
+
+                <data android:scheme="content" />
+                <data android:mimeType="message/rfc822" />
+                <data android:host="*" />
+            </intent-filter>
+
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.BROWSABLE" />
+                <category android:name="android.intent.category.DEFAULT" />
+
+                <data android:scheme="content" />
+                <data android:mimeType="*/*" />
+                <data android:host="*" />
+                <data android:pathPattern=".*\\.eml" />
+                <data android:pathPattern=".*\\..*\\.eml" />
+                <data android:pathPattern=".*\\..*\\..*\\.eml" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\.eml" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.eml" />
+            </intent-filter>
+        </activity>
+
+        <activity
+            android:name=".ActivityDSN"
+            android:exported="true"
+            android:icon="@mipmap/ic_launcher"
+            android:launchMode="singleTask">
+
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.BROWSABLE" />
+                <category android:name="android.intent.category.DEFAULT" />
+
+                <data android:scheme="content" />
+                <data android:mimeType="message/delivery-status" />
+                <data android:mimeType="message/disposition-notification" />
+                <data android:mimeType="text/rfc822-headers" />
+                <data android:host="*" />
+            </intent-filter>
+        </activity>
+
+        <activity
+            android:name=".ActivityBilling"
+            android:icon="@mipmap/ic_launcher"
+            android:launchMode="singleTask" />
+
+        <activity
+            android:name="net.openid.appauth.RedirectUriReceiverActivity"
+            tools:node="replace">
+            <intent-filter android:autoVerify="false">
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="oauth.faircode.eu"
+                    android:scheme="https" />
+            </intent-filter>
+
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="eu.faircode.email" />
+            </intent-filter>
+        </activity>
+
+        <service
+            android:name=".ServiceSynchronize"
+            android:foregroundServiceType="dataSync" />
+
+        <service
+            android:name=".ServiceSend"
+            android:foregroundServiceType="dataSync" />
+
+        <service android:name=".ServiceUI" />
+
+        <service
+            android:name=".ServiceExternal"
+            android:foregroundServiceType="dataSync">
+
+            <intent-filter>
+                <action android:name="${applicationId}.POLL" />
+                <action android:name="${applicationId}.ENABLE" />
+                <action android:name="${applicationId}.DISABLE" />
+                <action android:name="${applicationId}.DISCONNECT.ME" />
+            </intent-filter>
+        </service>
+
+        <service
+            android:name=".ServiceTileSynchronize"
+            android:icon="@drawable/baseline_sync_disabled_24"
+            android:label="@string/app_name"
+            android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
+
+            <intent-filter>
+                <action android:name="android.service.quicksettings.action.QS_TILE" />
+            </intent-filter>
+        </service>
+
+        <service
+            android:name=".ServiceTileUnseen"
+            android:icon="@drawable/baseline_mail_outline_24"
+            android:label="@string/tile_unseen"
+            android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
+
+            <intent-filter>
+                <action android:name="android.service.quicksettings.action.QS_TILE" />
+            </intent-filter>
+        </service>
+
+        <provider
+            android:name="androidx.core.content.FileProvider"
+            android:authorities="${applicationId}"
+            android:exported="false"
+            android:grantUriPermissions="true">
+
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/fileprovider_paths" />
+        </provider>
+
+        <receiver
+            android:name=".Widget"
+            android:label="@string/title_widget_title_count">
+
+            <meta-data
+                android:name="android.appwidget.provider"
+                android:resource="@xml/widget" />
+
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+            </intent-filter>
+        </receiver>
+
+        <receiver
+            android:name=".WidgetUnified"
+            android:label="@string/title_widget_title_list">
+
+            <meta-data
+                android:name="android.appwidget.provider"
+                android:resource="@xml/widget_unified" />
+
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+            </intent-filter>
+        </receiver>
+
+        <service
+            android:name="WidgetUnifiedService"
+            android:permission="android.permission.BIND_REMOTEVIEWS" />
+
+        <receiver android:name=".ReceiverAutoStart">
+
+            <intent-filter>
+                <action android:name="android.intent.action.BOOT_COMPLETED" />
+            </intent-filter>
+
+            <intent-filter>
+                <action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
+            </intent-filter>
+        </receiver>
+    </application>
+</manifest>
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index ff027e5d71..51eff7fc7b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -95,12 +95,12 @@
         android:name=".ApplicationEx"
         android:allowBackup="false"
         android:appCategory="productivity"
-        android:icon="@mipmap/ic_launcher_grey"
+        android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:networkSecurityConfig="@xml/network_security_config"
         android:requestLegacyExternalStorage="true"
         android:resizeableActivity="true"
-        android:roundIcon="@mipmap/ic_launcher_grey_round"
+        android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppThemeBlueOrangeLight">
         <!-- https://developer.samsung.com/samsung-dex/modify-optimizing.html -->
@@ -142,117 +142,9 @@
             </intent-filter>
         </activity>
 
-        <activity-alias
-            android:name=".ActivityMain.Blue"
-            android:enabled="false"
-            android:icon="@mipmap/ic_launcher_blue"
-            android:roundIcon="@mipmap/ic_launcher_blue_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-alias
-            android:name=".ActivityMain.Amber"
-            android:enabled="false"
-            android:icon="@mipmap/ic_launcher_amber"
-            android:roundIcon="@mipmap/ic_launcher_amber_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-alias
-            android:name=".ActivityMain.Yellow"
-            android:enabled="false"
-            android:icon="@mipmap/ic_launcher_yellow"
-            android:roundIcon="@mipmap/ic_launcher_yellow_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-alias
-            android:name=".ActivityMain.Purple"
-            android:enabled="false"
-            android:icon="@mipmap/ic_launcher_purple"
-            android:roundIcon="@mipmap/ic_launcher_purple_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-alias
-            android:name=".ActivityMain.Red"
-            android:enabled="false"
-            android:icon="@mipmap/ic_launcher_red"
-            android:roundIcon="@mipmap/ic_launcher_red_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-alias
-            android:name=".ActivityMain.Green"
-            android:enabled="false"
-            android:icon="@mipmap/ic_launcher_green"
-            android:roundIcon="@mipmap/ic_launcher_green_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-alias
             android:name=".ActivityMain.Debug"
-            android:enabled="false"
+            android:enabled="true"
             android:icon="@mipmap/ic_launcher_debug"
             android:roundIcon="@mipmap/ic_launcher_debug_round"
             android:targetActivity=".ActivityMain">
@@ -309,7 +201,7 @@
             android:enabled="true"
             android:excludeFromRecents="true"
             android:exported="true"
-            android:icon="@mipmap/ic_launcher_blue"
+            android:icon="@mipmap/ic_launcher"
             android:label="@string/app_search"
             android:launchMode="singleTask"
             android:theme="@style/Theme.AppCompat.Translucent">
@@ -353,7 +245,7 @@
         <activity
             android:name=".ActivityEML"
             android:exported="true"
-            android:icon="@mipmap/ic_launcher_blue"
+            android:icon="@mipmap/ic_launcher"
             android:launchMode="singleTask">
 
             <intent-filter>
@@ -387,7 +279,7 @@
         <activity
             android:name=".ActivityDSN"
             android:exported="true"
-            android:icon="@mipmap/ic_launcher_blue"
+            android:icon="@mipmap/ic_launcher"
             android:launchMode="singleTask">
 
             <intent-filter>
@@ -406,7 +298,7 @@
 
         <activity
             android:name=".ActivityBilling"
-            android:icon="@mipmap/ic_launcher_blue"
+            android:icon="@mipmap/ic_launcher"
             android:launchMode="singleTask" />
 
         <activity
diff --git a/app/src/main/ic_launcher_debug-web.png b/app/src/main/ic_launcher_debug-web.png
new file mode 100644
index 0000000000..4d510546b3
Binary files /dev/null and b/app/src/main/ic_launcher_debug-web.png differ
diff --git a/app/src/main/java/eu/faircode/email/ApplicationEx.java b/app/src/main/java/eu/faircode/email/ApplicationEx.java
index 110b35dbaa..896d7869e8 100644
--- a/app/src/main/java/eu/faircode/email/ApplicationEx.java
+++ b/app/src/main/java/eu/faircode/email/ApplicationEx.java
@@ -25,12 +25,10 @@ import android.app.NotificationChannel;
 import android.app.NotificationChannelGroup;
 import android.app.NotificationManager;
 import android.content.BroadcastReceiver;
-import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.SharedPreferences;
-import android.content.pm.PackageManager;
 import android.content.res.Configuration;
 import android.graphics.Color;
 import android.os.Build;
@@ -105,14 +103,15 @@ 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);
 
         createNotificationChannels();
 
-        setLauncherIcon(this);
-
         DB.setupViewInvalidation(this);
 
         if (Helper.hasWebView(this))
@@ -398,69 +397,6 @@ public class ApplicationEx extends Application {
         }
     }
 
-    static void setLauncherIcon(Context context) {
-        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-        String theme = prefs.getString("theme", "light");
-        boolean theme_icon = prefs.getBoolean("theme_icon", false);
-
-        Helper.enableComponent(context, ActivityMain.class.getName() + ".Blue", false);
-        Helper.enableComponent(context, ActivityMain.class.getName() + ".Amber", false);
-        Helper.enableComponent(context, ActivityMain.class.getName() + ".Yellow", false);
-        Helper.enableComponent(context, ActivityMain.class.getName() + ".Purple", false);
-        Helper.enableComponent(context, ActivityMain.class.getName() + ".Red", false);
-        Helper.enableComponent(context, ActivityMain.class.getName() + ".Green", false);
-        Helper.enableComponent(context, ActivityMain.class.getName() + ".Debug", false);
-
-        if (!theme_icon) {
-            Helper.enableComponent(context, ActivityMain.class.getName() + ".Blue", true);
-            return;
-        }
-
-        switch (theme) {
-            case "orange_blue_light":
-            case "orange_blue_dark":
-            case "orange_blue_black":
-            case "orange_blue_system":
-                Helper.enableComponent(context, ActivityMain.class.getName() + ".Amber", true);
-                break;
-
-            case "yellow_purple_light":
-            case "yellow_purple_dark":
-            case "yellow_purple_black":
-            case "yellow_purple_system":
-                Helper.enableComponent(context, ActivityMain.class.getName() + ".Yellow", true);
-                break;
-
-            case "purple_yellow_light":
-            case "purple_yellow_dark":
-            case "purple_yellow_black":
-            case "purple_yellow_system":
-                Helper.enableComponent(context, ActivityMain.class.getName() + ".Purple", true);
-                break;
-
-            case "red_green_light":
-            case "red_green_dark":
-            case "red_green_black":
-            case "red_green_system":
-                Helper.enableComponent(context, ActivityMain.class.getName() + ".Red", true);
-                break;
-
-            case "green_red_light":
-            case "green_red_dark":
-            case "green_red_black":
-            case "green_red_system":
-                Helper.enableComponent(context, ActivityMain.class.getName() + ".Green", true);
-                break;
-
-            default:
-                Helper.enableComponent(context, ActivityMain.class.getName(), true);
-                break;
-        }
-
-        if (BuildConfig.DEBUG && false)
-            Helper.enableComponent(context, ActivityMain.class.getName() + ".Debug", BuildConfig.DEBUG);
-    }
-
     private BroadcastReceiver onScreenOff = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java b/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java
index 49a1d73adf..146e6e54be 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java
@@ -947,7 +947,6 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
         private SwitchCompat swBlack;
         private SwitchCompat swSystem;
         private TextView tvSystem;
-        private SwitchCompat swLauncherIcon;
 
         private void eval() {
             int checkedId = rgTheme.getCheckedRadioButtonId();
@@ -975,11 +974,9 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
             swBlack = dview.findViewById(R.id.swBlack);
             swSystem = dview.findViewById(R.id.swSystem);
             tvSystem = dview.findViewById(R.id.tvSystem);
-            swLauncherIcon = dview.findViewById(R.id.swLauncherIcon);
 
             final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
             String theme = prefs.getString("theme", "light");
-            boolean theme_icon = prefs.getBoolean("theme_icon", false);
 
             itten.setOnClickListener(new View.OnClickListener() {
                 @Override
@@ -1036,7 +1033,6 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
             swDark.setChecked(dark || black);
             swBlack.setChecked(black);
             swSystem.setChecked(system);
-            swLauncherIcon.setChecked(theme_icon);
 
             switch (theme) {
                 case "light":
@@ -1100,8 +1096,6 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
                             boolean black = (swBlack.isEnabled() && swBlack.isChecked());
                             boolean system = (swSystem.isEnabled() && swSystem.isChecked());
 
-                            prefs.edit().putBoolean("theme_icon", swLauncherIcon.isChecked()).apply();
-
                             switch (rgTheme.getCheckedRadioButtonId()) {
                                 case R.id.rbThemeBlueOrange:
                                     if (system)
@@ -1144,8 +1138,6 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
                                     prefs.edit().putString("theme", "black_and_white").apply();
                                     break;
                             }
-
-                            ApplicationEx.setLauncherIcon(getContext());
                         }
                     })
                     .setNegativeButton(android.R.string.cancel, null)
diff --git a/app/src/main/res/layout/action_button.xml b/app/src/main/res/layout/action_button.xml
index a776b80a18..0ef5a2a490 100644
--- a/app/src/main/res/layout/action_button.xml
+++ b/app/src/main/res/layout/action_button.xml
@@ -4,4 +4,4 @@
     style="@style/Widget.AppCompat.Toolbar.Button.Navigation"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    app:srcCompat="@mipmap/ic_launcher_grey" />
+    app:srcCompat="@mipmap/ic_launcher" />
diff --git a/app/src/main/res/layout/dialog_theme.xml b/app/src/main/res/layout/dialog_theme.xml
index 2f250268fe..c3da60b333 100644
--- a/app/src/main/res/layout/dialog_theme.xml
+++ b/app/src/main/res/layout/dialog_theme.xml
@@ -139,15 +139,5 @@
             android:textStyle="italic"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/swSystem" />
-
-        <androidx.appcompat.widget.SwitchCompat
-            android:id="@+id/swLauncherIcon"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
-            android:text="@string/title_setup_theme_launcher_icon"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvSystem" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 </eu.faircode.email.ScrollViewEx>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_image.xml b/app/src/main/res/layout/item_image.xml
index 80cb04da45..aef48c736d 100644
--- a/app/src/main/res/layout/item_image.xml
+++ b/app/src/main/res/layout/item_image.xml
@@ -22,7 +22,7 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            app:srcCompat="@mipmap/ic_launcher_grey" />
+            app:srcCompat="@mipmap/ic_launcher" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvCaption"
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_blue.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
similarity index 100%
rename from app/src/main/res/mipmap-anydpi-v26/ic_launcher_blue.xml
rename to app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_amber.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_amber.xml
deleted file mode 100644
index 4e8a39aeae..0000000000
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_amber.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/lightAmberPrimary"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-</adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_amber_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_amber_round.xml
deleted file mode 100644
index 4e8a39aeae..0000000000
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_amber_round.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/lightAmberPrimary"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-</adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_green.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_green.xml
deleted file mode 100644
index 65b58dbb33..0000000000
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_green.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/lightGreenPrimary"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-</adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_green_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_green_round.xml
deleted file mode 100644
index 65b58dbb33..0000000000
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_green_round.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/lightGreenPrimary"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-</adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_grey.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_grey.xml
deleted file mode 100644
index c360652379..0000000000
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_grey.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/grey"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-</adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_grey_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_grey_round.xml
deleted file mode 100644
index c360652379..0000000000
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_grey_round.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/grey"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-</adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_purple.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_purple.xml
deleted file mode 100644
index 45144286c5..0000000000
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_purple.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/lightPurplePrimary"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-</adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_purple_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_purple_round.xml
deleted file mode 100644
index 45144286c5..0000000000
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_purple_round.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/lightPurplePrimary"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-</adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_red.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_red.xml
deleted file mode 100644
index d3b5fdb396..0000000000
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_red.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/lightRedPrimary"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-</adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_red_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_red_round.xml
deleted file mode 100644
index d3b5fdb396..0000000000
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_red_round.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/lightRedPrimary"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-</adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_blue_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
similarity index 100%
rename from app/src/main/res/mipmap-anydpi-v26/ic_launcher_blue_round.xml
rename to app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_yellow.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_yellow.xml
deleted file mode 100644
index 9bc2b6b5c5..0000000000
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_yellow.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/lightYellowPrimary"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-</adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_yellow_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_yellow_round.xml
deleted file mode 100644
index 9bc2b6b5c5..0000000000
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_yellow_round.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/lightYellowPrimary"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-</adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_blue.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from app/src/main/res/mipmap-hdpi/ic_launcher_blue.png
rename to app/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_amber.png b/app/src/main/res/mipmap-hdpi/ic_launcher_amber.png
deleted file mode 100644
index b19cb92423..0000000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_amber.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_amber_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_amber_round.png
deleted file mode 100644
index 21dffa7b2e..0000000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_amber_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_green.png b/app/src/main/res/mipmap-hdpi/ic_launcher_green.png
deleted file mode 100644
index 238f1f44e8..0000000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_green.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_green_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_green_round.png
deleted file mode 100644
index b9d188a29c..0000000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_green_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_grey.png b/app/src/main/res/mipmap-hdpi/ic_launcher_grey.png
deleted file mode 100644
index 722ab59063..0000000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_grey.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_grey_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_grey_round.png
deleted file mode 100644
index 3e52eb6548..0000000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_grey_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_purple.png b/app/src/main/res/mipmap-hdpi/ic_launcher_purple.png
deleted file mode 100644
index 7812449002..0000000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_purple.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_purple_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_purple_round.png
deleted file mode 100644
index 04bf55d3de..0000000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_purple_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_red.png b/app/src/main/res/mipmap-hdpi/ic_launcher_red.png
deleted file mode 100644
index 6603f1cd16..0000000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_red.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_red_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_red_round.png
deleted file mode 100644
index 201a117158..0000000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_red_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_blue_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
similarity index 100%
rename from app/src/main/res/mipmap-hdpi/ic_launcher_blue_round.png
rename to app/src/main/res/mipmap-hdpi/ic_launcher_round.png
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_yellow.png b/app/src/main/res/mipmap-hdpi/ic_launcher_yellow.png
deleted file mode 100644
index 2f79494cef..0000000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_yellow.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_yellow_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_yellow_round.png
deleted file mode 100644
index 0c3f0a7474..0000000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_yellow_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_blue.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from app/src/main/res/mipmap-mdpi/ic_launcher_blue.png
rename to app/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_amber.png b/app/src/main/res/mipmap-mdpi/ic_launcher_amber.png
deleted file mode 100644
index 36c26150b1..0000000000
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_amber.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_amber_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_amber_round.png
deleted file mode 100644
index f38a7b7dce..0000000000
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_amber_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_green.png b/app/src/main/res/mipmap-mdpi/ic_launcher_green.png
deleted file mode 100644
index d97141017e..0000000000
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_green.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_green_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_green_round.png
deleted file mode 100644
index d36332639d..0000000000
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_green_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_grey.png b/app/src/main/res/mipmap-mdpi/ic_launcher_grey.png
deleted file mode 100644
index 7f4c170c28..0000000000
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_grey.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_grey_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_grey_round.png
deleted file mode 100644
index c7a9ce8f5b..0000000000
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_grey_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_purple.png b/app/src/main/res/mipmap-mdpi/ic_launcher_purple.png
deleted file mode 100644
index 965774d582..0000000000
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_purple.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_purple_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_purple_round.png
deleted file mode 100644
index c849f6857b..0000000000
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_purple_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_red.png b/app/src/main/res/mipmap-mdpi/ic_launcher_red.png
deleted file mode 100644
index c0be7cd462..0000000000
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_red.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_red_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_red_round.png
deleted file mode 100644
index 89ca2ac445..0000000000
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_red_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_blue_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
similarity index 100%
rename from app/src/main/res/mipmap-mdpi/ic_launcher_blue_round.png
rename to app/src/main/res/mipmap-mdpi/ic_launcher_round.png
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_yellow.png b/app/src/main/res/mipmap-mdpi/ic_launcher_yellow.png
deleted file mode 100644
index c07fefb24f..0000000000
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_yellow.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_yellow_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_yellow_round.png
deleted file mode 100644
index 654fbf64a8..0000000000
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_yellow_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_blue.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from app/src/main/res/mipmap-xhdpi/ic_launcher_blue.png
rename to app/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_amber.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_amber.png
deleted file mode 100644
index bc4c30ae40..0000000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_amber.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_amber_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_amber_round.png
deleted file mode 100644
index 6d24448969..0000000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_amber_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_green.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_green.png
deleted file mode 100644
index 2329f857f7..0000000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_green.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_green_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_green_round.png
deleted file mode 100644
index 748cf62ed3..0000000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_green_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_grey.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_grey.png
deleted file mode 100644
index 6168f5bece..0000000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_grey.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_grey_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_grey_round.png
deleted file mode 100644
index 9de446493d..0000000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_grey_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_purple.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_purple.png
deleted file mode 100644
index 28cfb4c41b..0000000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_purple.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_purple_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_purple_round.png
deleted file mode 100644
index 38e4369c1f..0000000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_purple_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_red.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_red.png
deleted file mode 100644
index 63a16e9869..0000000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_red.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_red_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_red_round.png
deleted file mode 100644
index 8b3b70c727..0000000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_red_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_blue_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
similarity index 100%
rename from app/src/main/res/mipmap-xhdpi/ic_launcher_blue_round.png
rename to app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_yellow.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_yellow.png
deleted file mode 100644
index 5f85e7fee4..0000000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_yellow.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_yellow_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_yellow_round.png
deleted file mode 100644
index 8552822386..0000000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_yellow_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_blue.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from app/src/main/res/mipmap-xxhdpi/ic_launcher_blue.png
rename to app/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_amber.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_amber.png
deleted file mode 100644
index d7c8ad6323..0000000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_amber.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_amber_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_amber_round.png
deleted file mode 100644
index 3bd3530ae6..0000000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_amber_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_green.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_green.png
deleted file mode 100644
index e55e28ad9d..0000000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_green.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_green_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_green_round.png
deleted file mode 100644
index 2071c88b5a..0000000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_green_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_grey.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_grey.png
deleted file mode 100644
index 5a39b1bead..0000000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_grey.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_grey_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_grey_round.png
deleted file mode 100644
index 9eb1a23461..0000000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_grey_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_purple.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_purple.png
deleted file mode 100644
index 9d5b2aa741..0000000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_purple.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_purple_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_purple_round.png
deleted file mode 100644
index ca031d067b..0000000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_purple_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_red.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_red.png
deleted file mode 100644
index 7a0cd73d99..0000000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_red.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_red_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_red_round.png
deleted file mode 100644
index d474424354..0000000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_red_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_blue_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
similarity index 100%
rename from app/src/main/res/mipmap-xxhdpi/ic_launcher_blue_round.png
rename to app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_yellow.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_yellow.png
deleted file mode 100644
index ca3a34ab53..0000000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_yellow.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_yellow_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_yellow_round.png
deleted file mode 100644
index 6fb6377638..0000000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_yellow_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_blue.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from app/src/main/res/mipmap-xxxhdpi/ic_launcher_blue.png
rename to app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_amber.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_amber.png
deleted file mode 100644
index 994a0b4b2d..0000000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_amber.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_amber_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_amber_round.png
deleted file mode 100644
index b7ef173f61..0000000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_amber_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_green.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_green.png
deleted file mode 100644
index 28f61ca297..0000000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_green.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_green_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_green_round.png
deleted file mode 100644
index c6f08c46cb..0000000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_green_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_grey.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_grey.png
deleted file mode 100644
index 59bfb1a325..0000000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_grey.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_grey_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_grey_round.png
deleted file mode 100644
index 923e5f08d6..0000000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_grey_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_purple.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_purple.png
deleted file mode 100644
index 9dde23de4a..0000000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_purple.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_purple_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_purple_round.png
deleted file mode 100644
index 6c32547226..0000000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_purple_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_red.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_red.png
deleted file mode 100644
index e40238c08f..0000000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_red.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_red_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_red_round.png
deleted file mode 100644
index 44f00e981a..0000000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_red_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_blue_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
similarity index 100%
rename from app/src/main/res/mipmap-xxxhdpi/ic_launcher_blue_round.png
rename to app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_yellow.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_yellow.png
deleted file mode 100644
index fc70893d46..0000000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_yellow.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_yellow_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_yellow_round.png
deleted file mode 100644
index 098404747c..0000000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_yellow_round.png and /dev/null differ
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index beef8fbb70..4bb4c4177c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -252,7 +252,6 @@
     <string name="title_setup_theme_dark">Dark</string>
     <string name="title_setup_theme_black_background">Black background</string>
     <string name="title_setup_theme_system">Follow system</string>
-    <string name="title_setup_theme_launcher_icon">Use primary color for app icon</string>
 
     <string name="title_setup_theme_system_hint">This will automatically switch to a light/dark theme on day/night mode, if supported by Android</string>
 
diff --git a/app/src/play/AndroidManifest.xml b/app/src/play/AndroidManifest.xml
new file mode 100644
index 0000000000..94f44a12bc
--- /dev/null
+++ b/app/src/play/AndroidManifest.xml
@@ -0,0 +1,403 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    package="eu.faircode.email"
+    android:installLocation="internalOnly">
+
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+    <uses-permission android:name="android.permission.READ_CONTACTS" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="com.android.vending.BILLING" />
+    <uses-permission android:name="android.permission.USE_BIOMETRIC" />
+
+    <!-- OAuth -->
+    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
+    <uses-permission
+        android:name="android.permission.USE_CREDENTIALS"
+        android:maxSdkVersion="22" />
+    <uses-permission
+        android:name="android.permission.READ_PROFILE"
+        android:maxSdkVersion="22" />
+
+    <!-- https://developer.android.com/guide/topics/manifest/uses-feature-element#features-reference -->
+    <uses-feature
+        android:name="android.software.app_widgets"
+        android:required="false" />
+    <uses-feature
+        android:name="android.software.webview"
+        android:required="false" />
+    <uses-feature
+        android:name="android.hardware.camera"
+        android:required="false" />
+    <uses-feature
+        android:name="android.hardware.fingerprint"
+        android:required="false" />
+
+    <!-- Android 11: https://developer.android.com/preview/privacy/package-visibility -->
+    <queries>
+        <!--intent>
+            <action android:name="android.intent.action.VIEW" />
+            <data android:mimeType="*/*" />
+        </intent-->
+
+        <!-- AppAuth-Android -->
+        <intent>
+            <action android:name="android.intent.action.VIEW" />
+            <category android:name="android.intent.category.BROWSABLE" />
+            <data android:scheme="https" />
+        </intent>
+
+        <intent>
+            <action android:name="android.intent.action.VIEW" />
+            <category android:name="android.intent.category.BROWSABLE" />
+            <data android:scheme="http" />
+        </intent>
+
+        <!-- Customtabs -->
+        <!-- https://developers.google.com/web/updates/2020/07/custom-tabs-android-11#detecting_browsers_that_support_custom_tabs -->
+        <intent>
+            <action android:name="android.support.customtabs.action.CustomTabsService" />
+        </intent>
+
+        <intent>
+            <action android:name="android.intent.action.INSERT" />
+        </intent>
+
+        <intent>
+            <action android:name="android.intent.action.GET_CONTENT" />
+            <category android:name="android.intent.category.OPENABLE" />
+            <data android:mimeType="*/*" />
+        </intent>
+
+        <intent>
+            <action android:name="android.media.action.IMAGE_CAPTURE" />
+        </intent>
+
+        <intent>
+            <action android:name="android.provider.MediaStore.RECORD_SOUND" />
+        </intent>
+
+        <package android:name="org.sufficientlysecure.keychain" />
+        <package android:name="org.sufficientlysecure.keychain.debug" />
+
+        <intent>
+            <action android:name="org.openintents.openpgp.IOpenPgpService2" />
+        </intent>
+
+        <package android:name="com.google.android.tts" />
+    </queries>
+
+    <application
+        android:name=".ApplicationEx"
+        android:allowBackup="false"
+        android:appCategory="productivity"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:networkSecurityConfig="@xml/network_security_config"
+        android:requestLegacyExternalStorage="true"
+        android:roundIcon="@mipmap/ic_launcher_round"
+        android:supportsRtl="true"
+        android:theme="@style/AppThemeBlueOrangeLight">
+
+        <!-- do not contact Google servers -->
+        <meta-data
+            android:name="android.webkit.WebView.MetricsOptOut"
+            android:value="true" />
+        <meta-data
+            android:name="android.webkit.WebView.EnableSafeBrowsing"
+            android:value="false" />
+        <meta-data
+            android:name="android.allow_multiple_resumed_activities"
+            android:value="true" />
+
+        <activity
+            android:name=".ActivityMain"
+            android:excludeFromRecents="true"
+            android:exported="true"
+            android:launchMode="singleInstance"
+            android:theme="@style/Theme.AppCompat.Translucent">
+
+            <meta-data
+                android:name="android.app.shortcuts"
+                android:resource="@xml/shortcuts" />
+            <meta-data
+                android:name="android.service.chooser.chooser_target_service"
+                android:value="androidx.sharetarget.ChooserTargetServiceCompat" />
+
+            <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>
+
+        <activity
+            android:name=".ActivitySetup"
+            android:exported="false"
+            android:launchMode="singleTask"
+            android:parentActivityName=".ActivityMain" />
+
+        <activity
+            android:name=".ActivitySignature"
+            android:exported="false"
+            android:launchMode="singleTask"
+            android:parentActivityName=".ActivitySetup" />
+
+        <activity
+            android:name=".ActivityWidget"
+            android:exported="true">
+
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
+            </intent-filter>
+        </activity>
+
+        <activity
+            android:name=".ActivityWidgetUnified"
+            android:exported="true">
+
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
+            </intent-filter>
+        </activity>
+
+        <activity
+            android:name=".ActivityView"
+            android:exported="false"
+            android:launchMode="singleTask"
+            android:parentActivityName=".ActivityMain" />
+
+        <activity
+            android:name=".ActivitySearch"
+            android:enabled="true"
+            android:excludeFromRecents="true"
+            android:exported="true"
+            android:icon="@mipmap/ic_launcher"
+            android:label="@string/app_search"
+            android:launchMode="singleTask"
+            android:theme="@style/Theme.AppCompat.Translucent">
+
+            <intent-filter>
+                <action android:name="android.intent.action.PROCESS_TEXT" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="text/plain" />
+            </intent-filter>
+        </activity>
+
+        <activity
+            android:name=".ActivityCompose"
+            android:exported="true"
+            android:launchMode="singleTask"
+            android:parentActivityName=".ActivityView">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="mailto" />
+            </intent-filter>
+
+            <intent-filter>
+                <action android:name="android.intent.action.SENDTO" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:scheme="mailto" />
+            </intent-filter>
+
+            <intent-filter>
+                <action android:name="android.intent.action.SEND" />
+                <action android:name="android.intent.action.SEND_MULTIPLE" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="*/*" />
+            </intent-filter>
+        </activity>
+
+        <activity
+            android:name=".ActivityEML"
+            android:exported="true"
+            android:icon="@mipmap/ic_launcher"
+            android:launchMode="singleTask">
+
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.BROWSABLE" />
+                <category android:name="android.intent.category.DEFAULT" />
+
+                <data android:scheme="content" />
+                <data android:mimeType="message/rfc822" />
+                <data android:host="*" />
+            </intent-filter>
+
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.BROWSABLE" />
+                <category android:name="android.intent.category.DEFAULT" />
+
+                <data android:scheme="content" />
+                <data android:mimeType="*/*" />
+                <data android:host="*" />
+                <data android:pathPattern=".*\\.eml" />
+                <data android:pathPattern=".*\\..*\\.eml" />
+                <data android:pathPattern=".*\\..*\\..*\\.eml" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\.eml" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.eml" />
+            </intent-filter>
+        </activity>
+
+        <activity
+            android:name=".ActivityDSN"
+            android:exported="true"
+            android:icon="@mipmap/ic_launcher"
+            android:launchMode="singleTask">
+
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.BROWSABLE" />
+                <category android:name="android.intent.category.DEFAULT" />
+
+                <data android:scheme="content" />
+                <data android:mimeType="message/delivery-status" />
+                <data android:mimeType="message/disposition-notification" />
+                <data android:mimeType="text/rfc822-headers" />
+                <data android:host="*" />
+            </intent-filter>
+        </activity>
+
+        <activity
+            android:name=".ActivityBilling"
+            android:icon="@mipmap/ic_launcher"
+            android:launchMode="singleTask" />
+
+        <activity
+            android:name="net.openid.appauth.RedirectUriReceiverActivity"
+            tools:node="replace">
+            <intent-filter android:autoVerify="true">
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="oauth.faircode.eu"
+                    android:scheme="https" />
+            </intent-filter>
+
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="eu.faircode.email" />
+            </intent-filter>
+        </activity>
+
+        <service
+            android:name=".ServiceSynchronize"
+            android:foregroundServiceType="dataSync" />
+
+        <service
+            android:name=".ServiceSend"
+            android:foregroundServiceType="dataSync" />
+
+        <service android:name=".ServiceUI" />
+
+        <service
+            android:name=".ServiceExternal"
+            android:foregroundServiceType="dataSync">
+
+            <intent-filter>
+                <action android:name="${applicationId}.POLL" />
+                <action android:name="${applicationId}.ENABLE" />
+                <action android:name="${applicationId}.DISABLE" />
+                <action android:name="${applicationId}.DISCONNECT.ME" />
+            </intent-filter>
+        </service>
+
+        <service
+            android:name=".ServiceTileSynchronize"
+            android:icon="@drawable/baseline_sync_disabled_24"
+            android:label="@string/app_name"
+            android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
+
+            <intent-filter>
+                <action android:name="android.service.quicksettings.action.QS_TILE" />
+            </intent-filter>
+        </service>
+
+        <service
+            android:name=".ServiceTileUnseen"
+            android:icon="@drawable/baseline_mail_outline_24"
+            android:label="@string/tile_unseen"
+            android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
+
+            <intent-filter>
+                <action android:name="android.service.quicksettings.action.QS_TILE" />
+            </intent-filter>
+        </service>
+
+        <provider
+            android:name="androidx.core.content.FileProvider"
+            android:authorities="${applicationId}"
+            android:exported="false"
+            android:grantUriPermissions="true">
+
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/fileprovider_paths" />
+        </provider>
+
+        <receiver
+            android:name=".Widget"
+            android:label="@string/title_widget_title_count">
+
+            <meta-data
+                android:name="android.appwidget.provider"
+                android:resource="@xml/widget" />
+
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+            </intent-filter>
+        </receiver>
+
+        <receiver
+            android:name=".WidgetUnified"
+            android:label="@string/title_widget_title_list">
+
+            <meta-data
+                android:name="android.appwidget.provider"
+                android:resource="@xml/widget_unified" />
+
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+            </intent-filter>
+        </receiver>
+
+        <service
+            android:name="WidgetUnifiedService"
+            android:permission="android.permission.BIND_REMOTEVIEWS" />
+
+        <receiver android:name=".ReceiverAutoStart">
+
+            <intent-filter>
+                <action android:name="android.intent.action.BOOT_COMPLETED" />
+            </intent-filter>
+
+            <intent-filter>
+                <action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
+            </intent-filter>
+        </receiver>
+    </application>
+</manifest>
\ No newline at end of file