diff --git a/app/src/main/res/layout/include_message_navigation.xml b/app/src/main/res/layout/include_message_navigation.xml
index 884d949f97..53e3dee915 100644
--- a/app/src/main/res/layout/include_message_navigation.xml
+++ b/app/src/main/res/layout/include_message_navigation.xml
@@ -38,12 +38,12 @@
             android:layout_height="36dp"
             android:background="?android:attr/selectableItemBackgroundBorderless"
             android:contentDescription="@string/title_more"
-            android:padding="3dp"
+            android:padding="6dp"
             android:scaleType="fitCenter"
             android:tooltipText="@string/title_legend_expander"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/vSeparator"
-            app:srcCompat="@drawable/expander" />
+            app:srcCompat="@drawable/expander_hor" />
 
         <androidx.constraintlayout.helper.widget.Flow
             android:id="@+id/ibFlow"
@@ -55,9 +55,9 @@
             app:flow_horizontalGap="3dp"
             app:flow_horizontalStyle="packed"
             app:flow_wrapMode="chain"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ibTools" />
+            app:layout_constraintEnd_toStartOf="@+id/ibVerify"
+            app:layout_constraintStart_toEndOf="@id/ibTools"
+            app:layout_constraintTop_toBottomOf="@id/vSeparator" />
 
         <ImageButton
             android:id="@+id/ibMore"
@@ -365,8 +365,7 @@
             android:tooltipText="@string/title_verify"
             app:layout_constraintEnd_toStartOf="@+id/ibDecrypt"
             app:layout_constraintTop_toBottomOf="@id/vSeparator"
-            app:srcCompat="@drawable/twotone_gesture_24"
-            app:tint="?attr/colorAccent" />
+            app:srcCompat="@drawable/twotone_gesture_24" />
 
         <ImageButton
             android:id="@+id/ibDecrypt"
@@ -380,8 +379,7 @@
             android:tooltipText="@string/title_decrypt"
             app:layout_constraintEnd_toStartOf="@+id/ibImages"
             app:layout_constraintTop_toBottomOf="@id/vSeparator"
-            app:srcCompat="@drawable/twotone_lock_open_24"
-            app:tint="?attr/colorAccent" />
+            app:srcCompat="@drawable/twotone_lock_open_24" />
 
         <ImageButton
             android:id="@+id/ibImages"
@@ -395,8 +393,7 @@
             android:tooltipText="@string/title_legend_show_images"
             app:layout_constraintEnd_toStartOf="@+id/ibFull"
             app:layout_constraintTop_toBottomOf="@id/vSeparator"
-            app:srcCompat="@drawable/twotone_image_24"
-            app:tint="?attr/colorAccent" />
+            app:srcCompat="@drawable/twotone_image_24" />
 
         <ImageButton
             android:id="@+id/ibFull"
@@ -409,15 +406,14 @@
             android:tooltipText="@string/title_legend_show_full"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toBottomOf="@id/vSeparator"
-            app:srcCompat="@drawable/twotone_fullscreen_24"
-            app:tint="?attr/colorAccent" />
+            app:srcCompat="@drawable/twotone_fullscreen_24" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 
     <eu.faircode.email.FixedTextView
         android:id="@+id/tvReformatted"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:paddingVertical="6dp"
+        android:paddingBottom="12dp"
         android:text="@string/title_reformatted"
         android:textAppearance="@style/TextAppearance.AppCompat.Small"
         android:textStyle="italic"
@@ -430,7 +426,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:gravity="center"
-        android:paddingVertical="6dp"
+        android:paddingBottom="12dp"
         android:text="@string/title_signed_data"
         android:textAppearance="@style/TextAppearance.AppCompat.Small"
         android:textStyle="italic"