diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 3ac9807145..95d01c39ed 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -1762,7 +1762,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             vSeparator.setVisibility(View.VISIBLE);
             ibFull.setEnabled(false);
             ibFull.setVisibility(View.VISIBLE);
-            ibImages.setVisibility(View.GONE);
+            ibImages.setVisibility(View.INVISIBLE);
             ibDecrypt.setVisibility(View.GONE);
             ibVerify.setVisibility(View.GONE);
             ibUndo.setVisibility(View.GONE);
@@ -2673,7 +2673,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                     boolean always_images = prefs.getBoolean("html_always_images", false);
 
                     // Show images
-                    ibImages.setVisibility(has_images && !(show_full && always_images) ? View.VISIBLE : View.GONE);
+                    ibImages.setVisibility(has_images && !(show_full && always_images) ? View.VISIBLE : View.INVISIBLE);
 
                     // Show encrypt actions
                     ibVerify.setVisibility(false ||
diff --git a/app/src/main/res/layout/include_message_navigation.xml b/app/src/main/res/layout/include_message_navigation.xml
index c2f6abad09..12b3b46687 100644
--- a/app/src/main/res/layout/include_message_navigation.xml
+++ b/app/src/main/res/layout/include_message_navigation.xml
@@ -55,7 +55,7 @@
             app:flow_horizontalGap="3dp"
             app:flow_horizontalStyle="packed"
             app:flow_wrapMode="chain"
-            app:layout_constraintEnd_toStartOf="@+id/ibVerify"
+            app:layout_constraintEnd_toStartOf="@+id/ibImages"
             app:layout_constraintStart_toEndOf="@id/ibTools"
             app:layout_constraintTop_toBottomOf="@id/vSeparator" />
 
@@ -364,9 +364,8 @@
             android:scaleType="fitCenter"
             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:layout_constraintTop_toBottomOf="@+id/ibFull"
+            app:srcCompat="@drawable/twotone_gesture_24" />
 
         <ImageButton
             android:id="@+id/ibDecrypt"
@@ -378,10 +377,9 @@
             android:padding="6dp"
             android:scaleType="fitCenter"
             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:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/ibFull"
+            app:srcCompat="@drawable/twotone_lock_open_24" />
 
         <ImageButton
             android:id="@+id/ibImages"