diff --git a/app/src/main/java/eu/faircode/email/FragmentSetup.java b/app/src/main/java/eu/faircode/email/FragmentSetup.java
index fccfa4d337..84034ecc24 100644
--- a/app/src/main/java/eu/faircode/email/FragmentSetup.java
+++ b/app/src/main/java/eu/faircode/email/FragmentSetup.java
@@ -224,6 +224,7 @@ public class FragmentSetup extends FragmentBase {
             }
         });
 
+        tvManual.setPaintFlags(tvManual.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG);
         tvManual.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
diff --git a/app/src/main/res/layout/fragment_setup.xml b/app/src/main/res/layout/fragment_setup.xml
index d25e304091..c8b6dcc944 100644
--- a/app/src/main/res/layout/fragment_setup.xml
+++ b/app/src/main/res/layout/fragment_setup.xml
@@ -96,12 +96,13 @@
 
         <ImageButton
             android:id="@+id/ibManual"
-            android:layout_width="48dp"
+            android:layout_width="36dp"
             android:layout_height="48dp"
             android:layout_marginTop="12dp"
             android:background="?android:attr/selectableItemBackgroundBorderless"
             android:contentDescription="@string/title_legend_expander"
-            android:padding="12dp"
+            android:paddingVertical="12dp"
+            android:paddingEnd="0dp"
             app:layout_constraintEnd_toStartOf="@+id/tvManual"
             app:layout_constraintHorizontal_chainStyle="packed"
             app:layout_constraintStart_toStartOf="parent"