diff --git a/app/src/main/res/layout/include_message_navigation.xml b/app/src/main/res/layout/include_message_navigation.xml
index f241964ae7..a52c1f5054 100644
--- a/app/src/main/res/layout/include_message_navigation.xml
+++ b/app/src/main/res/layout/include_message_navigation.xml
@@ -51,10 +51,11 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="3dp"
-        android:layout_marginEnd="6dp"
-        android:backgroundTint="?attr/colorActionBackground"
+        android:layout_marginEnd="12dp"
+        android:background="@null"
         android:contentDescription="@string/title_decrypt"
-        android:tint="@color/action_foreground"
+        android:padding="6dp"
+        android:tint="?android:attr/textColorSecondary"
         android:tooltipText="@string/title_decrypt"
         app:layout_constraintEnd_toStartOf="@+id/ibUnsubscribe"
         app:layout_constraintTop_toBottomOf="@id/vSeparatorBottom"
@@ -65,10 +66,11 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="3dp"
-        android:layout_marginEnd="6dp"
-        android:backgroundTint="?attr/colorActionBackground"
+        android:layout_marginEnd="12dp"
+        android:background="@null"
         android:contentDescription="@string/title_legend_show_unsubscribe"
-        android:tint="@color/action_foreground"
+        android:padding="6dp"
+        android:tint="?android:attr/textColorSecondary"
         android:tooltipText="@string/title_legend_show_unsubscribe"
         app:layout_constraintEnd_toStartOf="@+id/ibImages"
         app:layout_constraintTop_toBottomOf="@id/vSeparatorBottom"
@@ -79,10 +81,11 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="3dp"
-        android:layout_marginEnd="6dp"
-        android:backgroundTint="?attr/colorActionBackground"
+        android:layout_marginEnd="12dp"
+        android:background="@null"
         android:contentDescription="@string/title_legend_show_images"
-        android:tint="@color/action_foreground"
+        android:padding="6dp"
+        android:tint="?android:attr/textColorSecondary"
         android:tooltipText="@string/title_legend_show_images"
         app:layout_constraintEnd_toStartOf="@+id/ibFull"
         app:layout_constraintTop_toBottomOf="@id/vSeparatorBottom"
@@ -93,9 +96,10 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="3dp"
-        android:backgroundTint="?attr/colorActionBackground"
+        android:background="@null"
         android:contentDescription="@string/title_legend_show_full"
-        android:tint="@color/action_foreground"
+        android:padding="6dp"
+        android:tint="?android:attr/textColorSecondary"
         android:tooltipText="@string/title_legend_show_full"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toBottomOf="@id/vSeparatorBottom"