diff --git a/app/src/debug/res/xml/shortcuts.xml b/app/src/debug/res/xml/shortcuts.xml
index 5d10043733..05f320a463 100644
--- a/app/src/debug/res/xml/shortcuts.xml
+++ b/app/src/debug/res/xml/shortcuts.xml
@@ -23,18 +23,6 @@
         <categories android:name="android.shortcut.conversation" />
     </shortcut>
 
-    <shortcut
-        android:enabled="false"
-        android:icon="@drawable/ic_shortcut_settings"
-        android:shortcutId="setup"
-        android:shortcutShortLabel="@string/shortcut_setup">
-        <intent
-            android:action="android.intent.action.VIEW"
-            android:targetClass="eu.faircode.email.ActivitySetup"
-            android:targetPackage="eu.faircode.email.debug" />
-        <categories android:name="android.shortcut.conversation" />
-    </shortcut>
-
     <share-target android:targetClass="eu.faircode.email.ActivityMain">
         <category android:name="eu.faircode.email.TEXT_SHARE_TARGET" />
         <data android:mimeType="text/plain" />
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e9ca147940..29275e531c 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -141,15 +141,9 @@
 
         <activity
             android:name=".ActivitySetup"
-            android:exported="true"
+            android:exported="false"
             android:launchMode="singleTask"
-            android:parentActivityName=".ActivityMain">
-
-            <intent-filter>
-                <action android:name="android.intent.action.APPLICATION_PREFERENCES" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
+            android:parentActivityName=".ActivityMain" />
 
         <activity
             android:name=".ActivitySignature"
diff --git a/app/src/main/res/drawable-hdpi/ic_shortcut_settings.png b/app/src/main/res/drawable-hdpi/ic_shortcut_settings.png
deleted file mode 100644
index 4080bdd77d..0000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_shortcut_settings.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_shortcut_settings.png b/app/src/main/res/drawable-mdpi/ic_shortcut_settings.png
deleted file mode 100644
index 72234923ca..0000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_shortcut_settings.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_shortcut_settings.png b/app/src/main/res/drawable-xhdpi/ic_shortcut_settings.png
deleted file mode 100644
index ec392e6227..0000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_shortcut_settings.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_shortcut_settings.png b/app/src/main/res/drawable-xxhdpi/ic_shortcut_settings.png
deleted file mode 100644
index a504f79f89..0000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_shortcut_settings.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_shortcut_settings.png b/app/src/main/res/drawable-xxxhdpi/ic_shortcut_settings.png
deleted file mode 100644
index fbacfc7cb8..0000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_shortcut_settings.png and /dev/null differ
diff --git a/app/src/main/res/xml/shortcuts.xml b/app/src/main/res/xml/shortcuts.xml
index 5a047042ad..6284381382 100644
--- a/app/src/main/res/xml/shortcuts.xml
+++ b/app/src/main/res/xml/shortcuts.xml
@@ -23,18 +23,6 @@
         <categories android:name="android.shortcut.conversation" />
     </shortcut>
 
-    <shortcut
-        android:enabled="false"
-        android:icon="@drawable/ic_shortcut_settings"
-        android:shortcutId="setup"
-        android:shortcutShortLabel="@string/shortcut_setup">
-        <intent
-            android:action="android.intent.action.VIEW"
-            android:targetClass="eu.faircode.email.ActivitySetup"
-            android:targetPackage="eu.faircode.email" />
-        <categories android:name="android.shortcut.conversation" />
-    </shortcut>
-
     <share-target android:targetClass="eu.faircode.email.ActivityMain">
         <category android:name="eu.faircode.email.TEXT_SHARE_TARGET" />
         <data android:mimeType="text/plain" />