diff --git a/app/src/main/res/layout/dialog_search.xml b/app/src/main/res/layout/dialog_search.xml
index 8a9dabfbb9..4ee6066d56 100644
--- a/app/src/main/res/layout/dialog_search.xml
+++ b/app/src/main/res/layout/dialog_search.xml
@@ -25,7 +25,6 @@
             android:layout_height="36dp"
             android:background="?android:attr/selectableItemBackgroundBorderless"
             android:contentDescription="@string/title_info"
-            android:foregroundTint="?android:attr/textColorPrimary"
             android:padding="6dp"
             android:scaleType="fitCenter"
             android:tooltipText="@string/title_info"
diff --git a/app/src/main/res/layout/include_message_body.xml b/app/src/main/res/layout/include_message_body.xml
index da9e228146..28e92e4058 100644
--- a/app/src/main/res/layout/include_message_body.xml
+++ b/app/src/main/res/layout/include_message_body.xml
@@ -130,7 +130,6 @@
         android:layout_width="36dp"
         android:layout_height="36dp"
         android:background="?android:attr/selectableItemBackgroundBorderless"
-        android:foregroundTint="?android:attr/textColorSecondary"
         android:padding="6dp"
         android:scaleType="fitCenter"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/include_message_calendar.xml b/app/src/main/res/layout/include_message_calendar.xml
index 4819d6e069..65dabf9625 100644
--- a/app/src/main/res/layout/include_message_calendar.xml
+++ b/app/src/main/res/layout/include_message_calendar.xml
@@ -22,7 +22,6 @@
         android:layout_height="36dp"
         android:background="?android:attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/title_icalendar_calendar"
-        android:foregroundTint="?android:attr/textColorSecondary"
         android:padding="6dp"
         android:scaleType="fitCenter"
         android:tooltipText="@string/title_icalendar_accept"
diff --git a/app/src/main/res/layout/include_message_navigation.xml b/app/src/main/res/layout/include_message_navigation.xml
index 65a0ba9b50..598cafdc9e 100644
--- a/app/src/main/res/layout/include_message_navigation.xml
+++ b/app/src/main/res/layout/include_message_navigation.xml
@@ -42,7 +42,6 @@
         android:layout_height="36dp"
         android:background="?android:attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/title_more"
-        android:foregroundTint="?android:attr/textColorSecondary"
         android:padding="6dp"
         android:scaleType="fitCenter"
         android:tooltipText="@string/title_more"
@@ -55,7 +54,6 @@
         android:layout_height="36dp"
         android:background="?android:attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/title_spam"
-        android:foregroundTint="?android:attr/textColorSecondary"
         android:padding="6dp"
         android:scaleType="fitCenter"
         android:tooltipText="@string/title_spam"
@@ -68,7 +66,6 @@
         android:layout_height="36dp"
         android:background="?android:attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/title_delete"
-        android:foregroundTint="?android:attr/textColorSecondary"
         android:padding="6dp"
         android:scaleType="fitCenter"
         android:tooltipText="@string/title_delete"
@@ -81,7 +78,6 @@
         android:layout_height="36dp"
         android:background="?android:attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/title_archive"
-        android:foregroundTint="?android:attr/textColorSecondary"
         android:padding="6dp"
         android:scaleType="fitCenter"
         android:tooltipText="@string/title_archive"
@@ -94,7 +90,6 @@
         android:layout_height="36dp"
         android:background="?android:attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/title_move"
-        android:foregroundTint="?android:attr/textColorSecondary"
         android:padding="6dp"
         android:scaleType="fitCenter"
         android:tooltipText="@string/title_move"
@@ -107,7 +102,6 @@
         android:layout_height="36dp"
         android:background="?android:attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/title_reply"
-        android:foregroundTint="?android:attr/textColorSecondary"
         android:padding="6dp"
         android:scaleType="fitCenter"
         android:tooltipText="@string/title_reply"
@@ -120,7 +114,6 @@
         android:layout_height="36dp"
         android:background="?android:attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/title_legend_show_unsubscribe"
-        android:foregroundTint="?android:attr/textColorSecondary"
         android:padding="6dp"
         android:scaleType="fitCenter"
         android:tooltipText="@string/title_legend_show_unsubscribe"
@@ -133,7 +126,6 @@
         android:layout_height="36dp"
         android:background="?android:attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/title_undo"
-        android:foregroundTint="?android:attr/textColorSecondary"
         android:padding="6dp"
         android:scaleType="fitCenter"
         android:tooltipText="@string/title_undo"
@@ -147,7 +139,6 @@
         android:layout_marginEnd="3dp"
         android:background="?android:attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/title_sign"
-        android:foregroundTint="?android:attr/textColorSecondary"
         android:padding="6dp"
         android:scaleType="fitCenter"
         android:tooltipText="@string/title_sign"
@@ -162,7 +153,6 @@
         android:layout_marginEnd="3dp"
         android:background="?android:attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/title_decrypt"
-        android:foregroundTint="?android:attr/textColorSecondary"
         android:padding="6dp"
         android:scaleType="fitCenter"
         android:tooltipText="@string/title_decrypt"
@@ -177,7 +167,6 @@
         android:layout_marginEnd="3dp"
         android:background="?android:attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/title_legend_show_images"
-        android:foregroundTint="?android:attr/textColorSecondary"
         android:padding="6dp"
         android:scaleType="fitCenter"
         android:tooltipText="@string/title_legend_show_images"
@@ -191,7 +180,6 @@
         android:layout_height="36dp"
         android:background="?android:attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/title_legend_show_full"
-        android:foregroundTint="?android:attr/textColorSecondary"
         android:padding="3dp"
         android:scaleType="fitCenter"
         android:tooltipText="@string/title_legend_show_full"