diff --git a/app/src/main/res/layout/include_message_navigation.xml b/app/src/main/res/layout/include_message_navigation.xml
index a52c1f5054..9c9b905186 100644
--- a/app/src/main/res/layout/include_message_navigation.xml
+++ b/app/src/main/res/layout/include_message_navigation.xml
@@ -48,14 +48,15 @@
 
     <ImageButton
         android:id="@+id/ibDecrypt"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="36dp"
+        android:layout_height="36dp"
         android:layout_marginTop="3dp"
         android:layout_marginEnd="12dp"
         android:background="@null"
         android:contentDescription="@string/title_decrypt"
-        android:padding="6dp"
-        android:tint="?android:attr/textColorSecondary"
+        android:foregroundTint="?android:attr/textColorSecondary"
+        android:padding="3dp"
+        android:scaleType="fitCenter"
         android:tooltipText="@string/title_decrypt"
         app:layout_constraintEnd_toStartOf="@+id/ibUnsubscribe"
         app:layout_constraintTop_toBottomOf="@id/vSeparatorBottom"
@@ -63,14 +64,15 @@
 
     <ImageButton
         android:id="@+id/ibUnsubscribe"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="36dp"
+        android:layout_height="36dp"
         android:layout_marginTop="3dp"
         android:layout_marginEnd="12dp"
         android:background="@null"
         android:contentDescription="@string/title_legend_show_unsubscribe"
-        android:padding="6dp"
-        android:tint="?android:attr/textColorSecondary"
+        android:foregroundTint="?android:attr/textColorSecondary"
+        android:padding="3dp"
+        android:scaleType="fitCenter"
         android:tooltipText="@string/title_legend_show_unsubscribe"
         app:layout_constraintEnd_toStartOf="@+id/ibImages"
         app:layout_constraintTop_toBottomOf="@id/vSeparatorBottom"
@@ -78,14 +80,15 @@
 
     <ImageButton
         android:id="@+id/ibImages"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="36dp"
+        android:layout_height="36dp"
         android:layout_marginTop="3dp"
         android:layout_marginEnd="12dp"
         android:background="@null"
         android:contentDescription="@string/title_legend_show_images"
-        android:padding="6dp"
-        android:tint="?android:attr/textColorSecondary"
+        android:foregroundTint="?android:attr/textColorSecondary"
+        android:padding="3dp"
+        android:scaleType="fitCenter"
         android:tooltipText="@string/title_legend_show_images"
         app:layout_constraintEnd_toStartOf="@+id/ibFull"
         app:layout_constraintTop_toBottomOf="@id/vSeparatorBottom"
@@ -93,13 +96,14 @@
 
     <ImageButton
         android:id="@+id/ibFull"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="36dp"
+        android:layout_height="36dp"
         android:layout_marginTop="3dp"
         android:background="@null"
         android:contentDescription="@string/title_legend_show_full"
-        android:padding="6dp"
-        android:tint="?android:attr/textColorSecondary"
+        android:foregroundTint="?android:attr/textColorSecondary"
+        android:padding="3dp"
+        android:scaleType="fitCenter"
         android:tooltipText="@string/title_legend_show_full"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toBottomOf="@id/vSeparatorBottom"