diff --git a/app/src/main/res/xml/shortcuts.xml b/app/src/main/res/xml/shortcuts.xml
index 2cd35750ef..ce0a9c73c5 100644
--- a/app/src/main/res/xml/shortcuts.xml
+++ b/app/src/main/res/xml/shortcuts.xml
@@ -1,24 +1,24 @@
 <shortcuts xmlns:android="http://schemas.android.com/apk/res/android">
     <shortcut
         android:enabled="true"
-        android:icon="@drawable/ic_shortcut_settings"
-        android:shortcutId="setup"
-        android:shortcutShortLabel="@string/shortcut_setup">
+        android:icon="@drawable/ic_shortcut_edit"
+        android:shortcutId="compose"
+        android:shortcutShortLabel="@string/shortcut_compose">
         <intent
             android:action="android.intent.action.VIEW"
-            android:targetClass="eu.faircode.email.ActivitySetup"
+            android:targetClass="eu.faircode.email.ActivityCompose"
             android:targetPackage="eu.faircode.email" />
         <categories android:name="android.shortcut.conversation" />
     </shortcut>
 
     <shortcut
         android:enabled="true"
-        android:icon="@drawable/ic_shortcut_edit"
-        android:shortcutId="compose"
-        android:shortcutShortLabel="@string/shortcut_compose">
+        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.ActivityCompose"
+            android:targetClass="eu.faircode.email.ActivitySetup"
             android:targetPackage="eu.faircode.email" />
         <categories android:name="android.shortcut.conversation" />
     </shortcut>