diff --git a/app/src/main/res/layout/fragment_setup.xml b/app/src/main/res/layout/fragment_setup.xml
index b2bac36401..63e2fae10c 100644
--- a/app/src/main/res/layout/fragment_setup.xml
+++ b/app/src/main/res/layout/fragment_setup.xml
@@ -79,6 +79,17 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/btnQuick" />
 
+        <eu.faircode.email.FixedTextView
+            android:id="@+id/tvQuickNew"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
+            android:text="@string/title_setup_wizard_new"
+            android:textAppearance="@style/TextAppearance.AppCompat.Small"
+            android:textColor="?android:attr/textColorLink"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tvQuickRemarkMultiple" />
+
         <Button
             android:id="@+id/btnInbox"
             android:layout_width="wrap_content"
@@ -87,18 +98,124 @@
             android:text="@string/title_setup_inbox"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvQuickRemarkMultiple" />
+            app:layout_constraintTop_toBottomOf="@id/tvQuickNew" />
 
         <eu.faircode.email.FixedTextView
-            android:id="@+id/tvQuickNew"
+            android:id="@+id/tvManual"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="24dp"
+            android:text="@string/title_setup_manual"
+            android:textAppearance="@style/TextAppearance.AppCompat.Small"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/btnInbox" />
+
+        <Button
+            android:id="@+id/btnAccount"
+            style="?android:attr/buttonStyleSmall"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="6dp"
+            android:text="@string/title_setup_accounts"
+            app:layout_constraintEnd_toStartOf="@+id/btnIdentity"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tvManual" />
+
+        <eu.faircode.email.FixedTextView
+            android:id="@+id/tvAccount"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/title_setup_account_remark"
+            android:textAppearance="@style/TextAppearance.AppCompat.Small"
+            app:layout_constraintEnd_toEndOf="@id/btnAccount"
+            app:layout_constraintStart_toStartOf="@id/btnAccount"
+            app:layout_constraintTop_toBottomOf="@id/btnAccount" />
+
+        <eu.faircode.email.FixedTextView
+            android:id="@+id/tvImap"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/title_imap"
+            android:textAppearance="@style/TextAppearance.AppCompat.Small"
+            app:layout_constraintEnd_toStartOf="@+id/tvPop"
+            app:layout_constraintStart_toStartOf="@id/btnAccount"
+            app:layout_constraintTop_toBottomOf="@id/tvAccount" />
+
+        <eu.faircode.email.FixedTextView
+            android:id="@+id/tvPop"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="6dp"
+            android:text="@string/title_pop3"
+            android:textAppearance="@style/TextAppearance.AppCompat.Small"
+            app:layout_constraintEnd_toEndOf="@id/btnAccount"
+            app:layout_constraintStart_toEndOf="@id/tvImap"
+            app:layout_constraintTop_toBottomOf="@id/tvAccount" />
+
+        <Button
+            android:id="@+id/btnIdentity"
+            style="?android:attr/buttonStyleSmall"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="6dp"
+            android:text="@string/title_setup_identities"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/btnAccount"
+            app:layout_constraintTop_toBottomOf="@id/tvManual" />
+
+        <eu.faircode.email.FixedTextView
+            android:id="@+id/tvIdentity"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/title_setup_identity_remark"
+            android:textAppearance="@style/TextAppearance.AppCompat.Small"
+            app:layout_constraintEnd_toEndOf="@id/btnIdentity"
+            app:layout_constraintStart_toStartOf="@id/btnIdentity"
+            app:layout_constraintTop_toBottomOf="@id/btnIdentity" />
+
+        <eu.faircode.email.FixedTextView
+            android:id="@+id/tvSmtp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/title_smtp"
+            android:textAppearance="@style/TextAppearance.AppCompat.Small"
+            app:layout_constraintEnd_toStartOf="@+id/tvAliases"
+            app:layout_constraintStart_toStartOf="@id/btnIdentity"
+            app:layout_constraintTop_toBottomOf="@id/tvIdentity" />
+
+        <eu.faircode.email.FixedTextView
+            android:id="@+id/tvAliases"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="6dp"
+            android:text="@string/title_aliases"
+            android:textAppearance="@style/TextAppearance.AppCompat.Small"
+            app:layout_constraintEnd_toEndOf="@id/btnIdentity"
+            app:layout_constraintStart_toEndOf="@id/tvSmtp"
+            app:layout_constraintTop_toBottomOf="@id/tvIdentity" />
+
+        <eu.faircode.email.FixedTextView
+            android:id="@+id/tvIdentityWhat"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="12dp"
-            android:text="@string/title_setup_wizard_new"
+            android:text="@string/title_setup_identity_what"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             android:textColor="?android:attr/textColorLink"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/btnInbox" />
+            app:layout_constraintTop_toBottomOf="@id/tvAliases" />
+
+        <eu.faircode.email.FixedTextView
+            android:id="@+id/tvNoComposable"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
+            android:text="@string/title_no_composable"
+            android:textAppearance="@style/TextAppearance.AppCompat.Small"
+            android:textColor="?attr/colorWarning"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tvIdentityWhat" />
 
         <!-- permissions -->
 
@@ -110,7 +227,7 @@
             android:background="?attr/colorSeparator"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvQuickNew" />
+            app:layout_constraintTop_toBottomOf="@id/tvNoComposable" />
 
         <ImageView
             android:id="@+id/two"
@@ -286,191 +403,6 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvDataSaver" />
 
-        <!-- account -->
-
-        <View
-            android:id="@+id/vSeparatorAccount"
-            android:layout_width="0dp"
-            android:layout_height="1dp"
-            android:layout_marginTop="24dp"
-            android:background="?attr/colorSeparator"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/btnDataSaver" />
-
-        <eu.faircode.email.FixedTextView
-            android:id="@+id/tvSetupAccount"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="6dp"
-            android:layout_marginEnd="6dp"
-            android:ellipsize="end"
-            android:singleLine="true"
-            android:text="@string/title_setup_account"
-            android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            android:textStyle="bold"
-            app:layout_constraintEnd_toStartOf="@+id/tvImap"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/vSeparatorAccount" />
-
-        <eu.faircode.email.FixedTextView
-            android:id="@+id/tvImap"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="6dp"
-            android:layout_marginEnd="6dp"
-            android:text="@string/title_imap"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/vSeparatorAccount" />
-
-        <eu.faircode.email.FixedTextView
-            android:id="@+id/tvPop3"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="6dp"
-            android:layout_marginEnd="6dp"
-            android:text="@string/title_pop3"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvImap" />
-
-        <eu.faircode.email.FixedTextView
-            android:id="@+id/tvAccount"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="6dp"
-            android:text="@string/title_setup_account_remark"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvSetupAccount" />
-
-        <eu.faircode.email.FixedTextView
-            android:id="@+id/tvAccountHint"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/title_setup_account_hint"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            android:textStyle="italic"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvAccount" />
-
-        <Button
-            android:id="@+id/btnAccount"
-            style="?android:attr/buttonStyleSmall"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/title_setup_manage"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvAccountHint" />
-
-        <!-- identity -->
-
-        <View
-            android:id="@+id/vSeparatorIdentity"
-            android:layout_width="0dp"
-            android:layout_height="1dp"
-            android:layout_marginTop="12dp"
-            android:background="?attr/colorSeparator"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/btnAccount" />
-
-        <eu.faircode.email.FixedTextView
-            android:id="@+id/tvSetupIdentity"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="6dp"
-            android:layout_marginEnd="6dp"
-            android:ellipsize="end"
-            android:singleLine="true"
-            android:text="@string/title_setup_identity"
-            android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            android:textStyle="bold"
-            app:layout_constraintEnd_toStartOf="@+id/tvSmtp"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/vSeparatorIdentity" />
-
-        <eu.faircode.email.FixedTextView
-            android:id="@+id/tvSmtp"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="6dp"
-            android:layout_marginEnd="6dp"
-            android:text="@string/title_smtp"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/vSeparatorIdentity" />
-
-        <eu.faircode.email.FixedTextView
-            android:id="@+id/tvAliases"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="6dp"
-            android:layout_marginEnd="6dp"
-            android:text="@string/title_aliases"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvSmtp" />
-
-        <eu.faircode.email.FixedTextView
-            android:id="@+id/tvIdentity"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="6dp"
-            android:text="@string/title_setup_identity_remark"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvSetupIdentity" />
-
-        <eu.faircode.email.FixedTextView
-            android:id="@+id/tvIdentityHint"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/title_setup_identity_hint"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            android:textStyle="italic"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvIdentity" />
-
-        <Button
-            android:id="@+id/btnIdentity"
-            style="?android:attr/buttonStyleSmall"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/title_setup_manage"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvIdentityHint" />
-
-        <eu.faircode.email.FixedTextView
-            android:id="@+id/tvIdentityWhat"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
-            android:text="@string/title_setup_identity_what"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            android:textColor="?android:attr/textColorLink"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/btnIdentity" />
-
-        <eu.faircode.email.FixedTextView
-            android:id="@+id/tvNoComposable"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
-            android:text="@string/title_no_composable"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            android:textColor="?attr/colorWarning"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvIdentityWhat" />
-
-
-        <androidx.constraintlayout.widget.Group
-            android:id="@+id/grpWelcome"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            app:constraint_referenced_ids="tvWelcome,ibWelcome" />
-
         <androidx.constraintlayout.widget.Group
             android:id="@+id/grpDataSaver"
             android:layout_width="0dp"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 905dd880ab..9a6eb49487 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -165,6 +165,13 @@
     <string name="title_setup_wizard">Wizard</string>
     <string name="title_setup_wizard_multiple">The wizard can be used multiple times to set up multiple accounts</string>
     <string name="title_setup_wizard_new">I need a new email address</string>
+    <string name="title_setup_manual">Manual setup</string>
+    <string name="title_setup_account_remark">To receive email</string>
+    <string name="title_setup_identity_remark">To send email</string>
+    <string name="title_setup_account_hint">To change color, swipe left/right target folder, etc</string>
+    <string name="title_setup_identity_hint">To change name, color, signature, etc</string>
+    <string name="title_setup_accounts">Accounts</string>
+    <string name="title_setup_identities">Identities</string>
     <string name="title_setup_gmail" translatable="false">Gmail</string>
     <string name="title_setup_outlook" translatable="false">Outlook, Live, Hotmail</string>
     <string name="title_setup_oauth" translatable="false">%1$s (OAuth)</string>
@@ -186,7 +193,7 @@
     <string name="title_setup_select_account">Select account</string>
     <string name="title_setup_instructions">Setup instructions</string>
     <string name="title_setup_no_settings">No settings found for domain \'%1$s\'</string>
-    <string name="title_setup_no_settings_hint">You can try to manually set up an account and identity using the settings provided by your email provider at the bottom of the main setup screen</string>
+    <string name="title_setup_no_settings_hint">You can try to manually set up an account and identity using the settings provided by your email provider</string>
     <string name="title_setup_no_auth_hint">Please double check your email address and password and make sure external access (IMAP/SMTP) is enabled for your account</string>
     <string name="title_setup_app_password_hint">This provider requires an app password instead of the account password, please check the instructions of your provider</string>
     <string name="title_setup_no_inbox">Inbox not found</string>
@@ -195,12 +202,6 @@
     <string name="title_setup_manage">Manage</string>
     <string name="title_setup_grant">Grant</string>
     <string name="title_setup_grant_again">Grant required permissions</string>
-    <string name="title_setup_account">Setup accounts manually</string>
-    <string name="title_setup_account_remark">To receive email</string>
-    <string name="title_setup_account_hint">To change color, swipe left/right target folder, etc</string>
-    <string name="title_setup_identity">Setup identities manually</string>
-    <string name="title_setup_identity_remark">To send email</string>
-    <string name="title_setup_identity_hint">To change name, color, signature, etc</string>
     <string name="title_setup_identity_what">What is an identity?</string>
     <string name="title_setup_permissions">Grant permissions</string>
     <string name="title_setup_permissions_remark">To access contact information (optional)</string>
@@ -704,7 +705,7 @@
     <string name="title_no_inbox">Inbox not found</string>
     <string name="title_no_drafts">No drafts folder</string>
     <string name="title_no_junk_folder">There is no spam folder selected for this account</string>
-    <string name="title_no_composable">Sending emails requires an identity to be configured, and a drafts folder to be selected in the account settings (setup step 1)</string>
+    <string name="title_no_composable">Sending emails requires an identity to be configured, and a drafts folder to be selected in the account settings</string>
     <string name="title_no_standard">This provider uses a proprietary email protocol and therefore it is not possible to use third party email clients</string>
     <string name="title_no_idle">This provider does not support push messages. This will delay reception of new messages and increase battery usage.</string>
     <string name="title_no_utf8">This provider does not support UTF-8</string>