diff --git a/vector/src/main/res/layout/bottom_sheet_logout_and_backup.xml b/vector/src/main/res/layout/bottom_sheet_logout_and_backup.xml
index aeaa2fb9..feaa79e1 100644
--- a/vector/src/main/res/layout/bottom_sheet_logout_and_backup.xml
+++ b/vector/src/main/res/layout/bottom_sheet_logout_and_backup.xml
@@ -90,7 +90,7 @@
             android:layout_marginRight="16dp"
             android:scaleType="fitCenter"
             android:src="@drawable/backup_keys"
-            android:tint="?android:attr/textColorTertiary" />
+            android:tint="?riotx_text_primary" />
 
         <TextView
             android:layout_width="wrap_content"
@@ -125,7 +125,7 @@
             android:layout_marginRight="16dp"
             android:scaleType="fitCenter"
             android:src="@drawable/backup_keys"
-            android:tint="?android:attr/textColorTertiary" />
+            android:tint="?riotx_text_primary" />
 
         <TextView
             android:layout_width="wrap_content"
diff --git a/vector/src/main/res/layout/constraint_set_composer_layout_compact.xml b/vector/src/main/res/layout/constraint_set_composer_layout_compact.xml
index a6091b92..43552428 100644
--- a/vector/src/main/res/layout/constraint_set_composer_layout_compact.xml
+++ b/vector/src/main/res/layout/constraint_set_composer_layout_compact.xml
@@ -75,7 +75,7 @@
         android:layout_marginTop="8dp"
         android:layout_marginBottom="38dp"
         android:alpha="0"
-        android:tint="?android:attr/textColorTertiary"
+        android:tint="?riotx_text_primary"
         app:layout_constraintEnd_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="parent"
         tools:ignore="MissingConstraints"
diff --git a/vector/src/main/res/layout/constraint_set_composer_layout_expanded.xml b/vector/src/main/res/layout/constraint_set_composer_layout_expanded.xml
index f71ccf5e..dcf13b4d 100644
--- a/vector/src/main/res/layout/constraint_set_composer_layout_expanded.xml
+++ b/vector/src/main/res/layout/constraint_set_composer_layout_expanded.xml
@@ -80,7 +80,7 @@
         android:layout_marginTop="6dp"
         android:layout_marginBottom="38dp"
         android:alpha="1"
-        android:tint="?android:attr/textColorTertiary"
+        android:tint="?riotx_text_primary"
         android:visibility="visible"
         app:layout_constraintEnd_toEndOf="@id/composer_related_message_avatar_view"
         app:layout_constraintStart_toStartOf="@id/composer_related_message_avatar_view"
diff --git a/vector/src/main/res/layout/merge_composer_layout.xml b/vector/src/main/res/layout/merge_composer_layout.xml
index 3828063f..c5db963c 100644
--- a/vector/src/main/res/layout/merge_composer_layout.xml
+++ b/vector/src/main/res/layout/merge_composer_layout.xml
@@ -63,7 +63,7 @@
         android:id="@+id/composer_related_message_action_image"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:tint="?android:attr/textColorTertiary"
+        android:tint="?riotx_text_primary"
         tools:ignore="MissingConstraints" />
 
     <ImageButton