diff --git a/app/src/main/java/eu/faircode/email/FragmentSetup.java b/app/src/main/java/eu/faircode/email/FragmentSetup.java
index 0b75d0cbb9..75f8b46100 100644
--- a/app/src/main/java/eu/faircode/email/FragmentSetup.java
+++ b/app/src/main/java/eu/faircode/email/FragmentSetup.java
@@ -27,6 +27,7 @@ import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
+import android.graphics.Paint;
 import android.graphics.drawable.Drawable;
 import android.net.ConnectivityManager;
 import android.net.Uri;
@@ -77,8 +78,8 @@ public class FragmentSetup extends FragmentBase {
 
     private TextView tvDozeDone;
     private Button btnDoze;
-    private Button btnBattery;
-    private Button btnStopped;
+    private TextView tvBatteryUsage;
+    private TextView tvSyncStopped;
 
     private Button btnDataSaver;
 
@@ -123,8 +124,8 @@ public class FragmentSetup extends FragmentBase {
 
         tvDozeDone = view.findViewById(R.id.tvDozeDone);
         btnDoze = view.findViewById(R.id.btnDoze);
-        btnBattery = view.findViewById(R.id.btnBattery);
-        btnStopped = view.findViewById(R.id.btnStopped);
+        tvBatteryUsage = view.findViewById(R.id.tvBatteryUsage);
+        tvSyncStopped = view.findViewById(R.id.tvSyncStopped);
 
         btnDataSaver = view.findViewById(R.id.btnDataSaver);
 
@@ -232,14 +233,16 @@ public class FragmentSetup extends FragmentBase {
             }
         });
 
-        btnBattery.setOnClickListener(new View.OnClickListener() {
+        tvBatteryUsage.setPaintFlags(tvBatteryUsage.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG);
+        tvBatteryUsage.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
                 Helper.viewFAQ(getContext(), 39);
             }
         });
 
-        btnStopped.setOnClickListener(new View.OnClickListener() {
+        tvSyncStopped.setPaintFlags(tvSyncStopped.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG);
+        tvSyncStopped.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
                 Helper.viewFAQ(getContext(), 16);
diff --git a/app/src/main/res/layout/fragment_setup.xml b/app/src/main/res/layout/fragment_setup.xml
index 3ed31231d7..08087766d4 100644
--- a/app/src/main/res/layout/fragment_setup.xml
+++ b/app/src/main/res/layout/fragment_setup.xml
@@ -110,7 +110,7 @@
             android:id="@+id/tvQuickRemark"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="6dp"
+            android:layout_marginTop="12dp"
             android:text="@string/title_setup_wizard_remark"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
             app:layout_constraintEnd_toEndOf="parent"
@@ -459,30 +459,28 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="@id/tvDozeDone" />
 
-        <Button
-            android:id="@+id/btnBattery"
-            style="?android:attr/buttonStyleSmall"
+        <TextView
+            android:id="@+id/tvBatteryUsage"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="12dp"
-            android:minWidth="0dp"
-            android:minHeight="0dp"
             android:text="@string/title_setup_doze_battery"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/btnDoze" />
-
-        <Button
-            android:id="@+id/btnStopped"
-            style="?android:attr/buttonStyleSmall"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
-            android:minWidth="0dp"
-            android:minHeight="0dp"
-            android:text="@string/title_setup_doze_stopped"
+            android:textAppearance="@style/TextAppearance.AppCompat.Small"
+            android:textColor="?android:attr/textColorLink"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/btnDoze" />
 
+        <TextView
+            android:id="@+id/tvSyncStopped"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
+            android:text="@string/title_setup_doze_stopped"
+            android:textAppearance="@style/TextAppearance.AppCompat.Small"
+            android:textColor="?android:attr/textColorLink"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tvBatteryUsage" />
+
         <TextView
             android:id="@+id/tvDataSaver"
             android:layout_width="wrap_content"
@@ -491,9 +489,8 @@
             android:text="@string/title_setup_data"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             android:textColor="?attr/colorWarning"
-            android:textIsSelectable="true"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/btnBattery" />
+            app:layout_constraintTop_toBottomOf="@id/tvSyncStopped" />
 
         <Button
             android:id="@+id/btnDataSaver"
@@ -503,7 +500,7 @@
             android:minWidth="0dp"
             android:minHeight="0dp"
             android:text="@string/title_setup_manage"
-            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvDataSaver" />
 
         <!-- inbox -->