diff --git a/app/src/main/res/layout/fragment_setup.xml b/app/src/main/res/layout/fragment_setup.xml
index 67d678da4a..2acdb62c66 100644
--- a/app/src/main/res/layout/fragment_setup.xml
+++ b/app/src/main/res/layout/fragment_setup.xml
@@ -78,6 +78,19 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/fast" />
 
+        <Button
+            android:id="@+id/btnGmail"
+            style="?android:attr/buttonStyleSmall"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:minWidth="0dp"
+            android:minHeight="0dp"
+            android:text="@string/title_setup_gmail"
+            android:textColor="?android:attr/textColorPrimary"
+            android:textStyle="bold"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tvQuick" />
+
         <Button
             android:id="@+id/btnHelp"
             style="?android:attr/buttonStyleSmall"
@@ -91,7 +104,7 @@
             android:textColor="@android:color/black"
             android:textStyle="bold"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvQuick" />
+            app:layout_constraintTop_toBottomOf="@id/btnGmail" />
 
         <Button
             android:id="@+id/btnQuick"
@@ -103,18 +116,7 @@
             android:textColor="@android:color/white"
             android:textStyle="bold"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvQuick" />
-
-        <Button
-            android:id="@+id/btnGmail"
-            style="?android:attr/buttonStyleSmall"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:minWidth="0dp"
-            android:minHeight="0dp"
-            android:text="@string/title_setup_gmail"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/btnQuick" />
+            app:layout_constraintTop_toBottomOf="@id/btnGmail" />
 
         <!-- account -->
 
@@ -125,7 +127,7 @@
             android:layout_marginTop="12dp"
             android:background="?attr/colorSeparator"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/btnGmail" />
+            app:layout_constraintTop_toBottomOf="@id/btnQuick" />
 
         <ImageView
             android:id="@+id/one"